From dacef3683a3d745c126e11fcfeff719076427d16 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Sat, 6 May 2017 14:49:53 +0200 Subject: [PATCH 001/160] add token to register --- mod/register.php | 3 ++- view/templates/register.tpl | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/register.php b/mod/register.php index 5e8da4685a..cfb65b69df 100644 --- a/mod/register.php +++ b/mod/register.php @@ -6,6 +6,7 @@ require_once('include/user.php'); if(! function_exists('register_post')) { function register_post(App $a) { + check_form_security_token_redirectOnErr('/register', 'register'); global $lang; @@ -294,7 +295,7 @@ function register_content(App $a) { '$sitename' => $a->get_hostname(), '$importh' => t('Import'), '$importt' => t('Import your profile to this friendica instance'), - + '$form_security_token' => get_form_security_token("register") )); return $o; diff --git a/view/templates/register.tpl b/view/templates/register.tpl index 5c55dac202..55c0862741 100644 --- a/view/templates/register.tpl +++ b/view/templates/register.tpl @@ -3,6 +3,7 @@ <form action="register" method="post" id="register-form"> <input type="hidden" name="photo" value="{{$photo}}" /> + <input type="hidden" name="form_security_token" value="{{$form_security_token}}"> {{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}} From f66c5c6823fea5847c8adf420ea26bf6f6e8c210 Mon Sep 17 00:00:00 2001 From: Roland Haeder <roland@mxchange.org> Date: Tue, 4 Apr 2017 19:47:32 +0200 Subject: [PATCH 002/160] added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org> --- include/dba_pdo.php | 78 ++++++++++++++++++++--------------------- include/dbstructure.php | 9 ++--- include/diaspora.php | 14 ++++---- include/event.php | 20 ++++++----- 4 files changed, 63 insertions(+), 58 deletions(-) diff --git a/include/dba_pdo.php b/include/dba_pdo.php index 63f35739a3..40ff09acf0 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -14,18 +14,19 @@ $objDDDBLResultHandler = new DataObjectPool('Result-Handler'); * **/ $cloPDOStatementResultHandler = function(Queue $objQueue) { + $objPDO = $objQueue->getState()->get('PDOStatement'); + $objQueue->getState()->update(array('result' => $objPDO)); - $objPDO = $objQueue->getState()->get('PDOStatement'); - $objQueue->getState()->update(array('result' => $objPDO)); - - # delete handler which closes the PDOStatement-cursor - # this will be done manual if using this handler - $objQueue->deleteHandler(QUEUE_CLOSE_CURSOR_POSITION); - + /* + * delete handler which closes the PDOStatement-cursor + * this will be done manual if using this handler + */ + $objQueue->deleteHandler(QUEUE_CLOSE_CURSOR_POSITION); }; $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementResultHandler)); +if (! class_exists('dba')) { /** * * MySQL database class @@ -36,8 +37,6 @@ $objDDDBLResultHandler->add('PDOStatement', array('HANDLER' => $cloPDOStatementR * the debugging stream is safe to view within both terminals and web pages. * */ - -if (! class_exists('dba')) { class dba { private $debug = 0; @@ -147,15 +146,13 @@ class dba { $a->save_timestamp($stamp1, "database"); /// @TODO really check $a->config for 'system'? it is very generic and should be there - if (x($a->config, 'system') && x($a->config['system'], 'db_log')) { - if (($duration > $a->config["system"]["db_loglimit"])) { - $duration = round($duration, 3); - $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); - @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t". - basename($backtrace[1]["file"])."\t". - $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". - substr($sql, 0, 2000)."\n", FILE_APPEND); - } + if (x($a->config, 'system') && x($a->config['system'], 'db_log') && ($duration > $a->config["system"]["db_loglimit"])) { + $duration = round($duration, 3); + $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + @file_put_contents($a->config["system"]["db_log"], datetime_convert()."\t".$duration."\t". + basename($backtrace[1]["file"])."\t". + $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". + substr($sql, 0, 2000)."\n", FILE_APPEND); } if ($intErrorCode) { @@ -202,8 +199,11 @@ class dba { } if ($onlyquery) { - $this->result = $r; # this will store an PDOStatement Object in result - $this->result->execute(); # execute the Statement, to get its result + // this will store an PDOStatement Object in result + $this->result = $r; + + // execute the Statement, to get its result + $this->result->execute(); return true; } @@ -262,7 +262,8 @@ function printable($s) { return $s; }} -// Procedural functions +// --- Procedural functions --- + if (! function_exists('dbg')) { function dbg($state) { global $db; @@ -273,18 +274,20 @@ function dbg($state) { if (! function_exists('dbesc')) { function dbesc($str) { global $db; - if ($db && $db->connected) - return($db->escape($str)); - else - return(str_replace("'","\\'",$str)); + + if ($db && $db->connected) { + return $db->escape($str); + } else { + return str_replace("'","\\'",$str); + } }} if (! function_exists('q')) { -/** +/* * Function: q($sql,$args); * Description: execute SQL query with printf style args. * Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", - * 'user', 1); + * 'user', 1); */ function q($sql) { @@ -301,23 +304,19 @@ function q($sql) { return $db->q($stmt); } - /** - * + /* * This will happen occasionally trying to store the * session data after abnormal program termination - * */ logger('dba: no database: ' . print_r($args,true)); return false; - }} if (! function_exists('dbq')) { -/** +/* * Raw db query, no arguments */ function dbq($sql) { - global $db; if ($db && $db->connected) { $ret = $db->q($sql); @@ -327,15 +326,14 @@ function dbq($sql) { return $ret; }} - -/* - * Caller is responsible for ensuring that any integer arguments to - * dbesc_array are actually integers and not malformed strings containing - * SQL injection vectors. All integer array elements should be specifically - * cast to int to avoid trouble. - */ if (! function_exists('dbesc_array_cb')) { function dbesc_array_cb(&$item, $key) { + /* + * Caller is responsible for ensuring that any integer arguments to + * dbesc_array are actually integers and not malformed strings containing + * SQL injection vectors. All integer array elements should be specifically + * cast to int to avoid trouble. + */ if (is_string($item)) { $item = dbesc($item); } diff --git a/include/dbstructure.php b/include/dbstructure.php index 3aebef0ad8..0bfac6669b 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -26,7 +26,7 @@ function convert_to_innodb() { $sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", dbesc($table['TABLE_NAME'])); echo $sql."\n"; - $result = @$db->q($sql); + $result = $db->q($sql); if (!dbm::is_result($result)) { print_update_error($db, $sql); } @@ -81,6 +81,7 @@ function update_fail($update_id, $error_message) { /* + @TODO deprecated code? $email_tpl = get_intltext_template("update_fail_eml.tpl"); $email_msg = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], @@ -1750,10 +1751,10 @@ function dbstructure_run(&$argv, &$argc) { } if (is_null($db)) { - @include(".htconfig.php"); - require_once("include/dba.php"); + @include ".htconfig.php"; + require_once "include/dba.php"; $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); + unset($db_host, $db_user, $db_pass, $db_data); } if ($argc == 2) { diff --git a/include/diaspora.php b/include/diaspora.php index f0d1a8ca31..7241607742 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -932,18 +932,20 @@ class Diaspora { logger("defining user ".$contact["nick"]." as friend"); } - // We don't seem to like that person + // Is this contact wanted? if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) { + // Maybe blocked, don't accept. return false; - // We are following this person? Then it is okay + // Is this person being followed? } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) { + // Yes, then it is fine. return true; - // Is it a post to a community? That's good + // Is it a post to a community? } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) { + // That's good return true; - } - // Messages for the global users and comments are always accepted - if (($importer["uid"] == 0) || $is_comment) { + } elseif (($importer["uid"] == 0) || $is_comment) { + // Messages for the global users and comments are always accepted return true; } diff --git a/include/event.php b/include/event.php index 089fe705db..e5f19deda0 100644 --- a/include/event.php +++ b/include/event.php @@ -853,18 +853,22 @@ function widget_events() { 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) - // So we have to test if if it's the own profile page of the logged in user - // 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) + /* + * 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) + * So we have to test if if it's the own profile page of the logged in user + * 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")) { 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 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")) { return; } From 347803fd5c0b7ceb910535ac99dbfe1a88844fc1 Mon Sep 17 00:00:00 2001 From: Roland Haeder <roland@mxchange.org> Date: Tue, 4 Apr 2017 19:48:13 +0200 Subject: [PATCH 003/160] added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org> --- include/pgettext.php | 1 - include/queue.php | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/include/pgettext.php b/include/pgettext.php index 756905a43a..f6f26a8cc4 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -91,7 +91,6 @@ function pop_lang() { $lang = $a->langsave; } - // l if (! function_exists('load_translation_table')) { diff --git a/include/queue.php b/include/queue.php index dbed460473..3b34ada7f4 100644 --- a/include/queue.php +++ b/include/queue.php @@ -2,15 +2,15 @@ use Friendica\Core\Config; -require_once('include/queue_fn.php'); -require_once('include/dfrn.php'); -require_once("include/datetime.php"); -require_once('include/items.php'); -require_once('include/bbcode.php'); -require_once('include/socgraph.php'); -require_once('include/cache.php'); +require_once 'include/queue_fn.php'; +require_once 'include/dfrn.php'; +require_once 'include/datetime.php'; +require_once 'include/items.php'; +require_once 'include/bbcode.php'; +require_once 'include/socgraph.php'; +require_once 'include/cache.php'; -function queue_run(&$argv, &$argc){ +function queue_run(&$argv, &$argc) { global $a; if ($argc > 1) { @@ -29,6 +29,25 @@ function queue_run(&$argv, &$argc){ // Handling the pubsubhubbub requests proc_run(PRIORITY_HIGH,'include/pubsubpublish.php'); + $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval'))); + + // If we are using the worker we don't need a delivery interval + /// @TODO To much get_config() here + if (get_config("system", "worker")) { + $interval = false; + } + + $r = q("select * from deliverq where 1"); + if ($r) { + foreach ($r as $rr) { + logger('queue: deliverq'); + proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']); + if ($interval) { + time_sleep_until(microtime(true) + (float) $interval); + } + } + } + $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); @@ -60,8 +79,8 @@ function queue_run(&$argv, &$argc){ // delivering - require_once('include/salmon.php'); - require_once('include/diaspora.php'); + require_once 'include/salmon.php'; + require_once 'include/diaspora.php'; $r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1", intval($queue_id)); From 635b26353cf263c6b5073d9bb4605b481b0e85ba Mon Sep 17 00:00:00 2001 From: Roland Haeder <roland@mxchange.org> Date: Tue, 4 Apr 2017 19:48:25 +0200 Subject: [PATCH 004/160] added spaces + some curly braces + some usage of dbm::is_result() Signed-off-by: Roland Haeder <roland@mxchange.org> --- include/redir.php | 14 +- include/salmon.php | 7 +- include/security.php | 72 +++++---- include/socgraph.php | 187 ++++++++++++++--------- include/tags.php | 9 +- include/template_processor.php | 10 +- include/text.php | 271 ++++++++++++++++----------------- include/threads.php | 24 ++- 8 files changed, 329 insertions(+), 265 deletions(-) diff --git a/include/redir.php b/include/redir.php index 36f982b12c..d6b8285cfc 100644 --- a/include/redir.php +++ b/include/redir.php @@ -6,13 +6,13 @@ function auto_redir(App $a, $contact_nick) { // prevent looping - if(x($_REQUEST,'redir') && intval($_REQUEST['redir'])) + if (x($_REQUEST,'redir') && intval($_REQUEST['redir'])) return; - if((! $contact_nick) || ($contact_nick === $a->user['nickname'])) + if ((! $contact_nick) || ($contact_nick === $a->user['nickname'])) return; - if(local_user()) { + if (local_user()) { // We need to find out if $contact_nick is a user on this hub, and if so, if I // am a contact of that user. However, that user may have other contacts with the @@ -24,7 +24,7 @@ function auto_redir(App $a, $contact_nick) { $baseurl = App::get_baseurl(); $domain_st = strpos($baseurl, "://"); - if($domain_st === false) + if ($domain_st === false) return; $baseurl = substr($baseurl, $domain_st + 3); $nurl = normalise_link($baseurl); @@ -58,11 +58,11 @@ function auto_redir(App $a, $contact_nick) { $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']); - if($r[0]['duplex'] && $r[0]['issued-id']) { + if ($r[0]['duplex'] && $r[0]['issued-id']) { $orig_id = $r[0]['issued-id']; $dfrn_id = '1:' . $orig_id; } - if($r[0]['duplex'] && $r[0]['dfrn-id']) { + if ($r[0]['duplex'] && $r[0]['dfrn-id']) { $orig_id = $r[0]['dfrn-id']; $dfrn_id = '0:' . $orig_id; } @@ -70,7 +70,7 @@ function auto_redir(App $a, $contact_nick) { // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues - if(strlen($dfrn_id) < 3) + if (strlen($dfrn_id) < 3) return; $sec = random_string(); diff --git a/include/salmon.php b/include/salmon.php index 6e08d0aaf2..6675849ce4 100644 --- a/include/salmon.php +++ b/include/salmon.php @@ -170,11 +170,14 @@ function slapper($owner, $url, $slap) { } logger('slapper for '.$url.' returned ' . $return_code); + if (! $return_code) { - return(-1); + return -1; } + if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) { - return(-1); + return -1; } + return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1); } diff --git a/include/security.php b/include/security.php index 09ac03c35e..ac462d1df1 100644 --- a/include/security.php +++ b/include/security.php @@ -56,58 +56,65 @@ function authenticate_success($user_record, $login_initial = false, $interactive $a->user = $user_record; - if($interactive) { + if ($interactive) { if ($a->user['login_date'] <= NULL_DATE) { $_SESSION['return_url'] = 'profile_photo/new'; $a->module = 'profile_photo'; info( t("Welcome ") . $a->user['username'] . EOL); info( t('Please upload a profile photo.') . EOL); - } - else + } else { info( t("Welcome back ") . $a->user['username'] . EOL); + } } $member_since = strtotime($a->user['register_date']); - if(time() < ($member_since + ( 60 * 60 * 24 * 14))) + if (time() < ($member_since + ( 60 * 60 * 24 * 14))) { $_SESSION['new_member'] = true; - else + } else { $_SESSION['new_member'] = false; - if(strlen($a->user['timezone'])) { + } + if (strlen($a->user['timezone'])) { date_default_timezone_set($a->user['timezone']); $a->timezone = $a->user['timezone']; } $master_record = $a->user; - if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { - $r = q("select * from user where uid = %d limit 1", + if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) { + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($_SESSION['submanage']) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $master_record = $r[0]; + } } $r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ", dbesc($master_record['password']), dbesc($master_record['email']) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $a->identities = $r; - else + } else { $a->identities = array(); + } - $r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname` - from manage INNER JOIN user on manage.mid = user.uid where `user`.`account_removed` = 0 - and `manage`.`uid` = %d", + $r = q("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname` + FROM `manage` + INNER JOIN `user` ON `manage`.`mid` = `user`.`uid` + WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = %d", intval($master_record['uid']) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $a->identities = array_merge($a->identities,$r); + } - if($login_initial) + if ($login_initial) { logger('auth_identities: ' . print_r($a->identities,true), LOGGER_DEBUG); - if($login_refresh) + } + if ($login_refresh) { logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG); + } $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($_SESSION['uid'])); @@ -119,7 +126,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"'); - if($login_initial || $login_refresh) { + if ($login_initial || $login_refresh) { q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d", dbesc(datetime_convert()), @@ -249,7 +256,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { * Profile owner - everything is visible */ - if(($local_user) && ($local_user == $owner_id)) { + if (($local_user) && ($local_user == $owner_id)) { $sql = ''; } @@ -261,9 +268,9 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { * done this and passed the groups into this function. */ - elseif($remote_user) { + elseif ($remote_user) { - if(! $remote_verified) { + if (! $remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", intval($remote_user), intval($owner_id) @@ -273,12 +280,12 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { $groups = init_groups_visitor($remote_user); } } - if($remote_verified) { + if ($remote_verified) { $gs = '<<>>'; // should be impossible to match - if(is_array($groups) && count($groups)) { - foreach($groups as $g) + if (is_array($groups) && count($groups)) { + foreach ($groups as $g) $gs .= '|<' . intval($g) . '>'; } @@ -331,7 +338,7 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) * Profile owner - everything is visible */ - if($local_user && ($local_user == $owner_id)) { + if ($local_user && ($local_user == $owner_id)) { $sql = ''; } @@ -343,9 +350,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) * done this and passed the groups into this function. */ - elseif($remote_user) { + elseif ($remote_user) { - if(! $remote_verified) { + if (! $remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", intval($remote_user), intval($owner_id) @@ -355,12 +362,12 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) $groups = init_groups_visitor($remote_user); } } - if($remote_verified) { + if ($remote_verified) { $gs = '<<>>'; // should be impossible to match - if(is_array($groups) && count($groups)) { - foreach($groups as $g) + if (is_array($groups) && count($groups)) { + foreach ($groups as $g) $gs .= '|<' . intval($g) . '>'; } @@ -454,7 +461,7 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f // DFRN contact. They are *not* neccessarily unique across the entire site. -if(! function_exists('init_groups_visitor')) { +if (! function_exists('init_groups_visitor')) { function init_groups_visitor($contact_id) { $groups = array(); $r = q("SELECT `gid` FROM `group_member` @@ -462,9 +469,8 @@ function init_groups_visitor($contact_id) { intval($contact_id) ); if (dbm::is_result($r)) { - foreach($r as $rr) + foreach ($r as $rr) $groups[] = $rr['gid']; } return $groups; }} - diff --git a/include/socgraph.php b/include/socgraph.php index fbac08cc97..ec78310769 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -53,8 +53,8 @@ function poco_load($cid, $uid = 0, $zcid = 0, $url = null) { function poco_load_worker($cid, $uid, $zcid, $url) { $a = get_app(); - if($cid) { - if((! $url) || (! $uid)) { + if ($cid) { + if ((! $url) || (! $uid)) { $r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1", intval($cid) ); @@ -63,11 +63,11 @@ function poco_load_worker($cid, $uid, $zcid, $url) { $uid = $r[0]['uid']; } } - if(! $uid) + if (! $uid) return; } - if(! $url) + if (! $url) return; $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ; @@ -80,18 +80,18 @@ function poco_load_worker($cid, $uid, $zcid, $url) { logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG); - if(($a->get_curl_code() > 299) || (! $s)) + if (($a->get_curl_code() > 299) || (! $s)) return; $j = json_decode($s); logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA); - if(! isset($j->entry)) + if (! isset($j->entry)) return; $total = 0; - foreach($j->entry as $entry) { + foreach ($j->entry as $entry) { $total ++; $profile_url = ''; @@ -155,7 +155,7 @@ function poco_load_worker($cid, $uid, $zcid, $url) { } if (isset($entry->tags)) { - foreach($entry->tags as $tag) { + foreach ($entry->tags as $tag) { $keywords = implode(", ", $tag); } } @@ -374,11 +374,13 @@ function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) { function poco_reachable($profile, $server = "", $network = "", $force = false) { - if ($server == "") + if ($server == "") { $server = poco_detect_server($profile); + } - if ($server == "") + if ($server == "") { return true; + } return poco_check_server($server, $network, $force); } @@ -1083,10 +1085,10 @@ function poco_check_server($server_url, $network = "", $force = false) { } $lines = explode("\n",$serverret["header"]); - if(count($lines)) { + if (count($lines)) { foreach($lines as $line) { $line = trim($line); - if(stristr($line,'X-Diaspora-Version:')) { + if (stristr($line,'X-Diaspora-Version:')) { $platform = "Diaspora"; $version = trim(str_replace("X-Diaspora-Version:", "", $line)); $version = trim(str_replace("x-diaspora-version:", "", $version)); @@ -1095,7 +1097,7 @@ function poco_check_server($server_url, $network = "", $force = false) { $version = $versionparts[0]; } - if(stristr($line,'Server: Mastodon')) { + if (stristr($line,'Server: Mastodon')) { $platform = "Mastodon"; $network = NETWORK_OSTATUS; } @@ -1165,10 +1167,11 @@ function poco_check_server($server_url, $network = "", $force = false) { $network = NETWORK_DIASPORA; } if (isset($data->site->redmatrix)) { - if (isset($data->site->redmatrix->PLATFORM_NAME)) + if (isset($data->site->redmatrix->PLATFORM_NAME)) { $platform = $data->site->redmatrix->PLATFORM_NAME; - elseif (isset($data->site->redmatrix->RED_PLATFORM)) + } elseif (isset($data->site->redmatrix->RED_PLATFORM)) { $platform = $data->site->redmatrix->RED_PLATFORM; + } $version = $data->site->redmatrix->RED_VERSION; $network = NETWORK_DIASPORA; @@ -1185,12 +1188,13 @@ function poco_check_server($server_url, $network = "", $force = false) { $data->site->private = poco_to_boolean($data->site->private); $data->site->inviteonly = poco_to_boolean($data->site->inviteonly); - if (!$data->site->closed AND !$data->site->private and $data->site->inviteonly) + if (!$data->site->closed AND !$data->site->private and $data->site->inviteonly) { $register_policy = REGISTER_APPROVE; - elseif (!$data->site->closed AND !$data->site->private) + } elseif (!$data->site->closed AND !$data->site->private) { $register_policy = REGISTER_OPEN; - else + } else { $register_policy = REGISTER_CLOSED; + } } } } @@ -1254,8 +1258,9 @@ function poco_check_server($server_url, $network = "", $force = false) { if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) { $serverret = z_fetch_url($server_url."/friendica/json"); - if (!$serverret["success"]) + if (!$serverret["success"]) { $serverret = z_fetch_url($server_url."/friendika/json"); + } if ($serverret["success"]) { $data = json_decode($serverret["body"]); @@ -1299,7 +1304,7 @@ function poco_check_server($server_url, $network = "", $force = false) { if (($last_contact <= $last_failure) AND !$failure) { logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG); - } else if (($last_contact >= $last_failure) AND $failure) { + } elseif (($last_contact >= $last_failure) AND $failure) { logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG); } @@ -1374,10 +1379,11 @@ function count_common_friends($uid,$cid) { function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) { - if($shuffle) + if ($shuffle) { $sql_extra = " order by rand() "; - else + } else { $sql_extra = " order by `gcontact`.`name` asc "; + } $r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid` FROM `glink` @@ -1396,6 +1402,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) { intval($limit) ); + /// @TODO Check all calling-findings of this function if they properly use dbm::is_result() return $r; } @@ -1419,7 +1426,7 @@ function count_common_friends_zcid($uid,$zcid) { function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) { - if($shuffle) + if ($shuffle) $sql_extra = " order by rand() "; else $sql_extra = " order by `gcontact`.`name` asc "; @@ -1435,6 +1442,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal intval($limit) ); + /// @TODO Check all calling-findings of this function if they properly use dbm::is_result() return $r; } @@ -1450,8 +1458,9 @@ function count_all_friends($uid,$cid) { intval($uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { return $r[0]['total']; + } return 0; } @@ -1473,6 +1482,7 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) { intval($limit) ); + /// @TODO Check all calling-findings of this function if they properly use dbm::is_result() return $r; } @@ -1493,11 +1503,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) { $network = array(NETWORK_DFRN); - if (get_config('system','diaspora_enabled')) + if (get_config('system','diaspora_enabled')) { $network[] = NETWORK_DIASPORA; + } - if (!get_config('system','ostatus_disabled')) + if (!get_config('system','ostatus_disabled')) { $network[] = NETWORK_OSTATUS; + } $sql_network = implode("', '", $network); $sql_network = "'".$sql_network."'"; @@ -1550,14 +1562,17 @@ function suggestion_query($uid, $start = 0, $limit = 80) { ); $list = array(); - foreach ($r2 AS $suggestion) + foreach ($r2 AS $suggestion) { $list[$suggestion["nurl"]] = $suggestion; + } - foreach ($r AS $suggestion) + foreach ($r AS $suggestion) { $list[$suggestion["nurl"]] = $suggestion; + } - while (sizeof($list) > ($limit)) + while (sizeof($list) > ($limit)) { array_pop($list); + } // Uncommented because the result of the queries are to big to store it in the cache. // We need to decide if we want to change the db column type or if we want to delete it. @@ -1602,8 +1617,9 @@ function update_suggestions() { if (dbm::is_result($r)) { foreach ($r as $rr) { $base = substr($rr['poco'],0,strrpos($rr['poco'],'/')); - if(! in_array($base,$done)) + if (! in_array($base,$done)) { poco_load(0,0,0,$base); + } } } } @@ -1640,8 +1656,9 @@ function poco_discover_federation() { if ($last) { $next = $last + (24 * 60 * 60); - if($next > time()) + if ($next > time()) { return; + } } // Discover Friendica, Hubzilla and Diaspora servers @@ -1785,18 +1802,20 @@ function poco_discover($complete = false) { function poco_discover_server_users($data, $server) { - if (!isset($data->entry)) + if (!isset($data->entry)) { return; + } foreach ($data->entry AS $entry) { $username = ""; if (isset($entry->urls)) { - foreach($entry->urls as $url) + foreach ($entry->urls as $url) { if ($url->type == 'profile') { $profile_url = $url->value; $urlparts = parse_url($profile_url); $username = end(explode("/", $urlparts["path"])); } + } } if ($username != "") { logger("Fetch contacts for the user ".$username." from the server ".$server["nurl"], LOGGER_DEBUG); @@ -1805,16 +1824,18 @@ function poco_discover_server_users($data, $server) { $url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation"; $retdata = z_fetch_url($url); - if ($retdata["success"]) + if ($retdata["success"]) { poco_discover_server(json_decode($retdata["body"]), 3); + } } } } function poco_discover_server($data, $default_generation = 0) { - if (!isset($data->entry) OR !count($data->entry)) + if (!isset($data->entry) OR !count($data->entry)) { return false; + } $success = false; @@ -1835,7 +1856,7 @@ function poco_discover_server($data, $default_generation = 0) { $name = $entry->displayName; if (isset($entry->urls)) { - foreach($entry->urls as $url) { + foreach ($entry->urls as $url) { if ($url->type == 'profile') { $profile_url = $url->value; continue; @@ -1860,31 +1881,31 @@ function poco_discover_server($data, $default_generation = 0) { $updated = date("Y-m-d H:i:s", strtotime($entry->updated)); } - if(isset($entry->network)) { + if (isset($entry->network)) { $network = $entry->network; } - if(isset($entry->currentLocation)) { + if (isset($entry->currentLocation)) { $location = $entry->currentLocation; } - if(isset($entry->aboutMe)) { + if (isset($entry->aboutMe)) { $about = html2bbcode($entry->aboutMe); } - if(isset($entry->gender)) { + if (isset($entry->gender)) { $gender = $entry->gender; } - if(isset($entry->generation) AND ($entry->generation > 0)) { + if (isset($entry->generation) AND ($entry->generation > 0)) { $generation = ++$entry->generation; } - if(isset($entry->contactType) AND ($entry->contactType >= 0)) { + if (isset($entry->contactType) AND ($entry->contactType >= 0)) { $contact_type = $entry->contactType; } - if(isset($entry->tags)) { + if (isset($entry->tags)) { foreach ($entry->tags as $tag) { $keywords = implode(", ", $tag); } @@ -1930,19 +1951,23 @@ function poco_discover_server($data, $default_generation = 0) { function clean_contact_url($url) { $parts = parse_url($url); - if (!isset($parts["scheme"]) OR !isset($parts["host"])) + if (!isset($parts["scheme"]) OR !isset($parts["host"])) { return $url; + } $new_url = $parts["scheme"]."://".$parts["host"]; - if (isset($parts["port"])) + if (isset($parts["port"])) { $new_url .= ":".$parts["port"]; + } - if (isset($parts["path"])) + if (isset($parts["path"])) { $new_url .= $parts["path"]; + } - if ($new_url != $url) + if ($new_url != $url) { logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".App::callstack(), LOGGER_DEBUG); + } return $new_url; } @@ -1981,24 +2006,28 @@ function get_gcontact_id($contact) { return false; } - if ($contact["network"] == NETWORK_STATUSNET) + /// @TODO backward-compatibility or old-lost code? + if ($contact["network"] == NETWORK_STATUSNET) { $contact["network"] = NETWORK_OSTATUS; + } // All new contacts are hidden by default - if (!isset($contact["hide"])) + if (!isset($contact["hide"])) { $contact["hide"] = true; + } // Replace alternate OStatus user format with the primary one fix_alternate_contact_address($contact); // Remove unwanted parts from the contact url (e.g. "?zrl=...") - if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) + if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { $contact["url"] = clean_contact_url($contact["url"]); + } $r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 2", dbesc(normalise_link($contact["url"]))); - if ($r) { + if (dbm::is_result($r)) { $gcontact_id = $r[0]["id"]; // Update every 90 days @@ -2030,7 +2059,7 @@ function get_gcontact_id($contact) { $r = q("SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2", dbesc(normalise_link($contact["url"]))); - if ($r) { + if (dbm::is_result($r)) { $gcontact_id = $r[0]["id"]; $doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")); @@ -2042,10 +2071,11 @@ function get_gcontact_id($contact) { proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"])); } - if ((dbm::is_result($r)) AND (count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != "")) - q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d", - dbesc(normalise_link($contact["url"])), - intval($gcontact_id)); + if ((dbm::is_result($r)) AND (count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != "")) { + q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d", + dbesc(normalise_link($contact["url"])), + intval($gcontact_id)); + } return $gcontact_id; } @@ -2067,8 +2097,9 @@ function update_gcontact($contact) { $gcontact_id = get_gcontact_id($contact); - if (!$gcontact_id) + if (!$gcontact_id) { return false; + } $r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`, `contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url` @@ -2077,8 +2108,9 @@ function update_gcontact($contact) { // Get all field names $fields = array(); - foreach ($r[0] AS $field => $data) + foreach ($r[0] AS $field => $data) { $fields[$field] = $data; + } unset($fields["url"]); unset($fields["updated"]); @@ -2086,47 +2118,59 @@ function update_gcontact($contact) { // Bugfix: We had an error in the storing of keywords which lead to the "0" // This value is still transmitted via poco. - if ($contact["keywords"] == "0") + if ($contact["keywords"] == "0") { unset($contact["keywords"]); + } - if ($r[0]["keywords"] == "0") + if ($r[0]["keywords"] == "0") { $r[0]["keywords"] = ""; + } // assign all unassigned fields from the database entry - foreach ($fields AS $field => $data) - if (!isset($contact[$field]) OR ($contact[$field] == "")) + foreach ($fields AS $field => $data) { + if (!isset($contact[$field]) OR ($contact[$field] == "")) { $contact[$field] = $r[0][$field]; + } + } - if (!isset($contact["hide"])) + if (!isset($contact["hide"])) { $contact["hide"] = $r[0]["hide"]; + } $fields["hide"] = $r[0]["hide"]; - if ($contact["network"] == NETWORK_STATUSNET) + /// @TODO backward-compatibility or old-lost code? + if ($contact["network"] == NETWORK_STATUSNET) { $contact["network"] = NETWORK_OSTATUS; + } // Replace alternate OStatus user format with the primary one fix_alternate_contact_address($contact); - if (!isset($contact["updated"])) + if (!isset($contact["updated"])) { $contact["updated"] = dbm::date(); + } if ($contact["server_url"] == "") { $server_url = $contact["url"]; $server_url = matching_url($server_url, $contact["alias"]); - if ($server_url != "") + if ($server_url != "") { $contact["server_url"] = $server_url; + } $server_url = matching_url($server_url, $contact["photo"]); - if ($server_url != "") + if ($server_url != "") { $contact["server_url"] = $server_url; + } $server_url = matching_url($server_url, $contact["notify"]); - if ($server_url != "") + if ($server_url != "") { $contact["server_url"] = $server_url; - } else + } + } else { $contact["server_url"] = normalise_link($contact["server_url"]); + } if (($contact["addr"] == "") AND ($contact["server_url"] != "") AND ($contact["nick"] != "")) { $hostname = str_replace("http://", "", $contact["server_url"]); @@ -2138,11 +2182,12 @@ function update_gcontact($contact) { unset($fields["generation"]); if ((($contact["generation"] > 0) AND ($contact["generation"] <= $r[0]["generation"])) OR ($r[0]["generation"] == 0)) { - foreach ($fields AS $field => $data) + foreach ($fields AS $field => $data) { if ($contact[$field] != $r[0][$field]) { logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG); $update = true; } + } if ($contact["generation"] < $r[0]["generation"]) { logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$r[0]["generation"]."'", LOGGER_DEBUG); @@ -2174,7 +2219,7 @@ function update_gcontact($contact) { $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1", dbesc(normalise_link($contact["url"]))); - if ($r) { + if (dbm::is_result($r)) { logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG); update_contact_avatar($contact["photo"], 0, $r[0]["id"]); diff --git a/include/tags.php b/include/tags.php index 6067f3f4b9..c82c6a09b4 100644 --- a/include/tags.php +++ b/include/tags.php @@ -58,10 +58,10 @@ function create_tags_from_item($itemid) { if (substr(trim($tag), 0, 1) == "#") { // try to ignore #039 or #1 or anything like that - if(ctype_digit(substr(trim($tag),1))) + if (ctype_digit(substr(trim($tag),1))) continue; // try to ignore html hex escapes, e.g. #x2317 - if((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2))) + if ((substr(trim($tag),1,1) == 'x' || substr(trim($tag),1,1) == 'X') && ctype_digit(substr(trim($tag),2))) continue; $type = TERM_HASHTAG; $term = substr($tag, 1); @@ -107,9 +107,10 @@ function create_tags_from_item($itemid) { function create_tags_from_itemuri($itemuri, $uid) { $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid)); - if(count($messages)) { - foreach ($messages as $message) + if (count($messages)) { + foreach ($messages as $message) { create_tags_from_item($message["id"]); + } } } diff --git a/include/template_processor.php b/include/template_processor.php index 27271e2edb..252375a060 100644 --- a/include/template_processor.php +++ b/include/template_processor.php @@ -69,7 +69,7 @@ class Template implements ITemplateEngine { * {{ if <$var>==<val|$var> }}...[{{ else }} ...]{{ endif }} * {{ if <$var>!=<val|$var> }}...[{{ else }} ...]{{ endif }} */ - private function _replcb_if($args) { + private function _replcb_if ($args) { if (strpos($args[2], "==") > 0) { list($a, $b) = array_map("trim", explode("==", $args[2])); $a = $this->_get_var($a); @@ -95,7 +95,7 @@ class Template implements ITemplateEngine { * {{ for <$var> as $name }}...{{ endfor }} * {{ for <$var> as $key=>$name }}...{{ endfor }} */ - private function _replcb_for($args) { + private function _replcb_for ($args) { $m = array_map('trim', explode(" as ", $args[2])); $x = explode("=>", $m[1]); if (count($x) == 1) { @@ -109,14 +109,16 @@ class Template implements ITemplateEngine { //$vals = $this->r[$m[0]]; $vals = $this->_get_var($m[0]); $ret = ""; - if (!is_array($vals)) + if (!is_array($vals)) { return $ret; + } foreach ($vals as $k => $v) { $this->_push_stack(); $r = $this->r; $r[$varname] = $v; - if ($keyname != '') + if ($keyname != '') { $r[$keyname] = (($k === 0) ? '0' : $k); + } $ret .= $this->replace($args[3], $r); $this->_pop_stack(); } diff --git a/include/text.php b/include/text.php index c9babba940..d904f7cbaa 100644 --- a/include/text.php +++ b/include/text.php @@ -8,7 +8,7 @@ require_once("include/Smilies.php"); require_once("include/map.php"); require_once("mod/proxy.php"); -if(! function_exists('replace_macros')) { +if (! function_exists('replace_macros')) { /** * This is our template processor * @@ -46,7 +46,7 @@ function replace_macros($s,$r) { define('RANDOM_STRING_HEX', 0x00 ); define('RANDOM_STRING_TEXT', 0x01 ); -if(! function_exists('random_string')) { +if (! function_exists('random_string')) { function random_string($size = 64,$type = RANDOM_STRING_HEX) { // generate a bit of entropy and run it through the whirlpool $s = hash('whirlpool', (string) rand() . uniqid(rand(),true) . (string) rand(),(($type == RANDOM_STRING_TEXT) ? true : false)); @@ -54,7 +54,7 @@ function random_string($size = 64,$type = RANDOM_STRING_HEX) { return(substr($s,0,$size)); }} -if(! function_exists('notags')) { +if (! function_exists('notags')) { /** * This is our primary input filter. * @@ -82,7 +82,7 @@ function notags($string) { -if(! function_exists('escape_tags')) { +if (! function_exists('escape_tags')) { /** * use this on "body" or "content" input where angle chars shouldn't be removed, * and allow them to be safely displayed. @@ -98,7 +98,7 @@ function escape_tags($string) { // generate a string that's random, but usually pronounceable. // used to generate initial passwords -if(! function_exists('autoname')) { +if (! function_exists('autoname')) { /** * generate a string that's random, but usually pronounceable. * used to generate initial passwords @@ -107,11 +107,11 @@ if(! function_exists('autoname')) { */ function autoname($len) { - if($len <= 0) + if ($len <= 0) return ''; $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); - if(mt_rand(0,5) == 4) + if (mt_rand(0,5) == 4) $vowels[] = 'y'; $cons = array( @@ -144,7 +144,7 @@ function autoname($len) { 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'); $start = mt_rand(0,2); - if($start == 0) + if ($start == 0) $table = $vowels; else $table = $cons; @@ -155,7 +155,7 @@ function autoname($len) { $r = mt_rand(0,count($table) - 1); $word .= $table[$r]; - if($table == $vowels) + if ($table == $vowels) $table = array_merge($cons,$midcons); else $table = $vowels; @@ -164,13 +164,13 @@ function autoname($len) { $word = substr($word,0,$len); - foreach($noend as $noe) { - if((strlen($word) > 2) && (substr($word,-2) == $noe)) { + foreach ($noend as $noe) { + if ((strlen($word) > 2) && (substr($word,-2) == $noe)) { $word = substr($word,0,-1); break; } } - if(substr($word,-1) == 'q') + if (substr($word,-1) == 'q') $word = substr($word,0,-1); return $word; }} @@ -179,7 +179,7 @@ function autoname($len) { // escape text ($str) for XML transport // returns escaped text. -if(! function_exists('xmlify')) { +if (! function_exists('xmlify')) { /** * escape text ($str) for XML transport * @param string $str @@ -189,7 +189,7 @@ function xmlify($str) { /* $buffer = ''; $len = mb_strlen($str); - for($x = 0; $x < $len; $x ++) { + for ($x = 0; $x < $len; $x ++) { $char = mb_substr($str,$x,1); switch( $char ) { @@ -232,7 +232,7 @@ function xmlify($str) { return($buffer); }} -if(! function_exists('unxmlify')) { +if (! function_exists('unxmlify')) { /** * undo an xmlify * @param string $s xml escaped text @@ -251,17 +251,17 @@ function unxmlify($s) { return $ret; }} -if(! function_exists('hex2bin')) { +if (! function_exists('hex2bin')) { /** * convenience wrapper, reverse the operation "bin2hex" * @param string $s * @return number */ function hex2bin($s) { - if(! (is_string($s) && strlen($s))) + if (! (is_string($s) && strlen($s))) return ''; - if(! ctype_xdigit($s)) { + if (! ctype_xdigit($s)) { return($s); } @@ -354,7 +354,7 @@ function paginate_data(App $a, $count = null) { return $data; } -if(! function_exists('paginate')) { +if (! function_exists('paginate')) { /** * Automatic pagination. * @@ -378,7 +378,7 @@ function paginate(App $a) { }} -if(! function_exists('alt_pager')) { +if (! function_exists('alt_pager')) { /** * Alternative pager * @param App $a App instance @@ -393,7 +393,7 @@ function alt_pager(App $a, $i) { }} -if(! function_exists('scroll_loader')) { +if (! function_exists('scroll_loader')) { /** * Loader for infinite scrolling * @return string html for loader @@ -406,7 +406,7 @@ function scroll_loader() { )); }} -if(! function_exists('expand_acl')) { +if (! function_exists('expand_acl')) { /** * Turn user/group ACLs stored as angle bracketed text into arrays * @@ -418,31 +418,31 @@ function expand_acl($s) { // e.g. "<1><2><3>" => array(1,2,3); $ret = array(); - if(strlen($s)) { + if (strlen($s)) { $t = str_replace('<','',$s); $a = explode('>',$t); - foreach($a as $aa) { - if(intval($aa)) + foreach ($a as $aa) { + if (intval($aa)) $ret[] = intval($aa); } } return $ret; }} -if(! function_exists('sanitise_acl')) { +if (! function_exists('sanitise_acl')) { /** * Wrap ACL elements in angle brackets for storage * @param string $item */ function sanitise_acl(&$item) { - if(intval($item)) + if (intval($item)) $item = '<' . intval(notags(trim($item))) . '>'; else unset($item); }} -if(! function_exists('perms2str')) { +if (! function_exists('perms2str')) { /** * Convert an ACL array to a storable string * @@ -454,12 +454,12 @@ if(! function_exists('perms2str')) { */ function perms2str($p) { $ret = ''; - if(is_array($p)) + if (is_array($p)) $tmp = $p; else $tmp = explode(',',$p); - if(is_array($tmp)) { + if (is_array($tmp)) { array_walk($tmp,'sanitise_acl'); $ret = implode('',$tmp); } @@ -467,7 +467,7 @@ function perms2str($p) { }} -if(! function_exists('item_new_uri')) { +if (! function_exists('item_new_uri')) { /** * generate a guaranteed unique (for this domain) item ID for ATOM * safe from birthday paradox @@ -494,14 +494,14 @@ function item_new_uri($hostname,$uid, $guid = "") { dbesc($uri)); if (dbm::is_result($r)) $dups = true; - } while($dups == true); + } while ($dups == true); return $uri; }} // Generate a guaranteed unique photo ID. // safe from birthday paradox -if(! function_exists('photo_new_resource')) { +if (! function_exists('photo_new_resource')) { /** * Generate a guaranteed unique photo ID. * safe from birthday paradox @@ -518,12 +518,12 @@ function photo_new_resource() { ); if (dbm::is_result($r)) $found = true; - } while($found == true); + } while ($found == true); return $resource; }} -if(! function_exists('load_view_file')) { +if (! function_exists('load_view_file')) { /** * @deprecated * wrapper to load a view template, checking for alternate @@ -536,11 +536,11 @@ if(! function_exists('load_view_file')) { */ function load_view_file($s) { global $lang, $a; - if(! isset($lang)) + if (! isset($lang)) $lang = 'en'; $b = basename($s); $d = dirname($s); - if(file_exists("$d/$lang/$b")) { + if (file_exists("$d/$lang/$b")) { $stamp1 = microtime(true); $content = file_get_contents("$d/$lang/$b"); $a->save_timestamp($stamp1, "file"); @@ -549,7 +549,7 @@ function load_view_file($s) { $theme = current_theme(); - if(file_exists("$d/theme/$theme/$b")) { + if (file_exists("$d/theme/$theme/$b")) { $stamp1 = microtime(true); $content = file_get_contents("$d/theme/$theme/$b"); $a->save_timestamp($stamp1, "file"); @@ -562,7 +562,7 @@ function load_view_file($s) { return $content; }} -if(! function_exists('get_intltext_template')) { +if (! function_exists('get_intltext_template')) { /** * load a view template, checking for alternate * languages before falling back to the default @@ -576,18 +576,18 @@ function get_intltext_template($s) { $a = get_app(); $engine = ''; - if($a->theme['template_engine'] === 'smarty3') + if ($a->theme['template_engine'] === 'smarty3') $engine = "/smarty3"; - if(! isset($lang)) + if (! isset($lang)) $lang = 'en'; - if(file_exists("view/lang/$lang$engine/$s")) { + if (file_exists("view/lang/$lang$engine/$s")) { $stamp1 = microtime(true); $content = file_get_contents("view/lang/$lang$engine/$s"); $a->save_timestamp($stamp1, "file"); return $content; - } elseif(file_exists("view/lang/en$engine/$s")) { + } elseif (file_exists("view/lang/en$engine/$s")) { $stamp1 = microtime(true); $content = file_get_contents("view/lang/en$engine/$s"); $a->save_timestamp($stamp1, "file"); @@ -600,7 +600,7 @@ function get_intltext_template($s) { } }} -if(! function_exists('get_markup_template')) { +if (! function_exists('get_markup_template')) { /** * load template $s * @@ -624,7 +624,7 @@ function get_markup_template($s, $root = '') { return $template; }} -if(! function_exists("get_template_file")) { +if (! function_exists("get_template_file")) { /** * * @param App $a @@ -636,10 +636,10 @@ function get_template_file($a, $filename, $root = '') { $theme = current_theme(); // Make sure $root ends with a slash / - if($root !== '' && $root[strlen($root)-1] !== '/') + if ($root !== '' && $root[strlen($root)-1] !== '/') $root = $root . '/'; - if(file_exists("{$root}view/theme/$theme/$filename")) + if (file_exists("{$root}view/theme/$theme/$filename")) $template_file = "{$root}view/theme/$theme/$filename"; elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename")) $template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename"; @@ -657,7 +657,7 @@ function get_template_file($a, $filename, $root = '') { -if(! function_exists('attribute_contains')) { +if (! function_exists('attribute_contains')) { /** * for html,xml parsing - let's say you've got * an attribute foobar="class1 class2 class3" @@ -674,7 +674,7 @@ if(! function_exists('attribute_contains')) { */ function attribute_contains($attr,$s) { $a = explode(' ', $attr); - if(count($a) && in_array($s,$a)) + if (count($a) && in_array($s,$a)) return true; return false; }} @@ -821,7 +821,7 @@ function dlogger($msg, $level = 0) { $a->save_timestamp($stamp1, "file"); } -if(! function_exists('activity_match')) { +if (! function_exists('activity_match')) { /** * Compare activity uri. Knows about activity namespace. * @@ -830,7 +830,7 @@ if(! function_exists('activity_match')) { * @return boolean */ function activity_match($haystack,$needle) { - if(($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) + if (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) return true; return false; }} @@ -884,7 +884,7 @@ function get_tags($string) { // and #hash tags. if (preg_match_all('/([!#@][^\^ \x0D\x0A,;:?]+)([ \x0D\x0A,;:?]|$)/', $string, $matches)) { - foreach($matches[1] as $match) { + foreach ($matches[1] as $match) { if (strstr($match, ']')) { // we might be inside a bbcode color tag - leave it alone continue; @@ -909,7 +909,7 @@ function get_tags($string) { // -if(! function_exists('qp')) { +if (! function_exists('qp')) { /** * quick and dirty quoted_printable encoding * @@ -920,7 +920,7 @@ function qp($s) { return str_replace ("%","=",rawurlencode($s)); }} -if(! function_exists('contact_block')) { +if (! function_exists('contact_block')) { /** * Get html for contact block. * @@ -933,12 +933,12 @@ function contact_block() { $a = get_app(); $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); - if($shown === false) + if ($shown === false) $shown = 24; - if($shown == 0) + if ($shown == 0) return; - if((! is_array($a->profile)) || ($a->profile['hide-friends'])) + if ((! is_array($a->profile)) || ($a->profile['hide-friends'])) return $o; $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` @@ -952,7 +952,7 @@ function contact_block() { if (dbm::is_result($r)) { $total = intval($r[0]['total']); } - if(! $total) { + if (! $total) { $contacts = t('No contacts'); $micropro = Null; @@ -1031,10 +1031,10 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $sparkle = ''; $redir = false; - if($redirect) { + if ($redirect) { $a = get_app(); $redirect_url = 'redir/' . $contact['id']; - if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) { + if (local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) { $redir = true; $url = $redirect_url; $sparkle = ' sparkle'; @@ -1044,7 +1044,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { } // If there is some js available we don't need the url - if(x($contact,'click')) + if (x($contact,'click')) $url = ''; return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( @@ -1062,7 +1062,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { -if(! function_exists('search')) { +if (! function_exists('search')) { /** * search box * @@ -1097,7 +1097,7 @@ function search($s,$id='search-box',$url='search',$save = false, $aside = true) return replace_macros(get_markup_template('searchbox.tpl'), $values); }} -if(! function_exists('valid_email')) { +if (! function_exists('valid_email')) { /** * Check if $x is a valid email string * @@ -1107,16 +1107,16 @@ if(! function_exists('valid_email')) { function valid_email($x){ // Removed because Fabio told me so. - //if(get_config('system','disable_email_validation')) + //if (get_config('system','disable_email_validation')) // return true; - if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) + if (preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) return true; return false; }} -if(! function_exists('linkify')) { +if (! function_exists('linkify')) { /** * Replace naked text hyperlink with HTML formatted hyperlink * @@ -1187,7 +1187,7 @@ function get_mood_verbs() { return $arr; } -if(! function_exists('day_translate')) { +if (! function_exists('day_translate')) { /** * Translate days and months names * @@ -1207,7 +1207,7 @@ function day_translate($s) { }} -if(! function_exists('normalise_link')) { +if (! function_exists('normalise_link')) { /** * Normalize url * @@ -1221,7 +1221,7 @@ function normalise_link($url) { -if(! function_exists('link_compare')) { +if (! function_exists('link_compare')) { /** * Compare two URLs to see if they are the same, but ignore * slight but hopefully insignificant differences such as if one @@ -1234,7 +1234,7 @@ if(! function_exists('link_compare')) { * */ function link_compare($a,$b) { - if(strcasecmp(normalise_link($a),normalise_link($b)) === 0) + if (strcasecmp(normalise_link($a),normalise_link($b)) === 0) return true; return false; }} @@ -1289,7 +1289,7 @@ function put_item_in_cache(&$item, $update = false) { // Given an item array, convert the body element from bbcode to html and add smilie icons. // If attach is true, also add icons for item attachments -if(! function_exists('prepare_body')) { +if (! function_exists('prepare_body')) { /** * Given an item array, convert the body element from bbcode to html and add smilie icons. * If attach is true, also add icons for item attachments @@ -1316,7 +1316,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { $taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`", intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION)); - foreach($taglist as $tag) { + foreach ($taglist as $tag) { if ($tag["url"] == "") $tag["url"] = $searchpath.strtolower($tag["term"]); @@ -1350,7 +1350,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { call_hooks('prepare_body', $prep_arr); $s = $prep_arr['html']; - if(! $attach) { + if (! $attach) { // Replace the blockquotes with quotes that are used in mails $mailquote = '<blockquote type="cite" class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">'; $s = str_replace(array('<blockquote>', '<blockquote class="spoiler">', '<blockquote class="author">'), array($mailquote, $mailquote, $mailquote), $s); @@ -1360,23 +1360,23 @@ function prepare_body(&$item,$attach = false, $preview = false) { $as = ''; $vhead = false; $arr = explode('[/attach],',$item['attach']); - if(count($arr)) { + if (count($arr)) { $as .= '<div class="body-attach">'; - foreach($arr as $r) { + foreach ($arr as $r) { $matches = false; $icon = ''; $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches, PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { + if ($cnt) { + foreach ($matches as $mtch) { $mime = $mtch[3]; - if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) + if ((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) $the_url = 'redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1]; else $the_url = $mtch[1]; - if(strpos($mime, 'video') !== false) { - if(!$vhead) { + if (strpos($mime, 'video') !== false) { + if (!$vhead) { $vhead = true; $a->page['htmlhead'] .= replace_macros(get_markup_template('videos_head.tpl'), array( '$baseurl' => z_root(), @@ -1398,7 +1398,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { } $filetype = strtolower(substr( $mime, 0, strpos($mime,'/') )); - if($filetype) { + if ($filetype) { $filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 )); $filesubtype = str_replace('.', '-', $filesubtype); } @@ -1433,7 +1433,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { $s = $s . $as; // map - if(strpos($s,'<div class="map">') !== false && $item['coord']) { + if (strpos($s,'<div class="map">') !== false && $item['coord']) { $x = generate_map(trim($item['coord'])); if ($x) { $s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s); @@ -1485,7 +1485,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { }} -if(! function_exists('prepare_text')) { +if (! function_exists('prepare_text')) { /** * Given a text string, convert from bbcode to html and add smilie icons. * @@ -1496,7 +1496,7 @@ function prepare_text($text) { require_once('include/bbcode.php'); - if(stristr($text,'[nosmile]')) + if (stristr($text,'[nosmile]')) $s = bbcode($text); else $s = Smilies::replace(bbcode($text)); @@ -1541,8 +1541,8 @@ function get_cats_and_terms($item) { $matches = false; $first = true; $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { + if ($cnt) { + foreach ($matches as $mtch) { $categories[] = array( 'name' => xmlify(file_tag_decode($mtch[1])), 'url' => "#", @@ -1556,11 +1556,11 @@ function get_cats_and_terms($item) { if (count($categories)) $categories[count($categories)-1]['last'] = true; - if(local_user() == $item['uid']) { + if (local_user() == $item['uid']) { $matches = false; $first = true; $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { + if ($cnt) { + foreach ($matches as $mtch) { $folders[] = array( 'name' => xmlify(file_tag_decode($mtch[1])), 'url' => "#", @@ -1578,7 +1578,7 @@ function get_cats_and_terms($item) { return array($categories, $folders); } -if(! function_exists('get_plink')) { +if (! function_exists('get_plink')) { /** * get private link for item * @param array $item @@ -1615,7 +1615,7 @@ function get_plink($item) { return($ret); }} -if(! function_exists('unamp')) { +if (! function_exists('unamp')) { /** * replace html amp entity with amp char * @param string $s @@ -1626,7 +1626,7 @@ function unamp($s) { }} -if(! function_exists('return_bytes')) { +if (! function_exists('return_bytes')) { /** * return number of bytes in size (K, M, G) * @param string $size_str @@ -1651,7 +1651,7 @@ function generate_user_guid() { $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1", dbesc($guid) ); - if(! count($x)) + if (! count($x)) $found = false; } while ($found == true ); return $guid; @@ -1667,7 +1667,7 @@ function base64url_encode($s, $strip_padding = false) { $s = strtr(base64_encode($s),'+/','-_'); - if($strip_padding) + if ($strip_padding) $s = str_replace('=','',$s); return $s; @@ -1679,7 +1679,7 @@ function base64url_encode($s, $strip_padding = false) { */ function base64url_decode($s) { - if(is_array($s)) { + if (is_array($s)) { logger('base64url_decode: illegal input: ' . print_r(debug_backtrace(), true)); return $s; } @@ -1690,11 +1690,11 @@ function base64url_decode($s) { * // Uncomment if you find you need it. * * $l = strlen($s); - * if(! strpos($s,'=')) { + * if (! strpos($s,'=')) { * $m = $l % 4; - * if($m == 2) + * if ($m == 2) * $s .= '=='; - * if($m == 3) + * if ($m == 3) * $s .= '='; * } * @@ -1786,10 +1786,10 @@ function bb_translate_video($s) { $matches = null; $r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER); if ($r) { - foreach($matches as $mtch) { - if((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be'))) + foreach ($matches as $mtch) { + if ((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be'))) $s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s); - elseif(stristr($mtch[1],'vimeo')) + elseif (stristr($mtch[1],'vimeo')) $s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s); } } @@ -1867,13 +1867,13 @@ function reltoabs($text, $base) { * @return string */ function item_post_type($item) { - if(intval($item['event-id'])) + if (intval($item['event-id'])) return t('event'); - if(strlen($item['resource-id'])) + if (strlen($item['resource-id'])) return t('photo'); - if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) + if (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) return t('activity'); - if($item['id'] != $item['parent']) + if ($item['id'] != $item['parent']) return t('comment'); return t('post'); } @@ -1893,7 +1893,7 @@ function file_tag_decode($s) { function file_tag_file_query($table,$s,$type = 'file') { - if($type == 'file') + if ($type == 'file') $str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' ); else $str = preg_quote( '<' . str_replace('%','%%',file_tag_encode($s)) . '>' ); @@ -1903,9 +1903,9 @@ function file_tag_file_query($table,$s,$type = 'file') { // ex. given music,video return <music><video> or [music][video] function file_tag_list_to_file($list,$type = 'file') { $tag_list = ''; - if(strlen($list)) { + if (strlen($list)) { $list_array = explode(",",$list); - if($type == 'file') { + if ($type == 'file') { $lbracket = '['; $rbracket = ']'; } @@ -1914,8 +1914,8 @@ function file_tag_list_to_file($list,$type = 'file') { $rbracket = '>'; } - foreach($list_array as $item) { - if(strlen($item)) { + foreach ($list_array as $item) { + if (strlen($item)) { $tag_list .= $lbracket . file_tag_encode(trim($item)) . $rbracket; } } @@ -1927,15 +1927,15 @@ function file_tag_list_to_file($list,$type = 'file') { function file_tag_file_to_list($file,$type = 'file') { $matches = false; $list = ''; - if($type == 'file') { + if ($type == 'file') { $cnt = preg_match_all('/\[(.*?)\]/',$file,$matches,PREG_SET_ORDER); } else { $cnt = preg_match_all('/<(.*?)>/',$file,$matches,PREG_SET_ORDER); } - if($cnt) { - foreach($matches as $mtch) { - if(strlen($list)) + if ($cnt) { + foreach ($matches as $mtch) { + if (strlen($list)) $list .= ','; $list .= file_tag_decode($mtch[1]); } @@ -1948,15 +1948,15 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { // $file_old - categories previously associated with an item // $file_new - new list of categories for an item - if(! intval($uid)) + if (! intval($uid)) return false; - if($file_old == $file_new) + if ($file_old == $file_new) return true; $saved = get_pconfig($uid,'system','filetags'); - if(strlen($saved)) { - if($type == 'file') { + if (strlen($saved)) { + if ($type == 'file') { $lbracket = '['; $rbracket = ']'; $termtype = TERM_FILE; @@ -1973,8 +1973,8 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { $new_tags = array(); $check_new_tags = explode(",",file_tag_file_to_list($file_new,$type)); - foreach($check_new_tags as $tag) { - if(! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket)) + foreach ($check_new_tags as $tag) { + if (! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket)) $new_tags[] = $tag; } @@ -1984,12 +1984,12 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { $deleted_tags = array(); $check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type)); - foreach($check_deleted_tags as $tag) { - if(! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket)) + foreach ($check_deleted_tags as $tag) { + if (! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket)) $deleted_tags[] = $tag; } - foreach($deleted_tags as $key => $tag) { + foreach ($deleted_tags as $key => $tag) { $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d", dbesc($tag), intval(TERM_OBJ_POST), @@ -2008,13 +2008,13 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { } } - if($saved != $filetags_updated) { + if ($saved != $filetags_updated) { set_pconfig($uid,'system','filetags', $filetags_updated); } return true; } else - if(strlen($file_new)) { + if (strlen($file_new)) { set_pconfig($uid,'system','filetags', $file_new); } return true; @@ -2024,14 +2024,14 @@ function file_tag_save_file($uid,$item,$file) { require_once("include/files.php"); $result = false; - if(! intval($uid)) + if (! intval($uid)) return false; $r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), intval($uid) ); if (dbm::is_result($r)) { - if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) + if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'), intval($item), @@ -2041,7 +2041,7 @@ function file_tag_save_file($uid,$item,$file) { create_files_from_item($item); $saved = get_pconfig($uid,'system','filetags'); - if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']'))) + if ((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']'))) set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']'); info( t('Item filed') ); } @@ -2052,10 +2052,10 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) { require_once("include/files.php"); $result = false; - if(! intval($uid)) + if (! intval($uid)) return false; - if($cat == true) { + if ($cat == true) { $pattern = '<' . file_tag_encode($file) . '>' ; $termtype = TERM_CATEGORY; } else { @@ -2105,8 +2105,8 @@ function normalise_openid($s) { function undo_post_tagging($s) { $matches = null; $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER); - if($cnt) { - foreach($matches as $mtch) { + if ($cnt) { + foreach ($matches as $mtch) { $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s); } } @@ -2120,11 +2120,11 @@ function protect_sprintf($s) { function is_a_date_arg($s) { $i = intval($s); - if($i > 1900) { + if ($i > 1900) { $y = date('Y'); - if($i <= $y+1 && strpos($s,'-') == 4) { + if ($i <= $y+1 && strpos($s,'-') == 4) { $m = intval(substr($s,5)); - if($m > 0 && $m <= 12) + if ($m > 0 && $m <= 12) return true; } } @@ -2228,7 +2228,6 @@ function text_highlight($s, $lang) { $o = $hl->highlight($s); $o = str_replace("\n", '', $o); - if ($tag_added) { $b = substr($o, 0, strpos($o, '<li>')); $e = substr($o, strpos($o, '</li>')); diff --git a/include/threads.php b/include/threads.php index b0ba546840..eacd4ee700 100644 --- a/include/threads.php +++ b/include/threads.php @@ -177,29 +177,34 @@ function add_shadow_entry($itemid) { function update_thread_uri($itemuri, $uid) { $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid)); - if (dbm::is_result($messages)) - foreach ($messages as $message) + if (dbm::is_result($messages)) { + foreach ($messages as $message) { update_thread($message["id"]); + } + } } function update_thread($itemid, $setmention = false) { $items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`, `deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid)); - if (!dbm::is_result($items)) + if (!dbm::is_result($items)) { return; + } $item = $items[0]; - if ($setmention) + if ($setmention) { $item["mention"] = 1; + } $sql = ""; foreach ($item AS $field => $data) if (!in_array($field, array("guid", "title", "body", "rendered-html", "rendered-hash"))) { - if ($sql != "") + if ($sql != "") { $sql .= ", "; + } $sql .= "`".$field."` = '".dbesc($data)."'"; } @@ -211,8 +216,9 @@ function update_thread($itemid, $setmention = false) { // Updating a shadow item entry $items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"])); - if (!$items) + if (!dbm::is_result($items)) { return; + } $result = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d", dbesc($item["title"]), @@ -227,9 +233,11 @@ function update_thread($itemid, $setmention = false) { function delete_thread_uri($itemuri, $uid) { $messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid)); - if(count($messages)) - foreach ($messages as $message) + if (dbm::is_result($messages)) { + foreach ($messages as $message) { delete_thread($message["id"], $itemuri); + } + } } function delete_thread($itemid, $itemuri = "") { From 031d96d93315ae77435239fa2033cf3149fe310d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 15:28:01 +0200 Subject: [PATCH 005/160] improved some comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/diaspora.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 7241607742..03d45b9dfa 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -880,11 +880,14 @@ class Diaspora { if (dbm::is_result($r)) { return $r[0]; } else { - // We haven't found it? - // We use another function for it that will possibly create a contact entry + /* + * Not found yet? Then use another function for it that will + * possibly create a contact entry. + */ $cid = get_contact($handle, $uid); if ($cid > 0) { + /// @TODO Contact-retrival should be encapsulated into an "entity" class like `Contact` $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid)); if (dbm::is_result($r)) { @@ -919,9 +922,11 @@ class Diaspora { */ private static function post_allow($importer, $contact, $is_comment = false) { - // perhaps we were already sharing with this person. Now they're sharing with us. - // That makes us friends. - // Normally this should have handled by getting a request - but this could get lost + /* + * perhaps we were already sharing with this person. Now they're sharing with us. + * That makes us friends. + * Normally this should have handled by getting a request - but this could get lost + */ if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), @@ -944,6 +949,7 @@ class Diaspora { } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) { // That's good return true; + // Is the message a comment for global users? } elseif (($importer["uid"] == 0) || $is_comment) { // Messages for the global users and comments are always accepted return true; From 249065b421ea40e96980e16511c2ace9101abcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 15:31:46 +0200 Subject: [PATCH 006/160] opps, went in again? :-/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/queue.php | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/include/queue.php b/include/queue.php index 3b34ada7f4..3b1e0d90d5 100644 --- a/include/queue.php +++ b/include/queue.php @@ -29,25 +29,6 @@ function queue_run(&$argv, &$argc) { // Handling the pubsubhubbub requests proc_run(PRIORITY_HIGH,'include/pubsubpublish.php'); - $interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval'))); - - // If we are using the worker we don't need a delivery interval - /// @TODO To much get_config() here - if (get_config("system", "worker")) { - $interval = false; - } - - $r = q("select * from deliverq where 1"); - if ($r) { - foreach ($r as $rr) { - logger('queue: deliverq'); - proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']); - if ($interval) { - time_sleep_until(microtime(true) + (float) $interval); - } - } - } - $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); @@ -60,9 +41,10 @@ function queue_run(&$argv, &$argc) { q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY"); } - // For the first 12 hours we'll try to deliver every 15 minutes - // After that, we'll only attempt delivery once per hour. - + /* + * For the first 12 hours we'll try to deliver every 15 minutes + * After that, we'll only attempt delivery once per hour. + */ $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`"); call_hooks('queue_predeliver', $a, $r); From afb430b908f611fa7c692b9c2c15b166d53e74db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 15:40:50 +0200 Subject: [PATCH 007/160] tpzo fixed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/diaspora.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/diaspora.php b/include/diaspora.php index 03d45b9dfa..a1d48c2fbe 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -949,7 +949,7 @@ class Diaspora { } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) { // That's good return true; - // Is the message a comment for global users? + // Is the message a global user or a comment? } elseif (($importer["uid"] == 0) || $is_comment) { // Messages for the global users and comments are always accepted return true; From f55ea4bc83174aff2e12e9a090656c0cd00c6969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 18:02:32 +0200 Subject: [PATCH 008/160] tpzo fixed again ... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/diaspora.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/diaspora.php b/include/diaspora.php index a1d48c2fbe..6ba1806ade 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -887,7 +887,7 @@ class Diaspora { $cid = get_contact($handle, $uid); if ($cid > 0) { - /// @TODO Contact-retrival should be encapsulated into an "entity" class like `Contact` + /// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact` $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid)); if (dbm::is_result($r)) { From 4c2d4934f78542b42feb17d31e52327e1d25f9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 18:05:18 +0200 Subject: [PATCH 009/160] Some CR applied: - removed todo - added explanation - merged next if() block with already merged MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/dba_pdo.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/dba_pdo.php b/include/dba_pdo.php index 40ff09acf0..16f00e88f5 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -145,7 +145,10 @@ class dba { $a->save_timestamp($stamp1, "database"); - /// @TODO really check $a->config for 'system'? it is very generic and should be there + /* + * Check if the configuration group 'system' and db_log is there. The + * extra first check needs to be done to avoid endless loop. + */ if (x($a->config, 'system') && x($a->config['system'], 'db_log') && ($duration > $a->config["system"]["db_loglimit"])) { $duration = round($duration, 3); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); From 0394004fee8c06c333926b2497ae8e9328b96cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 18:09:34 +0200 Subject: [PATCH 010/160] reverted comments, but maintained multi-line comment. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/diaspora.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 6ba1806ade..2e62686020 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -881,8 +881,8 @@ class Diaspora { return $r[0]; } else { /* - * Not found yet? Then use another function for it that will - * possibly create a contact entry. + * We haven't found it? + * We use another function for it that will possibly create a contact entry. */ $cid = get_contact($handle, $uid); @@ -923,7 +923,7 @@ class Diaspora { private static function post_allow($importer, $contact, $is_comment = false) { /* - * perhaps we were already sharing with this person. Now they're sharing with us. + * Perhaps we were already sharing with this person. Now they're sharing with us. * That makes us friends. * Normally this should have handled by getting a request - but this could get lost */ @@ -937,11 +937,11 @@ class Diaspora { logger("defining user ".$contact["nick"]." as friend"); } - // Is this contact wanted? + // We don't seem to like that person if ($contact["blocked"] || $contact["readonly"] || $contact["archive"]) { // Maybe blocked, don't accept. return false; - // Is this person being followed? + // We are following this person? } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) { // Yes, then it is fine. return true; From 11c16f1123940bcde4feca2b2c3070a54bb4c4ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 18:28:00 +0200 Subject: [PATCH 011/160] Continued: - added more curly braces - replaced if (blaFoo()) { return true; } return false; with return blaFoo(); - added spaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/text.php | 288 ++++++++++++++++++++++++++--------------------- 1 file changed, 158 insertions(+), 130 deletions(-) diff --git a/include/text.php b/include/text.php index d904f7cbaa..d1ccb3c96c 100644 --- a/include/text.php +++ b/include/text.php @@ -2,11 +2,11 @@ use Friendica\App; -require_once("include/template_processor.php"); -require_once("include/friendica_smarty.php"); -require_once("include/Smilies.php"); -require_once("include/map.php"); -require_once("mod/proxy.php"); +require_once "include/template_processor.php"; +require_once "include/friendica_smarty.php"; +require_once "include/Smilies.php"; +require_once "include/map.php"; +require_once "mod/proxy.php"; if (! function_exists('replace_macros')) { /** @@ -17,7 +17,7 @@ if (! function_exists('replace_macros')) { * @param array $r key value pairs (search => replace) * @return string substituted string */ -function replace_macros($s,$r) { +function replace_macros($s, $r) { $stamp1 = microtime(true); @@ -26,12 +26,12 @@ function replace_macros($s,$r) { // pass $baseurl to all templates $r['$baseurl'] = App::get_baseurl(); - $t = $a->template_engine(); try { - $output = $t->replace_macros($s,$r); + $output = $t->replace_macros($s, $r); } catch (Exception $e) { - echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme(); + echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>"; + killme(); } $a->save_timestamp($stamp1, "rendering"); @@ -47,10 +47,10 @@ define('RANDOM_STRING_HEX', 0x00 ); define('RANDOM_STRING_TEXT', 0x01 ); if (! function_exists('random_string')) { -function random_string($size = 64,$type = RANDOM_STRING_HEX) { +function random_string($size = 64, $type = RANDOM_STRING_HEX) { // generate a bit of entropy and run it through the whirlpool - $s = hash('whirlpool', (string) rand() . uniqid(rand(),true) . (string) rand(),(($type == RANDOM_STRING_TEXT) ? true : false)); - $s = (($type == RANDOM_STRING_TEXT) ? str_replace("\n","",base64url_encode($s,true)) : $s); + $s = hash('whirlpool', (string) rand() . uniqid(rand(),true) . (string) rand(), (($type == RANDOM_STRING_TEXT) ? true : false)); + $s = (($type == RANDOM_STRING_TEXT) ? str_replace("\n", "", base64url_encode($s,true)) : $s); return(substr($s,0,$size)); }} @@ -73,8 +73,7 @@ if (! function_exists('notags')) { * @return string Filtered string */ function notags($string) { - - return(str_replace(array("<",">"), array('[',']'), $string)); + return str_replace(array("<", ">"), array('[', ']'), $string); // High-bit filter no longer used // return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string)); @@ -90,8 +89,7 @@ if (! function_exists('escape_tags')) { * @return string */ function escape_tags($string) { - - return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false)); + return htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false); }} @@ -107,12 +105,14 @@ if (! function_exists('autoname')) { */ function autoname($len) { - if ($len <= 0) + if ($len <= 0) { return ''; + } $vowels = array('a','a','ai','au','e','e','e','ee','ea','i','ie','o','ou','u'); - if (mt_rand(0,5) == 4) + if (mt_rand(0, 5) == 4) { $vowels[] = 'y'; + } $cons = array( 'b','bl','br', @@ -144,10 +144,11 @@ function autoname($len) { 'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'); $start = mt_rand(0,2); - if ($start == 0) + if ($start == 0) { $table = $vowels; - else + } else { $table = $cons; + } $word = ''; @@ -155,23 +156,25 @@ function autoname($len) { $r = mt_rand(0,count($table) - 1); $word .= $table[$r]; - if ($table == $vowels) + if ($table == $vowels) { $table = array_merge($cons,$midcons); - else + } else { $table = $vowels; + } } $word = substr($word,0,$len); foreach ($noend as $noe) { - if ((strlen($word) > 2) && (substr($word,-2) == $noe)) { - $word = substr($word,0,-1); + if ((strlen($word) > 2) && (substr($word, -2) == $noe)) { + $word = substr($word, 0, -1); break; } } - if (substr($word,-1) == 'q') - $word = substr($word,0,-1); + if (substr($word, -1) == 'q') { + $word = substr($word, 0, -1); + } return $word; }} @@ -186,6 +189,7 @@ if (! function_exists('xmlify')) { * @return string Escaped text. */ function xmlify($str) { + /// @TODO deprecated code found? /* $buffer = ''; $len = mb_strlen($str); @@ -239,6 +243,7 @@ if (! function_exists('unxmlify')) { * @return string unescaped text */ function unxmlify($s) { + /// @TODO deprecated code found? // $ret = str_replace('&','&', $s); // $ret = str_replace(array('<','>','"','''),array('<','>','"',"'"),$ret); /*$ret = mb_ereg_replace('&', '&', $s); @@ -258,14 +263,15 @@ if (! function_exists('hex2bin')) { * @return number */ function hex2bin($s) { - if (! (is_string($s) && strlen($s))) + if (! (is_string($s) && strlen($s))) { return ''; - - if (! ctype_xdigit($s)) { - return($s); } - return(pack("H*",$s)); + if (! ctype_xdigit($s)) { + return $s; + } + + return pack("H*",$s); }} @@ -421,9 +427,10 @@ function expand_acl($s) { if (strlen($s)) { $t = str_replace('<','',$s); $a = explode('>',$t); - foreach ($a as $aa) { - if (intval($aa)) + foreach($a as $aa) { + if (intval($aa)) { $ret[] = intval($aa); + } } } return $ret; @@ -476,14 +483,14 @@ if (! function_exists('item_new_uri')) { * @param int $uid * @return string */ -function item_new_uri($hostname,$uid, $guid = "") { +function item_new_uri($hostname, $uid, $guid = "") { do { $dups = false; - if ($guid == "") + if ($guid == "") { $hash = get_guid(32); - else { + } else { $hash = $guid; $guid = ""; } @@ -492,9 +499,11 @@ function item_new_uri($hostname,$uid, $guid = "") { $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($uri)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { $dups = true; + } } while ($dups == true); + return $uri; }} @@ -516,9 +525,12 @@ function photo_new_resource() { $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", dbesc($resource) ); - if (dbm::is_result($r)) + + if (dbm::is_result($r)) { $found = true; + } } while ($found == true); + return $resource; }} @@ -536,8 +548,9 @@ if (! function_exists('load_view_file')) { */ function load_view_file($s) { global $lang, $a; - if (! isset($lang)) + if (! isset($lang)) { $lang = 'en'; + } $b = basename($s); $d = dirname($s); if (file_exists("$d/$lang/$b")) { @@ -576,11 +589,13 @@ function get_intltext_template($s) { $a = get_app(); $engine = ''; - if ($a->theme['template_engine'] === 'smarty3') + if ($a->theme['template_engine'] === 'smarty3') { $engine = "/smarty3"; + } - if (! isset($lang)) + if (! isset($lang)) { $lang = 'en'; + } if (file_exists("view/lang/$lang$engine/$s")) { $stamp1 = microtime(true); @@ -616,7 +631,8 @@ function get_markup_template($s, $root = '') { try { $template = $t->get_template_file($s, $root); } catch (Exception $e) { - echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme(); + echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>"; + killme(); } $a->save_timestamp($stamp1, "file"); @@ -636,17 +652,19 @@ function get_template_file($a, $filename, $root = '') { $theme = current_theme(); // Make sure $root ends with a slash / - if ($root !== '' && $root[strlen($root)-1] !== '/') + if ($root !== '' && $root[strlen($root) - 1] !== '/') { $root = $root . '/'; + } - if (file_exists("{$root}view/theme/$theme/$filename")) + if (file_exists("{$root}view/theme/$theme/$filename")) { $template_file = "{$root}view/theme/$theme/$filename"; - elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename")) - $template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename"; - elseif (file_exists("{$root}/$filename")) + } elseif (x($a->theme_info, "extends") && file_exists("{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename")) { + $template_file = "{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename"; + } elseif (file_exists("{$root}/$filename")) { $template_file = "{$root}/$filename"; - else + } else { $template_file = "{$root}view/$filename"; + } return $template_file; }} @@ -672,11 +690,9 @@ if (! function_exists('attribute_contains')) { * @param string $s string to search * @return boolean True if found, False otherwise */ -function attribute_contains($attr,$s) { +function attribute_contains($attr, $s) { $a = explode(' ', $attr); - if (count($a) && in_array($s,$a)) - return true; - return false; + return (count($a) && in_array($s,$a)); }} if (! function_exists('logger')) { @@ -830,9 +846,7 @@ if (! function_exists('activity_match')) { * @return boolean */ function activity_match($haystack,$needle) { - if (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle,NAMESPACE_ACTIVITY_SCHEMA))) - return true; - return false; + return (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle, NAMESPACE_ACTIVITY_SCHEMA))); }} @@ -917,7 +931,7 @@ if (! function_exists('qp')) { * @return string */ function qp($s) { -return str_replace ("%","=",rawurlencode($s)); + return str_replace("%", "=", rawurlencode($s)); }} if (! function_exists('contact_block')) { @@ -933,13 +947,16 @@ function contact_block() { $a = get_app(); $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); - if ($shown === false) + if ($shown === false) { $shown = 24; - if ($shown == 0) + } + if ($shown == 0) { return; + } - if ((! is_array($a->profile)) || ($a->profile['hide-friends'])) + if ((! is_array($a->profile)) || ($a->profile['hide-friends'])) { return $o; + } $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `hidden` AND NOT `archive` @@ -954,8 +971,7 @@ function contact_block() { } if (! $total) { $contacts = t('No contacts'); - $micropro = Null; - + $micropro = null; } else { // Splitting the query in two parts makes it much faster $r = q("SELECT `id` FROM `contact` @@ -1024,8 +1040,9 @@ function contact_block() { function micropro($contact, $redirect = false, $class = '', $textmode = false) { // Use the contact URL if no address is available - if ($contact["addr"] == "") + if ($contact["addr"] == "") { $contact["addr"] = $contact["url"]; + } $url = $contact['url']; $sparkle = ''; @@ -1038,14 +1055,15 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { $redir = true; $url = $redirect_url; $sparkle = ' sparkle'; - } - else + } else { $url = zrl($url); + } } // If there is some js available we don't need the url - if (x($contact,'click')) + if (x($contact, 'click')) { $url = ''; + } return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( '$click' => (($contact['click']) ? $contact['click'] : ''), @@ -1071,7 +1089,7 @@ if (! function_exists('search')) { * @param string $url search url * @param boolean $savedsearch show save search button */ -function search($s,$id='search-box',$url='search',$save = false, $aside = true) { +function search($s, $id = 'search-box', $url = 'search', $save = false, $aside = true) { $a = get_app(); $values = array( @@ -1090,8 +1108,9 @@ function search($s,$id='search-box',$url='search',$save = false, $aside = true) t("Tags"), t("Contacts")); - if (get_config('system','poco_local_search')) + if (get_config('system','poco_local_search')) { $values['$searchoption'][] = t("Forums"); + } } return replace_macros(get_markup_template('searchbox.tpl'), $values); @@ -1106,13 +1125,10 @@ if (! function_exists('valid_email')) { */ function valid_email($x){ - // Removed because Fabio told me so. + /// @TODO Removed because Fabio told me so. //if (get_config('system','disable_email_validation')) // return true; - - if (preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x)) - return true; - return false; + return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x); }} @@ -1125,7 +1141,7 @@ if (! function_exists('linkify')) { function linkify($s) { $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' <a href="$1" target="_blank">$1</a>', $s); $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); - return($s); + return $s; }} @@ -1215,8 +1231,8 @@ if (! function_exists('normalise_link')) { * @return string */ function normalise_link($url) { - $ret = str_replace(array('https:','//www.'), array('http:','//'), $url); - return(rtrim($ret,'/')); + $ret = str_replace(array('https:', '//www.'), array('http:', '//'), $url); + return rtrim($ret,'/'); }} @@ -1234,9 +1250,7 @@ if (! function_exists('link_compare')) { * */ function link_compare($a,$b) { - if (strcasecmp(normalise_link($a),normalise_link($b)) === 0) - return true; - return false; + return (strcasecmp(normalise_link($a), normalise_link($b)) === 0); }} /** @@ -1318,8 +1332,9 @@ function prepare_body(&$item,$attach = false, $preview = false) { foreach ($taglist as $tag) { - if ($tag["url"] == "") + if ($tag["url"] == "") { $tag["url"] = $searchpath.strtolower($tag["term"]); + } if ($tag["type"] == TERM_HASHTAG) { $hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>"; @@ -1433,7 +1448,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { $s = $s . $as; // map - if (strpos($s,'<div class="map">') !== false && $item['coord']) { + if (strpos($s, '<div class="map">') !== false && $item['coord']) { $x = generate_map(trim($item['coord'])); if ($x) { $s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s); @@ -1445,37 +1460,36 @@ function prepare_body(&$item,$attach = false, $preview = false) { $spoilersearch = '<blockquote class="spoiler">'; // Remove line breaks before the spoiler - while ((strpos($s, "\n".$spoilersearch) !== false)) - $s = str_replace("\n".$spoilersearch, $spoilersearch, $s); - while ((strpos($s, "<br />".$spoilersearch) !== false)) - $s = str_replace("<br />".$spoilersearch, $spoilersearch, $s); + while ((strpos($s, "\n" . $spoilersearch) !== false)) { + $s = str_replace("\n" . $spoilersearch, $spoilersearch, $s); + } + while ((strpos($s, "<br />" . $spoilersearch) !== false)) { + $s = str_replace("<br />" . $spoilersearch, $spoilersearch, $s); + } while ((strpos($s, $spoilersearch) !== false)) { - $pos = strpos($s, $spoilersearch); $rnd = random_string(8); - $spoilerreplace = '<br /> <span id="spoiler-wrap-'.$rnd.'" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'. - '<blockquote class="spoiler" id="spoiler-'.$rnd.'" style="display: none;">'; - $s = substr($s, 0, $pos).$spoilerreplace.substr($s, $pos+strlen($spoilersearch)); + $spoilerreplace = '<br /> <span id="spoiler-wrap-' . $rnd . '" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-' . $rnd . '\');">' . sprintf(t('Click to open/close')) . '</span>'. + '<blockquote class="spoiler" id="spoiler-' . $rnd . '" style="display: none;">'; + $s = substr($s, 0, $pos) . $spoilerreplace . substr($s, $pos + strlen($spoilersearch)); } // Look for quote with author $authorsearch = '<blockquote class="author">'; while ((strpos($s, $authorsearch) !== false)) { - $pos = strpos($s, $authorsearch); $rnd = random_string(8); - $authorreplace = '<br /> <span id="author-wrap-'.$rnd.'" class="author-wrap fakelink" onclick="openClose(\'author-'.$rnd.'\');">'.sprintf(t('Click to open/close')).'</span>'. - '<blockquote class="author" id="author-'.$rnd.'" style="display: block;">'; - $s = substr($s, 0, $pos).$authorreplace.substr($s, $pos+strlen($authorsearch)); + $authorreplace = '<br /> <span id="author-wrap-' . $rnd . '" class="author-wrap fakelink" onclick="openClose(\'author-' . $rnd . '\');">' . sprintf(t('Click to open/close')) . '</span>'. + '<blockquote class="author" id="author-' . $rnd . '" style="display: block;">'; + $s = substr($s, 0, $pos) . $authorreplace . substr($s, $pos + strlen($authorsearch)); } // replace friendica image url size with theme preference - if (x($a->theme_info,'item_image_size')){ - $ps = $a->theme_info['item_image_size']; - - $s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|',"$1-".$ps, $s); + if (x($a->theme_info, 'item_image_size')){ + $ps = $a->theme_info['item_image_size']; + $s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s); } $prep_arr = array('item' => $item, 'html' => $s); @@ -1494,12 +1508,13 @@ if (! function_exists('prepare_text')) { */ function prepare_text($text) { - require_once('include/bbcode.php'); + require_once 'include/bbcode.php'; - if (stristr($text,'[nosmile]')) + if (stristr($text, '[nosmile]')) { $s = bbcode($text); - else + } else { $s = Smilies::replace(bbcode($text)); + } return trim($s); }} @@ -1553,8 +1568,10 @@ function get_cats_and_terms($item) { $first = false; } } - if (count($categories)) $categories[count($categories)-1]['last'] = true; + if (count($categories)) { + $categories[count($categories) - 1]['last'] = true; + } if (local_user() == $item['uid']) { $matches = false; $first = true; @@ -1564,7 +1581,7 @@ function get_cats_and_terms($item) { $folders[] = array( 'name' => xmlify(file_tag_decode($mtch[1])), 'url' => "#", - 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])):""), + 'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])) : ""), 'first' => $first, 'last' => false ); @@ -1573,7 +1590,9 @@ function get_cats_and_terms($item) { } } - if (count($folders)) $folders[count($folders)-1]['last'] = true; + if (count($folders)) { + $folders[count($folders) - 1]['last'] = true; + } return array($categories, $folders); } @@ -1589,26 +1608,27 @@ function get_plink($item) { if ($a->user['nickname'] != "") { $ret = array( - //'href' => "display/".$a->user['nickname']."/".$item['id'], - 'href' => "display/".$item['guid'], - 'orig' => "display/".$item['guid'], + //'href' => "display/" . $a->user['nickname'] . "/" . $item['id'], + 'href' => "display/" . $item['guid'], + 'orig' => "display/" . $item['guid'], 'title' => t('View on separate page'), 'orig_title' => t('view on separate page'), ); - if (x($item,'plink')) { + if (x($item, 'plink')) { $ret["href"] = $a->remove_baseurl($item['plink']); $ret["title"] = t('link to source'); } - } elseif (x($item,'plink') && ($item['private'] != 1)) + } elseif (x($item, 'plink') && ($item['private'] != 1)) { $ret = array( 'href' => $item['plink'], 'orig' => $item['plink'], 'title' => t('link to source'), ); - else + } else { $ret = array(); + } //if (x($item,'plink') && ($item['private'] != 1)) @@ -1651,9 +1671,11 @@ function generate_user_guid() { $x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1", dbesc($guid) ); - if (! count($x)) + if (! dbm::is_result($x)) { $found = false; + } } while ($found == true ); + return $guid; } @@ -1665,10 +1687,11 @@ function generate_user_guid() { */ function base64url_encode($s, $strip_padding = false) { - $s = strtr(base64_encode($s),'+/','-_'); + $s = strtr(base64_encode($s), '+/', '-_'); - if ($strip_padding) + if ($strip_padding) { $s = str_replace('=','',$s); + } return $s; } @@ -1816,8 +1839,11 @@ function html2bb_video($s) { * @return array */ function array_xmlify($val){ - if (is_bool($val)) return $val?"true":"false"; - if (is_array($val)) return array_map('array_xmlify', $val); + if (is_bool($val)) { + return $val?"true":"false"; + } elseif (is_array($val)) { + return array_map('array_xmlify', $val); + } return xmlify((string) $val); } @@ -1830,8 +1856,9 @@ function array_xmlify($val){ * @return string */ function reltoabs($text, $base) { - if (empty($base)) - return $text; + if (empty($base)) { + return $text; + } $base = rtrim($base,'/'); @@ -1867,14 +1894,16 @@ function reltoabs($text, $base) { * @return string */ function item_post_type($item) { - if (intval($item['event-id'])) + if (intval($item['event-id'])) { return t('event'); - if (strlen($item['resource-id'])) + } elseif (strlen($item['resource-id'])) { return t('photo'); - if (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) + } elseif (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) { return t('activity'); - if ($item['id'] != $item['parent']) + } elseif ($item['id'] != $item['parent']) { return t('comment'); + } + return t('post'); } @@ -2114,7 +2143,7 @@ function undo_post_tagging($s) { } function protect_sprintf($s) { - return(str_replace('%','%%',$s)); + return str_replace('%', '%%', $s); } @@ -2122,7 +2151,7 @@ function is_a_date_arg($s) { $i = intval($s); if ($i > 1900) { $y = date('Y'); - if ($i <= $y+1 && strpos($s,'-') == 4) { + if ($i <= $y + 1 && strpos($s, '-') == 4) { $m = intval(substr($s,5)); if ($m > 0 && $m <= 12) return true; @@ -2211,15 +2240,14 @@ function text_highlight($s, $lang) { $s = trim(html_entity_decode($s, ENT_COMPAT)); $s = str_replace(' ', "\t", $s); - // The highlighter library insists on an opening php tag for php code blocks. If - // it isn't present, nothing is highlighted. So we're going to see if it's present. - // If not, we'll add it, and then quietly remove it after we get the processed output back. - - if ($lang === 'php') { - if (strpos($s, '<?php') !== 0) { - $s = '<?php' . "\n" . $s; - $tag_added = true; - } + /* + * The highlighter library insists on an opening php tag for php code blocks. If + * it isn't present, nothing is highlighted. So we're going to see if it's present. + * If not, we'll add it, and then quietly remove it after we get the processed output back. + */ + if ($lang === 'php' && strpos($s, '<?php') !== 0) { + $s = '<?php' . "\n" . $s; + $tag_added = true; } $renderer = new Text_Highlighter_Renderer_Html($options); From 0e0fb2b1eec8c1aaba00b46f2e60ee151c02da23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 18:34:16 +0200 Subject: [PATCH 012/160] removed TODOs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/socgraph.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index ec78310769..953bd0da78 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -2006,7 +2006,6 @@ function get_gcontact_id($contact) { return false; } - /// @TODO backward-compatibility or old-lost code? if ($contact["network"] == NETWORK_STATUSNET) { $contact["network"] = NETWORK_OSTATUS; } @@ -2139,7 +2138,6 @@ function update_gcontact($contact) { $fields["hide"] = $r[0]["hide"]; - /// @TODO backward-compatibility or old-lost code? if ($contact["network"] == NETWORK_STATUSNET) { $contact["network"] = NETWORK_OSTATUS; } From 98b407218d9954d5dc89615d4bc8a6438c97ebcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 18:37:51 +0200 Subject: [PATCH 013/160] Fixes: - don't do $string[position] anymore, use substr() instead - 'extends' was hanging loose there, rewrote it twice to fix parser error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/text.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index d1ccb3c96c..e8384123c4 100644 --- a/include/text.php +++ b/include/text.php @@ -652,14 +652,14 @@ function get_template_file($a, $filename, $root = '') { $theme = current_theme(); // Make sure $root ends with a slash / - if ($root !== '' && $root[strlen($root) - 1] !== '/') { + if ($root !== '' && substr($root, -1, 1) !== '/') { $root = $root . '/'; } if (file_exists("{$root}view/theme/$theme/$filename")) { $template_file = "{$root}view/theme/$theme/$filename"; - } elseif (x($a->theme_info, "extends") && file_exists("{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename")) { - $template_file = "{$root}view/theme/{$a->theme_info[\"extends\"]}/$filename"; + } elseif (x($a->theme_info, "extends") && file_exists(sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename))) { + $template_file = sprintf('%sview/theme/%s}/%s', $root, $a->theme_info["extends"], $filename); } elseif (file_exists("{$root}/$filename")) { $template_file = "{$root}/$filename"; } else { From b6648215b80e9c31b725efd0457b1e9c5a63094e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Wed, 17 May 2017 18:42:40 +0200 Subject: [PATCH 014/160] Opps, missed them MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/text.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/include/text.php b/include/text.php index e8384123c4..508cf17461 100644 --- a/include/text.php +++ b/include/text.php @@ -442,10 +442,11 @@ if (! function_exists('sanitise_acl')) { * @param string $item */ function sanitise_acl(&$item) { - if (intval($item)) + if (intval($item)) { $item = '<' . intval(notags(trim($item))) . '>'; - else + } else { unset($item); + } }} @@ -461,10 +462,11 @@ if (! function_exists('perms2str')) { */ function perms2str($p) { $ret = ''; - if (is_array($p)) + if (is_array($p)) { $tmp = $p; - else + } else { $tmp = explode(',',$p); + } if (is_array($tmp)) { array_walk($tmp,'sanitise_acl'); @@ -670,11 +672,6 @@ function get_template_file($a, $filename, $root = '') { }} - - - - - if (! function_exists('attribute_contains')) { /** * for html,xml parsing - let's say you've got @@ -1416,8 +1413,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { if ($filetype) { $filesubtype = strtolower(substr( $mime, strpos($mime,'/') + 1 )); $filesubtype = str_replace('.', '-', $filesubtype); - } - else { + } else { $filetype = 'unkn'; $filesubtype = 'unkn'; } From 44efdc3e1b01328a226c79e25834fe7adb2dbaf4 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sat, 20 May 2017 20:02:06 +0000 Subject: [PATCH 015/160] Central item expiration routine for external items --- doc/htconfig.md | 1 + include/dbclean.php | 79 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/doc/htconfig.md b/doc/htconfig.md index b2f7182960..ce0b446def 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -35,6 +35,7 @@ Example: To set the directory value please add this line to your .htconfig.php: * **db_loglimit_index_high** - Number of index rows to be logged anyway (for any index) * **db_log_index_blacklist** - Blacklist of indexes that shouldn't be watched * **dbclean** (Boolean) - Enable the automatic database cleanup process +* **dbclean-expire-days** (Integer) - Days after which remote items will be deleted. Own items, and marked or filed items are kept. * **default_service_class** - * **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker) * **diaspora_test** (Boolean) - For development only. Disables the message transfer. diff --git a/include/dbclean.php b/include/dbclean.php index ff4993c4a0..024b845f7d 100644 --- a/include/dbclean.php +++ b/include/dbclean.php @@ -17,9 +17,14 @@ function dbclean_run(&$argv, &$argc) { $stage = 0; } + // Get the expire days for step 8 and 9 + $days = Config::get('system', 'dbclean-expire-days', 0); + if ($stage == 0) { - for ($i = 1; $i <= 7; $i++) { - if (!Config::get('system', 'finished-dbclean-'.$i, false)) { + for ($i = 1; $i <= 9; $i++) { + // Execute the background script for a step when it isn't finished. + // Execute step 8 and 9 only when $days is defined. + if (!Config::get('system', 'finished-dbclean-'.$i, false) AND (($i < 8) OR ($days > 0))) { proc_run(PRIORITY_LOW, 'include/dbclean.php', $i); } } @@ -39,6 +44,9 @@ function remove_orphans($stage = 0) { // We split the deletion in many small tasks $limit = 1000; + // Get the expire days for step 8 and 9 + $days = Config::get('system', 'dbclean-expire-days', 0); + if ($stage == 1) { $last_id = Config::get('system', 'dbclean-last-id-1', 0); @@ -61,11 +69,6 @@ function remove_orphans($stage = 0) { logger("Done deleting ".$count." old global item entries from item table without user copy. Last ID: ".$last_id); Config::set('system', 'dbclean-last-id-1', $last_id); - - // We will eventually set this value when we found a good way to delete these items in another way. - // if ($count < $limit) { - // Config::set('system', 'finished-dbclean-1', true); - // } } elseif ($stage == 2) { $last_id = Config::get('system', 'dbclean-last-id-2', 0); @@ -216,11 +219,71 @@ function remove_orphans($stage = 0) { if ($count < $limit) { Config::set('system', 'finished-dbclean-7', true); } + } elseif ($stage == 8) { + if ($days <= 0) { + return; + } + + $last_id = Config::get('system', 'dbclean-last-id-8', 0); + + logger("Deleting expired threads. Last ID: ".$last_id); + $r = dba::p("SELECT `thread`.`iid` FROM `thread` + INNER JOIN `contact` ON `thread`.`contact-id` = `contact`.`id` AND NOT `notify_new_posts` + WHERE `thread`.`received` < UTC_TIMESTAMP() - INTERVAL ? DAY + AND NOT `thread`.`mention` AND NOT `thread`.`starred` + AND NOT `thread`.`wall` AND NOT `thread`.`origin` + AND `thread`.`uid` != 0 AND `thread`.`iid` >= ? + AND NOT `thread`.`iid` IN (SELECT `parent` FROM `item` + WHERE (`item`.`starred` OR (`item`.`resource-id` != '') + OR (`item`.`file` != '') OR (`item`.`event-id` != '') + OR (`item`.`attach` != '') OR `item`.`wall` OR `item`.`origin`) + AND `item`.`parent` = `thread`.`iid`) + ORDER BY `thread`.`iid` LIMIT 1000", $days, $last_id); + $count = dba::num_rows($r); + if ($count > 0) { + logger("found expired threads: ".$count); + while ($thread = dba::fetch($r)) { + $last_id = $thread["iid"]; + dba::delete('thread', array('iid' => $thread["iid"])); + } + } else { + logger("No expired threads found"); + } + dba::close($r); + logger("Done deleting ".$count." expired threads. Last ID: ".$last_id); + + Config::set('system', 'dbclean-last-id-8', $last_id); + } elseif ($stage == 9) { + if ($days <= 0) { + return; + } + + $last_id = Config::get('system', 'dbclean-last-id-9', 0); + $till_id = Config::get('system', 'dbclean-last-id-8', 0); + + logger("Deleting old global item entries from expired threads from ID ".$last_id." to ID ".$till_id); + $r = dba::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND + NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND + `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY AND `id` >= ? AND `id` <= ? + ORDER BY `id` LIMIT ".intval($limit), $last_id, $till_id); + $count = dba::num_rows($r); + if ($count > 0) { + logger("found global item entries from expired threads: ".$count); + while ($orphan = dba::fetch($r)) { + $last_id = $orphan["id"]; + dba::delete('item', array('id' => $orphan["id"])); + } + } else { + logger("No global item entries from expired threads"); + } + dba::close($r); + logger("Done deleting ".$count." old global item entries from expired threads. Last ID: ".$last_id); + + Config::set('system', 'dbclean-last-id-9', $last_id); } // Call it again if not all entries were purged if (($stage != 0) AND ($count > 0)) { proc_run(PRIORITY_MEDIUM, 'include/dbclean.php'); } - } From 291af19f25a036178ee5932b66e48ac485fa50ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Mon, 22 May 2017 13:04:30 +0200 Subject: [PATCH 016/160] Some improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/text.php | 94 +++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/include/text.php b/include/text.php index 508cf17461..3b04c86637 100644 --- a/include/text.php +++ b/include/text.php @@ -425,9 +425,9 @@ function expand_acl($s) { $ret = array(); if (strlen($s)) { - $t = str_replace('<','',$s); - $a = explode('>',$t); - foreach($a as $aa) { + $t = str_replace('<', '', $s); + $a = explode('>', $t); + foreach ($a as $aa) { if (intval($aa)) { $ret[] = intval($aa); } @@ -469,8 +469,8 @@ function perms2str($p) { } if (is_array($tmp)) { - array_walk($tmp,'sanitise_acl'); - $ret = implode('',$tmp); + array_walk($tmp, 'sanitise_acl'); + $ret = implode('', $tmp); } return $ret; }} @@ -1246,7 +1246,7 @@ if (! function_exists('link_compare')) { * @return boolean True if the URLs match, otherwise False * */ -function link_compare($a,$b) { +function link_compare($a, $b) { return (strcasecmp(normalise_link($a), normalise_link($b)) === 0); }} @@ -1312,14 +1312,14 @@ if (! function_exists('prepare_body')) { * @hook prepare_body ('item'=>item array, 'html'=>body string) after first bbcode to html * @hook prepare_body_final ('item'=>item array, 'html'=>body string) after attach icons and blockquote special case handling (spoiler, author) */ -function prepare_body(&$item,$attach = false, $preview = false) { +function prepare_body(&$item, $attach = false, $preview = false) { $a = get_app(); call_hooks('prepare_body_init', $item); - $searchpath = z_root()."/search?tag="; + $searchpath = z_root() . "/search?tag="; - $tags=array(); + $tags = array(); $hashtags = array(); $mentions = array(); @@ -1550,8 +1550,9 @@ function get_cats_and_terms($item) { $categories = array(); $folders = array(); - $matches = false; $first = true; - $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); + $matches = false; + $first = true; + $cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { $categories[] = array( @@ -1570,8 +1571,9 @@ function get_cats_and_terms($item) { } if (local_user() == $item['uid']) { - $matches = false; $first = true; - $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); + $matches = false; + $first = true; + $cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { $folders[] = array( @@ -1626,9 +1628,7 @@ function get_plink($item) { $ret = array(); } - //if (x($item,'plink') && ($item['private'] != 1)) - - return($ret); + return $ret; }} if (! function_exists('unamp')) { @@ -1913,15 +1913,16 @@ function file_tag_encode($s) { } function file_tag_decode($s) { - return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s); + return str_replace(array('%3c', '%3e', '%5b', '%5d'), array('<', '>', '[', ']'), $s); } function file_tag_file_query($table,$s,$type = 'file') { - if ($type == 'file') - $str = preg_quote( '[' . str_replace('%','%%',file_tag_encode($s)) . ']' ); - else - $str = preg_quote( '<' . str_replace('%','%%',file_tag_encode($s)) . '>' ); + if ($type == 'file') { + $str = preg_quote( '[' . str_replace('%', '%%', file_tag_encode($s)) . ']' ); + } else { + $str = preg_quote( '<' . str_replace('%', '%%', file_tag_encode($s)) . '>' ); + } return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; } @@ -1953,10 +1954,9 @@ function file_tag_file_to_list($file,$type = 'file') { $matches = false; $list = ''; if ($type == 'file') { - $cnt = preg_match_all('/\[(.*?)\]/',$file,$matches,PREG_SET_ORDER); - } - else { - $cnt = preg_match_all('/<(.*?)>/',$file,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER); + } else { + $cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER); } if ($cnt) { foreach ($matches as $mtch) { @@ -1969,7 +1969,7 @@ function file_tag_file_to_list($file,$type = 'file') { return $list; } -function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { +function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') { // $file_old - categories previously associated with an item // $file_new - new list of categories for an item @@ -2021,10 +2021,6 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { intval($termtype), intval($uid)); - //$r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type), - // intval($uid) - //); - if (dbm::is_result($r)) { unset($deleted_tags[$key]); } @@ -2034,19 +2030,19 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') { } if ($saved != $filetags_updated) { - set_pconfig($uid,'system','filetags', $filetags_updated); + set_pconfig($uid, 'system', 'filetags', $filetags_updated); } return true; } else if (strlen($file_new)) { - set_pconfig($uid,'system','filetags', $file_new); + set_pconfig($uid, 'system', 'filetags', $file_new); } return true; } -function file_tag_save_file($uid,$item,$file) { - require_once("include/files.php"); +function file_tag_save_file($uid, $item, $file) { + require_once "include/files.php"; $result = false; if (! intval($uid)) @@ -2056,25 +2052,27 @@ function file_tag_save_file($uid,$item,$file) { intval($uid) ); if (dbm::is_result($r)) { - if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) + if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) { q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'), intval($item), intval($uid) ); + } create_files_from_item($item); $saved = get_pconfig($uid,'system','filetags'); - if ((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']'))) - set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']'); + if ((! strlen($saved)) || (! stristr($saved, '[' . file_tag_encode($file) . ']'))) { + set_pconfig($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']'); + } info( t('Item filed') ); } return true; } -function file_tag_unsave_file($uid,$item,$file,$cat = false) { - require_once("include/files.php"); +function file_tag_unsave_file($uid, $item, $file, $cat = false) { + require_once "include/files.php"; $result = false; if (! intval($uid)) @@ -2111,25 +2109,22 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) { intval($termtype), intval($uid)); - //$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')), - //); - if (! dbm::is_result($r)) { $saved = get_pconfig($uid,'system','filetags'); - set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved)); + set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved)); } return true; } function normalise_openid($s) { - return trim(str_replace(array('http://','https://'),array('',''),$s),'/'); + return trim(str_replace(array('http://', 'https://'), array('', ''), $s), '/'); } function undo_post_tagging($s) { $matches = null; - $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $s, $matches, PREG_SET_ORDER); if ($cnt) { foreach ($matches as $mtch) { $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s); @@ -2170,7 +2165,7 @@ function deindent($text, $chr = "[\t ]", $count = NULL) { preg_match("|^" . $chr . "*|", $lines[$k], $m); $count = strlen($m[0]); } - for ($k=0; $k < count($lines); $k++) { + for ($k = 0; $k < count($lines); $k++) { $lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]); } @@ -2200,11 +2195,12 @@ function formatBytes($bytes, $precision = 2) { */ function format_network_name($network, $url = 0) { if ($network != "") { - require_once('include/contact_selectors.php'); - if ($url != "") + require_once 'include/contact_selectors.php'; + if ($url != "") { $network_name = '<a href="'.$url.'">'.network_to_name($network, $url)."</a>"; - else + } else { $network_name = network_to_name($network); + } return $network_name; } From e9c9c47a84c671ecf2bb4cf98efb3728e1f1fb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Mon, 22 May 2017 13:09:07 +0200 Subject: [PATCH 017/160] Continued a bit: - opps, cherry-pick/rebase/what-ever did not take all over - used x() for array key check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/text.php | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/include/text.php b/include/text.php index 3b04c86637..c0a71cc784 100644 --- a/include/text.php +++ b/include/text.php @@ -1352,8 +1352,9 @@ function prepare_body(&$item, $attach = false, $preview = false) { $update = (!local_user() and !remote_user() and ($item["uid"] == 0)); // Or update it if the current viewer is the intented viewer - if (($item["uid"] == local_user()) AND ($item["uid"] != 0)) + if (($item["uid"] == local_user()) AND ($item["uid"] != 0)) { $update = true; + } put_item_in_cache($item, $update); $s = $item["rendered-html"]; @@ -1371,7 +1372,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { $as = ''; $vhead = false; - $arr = explode('[/attach],',$item['attach']); + $arr = explode('[/attach],', $item['attach']); if (count($arr)) { $as .= '<div class="body-attach">'; foreach ($arr as $r) { @@ -1382,10 +1383,11 @@ function prepare_body(&$item, $attach = false, $preview = false) { foreach ($matches as $mtch) { $mime = $mtch[3]; - if ((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) + if ((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) { $the_url = 'redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1]; - else + } else { $the_url = $mtch[1]; + } if (strpos($mime, 'video') !== false) { if (!$vhead) { @@ -1400,11 +1402,11 @@ function prepare_body(&$item, $attach = false, $preview = false) { $id = end(explode('/', $the_url)); $as .= replace_macros(get_markup_template('video_top.tpl'), array( - '$video' => array( - 'id' => $id, - 'title' => t('View Video'), - 'src' => $the_url, - 'mime' => $mime, + '$video' => array( + 'id' => $id, + 'title' => t('View Video'), + 'src' => $the_url, + 'mime' => $mime, ), )); } @@ -1444,7 +1446,7 @@ function prepare_body(&$item, $attach = false, $preview = false) { $s = $s . $as; // map - if (strpos($s, '<div class="map">') !== false && $item['coord']) { + if (strpos($s, '<div class="map">') !== false && x($item, 'coord')) { $x = generate_map(trim($item['coord'])); if ($x) { $s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s); @@ -1934,14 +1936,13 @@ function file_tag_list_to_file($list,$type = 'file') { if ($type == 'file') { $lbracket = '['; $rbracket = ']'; - } - else { + } else { $lbracket = '<'; $rbracket = '>'; } foreach ($list_array as $item) { - if (strlen($item)) { + if (strlen($item)) { $tag_list .= $lbracket . file_tag_encode(trim($item)) . $rbracket; } } @@ -1960,8 +1961,9 @@ function file_tag_file_to_list($file,$type = 'file') { } if ($cnt) { foreach ($matches as $mtch) { - if (strlen($list)) + if (strlen($list)) { $list .= ','; + } $list .= file_tag_decode($mtch[1]); } } From 32f61016d368401890443efc861fff0032ac6c42 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 07:26:21 +0000 Subject: [PATCH 018/160] Overhauled "lock" functionality --- include/dbstructure.php | 2 +- include/lock.php | 80 ----------------------------------------- src/Util/Lock.php | 62 ++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 81 deletions(-) delete mode 100644 include/lock.php create mode 100644 src/Util/Lock.php diff --git a/include/dbstructure.php b/include/dbstructure.php index 441e7be7f7..1801288a45 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1205,7 +1205,7 @@ function db_definition() { "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" => NULL_DATE), + "pid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"), ), "indexes" => array( "PRIMARY" => array("id"), diff --git a/include/lock.php b/include/lock.php deleted file mode 100644 index 64f6319ef1..0000000000 --- a/include/lock.php +++ /dev/null @@ -1,80 +0,0 @@ -<?php - -// Provide some ability to lock a PHP function so that multiple processes -// can't run the function concurrently -if (! function_exists('lock_function')) { -function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) { - if ( $wait_sec == 0 ) - $wait_sec = 2; // don't let the user pick a value that's likely to crash the system - - $got_lock = false; - $start = time(); - - do { - q("LOCK TABLE `locks` WRITE"); - $r = q("SELECT `locked`, `created` FROM `locks` WHERE `name` = '%s' LIMIT 1", - dbesc($fn_name) - ); - - if ((dbm::is_result($r)) AND (!$r[0]['locked'] OR (strtotime($r[0]['created']) < time() - 3600))) { - q("UPDATE `locks` SET `locked` = 1, `created` = '%s' WHERE `name` = '%s'", - dbesc(datetime_convert()), - dbesc($fn_name) - ); - $got_lock = true; - } - elseif (! dbm::is_result($r)) { - /// @TODO the Boolean value for count($r) should be equivalent to the Boolean value of $r - q("INSERT INTO `locks` (`name`, `created`, `locked`) VALUES ('%s', '%s', 1)", - dbesc($fn_name), - dbesc(datetime_convert()) - ); - $got_lock = true; - } - - q("UNLOCK TABLES"); - - if (($block) && (! $got_lock)) - sleep($wait_sec); - - } while (($block) && (! $got_lock) && ((time() - $start) < $timeout)); - - logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG); - - return $got_lock; -}} - - -if (! function_exists('block_on_function_lock')) { -function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) { - if ( $wait_sec == 0 ) - $wait_sec = 2; // don't let the user pick a value that's likely to crash the system - - $start = time(); - - do { - $r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1", - dbesc($fn_name) - ); - - if (dbm::is_result($r) && $r[0]['locked']) { - sleep($wait_sec); - } - - } while (dbm::is_result($r) && $r[0]['locked'] && ((time() - $start) < $timeout)); - - return; -}} - - -if (! function_exists('unlock_function')) { -function unlock_function($fn_name) { - $r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'", - dbesc(NULL_DATE), - dbesc($fn_name) - ); - - logger('unlock_function: released lock for function ' . $fn_name, LOGGER_DEBUG); - - return; -}} diff --git a/src/Util/Lock.php b/src/Util/Lock.php new file mode 100644 index 0000000000..03e8545adf --- /dev/null +++ b/src/Util/Lock.php @@ -0,0 +1,62 @@ +<?php + +namespace Friendica\Util; + +/** + * @file src/Util/Lock.php + * @brief Functions for preventing parallel execution of functions + * + */ + +use dba; +use dbm; + +/** + * @brief This class contain Functions for preventing parallel execution of functions + */ +class Lock { + + +// Provide some ability to lock a PHP function so that multiple processes +// can't run the function concurrently + + public static function set($fn_name, $wait_sec = 2, $timeout = 30) { + if ($wait_sec == 0) { + $wait_sec = 2; + } + + $got_lock = false; + $start = time(); + + do { + dba:p("LOCK TABLE `locks` WRITE"); + $lock = dba::select('locks', array('locked'), array('name' => $fn_name), array('limit' => 1)); + + if ((dbm::is_result($lock)) AND !$lock['locked']) { + dba::update('locks', array('locked' => true), array('name' => $fn_name)); + $got_lock = true; + } elseif (!dbm::is_result($lock)) { + dbm::insert('locks', array('name' => $fn_name, 'locked' => true)); + $got_lock = true; + } + + dbm::p("UNLOCK TABLES"); + + if (!$got_lock) { + sleep($wait_sec); + } + } while (!$got_lock AND ((time() - $start) < $timeout)); + + logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG); + + return $got_lock; + } + + public static function remove($fn_name) { + dba::update('locks', array('locked' => false), array('name' => $fn_name)); + + logger('unlock_function: released lock for function ' . $fn_name, LOGGER_DEBUG); + + return; + } +} From 5de03c1b271e492b861e22c7f510fbb6ebec82a6 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 08:36:08 +0000 Subject: [PATCH 019/160] Locks now work - ready to be used in the wild --- src/Util/Lock.php | 53 +++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 03e8545adf..e8fa03f784 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -16,11 +16,16 @@ use dbm; */ class Lock { - -// Provide some ability to lock a PHP function so that multiple processes -// can't run the function concurrently - - public static function set($fn_name, $wait_sec = 2, $timeout = 30) { + /** + * @brief Sets a lock for a given name + * + * @param string $fn_name Name of the lock + * @param integer $timeout Seconds until we give up + * @param integer $wait_sec Time between to lock attempts + * + * @return boolean Was the lock successful? + */ + public static function set($fn_name, $timeout = 30, $wait_sec = 2) { if ($wait_sec == 0) { $wait_sec = 2; } @@ -29,34 +34,46 @@ class Lock { $start = time(); do { - dba:p("LOCK TABLE `locks` WRITE"); - $lock = dba::select('locks', array('locked'), array('name' => $fn_name), array('limit' => 1)); + dba::p("LOCK TABLE `locks` WRITE"); + $lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1)); - if ((dbm::is_result($lock)) AND !$lock['locked']) { - dba::update('locks', array('locked' => true), array('name' => $fn_name)); - $got_lock = true; + if (dbm::is_result($lock)) { + if ($lock['locked']) { + // When the process id isn't used anymore, we can safely claim the lock for us. + if (!posix_kill($lock['pid'], 0)) { + $lock['locked'] = false; + } + // We want to lock something that was already locked by us? So we got the lock. + if ($lock['pid'] == getmypid()) { + $got_lock = true; + } + } + if (!$lock['locked']) { + dba::update('locks', array('locked' => true, 'pid' => getmypid()), array('name' => $fn_name)); + $got_lock = true; + } } elseif (!dbm::is_result($lock)) { - dbm::insert('locks', array('name' => $fn_name, 'locked' => true)); + dba::insert('locks', array('name' => $fn_name, 'locked' => true, 'pid' => getmypid())); $got_lock = true; } - dbm::p("UNLOCK TABLES"); + dba::p("UNLOCK TABLES"); if (!$got_lock) { sleep($wait_sec); } } while (!$got_lock AND ((time() - $start) < $timeout)); - logger('lock_function: function ' . $fn_name . ' with blocking = ' . $block . ' got_lock = ' . $got_lock . ' time = ' . (time() - $start), LOGGER_DEBUG); - return $got_lock; } + /** + * @brief Removes a lock if it was set by us + * + * @param string $fn_name Name of the lock + */ public static function remove($fn_name) { - dba::update('locks', array('locked' => false), array('name' => $fn_name)); - - logger('unlock_function: released lock for function ' . $fn_name, LOGGER_DEBUG); - + dba::update('locks', array('locked' => false, 'pid' => 0), array('name' => $fn_name, 'pid' => getmypid())); return; } } From d2cb87a200cadcf055b194ea0b2fc577640fdea2 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 12:59:29 +0000 Subject: [PATCH 020/160] Database locks are now having its very own functions --- include/dba.php | 22 ++++++++++++++++++++++ src/Util/Lock.php | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/include/dba.php b/include/dba.php index b9e6c32d56..1fff51f3d1 100644 --- a/include/dba.php +++ b/include/dba.php @@ -806,6 +806,28 @@ class dba { return self::e($sql, $param); } + /** + * @brief Locks a table for exclusive write access + * + * This function can be extended in the future to accept a table array as well. + * + * @param string $table Table name + * + * @return boolean was the lock successful? + */ + static public function lock($table) { + return self::e("LOCK TABLES `".self::$dbo->escape($table)."` WRITE"); + } + + /** + * @brief Unlocks all locked tables + * + * @return boolean was the unlock successful? + */ + static public function unlock() { + return self::e("UNLOCK TABLES"); + } + /** * @brief Starts a transaction * diff --git a/src/Util/Lock.php b/src/Util/Lock.php index e8fa03f784..1a33e819f0 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -34,7 +34,7 @@ class Lock { $start = time(); do { - dba::p("LOCK TABLE `locks` WRITE"); + dba::lock('locks'); $lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1)); if (dbm::is_result($lock)) { @@ -57,7 +57,7 @@ class Lock { $got_lock = true; } - dba::p("UNLOCK TABLES"); + dba::unlock(); if (!$got_lock) { sleep($wait_sec); From bca5776e9c7f84d95fd7066ee2948f9ef945f78f Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 15:59:20 +0000 Subject: [PATCH 021/160] Lock now can use the memcache as well --- include/poller.php | 35 +++++++++++++------- src/Util/Lock.php | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 12 deletions(-) diff --git a/include/poller.php b/include/poller.php index 22fb65a4f8..60937fb7e0 100644 --- a/include/poller.php +++ b/include/poller.php @@ -2,6 +2,7 @@ use Friendica\App; use Friendica\Core\Config; +use Friendica\Util\Lock; if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) { $directory = dirname($_SERVER["argv"][0]); @@ -19,16 +20,12 @@ require_once("boot.php"); function poller_run($argv, $argc){ global $a, $db; - if (is_null($a)) { - $a = new App(dirname(__DIR__)); - } + $a = new App(dirname(__DIR__)); - if(is_null($db)) { - @include(".htconfig.php"); - require_once("include/dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); - }; + @include(".htconfig.php"); + require_once("include/dba.php"); + $db = new dba($db_host, $db_user, $db_pass, $db_data); + unset($db_host, $db_user, $db_pass, $db_data); Config::load(); @@ -41,6 +38,10 @@ function poller_run($argv, $argc){ load_hooks(); + if (($argc <= 1) OR ($argv[1] != "no_cron")) { + poller_run_cron(); + } + $a->start_process(); if ($a->min_memory_reached()) { @@ -55,11 +56,11 @@ function poller_run($argv, $argc){ return; } - if(($argc <= 1) OR ($argv[1] != "no_cron")) { - poller_run_cron(); + if ($a->max_processes_reached()) { + return; } - if ($a->max_processes_reached()) { + if (!Lock::set('poller_worker')) { return; } @@ -69,6 +70,8 @@ function poller_run($argv, $argc){ return; } + Lock::remove('poller_worker'); + $starttime = time(); while ($r = poller_worker_process()) { @@ -83,12 +86,18 @@ function poller_run($argv, $argc){ return; } + if (!Lock::set('poller_worker')) { + return; + } + // Count active workers and compare them with a maximum value that depends on the load if (poller_too_much_workers()) { logger('Active worker limit reached, quitting.', LOGGER_DEBUG); return; } + Lock::remove('poller_worker'); + if (!poller_execute($r[0])) { logger('Process execution failed, quitting.', LOGGER_DEBUG); return; @@ -724,6 +733,8 @@ function poller_run_cron() { if (array_search(__file__,get_included_files())===0){ poller_run($_SERVER["argv"],$_SERVER["argc"]); + Lock::removeAll(); + poller_unclaim_process(); get_app()->end_process(); diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 1a33e819f0..175ad34e36 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -8,6 +8,8 @@ namespace Friendica\Util; * */ +use Friendica\Core\Config; +use Memcache; use dba; use dbm; @@ -15,6 +17,31 @@ use dbm; * @brief This class contain Functions for preventing parallel execution of functions */ class Lock { + /** + * @brief Check for memcache and open a connection if configured + * + * @return object|boolean The memcache object - or "false" if not successful + */ + public static function memcache() { + if (!function_exists('memcache_connect')) { + return false; + } + + if (!Config::get('system', 'memcache')) { + return false; + } + + $memcache_host = Config::get('system', 'memcache_host', '127.0.0.1'); + $memcache_port = Config::get('system', 'memcache_port', 11211); + + $memcache = new Memcache; + + if (!$memcache->connect($memcache_host, $memcache_port)) { + return false; + } + + return $memcache; + } /** * @brief Sets a lock for a given name @@ -33,6 +60,33 @@ class Lock { $got_lock = false; $start = time(); + $memcache = self::memcache(); + if (is_object($memcache)) { + $cachekey = get_app()->get_hostname().";lock:".$fn_name; + + do { + $lock = $memcache->get($cachekey); + + if (!is_bool($lock)) { + $pid = (int)$lock; + + // When the process id isn't used anymore, we can safely claim the lock for us. + // Or we do want to lock something that was already locked by us. + if (!posix_kill($pid, 0) OR ($pid == getmypid())) { + $lock = false; + } + } + if (is_bool($lock)) { + $memcache->set($cachekey, getmypid(), MEMCACHE_COMPRESSED, 300); + $got_lock = true; + } + if (!$got_lock) { + sleep($wait_sec); + } + } while (!$got_lock AND ((time() - $start) < $timeout)); + + return $got_lock; + } do { dba::lock('locks'); $lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1)); @@ -73,7 +127,34 @@ class Lock { * @param string $fn_name Name of the lock */ public static function remove($fn_name) { + $memcache = self::memcache(); + if (is_object($memcache)) { + $cachekey = get_app()->get_hostname().";lock:".$fn_name; + $lock = $memcache->get($cachekey); + + if (!is_bool($lock)) { + if ((int)$lock == getmypid()) { + $memcache->delete($cachekey); + } + } + return; + } + dba::update('locks', array('locked' => false, 'pid' => 0), array('name' => $fn_name, 'pid' => getmypid())); return; } + + /** + * @brief Removes all lock that were set by us + */ + public static function removeAll() { + $memcache = self::memcache(); + if (is_object($memcache)) { + // We cannot delete all cache entries, but this doesn't matter with memcache + return; + } + + dba::update('locks', array('locked' => false, 'pid' => 0), array('pid' => getmypid())); + return; + } } From 30b24a2908513d64ba2a81f1120bca7c08c46b65 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 18:59:50 +0000 Subject: [PATCH 022/160] Locking seems to work great now --- include/poller.php | 19 ++++++++++--------- src/Util/Lock.php | 11 +++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/poller.php b/include/poller.php index 60937fb7e0..0d07605882 100644 --- a/include/poller.php +++ b/include/poller.php @@ -45,33 +45,32 @@ function poller_run($argv, $argc){ $a->start_process(); if ($a->min_memory_reached()) { + logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG); return; } if (poller_max_connections_reached()) { + logger('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG); return; } if ($a->maxload_reached()) { + logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG); return; } if ($a->max_processes_reached()) { - return; - } - - if (!Lock::set('poller_worker')) { + logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG); return; } // Checking the number of workers if (poller_too_much_workers()) { poller_kill_stale_workers(); + logger('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG); return; } - Lock::remove('poller_worker'); - $starttime = time(); while ($r = poller_worker_process()) { @@ -87,7 +86,9 @@ function poller_run($argv, $argc){ } if (!Lock::set('poller_worker')) { - return; + logger('Cannot get a lock, retrying.', LOGGER_DEBUG); + poller_unclaim_process(); + continue; } // Count active workers and compare them with a maximum value that depends on the load @@ -104,7 +105,7 @@ function poller_run($argv, $argc){ } // Quit the poller once every hour - if (time() > ($starttime + 3600)) { + if (time() > ($starttime + 360)) { logger('Process lifetime reachted, quitting.', LOGGER_DEBUG); return; } @@ -733,7 +734,7 @@ function poller_run_cron() { if (array_search(__file__,get_included_files())===0){ poller_run($_SERVER["argv"],$_SERVER["argc"]); - Lock::removeAll(); + Lock::remove('poller_worker'); poller_unclaim_process(); diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 175ad34e36..e8011bf59f 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -48,20 +48,16 @@ class Lock { * * @param string $fn_name Name of the lock * @param integer $timeout Seconds until we give up - * @param integer $wait_sec Time between to lock attempts * * @return boolean Was the lock successful? */ - public static function set($fn_name, $timeout = 30, $wait_sec = 2) { - if ($wait_sec == 0) { - $wait_sec = 2; - } - + public static function set($fn_name, $timeout = 120) { $got_lock = false; $start = time(); $memcache = self::memcache(); if (is_object($memcache)) { + $wait_sec = 1; $cachekey = get_app()->get_hostname().";lock:".$fn_name; do { @@ -87,6 +83,9 @@ class Lock { return $got_lock; } + + $wait_sec = 2; + do { dba::lock('locks'); $lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1)); From bde4943da51aac866ed0870617b868d779bc6835 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 19:01:22 +0000 Subject: [PATCH 023/160] Every hour should mean: every hour :) --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 0d07605882..bae2ac5e96 100644 --- a/include/poller.php +++ b/include/poller.php @@ -105,7 +105,7 @@ function poller_run($argv, $argc){ } // Quit the poller once every hour - if (time() > ($starttime + 360)) { + if (time() > ($starttime + 3600)) { logger('Process lifetime reachted, quitting.', LOGGER_DEBUG); return; } From 16276b21ebf617c5c2277b0c25f43f74131d5778 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 19:05:15 +0000 Subject: [PATCH 024/160] Typo --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index bae2ac5e96..087b4b733e 100644 --- a/include/poller.php +++ b/include/poller.php @@ -106,7 +106,7 @@ function poller_run($argv, $argc){ // Quit the poller once every hour if (time() > ($starttime + 3600)) { - logger('Process lifetime reachted, quitting.', LOGGER_DEBUG); + logger('Process lifetime reached, quitting.', LOGGER_DEBUG); return; } } From fb72fc77f5268a9036b43eabea2fa5fffff57b68 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 4 Jun 2017 20:03:37 +0000 Subject: [PATCH 025/160] Some code beautification --- include/poller.php | 160 +++++++++++++++++++++++++-------------------- 1 file changed, 89 insertions(+), 71 deletions(-) diff --git a/include/poller.php b/include/poller.php index a67f6a7d86..3d53be0abb 100644 --- a/include/poller.php +++ b/include/poller.php @@ -7,9 +7,9 @@ use Friendica\Util\Lock; if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) { $directory = dirname($_SERVER["argv"][0]); - if (substr($directory, 0, 1) != "/") + if (substr($directory, 0, 1) != "/") { $directory = $_SERVER["PWD"]."/".$directory; - + } $directory = realpath($directory."/.."); chdir($directory); @@ -38,53 +38,58 @@ function poller_run($argv, $argc){ load_hooks(); - if (($argc <= 1) OR ($argv[1] != "no_cron")) { - poller_run_cron(); - } - - $a->start_process(); - - if ($a->min_memory_reached()) { - logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG); - return; - } - - if (poller_max_connections_reached()) { - logger('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG); - return; - } - + // At first check the maximum load. We shouldn't continue with a high load if ($a->maxload_reached()) { logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG); return; } - if ($a->max_processes_reached()) { - logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG); - return; - } + // We now start the process. This is done after the load check since this could increase the load. + $a->start_process(); - // Checking the number of workers + // At first we check the number of workers and quit if there are too much of them + // This is done at the top to avoid that too much code is executed without a need to do so, + // since the poller mostly quits here. if (poller_too_much_workers()) { poller_kill_stale_workers(); logger('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG); return; } + // Do we have too few memory? + if ($a->min_memory_reached()) { + logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG); + return; + } + + // Possibly there are too much database connections + if (poller_max_connections_reached()) { + logger('Pre check: maximum connections reached, quitting.', LOGGER_DEBUG); + return; + } + + // Possibly there are too much database processes that block the system + if ($a->max_processes_reached()) { + logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG); + return; + } + + // Now we start additional cron processes if we should do so + if (($argc <= 1) OR ($argv[1] != "no_cron")) { + poller_run_cron(); + } + $starttime = time(); + // We fetch the next queue entry that is about to be executed while ($r = poller_worker_process()) { + // If we got that queue entry we claim it for us if (!poller_claim_process($r[0])) { continue; } - // Check free memory - if ($a->min_memory_reached()) { - logger('Memory limit reached, quitting.', LOGGER_DEBUG); - return; - } - + // To avoid the quitting of multiple pollers we serialize the next check if (!Lock::set('poller_worker')) { logger('Cannot get a lock, retrying.', LOGGER_DEBUG); poller_unclaim_process(); @@ -99,6 +104,13 @@ function poller_run($argv, $argc){ Lock::remove('poller_worker'); + // Check free memory + if ($a->min_memory_reached()) { + logger('Memory limit reached, quitting.', LOGGER_DEBUG); + return; + } + + // finally the work will be done if (!poller_execute($r[0])) { logger('Process execution failed, quitting.', LOGGER_DEBUG); return; @@ -160,7 +172,6 @@ function poller_execute($queue) { $funcname = str_replace(".php", "", basename($argv[0]))."_run"; if (function_exists($funcname)) { - poller_exec_function($queue, $funcname, $argv); dba::delete('workerqueue', array('id' => $queue["id"])); } else { @@ -236,24 +247,27 @@ function poller_exec_function($queue, $funcname, $argv) { $o = "\nDatabase Read:\n"; foreach ($a->callstack["database"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) + if ($time > 0) { $o .= $func.": ".$time."\n"; + } } } if (isset($a->callstack["database_write"])) { $o .= "\nDatabase Write:\n"; foreach ($a->callstack["database_write"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) + if ($time > 0) { $o .= $func.": ".$time."\n"; + } } } if (isset($a->callstack["network"])) { $o .= "\nNetwork:\n"; foreach ($a->callstack["network"] AS $func => $time) { $time = round($time, 3); - if ($time > 0) + if ($time > 0) { $o .= $func.": ".$time."\n"; + } } } } else { @@ -294,27 +308,30 @@ function poller_max_connections_reached() { if ($max == 0) { // the maximum number of possible user connections can be a system variable $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'"); - if ($r) + if (dbm::is_result($r)) { $max = $r[0]["Value"]; - + } // Or it can be granted. This overrides the system variable $r = q("SHOW GRANTS"); - if ($r) + if (dbm::is_result($r)) { foreach ($r AS $grants) { $grant = array_pop($grants); - if (stristr($grant, "GRANT USAGE ON")) - if (preg_match("/WITH MAX_USER_CONNECTIONS (\d*)/", $grant, $match)) + if (stristr($grant, "GRANT USAGE ON")) { + if (preg_match("/WITH MAX_USER_CONNECTIONS (\d*)/", $grant, $match)) { $max = $match[1]; + } + } } + } } // If $max is set we will use the processlist to determine the current number of connections // The processlist only shows entries of the current user if ($max != 0) { $r = q("SHOW PROCESSLIST"); - if (!dbm::is_result($r)) + if (!dbm::is_result($r)) { return false; - + } $used = count($r); logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG); @@ -330,28 +347,28 @@ function poller_max_connections_reached() { // We will now check for the system values. // This limit could be reached although the user limits are fine. $r = q("SHOW VARIABLES WHERE `variable_name` = 'max_connections'"); - if (!$r) + if (!dbm::is_result($r)) { return false; - + } $max = intval($r[0]["Value"]); - if ($max == 0) + if ($max == 0) { return false; - + } $r = q("SHOW STATUS WHERE `variable_name` = 'Threads_connected'"); - if (!$r) + if (!dbm::is_result($r)) { return false; - + } $used = intval($r[0]["Value"]); - if ($used == 0) + if ($used == 0) { return false; - + } logger("Connection usage (system values): ".$used."/".$max, LOGGER_DEBUG); $level = $used / $max * 100; - if ($level < $maxlevel) + if ($level < $maxlevel) { return false; - + } logger("Maximum level (".$level."%) of system connections reached: ".$used."/".$max); return true; } @@ -376,9 +393,9 @@ function poller_kill_stale_workers() { // Kill long running processes // Check if the priority is in a valid range - if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) + if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) { $pid["priority"] = PRIORITY_MEDIUM; - + } // Define the maximum durations $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360); $max_duration = $max_duration_defaults[$pid["priority"]]; @@ -480,7 +497,7 @@ function poller_too_much_workers() { } } - return($active >= $queues); + return $active >= $queues; } /** @@ -491,7 +508,7 @@ function poller_too_much_workers() { function poller_active_workers() { $workers = q("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'poller.php'"); - return($workers[0]["processes"]); + return $workers[0]["processes"]; } /** @@ -512,36 +529,37 @@ function poller_passing_slow(&$highest_priority) { INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`"); // No active processes at all? Fine - if (!dbm::is_result($r)) - return(false); - + if (!dbm::is_result($r)) { + return false; + } $priorities = array(); - foreach ($r AS $line) + foreach ($r AS $line) { $priorities[] = $line["priority"]; - + } // Should not happen - if (count($priorities) == 0) - return(false); - + if (count($priorities) == 0) { + return false; + } $highest_priority = min($priorities); // The highest process is already the slowest one? // Then we quit - if ($highest_priority == PRIORITY_NEGLIGIBLE) - return(false); - + if ($highest_priority == PRIORITY_NEGLIGIBLE) { + return false; + } $high = 0; - foreach ($priorities AS $priority) - if ($priority == $highest_priority) + foreach ($priorities AS $priority) { + if ($priority == $highest_priority) { ++$high; - + } + } logger("Highest priority: ".$highest_priority." Total processes: ".count($priorities)." Count high priority processes: ".$high, LOGGER_DEBUG); $passing_slow = (($high/count($priorities)) > (2/3)); - if ($passing_slow) + if ($passing_slow) { logger("Passing slower processes than priority ".$highest_priority, LOGGER_DEBUG); - - return($passing_slow); + } + return $passing_slow; } /** From 8db079c65e8d3bd72c9cbe739f48b8a5812c14b6 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 5 Jun 2017 06:08:26 +0000 Subject: [PATCH 026/160] Don't always fork the poller. --- boot.php | 13 ++----------- include/cron.php | 5 +++-- include/notifier.php | 6 +++--- include/pubsubpublish.php | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/boot.php b/boot.php index f9f8794e50..59011bc64f 100644 --- a/boot.php +++ b/boot.php @@ -35,6 +35,7 @@ require_once 'include/features.php'; require_once 'include/identity.php'; require_once 'update.php'; require_once 'include/dbstructure.php'; +require_once 'include/poller.php'; define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); @@ -1095,18 +1096,8 @@ function proc_run($cmd) { return; } - // Checking number of workers - $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")); - - if ($queues == 0) { - $queues = 4; - } - // If there are already enough workers running, don't fork another one - if ($workers[0]["workers"] >= $queues) { + if (poller_too_much_workers()) { return; } diff --git a/include/cron.php b/include/cron.php index 3702bf8b36..70b87e9696 100644 --- a/include/cron.php +++ b/include/cron.php @@ -246,10 +246,11 @@ function cron_poll_contacts($argc, $argv) { logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]); if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { - proc_run(PRIORITY_MEDIUM, 'include/onepoll.php', intval($contact['id'])); + $priority = PRIORITY_MEDIUM; } else { - proc_run(PRIORITY_LOW, 'include/onepoll.php', intval($contact['id'])); + $priority = PRIORITY_LOW; } + proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/onepoll.php', intval($contact['id'])); } } } diff --git a/include/notifier.php b/include/notifier.php index 74cfabb6cd..a08057f677 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -498,7 +498,7 @@ function notifier_run(&$argv, &$argc){ } logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG); - proc_run($priority, 'include/delivery.php', $cmd, $item_id, $contact['id']); + proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/delivery.php', $cmd, $item_id, $contact['id']); } } @@ -563,7 +563,7 @@ function notifier_run(&$argv, &$argc){ if ((! $mail) && (! $fsuggest) && (! $followup)) { logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]); - proc_run($priority, 'include/delivery.php', $cmd, $item_id, $rr['id']); + proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/delivery.php', $cmd, $item_id, $rr['id']); } } } @@ -603,7 +603,7 @@ function notifier_run(&$argv, &$argc){ } // Handling the pubsubhubbub requests - proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php'); + proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php'); } logger('notifier: calling hooks', LOGGER_DEBUG); diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 24d7b69637..bb94ea3b20 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -17,7 +17,7 @@ function pubsubpublish_run(&$argv, &$argc){ foreach ($r as $rr) { logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); - proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]); + proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php', $rr["id"]); } } From b86c4d539e8f04f8cbe536d93d6c2fd131a794bf Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 5 Jun 2017 14:59:53 +0000 Subject: [PATCH 027/160] Locking waits now for a shorter period. DB locking is used at other locations as well --- include/dba.php | 17 +++++++++++++++-- include/poller.php | 8 ++++---- include/socgraph.php | 11 ++++------- src/Util/Lock.php | 6 +++--- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/include/dba.php b/include/dba.php index 1fff51f3d1..1f428bf465 100644 --- a/include/dba.php +++ b/include/dba.php @@ -816,7 +816,15 @@ class dba { * @return boolean was the lock successful? */ static public function lock($table) { - return self::e("LOCK TABLES `".self::$dbo->escape($table)."` WRITE"); + // See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html + self::e("SET autocommit=0"); + $success = self::e("LOCK TABLES `".self::$dbo->escape($table)."` WRITE"); + if (!$success) { + self::e("SET autocommit=1"); + } else { + self::$in_transaction = true; + } + return $success; } /** @@ -825,7 +833,12 @@ class dba { * @return boolean was the unlock successful? */ static public function unlock() { - return self::e("UNLOCK TABLES"); + // See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html + self::e("COMMIT"); + $success = self::e("UNLOCK TABLES"); + self::e("SET autocommit=1"); + self::$in_transaction = false; + return $success; } /** diff --git a/include/poller.php b/include/poller.php index 3d53be0abb..1de9126d2d 100644 --- a/include/poller.php +++ b/include/poller.php @@ -573,7 +573,7 @@ function poller_worker_process() { $highest_priority = 0; if (poller_passing_slow($highest_priority)) { - dba::e('LOCK TABLES `workerqueue` WRITE'); + dba::lock('workerqueue'); // Are there waiting processes with a higher priority than the currently highest? $r = q("SELECT * FROM `workerqueue` @@ -595,7 +595,7 @@ function poller_worker_process() { return $r; } } else { - dba::e('LOCK TABLES `workerqueue` WRITE'); + dba::lock('workerqueue'); } // If there is no result (or we shouldn't pass lower processes) we check without priority limit @@ -605,7 +605,7 @@ function poller_worker_process() { // We only unlock the tables here, when we got no data if (!dbm::is_result($r)) { - dba::e('UNLOCK TABLES'); + dba::unlock(); } return $r; @@ -625,7 +625,7 @@ function poller_claim_process($queue) { $success = dba::update('workerqueue', array('executed' => datetime_convert(), 'pid' => $mypid), array('id' => $queue["id"], 'pid' => 0)); - dba::e('UNLOCK TABLES'); + dba::unlock(); if (!$success) { logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG); diff --git a/include/socgraph.php b/include/socgraph.php index fbac08cc97..7a39e388be 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -1995,10 +1995,11 @@ function get_gcontact_id($contact) { if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) $contact["url"] = clean_contact_url($contact["url"]); - $r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 2", + dba::lock('gcontact'); + $r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", dbesc(normalise_link($contact["url"]))); - if ($r) { + if (dbm::is_result($r)) { $gcontact_id = $r[0]["id"]; // Update every 90 days @@ -2036,17 +2037,13 @@ function get_gcontact_id($contact) { $doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")); } } + dba::unlock(); if ($doprobing) { logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG); proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"])); } - if ((dbm::is_result($r)) AND (count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != "")) - q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d", - dbesc(normalise_link($contact["url"])), - intval($gcontact_id)); - return $gcontact_id; } diff --git a/src/Util/Lock.php b/src/Util/Lock.php index e8011bf59f..7cc3472e69 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -57,7 +57,7 @@ class Lock { $memcache = self::memcache(); if (is_object($memcache)) { - $wait_sec = 1; + $wait_sec = 0.2; $cachekey = get_app()->get_hostname().";lock:".$fn_name; do { @@ -77,9 +77,9 @@ class Lock { $got_lock = true; } if (!$got_lock) { - sleep($wait_sec); + usleep($wait_sec * 1000000); } - } while (!$got_lock AND ((time() - $start) < $timeout)); + } while (!$got_lock AND ((time(true) - $start) < $timeout)); return $got_lock; } From 2bff8e302af5d26a7decd78d6e4ab6a181e232e3 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 5 Jun 2017 16:56:21 +0000 Subject: [PATCH 028/160] Removing the lock after the process was removed is better --- include/poller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/poller.php b/include/poller.php index 1de9126d2d..2cf1a15f6b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -752,11 +752,11 @@ function poller_run_cron() { if (array_search(__file__,get_included_files())===0){ poller_run($_SERVER["argv"],$_SERVER["argc"]); - Lock::remove('poller_worker'); - poller_unclaim_process(); get_app()->end_process(); + Lock::remove('poller_worker'); + killme(); } From 2b04865cdbb7c7516b188f786af739d1011b4cbb Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 5 Jun 2017 22:41:33 +0000 Subject: [PATCH 029/160] We found the handbrake ... --- include/poller.php | 21 ++++++++------------- src/Util/Lock.php | 2 +- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/include/poller.php b/include/poller.php index 2cf1a15f6b..4bd1ee9e4a 100644 --- a/include/poller.php +++ b/include/poller.php @@ -89,21 +89,16 @@ function poller_run($argv, $argc){ continue; } - // To avoid the quitting of multiple pollers we serialize the next check - if (!Lock::set('poller_worker')) { - logger('Cannot get a lock, retrying.', LOGGER_DEBUG); - poller_unclaim_process(); - continue; + // To avoid the quitting of multiple pollers only one poller at a time will execute the check + if (Lock::set('poller_worker', 0)) { + // Count active workers and compare them with a maximum value that depends on the load + if (poller_too_much_workers()) { + logger('Active worker limit reached, quitting.', LOGGER_DEBUG); + return; + } + Lock::remove('poller_worker'); } - // Count active workers and compare them with a maximum value that depends on the load - if (poller_too_much_workers()) { - logger('Active worker limit reached, quitting.', LOGGER_DEBUG); - return; - } - - Lock::remove('poller_worker'); - // Check free memory if ($a->min_memory_reached()) { logger('Memory limit reached, quitting.', LOGGER_DEBUG); diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 7cc3472e69..63f9b5f973 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -79,7 +79,7 @@ class Lock { if (!$got_lock) { usleep($wait_sec * 1000000); } - } while (!$got_lock AND ((time(true) - $start) < $timeout)); + } while (!$got_lock AND ((time() - $start) < $timeout)); return $got_lock; } From ba7b4fddea9cf346916a23455f2273c97cf9e7c9 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 04:00:24 +0000 Subject: [PATCH 030/160] memory check is now also only done once in a while --- include/poller.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/poller.php b/include/poller.php index 4bd1ee9e4a..68c5acbcbe 100644 --- a/include/poller.php +++ b/include/poller.php @@ -96,13 +96,13 @@ function poller_run($argv, $argc){ logger('Active worker limit reached, quitting.', LOGGER_DEBUG); return; } - Lock::remove('poller_worker'); - } - // Check free memory - if ($a->min_memory_reached()) { - logger('Memory limit reached, quitting.', LOGGER_DEBUG); - return; + // Check free memory + if ($a->min_memory_reached()) { + logger('Memory limit reached, quitting.', LOGGER_DEBUG); + return; + } + Lock::remove('poller_worker'); } // finally the work will be done From 5dfa513b62d37395039ddf60aecc867028b8f91f Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 04:22:18 +0000 Subject: [PATCH 031/160] Only wait when you have a timout value at all --- src/Util/Lock.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 63f9b5f973..af15e106d5 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -76,7 +76,7 @@ class Lock { $memcache->set($cachekey, getmypid(), MEMCACHE_COMPRESSED, 300); $got_lock = true; } - if (!$got_lock) { + if (!$got_lock AND ($timeout > 0)) { usleep($wait_sec * 1000000); } } while (!$got_lock AND ((time() - $start) < $timeout)); @@ -112,7 +112,7 @@ class Lock { dba::unlock(); - if (!$got_lock) { + if (!$got_lock AND ($timeout > 0)) { sleep($wait_sec); } } while (!$got_lock AND ((time() - $start) < $timeout)); From e00105d649d4a8e3ff89820563470cdd5d742ab9 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 11:59:38 +0000 Subject: [PATCH 032/160] Don't fork a new worker --- include/queue.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/queue.php b/include/queue.php index b21bf676ba..6b42cf31e0 100644 --- a/include/queue.php +++ b/include/queue.php @@ -27,7 +27,7 @@ function queue_run(&$argv, &$argc){ logger('queue: start'); // Handling the pubsubhubbub requests - proc_run(PRIORITY_HIGH,'include/pubsubpublish.php'); + proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php'); $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` @@ -50,7 +50,7 @@ function queue_run(&$argv, &$argc){ if (dbm::is_result($r)) { foreach ($r as $q_item) { logger('Call queue for id '.$q_item['id']); - proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']); + proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", $q_item['id']); } } return; From 8d13751d40d40d1d348584ae5ff803096e09f3af Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 12:07:27 +0000 Subject: [PATCH 033/160] Increased database version --- boot.php | 2 +- database.sql | 2 +- include/poller.php | 5 ++--- update.php | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index 59011bc64f..b1f956fb2b 100644 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.2-rc' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1227 ); +define ( 'DB_UPDATE_VERSION', 1228 ); /** * @brief Constant with a HTML line break. diff --git a/database.sql b/database.sql index 4a5946ef38..2c13264919 100644 --- a/database.sql +++ b/database.sql @@ -580,7 +580,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 '0001-01-01 00:00:00', + `pid` int(10) unsigned NOT NULL DEFAULT 0, PRIMARY KEY(`id`) ) DEFAULT COLLATE utf8mb4_general_ci; diff --git a/include/poller.php b/include/poller.php index 68c5acbcbe..b08d98ca75 100644 --- a/include/poller.php +++ b/include/poller.php @@ -461,8 +461,7 @@ function poller_too_much_workers() { dba::close($processes); } dba::close($entries); - - $processlist = implode(', ', $listitem); + $processlist = ' ('.implode(', ', $listitem).')'; $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE)); $entries = $s[0]["total"]; @@ -481,7 +480,7 @@ function poller_too_much_workers() { } } - logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries." (".$processlist.") - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG); + logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries.$processlist." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG); // Are there fewer workers running as possible? Then fork a new one. if (!Config::get("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) { diff --git a/update.php b/update.php index 7561a9af19..76620a48a4 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define('UPDATE_VERSION' , 1227); +define('UPDATE_VERSION' , 1228); /** * From 286b2da7a9bce69d538716c398d3c4d98fd69799 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 17:25:28 +0000 Subject: [PATCH 034/160] Added documentation and renamed function --- doc/database/db_locks.md | 12 +++++------ src/Util/Lock.php | 44 ++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md index 00556dd953..004ebd1c1e 100644 --- a/doc/database/db_locks.md +++ b/doc/database/db_locks.md @@ -1,11 +1,11 @@ Table locks =========== -| Field | Description | Type | Null | Key | Default | Extra | -|---------|------------------|--------------|------|-----|---------------------|----------------| -| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment | -| name | | varchar(128) | NO | | | | -| locked | | tinyint(1) | NO | | 0 | | -| created | | datetime | YES | | 0001-01-01 00:00:00 | | +| Field | Description | Type | Null | Key | Default | Extra | +|---------|------------------|------------------|------|-----|---------------------|----------------| +| id | sequential ID | int(11) | NO | PRI | NULL | auto_increment | +| name | | varchar(128) | NO | | | | +| locked | | tinyint(1) | NO | | 0 | | +| pid | | int(10) unsigned | NO | | 0 | | Return to [database documentation](help/database) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index af15e106d5..ca327de1e1 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -18,30 +18,30 @@ use dbm; */ class Lock { /** - * @brief Check for memcache and open a connection if configured - * - * @return object|boolean The memcache object - or "false" if not successful - */ - public static function memcache() { - if (!function_exists('memcache_connect')) { - return false; - } + * @brief Check for memcache and open a connection if configured + * + * @return object|boolean The memcache object - or "false" if not successful + */ + private static function connect_memcache() { + if (!function_exists('memcache_connect')) { + return false; + } - if (!Config::get('system', 'memcache')) { - return false; - } + if (!Config::get('system', 'memcache')) { + return false; + } - $memcache_host = Config::get('system', 'memcache_host', '127.0.0.1'); - $memcache_port = Config::get('system', 'memcache_port', 11211); + $memcache_host = Config::get('system', 'memcache_host', '127.0.0.1'); + $memcache_port = Config::get('system', 'memcache_port', 11211); - $memcache = new Memcache; + $memcache = new Memcache; - if (!$memcache->connect($memcache_host, $memcache_port)) { - return false; - } + if (!$memcache->connect($memcache_host, $memcache_port)) { + return false; + } - return $memcache; - } + return $memcache; + } /** * @brief Sets a lock for a given name @@ -55,7 +55,7 @@ class Lock { $got_lock = false; $start = time(); - $memcache = self::memcache(); + $memcache = self::connect_memcache(); if (is_object($memcache)) { $wait_sec = 0.2; $cachekey = get_app()->get_hostname().";lock:".$fn_name; @@ -126,7 +126,7 @@ class Lock { * @param string $fn_name Name of the lock */ public static function remove($fn_name) { - $memcache = self::memcache(); + $memcache = self::connect_memcache(); if (is_object($memcache)) { $cachekey = get_app()->get_hostname().";lock:".$fn_name; $lock = $memcache->get($cachekey); @@ -147,7 +147,7 @@ class Lock { * @brief Removes all lock that were set by us */ public static function removeAll() { - $memcache = self::memcache(); + $memcache = self::connect_memcache(); if (is_object($memcache)) { // We cannot delete all cache entries, but this doesn't matter with memcache return; From 929f518e5c67b7424e9249babcc7648daa2cd3fd Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 17:38:58 +0000 Subject: [PATCH 035/160] Added documentation --- include/dbclean.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/dbclean.php b/include/dbclean.php index 024b845f7d..8da78d64b5 100644 --- a/include/dbclean.php +++ b/include/dbclean.php @@ -35,6 +35,19 @@ function dbclean_run(&$argv, &$argc) { /** * @brief Remove orphaned database entries + * @param integer $stage What should be deleted? + * + * Values for $stage: + * ------------------ + * 1: Old global item entries from item table without user copy. + * 2: Items without parents. + * 3: Orphaned data from thread table. + * 4: Orphaned data from notify table. + * 5: Orphaned data from notify-threads table. + * 6: Orphaned data from sign table. + * 7: Orphaned data from term table. + * 8: Expired threads. + * 9: Old global item entries from expired threads */ function remove_orphans($stage = 0) { global $db; From 611d3e3f5d781a3d3bc2d8cd3c1360a3297a09f5 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 17:41:01 +0000 Subject: [PATCH 036/160] Added documentation --- doc/database/db_locks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md index 004ebd1c1e..4de6fbf961 100644 --- a/doc/database/db_locks.md +++ b/doc/database/db_locks.md @@ -6,6 +6,6 @@ Table locks | id | sequential ID | int(11) | NO | PRI | NULL | auto_increment | | name | | varchar(128) | NO | | | | | locked | | tinyint(1) | NO | | 0 | | -| pid | | int(10) unsigned | NO | | 0 | | +| pid | Process ID | int(10) unsigned | NO | | 0 | | Return to [database documentation](help/database) From e3d5dcf049b4e772ae05a924f4e1d045a3480006 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 17:42:47 +0000 Subject: [PATCH 037/160] Beware of camels --- src/Util/Lock.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index ca327de1e1..26ccdc9dd2 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -22,7 +22,7 @@ class Lock { * * @return object|boolean The memcache object - or "false" if not successful */ - private static function connect_memcache() { + private static function connectMemcache() { if (!function_exists('memcache_connect')) { return false; } @@ -55,7 +55,7 @@ class Lock { $got_lock = false; $start = time(); - $memcache = self::connect_memcache(); + $memcache = self::connectMemcache(); if (is_object($memcache)) { $wait_sec = 0.2; $cachekey = get_app()->get_hostname().";lock:".$fn_name; @@ -126,7 +126,7 @@ class Lock { * @param string $fn_name Name of the lock */ public static function remove($fn_name) { - $memcache = self::connect_memcache(); + $memcache = self::connectMemcache(); if (is_object($memcache)) { $cachekey = get_app()->get_hostname().";lock:".$fn_name; $lock = $memcache->get($cachekey); @@ -147,7 +147,7 @@ class Lock { * @brief Removes all lock that were set by us */ public static function removeAll() { - $memcache = self::connect_memcache(); + $memcache = self::connectMemcache(); if (is_object($memcache)) { // We cannot delete all cache entries, but this doesn't matter with memcache return; From 932e14971fdcfb54888ef7e4c73db0177b2e8816 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 17:56:22 +0000 Subject: [PATCH 038/160] Issue 2864: Add a "alternate" link on display page --- mod/display.php | 7 ++++--- view/templates/display-head.tpl | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/display.php b/mod/display.php index ca6809eba1..bc0ba388bf 100644 --- a/mod/display.php +++ b/mod/display.php @@ -209,9 +209,6 @@ function display_content(App $a, $update = 0) { $o = ''; - $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array()); - - if ($update) { $nick = $_REQUEST['nick']; } else { @@ -281,6 +278,10 @@ function display_content(App $a, $update = 0) { return; } + $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom'; + $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), + array('$alternate' => $alternate)); + $groups = array(); diff --git a/view/templates/display-head.tpl b/view/templates/display-head.tpl index 9a96a23988..f4d050eec2 100644 --- a/view/templates/display-head.tpl +++ b/view/templates/display-head.tpl @@ -1,4 +1,4 @@ - +<link href='{{$alternate}}' rel='alternate' type='application/atom+xml'> <script> $(document).ready(function() { $(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl"); @@ -6,4 +6,3 @@ $(document).ready(function() { $(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl"); }); </script> - From 4e748668c6862cd4ab37570b77c4f84c1ab855d3 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 20:10:47 +0000 Subject: [PATCH 039/160] Spaces --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index a19d9dec8f..fcabe5d8ee 100644 --- a/include/poller.php +++ b/include/poller.php @@ -392,7 +392,7 @@ function poller_kill_stale_workers() { $pid["priority"] = PRIORITY_MEDIUM; } - // Define the maximum durations + // Define the maximum durations $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360); $max_duration = $max_duration_defaults[$pid["priority"]]; From 6e6941a5466f45328d03dcb2819125c83e2c3c48 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 21:56:25 +0000 Subject: [PATCH 040/160] We have an alternate link --- include/dfrn.php | 59 +++++++++++++++++++++++++++++++++ mod/display.php | 21 ++++++++++-- view/templates/display-head.tpl | 2 +- 3 files changed, 79 insertions(+), 3 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index 7e4d7af2bc..5d0e6337a4 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -284,6 +284,65 @@ class dfrn { return $atom; } + /** + * @brief Generate an atom entry for a given item id + * + * @param int $item_id The item id + * + * @return string DFRN feed entry + */ + public static function itemFeed($item_id) { + $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, + `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, + `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`, + `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, + `sign`.`signed_text`, `sign`.`signature`, `sign`.`signer` + FROM `item` + STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + AND (NOT `contact`.`blocked` OR `contact`.`pending`) + LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` + WHERE `item`.`id` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0 + AND `item`.`wall` AND NOT `item`.`private`", + intval($item_id) + ); + + if (!dbm::is_result($r)) { + killme(); + } + + $item = $r[0]; + + $r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` + FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` + WHERE `contact`.`self` AND `user`.`uid` = %d LIMIT 1", + intval($item['uid']) + ); + + if (!dbm::is_result($r)) { + killme(); + } + + $owner = $r[0]; + + $doc = new DOMDocument('1.0', 'utf-8'); + $doc->formatOutput = true; + + $alternatelink = $owner['url']; + + $author = "dfrn:owner"; + //$author = "author"; + + $root = self::add_header($doc, $owner, $author, $alternatelink, true); + + $type = 'html'; + + $entry = self::entry($doc, $type, $item, $owner, true); + $root->appendChild($entry); + + $atom = trim($doc->saveXML()); + return $atom; + } + /** * @brief Create XML text for DFRN mails * diff --git a/mod/display.php b/mod/display.php index bc0ba388bf..e31b89998c 100644 --- a/mod/display.php +++ b/mod/display.php @@ -11,6 +11,17 @@ function display_init(App $a) { $nick = (($a->argc > 1) ? $a->argv[1] : ''); $profiledata = array(); + if ($a->argc == 3) { + if (substr($a->argv[2], -5) == '.atom') { + require_once('include/dfrn.php'); + $item_id = substr($a->argv[2], 0, -5); + $xml = dfrn::itemFeed($item_id); + header("Content-type: application/atom+xml"); + echo $xml; + http_status_exit(($xml) ? 200 : 500); + } + } + // If there is only one parameter, then check if this parameter could be a guid if ($a->argc == 2) { $nick = ""; @@ -278,11 +289,17 @@ function display_content(App $a, $update = 0) { return; } - $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom'; + // We are displaying an "alternate" link if that post was public. See issue 2864 + $items = q("SELECT `id` FROM `item` WHERE `id` = %d AND NOT `private` AND `wall`", intval($item_id)); + if (dbm::is_result($items)) { + $alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom'; + } else { + $alternate = ''; + } + $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array('$alternate' => $alternate)); - $groups = array(); $contact = null; diff --git a/view/templates/display-head.tpl b/view/templates/display-head.tpl index f4d050eec2..dda8162146 100644 --- a/view/templates/display-head.tpl +++ b/view/templates/display-head.tpl @@ -1,4 +1,4 @@ -<link href='{{$alternate}}' rel='alternate' type='application/atom+xml'> +{{if $alternate}}<link href='{{$alternate}}' rel='alternate' type='application/atom+xml'>{{/if}} <script> $(document).ready(function() { $(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl"); From 9c46971aa550e852788b5c5bae66aa660e191faa Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 6 Jun 2017 22:18:42 +0000 Subject: [PATCH 041/160] The check for blocking processes is deactivated until further checks were performed --- src/App.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/App.php b/src/App.php index d671c5f1ab..26cfcaadb1 100644 --- a/src/App.php +++ b/src/App.php @@ -797,6 +797,8 @@ class App { * @return bool Is the limit reached? */ function max_processes_reached() { + // Deactivated, needs more investigating if this check really makes sense + return false; if ($this->is_backend()) { $process = 'backend'; From 36630daca6569eed8f71dab6663e4fce113aa6ff Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Wed, 7 Jun 2017 07:36:04 +0200 Subject: [PATCH 042/160] added missing dash in version --- VERSION | 2 +- boot.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 3fec5bc901..b35d44161c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.3dev +3.5.3-dev diff --git a/boot.php b/boot.php index 5f83cb3e40..9428cf5a38 100644 --- a/boot.php +++ b/boot.php @@ -38,7 +38,7 @@ require_once 'include/dbstructure.php'; define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); -define ( 'FRIENDICA_VERSION', '3.5.3dev' ); +define ( 'FRIENDICA_VERSION', '3.5.3-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1227 ); From 2ad784d37ae88338f9bc610cd527c72fad052aa0 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 7 Jun 2017 05:42:30 +0000 Subject: [PATCH 043/160] Speeded up calling "proc_run" --- database.sql | 5 +++-- include/dbstructure.php | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/database.sql b/database.sql index 2c13264919..7f7e975e72 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ --- Friendica 3.5.2-rc (Asparagus) --- DB_UPDATE_VERSION 1227 +-- Friendica 3.5.3dev (Asparagus) +-- DB_UPDATE_VERSION 1228 -- ------------------------------------------ @@ -1116,6 +1116,7 @@ CREATE TABLE IF NOT EXISTS `workerqueue` ( `executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', PRIMARY KEY(`id`), INDEX `pid` (`pid`), + INDEX `parameter` (`parameter`(192)), INDEX `priority_created` (`priority`,`created`) ) DEFAULT COLLATE utf8mb4_general_ci; diff --git a/include/dbstructure.php b/include/dbstructure.php index 8449307638..161df46f69 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1743,6 +1743,7 @@ function db_definition() { "indexes" => array( "PRIMARY" => array("id"), "pid" => array("pid"), + "parameter" => array("parameter(192)"), "priority_created" => array("priority", "created"), ) ); From 97fd47c614e0fe880a08ac06f243da6c07ed2afd Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 7 Jun 2017 08:46:38 +0000 Subject: [PATCH 044/160] Moved include to top --- mod/display.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index e31b89998c..365b657615 100644 --- a/mod/display.php +++ b/mod/display.php @@ -2,6 +2,8 @@ use Friendica\App; +require_once('include/dfrn.php'); + function display_init(App $a) { if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { @@ -13,7 +15,6 @@ function display_init(App $a) { if ($a->argc == 3) { if (substr($a->argv[2], -5) == '.atom') { - require_once('include/dfrn.php'); $item_id = substr($a->argv[2], 0, -5); $xml = dfrn::itemFeed($item_id); header("Content-type: application/atom+xml"); From 1b5f1effa0ed7d7774f34ebb199fcbf9e6fd9f4b Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 7 Jun 2017 09:51:21 +0000 Subject: [PATCH 045/160] Code beautification --- include/dfrn.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index 5d0e6337a4..a8f7644ff7 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -329,10 +329,7 @@ class dfrn { $alternatelink = $owner['url']; - $author = "dfrn:owner"; - //$author = "author"; - - $root = self::add_header($doc, $owner, $author, $alternatelink, true); + $root = self::add_header($doc, $owner, 'dfrn:owner', $alternatelink, true); $type = 'html'; From 71a5de40f105234aa8082844d7839c3e0e49e905 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 7 Jun 2017 18:34:17 +0000 Subject: [PATCH 046/160] The index mustn't be 192 characters long --- include/dbstructure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index 161df46f69..2dec998a74 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1743,7 +1743,7 @@ function db_definition() { "indexes" => array( "PRIMARY" => array("id"), "pid" => array("pid"), - "parameter" => array("parameter(192)"), + "parameter" => array("parameter(64)"), "priority_created" => array("priority", "created"), ) ); From 1916f7858faea4cf8ac96101feafa883adb08891 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 7 Jun 2017 19:51:37 +0000 Subject: [PATCH 047/160] Increase the page load speed with Frio --- include/acl_selectors.php | 7 +++++++ view/theme/frio/theme.php | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index c7c6bb206a..9ef1977bc5 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -389,6 +389,13 @@ function populate_acl($user = null, $show_jotnets = false) { function construct_acl_data(App $a, $user) { + $arr = array('user' => $user); + call_hooks('construct_acl_data', $arr); + + if (isset($arr['cancel'])) { + return; + } + // Get group and contact information for html ACL selector $acl_data = acl_lookup($a, 'html'); diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 551f39c8f7..cbb7324bcb 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -48,6 +48,7 @@ function frio_install() { register_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu'); register_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav'); register_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); + register_hook('construct_acl_data', 'view/theme/frio/theme.php', 'frio_construct_acl_data'); logger("installed theme frio"); } @@ -58,6 +59,7 @@ function frio_uninstall() { unregister_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu'); unregister_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav'); unregister_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); + unregister_hook('construct_acl_data', 'view/theme/frio/theme.php', 'frio_construct_acl_data'); logger("uninstalled theme frio"); } @@ -321,3 +323,15 @@ function frio_acl_lookup(App $a, &$results) { $results["tot"] = $total; } } + +/** + * @brief: Deactivate the old style acl selector + * + * We don't need the old one for Frio. Deactivating makes page loading much faster + * + * @param App $a The app data @TODO Unused + * @param array $arr We use this array to stop processing. See construct_acl_data in include/acl_selectors.php + */ +function frio_construct_acl_data(App $a, &$arr) { + $arr['cancel'] = true; +} From 504ceb2d439d81314efd5a97fc78d99d7e9e5dc2 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 7 Jun 2017 20:24:44 +0000 Subject: [PATCH 048/160] We should increase the database version number --- boot.php | 2 +- update.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 50b8f03f63..15341c0fed 100644 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.3-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1228 ); +define ( 'DB_UPDATE_VERSION', 1229 ); /** * @brief Constant with a HTML line break. diff --git a/update.php b/update.php index 76620a48a4..df52e8582b 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define('UPDATE_VERSION' , 1228); +define('UPDATE_VERSION' , 1229); /** * From 9c0d2c31e87a73f157b360c518eb059e9a2507de Mon Sep 17 00:00:00 2001 From: Hypolite Petovan <mrpetovan@gmail.com> Date: Wed, 7 Jun 2017 22:00:59 -0400 Subject: [PATCH 049/160] Replace AND and OR in PHP conditions by && and || --- boot.php | 20 ++-- include/Contact.php | 26 ++--- include/Photo.php | 12 +-- include/acl_selectors.php | 4 +- include/api.php | 60 +++++------ include/auth.php | 2 +- include/bbcode.php | 36 +++---- include/cache.php | 10 +- include/contact_selectors.php | 2 +- include/contact_widgets.php | 2 +- include/conversation.php | 6 +- include/cron.php | 6 +- include/cronhooks.php | 4 +- include/dba.php | 22 ++-- include/dba_pdo.php | 4 +- include/dbclean.php | 4 +- include/dbm.php | 2 +- include/dbstructure.php | 10 +- include/delivery.php | 6 +- include/dfrn.php | 36 +++---- include/diaspora.php | 60 +++++------ include/discover_poco.php | 10 +- include/enotify.php | 12 +-- include/follow.php | 4 +- include/gprobe.php | 2 +- include/group.php | 4 +- include/html2plain.php | 2 +- include/identity.php | 12 +-- include/items.php | 58 +++++------ include/nav.php | 2 +- include/network.php | 14 +-- include/notifier.php | 10 +- include/oembed.php | 4 +- include/onepoll.php | 4 +- include/ostatus.php | 78 +++++++------- include/photos.php | 2 +- include/pidfile.php | 2 +- include/plaintext.php | 30 +++--- include/plugin.php | 2 +- include/poller.php | 12 +-- include/post_update.php | 6 +- include/queue.php | 4 +- include/session.php | 2 +- include/socgraph.php | 108 ++++++++++---------- include/spool_post.php | 6 +- include/tags.php | 4 +- include/text.php | 10 +- include/threads.php | 8 +- include/update_gcontact.php | 8 +- include/xml.php | 12 +-- index.php | 14 +-- mod/admin.php | 12 +-- mod/community.php | 4 +- mod/contacts.php | 12 +-- mod/dfrn_request.php | 8 +- mod/dirfind.php | 4 +- mod/display.php | 8 +- mod/events.php | 2 +- mod/fetch.php | 2 +- mod/follow.php | 4 +- mod/item.php | 26 ++--- mod/network.php | 4 +- mod/nodeinfo.php | 16 +-- mod/noscrape.php | 4 +- mod/photo.php | 2 +- mod/ping.php | 12 +-- mod/poco.php | 16 +-- mod/proxy.php | 26 ++--- mod/register.php | 2 +- mod/search.php | 6 +- mod/settings.php | 10 +- mod/update_network.php | 2 +- object/Item.php | 18 ++-- src/App.php | 10 +- src/Core/Config.php | 4 +- src/Core/PConfig.php | 4 +- src/Network/Probe.php | 164 +++++++++++++++--------------- src/Util/Lock.php | 10 +- update.php | 2 +- util/maintenance.php | 2 +- view/theme/frio/php/frio_boot.php | 4 +- view/theme/vier/style.php | 2 +- view/theme/vier/theme.php | 10 +- 83 files changed, 596 insertions(+), 596 deletions(-) diff --git a/boot.php b/boot.php index 15341c0fed..6fd7c30372 100644 --- a/boot.php +++ b/boot.php @@ -993,7 +993,7 @@ function notice($s) { function info($s) { $a = get_app(); - if (local_user() AND get_pconfig(local_user(), 'system', 'ignore_info')) { + if (local_user() && get_pconfig(local_user(), 'system', 'ignore_info')) { return; } @@ -1063,7 +1063,7 @@ function proc_run($cmd) { $arr = array('args' => $args, 'run_cmd' => true); call_hooks("proc_run", $arr); - if (!$arr['run_cmd'] OR ! count($args)) { + if (!$arr['run_cmd'] || ! count($args)) { return; } @@ -1407,7 +1407,7 @@ function clear_cache($basepath = "", $path = "") { $path = $basepath; } - if (($path == "") OR (!is_dir($path))) { + if (($path == "") || (!is_dir($path))) { return; } @@ -1444,7 +1444,7 @@ function get_itemcachepath() { } $itemcache = get_config('system', 'itemcache'); - if (($itemcache != "") AND App::directory_usable($itemcache)) { + if (($itemcache != "") && App::directory_usable($itemcache)) { return $itemcache; } @@ -1471,7 +1471,7 @@ function get_itemcachepath() { */ function get_spoolpath() { $spoolpath = get_config('system', 'spoolpath'); - if (($spoolpath != "") AND App::directory_usable($spoolpath)) { + if (($spoolpath != "") && App::directory_usable($spoolpath)) { // We have a spool path and it is usable return $spoolpath; } @@ -1506,7 +1506,7 @@ function get_temppath() { $temppath = get_config("system", "temppath"); - if (($temppath != "") AND App::directory_usable($temppath)) { + if (($temppath != "") && App::directory_usable($temppath)) { // We have a temp path and it is usable return $temppath; } @@ -1515,7 +1515,7 @@ function get_temppath() { $temppath = sys_get_temp_dir(); // Check if it is usable - if (($temppath != "") AND App::directory_usable($temppath)) { + if (($temppath != "") && App::directory_usable($temppath)) { // To avoid any interferences with other systems we create our own directory $new_temppath = $temppath . "/" . $a->get_hostname(); if (!is_dir($new_temppath)) { @@ -1638,7 +1638,7 @@ function argv($x) { function infinite_scroll_data($module) { if (get_pconfig(local_user(), 'system', 'infinite_scroll') - AND ($module == "network") AND ($_GET["mode"] != "minimal")) { + && ($module == "network") && ($_GET["mode"] != "minimal")) { // get the page number if (is_string($_GET["page"])) { @@ -1651,12 +1651,12 @@ function infinite_scroll_data($module) { // try to get the uri from which we load the content foreach ($_GET AS $param => $value) { - if (($param != "page") AND ($param != "q")) { + if (($param != "page") && ($param != "q")) { $reload_uri .= "&" . $param . "=" . urlencode($value); } } - if (($a->page_offset != "") AND ! strstr($reload_uri, "&offset=")) { + if (($a->page_offset != "") && ! strstr($reload_uri, "&offset=")) { $reload_uri .= "&offset=" . urlencode($a->page_offset); } diff --git a/include/Contact.php b/include/Contact.php index bb6d8c1981..0aeabc9725 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -262,33 +262,33 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { $profile = $default; } - if (($profile["photo"] == "") AND isset($default["photo"])) { + if (($profile["photo"] == "") && isset($default["photo"])) { $profile["photo"] = $default["photo"]; } - if (($profile["name"] == "") AND isset($default["name"])) { + if (($profile["name"] == "") && isset($default["name"])) { $profile["name"] = $default["name"]; } - if (($profile["network"] == "") AND isset($default["network"])) { + if (($profile["network"] == "") && isset($default["network"])) { $profile["network"] = $default["network"]; } - if (($profile["thumb"] == "") AND isset($profile["photo"])) { + if (($profile["thumb"] == "") && isset($profile["photo"])) { $profile["thumb"] = $profile["photo"]; } - if (($profile["micro"] == "") AND isset($profile["thumb"])) { + if (($profile["micro"] == "") && isset($profile["thumb"])) { $profile["micro"] = $profile["thumb"]; } - if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND + if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0) && in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]); } // Show contact details of Diaspora contacts only if connected - if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) { + if (($profile["cid"] == 0) && ($profile["network"] == NETWORK_DIASPORA)) { $profile["location"] = ""; $profile["about"] = ""; $profile["gender"] = ""; @@ -559,7 +559,7 @@ function get_contact($url, $uid = 0, $no_update = false) { // Update the contact every 7 days $update_photo = ($contacts[0]['avatar-date'] < datetime_convert('','','now -7 days')); - if (!$update_photo OR $no_update) { + if (!$update_photo || $no_update) { return $contact_id; } } elseif ($uid != 0) { @@ -636,7 +636,7 @@ function get_contact($url, $uid = 0, $no_update = false) { } } - if (count($contacts) > 1 AND $uid == 0 AND $contact_id != 0 AND $url != "") { + if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $url != "") { q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`", dbesc(normalise_link($url)), intval($contact_id)); @@ -654,9 +654,9 @@ function get_contact($url, $uid = 0, $no_update = false) { } // Only update if there had something been changed - if ($data["addr"] != $contacts[0]["addr"] OR - $data["alias"] != $contacts[0]["alias"] OR - $data["name"] != $contacts[0]["name"] OR + if ($data["addr"] != $contacts[0]["addr"] || + $data["alias"] != $contacts[0]["alias"] || + $data["name"] != $contacts[0]["name"] || $data["nick"] != $contacts[0]["nick"]) { q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s', `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d", @@ -769,7 +769,7 @@ function formatted_location($profile) { if($profile['locality']) $location .= $profile['locality']; - if($profile['region'] AND ($profile['locality'] != $profile['region'])) { + if($profile['region'] && ($profile['locality'] != $profile['region'])) { if($location) $location .= ', '; diff --git a/include/Photo.php b/include/Photo.php index 5920f80b38..5c3a52ffd5 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -785,7 +785,7 @@ function update_contact_avatar($avatar, $uid, $cid, $force = false) { $data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]); } - if (($r[0]["avatar"] != $avatar) OR $force) { + if (($r[0]["avatar"] != $avatar) || $force) { $photos = import_profile_photo($avatar, $uid, $cid, true); if ($photos) { @@ -825,7 +825,7 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) { $filename = basename($photo); $img_str = fetch_url($photo, true); - if ($quit_on_error AND ($img_str == "")) { + if ($quit_on_error && ($img_str == "")) { return false; } @@ -883,7 +883,7 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) { $photo_failure = true; } - if ($photo_failure AND $quit_on_error) { + if ($photo_failure && $quit_on_error) { return false; } @@ -902,7 +902,7 @@ function get_photo_info($url) { $data = Cache::get($url); - if (is_null($data) OR !$data OR !is_array($data)) { + if (is_null($data) || !$data || !is_array($data)) { $img_str = fetch_url($url, true, $redirects, 4); $filesize = strlen($img_str); @@ -996,7 +996,7 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") { /// $default_cid = $r[0]['id']; /// $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); - if ((strlen($imagedata) == 0) AND ($url == "")) { + if ((strlen($imagedata) == 0) && ($url == "")) { logger("No image data and no url provided", LOGGER_DEBUG); return(array()); } elseif (strlen($imagedata) == 0) { @@ -1102,7 +1102,7 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") { } } - if ($width > 160 AND $height > 160) { + if ($width > 160 && $height > 160) { $x = 0; $y = 0; diff --git a/include/acl_selectors.php b/include/acl_selectors.php index c7c6bb206a..665ed17bdf 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -209,7 +209,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $tabindex = ($tabindex > 0 ? "tabindex=\"$tabindex\"" : ""); - if ($privmail AND $preselected) { + if ($privmail && $preselected) { $sql_extra .= " AND `id` IN (".implode(",", $preselected).")"; $hidepreselected = ' style="display: none;"'; } else { @@ -261,7 +261,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p $o .= "</select>\r\n"; - if ($privmail AND $preselected) { + if ($privmail && $preselected) { $o .= implode(", ", $receiverlist); } diff --git a/include/api.php b/include/api.php index 5d962ecd03..bc40e420b0 100644 --- a/include/api.php +++ b/include/api.php @@ -483,7 +483,7 @@ $called_api = null; logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG); // Searching for contact URL - if (!is_null($contact_id) AND (intval($contact_id) == 0)) { + if (!is_null($contact_id) && (intval($contact_id) == 0)) { $user = dbesc(normalise_link($contact_id)); $url = $user; $extra_query = "AND `contact`.`nurl` = '%s' "; @@ -493,7 +493,7 @@ $called_api = null; } // Searching for contact id with uid = 0 - if (!is_null($contact_id) AND (intval($contact_id) != 0)) { + if (!is_null($contact_id) && (intval($contact_id) != 0)) { $user = dbesc(api_unique_id_to_url($contact_id)); if ($user == "") { @@ -538,7 +538,7 @@ $called_api = null; } } - if (is_null($user) AND ($a->argc > (count($called_api) - 1)) AND (count($called_api) > 0)) { + if (is_null($user) && ($a->argc > (count($called_api) - 1)) && (count($called_api) > 0)) { $argid = count($called_api); list($user, $null) = explode(".", $a->argv[$argid]); if (is_numeric($user)) { @@ -600,7 +600,7 @@ $called_api = null; $network_name = network_to_name($r[0]['network'], $r[0]['url']); // If no nick where given, extract it from the address - if (($r[0]['nick'] == "") OR ($r[0]['name'] == $r[0]['nick'])) { + if (($r[0]['nick'] == "") || ($r[0]['name'] == $r[0]['nick'])) { $r[0]['nick'] = api_get_nick($r[0]["url"]); } @@ -716,7 +716,7 @@ $called_api = null; $starred = 0; // Add a nick if it isn't present there - if (($uinfo[0]['nick'] == "") OR ($uinfo[0]['name'] == $uinfo[0]['nick'])) { + if (($uinfo[0]['nick'] == "") || ($uinfo[0]['name'] == $uinfo[0]['nick'])) { $uinfo[0]['nick'] = api_get_nick($uinfo[0]["url"]); } @@ -749,7 +749,7 @@ $called_api = null; 'contributors_enabled' => false, 'is_translator' => false, 'is_translation_enabled' => false, - 'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) OR ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)), + 'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) || ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)), 'follow_request_sent' => false, 'statusnet_blocking' => false, 'notifications' => false, @@ -777,10 +777,10 @@ $called_api = null; $status_user = api_get_user($a, $item["author-link"]); - $status_user["protected"] = (($item["allow_cid"] != "") OR - ($item["allow_gid"] != "") OR - ($item["deny_cid"] != "") OR - ($item["deny_gid"] != "") OR + $status_user["protected"] = (($item["allow_cid"] != "") || + ($item["allow_gid"] != "") || + ($item["deny_cid"] != "") || + ($item["deny_gid"] != "") || $item["private"]); if ($item['thr-parent'] == $item['uri']) { @@ -1305,9 +1305,9 @@ $called_api = null; $status_info["entities"] = $converted["entities"]; } - if (($lastwall['item_network'] != "") AND ($status["source"] == 'web')) { + if (($lastwall['item_network'] != "") && ($status["source"] == 'web')) { $status_info["source"] = network_to_name($lastwall['item_network'], $user_info['url']); - } elseif (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) { + } elseif (($lastwall['item_network'] != "") && (network_to_name($lastwall['item_network'], $user_info['url']) != $status_info["source"])) { $status_info["source"] = trim($status_info["source"].' ('.network_to_name($lastwall['item_network'], $user_info['url']).')'); } @@ -1393,11 +1393,11 @@ $called_api = null; $user_info["status"]["entities"] = $converted["entities"]; } - if (($lastwall['item_network'] != "") AND ($user_info["status"]["source"] == 'web')) { + if (($lastwall['item_network'] != "") && ($user_info["status"]["source"] == 'web')) { $user_info["status"]["source"] = network_to_name($lastwall['item_network'], $user_info['url']); } - if (($lastwall['item_network'] != "") AND (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) { + if (($lastwall['item_network'] != "") && (network_to_name($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) { $user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . network_to_name($lastwall['item_network'], $user_info['url']) . ')'); } @@ -2289,11 +2289,11 @@ $called_api = null; $statushtml = "<h4>" . bbcode($item['title']) . "</h4>\n" . $statushtml; } - // feeds without body should contain the link - if (($item['network'] == NETWORK_FEED) && (strlen($item['body']) == 0)) { - $statushtml .= bbcode($item['plink']); - } - + // feeds without body should contain the link + if (($item['network'] == NETWORK_FEED) && (strlen($item['body']) == 0)) { + $statushtml .= bbcode($item['plink']); + } + $entities = api_get_entitities($statustext, $body); return array( @@ -2402,8 +2402,8 @@ $called_api = null; $offset = 0; //foreach ($urls[1] AS $id=>$url) { foreach ($ordered_urls AS $url) { - if ((substr($url["title"], 0, 7) != "http://") AND (substr($url["title"], 0, 8) != "https://") AND - !strpos($url["title"], "http://") AND !strpos($url["title"], "https://")) + if ((substr($url["title"], 0, 7) != "http://") && (substr($url["title"], 0, 8) != "https://") && + !strpos($url["title"], "http://") && !strpos($url["title"], "https://")) $display_url = $url["title"]; else { $display_url = str_replace(array("http://www.", "https://www."), array("", ""), $url["url"]); @@ -2455,7 +2455,7 @@ $called_api = null; $scale = scale_image($image[0], $image[1], 150); $sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); - if (($image[0] > 150) OR ($image[1] > 150)) { + if (($image[0] > 150) || ($image[1] > 150)) { $scale = scale_image($image[0], $image[1], 340); $sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); } @@ -2463,7 +2463,7 @@ $called_api = null; $scale = scale_image($image[0], $image[1], 600); $sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); - if (($image[0] > 600) OR ($image[1] > 600)) { + if (($image[0] > 600) || ($image[1] > 600)) { $scale = scale_image($image[0], $image[1], 1024); $sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit"); } @@ -2668,7 +2668,7 @@ $called_api = null; list($status_user, $owner_user) = api_item_get_user($a, $item); // Look if the posts are matching if they should be filtered by user id - if ($filter_user AND ($status_user["id"] != $user_info["id"])) { + if ($filter_user && ($status_user["id"] != $user_info["id"])) { continue; } @@ -2712,9 +2712,9 @@ $called_api = null; $status["entities"] = $converted["entities"]; } - if (($item['item_network'] != "") AND ($status["source"] == 'web')) { + if (($item['item_network'] != "") && ($status["source"] == 'web')) { $status["source"] = network_to_name($item['item_network'], $user_info['url']); - } elseif (($item['item_network'] != "") AND (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) { + } elseif (($item['item_network'] != "") && (network_to_name($item['item_network'], $user_info['url']) != $status["source"])) { $status["source"] = trim($status["source"].' ('.network_to_name($item['item_network'], $user_info['url']).')'); } @@ -2723,7 +2723,7 @@ $called_api = null; // It doesn't work reliable with the link if its a feed //$IsRetweet = ($item['owner-link'] != $item['author-link']); //if ($IsRetweet) - // $IsRetweet = (($item['owner-name'] != $item['author-name']) OR ($item['owner-avatar'] != $item['author-avatar'])); + // $IsRetweet = (($item['owner-name'] != $item['author-name']) || ($item['owner-avatar'] != $item['author-avatar'])); if ($item["id"] == $item["parent"]) { @@ -3022,7 +3022,7 @@ $called_api = null; if (api_user() === false) throw new ForbiddenException(); - if (!x($_POST, "text") OR (!x($_POST,"screen_name") AND !x($_POST,"user_id"))) return; + if (!x($_POST, "text") || (!x($_POST,"screen_name") && !x($_POST,"user_id"))) return; $sender = api_get_user($a); @@ -4334,7 +4334,7 @@ $called_api = null; $in_reply_to['user_id_str'] = NULL; $in_reply_to['screen_name'] = NULL; - if (($item['thr-parent'] != $item['uri']) AND (intval($item['parent']) != intval($item['id']))) { + if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) { $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", intval($item['uid']), dbesc($item['thr-parent'])); @@ -4415,7 +4415,7 @@ $called_api = null; if (isset($data["text"])) $body = $data["text"]; - if (($body == "") AND (isset($data["title"]))) + if (($body == "") && (isset($data["title"]))) $body = $data["title"]; if (isset($data["url"])) diff --git a/include/auth.php b/include/auth.php index 5dfe9d3e06..d301f87055 100644 --- a/include/auth.php +++ b/include/auth.php @@ -29,7 +29,7 @@ if (isset($_COOKIE["Friendica"])) { new_cookie($authcookiedays*24*60*60, $r[0]); // Do the authentification if not done by now - if (!isset($_SESSION) OR !isset($_SESSION['authenticated'])) { + if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) { authenticate_success($r[0]); if (get_config('system','paranoia')) diff --git a/include/bbcode.php b/include/bbcode.php index 9a43cdb305..2b2d7fc937 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -49,14 +49,14 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { $data["title"] = str_replace(array("http://", "https://"), "", $data["title"]); } - if (((strpos($data["text"], "[img=") !== false) OR (strpos($data["text"], "[img]") !== false)) AND ($data["image"] != "")) { + if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false)) && ($data["image"] != "")) { $data["preview"] = $data["image"]; $data["image"] = ""; } if ($simplehtml == 7) { $text = style_url_for_mastodon($data["url"]); - } elseif (($simplehtml != 4) AND ($simplehtml != 0)) { + } elseif (($simplehtml != 4) && ($simplehtml != 0)) { $text = sprintf('<a href="%s" target="_blank">%s</a><br>', $data["url"], $data["title"]); } else { $text = sprintf('<span class="type-%s">', $data["type"]); @@ -71,13 +71,13 @@ function bb_attachment($Text, $simplehtml = false, $tryoembed = true) { if (strstr(strtolower($oembed), "<iframe ")) { $text = $oembed; } else { - if (($data["image"] != "") AND !strstr(strtolower($oembed), "<img ")) { + if (($data["image"] != "") && !strstr(strtolower($oembed), "<img ")) { $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a><br />', $data["url"], proxy_url($data["image"]), $data["title"]); - } elseif (($data["preview"] != "") AND !strstr(strtolower($oembed), "<img ")) { + } elseif (($data["preview"] != "") && !strstr(strtolower($oembed), "<img ")) { $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-preview" /></a><br />', $data["url"], proxy_url($data["preview"]), $data["title"]); } - if (($data["type"] == "photo") AND ($data["url"] != "") AND ($data["image"] != "")) { + if (($data["type"] == "photo") && ($data["url"] != "") && ($data["image"] != "")) { $text .= sprintf('<a href="%s" target="_blank"><img src="%s" alt="" title="%s" class="attachment-image" /></a>', $data["url"], proxy_url($data["image"]), $data["title"]); } else { $text .= $oembed; @@ -103,25 +103,25 @@ function bb_remove_share_information($Text, $plaintext = false, $nolink = false) $title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false); $text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false); - if ($plaintext OR (($title != "") AND strstr($text, $title))) { + if ($plaintext || (($title != "") && strstr($text, $title))) { $data["title"] = $data["url"]; - } elseif (($text != "") AND strstr($title, $text)) { + } elseif (($text != "") && strstr($title, $text)) { $data["text"] = $data["title"]; $data["title"] = $data["url"]; } - if (($data["text"] == "") AND ($data["title"] != "") AND ($data["url"] == "")) { + if (($data["text"] == "") && ($data["title"] != "") && ($data["url"] == "")) { return $data["title"] . $data["after"]; } // If the link already is included in the post, don't add it again - if (($data["url"] != "") AND strpos($data["text"], $data["url"])) { + if (($data["url"] != "") && strpos($data["text"], $data["url"])) { return $data["text"] . $data["after"]; } $text = $data["text"]; - if (($data["url"] != "") AND ($data["title"] != "")) { + if (($data["url"] != "") && ($data["title"] != "")) { $text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]"; } elseif (($data["url"] != "")) { $text .= "\n" . $data["url"]; @@ -167,7 +167,7 @@ function cleancss($input) { function bb_style_url($match) { $url = $match[1]; - if (isset($match[2]) AND ($match[1] != $match[2])) { + if (isset($match[2]) && ($match[1] != $match[2])) { return $match[0]; } @@ -485,20 +485,20 @@ function bb_ShareAttributes($share, $simplehtml) { $data = get_contact_details_by_url($profile); - if (isset($data["name"]) AND ($data["name"] != "") AND isset($data["addr"]) AND ($data["addr"] != "")) + if (isset($data["name"]) && ($data["name"] != "") && isset($data["addr"]) && ($data["addr"] != "")) $userid_compact = $data["name"]." (".$data["addr"].")"; else $userid_compact = GetProfileUsername($profile,$author, true); - if (isset($data["addr"]) AND ($data["addr"] != "")) + if (isset($data["addr"]) && ($data["addr"] != "")) $userid = $data["addr"]; else $userid = GetProfileUsername($profile,$author, false); - if (isset($data["name"]) AND ($data["name"] != "")) + if (isset($data["name"]) && ($data["name"] != "")) $author = $data["name"]; - if (isset($data["micro"]) AND ($data["micro"] != "")) + if (isset($data["micro"]) && ($data["micro"] != "")) $avatar = $data["micro"]; $preshare = trim($share[1]); @@ -744,7 +744,7 @@ function bb_RemovePictureLinks($match) { } function bb_expand_links($match) { - if (($match[3] == "") OR ($match[2] == $match[3]) OR stristr($match[2], $match[3])) { + if (($match[3] == "") || ($match[2] == $match[3]) || stristr($match[2], $match[3])) { return ($match[1] . "[url]" . $match[2] . "[/url]"); } else { return ($match[1] . $match[3] . " [url]" . $match[2] . "[/url]"); @@ -930,7 +930,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa $MAILSearchString = $URLSearchString; // Remove all hashtag addresses - if ((!$tryoembed OR $simplehtml) AND !in_array($simplehtml, array(3, 7))) { + if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, array(3, 7))) { $Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); } elseif ($simplehtml == 3) { $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", @@ -1319,7 +1319,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // Clean up the HTML by loading and saving the HTML with the DOM. // Bad structured html can break a whole page. // For performance reasons do it only with ativated item cache or at export. - if (!$tryoembed OR (get_itemcachepath() != "")) { + if (!$tryoembed || (get_itemcachepath() != "")) { $doc = new DOMDocument(); $doc->preserveWhiteSpace = false; diff --git a/include/cache.php b/include/cache.php index b56906c544..d3b24c19e7 100644 --- a/include/cache.php +++ b/include/cache.php @@ -172,35 +172,35 @@ class Cache { set_config("system", "cache_cleared_day", time()); } - if (($max_level <= CACHE_HOUR) AND (get_config("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) { + if (($max_level <= CACHE_HOUR) && (get_config("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) { q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", dbesc(datetime_convert('UTC','UTC',"now - 1 hours")), intval(CACHE_HOUR)); set_config("system", "cache_cleared_hour", time()); } - if (($max_level <= CACHE_HALF_HOUR) AND (get_config("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) { + if (($max_level <= CACHE_HALF_HOUR) && (get_config("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) { q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", dbesc(datetime_convert('UTC','UTC',"now - 30 minutes")), intval(CACHE_HALF_HOUR)); set_config("system", "cache_cleared_half_hour", time()); } - if (($max_level <= CACHE_QUARTER_HOUR) AND (get_config("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) { + if (($max_level <= CACHE_QUARTER_HOUR) && (get_config("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) { q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", dbesc(datetime_convert('UTC','UTC',"now - 15 minutes")), intval(CACHE_QUARTER_HOUR)); set_config("system", "cache_cleared_quarter_hour", time()); } - if (($max_level <= CACHE_FIVE_MINUTES) AND (get_config("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) { + if (($max_level <= CACHE_FIVE_MINUTES) && (get_config("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) { q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", dbesc(datetime_convert('UTC','UTC',"now - 5 minutes")), intval(CACHE_FIVE_MINUTES)); set_config("system", "cache_cleared_five_minute", time()); } - if (($max_level <= CACHE_MINUTE) AND (get_config("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) { + if (($max_level <= CACHE_MINUTE) && (get_config("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) { q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", dbesc(datetime_convert('UTC','UTC',"now - 1 minutes")), intval(CACHE_MINUTE)); diff --git a/include/contact_selectors.php b/include/contact_selectors.php index 7069af0664..27bdb47570 100644 --- a/include/contact_selectors.php +++ b/include/contact_selectors.php @@ -100,7 +100,7 @@ function network_to_name($s, $profile = "") { $networkname = str_replace($search, $replace, $s); - if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) AND ($profile != "")) { + if ((in_array($s, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) && ($profile != "")) { $r = q("SELECT `gserver`.`platform` FROM `gcontact` INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url` WHERE `gcontact`.`nurl` = '%s' AND `platform` != ''", diff --git a/include/contact_widgets.php b/include/contact_widgets.php index db077b420f..3cd18c7792 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -51,7 +51,7 @@ function unavailable_networks() { $networks[] = NETWORK_APPNET; } - if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) { + if (!plugin_enabled("fbpost") && !plugin_enabled("facebook")) { $networks[] = NETWORK_FACEBOOK; } diff --git a/include/conversation.php b/include/conversation.php index 27f9578ed8..e58df19f16 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -712,7 +712,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { $profile_link = zrl($profile_link); } - if (!x($item, 'author-thumb') OR ($item['author-thumb'] == "")) { + if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) { $author_contact = get_contact_details_by_url($item['author-link'], $profile_owner); if ($author_contact["thumb"]) { $item['author-thumb'] = $author_contact["thumb"]; @@ -721,7 +721,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) { } } - if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { + if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) { $owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner); if ($owner_contact["thumb"]) { $item['owner-thumb'] = $owner_contact["thumb"]; @@ -1013,7 +1013,7 @@ function item_photo_menu($item) { $menu[t("Poke")] = $poke_link; } - if ((($cid == 0) OR ($rel == CONTACT_IS_FOLLOWER)) AND + if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) && in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { $menu[t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']); } diff --git a/include/cron.php b/include/cron.php index 70b87e9696..76f3e41019 100644 --- a/include/cron.php +++ b/include/cron.php @@ -186,7 +186,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'] && 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) @@ -197,7 +197,7 @@ function cron_poll_contacts($argc, $argv) { $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3); } - if (($contact['priority'] >= 0) AND !$force) { + if (($contact['priority'] >= 0) && !$force) { $update = false; $t = $contact['last-update']; @@ -245,7 +245,7 @@ function cron_poll_contacts($argc, $argv) { logger("Polling " . $contact["network"] . " " . $contact["id"] . " " . $contact["nick"] . " " . $contact["name"]); - if (($contact['network'] == NETWORK_FEED) AND ($contact['priority'] <= 3)) { + if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) { $priority = PRIORITY_MEDIUM; } else { $priority = PRIORITY_LOW; diff --git a/include/cronhooks.php b/include/cronhooks.php index 2c378aa39c..4a852935a0 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -7,7 +7,7 @@ function cronhooks_run(&$argv, &$argc) { require_once 'include/datetime.php'; - if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { + if (($argc == 2) && is_array($a->hooks) && array_key_exists("cron", $a->hooks)) { foreach ($a->hooks["cron"] as $hook) { if ($hook[1] == $argv[1]) { logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG); @@ -38,7 +38,7 @@ function cronhooks_run(&$argv, &$argc) { $d = datetime_convert(); - if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) { + if (is_array($a->hooks) && array_key_exists("cron", $a->hooks)) { foreach ($a->hooks["cron"] as $hook) { logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG); proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]); diff --git a/include/dba.php b/include/dba.php index 1f428bf465..e4846899dc 100644 --- a/include/dba.php +++ b/include/dba.php @@ -117,7 +117,7 @@ class dba { /** * @brief Returns the MySQL server version string - * + * * This function discriminate between the deprecated mysql API and the current * object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1 * @@ -183,17 +183,17 @@ class dba { foreach ($r AS $row) { if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) { - $log = (in_array($row['key'], $watchlist) AND + $log = (in_array($row['key'], $watchlist) && ($row['rows'] >= intval($a->config["system"]["db_loglimit_index"]))); } else { $log = false; } - if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) { + if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) && ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) { $log = true; } - if (in_array($row['key'], $blacklist) OR ($row['key'] == "")) { + if (in_array($row['key'], $blacklist) || ($row['key'] == "")) { $log = false; } @@ -363,7 +363,7 @@ class dba { // PDO doesn't return "true" on successful operations - like mysqli does // Emulate this behaviour by checking if the query returned data and had columns // This should be reliable enough - if (($this->driver == 'pdo') AND (count($r) == 0) AND ($columns == 0)) { + if (($this->driver == 'pdo') && (count($r) == 0) && ($columns == 0)) { return true; } @@ -490,7 +490,7 @@ class dba { static private function replace_parameters($sql, $args) { $offset = 0; foreach ($args AS $param => $value) { - if (is_int($args[$param]) OR is_float($args[$param])) { + if (is_int($args[$param]) || is_float($args[$param])) { $replace = intval($args[$param]); } else { $replace = "'".self::$dbo->escape($args[$param])."'"; @@ -520,7 +520,7 @@ class dba { unset($args[0]); // When the second function parameter is an array then use this as the parameter array - if ((count($args) > 0) AND (is_array($args[1]))) { + if ((count($args) > 0) && (is_array($args[1]))) { $params = $args[1]; } else { $params = $args; @@ -533,7 +533,7 @@ class dba { $args[++$i] = $param; } - if (!self::$dbo OR !self::$dbo->connected) { + if (!self::$dbo || !self::$dbo->connected) { return false; } @@ -948,7 +948,7 @@ class dba { // When the search field is the relation field, we don't need to fetch the rows // This is useful when the leading record is already deleted in the frontend but the rest is done in the backend - if ((count($param) == 1) AND ($field == array_keys($param)[0])) { + if ((count($param) == 1) && ($field == array_keys($param)[0])) { foreach ($rel_def AS $rel_table => $rel_fields) { foreach ($rel_fields AS $rel_field) { $retval = self::delete($rel_table, array($rel_field => array_values($param)[0]), true, $callstack); @@ -1110,7 +1110,7 @@ class dba { } } - if (!$do_update OR (count($fields) == 0)) { + if (!$do_update || (count($fields) == 0)) { return true; } @@ -1190,7 +1190,7 @@ class dba { $result = self::p($sql, $condition); - if (is_bool($result) OR !$single_row) { + if (is_bool($result) || !$single_row) { return $result; } else { $row = self::fetch($result); diff --git a/include/dba_pdo.php b/include/dba_pdo.php index 63f35739a3..2ad5ab7447 100644 --- a/include/dba_pdo.php +++ b/include/dba_pdo.php @@ -190,14 +190,14 @@ class dba { * regardless of any logging that may or may nor be in effect. * These usually indicate SQL syntax errors that need to be resolved. */ - if (isset($result) AND ($result === false)) { + if (isset($result) && ($result === false)) { logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error); if (file_exists('dbfail.out')) { file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND); } } - if (isset($result) AND (($result === true) || ($result === false))) { + if (isset($result) && (($result === true) || ($result === false))) { return $result; } diff --git a/include/dbclean.php b/include/dbclean.php index 8da78d64b5..bc41bead2d 100644 --- a/include/dbclean.php +++ b/include/dbclean.php @@ -24,7 +24,7 @@ function dbclean_run(&$argv, &$argc) { for ($i = 1; $i <= 9; $i++) { // Execute the background script for a step when it isn't finished. // Execute step 8 and 9 only when $days is defined. - if (!Config::get('system', 'finished-dbclean-'.$i, false) AND (($i < 8) OR ($days > 0))) { + if (!Config::get('system', 'finished-dbclean-'.$i, false) && (($i < 8) || ($days > 0))) { proc_run(PRIORITY_LOW, 'include/dbclean.php', $i); } } @@ -296,7 +296,7 @@ function remove_orphans($stage = 0) { } // Call it again if not all entries were purged - if (($stage != 0) AND ($count > 0)) { + if (($stage != 0) && ($count > 0)) { proc_run(PRIORITY_MEDIUM, 'include/dbclean.php'); } } diff --git a/include/dbm.php b/include/dbm.php index db50dae89c..bda62f34c2 100644 --- a/include/dbm.php +++ b/include/dbm.php @@ -76,7 +76,7 @@ class dbm { if (is_bool($value)) { $value = ($value ? 'true' : 'false'); - } elseif (is_float($value) OR is_integer($value)) { + } elseif (is_float($value) || is_integer($value)) { $value = (string)$value; } else { $value = "'".dbesc($value)."'"; diff --git a/include/dbstructure.php b/include/dbstructure.php index 2dec998a74..b53befbf29 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -133,7 +133,7 @@ function table_structure($table) { // On utf8mb4 a varchar index can only have a length of 191 // The "show index" command sometimes returns this value although this value wasn't added manually. // Because we don't want to add this number to every index, we ignore bigger numbers - if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 191) OR ($index["Key_name"] == "PRIMARY"))) { + if (($index["Sub_part"] != "") && (($index["Sub_part"] < 191) || ($index["Key_name"] == "PRIMARY"))) { $column .= "(".$index["Sub_part"].")"; } @@ -232,7 +232,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { } // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements - if ((version_compare($db->server_info(), '5.7.4') >= 0) AND + if ((version_compare($db->server_info(), '5.7.4') >= 0) && !(strpos($db->server_info(), 'MariaDB') !== false)) { $ignore = ''; } else { @@ -381,7 +381,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { $field_definition = $database[$name]["fields"][$fieldname]; // Define the default collation if not given - if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) { + if (!isset($parameters['Collation']) && !is_null($field_definition['Collation'])) { $parameters['Collation'] = 'utf8mb4_general_ci'; } else { $parameters['Collation'] = null; @@ -389,7 +389,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) { if ($field_definition['Collation'] != $parameters['Collation']) { $sql2 = db_modify_table_field($fieldname, $parameters); - if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) { + if (($sql3 == "") || (substr($sql3, -2, 2) == "; ")) { $sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2; } else { $sql3 .= ", ".$sql2; @@ -513,7 +513,7 @@ function db_field_command($parameters, $create = true) { if ($parameters["extra"] != "") $fieldstruct .= " ".$parameters["extra"]; - /*if (($parameters["primary"] != "") AND $create) + /*if (($parameters["primary"] != "") && $create) $fieldstruct .= " PRIMARY KEY";*/ return($fieldstruct); diff --git a/include/delivery.php b/include/delivery.php index 098e423d17..9e6d8ffe61 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -339,7 +339,7 @@ function delivery_run(&$argv, &$argc){ // If we are setup as a soapbox we aren't accepting top level posts from this person - if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level) { + if (($x[0]['page-flags'] == PAGE_SOAPBOX) && $top_level) { break; } logger('mod-delivery: local delivery'); @@ -462,14 +462,14 @@ function delivery_run(&$argv, &$argc){ dbesc($it['parent-uri']), intval($uid)); - if (dbm::is_result($r) AND ($r[0]['title'] != '')) { + if (dbm::is_result($r) && ($r[0]['title'] != '')) { $subject = $r[0]['title']; } else { $r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($it['parent-uri']), intval($uid)); - if (dbm::is_result($r) AND ($r[0]['title'] != '')) + if (dbm::is_result($r) && ($r[0]['title'] != '')) $subject = $r[0]['title']; } } diff --git a/include/dfrn.php b/include/dfrn.php index 7e4d7af2bc..1b97f39a2d 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -245,7 +245,7 @@ class dfrn { /// @TODO This hook can't work anymore // call_hooks('atom_feed', $atom); - if (!dbm::is_result($items) OR $onlyheader) { + if (!dbm::is_result($items) || $onlyheader) { $atom = trim($doc->saveXML()); call_hooks('atom_feed_end', $atom); @@ -508,7 +508,7 @@ class dfrn { $attributes = array(); - if (!$public OR !$hidewall) { + if (!$public || !$hidewall) { $attributes = array("dfrn:updated" => $namdate); } @@ -519,7 +519,7 @@ class dfrn { $attributes = array("rel" => "photo", "type" => "image/jpeg", "media:width" => 175, "media:height" => 175, "href" => $owner['photo']); - if (!$public OR !$hidewall) { + if (!$public || !$hidewall) { $attributes["dfrn:updated"] = $picdate; } @@ -921,7 +921,7 @@ class dfrn { if (count($tags)) { foreach ($tags as $t) { - if (($type != 'html') OR ($t[0] != "@")) { + if (($type != 'html') || ($t[0] != "@")) { xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2])); } } @@ -940,7 +940,7 @@ class dfrn { intval($owner["uid"]), dbesc(normalise_link($mention))); - if (dbm::is_result($r) AND ($r[0]["forum"] OR $r[0]["prv"])) { + if (dbm::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) { xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned", "ostatus:object-type" => ACTIVITY_OBJ_GROUP, "href" => $mention)); @@ -1323,7 +1323,7 @@ class dfrn { $contact["avatar-date"] = $attributes->textContent; } } - if (($width > 0) AND ($href != "")) { + if (($width > 0) && ($href != "")) { $avatarlist[$width] = $href; } } @@ -1332,7 +1332,7 @@ class dfrn { $author["avatar"] = current($avatarlist); } - if (dbm::is_result($r) AND !$onlyfetch) { + if (dbm::is_result($r) && !$onlyfetch) { logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG); $poco = array("url" => $contact["url"]); @@ -1774,7 +1774,7 @@ class dfrn { $relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue; $relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue; - if (($relocate["avatar"] == "") AND ($relocate["photo"] != "")) { + if (($relocate["avatar"] == "") && ($relocate["photo"] != "")) { $relocate["avatar"] = $relocate["photo"]; } @@ -1922,7 +1922,7 @@ class dfrn { } // update last-child if it changes - if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) { + if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) { $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", dbesc(datetime_convert()), dbesc($item["parent-uri"]), @@ -2206,7 +2206,7 @@ class dfrn { $title = $attributes->textContent; } } - if (($rel != "") AND ($href != "")) { + if (($rel != "") && ($href != "")) { switch ($rel) { case "alternate": $item["plink"] = $href; @@ -2254,7 +2254,7 @@ class dfrn { ); // Is there an existing item? - if (dbm::is_result($current) AND edited_timestamp_is_newer($current[0], $item) AND + if (dbm::is_result($current) && edited_timestamp_is_newer($current[0], $item) && (datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) { logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG); return; @@ -2328,7 +2328,7 @@ class dfrn { } $notice_info = $xpath->query("statusnet:notice_info", $entry); - if ($notice_info AND ($notice_info->length > 0)) { + if ($notice_info && ($notice_info->length > 0)) { foreach ($notice_info->item(0)->attributes AS $attributes) { if ($attributes->name == "source") { $item["app"] = strip_tags($attributes->textContent); @@ -2378,9 +2378,9 @@ class dfrn { } } - if (($term != "") AND ($scheme != "")) { + if (($term != "") && ($scheme != "")) { $parts = explode(":", $scheme); - if ((count($parts) >= 4) AND (array_shift($parts) == "X-DFRN")) { + if ((count($parts) >= 4) && (array_shift($parts) == "X-DFRN")) { $termhash = array_shift($parts); $termurl = implode(":", $parts); @@ -2440,7 +2440,7 @@ class dfrn { $item["contact-id"] = $owner["contact-id"]; } - if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) { + if (($item["network"] != $owner["network"]) && ($owner["network"] != "")) { $item["network"] = $owner["network"]; } @@ -2448,7 +2448,7 @@ class dfrn { $item["contact-id"] = $author["contact-id"]; } - if (($item["network"] != $author["network"]) AND ($author["network"] != "")) { + if (($item["network"] != $author["network"]) && ($author["network"] != "")) { $item["network"] = $author["network"]; } @@ -2548,7 +2548,7 @@ class dfrn { ); } - if ($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) { + if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) { logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG); proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id); } @@ -2613,7 +2613,7 @@ class dfrn { $when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s"); } - if (!$uri OR !$importer["id"]) { + if (!$uri || !$importer["id"]) { return false; } diff --git a/include/diaspora.php b/include/diaspora.php index 25f1aa03b8..62c77f5b2f 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -416,7 +416,7 @@ class Diaspora { $fields = $postdata['fields']; // Is it a an action (comment, like, ...) for our own post? - if (isset($fields->parent_guid) AND !$postdata["relayed"]) { + if (isset($fields->parent_guid) && !$postdata["relayed"]) { $guid = notags(unxmlify($fields->parent_guid)); $importer = self::importer_for_guid($guid); if (is_array($importer)) { @@ -612,9 +612,9 @@ class Diaspora { } } - if (($fieldname == "author_signature") AND ($entry != "")) + if (($fieldname == "author_signature") && ($entry != "")) $author_signature = base64_decode($entry); - elseif (($fieldname == "parent_author_signature") AND ($entry != "")) + elseif (($fieldname == "parent_author_signature") && ($entry != "")) $parent_author_signature = base64_decode($entry); elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) { if ($signed_data != "") { @@ -624,7 +624,7 @@ class Diaspora { $signed_data .= $entry; } - if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) OR + if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) || ($orig_type == "relayable_retraction")) xml::copy($entry, $fields, $fieldname); } @@ -714,13 +714,13 @@ class Diaspora { $update = true; } - if (!$person OR $update) { + if (!$person || $update) { logger("create or refresh", LOGGER_DEBUG); $r = probe_url($handle, PROBE_DIASPORA); // Note that Friendica contacts will return a "Diaspora person" // if Diaspora connectivity is enabled on their server - if ($r AND ($r["network"] === NETWORK_DIASPORA)) { + if ($r && ($r["network"] === NETWORK_DIASPORA)) { self::add_fcontact($r, $update); $person = $r; } @@ -1143,7 +1143,7 @@ class Diaspora { // Fetch the author - for the old and the new Diaspora version if ($source_xml->post->status_message->diaspora_handle) $author = (string)$source_xml->post->status_message->diaspora_handle; - elseif ($source_xml->author AND ($source_xml->getName() == "status_message")) + elseif ($source_xml->author && ($source_xml->getName() == "status_message")) $author = (string)$source_xml->author; // If this isn't a "status_message" then quit @@ -1463,7 +1463,7 @@ class Diaspora { } // If we are the origin of the parent we store the original data and notify our followers - if ($message_id AND $parent_item["origin"]) { + if ($message_id && $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -1767,7 +1767,7 @@ class Diaspora { } // If we are the origin of the parent we store the original data and notify our followers - if ($message_id AND $parent_item["origin"]) { + if ($message_id && $parent_item["origin"]) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. @@ -2116,7 +2116,7 @@ class Diaspora { // perhaps we were already sharing with this person. Now they're sharing with us. // That makes us friends. if ($contact) { - if ($following AND $sharing) { + if ($following && $sharing) { logger("Author ".$author." (Contact ".$contact["id"].") wants to have a bidirectional conection.", LOGGER_DEBUG); self::receive_request_make_friend($importer, $contact); @@ -2139,17 +2139,17 @@ class Diaspora { } } - if (!$following AND $sharing AND in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) { + if (!$following && $sharing && in_array($importer["page-flags"], array(PAGE_SOAPBOX, PAGE_NORMAL))) { logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG); return false; - } elseif (!$following AND !$sharing) { + } elseif (!$following && !$sharing) { logger("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", LOGGER_DEBUG); return false; - } elseif (!$following AND $sharing) { + } elseif (!$following && $sharing) { logger("Author ".$author." wants to share with us.", LOGGER_DEBUG); - } elseif ($following AND $sharing) { + } elseif ($following && $sharing) { logger("Author ".$author." wants to have a bidirectional conection.", LOGGER_DEBUG); - } elseif ($following AND !$sharing) { + } elseif ($following && !$sharing) { logger("Author ".$author." wants to listen to us.", LOGGER_DEBUG); } @@ -2227,9 +2227,9 @@ class Diaspora { // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX // we are going to change the relationship and make them a follower. - if (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing AND $following) + if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) $new_relation = CONTACT_IS_FRIEND; - elseif (($importer["page-flags"] == PAGE_FREELOVE) AND $sharing) + elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) $new_relation = CONTACT_IS_SHARING; else $new_relation = CONTACT_IS_FOLLOWER; @@ -2452,7 +2452,7 @@ class Diaspora { intval($r[0]["parent"])); // Only delete it if the parent author really fits - if (!link_compare($p[0]["author-link"], $contact["url"]) AND !link_compare($r[0]["author-link"], $contact["url"])) { + if (!link_compare($p[0]["author-link"], $contact["url"]) && !link_compare($r[0]["author-link"], $contact["url"])) { logger("Thread author ".$p[0]["author-link"]." and item author ".$r[0]["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG); return false; } @@ -2489,7 +2489,7 @@ class Diaspora { $target_type = notags(unxmlify($data->target_type)); $contact = self::contact_by_handle($importer["uid"], $sender); - if (!$contact AND (in_array($target_type, array("Contact", "Person")))) { + if (!$contact && (in_array($target_type, array("Contact", "Person")))) { logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]); return false; } @@ -2617,7 +2617,7 @@ class Diaspora { $datarray["location"] = $address["address"]; } - if (isset($address["lat"]) AND isset($address["lng"])) { + if (isset($address["lat"]) && isset($address["lng"])) { $datarray["coord"] = $address["lat"]." ".$address["lng"]; } @@ -2930,7 +2930,7 @@ class Diaspora { // The message could not be delivered. We mark the contact as "dead" mark_for_death($contact); } - } elseif (($return_code >= 200) AND ($return_code <= 299)) { + } elseif (($return_code >= 200) && ($return_code <= 299)) { // We successfully delivered a message, the contact is alive unmark_for_death($contact); } @@ -3040,7 +3040,7 @@ class Diaspora { // Skip if it isn't a pure repeated messages // Does it start with a share? - if ((strpos($body, "[share") > 0) AND $complete) + if ((strpos($body, "[share") > 0) && $complete) return(false); // Does it end with a share? @@ -3088,7 +3088,7 @@ class Diaspora { $ret= array(); $ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile); - if (($ret["root_handle"] == $profile) OR ($ret["root_handle"] == "")) + if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) return(false); $link = ""; @@ -3101,7 +3101,7 @@ class Diaspora { $link = $matches[1]; $ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link); - if (($ret["root_guid"] == $link) OR (trim($ret["root_guid"]) == "")) + if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == "")) return(false); return($ret); @@ -3161,7 +3161,7 @@ class Diaspora { if ($event['start']) { $eventdata['start'] = datetime_convert($eventdata['timezone'], "UTC", $event['start'], $mask); } - if ($event['finish'] AND !$event['nofinish']) { + if ($event['finish'] && !$event['nofinish']) { $eventdata['end'] = datetime_convert($eventdata['timezone'], "UTC", $event['finish'], $mask); } if ($event['summary']) { @@ -3207,7 +3207,7 @@ class Diaspora { $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); // Detect a share element and do a reshare - if (!$item['private'] AND ($ret = self::is_reshare($item["body"]))) { + if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) { $message = array("root_diaspora_id" => $ret["root_handle"], "root_guid" => $ret["root_guid"], "guid" => $item["guid"], @@ -3257,7 +3257,7 @@ class Diaspora { "provider_display_name" => $item["app"]); // Diaspora rejects messages when they contain a location without "lat" or "lng" - if (!isset($location["lat"]) OR !isset($location["lng"])) { + if (!isset($location["lat"]) || !isset($location["lng"])) { unset($message["location"]); } @@ -3532,7 +3532,7 @@ class Diaspora { // Old way - is used by the internal Friendica functions /// @todo Change all signatur storing functions to the new format - if ($signature['signed_text'] AND $signature['signature'] AND $signature['signer']) + if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) $message = self::message_from_signature($item, $signature); else {// New way $msg = json_decode($signature['signed_text'], true); @@ -3584,7 +3584,7 @@ class Diaspora { $target_type = "StatusMessage"; } - if ($relay AND ($item["uri"] !== $item["parent-uri"])) + if ($relay && ($item["uri"] !== $item["parent-uri"])) $signature = "parent_author_signature"; else $signature = "target_author_signature"; @@ -3764,7 +3764,7 @@ class Diaspora { public static function store_like_signature($contact, $post_id) { // Is the contact the owner? Then fetch the private key - if (!$contact['self'] OR ($contact['uid'] == 0)) { + if (!$contact['self'] || ($contact['uid'] == 0)) { logger("No owner post, so not storing signature", LOGGER_DEBUG); return false; } diff --git a/include/discover_poco.php b/include/discover_poco.php index e71c26fc18..11794c32d7 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -81,12 +81,12 @@ function discover_poco_run(&$argv, &$argc) { logger($result, LOGGER_DEBUG); } elseif ($mode == 3) { update_suggestions(); - } elseif (($mode == 2) AND get_config('system','poco_completion')) { + } elseif (($mode == 2) && get_config('system','poco_completion')) { discover_users(); - } elseif (($mode == 1) AND ($search != "") and get_config('system','poco_local_search')) { + } elseif (($mode == 1) && ($search != "") and get_config('system','poco_local_search')) { discover_directory($search); gs_search_user($search); - } elseif (($mode == 0) AND ($search == "") and (get_config('system','poco_discovery') > 0)) { + } elseif (($mode == 0) && ($search == "") and (get_config('system','poco_discovery') > 0)) { // Query Friendica and Hubzilla servers for their users poco_discover(); @@ -176,7 +176,7 @@ function discover_users() { $server_url = $user["server_url"]; } - if ((($server_url == "") AND ($user["network"] == NETWORK_FEED)) OR $force_update OR poco_check_server($server_url, $user["network"])) { + if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) { logger('Check profile '.$user["url"]); proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"])); @@ -216,7 +216,7 @@ function discover_directory($search) { if (dbm::is_result($exists)) { logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG); - if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) AND + if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) && ($exists[0]["updated"] < $exists[0]["last_failure"])) { continue; } diff --git a/include/enotify.php b/include/enotify.php index 08129da1a5..d0fcbeef10 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -99,7 +99,7 @@ function notification($params) { intval($parent_id), intval($params['uid']) ); - if ($p AND count($p) AND ($p[0]["ignored"])) { + if ($p && count($p) && ($p[0]["ignored"])) { logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG); return; } @@ -515,7 +515,7 @@ function notification($params) { logger('sending notification email'); - if (isset($params['parent']) AND (intval($params['parent']) != 0)) { + if (isset($params['parent']) && (intval($params['parent']) != 0)) { $id_for_parent = $params['parent']."@".$hostname; // Is this the first email notification for this parent item and user? @@ -676,7 +676,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { // Check for invalid profile urls. 13 should be the shortest possible profile length: // http://a.bc/d // Additionally check for invalid urls that would return the normalised value "http:" - if ((strlen($profile) >= 13) AND (normalise_link($profile) != "http:")) { + if ((strlen($profile) >= 13) && (normalise_link($profile) != "http:")) { if (!in_array($profile, $profiles2)) $profiles2[] = $profile; @@ -760,11 +760,11 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $tagged = false; foreach ($profiles AS $profile) { - if (strpos($item[0]["tag"], "=".$profile."]") OR strpos($item[0]["body"], "=".$profile."]")) + if (strpos($item[0]["tag"], "=".$profile."]") || strpos($item[0]["body"], "=".$profile."]")) $tagged = true; } - if ($item[0]["mention"] OR $tagged OR ($defaulttype == NOTIFY_TAGSELF)) { + if ($item[0]["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) { $params["type"] = NOTIFY_TAGSELF; $params["verb"] = ACTIVITY_TAG; } @@ -776,7 +776,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { LIMIT 1", intval($item[0]["parent"]), intval($uid)); - if ($parent AND !isset($params["type"])) { + if ($parent && !isset($params["type"])) { $params["type"] = NOTIFY_COMMENT; $params["verb"] = ACTIVITY_POST; } diff --git a/include/follow.php b/include/follow.php index cdeac6db2a..711579ff5a 100644 --- a/include/follow.php +++ b/include/follow.php @@ -30,10 +30,10 @@ function update_contact($id) { // make sure to not overwrite existing values with blank entries foreach ($ret AS $key => $val) { - if (isset($r[0][$key]) AND ($r[0][$key] != "") AND ($val == "")) + if (isset($r[0][$key]) && ($r[0][$key] != "") && ($val == "")) $ret[$key] = $r[0][$key]; - if (isset($r[0][$key]) AND ($ret[$key] != $r[0][$key])) + if (isset($r[0][$key]) && ($ret[$key] != $r[0][$key])) $update = true; } diff --git a/include/gprobe.php b/include/gprobe.php index 8e9ebd1227..788a9eb044 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -47,7 +47,7 @@ function gprobe_run(&$argv, &$argc){ } if (dbm::is_result($r)) { // Check for accessibility and do a poco discovery - if (poco_last_updated($r[0]['url'], true) AND ($r[0]["network"] == NETWORK_DFRN)) + if (poco_last_updated($r[0]['url'], true) && ($r[0]["network"] == NETWORK_DFRN)) poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url'])); } diff --git a/include/group.php b/include/group.php index fa0e8f59a6..ab805e6874 100644 --- a/include/group.php +++ b/include/group.php @@ -22,7 +22,7 @@ function group_add($uid,$name) { intval($uid), dbesc($name) ); - notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); + notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); } return true; } @@ -320,7 +320,7 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) { if (dbm::is_result($r)) foreach ($r as $rr) $ret[] = $rr['contact-id']; - if ($check_dead AND !$use_gcontact) { + if ($check_dead && !$use_gcontact) { require_once('include/acl_selectors.php'); $ret = prune_deadguys($ret); } diff --git a/include/html2plain.php b/include/html2plain.php index ed338ce710..da308a5c69 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -212,7 +212,7 @@ function html2plain($html, $wraplength = 75, $compact = false) $message = html_entity_decode($message, ENT_QUOTES, 'UTF-8'); - if (!$compact AND ($message != "")) { + if (!$compact && ($message != "")) { $counter = 1; foreach ($urls as $id=>$url) if ($url != "") diff --git a/include/identity.php b/include/identity.php index 25b24f289b..c733bea31b 100644 --- a/include/identity.php +++ b/include/identity.php @@ -217,7 +217,7 @@ function profile_sidebar($profile, $block = 0) { $profile['picdate'] = urlencode($profile['picdate']); - if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) { + if (($profile['network'] != "") && ($profile['network'] != NETWORK_DFRN)) { $profile['network_name'] = format_network_name($profile['network'], $profile['url']); } else { $profile['network_name'] = ""; @@ -240,7 +240,7 @@ function profile_sidebar($profile, $block = 0) { } // Is the local user already connected to that user? - if ($connect AND local_user()) { + if ($connect && local_user()) { if (isset($profile["url"])) { $profile_url = normalise_link($profile["url"]); } else { @@ -254,19 +254,19 @@ function profile_sidebar($profile, $block = 0) { $connect = false; } - if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect'])) + if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect'])) $connect = false; $remoteconnect = NULL; if (isset($profile['remoteconnect'])) $remoteconnect = $profile['remoteconnect']; - if ($connect AND ($profile['network'] == NETWORK_DFRN) AND !isset($remoteconnect)) + if ($connect && ($profile['network'] == NETWORK_DFRN) && !isset($remoteconnect)) $subscribe_feed = t("Atom feed"); else $subscribe_feed = false; - if (remote_user() OR (get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))) { + if (remote_user() || (get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))) { $wallmessage = t('Message'); $wallmessage_link = "wallmessage/".$profile["nickname"]; @@ -379,7 +379,7 @@ function profile_sidebar($profile, $block = 0) { if (!$block) { $contact_block = contact_block(); - if (is_array($a->profile) AND !$a->profile['hide-friends']) { + if (is_array($a->profile) && !$a->profile['hide-friends']) { $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", intval($a->profile['uid'])); if (dbm::is_result($r)) diff --git a/include/items.php b/include/items.php index 4a68bd2864..234c001942 100644 --- a/include/items.php +++ b/include/items.php @@ -159,16 +159,16 @@ function add_page_info_data($data) { // It maybe is a rich content, but if it does have everything that a link has, // then treat it that way - if (($data["type"] == "rich") AND is_string($data["title"]) AND - is_string($data["text"]) AND (sizeof($data["images"]) > 0)) { + if (($data["type"] == "rich") && is_string($data["title"]) && + is_string($data["text"]) && (sizeof($data["images"]) > 0)) { $data["type"] = "link"; } - if ((($data["type"] != "link") AND ($data["type"] != "video") AND ($data["type"] != "photo")) OR ($data["title"] == $data["url"])) { + if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) { return ""; } - if ($no_photos AND ($data["type"] == "photo")) { + if ($no_photos && ($data["type"] == "photo")) { return ""; } @@ -204,7 +204,7 @@ function add_page_info_data($data) { $preview = str_replace(array("[", "]"), array("[", "]"), htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false)); // if the preview picture is larger than 500 pixels then show it in a larger mode // But only, if the picture isn't higher than large (To prevent huge posts) - if (($data["images"][0]["width"] >= 500) AND ($data["images"][0]["width"] >= $data["images"][0]["height"])) { + if (($data["images"][0]["width"] >= 500) && ($data["images"][0]["width"] >= $data["images"][0]["height"])) { $text .= " image='".$preview."'"; } else { $text .= " preview='".$preview."'"; @@ -214,7 +214,7 @@ function add_page_info_data($data) { $text .= "]".$data["text"]."[/attachment]"; $hashtags = ""; - if (isset($data["keywords"]) AND count($data["keywords"])) { + if (isset($data["keywords"]) && count($data["keywords"])) { $hashtags = "\n"; foreach ($data["keywords"] AS $keyword) { /// @todo make a positive list of allowed characters @@ -237,11 +237,11 @@ function query_page_info($url, $no_photos = false, $photo = "", $keywords = fals logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG); - if (!$keywords AND isset($data["keywords"])) { + if (!$keywords && isset($data["keywords"])) { unset($data["keywords"]); } - if (($keyword_blacklist != "") AND isset($data["keywords"])) { + if (($keyword_blacklist != "") && isset($data["keywords"])) { $list = explode(", ", $keyword_blacklist); foreach ($list AS $keyword) { $keyword = trim($keyword); @@ -259,7 +259,7 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa $data = query_page_info($url, $no_photos, $photo, $keywords, $keyword_blacklist); $tags = ""; - if (isset($data["keywords"]) AND count($data["keywords"])) { + if (isset($data["keywords"]) && count($data["keywords"])) { foreach ($data["keywords"] AS $keyword) { $hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"), array("", "", "", "", "", ""), $keyword); @@ -301,7 +301,7 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { } // Convert urls without bbcode elements - if (!$matches AND $texturl) { + if (!$matches && $texturl) { preg_match("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", " ".$body, $matches); // Yeah, a hack. I really hate regular expressions :) @@ -315,21 +315,21 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) { } // Remove the link from the body if the link is attached at the end of the post - if (isset($footer) AND (trim($footer) != "") AND (strpos($footer, $matches[1]))) { + if (isset($footer) && (trim($footer) != "") && (strpos($footer, $matches[1]))) { $removedlink = trim(str_replace($matches[1], "", $body)); - if (($removedlink == "") OR strstr($body, $removedlink)) { + if (($removedlink == "") || strstr($body, $removedlink)) { $body = $removedlink; } $url = str_replace(array('/', '.'), array('\/', '\.'), $matches[1]); $removedlink = preg_replace("/\[url\=" . $url . "\](.*?)\[\/url\]/ism", '', $body); - if (($removedlink == "") OR strstr($body, $removedlink)) { + if (($removedlink == "") || strstr($body, $removedlink)) { $body = $removedlink; } } // Add the page information to the bottom - if (isset($footer) AND (trim($footer) != "")) { + if (isset($footer) && (trim($footer) != "")) { $body .= $footer; } @@ -421,10 +421,10 @@ function store_conversation($arr) { if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { $conversation = array('item-uri' => $arr['uri'], 'received' => dbm::date()); - if (isset($arr['parent-uri']) AND ($arr['parent-uri'] != $arr['uri'])) { + if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) { $conversation['reply-to-uri'] = $arr['parent-uri']; } - if (isset($arr['thr-parent']) AND ($arr['thr-parent'] != $arr['uri'])) { + if (isset($arr['thr-parent']) && ($arr['thr-parent'] != $arr['uri'])) { $conversation['reply-to-uri'] = $arr['thr-parent']; } @@ -453,7 +453,7 @@ function store_conversation($arr) { unset($old_conv['source']); } // Update structure data all the time but the source only when its from a better protocol. - if (($old_conv['protocol'] < $conversation['protocol']) AND ($old_conv['protocol'] != 0)) { + if (($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) { unset($conversation['protocol']); unset($conversation['source']); } @@ -503,9 +503,9 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f if ($notify) { $guid_prefix = ""; - } elseif ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) { + } elseif ((trim($arr['guid']) == "") && (trim($arr['plink']) != "")) { $arr['guid'] = uri_to_guid($arr['plink']); - } elseif ((trim($arr['guid']) == "") AND (trim($arr['uri']) != "")) { + } elseif ((trim($arr['guid']) == "") && (trim($arr['uri']) != "")) { $arr['guid'] = uri_to_guid($arr['uri']); } else { $parsed = parse_url($arr["author-link"]); @@ -653,7 +653,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $arr['edited'] = datetime_convert(); } - if (($arr['author-link'] == "") AND ($arr['owner-link'] == "")) { + if (($arr['author-link'] == "") && ($arr['owner-link'] == "")) { logger("Both author-link and owner-link are empty. Called by: " . App::callstack(), LOGGER_DEBUG); } @@ -832,7 +832,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f $a = get_app(); $self = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']); logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG); - if ((normalise_link($arr['author-link']) == $self) OR (normalise_link($arr['owner-link']) == $self)) { + if ((normalise_link($arr['author-link']) == $self) || (normalise_link($arr['owner-link']) == $self)) { q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", intval($parent_id)); logger("item_store: tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG); } @@ -1051,7 +1051,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f // update the commented timestamp on the parent // Only update "commented" if it is really a comment - if (($arr['verb'] == ACTIVITY_POST) OR !get_config("system", "like_no_comment")) { + if (($arr['verb'] == ACTIVITY_POST) || !get_config("system", "like_no_comment")) { q("UPDATE `item` SET `commented` = '%s', `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), dbesc(datetime_convert()), @@ -1089,7 +1089,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f * current post can be deleted if is for a community page and no mention are * in it. */ - if (!$deleted AND !$dontcache) { + if (!$deleted && !$dontcache) { $r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post)); if ((dbm::is_result($r)) && (count($r) == 1)) { @@ -1156,10 +1156,10 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f */ function item_set_last_item($arr) { - $update = (!$arr['private'] AND (($arr["author-link"] === $arr["owner-link"]) OR ($arr["parent-uri"] === $arr["uri"]))); + $update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"]))); // Is it a forum? Then we don't care about the rules from above - if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) { + if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) { $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`", intval($arr['contact-id'])); if (dbm::is_result($isforum)) { @@ -1600,7 +1600,7 @@ function item_is_remote_self($contact, &$datarray) { return false; } - if (($contact['network'] != NETWORK_FEED) AND $datarray['private']) { + if (($contact['network'] != NETWORK_FEED) && $datarray['private']) { return false; } @@ -1701,7 +1701,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { intval($importer['uid']) ); - if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { + if (dbm::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { // create notification $hash = random_string(); @@ -1741,7 +1741,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) { )); } - } elseif (dbm::is_result($r) AND in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { + } elseif (dbm::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { $r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1", intval($importer['uid']), dbesc($url) @@ -1803,7 +1803,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') { logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token); - if (!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) { + if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) { $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d", dbesc($verify_token), intval($contact['id']) diff --git a/include/nav.php b/include/nav.php index 3c7c932e28..435e892d91 100644 --- a/include/nav.php +++ b/include/nav.php @@ -121,7 +121,7 @@ function nav_info(App $a) $nav['apps'] = array('apps', t('Apps'), '', t('Addon applications, utilities, games')); } - if (local_user() OR !get_config('system', 'local_search')) { + if (local_user() || !get_config('system', 'local_search')) { $nav['search'] = array('search', t('Search'), '', t('Search site content')); $nav['searchoption'] = array( diff --git a/include/network.php b/include/network.php index 7d8cf36118..035abc478a 100644 --- a/include/network.php +++ b/include/network.php @@ -187,7 +187,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) { $newurl = $curl_info['redirect_url']; - if (($new_location_info['path'] == '') AND ( $new_location_info['host'] != '')) { + if (($new_location_info['path'] == '') && ( $new_location_info['host'] != '')) { $newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path']; } @@ -818,8 +818,8 @@ function original_url($url, $depth = 1, $fetchbody = false) { if ($http_code == 0) return($url); - if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302")) - AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) { + if ((($curl_info['http_code'] == "301") || ($curl_info['http_code'] == "302")) + && (($curl_info['redirect_url'] != "") || ($curl_info['location'] != ""))) { if ($curl_info['redirect_url'] != "") return(original_url($curl_info['redirect_url'], ++$depth, $fetchbody)); else @@ -835,7 +835,7 @@ function original_url($url, $depth = 1, $fetchbody = false) { return($url); // if it isn't a HTML file then exit - if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html")) + if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]),"html")) return($url); $stamp1 = microtime(true); @@ -929,7 +929,7 @@ function json_return_and_die($x) { */ function matching_url($url1, $url2) { - if (($url1 == "") OR ($url2 == "")) + if (($url1 == "") || ($url2 == "")) return ""; $url1 = normalise_link($url1); @@ -938,7 +938,7 @@ function matching_url($url1, $url2) { $parts1 = parse_url($url1); $parts2 = parse_url($url2); - if (!isset($parts1["host"]) OR !isset($parts2["host"])) + if (!isset($parts1["host"]) || !isset($parts2["host"])) return ""; if ($parts1["scheme"] != $parts2["scheme"]) @@ -967,7 +967,7 @@ function matching_url($url1, $url2) { if ($path1 == $path2) $path .= $path1."/"; - } while (($path1 == $path2) AND ($i++ <= count($pathparts1))); + } while (($path1 == $path2) && ($i++ <= count($pathparts1))); $match .= $path; diff --git a/include/notifier.php b/include/notifier.php index a08057f677..94124fee1f 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -306,13 +306,13 @@ function notifier_run(&$argv, &$argc){ $recipients = array($parent['contact-id']); $recipients_followup = array($parent['contact-id']); - //if (!$target_item['private'] AND $target_item['wall'] AND - if (!$target_item['private'] AND + //if (!$target_item['private'] && $target_item['wall'] && + if (!$target_item['private'] && (strlen($target_item['allow_cid'].$target_item['allow_gid']. $target_item['deny_cid'].$target_item['deny_gid']) == 0)) $push_notify = true; - if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) { + if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) { $push_notify = true; @@ -396,7 +396,7 @@ function notifier_run(&$argv, &$argc){ // If the thread parent is OStatus then do some magic to distribute the messages. // We have not only to look at the parent, since it could be a Friendica thread. - if (($thr_parent AND ($thr_parent[0]['network'] == NETWORK_OSTATUS)) OR ($parent['network'] == NETWORK_OSTATUS)) { + if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) { $diaspora_delivery = false; @@ -573,7 +573,7 @@ function notifier_run(&$argv, &$argc){ } // Notify PuSH subscribers (Used for OStatus distribution of regular posts) - if ($push_notify AND strlen($hub)) { + if ($push_notify && strlen($hub)) { $hubs = explode(',', $hub); if (count($hubs)) { foreach ($hubs as $h) { diff --git a/include/oembed.php b/include/oembed.php index d28a97e322..0f3296b254 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -108,7 +108,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ $j->embedurl = $embedurl; // If fetching information doesn't work, then improve via internal functions - if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) { + if (($j->type == "error") || ($no_rich_type && ($j->type == "rich"))) { $data = ParseUrl::getSiteinfoCached($embedurl, true, false); $j->type = $data["type"]; @@ -194,7 +194,7 @@ function oembed_format_object($j){ if (isset($j->author_name)) { $ret.=" (".$j->author_name.")"; } - } elseif (isset($j->provider_name) OR isset($j->author_name)) { + } elseif (isset($j->provider_name) || isset($j->author_name)) { $embedlink = ""; if (isset($j->provider_name)) { $embedlink .= $j->provider_name; diff --git a/include/onepoll.php b/include/onepoll.php index cf5a1f576a..bcb9d09be2 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -68,7 +68,7 @@ function onepoll_run(&$argv, &$argc){ $contact = $contacts[0]; // load current friends if possible. - if (($contact['poco'] != "") AND ($contact['success_update'] > $contact['failure_update'])) { + if (($contact['poco'] != "") && ($contact['success_update'] > $contact['failure_update'])) { $r = q("SELECT count(*) as total from glink where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", intval($contact['id']) @@ -395,7 +395,7 @@ function onepoll_run(&$argv, &$argc){ logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG); // Only delete when mails aren't automatically moved or deleted - if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3)) + if (($mailconf[0]['action'] != 1) && ($mailconf[0]['action'] != 3)) if ($meta->deleted && ! $r[0]['deleted']) { q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), diff --git a/include/ostatus.php b/include/ostatus.php index 2b52de7344..16471f4d4c 100644 --- a/include/ostatus.php +++ b/include/ostatus.php @@ -54,7 +54,7 @@ class ostatus { $alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes; if (is_object($alternate)) { foreach ($alternate AS $attributes) { - if (($attributes->name == "href") AND ($attributes->textContent != "")) { + if (($attributes->name == "href") && ($attributes->textContent != "")) { $author["author-link"] = $attributes->textContent; } } @@ -100,7 +100,7 @@ class ostatus { $width = $attributes->textContent; } } - if (($width > 0) AND ($href != "")) { + if (($width > 0) && ($href != "")) { $avatarlist[$width] = $href; } } @@ -119,7 +119,7 @@ class ostatus { $author["owner-avatar"] = $author["author-avatar"]; // Only update the contacts if it is an OStatus contact - if ($r AND !$onlyfetch AND ($contact["network"] == NETWORK_OSTATUS)) { + if ($r && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) { // Update contact data @@ -153,8 +153,8 @@ class ostatus { if ($value != "") $contact["location"] = $value; - if (($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["about"] != $r[0]["about"]) OR - ($contact["alias"] != $r[0]["alias"]) OR ($contact["location"] != $r[0]["location"])) { + if (($contact["name"] != $r[0]["name"]) || ($contact["nick"] != $r[0]["nick"]) || ($contact["about"] != $r[0]["about"]) || + ($contact["alias"] != $r[0]["alias"]) || ($contact["location"] != $r[0]["location"])) { logger("Update contact data for contact ".$contact["id"], LOGGER_DEBUG); @@ -164,7 +164,7 @@ class ostatus { dbesc(datetime_convert()), intval($contact["id"])); } - if (isset($author["author-avatar"]) AND ($author["author-avatar"] != $r[0]['avatar'])) { + if (isset($author["author-avatar"]) && ($author["author-avatar"] != $r[0]['avatar'])) { logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG); update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]); @@ -354,13 +354,13 @@ class ostatus { $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; // Mastodon Content Warning - if (($item["verb"] == ACTIVITY_POST) AND $xpath->evaluate('boolean(atom:summary)', $entry)) { + if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) { $clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; $item["body"] = html2bbcode($clear_text) . '[spoiler]' . $item["body"] . '[/spoiler]'; } - if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { + if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { $item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue; $item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue; } elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) { @@ -469,11 +469,11 @@ class ostatus { foreach ($links AS $link) { $attribute = self::read_attributes($link); - if (($attribute['rel'] != "") AND ($attribute['href'] != "")) { + if (($attribute['rel'] != "") && ($attribute['href'] != "")) { switch ($attribute['rel']) { case "alternate": $item["plink"] = $attribute['href']; - if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR + if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) { $item["body"] .= add_page_info($attribute['href']); } @@ -525,7 +525,7 @@ class ostatus { $repeat_of = ""; $notice_info = $xpath->query('statusnet:notice_info', $entry); - if ($notice_info AND ($notice_info->length > 0)) { + if ($notice_info && ($notice_info->length > 0)) { foreach ($notice_info->item(0)->attributes AS $attributes) { if ($attributes->name == "source") { $item["app"] = strip_tags($attributes->textContent); @@ -540,7 +540,7 @@ class ostatus { } // Is it a repeated post? - if (($repeat_of != "") OR ($item["verb"] == ACTIVITY_SHARE)) { + if (($repeat_of != "") || ($item["verb"] == ACTIVITY_SHARE)) { $activityobjects = $xpath->query('activity:object', $entry)->item(0); if (is_object($activityobjects)) { @@ -550,7 +550,7 @@ class ostatus { $orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue; } $orig_links = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects); - if ($orig_links AND ($orig_links->length > 0)) { + if ($orig_links && ($orig_links->length > 0)) { foreach ($orig_links->item(0)->attributes AS $attributes) { if ($attributes->name == "href") { $orig_link = $attributes->textContent; @@ -621,8 +621,8 @@ class ostatus { intval($importer["uid"]), dbesc($item["parent-uri"])); // Only fetch missing stuff if it is a comment or reshare. - if (in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_SHARE)) AND - !dbm::is_result($r) AND ($related != "")) { + if (in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_SHARE)) && + !dbm::is_result($r) && ($related != "")) { $reply_path = str_replace("/notice/", "/api/statuses/show/", $related).".atom"; if ($reply_path != $related) { @@ -668,16 +668,16 @@ class ostatus { public static function convert_href($href) { $elements = explode(":",$href); - if ((count($elements) <= 2) OR ($elements[0] != "tag")) + if ((count($elements) <= 2) || ($elements[0] != "tag")) return $href; $server = explode(",", $elements[1]); $conversation = explode("=", $elements[2]); - if ((count($elements) == 4) AND ($elements[2] == "post")) + if ((count($elements) == 4) && ($elements[2] == "post")) return "http://".$server[0]."/notice/".$elements[3]; - if ((count($conversation) != 2) OR ($conversation[1] =="")) + if ((count($conversation) != 2) || ($conversation[1] =="")) return $href; if ($elements[3] == "objectType=thread") @@ -703,7 +703,7 @@ class ostatus { } // Don't poll if the interval is set negative - if (($poll_interval < 0) AND !$override) { + if (($poll_interval < 0) && !$override) { return; } @@ -720,7 +720,7 @@ class ostatus { } - if ($last AND !$override) { + if ($last && !$override) { $next = $last + ($poll_interval * 60); if ($next > time()) { logger('poll interval not reached'); @@ -818,7 +818,7 @@ class ostatus { if ($conversation_id != "") { $elements = explode(":", $conversation_id); - if ((count($elements) <= 2) OR ($elements[0] != "tag")) + if ((count($elements) <= 2) || ($elements[0] != "tag")) return $conversation_id; } @@ -933,8 +933,8 @@ class ostatus { // If the thread shouldn't be completed then store the item and go away // Don't do a completion on liked content - if (((intval(get_config('system','ostatus_poll_interval')) == -2) AND (count($item) > 0)) OR - ($item["verb"] == ACTIVITY_LIKE) OR ($conversation_url == "")) { + if (((intval(get_config('system','ostatus_poll_interval')) == -2) && (count($item) > 0)) || + ($item["verb"] == ACTIVITY_LIKE) || ($conversation_url == "")) { $item_stored = item_store($item, $all_threads); return $item_stored; } @@ -979,10 +979,10 @@ class ostatus { $conv_arr = z_fetch_url($conv."?page=".$pageno); // If it is a non-ssl site and there is an error, then try ssl or vice versa - if (!$conv_arr["success"] AND (substr($conv, 0, 7) == "http://")) { + if (!$conv_arr["success"] && (substr($conv, 0, 7) == "http://")) { $conv = str_replace("http://", "https://", $conv); $conv_as = fetch_url($conv."?page=".$pageno); - } elseif (!$conv_arr["success"] AND (substr($conv, 0, 8) == "https://")) { + } elseif (!$conv_arr["success"] && (substr($conv, 0, 8) == "https://")) { $conv = str_replace("https://", "http://", $conv); $conv_as = fetch_url($conv."?page=".$pageno); } else @@ -1057,7 +1057,7 @@ class ostatus { // 1. Our conversation hasn't the "real" thread starter // 2. This first post is a post inside our thread // 3. This first post is a post inside another thread - if (($first_id != $parent["uri"]) AND ($parent["uri"] != "")) { + if (($first_id != $parent["uri"]) && ($parent["uri"] != "")) { $new_parent = true; @@ -1144,7 +1144,7 @@ class ostatus { } // The item we are having on the system is the one that we wanted to store via the item array - if (isset($item["uri"]) AND ($item["uri"] == $existing_message["uri"])) { + if (isset($item["uri"]) && ($item["uri"] == $existing_message["uri"])) { $item = array(); $item_stored = 0; } @@ -1164,7 +1164,7 @@ class ostatus { $details = self::get_actor_details($actor, $uid, $parent["contact-id"]); // Do we only want to import threads that were started by our contacts? - if ($details["not_following"] AND $new_parent AND get_config('system','ostatus_full_threads')) { + if ($details["not_following"] && $new_parent && get_config('system','ostatus_full_threads')) { logger("Don't import uri ".$first_id." because user ".$uid." doesn't follow the person ".$actor, LOGGER_DEBUG); continue; } @@ -1218,7 +1218,7 @@ class ostatus { $arr["coord"] = trim($single_conv->location->lat." ".$single_conv->location->lon); // Is it a reshared item? - if (isset($single_conv->verb) AND ($single_conv->verb == "share") AND isset($single_conv->object)) { + if (isset($single_conv->verb) && ($single_conv->verb == "share") && isset($single_conv->object)) { if (is_array($single_conv->object)) $single_conv->object = $single_conv->object[0]; @@ -1277,7 +1277,7 @@ class ostatus { unset($arr["coord"]); // Copy fields from given item array - if (isset($item["uri"]) AND (($item["uri"] == $arr["uri"]) OR ($item["uri"] == $single_conv->id))) { + if (isset($item["uri"]) && (($item["uri"] == $arr["uri"]) || ($item["uri"] == $single_conv->id))) { logger('Use stored item array for item with URI '.$item["uri"], LOGGER_DEBUG); $newitem = item_store($item); $item = array(); @@ -1307,7 +1307,7 @@ class ostatus { } } - if (($item_stored < 0) AND (count($item) > 0)) { + if (($item_stored < 0) && (count($item) > 0)) { if (get_config('system','ostatus_full_threads')) { $details = self::get_actor_details($item["owner-link"], $uid, $item["contact-id"]); @@ -1543,7 +1543,7 @@ class ostatus { break; } - if (($siteinfo["type"] != "photo") AND isset($siteinfo["image"])) { + if (($siteinfo["type"] != "photo") && isset($siteinfo["image"])) { $imgdata = get_photo_info($siteinfo["image"]); $attributes = array("rel" => "enclosure", "href" => $siteinfo["image"], @@ -1788,7 +1788,7 @@ class ostatus { */ private function reshare_entry($doc, $item, $owner, $repeated_guid, $toplevel) { - if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { + if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); } @@ -1854,7 +1854,7 @@ class ostatus { */ private function like_entry($doc, $item, $owner, $toplevel) { - if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { + if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); } @@ -1999,7 +1999,7 @@ class ostatus { */ private function note_entry($doc, $item, $owner, $toplevel) { - if (($item["id"] != $item["parent"]) AND (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { + if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) { logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG); } @@ -2080,7 +2080,7 @@ class ostatus { xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html", "href" => App::get_baseurl()."/display/".$item["guid"])); - if ($complete AND ($item["id"] > 0)) + if ($complete && ($item["id"] > 0)) xml::add_element($doc, $entry, "status_net", "", array("notice_id" => $item["id"])); xml::add_element($doc, $entry, "activity:verb", $verb); @@ -2102,7 +2102,7 @@ class ostatus { $mentioned = array(); - if (($item['parent'] != $item['id']) OR ($item['parent-uri'] !== $item['uri']) OR (($item['thr-parent'] !== '') AND ($item['thr-parent'] !== $item['uri']))) { + if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); @@ -2175,7 +2175,7 @@ class ostatus { $r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'", intval($owner["uid"]), dbesc(normalise_link($mention))); - if ($r[0]["forum"] OR $r[0]["prv"]) + if ($r[0]["forum"] || $r[0]["prv"]) xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned", "ostatus:object-type" => ACTIVITY_OBJ_GROUP, "href" => $mention)); @@ -2201,7 +2201,7 @@ class ostatus { self::get_attachment($doc, $entry, $item); - if ($complete AND ($item["id"] > 0)) { + if ($complete && ($item["id"] > 0)) { $app = $item["app"]; if ($app == "") $app = "web"; diff --git a/include/photos.php b/include/photos.php index 38cda3f2ba..a1faffc259 100644 --- a/include/photos.php +++ b/include/photos.php @@ -44,7 +44,7 @@ function photo_albums($uid, $update = false) { $key = "photo_albums:".$uid.":".local_user().":".remote_user(); $albums = Cache::get($key); - if (is_null($albums) OR $update) { + if (is_null($albums) || $update) { if (!Config::get('system', 'no_count', false)) { /// @todo This query needs to be renewed. It is really slow // At this time we just store the data in the cache diff --git a/include/pidfile.php b/include/pidfile.php index dda6b3e9c1..7157a6e591 100644 --- a/include/pidfile.php +++ b/include/pidfile.php @@ -8,7 +8,7 @@ class pidfile { if (file_exists($this->_file)) { $pid = trim(@file_get_contents($this->_file)); - if (($pid != "") AND posix_kill($pid, 0)) { + if (($pid != "") && posix_kill($pid, 0)) { $this->_running = true; } } diff --git a/include/plaintext.php b/include/plaintext.php index 215d9f3db7..1d16aa2e8d 100644 --- a/include/plaintext.php +++ b/include/plaintext.php @@ -54,7 +54,7 @@ function get_old_attachment_data($body) { $picturedata = get_photo_info($matches[1]); - if (($picturedata[0] >= 500) AND ($picturedata[0] >= $picturedata[1])) + if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1])) $post["image"] = $matches[1]; else $post["preview"] = $matches[1]; @@ -64,8 +64,8 @@ function get_old_attachment_data($body) { $post["url"] = $matches[1]; $post["title"] = $matches[2]; } - if (($post["url"] == "") AND (in_array($post["type"], array("link", "video"))) - AND preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) { + if (($post["url"] == "") && (in_array($post["type"], array("link", "video"))) + && preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) { $post["url"] = $matches[1]; } @@ -204,7 +204,7 @@ function get_attached_data($body) { // Workaround: // Sometimes photo posts to the own album are not detected at the start. // So we seem to cannot use the cache for these cases. That's strange. - if (($data["type"] != "photo") AND strstr($pictures[0][1], "/photos/")) + if (($data["type"] != "photo") && strstr($pictures[0][1], "/photos/")) $data = ParseUrl::getSiteinfo($pictures[0][1], true); if ($data["type"] == "photo") { @@ -256,7 +256,7 @@ function get_attached_data($body) { $post["type"] = "text"; $post["text"] = trim($body); } - } elseif (isset($post["url"]) AND ($post["type"] == "video")) { + } elseif (isset($post["url"]) && ($post["type"] == "video")) { $data = ParseUrl::getSiteinfoCached($post["url"], true); if (isset($data["images"][0])) @@ -278,7 +278,7 @@ function shortenmsg($msg, $limit, $twitter = false) { if (iconv_strlen(trim($msg."\n".$line), "UTF-8") <= $limit) $msg = trim($msg."\n".$line); // Is the new message empty by now or is it a reshared message? - elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle))) + elseif (($msg == "") || (($row == 1) && (substr($msg, 0, 4) == $recycle))) $msg = iconv_substr(iconv_substr(trim($msg."\n".$line), 0, $limit, "UTF-8"), 0, -3, "UTF-8").$ellipsis; else break; @@ -315,7 +315,7 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 //$post = get_attached_data($b["body"]); $post = get_attached_data($body); - if (($b["title"] != "") AND ($post["text"] != "")) + if (($b["title"] != "") && ($post["text"] != "")) $post["text"] = trim($b["title"]."\n\n".$post["text"]); elseif ($b["title"] != "") $post["text"] = trim($b["title"]); @@ -329,7 +329,7 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 // If we post to a network with no limit we only fetch // an abstract exactly for this network - if (($limit == 0) AND ($abstract == $default_abstract)) + if (($limit == 0) && ($abstract == $default_abstract)) $abstract = ""; } else // Try to guess the correct target network @@ -373,25 +373,25 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 elseif ($post["type"] == "photo") $link = $post["image"]; - if (($msg == "") AND isset($post["title"])) + if (($msg == "") && isset($post["title"])) $msg = trim($post["title"]); - if (($msg == "") AND isset($post["description"])) + if (($msg == "") && isset($post["description"])) $msg = trim($post["description"]); // If the link is already contained in the post, then it neeedn't to be added again // But: if the link is beyond the limit, then it has to be added. - if (($link != "") AND strstr($msg, $link)) { + if (($link != "") && strstr($msg, $link)) { $pos = strpos($msg, $link); // Will the text be shortened in the link? // Or is the link the last item in the post? - if (($limit > 0) AND ($pos < $limit) AND (($pos + 23 > $limit) OR ($pos + strlen($link) == strlen($msg)))) + if (($limit > 0) && ($pos < $limit) && (($pos + 23 > $limit) || ($pos + strlen($link) == strlen($msg)))) $msg = trim(str_replace($link, "", $msg)); - elseif (($limit == 0) OR ($pos < $limit)) { + elseif (($limit == 0) || ($pos < $limit)) { // The limit has to be increased since it will be shortened - but not now // Only do it with Twitter (htmlmode = 8) - if (($limit > 0) AND (strlen($link) > 23) AND ($htmlmode == 8)) + if (($limit > 0) && (strlen($link) > 23) && ($htmlmode == 8)) $limit = $limit - 23 + strlen($link); $link = ""; @@ -414,7 +414,7 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2 if (iconv_strlen($msg, "UTF-8") > $limit) { - if (($post["type"] == "text") AND isset($post["url"])) + if (($post["type"] == "text") && isset($post["url"])) $post["url"] = $b["plink"]; elseif (!isset($post["url"])) { $limit = $limit - 23; diff --git a/include/plugin.php b/include/plugin.php index 9021f814b1..0c43b4d448 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -563,7 +563,7 @@ function theme_include($file, $root = '') { $root = $root . '/'; } $theme_info = $a->theme_info; - if (is_array($theme_info) AND array_key_exists('extends',$theme_info)) { + if (is_array($theme_info) && array_key_exists('extends',$theme_info)) { $parent = $theme_info['extends']; } else { $parent = 'NOPATH'; diff --git a/include/poller.php b/include/poller.php index fcabe5d8ee..cc8edce656 100644 --- a/include/poller.php +++ b/include/poller.php @@ -4,7 +4,7 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Util\Lock; -if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) { +if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) { $directory = dirname($_SERVER["argv"][0]); if (substr($directory, 0, 1) != "/") { @@ -75,7 +75,7 @@ function poller_run($argv, $argc){ } // Now we start additional cron processes if we should do so - if (($argc <= 1) OR ($argv[1] != "no_cron")) { + if (($argc <= 1) || ($argv[1] != "no_cron")) { poller_run_cron(); } @@ -467,7 +467,7 @@ function poller_too_much_workers() { $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)) { + if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($entries > 0) && ($active >= $queues)) { $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority` LIMIT 1", dbesc(NULL_DATE)); $top_priority = $s[0]["priority"]; @@ -475,7 +475,7 @@ function poller_too_much_workers() { 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)) { + if (!$high_running && ($top_priority > PRIORITY_UNDEFINED) && ($top_priority < PRIORITY_NEGLIGIBLE)) { logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG); $queues = $active + 1; } @@ -484,7 +484,7 @@ function poller_too_much_workers() { logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries.$processlist." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG); // Are there fewer workers running as possible? Then fork a new one. - if (!Config::get("system", "worker_dont_fork") AND ($queues > ($active + 1)) AND ($entries > 1)) { + if (!Config::get("system", "worker_dont_fork") && ($queues > ($active + 1)) && ($entries > 1)) { logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG); $args = array("include/poller.php", "no_cron"); $a = get_app(); @@ -632,7 +632,7 @@ function poller_claim_process($queue) { if (!$id) { logger("Queue item ".$queue["id"]." vanished - skip this execution", LOGGER_DEBUG); return false; - } elseif ((strtotime($id[0]["executed"]) <= 0) OR ($id[0]["pid"] == 0)) { + } elseif ((strtotime($id[0]["executed"]) <= 0) || ($id[0]["pid"] == 0)) { logger("Entry for queue item ".$queue["id"]." wasn't stored - skip this execution", LOGGER_DEBUG); return false; } elseif ($id[0]["pid"] != $mypid) { diff --git a/include/post_update.php b/include/post_update.php index af49bb555c..8dcf070526 100644 --- a/include/post_update.php +++ b/include/post_update.php @@ -45,7 +45,7 @@ function post_update_1192() { WHERE `thread`.`gcontact-id` = 0 AND (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)"); - if ($r AND ($r[0]["total"] == 0)) { + if ($r && ($r[0]["total"] == 0)) { set_config("system", "post_update_version", 1192); return true; } @@ -171,7 +171,7 @@ function post_update_1198() { WHERE `thread`.`author-id` = 0 AND `thread`.`owner-id` = 0 AND (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)"); - if ($r AND ($r[0]["total"] == 0)) { + if ($r && ($r[0]["total"] == 0)) { set_config("system", "post_update_version", 1198); logger("Done", LOGGER_DEBUG); return true; @@ -247,7 +247,7 @@ function post_update_1206() { return false; } foreach ($r AS $user) { - if (!empty($user["lastitem_date"]) AND ($user["lastitem_date"] > $user["last-item"])) { + if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) { q("UPDATE `contact` SET `last-item` = '%s' WHERE `id` = %d", dbesc($user["lastitem_date"]), intval($user["id"])); diff --git a/include/queue.php b/include/queue.php index cf5ed9a815..a92f2b2074 100644 --- a/include/queue.php +++ b/include/queue.php @@ -83,7 +83,7 @@ function queue_run(&$argv, &$argc){ $dead = Cache::get($cachekey_deadguy.$c[0]['notify']); - if (!is_null($dead) AND $dead) { + if (!is_null($dead) && $dead) { logger('queue: skipping known dead url: '.$c[0]['notify']); update_queue_time($q_item['id']); return; @@ -101,7 +101,7 @@ function queue_run(&$argv, &$argc){ Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR); } - if (!is_null($vital) AND !$vital) { + if (!is_null($vital) && !$vital) { logger('queue: skipping dead server: '.$server); update_queue_time($q_item['id']); return; diff --git a/include/session.php b/include/session.php index 055bfcb4ef..5194e7ef0e 100644 --- a/include/session.php +++ b/include/session.php @@ -65,7 +65,7 @@ function ref_session_write($id, $data) { $memcache = cache::memcache(); $a = get_app(); - if (is_object($memcache) AND is_object($a)) { + if (is_object($memcache) && is_object($a)) { $memcache->set($a->get_hostname().":session:".$id, $data, MEMCACHE_COMPRESSED, $expire); return true; } diff --git a/include/socgraph.php b/include/socgraph.php index 7a39e388be..eda8e3797c 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -150,7 +150,7 @@ function poco_load_worker($cid, $uid, $zcid, $url) { $gender = $entry->gender; } - if (isset($entry->generation) AND ($entry->generation > 0)) { + if (isset($entry->generation) && ($entry->generation > 0)) { $generation = ++$entry->generation; } @@ -160,7 +160,7 @@ function poco_load_worker($cid, $uid, $zcid, $url) { } } - if (isset($entry->contactType) AND ($entry->contactType >= 0)) + if (isset($entry->contactType) && ($entry->contactType >= 0)) $contact_type = $entry->contactType; $gcontact = array("url" => $profile_url, @@ -238,7 +238,7 @@ function sanitize_gcontact($gcontact) { $alternate = poco_alternate_ostatus_url($gcontact['url']); // The global contacts should contain the original picture, not the cached one - if (($gcontact['generation'] != 1) AND stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) { + if (($gcontact['generation'] != 1) && stristr(normalise_link($gcontact['photo']), normalise_link(App::get_baseurl()."/photo/"))) { $gcontact['photo'] = ""; } @@ -250,7 +250,7 @@ function sanitize_gcontact($gcontact) { $gcontact['network'] = $r[0]["network"]; } - if (($gcontact['network'] == "") OR ($gcontact['network'] == NETWORK_OSTATUS)) { + if (($gcontact['network'] == "") || ($gcontact['network'] == NETWORK_OSTATUS)) { $r = q("SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1", dbesc($gcontact['url']), dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET) ); @@ -268,13 +268,13 @@ function sanitize_gcontact($gcontact) { ); if (count($x)) { - if (!isset($gcontact['network']) AND ($x[0]["network"] != NETWORK_STATUSNET)) { + if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) { $gcontact['network'] = $x[0]["network"]; } if ($gcontact['updated'] <= NULL_DATE) { $gcontact['updated'] = $x[0]["updated"]; } - if (!isset($gcontact['server_url']) AND (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) { + if (!isset($gcontact['server_url']) && (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) { $gcontact['server_url'] = $x[0]["server_url"]; } if (!isset($gcontact['addr'])) { @@ -282,8 +282,8 @@ function sanitize_gcontact($gcontact) { } } - if ((!isset($gcontact['network']) OR !isset($gcontact['name']) OR !isset($gcontact['addr']) OR !isset($gcontact['photo']) OR !isset($gcontact['server_url']) OR $alternate) - AND poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) { + if ((!isset($gcontact['network']) || !isset($gcontact['name']) || !isset($gcontact['addr']) || !isset($gcontact['photo']) || !isset($gcontact['server_url']) || $alternate) + && poco_reachable($gcontact['url'], $gcontact['server_url'], $gcontact['network'], false)) { $data = Probe::uri($gcontact['url']); if ($data["network"] == NETWORK_PHANTOM) { @@ -296,7 +296,7 @@ function sanitize_gcontact($gcontact) { $gcontact = array_merge($gcontact, $data); - if ($alternate AND ($gcontact['network'] == NETWORK_OSTATUS)) { + if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) { // Delete the old entry - if it exists $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile))); if ($r) { @@ -306,7 +306,7 @@ function sanitize_gcontact($gcontact) { } } - if (!isset($gcontact['name']) OR !isset($gcontact['photo'])) { + if (!isset($gcontact['name']) || !isset($gcontact['photo'])) { throw new Exception('No name and photo for URL '.$gcontact['url']); } @@ -481,11 +481,11 @@ function poco_last_updated($profile, $force = false) { $server_url = normalise_link(poco_detect_server($profile)); } - if (($server_url == '') AND ($gcontacts[0]["server_url"] != "")) { + if (($server_url == '') && ($gcontacts[0]["server_url"] != "")) { $server_url = $gcontacts[0]["server_url"]; } - if (!$force AND (($server_url == '') OR ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) { + if (!$force && (($server_url == '') || ($gcontacts[0]["server_url"] == $gcontacts[0]["nurl"]))) { $server_url = normalise_link(poco_detect_server($profile)); } @@ -519,7 +519,7 @@ function poco_last_updated($profile, $force = false) { } // noscrape is really fast so we don't cache the call. - if (($server_url != "") AND ($gcontacts[0]["nick"] != "")) { + if (($server_url != "") && ($gcontacts[0]["nick"] != "")) { // Use noscrape if possible $server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url))); @@ -527,7 +527,7 @@ function poco_last_updated($profile, $force = false) { if ($server) { $noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]); - if ($noscraperet["success"] AND ($noscraperet["body"] != "")) { + if ($noscraperet["success"] && ($noscraperet["body"] != "")) { $noscrape = json_decode($noscraperet["body"], true); @@ -591,7 +591,7 @@ function poco_last_updated($profile, $force = false) { } // If we only can poll the feed, then we only do this once a while - if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) { + if (!$force && !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"], $gcontacts[0]["last_contact"])) { logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG); update_gcontact($contact); @@ -602,8 +602,8 @@ function poco_last_updated($profile, $force = false) { // Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711) // Then check the other link and delete this one - if (($data["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($profile) AND - (normalise_link($profile) == normalise_link($data["alias"])) AND + if (($data["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($profile) && + (normalise_link($profile) == normalise_link($data["alias"])) && (normalise_link($profile) != normalise_link($data["url"]))) { // Delete the old entry @@ -627,7 +627,7 @@ function poco_last_updated($profile, $force = false) { return false; } - if (($data["poll"] == "") OR (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) { + if (($data["poll"] == "") || (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) { q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc(normalise_link($profile))); @@ -715,24 +715,24 @@ function poco_do_update($created, $updated, $last_failure, $last_contact) { return false; // If the last contact was less than a week ago and the last failure is older than a week then don't update - //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) AND ($contact_time > $failure_time)) + //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time)) // return false; // If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week - if ((($now - $contact_time) > (60 * 60 * 24 * 7)) AND (($now - $created_time) > (60 * 60 * 24 * 7)) AND (($now - $failure_time) < (60 * 60 * 24 * 7))) + if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) return false; // If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month - if ((($now - $contact_time) > (60 * 60 * 24 * 30)) AND (($now - $created_time) > (60 * 60 * 24 * 30)) AND (($now - $failure_time) < (60 * 60 * 24 * 30))) + if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) return false; return true; } function poco_to_boolean($val) { - if (($val == "true") OR ($val == 1)) + if (($val == "true") || ($val == 1)) return(true); - if (($val == "false") OR ($val == 0)) + if (($val == "false") || ($val == 0)) return(false); return ($val); @@ -823,7 +823,7 @@ function poco_fetch_nodeinfo($server_url) { $server['register_policy'] = REGISTER_CLOSED; - if (is_bool($nodeinfo->openRegistrations) AND $nodeinfo->openRegistrations) { + if (is_bool($nodeinfo->openRegistrations) && $nodeinfo->openRegistrations) { $server['register_policy'] = REGISTER_OPEN; } @@ -975,7 +975,7 @@ function poco_check_server($server_url, $network = "", $force = false) { $info = $servers[0]["info"]; $register_policy = $servers[0]["register_policy"]; - if (!$force AND !poco_do_update($servers[0]["created"], "", $last_failure, $last_contact)) { + if (!$force && !poco_do_update($servers[0]["created"], "", $last_failure, $last_contact)) { logger("Use cached data for server ".$server_url, LOGGER_DEBUG); return ($last_contact >= $last_failure); } @@ -1007,7 +1007,7 @@ function poco_check_server($server_url, $network = "", $force = false) { // Quit if there is a timeout. // But we want to make sure to only quit if we are mostly sure that this server url fits. - if (dbm::is_result($servers) AND ($orig_server_url == $server_url) AND + if (dbm::is_result($servers) && ($orig_server_url == $server_url) && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) { logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG); dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url)); @@ -1016,7 +1016,7 @@ function poco_check_server($server_url, $network = "", $force = false) { // Maybe the page is unencrypted only? $xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0"); - if (!$serverret["success"] OR ($serverret["body"] == "") OR (@sizeof($xmlobj) == 0) OR !is_object($xmlobj)) { + if (!$serverret["success"] || ($serverret["body"] == "") || (@sizeof($xmlobj) == 0) || !is_object($xmlobj)) { $server_url = str_replace("https://", "http://", $server_url); // We set the timeout to 20 seconds since this operation should be done in no time if the server was vital @@ -1032,7 +1032,7 @@ function poco_check_server($server_url, $network = "", $force = false) { $xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0"); } - if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) { + if (!$serverret["success"] || ($serverret["body"] == "") || (sizeof($xmlobj) == 0) || !is_object($xmlobj)) { // Workaround for bad configured servers (known nginx problem) if (!in_array($serverret["debug"]["http_code"], array("403", "404"))) { $failure = true; @@ -1071,7 +1071,7 @@ function poco_check_server($server_url, $network = "", $force = false) { // Test for Diaspora, Hubzilla, Mastodon or older Friendica servers $serverret = z_fetch_url($server_url); - if (!$serverret["success"] OR ($serverret["body"] == "")) { + if (!$serverret["success"] || ($serverret["body"] == "")) { $failure = true; } else { $server = poco_detect_server_type($serverret["body"]); @@ -1104,13 +1104,13 @@ function poco_check_server($server_url, $network = "", $force = false) { } } - if (!$failure AND ($poco == "")) { + if (!$failure && ($poco == "")) { // Test for Statusnet // Will also return data for Friendica and GNU Social - but it will be overwritten later // The "not implemented" is a special treatment for really, really old Friendica versions $serverret = z_fetch_url($server_url."/api/statusnet/version.json"); - if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND - ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) { + if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') && + ($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) { $platform = "StatusNet"; // Remove junk that some GNU Social servers return $version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]); @@ -1120,8 +1120,8 @@ function poco_check_server($server_url, $network = "", $force = false) { // Test for GNU Social $serverret = z_fetch_url($server_url."/api/gnusocial/version.json"); - if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND - ($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) { + if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') && + ($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) { $platform = "GNU Social"; // Remove junk that some GNU Social servers return $version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]); @@ -1131,7 +1131,7 @@ function poco_check_server($server_url, $network = "", $force = false) { // Test for Mastodon $serverret = z_fetch_url($server_url."/api/v1/instance"); - if ($serverret["success"] AND ($serverret["body"] != '')) { + if ($serverret["success"] && ($serverret["body"] != '')) { $data = json_decode($serverret["body"]); if (isset($data->version)) { $platform = "Mastodon"; @@ -1185,9 +1185,9 @@ function poco_check_server($server_url, $network = "", $force = false) { $data->site->private = poco_to_boolean($data->site->private); $data->site->inviteonly = poco_to_boolean($data->site->inviteonly); - if (!$data->site->closed AND !$data->site->private and $data->site->inviteonly) + if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) $register_policy = REGISTER_APPROVE; - elseif (!$data->site->closed AND !$data->site->private) + elseif (!$data->site->closed && !$data->site->private) $register_policy = REGISTER_OPEN; else $register_policy = REGISTER_CLOSED; @@ -1251,7 +1251,7 @@ function poco_check_server($server_url, $network = "", $force = false) { // Check for noscrape // Friendica servers could be detected as OStatus servers - if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) { + if (!$failure && in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) { $serverret = z_fetch_url($server_url."/friendica/json"); if (!$serverret["success"]) @@ -1285,7 +1285,7 @@ function poco_check_server($server_url, $network = "", $force = false) { } } - if ($possible_failure AND !$failure) { + if ($possible_failure && !$failure) { $failure = true; } @@ -1297,9 +1297,9 @@ function poco_check_server($server_url, $network = "", $force = false) { $last_failure = $orig_last_failure; } - if (($last_contact <= $last_failure) AND !$failure) { + if (($last_contact <= $last_failure) && !$failure) { logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG); - } else if (($last_contact >= $last_failure) AND $failure) { + } else if (($last_contact >= $last_failure) && $failure) { logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG); } @@ -1729,7 +1729,7 @@ function poco_discover_single_server($id) { $success = poco_discover_server(json_decode($retdata["body"])); } - if (!$success AND (get_config('system','poco_discovery') > 2)) { + if (!$success && (get_config('system','poco_discovery') > 2)) { logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG); poco_discover_server_users($data, $server); } @@ -1776,7 +1776,7 @@ function poco_discover($complete = false) { logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG); proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id'])); - if (!$complete AND (--$no_of_queries == 0)) { + if (!$complete && (--$no_of_queries == 0)) { break; } } @@ -1813,7 +1813,7 @@ function poco_discover_server_users($data, $server) { function poco_discover_server($data, $default_generation = 0) { - if (!isset($data->entry) OR !count($data->entry)) + if (!isset($data->entry) || !count($data->entry)) return false; $success = false; @@ -1876,11 +1876,11 @@ function poco_discover_server($data, $default_generation = 0) { $gender = $entry->gender; } - if(isset($entry->generation) AND ($entry->generation > 0)) { + if(isset($entry->generation) && ($entry->generation > 0)) { $generation = ++$entry->generation; } - if(isset($entry->contactType) AND ($entry->contactType >= 0)) { + if(isset($entry->contactType) && ($entry->contactType >= 0)) { $contact_type = $entry->contactType; } @@ -1930,7 +1930,7 @@ function poco_discover_server($data, $default_generation = 0) { function clean_contact_url($url) { $parts = parse_url($url); - if (!isset($parts["scheme"]) OR !isset($parts["host"])) + if (!isset($parts["scheme"]) || !isset($parts["host"])) return $url; $new_url = $parts["scheme"]."://".$parts["host"]; @@ -1953,7 +1953,7 @@ function clean_contact_url($url) { * @param arr $contact contact array (called by reference) */ function fix_alternate_contact_address(&$contact) { - if (($contact["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($contact["url"])) { + if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) { $data = probe_url($contact["url"]); if ($contact["network"] == NETWORK_OSTATUS) { logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG); @@ -2008,7 +2008,7 @@ function get_gcontact_id($contact) { $last_failure = strtotime($r[0]["last_failure"]); $last_contact_str = $r[0]["last_contact"]; $last_contact = strtotime($r[0]["last_contact"]); - $doprobing = (((time() - $last_contact) > (90 * 86400)) AND ((time() - $last_failure) > (90 * 86400))); + $doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400))); } } else { q("INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`) @@ -2056,7 +2056,7 @@ function get_gcontact_id($contact) { function update_gcontact($contact) { // Check for invalid "contact-type" value - if (isset($contact['contact-type']) AND (intval($contact['contact-type']) < 0)) { + if (isset($contact['contact-type']) && (intval($contact['contact-type']) < 0)) { $contact['contact-type'] = 0; } @@ -2091,7 +2091,7 @@ function update_gcontact($contact) { // assign all unassigned fields from the database entry foreach ($fields AS $field => $data) - if (!isset($contact[$field]) OR ($contact[$field] == "")) + if (!isset($contact[$field]) || ($contact[$field] == "")) $contact[$field] = $r[0][$field]; if (!isset($contact["hide"])) @@ -2125,7 +2125,7 @@ function update_gcontact($contact) { } else $contact["server_url"] = normalise_link($contact["server_url"]); - if (($contact["addr"] == "") AND ($contact["server_url"] != "") AND ($contact["nick"] != "")) { + if (($contact["addr"] == "") && ($contact["server_url"] != "") && ($contact["nick"] != "")) { $hostname = str_replace("http://", "", $contact["server_url"]); $contact["addr"] = $contact["nick"]."@".$hostname; } @@ -2134,7 +2134,7 @@ function update_gcontact($contact) { $update = false; unset($fields["generation"]); - if ((($contact["generation"] > 0) AND ($contact["generation"] <= $r[0]["generation"])) OR ($r[0]["generation"] == 0)) { + if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) { foreach ($fields AS $field => $data) if ($contact[$field] != $r[0][$field]) { logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG); @@ -2240,7 +2240,7 @@ function update_gcontact_for_user($uid) { "gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"], "birthday" => $r[0]["dob"], "photo" => $r[0]["photo"], "notify" => $r[0]["notify"], "url" => $r[0]["url"], - "hide" => ($r[0]["hidewall"] OR !$r[0]["net-publish"]), + "hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]), "nick" => $r[0]["nickname"], "addr" => $addr, "connect" => $addr, "server_url" => App::get_baseurl(), "generation" => 1, "network" => NETWORK_DFRN); diff --git a/include/spool_post.php b/include/spool_post.php index 2b21e41965..b7b8de396a 100644 --- a/include/spool_post.php +++ b/include/spool_post.php @@ -13,7 +13,7 @@ function spool_post_run($argv, $argc) { $path = get_spoolpath(); - if (($path != '') AND is_writable($path)){ + if (($path != '') && is_writable($path)){ if ($dh = opendir($path)) { while (($file = readdir($dh)) !== false) { @@ -30,7 +30,7 @@ function spool_post_run($argv, $argc) { } // We can't read or write the file? So we don't care about it. - if (!is_writable($fullfile) OR !is_readable($fullfile)) { + if (!is_writable($fullfile) || !is_readable($fullfile)) { continue; } @@ -42,7 +42,7 @@ function spool_post_run($argv, $argc) { } // Skip if it doesn't seem to be an item array - if (!isset($arr['uid']) AND !isset($arr['uri']) AND !isset($arr['network'])) { + if (!isset($arr['uid']) && !isset($arr['uri']) && !isset($arr['network'])) { continue; } diff --git a/include/tags.php b/include/tags.php index 6067f3f4b9..ad66b02727 100644 --- a/include/tags.php +++ b/include/tags.php @@ -31,7 +31,7 @@ function create_tags_from_item($itemid) { $tags = ""; foreach ($taglist as $tag) - if ((substr(trim($tag), 0, 1) == "#") OR (substr(trim($tag), 0, 1) == "@")) + if ((substr(trim($tag), 0, 1) == "#") || (substr(trim($tag), 0, 1) == "@")) $tags .= " ".trim($tag); else $tags .= " #".trim($tag); @@ -91,7 +91,7 @@ function create_tags_from_item($itemid) { dbesc($link), dbesc($message["guid"]), dbesc($message["created"]), dbesc($message["received"]), intval($global)); // Search for mentions - if ((substr($tag, 0, 1) == '@') AND (strpos($link, $profile_base_friendica) OR strpos($link, $profile_base_diaspora))) { + if ((substr($tag, 0, 1) == '@') && (strpos($link, $profile_base_friendica) || strpos($link, $profile_base_diaspora))) { $users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link); foreach ($users AS $user) { if ($user["uid"] == $message["uid"]) { diff --git a/include/text.php b/include/text.php index c9babba940..80c0d87e2e 100644 --- a/include/text.php +++ b/include/text.php @@ -287,7 +287,7 @@ function paginate_data(App $a, $count = null) { $stripped = trim($stripped, '/'); $pagenum = $a->pager['page']; - if (($a->page_offset != '') AND !preg_match('/[?&].offset=/', $stripped)) { + if (($a->page_offset != '') && !preg_match('/[?&].offset=/', $stripped)) { $stripped .= '&offset=' . urlencode($a->page_offset); } @@ -1265,8 +1265,8 @@ function redir_private_images($a, &$item) function put_item_in_cache(&$item, $update = false) { - if (($item["rendered-hash"] != hash("md5", $item["body"])) OR ($item["rendered-hash"] == "") OR - ($item["rendered-html"] == "") OR get_config("system", "ignore_cache")) { + if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") || + ($item["rendered-html"] == "") || get_config("system", "ignore_cache")) { // The function "redir_private_images" changes the body. // I'm not sure if we should store it permanently, so we save the old value. @@ -1279,7 +1279,7 @@ function put_item_in_cache(&$item, $update = false) { $item["rendered-hash"] = hash("md5", $item["body"]); $item["body"] = $body; - if ($update AND ($item["id"] != 0)) { + if ($update && ($item["id"] != 0)) { q("UPDATE `item` SET `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d", dbesc($item["rendered-html"]), dbesc($item["rendered-hash"]), intval($item["id"])); } @@ -1340,7 +1340,7 @@ function prepare_body(&$item,$attach = false, $preview = false) { $update = (!local_user() and !remote_user() and ($item["uid"] == 0)); // Or update it if the current viewer is the intented viewer - if (($item["uid"] == local_user()) AND ($item["uid"] != 0)) + if (($item["uid"] == local_user()) && ($item["uid"] != 0)) $update = true; put_item_in_cache($item, $update); diff --git a/include/threads.php b/include/threads.php index b0ba546840..7a6305f85b 100644 --- a/include/threads.php +++ b/include/threads.php @@ -45,12 +45,12 @@ function add_shadow_thread($itemid) { $item = $items[0]; // is it already a copy? - if (($itemid == 0) OR ($item['uid'] == 0)) { + if (($itemid == 0) || ($item['uid'] == 0)) { return; } // Is it a visible public post? - if (!$item["visible"] OR $item["deleted"] OR $item["moderated"] OR $item["private"]) { + if (!$item["visible"] || $item["deleted"] || $item["moderated"] || $item["private"]) { return; } @@ -86,8 +86,8 @@ function add_shadow_thread($itemid) { $item = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid)); - if (count($item) AND ($item[0]["allow_cid"] == '') AND ($item[0]["allow_gid"] == '') AND - ($item[0]["deny_cid"] == '') AND ($item[0]["deny_gid"] == '')) { + if (count($item) && ($item[0]["allow_cid"] == '') && ($item[0]["allow_gid"] == '') && + ($item[0]["deny_cid"] == '') && ($item[0]["deny_gid"] == '')) { $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri'])); diff --git a/include/update_gcontact.php b/include/update_gcontact.php index d283bd2689..97c825352e 100644 --- a/include/update_gcontact.php +++ b/include/update_gcontact.php @@ -40,16 +40,16 @@ function update_gcontact_run(&$argv, &$argc) { return; } - if (($data["name"] == "") AND ($r[0]['name'] != "")) + if (($data["name"] == "") && ($r[0]['name'] != "")) $data["name"] = $r[0]['name']; - if (($data["nick"] == "") AND ($r[0]['nick'] != "")) + if (($data["nick"] == "") && ($r[0]['nick'] != "")) $data["nick"] = $r[0]['nick']; - if (($data["addr"] == "") AND ($r[0]['addr'] != "")) + if (($data["addr"] == "") && ($r[0]['addr'] != "")) $data["addr"] = $r[0]['addr']; - if (($data["photo"] == "") AND ($r[0]['photo'] != "")) + if (($data["photo"] == "") && ($r[0]['photo'] != "")) $data["photo"] = $r[0]['photo']; diff --git a/include/xml.php b/include/xml.php index 9f7de8f33e..a9f4679b48 100644 --- a/include/xml.php +++ b/include/xml.php @@ -51,7 +51,7 @@ class xml { } foreach($array as $key => $value) { - if (!isset($element) AND isset($xml)) { + if (!isset($element) && isset($xml)) { $element = $xml; } @@ -67,7 +67,7 @@ class xml { } $element_parts = explode(":", $key); - if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) { + if ((count($element_parts) > 1) && isset($namespaces[$element_parts[0]])) { $namespace = $namespaces[$element_parts[0]]; } elseif (isset($namespaces[""])) { $namespace = $namespaces[""]; @@ -76,18 +76,18 @@ class xml { } // Remove undefined namespaces from the key - if ((count($element_parts) > 1) AND is_null($namespace)) { + if ((count($element_parts) > 1) && is_null($namespace)) { $key = $element_parts[1]; } if (substr($key, 0, 11) == "@attributes") { - if (!isset($element) OR !is_array($value)) { + if (!isset($element) || !is_array($value)) { continue; } foreach ($value as $attr_key => $attr_value) { $element_parts = explode(":", $attr_key); - if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]])) { + if ((count($element_parts) > 1) && isset($namespaces[$element_parts[0]])) { $namespace = $namespaces[$element_parts[0]]; } else { $namespace = NULL; @@ -399,7 +399,7 @@ class xml { /** * @brief Delete a node in a XML object - * + * * @param object $doc XML document * @param string $node Node name */ diff --git a/index.php b/index.php index 2b26eb90f0..9ddb47efc6 100644 --- a/index.php +++ b/index.php @@ -59,15 +59,15 @@ if (!$install) { Config::load(); - if ($a->max_processes_reached() OR $a->maxload_reached()) { + if ($a->max_processes_reached() || $a->maxload_reached()) { header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable'); header('Retry-After: 120'); header('Refresh: 120; url=' . App::get_baseurl() . "/" . $a->query_string); die("System is currently unavailable. Please try again later"); } - if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND - (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) AND + if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") && + (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) && (substr(App::get_baseurl(), 0, 8) == "https://")) { header("HTTP/1.1 302 Moved Temporarily"); header("Location: " . App::get_baseurl() . "/" . $a->query_string); @@ -128,7 +128,7 @@ if ((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) { if ((x($_GET,'zrl')) && (!$install && !$maintenance)) { // Only continue when the given profile link seems valid // Valid profile links contain a path with "/profile/" and no query parameters - if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") AND + if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") && strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) { $_SESSION['my_url'] = $_GET['zrl']; $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); @@ -245,7 +245,7 @@ if (strlen($a->module)) { } // Compatibility with the Firefox App - if (($a->module == "users") AND ($a->cmd == "users/sign_in")) { + if (($a->module == "users") && ($a->cmd == "users/sign_in")) { $a->module = "login"; } @@ -450,7 +450,7 @@ if (!$a->theme['stylesheet']) { $a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']); //$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet)); -if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "minimal"))) { +if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "minimal"))) { $doc = new DOMDocument(); $target = new DOMDocument(); @@ -473,7 +473,7 @@ if (isset($_GET["mode"]) AND (($_GET["mode"] == "raw") OR ($_GET["mode"] == "min } } -if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) { +if (isset($_GET["mode"]) && ($_GET["mode"] == "raw")) { header("Content-type: text/html; charset=utf-8"); diff --git a/mod/admin.php b/mod/admin.php index d9684d6a4f..98558a6de4 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -770,7 +770,7 @@ function admin_page_site_post(App $a) { $worker_frontend = ((x($_POST,'worker_frontend')) ? True : False); // Has the directory url changed? If yes, then resubmit the existing profiles there - if ($global_directory != Config::get('system', 'directory') AND ($global_directory != '')) { + if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) { Config::set('system', 'directory', $global_directory); proc_run(PRIORITY_LOW, 'include/directory.php'); } @@ -936,7 +936,7 @@ function admin_page_site(App $a) { /* Installed langs */ $lang_choices = get_available_languages(); - if (strlen(get_config('system','directory_submit_url')) AND + if (strlen(get_config('system','directory_submit_url')) && !strlen(get_config('system','directory'))) { set_config('system','directory', dirname(get_config('system','directory_submit_url'))); del_config('system','directory_submit_url'); @@ -958,7 +958,7 @@ function admin_page_site(App $a) { $f = basename($file); // Only show allowed themes here - if (($allowed_theme_list != '') AND !strstr($allowed_theme_list, $f)) { + if (($allowed_theme_list != '') && !strstr($allowed_theme_list, $f)) { continue; } @@ -1183,7 +1183,7 @@ function admin_page_dbsync(App $a) { goaway('admin/dbsync'); } - if (($a->argc > 2) AND (intval($a->argv[2]) OR ($a->argv[2] === 'check'))) { + if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) { require_once("include/dbstructure.php"); $retval = update_structure(false, true); if (!$retval) { @@ -1663,7 +1663,7 @@ function admin_page_plugins(App $a) { $show_plugin = true; // If the addon is unsupported, then only show it, when it is enabled - if ((strtolower($info["status"]) == "unsupported") AND !in_array($id, $a->plugins)) { + if ((strtolower($info["status"]) == "unsupported") && !in_array($id, $a->plugins)) { $show_plugin = false; } @@ -1801,7 +1801,7 @@ function admin_page_themes(App $a) { $is_supported = 1-(intval(file_exists($file.'/unsupported'))); $is_allowed = intval(in_array($f,$allowed_themes)); - if ($is_allowed OR $is_supported OR get_config("system", "show_unsupported_themes")) { + if ($is_allowed || $is_supported || get_config("system", "show_unsupported_themes")) { $themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed); } } diff --git a/mod/community.php b/mod/community.php index 5c71667bdc..b1995c7002 100644 --- a/mod/community.php +++ b/mod/community.php @@ -68,14 +68,14 @@ function community_content(App $a, $update = 0) { } $previousauthor = $item["author-link"]; - if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) { + if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) { $s[] = $item; } } if ((sizeof($s) < $a->pager['itemspage'])) { $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']); } - } while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0)); + } while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0)); } else { $s = $r; } diff --git a/mod/contacts.php b/mod/contacts.php index 30b8dde20e..8ba8e866de 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -17,7 +17,7 @@ function contacts_init(App $a) { $contact_id = 0; - if((($a->argc == 2) && intval($a->argv[1])) OR (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) { + if((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) { $contact_id = intval($a->argv[1]); $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1", intval(local_user()), @@ -42,7 +42,7 @@ function contacts_init(App $a) { if ($contact_id) { $a->data['contact'] = $r[0]; - if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { + if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) { $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); } else { $networkname = ''; @@ -266,7 +266,7 @@ function _contact_update_profile($contact_id) { $data = Probe::uri($r[0]["url"], "", 0, false); // "Feed" or "Unknown" is mostly a sign of communication problems - if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"])) + if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) && ($data["network"] != $r[0]["network"])) return; $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm", @@ -281,14 +281,14 @@ function _contact_update_profile($contact_id) { } foreach($updatefields AS $field) - if (isset($data[$field]) AND ($data[$field] != "")) + if (isset($data[$field]) && ($data[$field] != "")) $update[$field] = $data[$field]; $update["nurl"] = normalise_link($data["url"]); $query = ""; - if (isset($data["priority"]) AND ($data["priority"] != 0)) + if (isset($data["priority"]) && ($data["priority"] != 0)) $query = "`priority` = ".intval($data["priority"]); foreach($update AS $key => $value) { @@ -573,7 +573,7 @@ function contacts_content(App $a) { if ($contact['network'] == NETWORK_DFRN) $profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)); - if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND + if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) && ($contact['rel'] == CONTACT_IS_FOLLOWER)) $follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]); diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 4efb4119e1..0050decee1 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -626,7 +626,7 @@ function dfrn_request_post(App $a) { ); // NOTREACHED // END $network === NETWORK_DFRN - } elseif (($network != NETWORK_PHANTOM) AND ($url != "")) { + } elseif (($network != NETWORK_PHANTOM) && ($url != "")) { /* * @@ -693,7 +693,7 @@ function dfrn_request_content(App $a) { $confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : ""); // Checking fastlane for validity - if (x($_SESSION, "fastlane") AND (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) { + if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) { $_POST["dfrn_url"] = $dfrn_url; $_POST["confirm_key"] = $confirm_key; $_POST["localconfirm"] = 1; @@ -813,9 +813,9 @@ function dfrn_request_content(App $a) { // At first look if an address was provided // Otherwise take the local address - if (x($_GET,'addr') AND ($_GET['addr'] != "")) { + if (x($_GET,'addr') && ($_GET['addr'] != "")) { $myaddr = hex2bin($_GET['addr']); - } elseif (x($_GET,'address') AND ($_GET['address'] != "")) { + } elseif (x($_GET,'address') && ($_GET['address'] != "")) { $myaddr = $_GET['address']; } elseif (local_user()) { if (strlen($a->path)) { diff --git a/mod/dirfind.php b/mod/dirfind.php index a64a804ba8..884eca9a66 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -37,7 +37,7 @@ function dirfind_content(App $a, $prefix = "") { if (strpos($search,'@') === 0) { $search = substr($search,1); $header = sprintf( t('People Search - %s'), $search); - if ((valid_email($search) AND validate_email($search)) OR + if ((valid_email($search) && validate_email($search)) || (substr(normalise_link($search), 0, 7) == "http://")) { $user_data = probe_url($search); $discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))); @@ -75,7 +75,7 @@ function dirfind_content(App $a, $prefix = "") { $j->results[] = $objresult; // Add the contact to the global contacts if it isn't already in our system - if (($contact["cid"] == 0) AND ($contact["zid"] == 0) AND ($contact["gid"] == 0)) { + if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) { update_gcontact($user_data); } } elseif ($local) { diff --git a/mod/display.php b/mod/display.php index ca6809eba1..c4cf381e93 100644 --- a/mod/display.php +++ b/mod/display.php @@ -59,7 +59,7 @@ function display_init(App $a) { WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND `id` = %d", $r[0]["parent"]); } - if (($itemuid != local_user()) AND local_user()) { + if (($itemuid != local_user()) && local_user()) { // Do we know this contact but we haven't got this item? // Copy the wohle thread to our local storage so that we can interact. // We really should change this need for the future since it scales very bad. @@ -129,11 +129,11 @@ function display_fetchauthor($a, $item) { // Skip if it isn't a pure repeated messages // Does it start with a share? - if (!$skip AND strpos($body, "[share") > 0) { + if (!$skip && strpos($body, "[share") > 0) { $skip = true; } // Does it end with a share? - if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) { + if (!$skip && (strlen($body) > (strrpos($body, "[/share]") + 8))) { $skip = true; } if (!$skip) { @@ -265,7 +265,7 @@ function display_content(App $a, $update = 0) { } } - if ($item_id AND !is_numeric($item_id)) { + if ($item_id && !is_numeric($item_id)) { $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($item_id), intval($a->profile['uid'])); if (dbm::is_result($r)) { diff --git a/mod/events.php b/mod/events.php index 876727608d..0fdec5cbe4 100644 --- a/mod/events.php +++ b/mod/events.php @@ -436,7 +436,7 @@ function events_content(App $a) { $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 || ($mode !== 'new')) { $sh_checked .= ' disabled="disabled" '; } diff --git a/mod/fetch.php b/mod/fetch.php index 0afd7af107..6dd6966d9e 100644 --- a/mod/fetch.php +++ b/mod/fetch.php @@ -11,7 +11,7 @@ require_once("include/xml.php"); function fetch_init(App $a) { - if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) { + if (($a->argc != 3) || (!in_array($a->argv[1], array("post", "status_message", "reshare")))) { header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found')); killme(); } diff --git a/mod/follow.php b/mod/follow.php index 45e017f088..8d5cb99126 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -37,14 +37,14 @@ function follow_content(App $a) { $ret = probe_url($url); - if (($ret["network"] == NETWORK_DIASPORA) AND !get_config('system','diaspora_enabled')) { + if (($ret["network"] == NETWORK_DIASPORA) && !get_config('system','diaspora_enabled')) { notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL); $submit = ""; //goaway($_SESSION['return_url']); // NOTREACHED } - if (($ret["network"] == NETWORK_OSTATUS) AND get_config('system','ostatus_disabled')) { + if (($ret["network"] == NETWORK_OSTATUS) && get_config('system','ostatus_disabled')) { notice( t("OStatus support is disabled. Contact can't be added.") . EOL); $submit = ""; //goaway($_SESSION['return_url']); diff --git a/mod/item.php b/mod/item.php index f696a96a7e..7e6d092711 100644 --- a/mod/item.php +++ b/mod/item.php @@ -139,8 +139,8 @@ function item_post(App $a) { // If the contact id doesn't fit with the contact, then set the contact to null $thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent)); - if (dbm::is_result($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS) - AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) { + if (dbm::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS) + && (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) { $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]); if (!isset($parent_contact["nick"])) { @@ -175,7 +175,7 @@ function item_post(App $a) { $object = ((x($_REQUEST, 'object')) ? $_REQUEST['object'] : ''); // Check for multiple posts with the same message id (when the post was created via API) - if (($message_id != '') AND ($profile_uid != 0)) { + if (($message_id != '') && ($profile_uid != 0)) { $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($message_id), intval($profile_uid) @@ -309,8 +309,8 @@ function item_post(App $a) { // for non native networks use the network of the original post as network of the item if (($parent_item['network'] != NETWORK_DIASPORA) - AND ($parent_item['network'] != NETWORK_OSTATUS) - AND ($network == "")) { + && ($parent_item['network'] != NETWORK_OSTATUS) + && ($network == "")) { $network = $parent_item['network']; } @@ -504,7 +504,7 @@ function item_post(App $a) { $bookmark = 0; $data = get_attachment_data($body); - if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) OR isset($data["type"])) { + if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) { $objecttype = ACTIVITY_OBJ_BOOKMARK; $bookmark = 1; } @@ -543,7 +543,7 @@ function item_post(App $a) { * add a statusnet style reply tag if the original post was from there * and we are replying, and there isn't one already */ - if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) { + if ($parent && ($parent_contact['network'] == NETWORK_OSTATUS)) { $contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]'; if (!in_array($contact, $tags)) { @@ -1226,7 +1226,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n } // select someone by attag or nick and the name passed in the current network - if(!dbm::is_result($r) AND ($network != "")) + if(!dbm::is_result($r) && ($network != "")) $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", dbesc($name), dbesc($name), @@ -1235,7 +1235,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n ); //select someone from this user's contacts by name in the current network - if (!dbm::is_result($r) AND ($network != "")) { + if (!dbm::is_result($r) && ($network != "")) { $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1", dbesc($name), dbesc($network), @@ -1262,7 +1262,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n } if (dbm::is_result($r)) { - if (strlen($inform) AND (isset($r[0]["notify"]) OR isset($r[0]["id"]))) { + if (strlen($inform) && (isset($r[0]["notify"]) || isset($r[0]["id"]))) { $inform .= ','; } @@ -1275,14 +1275,14 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n $profile = $r[0]["url"]; $alias = $r[0]["alias"]; $newname = $r[0]["nick"]; - if (($newname == "") OR (($r[0]["network"] != NETWORK_OSTATUS) AND ($r[0]["network"] != NETWORK_TWITTER) - AND ($r[0]["network"] != NETWORK_STATUSNET) AND ($r[0]["network"] != NETWORK_APPNET))) { + if (($newname == "") || (($r[0]["network"] != NETWORK_OSTATUS) && ($r[0]["network"] != NETWORK_TWITTER) + && ($r[0]["network"] != NETWORK_STATUSNET) && ($r[0]["network"] != NETWORK_APPNET))) { $newname = $r[0]["name"]; } } //if there is an url for this persons profile - if (isset($profile) AND ($newname != "")) { + if (isset($profile) && ($newname != "")) { $replaced = true; // create profile link diff --git a/mod/network.php b/mod/network.php index 0d37d4d2e2..61db199d55 100644 --- a/mod/network.php +++ b/mod/network.php @@ -398,7 +398,7 @@ function network_content(App $a, $update = 0) { } set_pconfig(local_user(), 'network.view', 'net.selected', ($nets ? $nets : 'all')); - if(!$update AND !$rawmode) { + if(!$update && !$rawmode) { $tabs = network_tabs($a); $o .= $tabs; @@ -459,7 +459,7 @@ function network_content(App $a, $update = 0) { $sql_table = "`thread`"; $sql_parent = "`iid`"; - if ($nouveau OR strlen($file) OR $update) { + if ($nouveau || strlen($file) || $update) { $sql_table = "`item`"; $sql_parent = "`parent`"; $sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`"; diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php index 5d8e8f2a20..b0fcc09eda 100644 --- a/mod/nodeinfo.php +++ b/mod/nodeinfo.php @@ -25,12 +25,12 @@ function nodeinfo_init(App $a) { killme(); } - if (($a->argc != 2) OR ($a->argv[1] != '1.0')) { + if (($a->argc != 2) || ($a->argv[1] != '1.0')) { http_status_exit(404); killme(); } - $smtp = (function_exists('imap_open') AND !Config::get('system', 'imap_disabled') AND !Config::get('system', 'dfrn_only')); + $smtp = (function_exists('imap_open') && !Config::get('system', 'imap_disabled') && !Config::get('system', 'dfrn_only')); $nodeinfo = array(); $nodeinfo['version'] = '1.0'; @@ -74,7 +74,7 @@ function nodeinfo_init(App $a) { if (plugin_enabled('appnet')) { $nodeinfo['services']['inbound'][] = 'appnet'; } - if (plugin_enabled('appnet') OR plugin_enabled('buffer')) { + if (plugin_enabled('appnet') || plugin_enabled('buffer')) { $nodeinfo['services']['outbound'][] = 'appnet'; } if (plugin_enabled('blogger')) { @@ -83,7 +83,7 @@ function nodeinfo_init(App $a) { if (plugin_enabled('dwpost')) { $nodeinfo['services']['outbound'][] = 'dreamwidth'; } - if (plugin_enabled('fbpost') OR plugin_enabled('buffer')) { + if (plugin_enabled('fbpost') || plugin_enabled('buffer')) { $nodeinfo['services']['outbound'][] = 'facebook'; } if (plugin_enabled('statusnet')) { @@ -91,7 +91,7 @@ function nodeinfo_init(App $a) { $nodeinfo['services']['outbound'][] = 'gnusocial'; } - if (plugin_enabled('gpluspost') OR plugin_enabled('buffer')) { + if (plugin_enabled('gpluspost') || plugin_enabled('buffer')) { $nodeinfo['services']['outbound'][] = 'google'; } if (plugin_enabled('ijpost')) { @@ -123,7 +123,7 @@ function nodeinfo_init(App $a) { if (plugin_enabled('tumblr')) { $nodeinfo['services']['outbound'][] = 'tumblr'; } - if (plugin_enabled('twitter') OR plugin_enabled('buffer')) { + if (plugin_enabled('twitter') || plugin_enabled('buffer')) { $nodeinfo['services']['outbound'][] = 'twitter'; } if (plugin_enabled('wppost')) { @@ -203,11 +203,11 @@ function nodeinfo_cron() { $month = time() - (30 * 24 * 60 * 60); foreach ($users AS $user) { - if ((strtotime($user['login_date']) > $halfyear) OR + if ((strtotime($user['login_date']) > $halfyear) || (strtotime($user['last-item']) > $halfyear)) { ++$active_users_halfyear; } - if ((strtotime($user['login_date']) > $month) OR + if ((strtotime($user['login_date']) > $month) || (strtotime($user['last-item']) > $month)) { ++$active_users_monthly; } diff --git a/mod/noscrape.php b/mod/noscrape.php index a269d7369a..814dc885cd 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -17,7 +17,7 @@ function noscrape_init(App $a) { profile_load($a,$which,$profile); - if (!$a->profile['net-publish'] OR $a->profile['hidewall']) { + if (!$a->profile['net-publish'] || $a->profile['hidewall']) { header('Content-type: application/json; charset=utf-8'); $json_info = array("hide" => true); echo json_encode($json_info); @@ -42,7 +42,7 @@ function noscrape_init(App $a) { 'tags' => $keywords ); - if (is_array($a->profile) AND !$a->profile['hide-friends']) { + if (is_array($a->profile) && !$a->profile['hide-friends']) { $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1", intval($a->profile['uid'])); if (dbm::is_result($r)) { diff --git a/mod/photo.php b/mod/photo.php index 7506834cf5..3c5fdd7be4 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -119,7 +119,7 @@ function photo_init(App $a) { intval($resolution) ); - $public = (dbm::is_result($r)) AND ($r[0]['allow_cid'] == '') AND ($r[0]['allow_gid'] == '') AND ($r[0]['deny_cid'] == '') AND ($r[0]['deny_gid'] == ''); + $public = (dbm::is_result($r)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid'] == '') && ($r[0]['deny_gid'] == ''); if (dbm::is_result($r)) { $resolution = $r[0]['scale']; diff --git a/mod/ping.php b/mod/ping.php index 8ebf4add38..ad1d4019f0 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -330,10 +330,10 @@ function ping_init(App $a) if (dbm::is_result($notifs)) { // Are the nofications called from the regular process or via the friendica app? - $regularnotifications = (intval($_GET['uid']) AND intval($_GET['_'])); + $regularnotifications = (intval($_GET['uid']) && intval($_GET['_'])); foreach ($notifs as $notif) { - if ($a->is_friendica_app() OR !$regularnotifications) { + if ($a->is_friendica_app() || !$regularnotifications) { $notif['message'] = str_replace("{0}", $notif['name'], $notif['message']); } @@ -434,7 +434,7 @@ function ping_get_notifications($uid) intval($offset) ); - if (!$r AND !$seen) { + if (!$r && !$seen) { $seen = true; $seensql = ""; $order = "DESC"; @@ -474,12 +474,12 @@ function ping_get_notifications($uid) $notification["href"] = App::get_baseurl() . "/notify/view/" . $notification["id"]; - if ($notification["visible"] AND !$notification["spam"] AND - !$notification["deleted"] AND !is_array($result[$notification["parent"]])) { + if ($notification["visible"] && !$notification["spam"] && + !$notification["deleted"] && !is_array($result[$notification["parent"]])) { $result[$notification["parent"]] = $notification; } } - } while ((count($result) < 50) AND !$quit); + } while ((count($result) < 50) && !$quit); return($result); } diff --git a/mod/poco.php b/mod/poco.php index 97f518a1a5..5610190dc2 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -55,7 +55,7 @@ function poco_init(App $a) { $cid = intval($a->argv[4]); } - if (! $system_mode AND ! $global) { + if (! $system_mode && ! $global) { $users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid` where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1", dbesc($user) @@ -157,7 +157,7 @@ function poco_init(App $a) { if (x($_GET, 'filtered')) { $ret['filtered'] = false; } - if (x($_GET, 'updatedSince') AND ! $global) { + if (x($_GET, 'updatedSince') && ! $global) { $ret['updatedSince'] = false; } $ret['startIndex'] = (int) $startIndex; @@ -207,21 +207,21 @@ function poco_init(App $a) { } } - if (($contact['about'] == "") AND isset($contact['pabout'])) { + if (($contact['about'] == "") && isset($contact['pabout'])) { $contact['about'] = $contact['pabout']; } if ($contact['location'] == "") { if (isset($contact['plocation'])) { $contact['location'] = $contact['plocation']; } - if (isset($contact['pregion']) AND ( $contact['pregion'] != "")) { + if (isset($contact['pregion']) && ( $contact['pregion'] != "")) { if ($contact['location'] != "") { $contact['location'] .= ", "; } $contact['location'] .= $contact['pregion']; } - if (isset($contact['pcountry']) AND ( $contact['pcountry'] != "")) { + if (isset($contact['pcountry']) && ( $contact['pcountry'] != "")) { if ($contact['location'] != "") { $contact['location'] .= ", "; } @@ -229,10 +229,10 @@ function poco_init(App $a) { } } - if (($contact['gender'] == "") AND isset($contact['pgender'])) { + if (($contact['gender'] == "") && isset($contact['pgender'])) { $contact['gender'] = $contact['pgender']; } - if (($contact['keywords'] == "") AND isset($contact['pub_keywords'])) { + if (($contact['keywords'] == "") && isset($contact['pub_keywords'])) { $contact['keywords'] = $contact['pub_keywords']; } if (isset($contact['account-type'])) { @@ -306,7 +306,7 @@ function poco_init(App $a) { if ($entry['network'] == NETWORK_STATUSNET) { $entry['network'] = NETWORK_OSTATUS; } - if (($entry['network'] == "") AND ($contact['self'])) { + if (($entry['network'] == "") && ($contact['self'])) { $entry['network'] = NETWORK_DFRN; } } diff --git a/mod/proxy.php b/mod/proxy.php index 9311e55a96..a78f40dab2 100644 --- a/mod/proxy.php +++ b/mod/proxy.php @@ -48,15 +48,15 @@ function proxy_init(App $a) { $basepath = $a->get_basepath(); // If the cache path isn't there, try to create it - if (!is_dir($basepath . '/proxy') AND is_writable($basepath)) { + if (!is_dir($basepath . '/proxy') && is_writable($basepath)) { mkdir($basepath . '/proxy'); } // Checking if caching into a folder in the webroot is activated and working - $direct_cache = (is_dir($basepath . '/proxy') AND is_writable($basepath . '/proxy')); + $direct_cache = (is_dir($basepath . '/proxy') && is_writable($basepath . '/proxy')); // Look for filename in the arguments - if ((isset($a->argv[1]) OR isset($a->argv[2]) OR isset($a->argv[3])) AND !isset($_REQUEST['url'])) { + if ((isset($a->argv[1]) || isset($a->argv[2]) || isset($a->argv[3])) && !isset($_REQUEST['url'])) { if (isset($a->argv[3])) { $url = $a->argv[3]; } elseif (isset($a->argv[2])) { @@ -65,7 +65,7 @@ function proxy_init(App $a) { $url = $a->argv[1]; } - if (isset($a->argv[3]) AND ($a->argv[3] == 'thumb')) { + if (isset($a->argv[3]) && ($a->argv[3] == 'thumb')) { $size = 200; } @@ -112,7 +112,7 @@ function proxy_init(App $a) { $urlhash = 'pic:' . sha1($_REQUEST['url']); $cachefile = get_cachefile(hash('md5', $_REQUEST['url'])); - if ($cachefile != '' AND file_exists($cachefile)) { + if ($cachefile != '' && file_exists($cachefile)) { $img_str = file_get_contents($cachefile); $mime = image_type_to_mime_type(exif_imagetype($cachefile)); @@ -140,7 +140,7 @@ function proxy_init(App $a) { $valid = true; $r = array(); - if (!$direct_cache AND ($cachefile == '')) { + if (!$direct_cache && ($cachefile == '')) { $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash); if (dbm::is_result($r)) { $img_str = $r[0]['data']; @@ -163,7 +163,7 @@ function proxy_init(App $a) { unlink($tempfile); // If there is an error then return a blank image - if ((substr($a->get_curl_code(), 0, 1) == '4') OR (!$img_str)) { + if ((substr($a->get_curl_code(), 0, 1) == '4') || (!$img_str)) { $img_str = file_get_contents('images/blank.png'); $mime = 'image/png'; $cachefile = ''; // Clear the cachefile so that the dummy isn't stored @@ -173,7 +173,7 @@ function proxy_init(App $a) { $img->scaleImage(10); $img_str = $img->imageString(); } - } elseif ($mime != 'image/jpeg' AND !$direct_cache AND $cachefile == '') { + } elseif ($mime != 'image/jpeg' && !$direct_cache && $cachefile == '') { $image = @imagecreatefromstring($img_str); if ($image === FALSE) { @@ -199,7 +199,7 @@ function proxy_init(App $a) { } else { $img = new Photo($img_str, $mime); - if ($img->is_valid() AND !$direct_cache AND ($cachefile == '')) { + if ($img->is_valid() && !$direct_cache && ($cachefile == '')) { $img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100); } } @@ -219,7 +219,7 @@ function proxy_init(App $a) { // If there is a real existing directory then put the cache file there // advantage: real file access is really fast // Otherwise write in cachefile - if ($valid AND $direct_cache) { + if ($valid && $direct_cache) { file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true), $img_str_orig); if ($sizetype != '') { file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true) . $sizetype, $img_str); @@ -282,7 +282,7 @@ function proxy_url($url, $writemode = false, $size = '') { $shortpath = hash('md5', $url); $longpath = substr($shortpath, 0, 2); - if (is_dir($basepath) AND $writemode AND !is_dir($basepath . '/' . $longpath)) { + if (is_dir($basepath) && $writemode && !is_dir($basepath . '/' . $longpath)) { mkdir($basepath . '/' . $longpath); chmod($basepath . '/' . $longpath, 0777); } @@ -306,7 +306,7 @@ function proxy_url($url, $writemode = false, $size = '') { // Too long files aren't supported by Apache // Writemode in combination with long files shouldn't be possible - if ((strlen($proxypath) > 250) AND $writemode) { + if ((strlen($proxypath) > 250) && $writemode) { return $shortpath; } elseif (strlen($proxypath) > 250) { return App::get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url); @@ -360,7 +360,7 @@ function proxy_parse_query($url) { function proxy_img_cb($matches) { // if the picture seems to be from another picture cache then take the original source $queryvar = proxy_parse_query($matches[2]); - if (($queryvar['url'] != '') AND (substr($queryvar['url'], 0, 4) == 'http')) { + if (($queryvar['url'] != '') && (substr($queryvar['url'], 0, 4) == 'http')) { $matches[2] = urldecode($queryvar['url']); } diff --git a/mod/register.php b/mod/register.php index 71c13ef396..d6343a2285 100644 --- a/mod/register.php +++ b/mod/register.php @@ -83,7 +83,7 @@ function register_post(App $a) { } // Only send a password mail when the password wasn't manually provided - if (!x($_POST,'password1') OR !x($_POST,'confirm')) { + if (!x($_POST,'password1') || !x($_POST,'confirm')) { $res = send_register_open_eml( $user['email'], $a->config['sitename'], diff --git a/mod/search.php b/mod/search.php index fd1212ceec..3397c813bf 100644 --- a/mod/search.php +++ b/mod/search.php @@ -97,7 +97,7 @@ function search_content(App $a) { return; } - if(get_config('system','local_search') AND !local_user()) { + if(get_config('system','local_search') && !local_user()) { http_status_exit(403, array("title" => t("Public access denied."), "description" => t("Only logged in users are permitted to perform a search."))); @@ -106,7 +106,7 @@ function search_content(App $a) { //return; } - if (get_config('system','permit_crawling') AND !local_user()) { + if (get_config('system','permit_crawling') && !local_user()) { // Default values: // 10 requests are "free", after the 11th only a call per minute is allowed @@ -122,7 +122,7 @@ function search_content(App $a) { $result = Cache::get("remote_search:".$remote); if (!is_null($result)) { $resultdata = json_decode($result); - if (($resultdata->time > (time() - $crawl_permit_period)) AND ($resultdata->accesses > $free_crawls)) { + if (($resultdata->time > (time() - $crawl_permit_period)) && ($resultdata->accesses > $free_crawls)) { http_status_exit(429, array("title" => t("Too Many Requests"), "description" => t("Only one search per minute is permitted for not logged in users."))); diff --git a/mod/settings.php b/mod/settings.php index 3357de09e5..6793d86a9c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -462,13 +462,13 @@ function settings_post(App $a) { $notify += intval($_POST['notify8']); // Adjust the page flag if the account type doesn't fit to the page flag. - if (($account_type == ACCOUNT_TYPE_PERSON) AND !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) + if (($account_type == ACCOUNT_TYPE_PERSON) && !in_array($page_flags, array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) $page_flags = PAGE_NORMAL; - elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) AND !in_array($page_flags, array(PAGE_SOAPBOX))) + elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, array(PAGE_SOAPBOX))) $page_flags = PAGE_SOAPBOX; - elseif (($account_type == ACCOUNT_TYPE_NEWS) AND !in_array($page_flags, array(PAGE_SOAPBOX))) + elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, array(PAGE_SOAPBOX))) $page_flags = PAGE_SOAPBOX; - elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) AND !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) + elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, array(PAGE_COMMUNITY, PAGE_PRVGROUP))) $page_flags = PAGE_COMMUNITY; $email_changed = false; @@ -1101,7 +1101,7 @@ function settings_content(App $a) { // Set the account type to "Community" when the page is a community page but the account type doesn't fit // This is only happening on the first visit after the update - if (in_array($a->user['page-flags'], array(PAGE_COMMUNITY, PAGE_PRVGROUP)) AND + if (in_array($a->user['page-flags'], array(PAGE_COMMUNITY, PAGE_PRVGROUP)) && ($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY)) $a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY; diff --git a/mod/update_network.php b/mod/update_network.php index 42172486d8..ec3494fb7c 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -15,7 +15,7 @@ function update_network_content(App $a) { echo "<!DOCTYPE html><html><body>\r\n"; echo "<section>"; - if (!get_pconfig($profile_uid, "system", "no_auto_update") OR ($_GET["force"] == 1)) { + if (!get_pconfig($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) { $text = network_content($a, $profile_uid); } else { $text = ""; diff --git a/object/Item.php b/object/Item.php index 9e8b4738e2..95c01a073e 100644 --- a/object/Item.php +++ b/object/Item.php @@ -158,7 +158,7 @@ class Item extends BaseObject { $profile_link = zrl($profile_link); } - if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) { + if (!isset($item['author-thumb']) || ($item['author-thumb'] == "")) { $author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner()); if ($author_contact["thumb"]) { $item['author-thumb'] = $author_contact["thumb"]; @@ -167,7 +167,7 @@ class Item extends BaseObject { } } - if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) { + if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) { $owner_contact = get_contact_details_by_url($item['owner-link'], $conv->get_profile_owner()); if ($owner_contact["thumb"]) { $item['owner-thumb'] = $owner_contact["thumb"]; @@ -307,28 +307,28 @@ class Item extends BaseObject { // Disable features that aren't available in several networks /// @todo Add NETWORK_DIASPORA when it will pass this information - if (!in_array($item["item_network"], array(NETWORK_DFRN)) AND isset($buttons["dislike"])) { + if (!in_array($item["item_network"], array(NETWORK_DFRN)) && isset($buttons["dislike"])) { unset($buttons["dislike"],$isevent); $tagger = ''; } - if (($item["item_network"] == NETWORK_FEED) AND isset($buttons["like"])) { + if (($item["item_network"] == NETWORK_FEED) && isset($buttons["like"])) { unset($buttons["like"]); } - if (($item["item_network"] == NETWORK_MAIL) AND isset($buttons["like"])) { + if (($item["item_network"] == NETWORK_MAIL) && isset($buttons["like"])) { unset($buttons["like"]); } // Diaspora isn't able to do likes on comments - but Hubzilla does /// @todo When Diaspora will pass this information we will remove these lines - if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND - !Diaspora::is_redmatrix($item["owner-link"]) AND isset($buttons["like"])) { + if (($item["item_network"] == NETWORK_DIASPORA) && ($indent == 'comment') && + !Diaspora::is_redmatrix($item["owner-link"]) && isset($buttons["like"])) { unset($buttons["like"]); } // Facebook can like comments - but it isn't programmed in the connector yet. - if (($item["item_network"] == NETWORK_FACEBOOK) AND ($indent == 'comment') AND isset($buttons["like"])) { + if (($item["item_network"] == NETWORK_FACEBOOK) && ($indent == 'comment') && isset($buttons["like"])) { unset($buttons["like"]); } @@ -733,7 +733,7 @@ class Item extends BaseObject { if($this->is_toplevel()) { if($conv->get_mode() !== 'profile') { - if($this->get_data_value('wall') AND !$this->get_data_value('self')) { + if($this->get_data_value('wall') && !$this->get_data_value('self')) { // On the network page, I am the owner. On the display page it will be the profile owner. // This will have been stored in $a->page_contact by our calling page. // Put this person as the wall owner of the wall-to-wall notice. diff --git a/src/App.php b/src/App.php index 26cfcaadb1..f6b568ae8a 100644 --- a/src/App.php +++ b/src/App.php @@ -406,7 +406,7 @@ class App { $this->hostname = Config::get('config', 'hostname'); } - if (!isset($this->hostname) OR ( $this->hostname == '')) { + if (!isset($this->hostname) || ( $this->hostname == '')) { $this->hostname = $hostname; } } @@ -850,7 +850,7 @@ class App { $meminfo[$key] = (int) ($meminfo[$key] / 1024); } - if (!isset($meminfo['MemAvailable']) OR ! isset($meminfo['MemFree'])) { + if (!isset($meminfo['MemAvailable']) || ! isset($meminfo['MemFree'])) { return false; } @@ -907,7 +907,7 @@ class App { $cachekey = 'app:proc_run:started'; $result = Cache::get($cachekey); - if (!is_null($result) AND ( time() - $result) < 2) { + if (!is_null($result) && ( time() - $result) < 2) { return; } @@ -949,7 +949,7 @@ class App { * @return string system username */ static function systemuser() { - if (!function_exists('posix_getpwuid') OR ! function_exists('posix_geteuid')) { + if (!function_exists('posix_getpwuid') || ! function_exists('posix_geteuid')) { return ''; } @@ -980,7 +980,7 @@ class App { logger('Path "' . $directory . '" is not a directory for user ' . self::systemuser(), LOGGER_DEBUG); return false; } - if ($check_writable AND !is_writable($directory)) { + if ($check_writable && !is_writable($directory)) { logger('Path "' . $directory . '" is not writable for user ' . self::systemuser(), LOGGER_DEBUG); return false; } diff --git a/src/Core/Config.php b/src/Core/Config.php index 4e5c1e3d04..d454de3921 100644 --- a/src/Core/Config.php +++ b/src/Core/Config.php @@ -151,7 +151,7 @@ class Config { $stored = self::get($family, $key, null, true); - if (($stored === $dbvalue) AND self::$in_db[$family][$key]) { + if (($stored === $dbvalue) && self::$in_db[$family][$key]) { return true; } @@ -167,7 +167,7 @@ class Config { // manage array value $dbvalue = (is_array($value) ? serialize($value) : $dbvalue); - if (is_null($stored) OR !self::$in_db[$family][$key]) { + if (is_null($stored) || !self::$in_db[$family][$key]) { $ret = q("INSERT INTO `config` (`cat`, `k`, `v`) VALUES ('%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'", dbesc($family), dbesc($key), diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php index 6ced9fc755..2cfcfc235a 100644 --- a/src/Core/PConfig.php +++ b/src/Core/PConfig.php @@ -138,7 +138,7 @@ class PConfig { $stored = self::get($uid, $family, $key, null, true); - if (($stored === $dbvalue) AND self::$in_db[$uid][$family][$key]) { + if (($stored === $dbvalue) && self::$in_db[$uid][$family][$key]) { return true; } @@ -147,7 +147,7 @@ class PConfig { // manage array value $dbvalue = (is_array($value) ? serialize($value) : $dbvalue); - if (is_null($stored) OR !self::$in_db[$uid][$family][$key]) { + if (is_null($stored) || !self::$in_db[$uid][$family][$key]) { $ret = q("INSERT INTO `pconfig` (`uid`, `cat`, `k`, `v`) VALUES (%d, '%s', '%s', '%s') ON DUPLICATE KEY UPDATE `v` = '%s'", intval($uid), dbesc($family), diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 531fdfef64..f0bb17dacd 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -104,7 +104,7 @@ class Probe { logger("Probing for ".$host, LOGGER_DEBUG); $ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml')); - if (($ret['errno'] == CURLE_OPERATION_TIMEDOUT) AND !self::ownHost($ssl_url)) { + if (($ret['errno'] == CURLE_OPERATION_TIMEDOUT) && !self::ownHost($ssl_url)) { logger("Probing timeout for ".$ssl_url, LOGGER_DEBUG); return false; } @@ -144,11 +144,11 @@ class Probe { } if (($attributes["rel"] == "lrdd") - AND ($attributes["type"] == "application/xrd+xml") + && ($attributes["type"] == "application/xrd+xml") ) { $xrd_data["lrdd-xml"] = $attributes["template"]; } elseif (($attributes["rel"] == "lrdd") - AND ($attributes["type"] == "application/json") + && ($attributes["type"] == "application/json") ) { $xrd_data["lrdd-json"] = $attributes["template"]; } elseif ($attributes["rel"] == "lrdd") { @@ -195,7 +195,7 @@ class Probe { if ($link['@attributes']['rel'] === NAMESPACE_DFRN) { $profile_link = $link['@attributes']['href']; } - if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == "")) { + if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) && ($profile_link == "")) { $profile_link = 'stat:'.$link['@attributes']['template']; } if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard') { @@ -244,7 +244,7 @@ class Probe { do { $lrdd = self::xrd($host); $host .= "/".array_shift($path_parts); - } while (!$lrdd AND (sizeof($path_parts) > 0)); + } while (!$lrdd && (sizeof($path_parts) > 0)); } if (!$lrdd) { @@ -264,7 +264,7 @@ class Probe { $path = str_replace('{uri}', urlencode($uri), $link); $webfinger = self::webfinger($path); - if (!$webfinger AND (strstr($uri, "@"))) { + if (!$webfinger && (strstr($uri, "@"))) { $path = str_replace('{uri}', urlencode("acct:".$uri), $link); $webfinger = self::webfinger($path); } @@ -272,7 +272,7 @@ class Probe { // Special treatment for Mastodon // Problem is that Mastodon uses an URL format like http://domain.tld/@nick // But the webfinger for this format fails. - if (!$webfinger AND isset($nick)) { + if (!$webfinger && isset($nick)) { // Mastodon uses a "@" as prefix for usernames in their url format $nick = ltrim($nick, '@'); @@ -340,7 +340,7 @@ class Probe { $data["photo"] = App::get_baseurl().'/images/person-175.jpg'; } - if (!isset($data["name"]) OR ($data["name"] == "")) { + if (!isset($data["name"]) || ($data["name"] == "")) { if (isset($data["nick"])) { $data["name"] = $data["nick"]; } @@ -350,7 +350,7 @@ class Probe { } } - if (!isset($data["nick"]) OR ($data["nick"] == "")) { + if (!isset($data["nick"]) || ($data["nick"] == "")) { $data["nick"] = strtolower($data["name"]); if (strpos($data['nick'], ' ')) { @@ -377,12 +377,12 @@ class Probe { /// It should only be updated if the existing picture isn't existing anymore. /// We only update the contact when it is no probing for a specific network. if (($data['network'] != NETWORK_FEED) - AND ($network == "") - AND $data["name"] - AND $data["nick"] - AND $data["url"] - AND $data["addr"] - AND $data["poll"] + && ($network == "") + && $data["name"] + && $data["nick"] + && $data["url"] + && $data["addr"] + && $data["poll"] ) { q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `addr` = '%s', `notify` = '%s', `poll` = '%s', `alias` = '%s', `success_update` = '%s' @@ -417,7 +417,7 @@ class Probe { private function detect($uri, $network, $uid) { $parts = parse_url($uri); - if (isset($parts["scheme"]) AND isset($parts["host"]) AND isset($parts["path"])) { + if (isset($parts["scheme"]) && isset($parts["host"]) && isset($parts["path"])) { $host = $parts["host"]; if (isset($parts["port"])) { $host .= ':'.$parts["port"]; @@ -434,7 +434,7 @@ class Probe { $path_parts = explode("/", trim($parts["path"], "/")); - while (!$lrdd AND (sizeof($path_parts) > 1)) { + while (!$lrdd && (sizeof($path_parts) > 1)) { $host .= "/".array_shift($path_parts); $lrdd = self::xrd($host); } @@ -501,7 +501,7 @@ class Probe { $webfinger = self::webfinger($path); // We cannot be sure that the detected address was correct, so we don't use the values - if ($webfinger AND ($uri != $addr)) { + if ($webfinger && ($uri != $addr)) { $nick = ""; $addr = ""; } @@ -529,32 +529,32 @@ class Probe { if (in_array($network, array("", NETWORK_DFRN))) { $result = self::dfrn($webfinger); } - if ((!$result AND ($network == "")) OR ($network == NETWORK_DIASPORA)) { + if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) { $result = self::diaspora($webfinger); } - if ((!$result AND ($network == "")) OR ($network == NETWORK_OSTATUS)) { + if ((!$result && ($network == "")) || ($network == NETWORK_OSTATUS)) { $result = self::ostatus($webfinger); } - if ((!$result AND ($network == "")) OR ($network == NETWORK_PUMPIO)) { + if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) { $result = self::pumpio($webfinger); } - if ((!$result AND ($network == "")) OR ($network == NETWORK_FEED)) { + if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) { $result = self::feed($uri); } else { // We overwrite the detected nick with our try if the previois routines hadn't detected it. // Additionally it is overwritten when the nickname doesn't make sense (contains spaces). - if ((!isset($result["nick"]) OR ($result["nick"] == "") OR (strstr($result["nick"], " "))) AND ($nick != "")) { + if ((!isset($result["nick"]) || ($result["nick"] == "") || (strstr($result["nick"], " "))) && ($nick != "")) { $result["nick"] = $nick; } - if ((!isset($result["addr"]) OR ($result["addr"] == "")) AND ($addr != "")) { + if ((!isset($result["addr"]) || ($result["addr"] == "")) && ($addr != "")) { $result["addr"] = $addr; } } logger($uri." is ".$result["network"], LOGGER_DEBUG); - if (!isset($result["baseurl"]) OR ($result["baseurl"] == "")) { + if (!isset($result["baseurl"]) || ($result["baseurl"] == "")) { $pos = strpos($result["url"], $host); if ($pos) { $result["baseurl"] = substr($result["url"], 0, $pos).$host; @@ -762,12 +762,12 @@ class Probe { $data = self::pollNoscrape($noscrape_url, $data); if (!isset($data["notify"]) - OR !isset($data["confirm"]) - OR !isset($data["request"]) - OR !isset($data["poll"]) - OR !isset($data["poco"]) - OR !isset($data["name"]) - OR !isset($data["photo"]) + || !isset($data["confirm"]) + || !isset($data["request"]) + || !isset($data["poll"]) + || !isset($data["poco"]) + || !isset($data["name"]) + || !isset($data["photo"]) ) { $data = self::pollHcard($profile_link, $data, true); } @@ -801,33 +801,33 @@ class Probe { $hcard_url = ""; $data = array(); foreach ($webfinger["links"] as $link) { - if (($link["rel"] == NAMESPACE_DFRN) AND ($link["href"] != "")) { + if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) { $data["network"] = NETWORK_DFRN; - } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) { + } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) { $data["poll"] = $link["href"]; - } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) { $data["url"] = $link["href"]; - } elseif (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) { $hcard_url = $link["href"]; - } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) { + } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) { $data["poco"] = $link["href"]; - } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && ($link["href"] != "")) { $data["photo"] = $link["href"]; - } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) { $data["baseurl"] = trim($link["href"], '/'); - } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) { $data["guid"] = $link["href"]; - } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) { $data["pubkey"] = base64_decode($link["href"]); - //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) + //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA")) if (strstr($data["pubkey"], 'RSA ')) { $data["pubkey"] = rsatopem($data["pubkey"]); } } } - if (!isset($data["network"]) OR ($hcard_url == "")) { + if (!isset($data["network"]) || ($hcard_url == "")) { return false; } @@ -836,11 +836,11 @@ class Probe { $data = self::pollNoscrape($noscrape_url, $data); if (isset($data["notify"]) - AND isset($data["confirm"]) - AND isset($data["request"]) - AND isset($data["poll"]) - AND isset($data["name"]) - AND isset($data["photo"]) + && isset($data["confirm"]) + && isset($data["request"]) + && isset($data["poll"]) + && isset($data["name"]) + && isset($data["photo"]) ) { return $data; } @@ -887,7 +887,7 @@ class Probe { // We have to discard the guid from the hcard in favour of the guid from lrdd // Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does. $search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */ - if (($search->length > 0) AND ($data["guid"] == "")) { + if (($search->length > 0) && ($data["guid"] == "")) { $data["guid"] = $search->item(0)->nodeValue; } @@ -928,13 +928,13 @@ class Probe { $attr[$attribute->name] = trim($attribute->value); } - if (isset($attr["src"]) AND isset($attr["width"])) { + if (isset($attr["src"]) && isset($attr["width"])) { $avatar[$attr["width"]] = $attr["src"]; } // We don't have a width. So we just take everything that we got. // This is a Hubzilla workaround which doesn't send a width. - if ((sizeof($avatar) == 0) AND isset($attr["src"])) { + if ((sizeof($avatar) == 0) && isset($attr["src"])) { $avatar[] = $attr["src"]; } } @@ -981,37 +981,37 @@ class Probe { $hcard_url = ""; $data = array(); foreach ($webfinger["links"] as $link) { - if (($link["rel"] == "http://microformats.org/profile/hcard") AND ($link["href"] != "")) { + if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) { $hcard_url = $link["href"]; - } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) { $data["baseurl"] = trim($link["href"], '/'); - } elseif (($link["rel"] == "http://joindiaspora.com/guid") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) { $data["guid"] = $link["href"]; - } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") AND ($link["type"] == "text/html") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) { $data["url"] = $link["href"]; - } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) { + } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) { $data["poll"] = $link["href"]; - } elseif (($link["rel"] == NAMESPACE_POCO) AND ($link["href"] != "")) { + } elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) { $data["poco"] = $link["href"]; - } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) { $data["notify"] = $link["href"]; - } elseif (($link["rel"] == "diaspora-public-key") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) { $data["pubkey"] = base64_decode($link["href"]); - //if (strstr($data["pubkey"], 'RSA ') OR ($link["type"] == "RSA")) + //if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA")) if (strstr($data["pubkey"], 'RSA ')) { $data["pubkey"] = rsatopem($data["pubkey"]); } } } - if (!isset($data["url"]) OR ($hcard_url == "")) { + if (!isset($data["url"]) || ($hcard_url == "")) { return false; } if (is_array($webfinger["aliases"])) { foreach ($webfinger["aliases"] as $alias) { - if (normalise_link($alias) != normalise_link($data["url"]) AND ! strstr($alias, "@")) { + if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) { $data["alias"] = $alias; } } @@ -1025,10 +1025,10 @@ class Probe { } if (isset($data["url"]) - AND isset($data["guid"]) - AND isset($data["baseurl"]) - AND isset($data["pubkey"]) - AND ($hcard_url != "") + && isset($data["guid"]) + && isset($data["baseurl"]) + && isset($data["pubkey"]) + && ($hcard_url != "") ) { $data["network"] = NETWORK_DIASPORA; @@ -1062,21 +1062,21 @@ class Probe { } } - if (is_string($webfinger["subject"]) AND strstr($webfinger["subject"], "@")) { + if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")) { $data["addr"] = str_replace('acct:', '', $webfinger["subject"]); } $pubkey = ""; foreach ($webfinger["links"] as $link) { if (($link["rel"] == "http://webfinger.net/rel/profile-page") - AND ($link["type"] == "text/html") - AND ($link["href"] != "") + && ($link["type"] == "text/html") + && ($link["href"] != "") ) { $data["url"] = $link["href"]; - } elseif (($link["rel"] == "salmon") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "salmon") && ($link["href"] != "")) { $data["notify"] = $link["href"]; - } elseif (($link["rel"] == NAMESPACE_FEED) AND ($link["href"] != "")) { + } elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) { $data["poll"] = $link["href"]; - } elseif (($link["rel"] == "magic-public-key") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "magic-public-key") && ($link["href"] != "")) { $pubkey = $link["href"]; if (substr($pubkey, 0, 5) === 'data:') { @@ -1103,9 +1103,9 @@ class Probe { } } - if (isset($data["notify"]) AND isset($data["pubkey"]) - AND isset($data["poll"]) - AND isset($data["url"]) + if (isset($data["notify"]) && isset($data["pubkey"]) + && isset($data["poll"]) + && isset($data["url"]) ) { $data["network"] = NETWORK_OSTATUS; } else { @@ -1200,21 +1200,21 @@ class Probe { $data = array(); foreach ($webfinger["links"] as $link) { if (($link["rel"] == "http://webfinger.net/rel/profile-page") - AND ($link["type"] == "text/html") - AND ($link["href"] != "") + && ($link["type"] == "text/html") + && ($link["href"] != "") ) { $data["url"] = $link["href"]; - } elseif (($link["rel"] == "activity-inbox") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "activity-inbox") && ($link["href"] != "")) { $data["notify"] = $link["href"]; - } elseif (($link["rel"] == "activity-outbox") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "activity-outbox") && ($link["href"] != "")) { $data["poll"] = $link["href"]; - } elseif (($link["rel"] == "dialback") AND ($link["href"] != "")) { + } elseif (($link["rel"] == "dialback") && ($link["href"] != "")) { $data["dialback"] = $link["href"]; } } - if (isset($data["poll"]) AND isset($data["notify"]) - AND isset($data["dialback"]) - AND isset($data["url"]) + if (isset($data["poll"]) && isset($data["notify"]) + && isset($data["dialback"]) + && isset($data["url"]) ) { // by now we use these fields only for the network type detection // So we unset all data that isn't used at the moment diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 26ccdc9dd2..b2c5afc662 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -68,7 +68,7 @@ class Lock { // When the process id isn't used anymore, we can safely claim the lock for us. // Or we do want to lock something that was already locked by us. - if (!posix_kill($pid, 0) OR ($pid == getmypid())) { + if (!posix_kill($pid, 0) || ($pid == getmypid())) { $lock = false; } } @@ -76,10 +76,10 @@ class Lock { $memcache->set($cachekey, getmypid(), MEMCACHE_COMPRESSED, 300); $got_lock = true; } - if (!$got_lock AND ($timeout > 0)) { + if (!$got_lock && ($timeout > 0)) { usleep($wait_sec * 1000000); } - } while (!$got_lock AND ((time() - $start) < $timeout)); + } while (!$got_lock && ((time() - $start) < $timeout)); return $got_lock; } @@ -112,10 +112,10 @@ class Lock { dba::unlock(); - if (!$got_lock AND ($timeout > 0)) { + if (!$got_lock && ($timeout > 0)) { sleep($wait_sec); } - } while (!$got_lock AND ((time() - $start) < $timeout)); + } while (!$got_lock && ((time() - $start) < $timeout)); return $got_lock; } diff --git a/update.php b/update.php index df52e8582b..83f3dada53 100644 --- a/update.php +++ b/update.php @@ -1652,7 +1652,7 @@ function update_1180() { function update_1188() { - if (strlen(get_config('system','directory_submit_url')) AND + if (strlen(get_config('system','directory_submit_url')) && !strlen(get_config('system','directory'))) { set_config('system','directory', dirname(get_config('system','directory_submit_url'))); del_config('system','directory_submit_url'); diff --git a/util/maintenance.php b/util/maintenance.php index 40634e0d89..9c9fc4f19d 100644 --- a/util/maintenance.php +++ b/util/maintenance.php @@ -24,7 +24,7 @@ if ($argc > 1) { Config::set('system', 'maintenance', $maint_mode); -if ($maint_mode AND ($argc > 2)) { +if ($maint_mode && ($argc > 2)) { $reason_arr = $argv; array_shift($reason_arr); array_shift($reason_arr); diff --git a/view/theme/frio/php/frio_boot.php b/view/theme/frio/php/frio_boot.php index 17fbb1fbac..91e0f6ff35 100644 --- a/view/theme/frio/php/frio_boot.php +++ b/view/theme/frio/php/frio_boot.php @@ -15,9 +15,9 @@ use Friendica\App; * @todo Check if this is really needed. */ function load_page(App $a) { - if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) { + if(isset($_GET["mode"]) && ($_GET["mode"] == "minimal")) { require "view/theme/frio/minimal.php"; - } elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) { + } elseif((isset($_GET["mode"]) && ($_GET["mode"] == "none"))) { require "view/theme/frio/none.php"; } else { $template = 'view/theme/' . current_theme() . '/' diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php index 3d3c776745..dba758ca24 100644 --- a/view/theme/vier/style.php +++ b/view/theme/vier/style.php @@ -46,7 +46,7 @@ if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MA $cached_etag = str_replace(array('"', "-gzip"), array('', ''), stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])); - if (($cached_modified == $modified) AND ($cached_etag == $etag)) { + if (($cached_modified == $modified) && ($cached_etag == $etag)) { header('HTTP/1.1 304 Not Modified'); exit(); } diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 269b34460c..eaee46e928 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -96,14 +96,14 @@ EOT; // Hide the left menu bar /// @TODO maybe move this static array out where it should belong? - if (($a->page['aside'] == "") AND in_array($a->argv[0], array("community", "events", "help", "manage", "notifications", + if (($a->page['aside'] == "") && in_array($a->argv[0], array("community", "events", "help", "manage", "notifications", "probe", "webfinger", "login", "invite", "credits"))) { $a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />"; } } function get_vier_config($key, $default = false, $admin = false) { - if (local_user() AND !$admin) { + if (local_user() && !$admin) { $result = get_pconfig(local_user(), "vier", $key); if ($result !== false) { return $result; @@ -186,7 +186,7 @@ function vier_community_info() { } //right_aside FIND FRIENDS - if ($show_friends AND local_user()) { + if ($show_friends && local_user()) { $nv = array(); $nv['title'] = array("", t('Find Friends'), "", ""); $nv['directory'] = array('directory', t('Local Directory'), "", ""); @@ -206,7 +206,7 @@ function vier_community_info() { } //Community_Pages at right_aside - if ($show_pages AND local_user()) { + if ($show_pages && local_user()) { require_once 'include/ForumManager.php'; @@ -372,7 +372,7 @@ function vier_community_info() { $r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress"); } - if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) { + if (function_exists("imap_open") && !get_config("system","imap_disabled") && !get_config("system","dfrn_only")) { $r[] = array("photo" => "images/mail.png", "name" => "E-Mail"); } From 2281989866068f2b4f7dc3b72eb19f5bd9cdc949 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan <mrpetovan@gmail.com> Date: Wed, 7 Jun 2017 22:01:14 -0400 Subject: [PATCH 050/160] Replace && by AND in SQL queries --- include/queue.php | 2 +- update.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/queue.php b/include/queue.php index a92f2b2074..5e73922f9a 100644 --- a/include/queue.php +++ b/include/queue.php @@ -44,7 +44,7 @@ function queue_run(&$argv, &$argc){ // For the first 12 hours we'll try to deliver every 15 minutes // After that, we'll only attempt delivery once per hour. - $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`"); + $r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`"); call_hooks('queue_predeliver', $a, $r); diff --git a/update.php b/update.php index 83f3dada53..aaa7aa0b9e 100644 --- a/update.php +++ b/update.php @@ -356,7 +356,7 @@ function update_1035() { function update_1036() { - $r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' "); + $r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' AND `photo` LIKE '%include/photo%' "); if (dbm::is_result($r)) { foreach ($r as $rr) { q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d", From 98d105158339de85edea7f356a58d4c125af18e6 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan <mrpetovan@gmail.com> Date: Wed, 7 Jun 2017 22:01:27 -0400 Subject: [PATCH 051/160] Updated documentation with the new coding standard --- doc/Developers-Intro.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md index 3cda8ab466..137e5aaf54 100644 --- a/doc/Developers-Intro.md +++ b/doc/Developers-Intro.md @@ -64,6 +64,7 @@ Here's a few primers if you are new to Friendica or to the PSR-2 coding standard * By default, strings are enclosed in single quotes, but feel free to use double quotes if it makes more sense (SQL queries, adding tabs and line feeds). * Operators are wrapped by spaces, e.g. `$var === true`, `$var = 1 + 2` and `'string' . $concat . 'enation'` * Braces are mandatory in conditions + * Boolean operators are `&&` and `||` for PHP conditions, `AND` and `OR` for SQL queries * No closing PHP tag * No trailing spaces From 0541a62134e8af948f0e4c713a42ca70eaa64f3f Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 8 Jun 2017 03:56:42 +0000 Subject: [PATCH 052/160] The function "construct_acl_data" isn't used at all, it seems. it is deactivated now --- include/acl_selectors.php | 10 +++------- view/theme/frio/theme.php | 14 -------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 9ef1977bc5..725f69a656 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -388,13 +388,9 @@ function populate_acl($user = null, $show_jotnets = false) { } function construct_acl_data(App $a, $user) { - - $arr = array('user' => $user); - call_hooks('construct_acl_data', $arr); - - if (isset($arr['cancel'])) { - return; - } + // This function is now deactivated. It seems as if the generated data isn't used anywhere. + // We will remove the function completely before the release of 3.5.3 when there won't be any issues. + return; // Get group and contact information for html ACL selector $acl_data = acl_lookup($a, 'html'); diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index cbb7324bcb..551f39c8f7 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -48,7 +48,6 @@ function frio_install() { register_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu'); register_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav'); register_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); - register_hook('construct_acl_data', 'view/theme/frio/theme.php', 'frio_construct_acl_data'); logger("installed theme frio"); } @@ -59,7 +58,6 @@ function frio_uninstall() { unregister_hook('contact_photo_menu', 'view/theme/frio/theme.php', 'frio_contact_photo_menu'); unregister_hook('nav_info', 'view/theme/frio/theme.php', 'frio_remote_nav'); unregister_hook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup'); - unregister_hook('construct_acl_data', 'view/theme/frio/theme.php', 'frio_construct_acl_data'); logger("uninstalled theme frio"); } @@ -323,15 +321,3 @@ function frio_acl_lookup(App $a, &$results) { $results["tot"] = $total; } } - -/** - * @brief: Deactivate the old style acl selector - * - * We don't need the old one for Frio. Deactivating makes page loading much faster - * - * @param App $a The app data @TODO Unused - * @param array $arr We use this array to stop processing. See construct_acl_data in include/acl_selectors.php - */ -function frio_construct_acl_data(App $a, &$arr) { - $arr['cancel'] = true; -} From a9b948d6f9a3c8b110d84096d033f3fbef864bcb Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Thu, 8 Jun 2017 15:00:50 +0200 Subject: [PATCH 053/160] added hints how to specify a port for the database connection --- INSTALL.txt | 11 ++++++++--- doc/Install.md | 2 ++ doc/htconfig.md | 7 +++++++ view/templates/htconfig.tpl | 8 +++++--- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 81dfdfd272..c42c089716 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -71,9 +71,14 @@ write or create files in your web directory, create an empty file called .htconfig.php and make it writable by the web server. 5. Visit your website with a web browser and follow the instructions. Please -note any error messages and correct these before continuing. If you are using -SSL with a known signature authority (recommended), use the https: link to your -website. If you are using a self-signed cert or no cert, use the http: link. +note any error messages and correct these before continuing. + +If you are using SSL with a known signature authority (recommended), use the +https: link to your website. If you are using a self-signed cert or no cert, +use the http: link. + +If you need to specify a port for the connection to the database, you can do +so in the host name setting for the database. 6. *If* the automated installation fails for any reason, check the following: diff --git a/doc/Install.md b/doc/Install.md index a8ea2c0503..53df55be06 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -82,6 +82,8 @@ Restart mysql and you should be fine. Point your web browser to the new site and follow the instructions. Please note any error messages and correct these before continuing. +If you need to specify a port for the connection to the database, you can do so in the host name setting for the database. + *If* the automated installation fails for any reason, check the following: * Does ".htconfig.php" exist? If not, edit htconfig.php and change the system settings. Rename to .htconfig.php diff --git a/doc/htconfig.md b/doc/htconfig.md index 7887184d88..519c655fb2 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -117,3 +117,10 @@ If more then one account should be able to access the admin panel, seperate the If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name. $a->config['admin_name'] = "Marvin"; + +## Database Settings + +The configuration variables db_host, db_user, db_pass and db_data are holding your credentials for the database connection. +If you need to specify a port to access the database, you can do so by appending ":portnumber" to the db_host variable. + + $db_host = 'your.mysqlhost.com:123456'; diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl index 02cf67f39d..6a156012a2 100644 --- a/view/templates/htconfig.tpl +++ b/view/templates/htconfig.tpl @@ -1,14 +1,16 @@ <?php /* ******************************************************************** - * The following configuration has to be within the .htconfig file - * and will not be overruled by decisions made in the admin panel. + * The following configuration has to be within the .htconfig.php + * file and will not be overruled by decisions made in the admin panel. * * See below for variables that may be overruled by the admin panel. * ********************************************************************/ // Set the following for your MySQL installation -// Copy or rename this file to .htconfig.php +// +// If you need to specify a port for reacing the database, you can do so by +// adding ":portnumber" after "your.mysqlhost.com" in the $db_host config. $db_host = '{{$dbhost}}'; $db_user = '{{$dbuser}}'; From 0489c04a432d87cd8f6c268736102020ff84249e Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Thu, 8 Jun 2017 15:03:04 +0200 Subject: [PATCH 054/160] spacing not tabs --- doc/htconfig.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/htconfig.md b/doc/htconfig.md index 519c655fb2..9c556bb7cd 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -123,4 +123,4 @@ If you want to have a more personalized closing line for the notification emails The configuration variables db_host, db_user, db_pass and db_data are holding your credentials for the database connection. If you need to specify a port to access the database, you can do so by appending ":portnumber" to the db_host variable. - $db_host = 'your.mysqlhost.com:123456'; + $db_host = 'your.mysqlhost.com:123456'; From 8f336bffc24a636462f770ab91661436cf85ef53 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 8 Jun 2017 20:43:30 +0000 Subject: [PATCH 055/160] further improvements to the workerqueue --- include/poller.php | 104 ++++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 29 deletions(-) diff --git a/include/poller.php b/include/poller.php index fcabe5d8ee..1588cecf20 100644 --- a/include/poller.php +++ b/include/poller.php @@ -86,13 +86,21 @@ function poller_run($argv, $argc){ // If we got that queue entry we claim it for us if (!poller_claim_process($r[0])) { + dba::unlock(); continue; + } else { + // Fetch all workerqueue data while the table is still locked + // This is redundant, but this speeds up the processing + $entries = poller_total_entries(); + $top_priority = poller_highest_priority(); + $high_running = poller_process_with_priority_active($top_priority); + dba::unlock(); } // To avoid the quitting of multiple pollers only one poller at a time will execute the check if (Lock::set('poller_worker', 0)) { // Count active workers and compare them with a maximum value that depends on the load - if (poller_too_much_workers()) { + if (poller_too_much_workers($entries, $top_priority, $high_running)) { logger('Active worker limit reached, quitting.', LOGGER_DEBUG); return; } @@ -120,6 +128,39 @@ function poller_run($argv, $argc){ logger("Couldn't select a workerqueue entry, quitting.", LOGGER_DEBUG); } +/** + * @brief Returns the number of non executed entries in the worker queue + * + * @return integer Number of non executed entries in the worker queue + */ +function poller_total_entries() { + $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE)); + return $s[0]["total"]; +} + +/** + * @brief Returns the highest priority in the worker queue that isn't executed + * + * @return integer Number of active poller processes + */ +function poller_highest_priority() { + $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority` LIMIT 1", dbesc(NULL_DATE)); + return $s[0]["priority"]; +} + +/** + * @brief Returns if a process with the given priority is running + * + * @param integer $priority The priority that should be checked + * + * @return integer Is there a process running with that priority? + */ +function poller_process_with_priority_active($priority) { + $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` > '%s' LIMIT 1", + intval($priority), dbesc(NULL_DATE)); + return dbm::is_result($s); +} + /** * @brief Execute a worker entry * @@ -421,9 +462,13 @@ function poller_kill_stale_workers() { /** * @brief Checks if the number of active workers exceeds the given limits * + * @param integer $entries The number of not executed entries in the worker queue + * @param integer $top_priority The highest not executed priority in the worker queue + * @param boolean $high_running Is a process with priority "$top_priority" running? + * * @return bool Are there too much workers running? */ -function poller_too_much_workers() { +function poller_too_much_workers($entries = NULL, $top_priority = NULL, $high_running = NULL) { $queues = Config::get("system", "worker_queues", 4); $maxqueues = $queues; @@ -442,39 +487,40 @@ function poller_too_much_workers() { $slope = $maxworkers / pow($maxsysload, $exponent); $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent)); - // Create a list of queue entries grouped by their priority - $listitem = array(); + if (Config::get('system', 'worker_debug')) { + // Create a list of queue entries grouped by their priority + $listitem = array(); - // Adding all processes with no workerqueue entry - $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS (SELECT id FROM `workerqueue` WHERE `workerqueue`.`pid` = `process`.`pid`)"); - if ($process = dba::fetch($processes)) { - $listitem[0] = "0:".$process["running"]; - } - dba::close($processes); - - // Now adding all processes with workerqueue entries - $entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` GROUP BY `priority`"); - while ($entry = dba::fetch($entries)) { - $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE `priority` = ?", $entry["priority"]); + // Adding all processes with no workerqueue entry + $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS (SELECT id FROM `workerqueue` WHERE `workerqueue`.`pid` = `process`.`pid`)"); if ($process = dba::fetch($processes)) { - $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"]; + $listitem[0] = "0:".$process["running"]; } dba::close($processes); + + // Now adding all processes with workerqueue entries + $entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` GROUP BY `priority`"); + while ($entry = dba::fetch($entries)) { + $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE `priority` = ?", $entry["priority"]); + if ($process = dba::fetch($processes)) { + $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"]; + } + dba::close($processes); + } + dba::close($entries); + $processlist = ' ('.implode(', ', $listitem).')'; } - dba::close($entries); - $processlist = ' ('.implode(', ', $listitem).')'; - - $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE)); - $entries = $s[0]["total"]; + if (is_null($entries)) { + $entries = poller_total_entries(); + } if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($entries > 0) AND ($active >= $queues)) { - $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` > '%s' LIMIT 1", - intval($top_priority), dbesc(NULL_DATE)); - $high_running = dbm::is_result($s); - + if (is_null($top_priority)) { + $top_priority = poller_highest_priority(); + } + if (is_null($high_running)) { + $high_running = poller_process_with_priority_active($top_priority); + } if (!$high_running AND ($top_priority > PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_NEGLIGIBLE)) { logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG); $queues = $active + 1; @@ -620,7 +666,7 @@ function poller_claim_process($queue) { $success = dba::update('workerqueue', array('executed' => datetime_convert(), 'pid' => $mypid), array('id' => $queue["id"], 'pid' => 0)); - dba::unlock(); + //dba::unlock(); if (!$success) { logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG); From d419962dbf54e5c526b386d9ad37c90b0b8ec31e Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 8 Jun 2017 20:50:25 +0000 Subject: [PATCH 056/160] Added documentation --- doc/htconfig.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/htconfig.md b/doc/htconfig.md index 7887184d88..5fbd6e0cb8 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -68,6 +68,7 @@ Example: To set the directory value please add this line to your .htconfig.php: * **ostatus_poll_timeframe** - Defines how old an item can be to try to complete the conversation with it. * **paranoia** (Boolean) - Log out users if their IP address changed. * **permit_crawling** (Boolean) - Restricts the search for not logged in users to one search per minute. +* **worker_debug** (Boolean) - If activated, it prints out the number of running processes split by priority. * **profiler** (Boolean) - Enable internal timings to help optimize code. Needed for "rendertime" addon. Default is false. * **free_crawls** - Number of "free" searches when "permit_crawling" is activated (Default value is 10) * **crawl_permit_period** - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60) From f1119b41981e63f9c0469738b1008519c86c4fea Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 8 Jun 2017 20:53:21 +0000 Subject: [PATCH 057/160] Removed commented out line --- include/poller.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 1588cecf20..a1266d62c9 100644 --- a/include/poller.php +++ b/include/poller.php @@ -666,7 +666,6 @@ function poller_claim_process($queue) { $success = dba::update('workerqueue', array('executed' => datetime_convert(), 'pid' => $mypid), array('id' => $queue["id"], 'pid' => 0)); - //dba::unlock(); if (!$success) { logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG); From 34815de99c548b61c94b6e6939edd485eca728d6 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 8 Jun 2017 21:00:45 +0000 Subject: [PATCH 058/160] Changed documentation --- include/acl_selectors.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 725f69a656..ee5ad7fcc8 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -389,7 +389,7 @@ function populate_acl($user = null, $show_jotnets = false) { function construct_acl_data(App $a, $user) { // This function is now deactivated. It seems as if the generated data isn't used anywhere. - // We will remove the function completely before the release of 3.5.3 when there won't be any issues. + /// @todo Remove this function and all function calls before releasing Friendica 3.5.3 return; // Get group and contact information for html ACL selector From ad4cdf2a9d2e3965a7526cac26b99369b4ce2111 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan <mrpetovan@gmail.com> Date: Thu, 8 Jun 2017 21:03:44 -0400 Subject: [PATCH 059/160] Replace lowercase operators --- boot.php | 4 +-- include/NotificationsManager.php | 8 +++--- include/api.php | 8 +++--- include/auth_ejabberd.php | 2 +- include/bbcode.php | 10 +++---- include/dbstructure.php | 2 +- include/delivery.php | 6 ++--- include/discover_poco.php | 4 +-- include/email.php | 6 ++--- include/enotify.php | 2 +- include/html2bbcode.php | 2 +- include/html2plain.php | 12 ++++----- include/items.php | 6 ++--- include/message.php | 2 +- include/msgclean.php | 46 ++++++++++++++++---------------- include/notifier.php | 4 +-- include/onepoll.php | 10 +++---- include/photos.php | 2 +- include/quoteconvert.php | 2 +- include/xml.php | 2 +- mod/settings.php | 2 +- util/php2po.php | 2 +- util/typo.php | 14 +++++----- view/theme/vier/theme.php | 2 +- 24 files changed, 80 insertions(+), 80 deletions(-) diff --git a/boot.php b/boot.php index 6fd7c30372..5417e0fa23 100644 --- a/boot.php +++ b/boot.php @@ -1424,10 +1424,10 @@ function clear_cache($basepath = "", $path = "") { if ($dh = opendir($path)) { while (($file = readdir($dh)) !== false) { $fullpath = $path . "/" . $file; - if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) { + if ((filetype($fullpath) == "dir") && ($file != ".") && ($file != "..")) { clear_cache($basepath, $fullpath); } - if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) { + if ((filetype($fullpath) == "file") && (filectime($fullpath) < (time() - $cachetime))) { unlink($fullpath); } } diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index ad0ede6dbe..57c315c9d7 100644 --- a/include/NotificationsManager.php +++ b/include/NotificationsManager.php @@ -512,7 +512,7 @@ class NotificationsManager { $myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $diasp_url = str_replace('/profile/','/u/',$myurl); - $sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", + $sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ", dbesc($myurl . '$'), dbesc($myurl . '\\]'), dbesc($diasp_url . '\\]') @@ -829,11 +829,11 @@ class NotificationsManager { } /** - * @brief Check for missing contact data and try to fetch the data from + * @brief Check for missing contact data and try to fetch the data from * from other sources - * + * * @param array $arr The input array with the intro data - * + * * @return array The array with the intro data */ private function getMissingIntroData($arr) { diff --git a/include/api.php b/include/api.php index bc40e420b0..16ff0f4a05 100644 --- a/include/api.php +++ b/include/api.php @@ -2178,7 +2178,7 @@ $called_api = null; `contact`.`id` AS `cid` FROM `item`, `contact` WHERE `item`.`uid` = %d - AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 + AND `item`.`visible` = 1 AND `item`.`moderated` = 0 AND `item`.`deleted` = 0 AND `item`.`starred` = 1 AND `contact`.`id` = `item`.`contact-id` AND (NOT `contact`.`blocked` OR `contact`.`pending`) @@ -2263,13 +2263,13 @@ $called_api = null; $statustitle = trim($item['title']); - if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false)) { + if (($statustitle != '') && (strpos($statusbody, $statustitle) !== false)) { $statustext = trim($statusbody); } else { $statustext = trim($statustitle."\n\n".$statusbody); } - if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000)) { + if (($item["network"] == NETWORK_FEED) && (strlen($statustext)> 1000)) { $statustext = substr($statustext, 0, 1000)."... \n".$item["plink"]; } @@ -3982,7 +3982,7 @@ $called_api = null; } function prepare_photo_data($type, $scale, $photo_id) { - $scale_sql = ($scale === false ? "" : sprintf("and scale=%d", intval($scale))); + $scale_sql = ($scale === false ? "" : sprintf("AND scale=%d", intval($scale))); $data_sql = ($scale === false ? "" : "data, "); // added allow_cid, allow_gid, deny_cid, deny_gid to output as string like stored in database diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php index 9211c5baf0..490ea0d1cb 100755 --- a/include/auth_ejabberd.php +++ b/include/auth_ejabberd.php @@ -89,7 +89,7 @@ class exAuth { // Open the logfile if the logfile name is defined if ($this->sLogFile != '') - $this->rLogFile = fopen($this->sLogFile, "a") or die("Error opening log file: ". $this->sLogFile); + $this->rLogFile = fopen($this->sLogFile, "a") || die("Error opening log file: ". $this->sLogFile); $this->writeLog("[exAuth] start"); diff --git a/include/bbcode.php b/include/bbcode.php index 2b2d7fc937..0c4e12c9ad 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -147,7 +147,7 @@ function cleancss($input) { for ($i = 0; $i < strlen($input); $i++) { $char = substr($input, $i, 1); - if (($char >= "a") and ($char <= "z")) { + if (($char >= "a") && ($char <= "z")) { $cleaned .= $char; } @@ -1126,7 +1126,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // Check for [spoiler] text // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/spoiler]") !== false) and (strpos($Text, "[spoiler]") !== false) and (++$endlessloop < 20)) { + while ((strpos($Text, "[/spoiler]") !== false) && (strpos($Text, "[spoiler]") !== false) && (++$endlessloop < 20)) { $Text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $Text); } @@ -1136,7 +1136,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/spoiler]")!== false) and (strpos($Text, "[spoiler=") !== false) and (++$endlessloop < 20)) { + while ((strpos($Text, "[/spoiler]")!== false) && (strpos($Text, "[spoiler=") !== false) && (++$endlessloop < 20)) { $Text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism", "<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>", $Text); @@ -1148,7 +1148,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // Check for [quote] text // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/quote]") !== false) and (strpos($Text, "[quote]") !== false) and (++$endlessloop < 20)) { + while ((strpos($Text, "[/quote]") !== false) && (strpos($Text, "[quote]") !== false) && (++$endlessloop < 20)) { $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism", "$QuoteLayout", $Text); } @@ -1158,7 +1158,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa // handle nested quotes $endlessloop = 0; - while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20)) { + while ((strpos($Text, "[/quote]")!== false) && (strpos($Text, "[quote=") !== false) && (++$endlessloop < 20)) { $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", "<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>", $Text); diff --git a/include/dbstructure.php b/include/dbstructure.php index b53befbf29..8ab9bf9d58 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -530,7 +530,7 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) { $primary_keys = array(); foreach ($fields AS $fieldname => $field) { $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field); - if (x($field,'primary') and $field['primary']!='') { + if (x($field,'primary') && $field['primary']!='') { $primary_keys[] = $fieldname; } } diff --git a/include/delivery.php b/include/delivery.php index 9e6d8ffe61..05fba7985c 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -91,7 +91,7 @@ function delivery_run(&$argv, &$argc){ $uid = $item_id; } else { // find ancestors - $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1", intval($item_id) ); @@ -105,7 +105,7 @@ function delivery_run(&$argv, &$argc){ $updated = $r[0]['edited']; $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` - FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC", + FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC", intval($parent_id) ); @@ -453,7 +453,7 @@ function delivery_run(&$argv, &$argc){ $headers .= "References: <".iri2msgid($it["parent-uri"]).">"; // If Threading is enabled, write down the correct parent - if (($it["thr-parent"] != "") and ($it["thr-parent"] != $it["parent-uri"])) + if (($it["thr-parent"] != "") && ($it["thr-parent"] != $it["parent-uri"])) $headers .= " <".iri2msgid($it["thr-parent"]).">"; $headers .= "\n"; diff --git a/include/discover_poco.php b/include/discover_poco.php index 11794c32d7..6bb296c9c1 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -83,10 +83,10 @@ function discover_poco_run(&$argv, &$argc) { update_suggestions(); } elseif (($mode == 2) && get_config('system','poco_completion')) { discover_users(); - } elseif (($mode == 1) && ($search != "") and get_config('system','poco_local_search')) { + } elseif (($mode == 1) && ($search != "") && get_config('system','poco_local_search')) { discover_directory($search); gs_search_user($search); - } elseif (($mode == 0) && ($search == "") and (get_config('system','poco_discovery') > 0)) { + } elseif (($mode == 0) && ($search == "") && (get_config('system','poco_discovery') > 0)) { // Query Friendica and Hubzilla servers for their users poco_discover(); diff --git a/include/email.php b/include/email.php index b8d99433e1..78e98a830c 100644 --- a/include/email.php +++ b/include/email.php @@ -152,7 +152,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) { if ($p->parameters) foreach ($p->parameters as $x) $params[strtolower($x->attribute)] = $x->value; - if (isset($p->dparameters) and $p->dparameters) + if (isset($p->dparameters) && $p->dparameters) foreach ($p->dparameters as $x) $params[strtolower($x->attribute)] = $x->value; @@ -160,7 +160,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) { // Any part with a filename is an attachment, // so an attached text file (type 0) is not mistaken as the message. - if ((isset($params['filename']) and $params['filename']) || (isset($params['name']) and $params['name'])) { + if ((isset($params['filename']) && $params['filename']) || (isset($params['name']) && $params['name'])) { // filename may be given as 'Filename' or 'Name' or both $filename = ($params['filename'])? $params['filename'] : $params['name']; // filename may be encoded, so see imap_mime_header_decode() @@ -191,7 +191,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) { // } // SUBPART RECURSION - if (isset($p->parts) and $p->parts) { + if (isset($p->parts) && $p->parts) { $x = ""; foreach ($p->parts as $partno0=>$p2) { $x .= email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype); // 1.2, 1.2.1, etc. diff --git a/include/enotify.php b/include/enotify.php index d0fcbeef10..39665d14d4 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -115,7 +115,7 @@ function notification($params) { dbesc($params['link']), intval($params['uid']) ); - if ($p and count($p)) { + if ($p && count($p)) { pop_lang(); return; } diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 1deab95195..435f6b77c1 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -44,7 +44,7 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb) if (strpos('*'.$startbb, '$1') > 0) { - if ($replace and (@$attr[$attribute] != '')) { + if ($replace && (@$attr[$attribute] != '')) { $startbb = preg_replace($value, $startbb, $attr[$attribute], -1, $count); diff --git a/include/html2plain.php b/include/html2plain.php index da308a5c69..72185de3b5 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -23,7 +23,7 @@ function breaklines($line, $level, $wraplength = 75) if ($pos == 0) $pos = strpos($line, ' '); - if (($pos > 0) and strlen($line) > $wraplen) { + if (($pos > 0) && strlen($line) > $wraplen) { $newline = trim(substr($line, 0, $pos)); if ($level > 0) $newline = str_repeat(">", $level).' '.$newline; @@ -32,7 +32,7 @@ function breaklines($line, $level, $wraplength = 75) $line = substr($line, $pos+1); } - } while ((strlen($line) > $wraplen) and !($oldline == $line)); + } while ((strlen($line) > $wraplen) && !($oldline == $line)); if ($level > 0) $line = str_repeat(">", $level).' '.$line; @@ -70,7 +70,7 @@ function quotelevel($message, $wraplength = 75) $line = substr($line, 0, $pos).substr($line, $pos+8); } - if (!$startquote or ($line != '')) + if (!$startquote || ($line != '')) $newlines[] = breaklines($line, $currlevel, $wraplength); } return(implode($newlines, "\n")); @@ -92,13 +92,13 @@ function collecturls($message) { if (strpos($treffer[1], $listitem) !== false) $ignore = true; - if ((strpos($treffer[1], "//twitter.com/") !== false) and (strpos($treffer[1], "/status/") !== false)) + if ((strpos($treffer[1], "//twitter.com/") !== false) && (strpos($treffer[1], "/status/") !== false)) $ignore = false; - if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false)) + if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/posts") !== false)) $ignore = false; - if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/photos") !== false)) + if ((strpos($treffer[1], "//plus.google.com/") !== false) && (strpos($treffer[1], "/photos") !== false)) $ignore = false; if (!$ignore) diff --git a/include/items.php b/include/items.php index 234c001942..eb30763909 100644 --- a/include/items.php +++ b/include/items.php @@ -143,7 +143,7 @@ function title_is_body($title, $body) { $body = substr($body, 0, strlen($title)); } - if (($title != $body) and (substr($title, -3) == "...")) { + if (($title != $body) && (substr($title, -3) == "...")) { $pos = strrpos($title, "..."); if ($pos > 0) { $title = substr($title, 0, $pos); @@ -1282,7 +1282,7 @@ function get_item_id($guid, $uid = 0) { // Does the given user have this item? if ($uid) { $r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid` - WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 + WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0 AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid)); if (dbm::is_result($r)) { $id = $r[0]["id"]; @@ -1293,7 +1293,7 @@ function get_item_id($guid, $uid = 0) { // Or is it anywhere on the server? if ($nick == "") { $r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid` - WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 + WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `item`.`wall` = 1 diff --git a/include/message.php b/include/message.php index 7a62af8c93..0c1ffff7cf 100644 --- a/include/message.php +++ b/include/message.php @@ -108,7 +108,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){ ); - $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1", + $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval(local_user()) ); diff --git a/include/msgclean.php b/include/msgclean.php index 9e8ebed790..4abbafb71b 100644 --- a/include/msgclean.php +++ b/include/msgclean.php @@ -124,7 +124,7 @@ function removesig($message) // Sollte sich der Signaturtrenner innerhalb eines Quotes befinden // wird keine Signaturtrennung ausgefuehrt - if (($sigpos < $quotepos) and ($sigpos != 0)) + if (($sigpos < $quotepos) && ($sigpos != 0)) return(array('body' => $message, 'sig' => '')); /// @TODO Regexp umstellen, so dass auf 1 oder kein Leerzeichen @@ -135,7 +135,7 @@ function removesig($message) preg_match($pattern, $message, $result); - if (($result[1] != '') and ($result[2] != '')) { + if (($result[1] != '') && ($result[2] != '')) { $cleaned = trim($result[1])."\n"; $sig = trim($result[2]); // '[hr][size=x-small][color=darkblue]'.trim($result[2]).'[/color][/size]'; @@ -157,8 +157,8 @@ function removelinebreak($message) foreach ($arrbody as $i => $line) { $currquotelevel = 0; $currline = $line; - while ((strlen($currline)>0) and ((substr($currline, 0, 1) == '>') - or (substr($currline, 0, 1) == ' '))) { + while ((strlen($currline)>0) && ((substr($currline, 0, 1) == '>') + || (substr($currline, 0, 1) == ' '))) { if (substr($currline, 0, 1) == '>') $currquotelevel++; @@ -167,8 +167,8 @@ function removelinebreak($message) $quotelevel = 0; $nextline = trim($arrbody[$i+1]); - while ((strlen($nextline)>0) and ((substr($nextline, 0, 1) == '>') - or (substr($nextline, 0, 1) == ' '))) { + while ((strlen($nextline)>0) && ((substr($nextline, 0, 1) == '>') + || (substr($nextline, 0, 1) == ' '))) { if (substr($nextline, 0, 1) == '>') $quotelevel++; @@ -178,21 +178,21 @@ function removelinebreak($message) $len = strlen($line); $firstword = strpos($nextline.' ', ' '); - $specialchars = ((substr(trim($nextline), 0, 1) == '-') or - (substr(trim($nextline), 0, 1) == '=') or - (substr(trim($nextline), 0, 1) == '*') or - (substr(trim($nextline), 0, 1) == '·') or - (substr(trim($nextline), 0, 4) == '[url') or - (substr(trim($nextline), 0, 5) == '[size') or - (substr(trim($nextline), 0, 7) == 'http://') or + $specialchars = ((substr(trim($nextline), 0, 1) == '-') || + (substr(trim($nextline), 0, 1) == '=') || + (substr(trim($nextline), 0, 1) == '*') || + (substr(trim($nextline), 0, 1) == '·') || + (substr(trim($nextline), 0, 4) == '[url') || + (substr(trim($nextline), 0, 5) == '[size') || + (substr(trim($nextline), 0, 7) == 'http://') || (substr(trim($nextline), 0, 8) == 'https://')); if (!$specialchars) - $specialchars = ((substr(rtrim($line), -1) == '-') or - (substr(rtrim($line), -1) == '=') or - (substr(rtrim($line), -1) == '*') or - (substr(rtrim($line), -1) == '·') or - (substr(rtrim($line), -6) == '[/url]') or + $specialchars = ((substr(rtrim($line), -1) == '-') || + (substr(rtrim($line), -1) == '=') || + (substr(rtrim($line), -1) == '*') || + (substr(rtrim($line), -1) == '·') || + (substr(rtrim($line), -6) == '[/url]') || (substr(rtrim($line), -7) == '[/size]')); //if ($specialchars) @@ -202,8 +202,8 @@ function removelinebreak($message) if (substr($lines[$lineno], -1) != ' ') $lines[$lineno] .= ' '; - while ((strlen($line)>0) and ((substr($line, 0, 1) == '>') - or (substr($line, 0, 1) == ' '))) { + while ((strlen($line)>0) && ((substr($line, 0, 1) == '>') + || (substr($line, 0, 1) == ' '))) { $line = ltrim(substr($line, 1)); } @@ -213,10 +213,10 @@ function removelinebreak($message) // $lines[$lineno] = $quotelevel.'-'.$len.'-'.$firstword.'-'; $lines[$lineno] .= $line; - //if ((($len + $firstword < 68) and (substr($line, -1, 1) != ' ')) - // or ($quotelevel != $currquotelevel) or $specialchars) + //if ((($len + $firstword < 68) && (substr($line, -1, 1) != ' ')) + // || ($quotelevel != $currquotelevel) || $specialchars) if (((substr($line, -1, 1) != ' ')) - or ($quotelevel != $currquotelevel)) + || ($quotelevel != $currquotelevel)) $lineno++; } return(implode("\n", $lines)); diff --git a/include/notifier.php b/include/notifier.php index 94124fee1f..7f6318182f 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -163,7 +163,7 @@ function notifier_run(&$argv, &$argc){ $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN); } else { // find ancestors - $r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1", intval($item_id) ); @@ -177,7 +177,7 @@ function notifier_run(&$argv, &$argc){ $updated = $r[0]['edited']; $items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer` - FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC", + FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible = 1 AND moderated = 0 ORDER BY `id` ASC", intval($parent_id) ); diff --git a/include/onepoll.php b/include/onepoll.php index bcb9d09be2..28afca28a5 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -69,8 +69,8 @@ function onepoll_run(&$argv, &$argc){ // load current friends if possible. if (($contact['poco'] != "") && ($contact['success_update'] > $contact['failure_update'])) { - $r = q("SELECT count(*) as total from glink - where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", + $r = q("SELECT count(*) AS total FROM glink + WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY", intval($contact['id']) ); if (dbm::is_result($r)) { @@ -467,15 +467,15 @@ function onepoll_run(&$argv, &$argc){ $datarray['created'] = datetime_convert('UTC','UTC',$meta->date); // Is it a reply? - $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or - (substr(strtolower($datarray['title']), 0, 3) == "re-") or + $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") || + (substr(strtolower($datarray['title']), 0, 3) == "re-") || ($raw_refs != "")); // Remove Reply-signs in the subject $datarray['title'] = RemoveReply($datarray['title']); // If it seems to be a reply but a header couldn't be found take the last message with matching subject - if (!x($datarray,'parent-uri') and $reply) { + if (!x($datarray,'parent-uri') && $reply) { $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1", dbesc(protect_sprintf($datarray['title'])), intval($importer_uid), diff --git a/include/photos.php b/include/photos.php index a1faffc259..6e0002bd47 100644 --- a/include/photos.php +++ b/include/photos.php @@ -12,7 +12,7 @@ function getGps($exifCoord, $hemi) { $minutes = count($exifCoord) > 1 ? gps2Num($exifCoord[1]) : 0; $seconds = count($exifCoord) > 2 ? gps2Num($exifCoord[2]) : 0; - $flip = ($hemi == 'W' or $hemi == 'S') ? -1 : 1; + $flip = ($hemi == 'W' || $hemi == 'S') ? -1 : 1; return floatval($flip * ($degrees + ($minutes / 60) + ($seconds / 3600))); } diff --git a/include/quoteconvert.php b/include/quoteconvert.php index 33e8843b0b..71a15350c5 100644 --- a/include/quoteconvert.php +++ b/include/quoteconvert.php @@ -10,7 +10,7 @@ function convertquote($body, $reply) $quoteline = $arrbody[$i]; while ((strlen($quoteline)>0) and ((substr($quoteline, 0, 1) == '>') - or (substr($quoteline, 0, 1) == ' '))) { + || (substr($quoteline, 0, 1) == ' '))) { if (substr($quoteline, 0, 1) == '>') $quotelevel++; diff --git a/include/xml.php b/include/xml.php index a9f4679b48..c184b5099e 100644 --- a/include/xml.php +++ b/include/xml.php @@ -323,7 +323,7 @@ class xml { if ($type == "open") { // The starting of the tag '<tag>' $parent[$level-1] = &$current; - if (!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag + if (!is_array($current) || (!in_array($tag, array_keys($current)))) { // Insert New tag $current[$tag] = $result; if ($attributes_data) { $current[$tag. '_attr'] = $attributes_data; diff --git a/mod/settings.php b/mod/settings.php index 6793d86a9c..e4ac9f0459 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -949,7 +949,7 @@ function settings_content(App $a) { $is_experimental = file_exists('view/theme/' . $th . '/experimental'); $unsupported = file_exists('view/theme/' . $th . '/unsupported'); $is_mobile = file_exists('view/theme/' . $th . '/mobile'); - if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){ + if (!$is_experimental || ($is_experimental && (get_config('experimentals','exp_themes')==1 || get_config('experimentals','exp_themes')===false))){ $theme_name = (($is_experimental) ? sprintf("%s - \x28Experimental\x29", $f) : $f); if ($is_mobile) { $mobile_themes[$f]=$theme_name; diff --git a/util/php2po.php b/util/php2po.php index e07f718004..35bdc94317 100644 --- a/util/php2po.php +++ b/util/php2po.php @@ -93,7 +93,7 @@ print "\nLoading base message.po..."; // load base messages.po and extract msgids $base_msgids = array(); $norm_base_msgids = array(); -$base_f = file("util/messages.po") or die("No base messages.po\n"); +$base_f = file("util/messages.po") || die("No base messages.po\n"); $_f = 0; $_mid = ""; $_mids = array(); foreach( $base_f as $l) { $l = trim($l); diff --git a/util/typo.php b/util/typo.php index 1b84181db3..d837bcefc9 100755 --- a/util/typo.php +++ b/util/typo.php @@ -27,7 +27,7 @@ $Iterator = new RecursiveDirectoryIterator('src'); foreach (new RecursiveIteratorIterator($Iterator) as $file) { if (substr($file, -4) === '.php') { passthru("$phpath -l $file", $ret); - $ret === 0 or die(); + $ret === 0 || die(); } } @@ -35,21 +35,21 @@ echo "Directory: mod\n"; $files = glob('mod/*.php'); foreach ($files as $file) { passthru("$phpath -l $file", $ret); - $ret === 0 or die(); + $ret === 0 || die(); } echo "Directory: include\n"; $files = glob('include/*.php'); foreach ($files as $file) { passthru("$phpath -l $file", $ret); - $ret === 0 or die(); + $ret === 0 || die(); } echo "Directory: object\n"; $files = glob('object/*.php'); foreach ($files as $file) { passthru("$phpath -l $file", $ret); - $ret === 0 or die(); + $ret === 0 || die(); } echo "Directory: addon\n"; @@ -60,7 +60,7 @@ foreach ($dirs as $dir) { $files = glob($dir . '/' . $addon . '.php'); foreach ($files as $file) { passthru("$phpath -l $file", $ret); - $ret === 0 or die(); + $ret === 0 || die(); } } @@ -68,10 +68,10 @@ echo "String files\n"; echo 'util/strings.php' . "\n"; passthru("$phpath -l util/strings.php", $ret); -$ret === 0 or die(); +$ret === 0 || die(); $files = glob('view/lang/*/strings.php'); foreach ($files as $file) { passthru("$phpath -l $file", $ret); - $ret === 0 or die(); + $ret === 0 || die(); } diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index eaee46e928..298f0df57f 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -21,7 +21,7 @@ function vier_init(App $a) { set_template_engine($a, 'smarty3'); - if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()) { + if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) { vier_community_info(); $a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n"; From 7f0988a1030a247624bdbb2c7a6b4c54610e7d88 Mon Sep 17 00:00:00 2001 From: Andy H3 <andy@hubup.pro> Date: Fri, 9 Jun 2017 15:42:31 +0700 Subject: [PATCH 060/160] Regenerated master messages.po file --- util/messages.po | 3713 +++++++++++++++++++++++----------------------- 1 file changed, 1855 insertions(+), 1858 deletions(-) diff --git a/util/messages.po b/util/messages.po index 9f845714e6..69d2eca9e0 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-05-28 11:09+0200\n" +"POT-Creation-Date: 2017-06-08 22:07+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -383,95 +383,20 @@ msgid "add" msgstr "" #: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133 -#: view/theme/vier/theme.php:256 +#: view/theme/vier/theme.php:248 msgid "Forums" msgstr "" -#: include/ForumManager.php:118 view/theme/vier/theme.php:258 +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 msgid "External link to forum" msgstr "" #: include/ForumManager.php:121 include/contact_widgets.php:271 #: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: view/theme/vier/theme.php:261 src/App.php:506 +#: view/theme/vier/theme.php:253 src/App.php:506 msgid "show more" msgstr "" -#: include/NotificationsManager.php:153 -msgid "System" -msgstr "" - -#: include/NotificationsManager.php:160 include/nav.php:160 mod/admin.php:518 -#: view/theme/frio/theme.php:255 -msgid "Network" -msgstr "" - -#: include/NotificationsManager.php:167 mod/network.php:835 -#: mod/profiles.php:699 -msgid "Personal" -msgstr "" - -#: include/NotificationsManager.php:174 include/nav.php:107 -#: include/nav.php:163 -msgid "Home" -msgstr "" - -#: include/NotificationsManager.php:181 include/nav.php:168 -msgid "Introductions" -msgstr "" - -#: include/NotificationsManager.php:239 include/NotificationsManager.php:251 -#, php-format -msgid "%s commented on %s's post" -msgstr "" - -#: include/NotificationsManager.php:250 -#, php-format -msgid "%s created a new post" -msgstr "" - -#: include/NotificationsManager.php:265 -#, php-format -msgid "%s liked %s's post" -msgstr "" - -#: include/NotificationsManager.php:278 -#, php-format -msgid "%s disliked %s's post" -msgstr "" - -#: include/NotificationsManager.php:291 -#, php-format -msgid "%s is attending %s's event" -msgstr "" - -#: include/NotificationsManager.php:304 -#, php-format -msgid "%s is not attending %s's event" -msgstr "" - -#: include/NotificationsManager.php:317 -#, php-format -msgid "%s may attend %s's event" -msgstr "" - -#: include/NotificationsManager.php:334 -#, php-format -msgid "%s is now friends with %s" -msgstr "" - -#: include/NotificationsManager.php:770 -msgid "Friend Suggestion" -msgstr "" - -#: include/NotificationsManager.php:803 -msgid "Friend/Connect Request" -msgstr "" - -#: include/NotificationsManager.php:803 -msgid "New Follower" -msgstr "" - #: include/acl_selectors.php:355 msgid "Post to Email" msgstr "" @@ -600,11 +525,11 @@ msgid "Find" msgstr "" #: include/contact_widgets.php:37 mod/suggest.php:116 -#: view/theme/vier/theme.php:203 +#: view/theme/vier/theme.php:195 msgid "Friend Suggestions" msgstr "" -#: include/contact_widgets.php:38 view/theme/vier/theme.php:202 +#: include/contact_widgets.php:38 view/theme/vier/theme.php:194 msgid "Similar Interests" msgstr "" @@ -612,7 +537,7 @@ msgstr "" msgid "Random Profile" msgstr "" -#: include/contact_widgets.php:40 view/theme/vier/theme.php:204 +#: include/contact_widgets.php:40 view/theme/vier/theme.php:196 msgid "Invite Friends" msgstr "" @@ -742,8 +667,8 @@ msgid "Select" msgstr "" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 -#: mod/photos.php:1731 mod/admin.php:1514 mod/contacts.php:819 -#: mod/contacts.php:1018 mod/settings.php:745 object/Item.php:138 +#: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 +#: mod/settings.php:745 mod/admin.php:1514 object/Item.php:138 msgid "Delete" msgstr "" @@ -927,8 +852,7 @@ msgstr "" msgid "Tag term:" msgstr "" -#: include/conversation.php:1229 include/conversation.php:1245 -#: mod/filer.php:31 +#: include/conversation.php:1229 include/conversation.php:1245 mod/filer.php:31 msgid "Save to Folder:" msgstr "" @@ -1030,8 +954,8 @@ msgstr "" #: include/conversation.php:1318 include/items.php:2165 mod/editpost.php:140 #: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/follow.php:126 -#: mod/message.php:211 mod/photos.php:247 mod/photos.php:339 -#: mod/suggest.php:34 mod/tagrm.php:13 mod/tagrm.php:98 mod/videos.php:134 +#: mod/message.php:211 mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34 +#: mod/tagrm.php:13 mod/tagrm.php:98 mod/videos.php:134 #: mod/dfrn_request.php:894 mod/contacts.php:458 mod/settings.php:683 #: mod/settings.php:709 msgid "Cancel" @@ -1535,8 +1459,7 @@ msgstr "" msgid "Search" msgstr "" -#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 -#: mod/notes.php:64 +#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 mod/notes.php:64 msgid "Save" msgstr "" @@ -1725,22 +1648,6 @@ msgstr "" msgid "Item filed" msgstr "" -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "" - -#: include/Contact.php:822 -msgid "News" -msgstr "" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "" - #: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 msgid "Image/photo" msgstr "" @@ -1766,6 +1673,22 @@ msgstr "" msgid "Invalid link protocol" msgstr "" +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "" + +#: include/Contact.php:822 +msgid "News" +msgstr "" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "" + #: include/enotify.php:27 msgid "Friendica Notification" msgstr "" @@ -2076,7 +1999,7 @@ msgstr "" msgid "Clear notifications" msgstr "" -#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:862 +#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:869 msgid "Logout" msgstr "" @@ -2139,7 +2062,7 @@ msgstr "" msgid "Your personal notes" msgstr "" -#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:863 +#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:870 msgid "Login" msgstr "" @@ -2147,11 +2070,15 @@ msgstr "" msgid "Sign in" msgstr "" +#: include/nav.php:107 include/nav.php:163 include/NotificationsManager.php:176 +msgid "Home" +msgstr "" + #: include/nav.php:107 msgid "Home Page" msgstr "" -#: include/nav.php:111 mod/register.php:291 boot.php:839 +#: include/nav.php:111 mod/register.php:291 boot.php:846 msgid "Register" msgstr "" @@ -2159,7 +2086,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:299 +#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 msgid "Help" msgstr "" @@ -2212,6 +2139,11 @@ msgstr "" msgid "Information about this friendica instance" msgstr "" +#: include/nav.php:160 include/NotificationsManager.php:162 mod/admin.php:518 +#: view/theme/frio/theme.php:255 +msgid "Network" +msgstr "" + #: include/nav.php:160 view/theme/frio/theme.php:255 msgid "Conversations from your friends" msgstr "" @@ -2224,6 +2156,10 @@ msgstr "" msgid "Load Network page with no filters" msgstr "" +#: include/nav.php:168 include/NotificationsManager.php:183 +msgid "Introductions" +msgstr "" + #: include/nav.php:168 msgid "Friend Requests" msgstr "" @@ -2280,8 +2216,8 @@ msgstr "" msgid "Delegate Page Management" msgstr "" -#: include/nav.php:188 mod/newmember.php:15 mod/admin.php:1624 -#: mod/admin.php:1900 mod/settings.php:113 view/theme/frio/theme.php:258 +#: include/nav.php:188 mod/newmember.php:15 mod/settings.php:113 +#: mod/admin.php:1624 mod/admin.php:1900 view/theme/frio/theme.php:258 msgid "Settings" msgstr "" @@ -2444,11 +2380,11 @@ msgid "Friends" msgstr "" #: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3697 mod/photos.php:73 mod/photos.php:189 -#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 -#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 -#: mod/profile_photo.php:90 mod/profile_photo.php:214 -#: mod/profile_photo.php:309 mod/profile_photo.php:319 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 mod/photos.php:776 +#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1865 +#: mod/profile_photo.php:74 mod/profile_photo.php:82 mod/profile_photo.php:90 +#: mod/profile_photo.php:214 mod/profile_photo.php:309 +#: mod/profile_photo.php:319 msgid "Profile Photos" msgstr "" @@ -2516,6 +2452,308 @@ msgstr "" msgid "Registration details for %s" msgstr "" +#: include/dba_pdo.php:76 include/dba.php:57 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "" + +#: include/plugin.php:532 include/plugin.php:534 +msgid "Click here to upgrade." +msgstr "" + +#: include/plugin.php:541 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: include/plugin.php:546 +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 +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/NotificationsManager.php:155 +msgid "System" +msgstr "" + +#: include/NotificationsManager.php:169 mod/network.php:835 +#: mod/profiles.php:699 +msgid "Personal" +msgstr "" + +#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 +#, php-format +msgid "%s commented on %s's post" +msgstr "" + +#: include/NotificationsManager.php:252 +#, php-format +msgid "%s created a new post" +msgstr "" + +#: include/NotificationsManager.php:267 +#, php-format +msgid "%s liked %s's post" +msgstr "" + +#: include/NotificationsManager.php:280 +#, php-format +msgid "%s disliked %s's post" +msgstr "" + +#: include/NotificationsManager.php:293 +#, php-format +msgid "%s is attending %s's event" +msgstr "" + +#: include/NotificationsManager.php:306 +#, php-format +msgid "%s is not attending %s's event" +msgstr "" + +#: include/NotificationsManager.php:319 +#, php-format +msgid "%s may attend %s's event" +msgstr "" + +#: include/NotificationsManager.php:336 +#, php-format +msgid "%s is now friends with %s" +msgstr "" + +#: include/NotificationsManager.php:774 +msgid "Friend Suggestion" +msgstr "" + +#: include/NotificationsManager.php:803 +msgid "Friend/Connect Request" +msgstr "" + +#: include/NotificationsManager.php:803 +msgid "New Follower" +msgstr "" + #: include/api.php:1102 #, php-format msgid "Daily posting limit of %d posts reached. The post was rejected." @@ -2531,11 +2769,6 @@ msgstr "" msgid "Monthly posting limit of %d posts reached. The post was rejected." msgstr "" -#: include/dba.php:57 include/dba_pdo.php:75 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "" - #: include/dbstructure.php:25 msgid "There are no tables on MyISAM." msgstr "" @@ -2779,8 +3012,8 @@ msgstr "" msgid "Basic" msgstr "" -#: include/identity.php:761 mod/events.php:510 mod/admin.php:1065 -#: mod/contacts.php:881 +#: include/identity.php:761 mod/events.php:510 mod/contacts.php:881 +#: mod/admin.php:1065 msgid "Advanced" msgstr "" @@ -2832,19 +3065,18 @@ msgstr "" #: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 #: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105 #: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/dirfind.php:15 -#: mod/display.php:482 mod/editpost.php:12 mod/events.php:188 -#: mod/follow.php:13 mod/follow.php:76 mod/follow.php:160 mod/fsuggest.php:80 -#: mod/group.php:20 mod/invite.php:17 mod/invite.php:105 mod/manage.php:103 -#: mod/message.php:48 mod/message.php:173 mod/mood.php:116 mod/network.php:7 -#: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73 -#: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111 -#: mod/poke.php:155 mod/register.php:44 mod/repair_ostatus.php:11 -#: mod/suggest.php:60 mod/viewcontacts.php:49 mod/wall_attach.php:69 -#: mod/wall_attach.php:72 mod/wall_upload.php:101 mod/wall_upload.php:104 -#: mod/wallmessage.php:11 mod/wallmessage.php:35 mod/wallmessage.php:75 -#: mod/wallmessage.php:99 mod/item.php:197 mod/item.php:209 mod/regmod.php:106 -#: mod/uimport.php:26 mod/contacts.php:363 mod/profile_photo.php:19 -#: mod/profile_photo.php:179 mod/profile_photo.php:190 +#: mod/display.php:482 mod/editpost.php:12 mod/events.php:188 mod/follow.php:13 +#: mod/follow.php:76 mod/follow.php:160 mod/fsuggest.php:80 mod/group.php:20 +#: mod/invite.php:17 mod/invite.php:105 mod/manage.php:103 mod/message.php:48 +#: mod/message.php:173 mod/mood.php:116 mod/network.php:7 mod/nogroup.php:29 +#: mod/notes.php:25 mod/notifications.php:73 mod/ostatus_subscribe.php:11 +#: mod/photos.php:168 mod/photos.php:1111 mod/poke.php:155 mod/register.php:44 +#: mod/repair_ostatus.php:11 mod/suggest.php:60 mod/viewcontacts.php:49 +#: mod/wall_attach.php:69 mod/wall_attach.php:72 mod/wall_upload.php:101 +#: mod/wall_upload.php:104 mod/wallmessage.php:11 mod/wallmessage.php:35 +#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/item.php:197 +#: mod/item.php:209 mod/regmod.php:106 mod/uimport.php:26 mod/contacts.php:363 +#: mod/profile_photo.php:19 mod/profile_photo.php:179 mod/profile_photo.php:190 #: mod/profile_photo.php:203 mod/profiles.php:172 mod/profiles.php:610 #: mod/settings.php:24 mod/settings.php:132 mod/settings.php:669 index.php:410 msgid "Permission denied." @@ -2872,242 +3104,6 @@ msgstr "" msgid "stopped following" msgstr "" -#: include/plugin.php:531 include/plugin.php:533 -msgid "Click here to upgrade." -msgstr "" - -#: include/plugin.php:539 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: include/plugin.php:544 -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 -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 "" - #: mod/allfriends.php:48 msgid "No friends to display." msgstr "" @@ -3337,13 +3333,12 @@ msgstr "" #: mod/content.php:729 mod/crepair.php:159 mod/events.php:508 #: mod/fsuggest.php:109 mod/install.php:244 mod/install.php:284 #: mod/invite.php:144 mod/localtime.php:46 mod/manage.php:156 -#: mod/message.php:340 mod/message.php:523 mod/mood.php:139 -#: mod/photos.php:1143 mod/photos.php:1273 mod/photos.php:1599 -#: mod/photos.php:1648 mod/photos.php:1690 mod/photos.php:1770 -#: mod/poke.php:204 mod/contacts.php:588 mod/profiles.php:684 -#: object/Item.php:702 view/theme/duepuntozero/config.php:64 -#: view/theme/frio/config.php:67 view/theme/quattro/config.php:70 -#: view/theme/vier/config.php:113 +#: mod/message.php:340 mod/message.php:523 mod/mood.php:139 mod/photos.php:1143 +#: mod/photos.php:1273 mod/photos.php:1599 mod/photos.php:1648 +#: mod/photos.php:1690 mod/photos.php:1770 mod/poke.php:204 +#: mod/contacts.php:588 mod/profiles.php:684 object/Item.php:702 +#: view/theme/duepuntozero/config.php:64 view/theme/frio/config.php:67 +#: view/theme/quattro/config.php:70 view/theme/vier/config.php:113 msgid "Submit" msgstr "" @@ -3518,9 +3513,8 @@ msgid "" "entries from this contact." msgstr "" -#: mod/crepair.php:170 mod/admin.php:1496 mod/admin.php:1509 -#: mod/admin.php:1522 mod/admin.php:1538 mod/settings.php:684 -#: mod/settings.php:710 +#: mod/crepair.php:170 mod/settings.php:684 mod/settings.php:710 +#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1538 msgid "Name" msgstr "" @@ -3676,7 +3670,7 @@ msgstr "" msgid "%1$s welcomes %2$s" msgstr "" -#: mod/directory.php:195 view/theme/vier/theme.php:201 +#: mod/directory.php:195 view/theme/vier/theme.php:193 msgid "Global Directory" msgstr "" @@ -4510,7 +4504,7 @@ msgid "" "Password reset failed." msgstr "" -#: mod/lostpass.php:112 boot.php:877 +#: mod/lostpass.php:112 boot.php:884 msgid "Password Reset" msgstr "" @@ -4578,7 +4572,7 @@ msgid "" "your email for further instructions." msgstr "" -#: mod/lostpass.php:163 boot.php:865 +#: mod/lostpass.php:163 boot.php:872 msgid "Nickname or Email: " msgstr "" @@ -4983,14 +4977,12 @@ msgstr "" msgid "Invalid request identifier." msgstr "" -#: mod/notifications.php:46 mod/notifications.php:182 -#: mod/notifications.php:229 +#: mod/notifications.php:46 mod/notifications.php:182 mod/notifications.php:229 msgid "Discard" msgstr "" -#: mod/notifications.php:62 mod/notifications.php:181 -#: mod/notifications.php:265 mod/contacts.php:617 mod/contacts.php:817 -#: mod/contacts.php:1002 +#: mod/notifications.php:62 mod/notifications.php:181 mod/notifications.php:265 +#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 msgid "Ignore" msgstr "" @@ -5361,18 +5353,6 @@ msgstr "" msgid "View Album" msgstr "" -#: mod/ping.php:273 -msgid "{0} wants to be your friend" -msgstr "" - -#: mod/ping.php:288 -msgid "{0} sent you a message" -msgstr "" - -#: mod/ping.php:303 -msgid "{0} requested registration" -msgstr "" - #: mod/poke.php:197 msgid "Poke/Prod" msgstr "" @@ -5924,6 +5904,1462 @@ msgid "" "select \"Export account\"" msgstr "" +#: mod/contacts.php:137 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "" +msgstr[1] "" + +#: mod/contacts.php:172 mod/contacts.php:381 +msgid "Could not access contact record." +msgstr "" + +#: mod/contacts.php:186 +msgid "Could not locate selected profile." +msgstr "" + +#: mod/contacts.php:219 +msgid "Contact updated." +msgstr "" + +#: mod/contacts.php:402 +msgid "Contact has been blocked" +msgstr "" + +#: mod/contacts.php:402 +msgid "Contact has been unblocked" +msgstr "" + +#: mod/contacts.php:413 +msgid "Contact has been ignored" +msgstr "" + +#: mod/contacts.php:413 +msgid "Contact has been unignored" +msgstr "" + +#: mod/contacts.php:425 +msgid "Contact has been archived" +msgstr "" + +#: mod/contacts.php:425 +msgid "Contact has been unarchived" +msgstr "" + +#: mod/contacts.php:450 +msgid "Drop contact" +msgstr "" + +#: mod/contacts.php:453 mod/contacts.php:812 +msgid "Do you really want to delete this contact?" +msgstr "" + +#: mod/contacts.php:472 +msgid "Contact has been removed." +msgstr "" + +#: mod/contacts.php:509 +#, php-format +msgid "You are mutual friends with %s" +msgstr "" + +#: mod/contacts.php:513 +#, php-format +msgid "You are sharing with %s" +msgstr "" + +#: mod/contacts.php:518 +#, php-format +msgid "%s is sharing with you" +msgstr "" + +#: mod/contacts.php:538 +msgid "Private communications are not available for this contact." +msgstr "" + +#: mod/contacts.php:541 mod/admin.php:984 +msgid "Never" +msgstr "" + +#: mod/contacts.php:545 +msgid "(Update was successful)" +msgstr "" + +#: mod/contacts.php:545 +msgid "(Update was not successful)" +msgstr "" + +#: mod/contacts.php:547 mod/contacts.php:975 +msgid "Suggest friends" +msgstr "" + +#: mod/contacts.php:551 +#, php-format +msgid "Network type: %s" +msgstr "" + +#: mod/contacts.php:564 +msgid "Communications lost with this contact!" +msgstr "" + +#: mod/contacts.php:567 +msgid "Fetch further information for feeds" +msgstr "" + +#: mod/contacts.php:568 mod/admin.php:993 +msgid "Disabled" +msgstr "" + +#: mod/contacts.php:568 +msgid "Fetch information" +msgstr "" + +#: mod/contacts.php:568 +msgid "Fetch information and keywords" +msgstr "" + +#: mod/contacts.php:586 +msgid "Contact" +msgstr "" + +#: mod/contacts.php:589 +msgid "Profile Visibility" +msgstr "" + +#: mod/contacts.php:590 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: mod/contacts.php:591 +msgid "Contact Information / Notes" +msgstr "" + +#: mod/contacts.php:592 +msgid "Edit contact notes" +msgstr "" + +#: mod/contacts.php:598 +msgid "Block/Unblock contact" +msgstr "" + +#: mod/contacts.php:599 +msgid "Ignore contact" +msgstr "" + +#: mod/contacts.php:600 +msgid "Repair URL settings" +msgstr "" + +#: mod/contacts.php:601 +msgid "View conversations" +msgstr "" + +#: mod/contacts.php:607 +msgid "Last update:" +msgstr "" + +#: mod/contacts.php:609 +msgid "Update public posts" +msgstr "" + +#: mod/contacts.php:611 mod/contacts.php:985 +msgid "Update now" +msgstr "" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1516 +msgid "Unblock" +msgstr "" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1515 +msgid "Block" +msgstr "" + +#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 +msgid "Unignore" +msgstr "" + +#: mod/contacts.php:621 +msgid "Currently blocked" +msgstr "" + +#: mod/contacts.php:622 +msgid "Currently ignored" +msgstr "" + +#: mod/contacts.php:623 +msgid "Currently archived" +msgstr "" + +#: mod/contacts.php:624 +msgid "" +"Replies/likes to your public posts <strong>may</strong> still be visible" +msgstr "" + +#: mod/contacts.php:625 +msgid "Notification for new posts" +msgstr "" + +#: mod/contacts.php:625 +msgid "Send a notification of every new post of this contact" +msgstr "" + +#: mod/contacts.php:628 +msgid "Blacklisted keywords" +msgstr "" + +#: mod/contacts.php:628 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "" + +#: mod/contacts.php:646 +msgid "Actions" +msgstr "" + +#: mod/contacts.php:649 +msgid "Contact Settings" +msgstr "" + +#: mod/contacts.php:695 +msgid "Suggestions" +msgstr "" + +#: mod/contacts.php:698 +msgid "Suggest potential friends" +msgstr "" + +#: mod/contacts.php:706 +msgid "Show all contacts" +msgstr "" + +#: mod/contacts.php:711 +msgid "Unblocked" +msgstr "" + +#: mod/contacts.php:714 +msgid "Only show unblocked contacts" +msgstr "" + +#: mod/contacts.php:720 +msgid "Blocked" +msgstr "" + +#: mod/contacts.php:723 +msgid "Only show blocked contacts" +msgstr "" + +#: mod/contacts.php:729 +msgid "Ignored" +msgstr "" + +#: mod/contacts.php:732 +msgid "Only show ignored contacts" +msgstr "" + +#: mod/contacts.php:738 +msgid "Archived" +msgstr "" + +#: mod/contacts.php:741 +msgid "Only show archived contacts" +msgstr "" + +#: mod/contacts.php:747 +msgid "Hidden" +msgstr "" + +#: mod/contacts.php:750 +msgid "Only show hidden contacts" +msgstr "" + +#: mod/contacts.php:807 +msgid "Search your contacts" +msgstr "" + +#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 +msgid "Update" +msgstr "" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Archive" +msgstr "" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Unarchive" +msgstr "" + +#: mod/contacts.php:821 +msgid "Batch Actions" +msgstr "" + +#: mod/contacts.php:867 +msgid "View all contacts" +msgstr "" + +#: mod/contacts.php:877 +msgid "View all common friends" +msgstr "" + +#: mod/contacts.php:884 +msgid "Advanced Contact Settings" +msgstr "" + +#: mod/contacts.php:918 +msgid "Mutual Friendship" +msgstr "" + +#: mod/contacts.php:922 +msgid "is a fan of yours" +msgstr "" + +#: mod/contacts.php:926 +msgid "you are a fan of" +msgstr "" + +#: mod/contacts.php:996 +msgid "Toggle Blocked status" +msgstr "" + +#: mod/contacts.php:1004 +msgid "Toggle Ignored status" +msgstr "" + +#: mod/contacts.php:1012 +msgid "Toggle Archive status" +msgstr "" + +#: mod/contacts.php:1020 +msgid "Delete contact" +msgstr "" + +#: mod/ping.php:274 +msgid "{0} wants to be your friend" +msgstr "" + +#: mod/ping.php:289 +msgid "{0} sent you a message" +msgstr "" + +#: mod/ping.php:304 +msgid "{0} requested registration" +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:322 +#, 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:136 +msgid "Unable to process image" +msgstr "" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "" + +#: mod/profile_photo.php:256 +msgid "Upload" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "" + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "" + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "" + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "" + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "" + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "" + +#: mod/profiles.php:567 +msgid " and " +msgstr "" + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "" + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "" + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow " +"you." +msgstr "" + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "" + +#: mod/settings.php:45 mod/admin.php:1496 +msgid "Account" +msgstr "" + +#: mod/settings.php:54 mod/admin.php:170 +msgid "Additional features" +msgstr "" + +#: mod/settings.php:62 +msgid "Display" +msgstr "" + +#: mod/settings.php:69 mod/settings.php:891 +msgid "Social Networks" +msgstr "" + +#: mod/settings.php:76 mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 +msgid "Plugins" +msgstr "" + +#: mod/settings.php:90 +msgid "Connected apps" +msgstr "" + +#: mod/settings.php:104 +msgid "Remove account" +msgstr "" + +#: mod/settings.php:159 +msgid "Missing some important data!" +msgstr "" + +#: mod/settings.php:273 +msgid "Failed to connect with email account using the settings provided." +msgstr "" + +#: mod/settings.php:278 +msgid "Email settings updated." +msgstr "" + +#: mod/settings.php:293 +msgid "Features updated" +msgstr "" + +#: mod/settings.php:363 +msgid "Relocate message has been send to your contacts" +msgstr "" + +#: mod/settings.php:382 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: mod/settings.php:390 +msgid "Wrong password." +msgstr "" + +#: mod/settings.php:401 +msgid "Password changed." +msgstr "" + +#: mod/settings.php:403 +msgid "Password update failed. Please try again." +msgstr "" + +#: mod/settings.php:483 +msgid " Please use a shorter name." +msgstr "" + +#: mod/settings.php:485 +msgid " Name too short." +msgstr "" + +#: mod/settings.php:494 +msgid "Wrong Password" +msgstr "" + +#: mod/settings.php:499 +msgid " Not valid email." +msgstr "" + +#: mod/settings.php:505 +msgid " Cannot change to that email." +msgstr "" + +#: mod/settings.php:561 +msgid "Private forum has no privacy permissions. Using default privacy group." +msgstr "" + +#: mod/settings.php:565 +msgid "Private forum has no privacy permissions and no default privacy group." +msgstr "" + +#: mod/settings.php:605 +msgid "Settings updated." +msgstr "" + +#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 +msgid "Add application" +msgstr "" + +#: mod/settings.php:682 mod/settings.php:793 mod/settings.php:842 +#: mod/settings.php:909 mod/settings.php:1006 mod/settings.php:1272 +#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 +#: mod/admin.php:2176 +msgid "Save Settings" +msgstr "" + +#: mod/settings.php:685 mod/settings.php:711 +msgid "Consumer Key" +msgstr "" + +#: mod/settings.php:686 mod/settings.php:712 +msgid "Consumer Secret" +msgstr "" + +#: mod/settings.php:687 mod/settings.php:713 +msgid "Redirect" +msgstr "" + +#: mod/settings.php:688 mod/settings.php:714 +msgid "Icon url" +msgstr "" + +#: mod/settings.php:699 +msgid "You can't edit this application." +msgstr "" + +#: mod/settings.php:742 +msgid "Connected Apps" +msgstr "" + +#: mod/settings.php:746 +msgid "Client key starts with" +msgstr "" + +#: mod/settings.php:747 +msgid "No name" +msgstr "" + +#: mod/settings.php:748 +msgid "Remove authorization" +msgstr "" + +#: mod/settings.php:760 +msgid "No Plugin settings configured" +msgstr "" + +#: mod/settings.php:769 +msgid "Plugin Settings" +msgstr "" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "Off" +msgstr "" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "On" +msgstr "" + +#: mod/settings.php:791 +msgid "Additional Features" +msgstr "" + +#: mod/settings.php:801 mod/settings.php:805 +msgid "General Social Media Settings" +msgstr "" + +#: mod/settings.php:811 +msgid "Disable intelligent shortening" +msgstr "" + +#: mod/settings.php:813 +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:819 +msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" +msgstr "" + +#: mod/settings.php:821 +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:827 +msgid "Default group for OStatus contacts" +msgstr "" + +#: mod/settings.php:835 +msgid "Your legacy GNU Social account" +msgstr "" + +#: mod/settings.php:837 +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:840 +msgid "Repair OStatus subscriptions" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +#, php-format +msgid "Built-in support for %s connectivity is %s" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "enabled" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "disabled" +msgstr "" + +#: mod/settings.php:850 +msgid "GNU Social (OStatus)" +msgstr "" + +#: mod/settings.php:884 +msgid "Email access is disabled on this site." +msgstr "" + +#: mod/settings.php:896 +msgid "Email/Mailbox Setup" +msgstr "" + +#: mod/settings.php:897 +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:898 +msgid "Last successful email check:" +msgstr "" + +#: mod/settings.php:900 +msgid "IMAP server name:" +msgstr "" + +#: mod/settings.php:901 +msgid "IMAP port:" +msgstr "" + +#: mod/settings.php:902 +msgid "Security:" +msgstr "" + +#: mod/settings.php:902 mod/settings.php:907 +msgid "None" +msgstr "" + +#: mod/settings.php:903 +msgid "Email login name:" +msgstr "" + +#: mod/settings.php:904 +msgid "Email password:" +msgstr "" + +#: mod/settings.php:905 +msgid "Reply-to address:" +msgstr "" + +#: mod/settings.php:906 +msgid "Send public posts to all email contacts:" +msgstr "" + +#: mod/settings.php:907 +msgid "Action after import:" +msgstr "" + +#: mod/settings.php:907 +msgid "Move to folder" +msgstr "" + +#: mod/settings.php:908 +msgid "Move to folder:" +msgstr "" + +#: mod/settings.php:944 mod/admin.php:948 +msgid "No special theme for mobile devices" +msgstr "" + +#: mod/settings.php:1004 +msgid "Display Settings" +msgstr "" + +#: mod/settings.php:1010 mod/settings.php:1033 +msgid "Display Theme:" +msgstr "" + +#: mod/settings.php:1011 +msgid "Mobile Theme:" +msgstr "" + +#: mod/settings.php:1012 +msgid "Suppress warning of insecure networks" +msgstr "" + +#: mod/settings.php:1012 +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:1013 +msgid "Update browser every xx seconds" +msgstr "" + +#: mod/settings.php:1013 +msgid "Minimum of 10 seconds. Enter -1 to disable it." +msgstr "" + +#: mod/settings.php:1014 +msgid "Number of items to display per page:" +msgstr "" + +#: mod/settings.php:1014 mod/settings.php:1015 +msgid "Maximum of 100 items" +msgstr "" + +#: mod/settings.php:1015 +msgid "Number of items to display per page when viewed from mobile device:" +msgstr "" + +#: mod/settings.php:1016 +msgid "Don't show emoticons" +msgstr "" + +#: mod/settings.php:1017 +msgid "Calendar" +msgstr "" + +#: mod/settings.php:1018 +msgid "Beginning of week:" +msgstr "" + +#: mod/settings.php:1019 +msgid "Don't show notices" +msgstr "" + +#: mod/settings.php:1020 +msgid "Infinite scroll" +msgstr "" + +#: mod/settings.php:1021 +msgid "Automatic updates only at the top of the network page" +msgstr "" + +#: mod/settings.php:1022 +msgid "Bandwith Saver Mode" +msgstr "" + +#: mod/settings.php:1022 +msgid "" +"When enabled, embedded content is not displayed on automatic updates, they " +"only show on page reload." +msgstr "" + +#: mod/settings.php:1024 +msgid "General Theme Settings" +msgstr "" + +#: mod/settings.php:1025 +msgid "Custom Theme Settings" +msgstr "" + +#: mod/settings.php:1026 +msgid "Content Settings" +msgstr "" + +#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 +#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 +#: view/theme/vier/config.php:115 +msgid "Theme settings" +msgstr "" + +#: mod/settings.php:1111 +msgid "Account Types" +msgstr "" + +#: mod/settings.php:1112 +msgid "Personal Page Subtypes" +msgstr "" + +#: mod/settings.php:1113 +msgid "Community Forum Subtypes" +msgstr "" + +#: mod/settings.php:1120 +msgid "Personal Page" +msgstr "" + +#: mod/settings.php:1121 +msgid "Account for a personal profile." +msgstr "" + +#: mod/settings.php:1124 +msgid "Organisation Page" +msgstr "" + +#: mod/settings.php:1125 +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1128 +msgid "News Page" +msgstr "" + +#: mod/settings.php:1129 +msgid "" +"Account for a news reflector that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1132 +msgid "Community Forum" +msgstr "" + +#: mod/settings.php:1133 +msgid "Account for community discussions." +msgstr "" + +#: mod/settings.php:1136 +msgid "Normal Account Page" +msgstr "" + +#: mod/settings.php:1137 +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "" + +#: mod/settings.php:1140 +msgid "Soapbox Page" +msgstr "" + +#: mod/settings.php:1141 +msgid "" +"Account for a public profile that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1144 +msgid "Public Forum" +msgstr "" + +#: mod/settings.php:1145 +msgid "Automatically approves all contact requests." +msgstr "" + +#: mod/settings.php:1148 +msgid "Automatic Friend Page" +msgstr "" + +#: mod/settings.php:1149 +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "" + +#: mod/settings.php:1152 +msgid "Private Forum [Experimental]" +msgstr "" + +#: mod/settings.php:1153 +msgid "Requires manual approval of contact requests." +msgstr "" + +#: mod/settings.php:1164 +msgid "OpenID:" +msgstr "" + +#: mod/settings.php:1164 +msgid "(Optional) Allow this OpenID to login to this account." +msgstr "" + +#: mod/settings.php:1172 +msgid "Publish your default profile in your local site directory?" +msgstr "" + +#: mod/settings.php:1172 +msgid "Your profile may be visible in public." +msgstr "" + +#: mod/settings.php:1178 +msgid "Publish your default profile in the global social directory?" +msgstr "" + +#: mod/settings.php:1185 +msgid "Hide your contact/friend list from viewers of your default profile?" +msgstr "" + +#: mod/settings.php:1189 +msgid "" +"If enabled, posting public messages to Diaspora and other networks isn't " +"possible." +msgstr "" + +#: mod/settings.php:1194 +msgid "Allow friends to post to your profile page?" +msgstr "" + +#: mod/settings.php:1199 +msgid "Allow friends to tag your posts?" +msgstr "" + +#: mod/settings.php:1204 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: mod/settings.php:1209 +msgid "Permit unknown people to send you private mail?" +msgstr "" + +#: mod/settings.php:1217 +msgid "Profile is <strong>not published</strong>." +msgstr "" + +#: mod/settings.php:1225 +#, php-format +msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." +msgstr "" + +#: mod/settings.php:1232 +msgid "Automatically expire posts after this many days:" +msgstr "" + +#: mod/settings.php:1232 +msgid "If empty, posts will not expire. Expired posts will be deleted" +msgstr "" + +#: mod/settings.php:1233 +msgid "Advanced expiration settings" +msgstr "" + +#: mod/settings.php:1234 +msgid "Advanced Expiration" +msgstr "" + +#: mod/settings.php:1235 +msgid "Expire posts:" +msgstr "" + +#: mod/settings.php:1236 +msgid "Expire personal notes:" +msgstr "" + +#: mod/settings.php:1237 +msgid "Expire starred posts:" +msgstr "" + +#: mod/settings.php:1238 +msgid "Expire photos:" +msgstr "" + +#: mod/settings.php:1239 +msgid "Only expire posts by others:" +msgstr "" + +#: mod/settings.php:1270 +msgid "Account Settings" +msgstr "" + +#: mod/settings.php:1278 +msgid "Password Settings" +msgstr "" + +#: mod/settings.php:1281 +msgid "Current Password:" +msgstr "" + +#: mod/settings.php:1281 mod/settings.php:1282 +msgid "Your current password to confirm the changes" +msgstr "" + +#: mod/settings.php:1282 +msgid "Password:" +msgstr "" + +#: mod/settings.php:1286 +msgid "Basic Settings" +msgstr "" + +#: mod/settings.php:1288 +msgid "Email Address:" +msgstr "" + +#: mod/settings.php:1289 +msgid "Your Timezone:" +msgstr "" + +#: mod/settings.php:1290 +msgid "Your Language:" +msgstr "" + +#: mod/settings.php:1290 +msgid "" +"Set the language we use to show you friendica interface and to send you " +"emails" +msgstr "" + +#: mod/settings.php:1291 +msgid "Default Post Location:" +msgstr "" + +#: mod/settings.php:1292 +msgid "Use Browser Location:" +msgstr "" + +#: mod/settings.php:1295 +msgid "Security and Privacy Settings" +msgstr "" + +#: mod/settings.php:1297 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: mod/settings.php:1297 mod/settings.php:1327 +msgid "(to prevent spam abuse)" +msgstr "" + +#: mod/settings.php:1298 +msgid "Default Post Permissions" +msgstr "" + +#: mod/settings.php:1299 +msgid "(click to open/close)" +msgstr "" + +#: mod/settings.php:1310 +msgid "Default Private Post" +msgstr "" + +#: mod/settings.php:1311 +msgid "Default Public Post" +msgstr "" + +#: mod/settings.php:1315 +msgid "Default Permissions for New Posts" +msgstr "" + +#: mod/settings.php:1327 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: mod/settings.php:1330 +msgid "Notification Settings" +msgstr "" + +#: mod/settings.php:1331 +msgid "By default post a status message when:" +msgstr "" + +#: mod/settings.php:1332 +msgid "accepting a friend request" +msgstr "" + +#: mod/settings.php:1333 +msgid "joining a forum/community" +msgstr "" + +#: mod/settings.php:1334 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: mod/settings.php:1335 +msgid "Send a notification email when:" +msgstr "" + +#: mod/settings.php:1336 +msgid "You receive an introduction" +msgstr "" + +#: mod/settings.php:1337 +msgid "Your introductions are confirmed" +msgstr "" + +#: mod/settings.php:1338 +msgid "Someone writes on your profile wall" +msgstr "" + +#: mod/settings.php:1339 +msgid "Someone writes a followup comment" +msgstr "" + +#: mod/settings.php:1340 +msgid "You receive a private message" +msgstr "" + +#: mod/settings.php:1341 +msgid "You receive a friend suggestion" +msgstr "" + +#: mod/settings.php:1342 +msgid "You are tagged in a post" +msgstr "" + +#: mod/settings.php:1343 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: mod/settings.php:1345 +msgid "Activate desktop notifications" +msgstr "" + +#: mod/settings.php:1345 +msgid "Show desktop popup on new notifications" +msgstr "" + +#: mod/settings.php:1347 +msgid "Text-only notification emails" +msgstr "" + +#: mod/settings.php:1349 +msgid "Send text only notification emails, without the html part" +msgstr "" + +#: mod/settings.php:1351 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: mod/settings.php:1352 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: mod/settings.php:1355 +msgid "Relocate" +msgstr "" + +#: mod/settings.php:1356 +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:1357 +msgid "Resend relocate message to contacts" +msgstr "" + #: mod/admin.php:97 msgid "Theme settings updated." msgstr "" @@ -5936,18 +7372,10 @@ msgstr "" msgid "Users" msgstr "" -#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76 -msgid "Plugins" -msgstr "" - #: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 msgid "Themes" msgstr "" -#: mod/admin.php:170 mod/settings.php:54 -msgid "Additional features" -msgstr "" - #: mod/admin.php:171 msgid "DB updates" msgstr "" @@ -6196,10 +7624,6 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: mod/admin.php:948 mod/settings.php:944 -msgid "No special theme for mobile devices" -msgstr "" - #: mod/admin.php:977 msgid "No community page" msgstr "" @@ -6212,18 +7636,10 @@ msgstr "" msgid "Global community page" msgstr "" -#: mod/admin.php:984 mod/contacts.php:541 -msgid "Never" -msgstr "" - #: mod/admin.php:985 msgid "At post arrival" msgstr "" -#: mod/admin.php:993 mod/contacts.php:568 -msgid "Disabled" -msgstr "" - #: mod/admin.php:995 msgid "Users, Global Contacts" msgstr "" @@ -6276,13 +7692,6 @@ msgstr "" msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793 -#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006 -#: mod/settings.php:1272 -msgid "Save Settings" -msgstr "" - #: mod/admin.php:1063 msgid "File upload" msgstr "" @@ -7111,10 +8520,6 @@ msgstr "" msgid "Last item" msgstr "" -#: mod/admin.php:1496 mod/settings.php:45 -msgid "Account" -msgstr "" - #: mod/admin.php:1505 msgid "Add User" msgstr "" @@ -7147,16 +8552,6 @@ msgstr "" msgid "Deny" msgstr "" -#: mod/admin.php:1515 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Block" -msgstr "" - -#: mod/admin.php:1516 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Unblock" -msgstr "" - #: mod/admin.php:1517 msgid "Site admin" msgstr "" @@ -7315,14 +8710,6 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "" -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "Off" -msgstr "" - -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "On" -msgstr "" - #: mod/admin.php:2166 #, php-format msgid "Lock feature %s" @@ -7332,1396 +8719,6 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: mod/contacts.php:137 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "" -msgstr[1] "" - -#: mod/contacts.php:172 mod/contacts.php:381 -msgid "Could not access contact record." -msgstr "" - -#: mod/contacts.php:186 -msgid "Could not locate selected profile." -msgstr "" - -#: mod/contacts.php:219 -msgid "Contact updated." -msgstr "" - -#: mod/contacts.php:402 -msgid "Contact has been blocked" -msgstr "" - -#: mod/contacts.php:402 -msgid "Contact has been unblocked" -msgstr "" - -#: mod/contacts.php:413 -msgid "Contact has been ignored" -msgstr "" - -#: mod/contacts.php:413 -msgid "Contact has been unignored" -msgstr "" - -#: mod/contacts.php:425 -msgid "Contact has been archived" -msgstr "" - -#: mod/contacts.php:425 -msgid "Contact has been unarchived" -msgstr "" - -#: mod/contacts.php:450 -msgid "Drop contact" -msgstr "" - -#: mod/contacts.php:453 mod/contacts.php:812 -msgid "Do you really want to delete this contact?" -msgstr "" - -#: mod/contacts.php:472 -msgid "Contact has been removed." -msgstr "" - -#: mod/contacts.php:509 -#, php-format -msgid "You are mutual friends with %s" -msgstr "" - -#: mod/contacts.php:513 -#, php-format -msgid "You are sharing with %s" -msgstr "" - -#: mod/contacts.php:518 -#, php-format -msgid "%s is sharing with you" -msgstr "" - -#: mod/contacts.php:538 -msgid "Private communications are not available for this contact." -msgstr "" - -#: mod/contacts.php:545 -msgid "(Update was successful)" -msgstr "" - -#: mod/contacts.php:545 -msgid "(Update was not successful)" -msgstr "" - -#: mod/contacts.php:547 mod/contacts.php:975 -msgid "Suggest friends" -msgstr "" - -#: mod/contacts.php:551 -#, php-format -msgid "Network type: %s" -msgstr "" - -#: mod/contacts.php:564 -msgid "Communications lost with this contact!" -msgstr "" - -#: mod/contacts.php:567 -msgid "Fetch further information for feeds" -msgstr "" - -#: mod/contacts.php:568 -msgid "Fetch information" -msgstr "" - -#: mod/contacts.php:568 -msgid "Fetch information and keywords" -msgstr "" - -#: mod/contacts.php:586 -msgid "Contact" -msgstr "" - -#: mod/contacts.php:589 -msgid "Profile Visibility" -msgstr "" - -#: mod/contacts.php:590 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: mod/contacts.php:591 -msgid "Contact Information / Notes" -msgstr "" - -#: mod/contacts.php:592 -msgid "Edit contact notes" -msgstr "" - -#: mod/contacts.php:598 -msgid "Block/Unblock contact" -msgstr "" - -#: mod/contacts.php:599 -msgid "Ignore contact" -msgstr "" - -#: mod/contacts.php:600 -msgid "Repair URL settings" -msgstr "" - -#: mod/contacts.php:601 -msgid "View conversations" -msgstr "" - -#: mod/contacts.php:607 -msgid "Last update:" -msgstr "" - -#: mod/contacts.php:609 -msgid "Update public posts" -msgstr "" - -#: mod/contacts.php:611 mod/contacts.php:985 -msgid "Update now" -msgstr "" - -#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 -msgid "Unignore" -msgstr "" - -#: mod/contacts.php:621 -msgid "Currently blocked" -msgstr "" - -#: mod/contacts.php:622 -msgid "Currently ignored" -msgstr "" - -#: mod/contacts.php:623 -msgid "Currently archived" -msgstr "" - -#: mod/contacts.php:624 -msgid "" -"Replies/likes to your public posts <strong>may</strong> still be visible" -msgstr "" - -#: mod/contacts.php:625 -msgid "Notification for new posts" -msgstr "" - -#: mod/contacts.php:625 -msgid "Send a notification of every new post of this contact" -msgstr "" - -#: mod/contacts.php:628 -msgid "Blacklisted keywords" -msgstr "" - -#: mod/contacts.php:628 -msgid "" -"Comma separated list of keywords that should not be converted to hashtags, " -"when \"Fetch information and keywords\" is selected" -msgstr "" - -#: mod/contacts.php:646 -msgid "Actions" -msgstr "" - -#: mod/contacts.php:649 -msgid "Contact Settings" -msgstr "" - -#: mod/contacts.php:695 -msgid "Suggestions" -msgstr "" - -#: mod/contacts.php:698 -msgid "Suggest potential friends" -msgstr "" - -#: mod/contacts.php:706 -msgid "Show all contacts" -msgstr "" - -#: mod/contacts.php:711 -msgid "Unblocked" -msgstr "" - -#: mod/contacts.php:714 -msgid "Only show unblocked contacts" -msgstr "" - -#: mod/contacts.php:720 -msgid "Blocked" -msgstr "" - -#: mod/contacts.php:723 -msgid "Only show blocked contacts" -msgstr "" - -#: mod/contacts.php:729 -msgid "Ignored" -msgstr "" - -#: mod/contacts.php:732 -msgid "Only show ignored contacts" -msgstr "" - -#: mod/contacts.php:738 -msgid "Archived" -msgstr "" - -#: mod/contacts.php:741 -msgid "Only show archived contacts" -msgstr "" - -#: mod/contacts.php:747 -msgid "Hidden" -msgstr "" - -#: mod/contacts.php:750 -msgid "Only show hidden contacts" -msgstr "" - -#: mod/contacts.php:807 -msgid "Search your contacts" -msgstr "" - -#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 -msgid "Update" -msgstr "" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Archive" -msgstr "" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Unarchive" -msgstr "" - -#: mod/contacts.php:821 -msgid "Batch Actions" -msgstr "" - -#: mod/contacts.php:867 -msgid "View all contacts" -msgstr "" - -#: mod/contacts.php:877 -msgid "View all common friends" -msgstr "" - -#: mod/contacts.php:884 -msgid "Advanced Contact Settings" -msgstr "" - -#: mod/contacts.php:918 -msgid "Mutual Friendship" -msgstr "" - -#: mod/contacts.php:922 -msgid "is a fan of yours" -msgstr "" - -#: mod/contacts.php:926 -msgid "you are a fan of" -msgstr "" - -#: mod/contacts.php:996 -msgid "Toggle Blocked status" -msgstr "" - -#: mod/contacts.php:1004 -msgid "Toggle Ignored status" -msgstr "" - -#: mod/contacts.php:1012 -msgid "Toggle Archive status" -msgstr "" - -#: mod/contacts.php:1020 -msgid "Delete contact" -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:322 -#, 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:136 -msgid "Unable to process image" -msgstr "" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "" - -#: mod/profile_photo.php:256 -msgid "Upload" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "" - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "" - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "" - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "" - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "" - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "" - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "" - -#: mod/profiles.php:567 -msgid " and " -msgstr "" - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "" - -#: mod/profiles.php:579 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr "" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "" - -#: mod/profiles.php:714 -msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "" - -#: mod/profiles.php:715 -msgid "Your Full Name:" -msgstr "" - -#: mod/profiles.php:716 -msgid "Title/Description:" -msgstr "" - -#: mod/profiles.php:719 -msgid "Street Address:" -msgstr "" - -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "" - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "" - -#: mod/profiles.php:731 -msgid "" -"The XMPP address will be propagated to your contacts so that they can follow " -"you." -msgstr "" - -#: mod/profiles.php:732 -msgid "Homepage URL:" -msgstr "" - -#: mod/profiles.php:735 -msgid "Religious Views:" -msgstr "" - -#: mod/profiles.php:736 -msgid "Public Keywords:" -msgstr "" - -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "" - -#: mod/profiles.php:737 -msgid "Private Keywords:" -msgstr "" - -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" -msgstr "" - -#: mod/profiles.php:740 -msgid "Musical interests" -msgstr "" - -#: mod/profiles.php:741 -msgid "Books, literature" -msgstr "" - -#: mod/profiles.php:742 -msgid "Television" -msgstr "" - -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" -msgstr "" - -#: mod/profiles.php:744 -msgid "Hobbies/Interests" -msgstr "" - -#: mod/profiles.php:745 -msgid "Love/romance" -msgstr "" - -#: mod/profiles.php:746 -msgid "Work/employment" -msgstr "" - -#: mod/profiles.php:747 -msgid "School/education" -msgstr "" - -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" -msgstr "" - -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" -msgstr "" - -#: mod/settings.php:62 -msgid "Display" -msgstr "" - -#: mod/settings.php:69 mod/settings.php:891 -msgid "Social Networks" -msgstr "" - -#: mod/settings.php:90 -msgid "Connected apps" -msgstr "" - -#: mod/settings.php:104 -msgid "Remove account" -msgstr "" - -#: mod/settings.php:159 -msgid "Missing some important data!" -msgstr "" - -#: mod/settings.php:273 -msgid "Failed to connect with email account using the settings provided." -msgstr "" - -#: mod/settings.php:278 -msgid "Email settings updated." -msgstr "" - -#: mod/settings.php:293 -msgid "Features updated" -msgstr "" - -#: mod/settings.php:363 -msgid "Relocate message has been send to your contacts" -msgstr "" - -#: mod/settings.php:382 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: mod/settings.php:390 -msgid "Wrong password." -msgstr "" - -#: mod/settings.php:401 -msgid "Password changed." -msgstr "" - -#: mod/settings.php:403 -msgid "Password update failed. Please try again." -msgstr "" - -#: mod/settings.php:483 -msgid " Please use a shorter name." -msgstr "" - -#: mod/settings.php:485 -msgid " Name too short." -msgstr "" - -#: mod/settings.php:494 -msgid "Wrong Password" -msgstr "" - -#: mod/settings.php:499 -msgid " Not valid email." -msgstr "" - -#: mod/settings.php:505 -msgid " Cannot change to that email." -msgstr "" - -#: mod/settings.php:561 -msgid "Private forum has no privacy permissions. Using default privacy group." -msgstr "" - -#: mod/settings.php:565 -msgid "Private forum has no privacy permissions and no default privacy group." -msgstr "" - -#: mod/settings.php:605 -msgid "Settings updated." -msgstr "" - -#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 -msgid "Add application" -msgstr "" - -#: mod/settings.php:685 mod/settings.php:711 -msgid "Consumer Key" -msgstr "" - -#: mod/settings.php:686 mod/settings.php:712 -msgid "Consumer Secret" -msgstr "" - -#: mod/settings.php:687 mod/settings.php:713 -msgid "Redirect" -msgstr "" - -#: mod/settings.php:688 mod/settings.php:714 -msgid "Icon url" -msgstr "" - -#: mod/settings.php:699 -msgid "You can't edit this application." -msgstr "" - -#: mod/settings.php:742 -msgid "Connected Apps" -msgstr "" - -#: mod/settings.php:746 -msgid "Client key starts with" -msgstr "" - -#: mod/settings.php:747 -msgid "No name" -msgstr "" - -#: mod/settings.php:748 -msgid "Remove authorization" -msgstr "" - -#: mod/settings.php:760 -msgid "No Plugin settings configured" -msgstr "" - -#: mod/settings.php:769 -msgid "Plugin Settings" -msgstr "" - -#: mod/settings.php:791 -msgid "Additional Features" -msgstr "" - -#: mod/settings.php:801 mod/settings.php:805 -msgid "General Social Media Settings" -msgstr "" - -#: mod/settings.php:811 -msgid "Disable intelligent shortening" -msgstr "" - -#: mod/settings.php:813 -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:819 -msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" -msgstr "" - -#: mod/settings.php:821 -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:827 -msgid "Default group for OStatus contacts" -msgstr "" - -#: mod/settings.php:835 -msgid "Your legacy GNU Social account" -msgstr "" - -#: mod/settings.php:837 -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:840 -msgid "Repair OStatus subscriptions" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -#, php-format -msgid "Built-in support for %s connectivity is %s" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "enabled" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "disabled" -msgstr "" - -#: mod/settings.php:850 -msgid "GNU Social (OStatus)" -msgstr "" - -#: mod/settings.php:884 -msgid "Email access is disabled on this site." -msgstr "" - -#: mod/settings.php:896 -msgid "Email/Mailbox Setup" -msgstr "" - -#: mod/settings.php:897 -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:898 -msgid "Last successful email check:" -msgstr "" - -#: mod/settings.php:900 -msgid "IMAP server name:" -msgstr "" - -#: mod/settings.php:901 -msgid "IMAP port:" -msgstr "" - -#: mod/settings.php:902 -msgid "Security:" -msgstr "" - -#: mod/settings.php:902 mod/settings.php:907 -msgid "None" -msgstr "" - -#: mod/settings.php:903 -msgid "Email login name:" -msgstr "" - -#: mod/settings.php:904 -msgid "Email password:" -msgstr "" - -#: mod/settings.php:905 -msgid "Reply-to address:" -msgstr "" - -#: mod/settings.php:906 -msgid "Send public posts to all email contacts:" -msgstr "" - -#: mod/settings.php:907 -msgid "Action after import:" -msgstr "" - -#: mod/settings.php:907 -msgid "Move to folder" -msgstr "" - -#: mod/settings.php:908 -msgid "Move to folder:" -msgstr "" - -#: mod/settings.php:1004 -msgid "Display Settings" -msgstr "" - -#: mod/settings.php:1010 mod/settings.php:1033 -msgid "Display Theme:" -msgstr "" - -#: mod/settings.php:1011 -msgid "Mobile Theme:" -msgstr "" - -#: mod/settings.php:1012 -msgid "Suppress warning of insecure networks" -msgstr "" - -#: mod/settings.php:1012 -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:1013 -msgid "Update browser every xx seconds" -msgstr "" - -#: mod/settings.php:1013 -msgid "Minimum of 10 seconds. Enter -1 to disable it." -msgstr "" - -#: mod/settings.php:1014 -msgid "Number of items to display per page:" -msgstr "" - -#: mod/settings.php:1014 mod/settings.php:1015 -msgid "Maximum of 100 items" -msgstr "" - -#: mod/settings.php:1015 -msgid "Number of items to display per page when viewed from mobile device:" -msgstr "" - -#: mod/settings.php:1016 -msgid "Don't show emoticons" -msgstr "" - -#: mod/settings.php:1017 -msgid "Calendar" -msgstr "" - -#: mod/settings.php:1018 -msgid "Beginning of week:" -msgstr "" - -#: mod/settings.php:1019 -msgid "Don't show notices" -msgstr "" - -#: mod/settings.php:1020 -msgid "Infinite scroll" -msgstr "" - -#: mod/settings.php:1021 -msgid "Automatic updates only at the top of the network page" -msgstr "" - -#: mod/settings.php:1022 -msgid "Bandwith Saver Mode" -msgstr "" - -#: mod/settings.php:1022 -msgid "" -"When enabled, embedded content is not displayed on automatic updates, they " -"only show on page reload." -msgstr "" - -#: mod/settings.php:1024 -msgid "General Theme Settings" -msgstr "" - -#: mod/settings.php:1025 -msgid "Custom Theme Settings" -msgstr "" - -#: mod/settings.php:1026 -msgid "Content Settings" -msgstr "" - -#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 -#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 -#: view/theme/vier/config.php:115 -msgid "Theme settings" -msgstr "" - -#: mod/settings.php:1111 -msgid "Account Types" -msgstr "" - -#: mod/settings.php:1112 -msgid "Personal Page Subtypes" -msgstr "" - -#: mod/settings.php:1113 -msgid "Community Forum Subtypes" -msgstr "" - -#: mod/settings.php:1120 -msgid "Personal Page" -msgstr "" - -#: mod/settings.php:1121 -msgid "This account is a regular personal profile" -msgstr "" - -#: mod/settings.php:1124 -msgid "Organisation Page" -msgstr "" - -#: mod/settings.php:1125 -msgid "This account is a profile for an organisation" -msgstr "" - -#: mod/settings.php:1128 -msgid "News Page" -msgstr "" - -#: mod/settings.php:1129 -msgid "This account is a news account/reflector" -msgstr "" - -#: mod/settings.php:1132 -msgid "Community Forum" -msgstr "" - -#: mod/settings.php:1133 -msgid "" -"This account is a community forum where people can discuss with each other" -msgstr "" - -#: mod/settings.php:1136 -msgid "Normal Account Page" -msgstr "" - -#: mod/settings.php:1137 -msgid "This account is a normal personal profile" -msgstr "" - -#: mod/settings.php:1140 -msgid "Soapbox Page" -msgstr "" - -#: mod/settings.php:1141 -msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "" - -#: mod/settings.php:1144 -msgid "Public Forum" -msgstr "" - -#: mod/settings.php:1145 -msgid "Automatically approve all contact requests" -msgstr "" - -#: mod/settings.php:1148 -msgid "Automatic Friend Page" -msgstr "" - -#: mod/settings.php:1149 -msgid "Automatically approve all connection/friend requests as friends" -msgstr "" - -#: mod/settings.php:1152 -msgid "Private Forum [Experimental]" -msgstr "" - -#: mod/settings.php:1153 -msgid "Private forum - approved members only" -msgstr "" - -#: mod/settings.php:1164 -msgid "OpenID:" -msgstr "" - -#: mod/settings.php:1164 -msgid "(Optional) Allow this OpenID to login to this account." -msgstr "" - -#: mod/settings.php:1172 -msgid "Publish your default profile in your local site directory?" -msgstr "" - -#: mod/settings.php:1172 -msgid "Your profile may be visible in public." -msgstr "" - -#: mod/settings.php:1178 -msgid "Publish your default profile in the global social directory?" -msgstr "" - -#: mod/settings.php:1185 -msgid "Hide your contact/friend list from viewers of your default profile?" -msgstr "" - -#: mod/settings.php:1189 -msgid "" -"If enabled, posting public messages to Diaspora and other networks isn't " -"possible." -msgstr "" - -#: mod/settings.php:1194 -msgid "Allow friends to post to your profile page?" -msgstr "" - -#: mod/settings.php:1199 -msgid "Allow friends to tag your posts?" -msgstr "" - -#: mod/settings.php:1204 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: mod/settings.php:1209 -msgid "Permit unknown people to send you private mail?" -msgstr "" - -#: mod/settings.php:1217 -msgid "Profile is <strong>not published</strong>." -msgstr "" - -#: mod/settings.php:1225 -#, php-format -msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." -msgstr "" - -#: mod/settings.php:1232 -msgid "Automatically expire posts after this many days:" -msgstr "" - -#: mod/settings.php:1232 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "" - -#: mod/settings.php:1233 -msgid "Advanced expiration settings" -msgstr "" - -#: mod/settings.php:1234 -msgid "Advanced Expiration" -msgstr "" - -#: mod/settings.php:1235 -msgid "Expire posts:" -msgstr "" - -#: mod/settings.php:1236 -msgid "Expire personal notes:" -msgstr "" - -#: mod/settings.php:1237 -msgid "Expire starred posts:" -msgstr "" - -#: mod/settings.php:1238 -msgid "Expire photos:" -msgstr "" - -#: mod/settings.php:1239 -msgid "Only expire posts by others:" -msgstr "" - -#: mod/settings.php:1270 -msgid "Account Settings" -msgstr "" - -#: mod/settings.php:1278 -msgid "Password Settings" -msgstr "" - -#: mod/settings.php:1280 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: mod/settings.php:1281 -msgid "Current Password:" -msgstr "" - -#: mod/settings.php:1281 mod/settings.php:1282 -msgid "Your current password to confirm the changes" -msgstr "" - -#: mod/settings.php:1282 -msgid "Password:" -msgstr "" - -#: mod/settings.php:1286 -msgid "Basic Settings" -msgstr "" - -#: mod/settings.php:1288 -msgid "Email Address:" -msgstr "" - -#: mod/settings.php:1289 -msgid "Your Timezone:" -msgstr "" - -#: mod/settings.php:1290 -msgid "Your Language:" -msgstr "" - -#: mod/settings.php:1290 -msgid "" -"Set the language we use to show you friendica interface and to send you " -"emails" -msgstr "" - -#: mod/settings.php:1291 -msgid "Default Post Location:" -msgstr "" - -#: mod/settings.php:1292 -msgid "Use Browser Location:" -msgstr "" - -#: mod/settings.php:1295 -msgid "Security and Privacy Settings" -msgstr "" - -#: mod/settings.php:1297 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: mod/settings.php:1297 mod/settings.php:1327 -msgid "(to prevent spam abuse)" -msgstr "" - -#: mod/settings.php:1298 -msgid "Default Post Permissions" -msgstr "" - -#: mod/settings.php:1299 -msgid "(click to open/close)" -msgstr "" - -#: mod/settings.php:1310 -msgid "Default Private Post" -msgstr "" - -#: mod/settings.php:1311 -msgid "Default Public Post" -msgstr "" - -#: mod/settings.php:1315 -msgid "Default Permissions for New Posts" -msgstr "" - -#: mod/settings.php:1327 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: mod/settings.php:1330 -msgid "Notification Settings" -msgstr "" - -#: mod/settings.php:1331 -msgid "By default post a status message when:" -msgstr "" - -#: mod/settings.php:1332 -msgid "accepting a friend request" -msgstr "" - -#: mod/settings.php:1333 -msgid "joining a forum/community" -msgstr "" - -#: mod/settings.php:1334 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: mod/settings.php:1335 -msgid "Send a notification email when:" -msgstr "" - -#: mod/settings.php:1336 -msgid "You receive an introduction" -msgstr "" - -#: mod/settings.php:1337 -msgid "Your introductions are confirmed" -msgstr "" - -#: mod/settings.php:1338 -msgid "Someone writes on your profile wall" -msgstr "" - -#: mod/settings.php:1339 -msgid "Someone writes a followup comment" -msgstr "" - -#: mod/settings.php:1340 -msgid "You receive a private message" -msgstr "" - -#: mod/settings.php:1341 -msgid "You receive a friend suggestion" -msgstr "" - -#: mod/settings.php:1342 -msgid "You are tagged in a post" -msgstr "" - -#: mod/settings.php:1343 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: mod/settings.php:1345 -msgid "Activate desktop notifications" -msgstr "" - -#: mod/settings.php:1345 -msgid "Show desktop popup on new notifications" -msgstr "" - -#: mod/settings.php:1347 -msgid "Text-only notification emails" -msgstr "" - -#: mod/settings.php:1349 -msgid "Send text only notification emails, without the html part" -msgstr "" - -#: mod/settings.php:1351 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: mod/settings.php:1352 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: mod/settings.php:1355 -msgid "Relocate" -msgstr "" - -#: mod/settings.php:1356 -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:1357 -msgid "Resend relocate message to contacts" -msgstr "" - #: object/Item.php:356 msgid "via" msgstr "" @@ -8870,7 +8867,7 @@ msgstr "" msgid "Community Pages" msgstr "" -#: view/theme/vier/config.php:118 view/theme/vier/theme.php:151 +#: view/theme/vier/config.php:118 view/theme/vier/theme.php:143 msgid "Community Profiles" msgstr "" @@ -8878,23 +8875,23 @@ msgstr "" msgid "Help or @NewHere ?" msgstr "" -#: view/theme/vier/config.php:120 view/theme/vier/theme.php:392 +#: view/theme/vier/config.php:120 view/theme/vier/theme.php:384 msgid "Connect Services" msgstr "" -#: view/theme/vier/config.php:121 view/theme/vier/theme.php:199 +#: view/theme/vier/config.php:121 view/theme/vier/theme.php:191 msgid "Find Friends" msgstr "" -#: view/theme/vier/config.php:122 view/theme/vier/theme.php:181 +#: view/theme/vier/config.php:122 view/theme/vier/theme.php:173 msgid "Last users" msgstr "" -#: view/theme/vier/theme.php:200 +#: view/theme/vier/theme.php:192 msgid "Local Directory" msgstr "" -#: view/theme/vier/theme.php:292 +#: view/theme/vier/theme.php:284 msgid "Quick Start" msgstr "" @@ -8910,43 +8907,43 @@ msgstr "" msgid "toggle mobile" msgstr "" -#: boot.php:726 +#: boot.php:733 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: boot.php:838 +#: boot.php:845 msgid "Create a New Account" msgstr "" -#: boot.php:866 +#: boot.php:873 msgid "Password: " msgstr "" -#: boot.php:867 +#: boot.php:874 msgid "Remember me" msgstr "" -#: boot.php:870 +#: boot.php:877 msgid "Or login using OpenID: " msgstr "" -#: boot.php:876 +#: boot.php:883 msgid "Forgot your password?" msgstr "" -#: boot.php:879 +#: boot.php:886 msgid "Website Terms of Service" msgstr "" -#: boot.php:880 +#: boot.php:887 msgid "terms of service" msgstr "" -#: boot.php:882 +#: boot.php:889 msgid "Website Privacy Policy" msgstr "" -#: boot.php:883 +#: boot.php:890 msgid "privacy policy" msgstr "" From c8f87e1c28a59bf2d08221eb779af514a0997888 Mon Sep 17 00:00:00 2001 From: Andy H3 <andy@hubup.pro> Date: Fri, 9 Jun 2017 16:21:25 +0700 Subject: [PATCH 061/160] Updated settings.php --- mod/settings.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 3357de09e5..eea0401cad 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1118,39 +1118,39 @@ function settings_content(App $a) { '$type_community' => ACCOUNT_TYPE_COMMUNITY, '$account_person' => array('account-type', t('Personal Page'), ACCOUNT_TYPE_PERSON, - t('This account is a regular personal profile'), + t('Account for a personal profile.'), ($a->user['account-type'] == ACCOUNT_TYPE_PERSON)), '$account_organisation' => array('account-type', t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION, - t('This account is a profile for an organisation'), + t('Account for an organisation that automatically approves contact requests as "Followers".'), ($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)), '$account_news' => array('account-type', t('News Page'), ACCOUNT_TYPE_NEWS, - t('This account is a news account/reflector'), + t('Account for a news reflector that automatically approves contact requests as "Followers".'), ($a->user['account-type'] == ACCOUNT_TYPE_NEWS)), '$account_community' => array('account-type', t('Community Forum'), ACCOUNT_TYPE_COMMUNITY, - t('This account is a community forum where people can discuss with each other'), + t('Account for community discussions.'), ($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)), '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, - t('This account is a normal personal profile'), + t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'), ($a->user['page-flags'] == PAGE_NORMAL)), '$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX, - t('Automatically approve all connection/friend requests as read-only fans'), + t('Account for a public profile that automatically approves contact requests as "Followers".'), ($a->user['page-flags'] == PAGE_SOAPBOX)), '$page_community' => array('page-flags', t('Public Forum'), PAGE_COMMUNITY, - t('Automatically approve all contact requests'), + t('Automatically approves all contact requests.'), ($a->user['page-flags'] == PAGE_COMMUNITY)), '$page_freelove' => array('page-flags', t('Automatic Friend Page'), PAGE_FREELOVE, - t('Automatically approve all connection/friend requests as friends'), + t('Account for a popular profile that automatically approves contact requests as "Friends".'), ($a->user['page-flags'] == PAGE_FREELOVE)), '$page_prvgroup' => array('page-flags', t('Private Forum [Experimental]'), PAGE_PRVGROUP, - t('Private forum - approved members only'), + t('Requires manual approval of contact requests.'), ($a->user['page-flags'] == PAGE_PRVGROUP)), From ccbb50b5895d749cb6b4e44f0fb3e592a4fd3d8a Mon Sep 17 00:00:00 2001 From: Andy H3 <andy@hubup.pro> Date: Fri, 9 Jun 2017 16:44:42 +0700 Subject: [PATCH 062/160] Regenerated master messages.po file --- util/messages.po | 1516 +++++++++++++++++++++++----------------------- 1 file changed, 760 insertions(+), 756 deletions(-) diff --git a/util/messages.po b/util/messages.po index 69d2eca9e0..ba987ec953 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-06-08 22:07+0700\n" +"POT-Creation-Date: 2017-06-09 16:42+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -668,7 +668,7 @@ msgstr "" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 #: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 -#: mod/settings.php:745 mod/admin.php:1514 object/Item.php:138 +#: mod/admin.php:1514 mod/settings.php:745 object/Item.php:138 msgid "Delete" msgstr "" @@ -2216,8 +2216,8 @@ msgstr "" msgid "Delegate Page Management" msgstr "" -#: include/nav.php:188 mod/newmember.php:15 mod/settings.php:113 -#: mod/admin.php:1624 mod/admin.php:1900 view/theme/frio/theme.php:258 +#: include/nav.php:188 mod/newmember.php:15 mod/admin.php:1624 +#: mod/admin.php:1900 mod/settings.php:113 view/theme/frio/theme.php:258 msgid "Settings" msgstr "" @@ -3513,8 +3513,8 @@ msgid "" "entries from this contact." msgstr "" -#: mod/crepair.php:170 mod/settings.php:684 mod/settings.php:710 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1538 +#: mod/crepair.php:170 mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 +#: mod/admin.php:1538 mod/settings.php:684 mod/settings.php:710 msgid "Name" msgstr "" @@ -6610,756 +6610,6 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: mod/settings.php:45 mod/admin.php:1496 -msgid "Account" -msgstr "" - -#: mod/settings.php:54 mod/admin.php:170 -msgid "Additional features" -msgstr "" - -#: mod/settings.php:62 -msgid "Display" -msgstr "" - -#: mod/settings.php:69 mod/settings.php:891 -msgid "Social Networks" -msgstr "" - -#: mod/settings.php:76 mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 -msgid "Plugins" -msgstr "" - -#: mod/settings.php:90 -msgid "Connected apps" -msgstr "" - -#: mod/settings.php:104 -msgid "Remove account" -msgstr "" - -#: mod/settings.php:159 -msgid "Missing some important data!" -msgstr "" - -#: mod/settings.php:273 -msgid "Failed to connect with email account using the settings provided." -msgstr "" - -#: mod/settings.php:278 -msgid "Email settings updated." -msgstr "" - -#: mod/settings.php:293 -msgid "Features updated" -msgstr "" - -#: mod/settings.php:363 -msgid "Relocate message has been send to your contacts" -msgstr "" - -#: mod/settings.php:382 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: mod/settings.php:390 -msgid "Wrong password." -msgstr "" - -#: mod/settings.php:401 -msgid "Password changed." -msgstr "" - -#: mod/settings.php:403 -msgid "Password update failed. Please try again." -msgstr "" - -#: mod/settings.php:483 -msgid " Please use a shorter name." -msgstr "" - -#: mod/settings.php:485 -msgid " Name too short." -msgstr "" - -#: mod/settings.php:494 -msgid "Wrong Password" -msgstr "" - -#: mod/settings.php:499 -msgid " Not valid email." -msgstr "" - -#: mod/settings.php:505 -msgid " Cannot change to that email." -msgstr "" - -#: mod/settings.php:561 -msgid "Private forum has no privacy permissions. Using default privacy group." -msgstr "" - -#: mod/settings.php:565 -msgid "Private forum has no privacy permissions and no default privacy group." -msgstr "" - -#: mod/settings.php:605 -msgid "Settings updated." -msgstr "" - -#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 -msgid "Add application" -msgstr "" - -#: mod/settings.php:682 mod/settings.php:793 mod/settings.php:842 -#: mod/settings.php:909 mod/settings.php:1006 mod/settings.php:1272 -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 -msgid "Save Settings" -msgstr "" - -#: mod/settings.php:685 mod/settings.php:711 -msgid "Consumer Key" -msgstr "" - -#: mod/settings.php:686 mod/settings.php:712 -msgid "Consumer Secret" -msgstr "" - -#: mod/settings.php:687 mod/settings.php:713 -msgid "Redirect" -msgstr "" - -#: mod/settings.php:688 mod/settings.php:714 -msgid "Icon url" -msgstr "" - -#: mod/settings.php:699 -msgid "You can't edit this application." -msgstr "" - -#: mod/settings.php:742 -msgid "Connected Apps" -msgstr "" - -#: mod/settings.php:746 -msgid "Client key starts with" -msgstr "" - -#: mod/settings.php:747 -msgid "No name" -msgstr "" - -#: mod/settings.php:748 -msgid "Remove authorization" -msgstr "" - -#: mod/settings.php:760 -msgid "No Plugin settings configured" -msgstr "" - -#: mod/settings.php:769 -msgid "Plugin Settings" -msgstr "" - -#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 -msgid "Off" -msgstr "" - -#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 -msgid "On" -msgstr "" - -#: mod/settings.php:791 -msgid "Additional Features" -msgstr "" - -#: mod/settings.php:801 mod/settings.php:805 -msgid "General Social Media Settings" -msgstr "" - -#: mod/settings.php:811 -msgid "Disable intelligent shortening" -msgstr "" - -#: mod/settings.php:813 -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:819 -msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" -msgstr "" - -#: mod/settings.php:821 -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:827 -msgid "Default group for OStatus contacts" -msgstr "" - -#: mod/settings.php:835 -msgid "Your legacy GNU Social account" -msgstr "" - -#: mod/settings.php:837 -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:840 -msgid "Repair OStatus subscriptions" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -#, php-format -msgid "Built-in support for %s connectivity is %s" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "enabled" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "disabled" -msgstr "" - -#: mod/settings.php:850 -msgid "GNU Social (OStatus)" -msgstr "" - -#: mod/settings.php:884 -msgid "Email access is disabled on this site." -msgstr "" - -#: mod/settings.php:896 -msgid "Email/Mailbox Setup" -msgstr "" - -#: mod/settings.php:897 -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:898 -msgid "Last successful email check:" -msgstr "" - -#: mod/settings.php:900 -msgid "IMAP server name:" -msgstr "" - -#: mod/settings.php:901 -msgid "IMAP port:" -msgstr "" - -#: mod/settings.php:902 -msgid "Security:" -msgstr "" - -#: mod/settings.php:902 mod/settings.php:907 -msgid "None" -msgstr "" - -#: mod/settings.php:903 -msgid "Email login name:" -msgstr "" - -#: mod/settings.php:904 -msgid "Email password:" -msgstr "" - -#: mod/settings.php:905 -msgid "Reply-to address:" -msgstr "" - -#: mod/settings.php:906 -msgid "Send public posts to all email contacts:" -msgstr "" - -#: mod/settings.php:907 -msgid "Action after import:" -msgstr "" - -#: mod/settings.php:907 -msgid "Move to folder" -msgstr "" - -#: mod/settings.php:908 -msgid "Move to folder:" -msgstr "" - -#: mod/settings.php:944 mod/admin.php:948 -msgid "No special theme for mobile devices" -msgstr "" - -#: mod/settings.php:1004 -msgid "Display Settings" -msgstr "" - -#: mod/settings.php:1010 mod/settings.php:1033 -msgid "Display Theme:" -msgstr "" - -#: mod/settings.php:1011 -msgid "Mobile Theme:" -msgstr "" - -#: mod/settings.php:1012 -msgid "Suppress warning of insecure networks" -msgstr "" - -#: mod/settings.php:1012 -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:1013 -msgid "Update browser every xx seconds" -msgstr "" - -#: mod/settings.php:1013 -msgid "Minimum of 10 seconds. Enter -1 to disable it." -msgstr "" - -#: mod/settings.php:1014 -msgid "Number of items to display per page:" -msgstr "" - -#: mod/settings.php:1014 mod/settings.php:1015 -msgid "Maximum of 100 items" -msgstr "" - -#: mod/settings.php:1015 -msgid "Number of items to display per page when viewed from mobile device:" -msgstr "" - -#: mod/settings.php:1016 -msgid "Don't show emoticons" -msgstr "" - -#: mod/settings.php:1017 -msgid "Calendar" -msgstr "" - -#: mod/settings.php:1018 -msgid "Beginning of week:" -msgstr "" - -#: mod/settings.php:1019 -msgid "Don't show notices" -msgstr "" - -#: mod/settings.php:1020 -msgid "Infinite scroll" -msgstr "" - -#: mod/settings.php:1021 -msgid "Automatic updates only at the top of the network page" -msgstr "" - -#: mod/settings.php:1022 -msgid "Bandwith Saver Mode" -msgstr "" - -#: mod/settings.php:1022 -msgid "" -"When enabled, embedded content is not displayed on automatic updates, they " -"only show on page reload." -msgstr "" - -#: mod/settings.php:1024 -msgid "General Theme Settings" -msgstr "" - -#: mod/settings.php:1025 -msgid "Custom Theme Settings" -msgstr "" - -#: mod/settings.php:1026 -msgid "Content Settings" -msgstr "" - -#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 -#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 -#: view/theme/vier/config.php:115 -msgid "Theme settings" -msgstr "" - -#: mod/settings.php:1111 -msgid "Account Types" -msgstr "" - -#: mod/settings.php:1112 -msgid "Personal Page Subtypes" -msgstr "" - -#: mod/settings.php:1113 -msgid "Community Forum Subtypes" -msgstr "" - -#: mod/settings.php:1120 -msgid "Personal Page" -msgstr "" - -#: mod/settings.php:1121 -msgid "Account for a personal profile." -msgstr "" - -#: mod/settings.php:1124 -msgid "Organisation Page" -msgstr "" - -#: mod/settings.php:1125 -msgid "" -"Account for an organisation that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:1128 -msgid "News Page" -msgstr "" - -#: mod/settings.php:1129 -msgid "" -"Account for a news reflector that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:1132 -msgid "Community Forum" -msgstr "" - -#: mod/settings.php:1133 -msgid "Account for community discussions." -msgstr "" - -#: mod/settings.php:1136 -msgid "Normal Account Page" -msgstr "" - -#: mod/settings.php:1137 -msgid "" -"Account for a regular personal profile that requires manual approval of " -"\"Friends\" and \"Followers\"." -msgstr "" - -#: mod/settings.php:1140 -msgid "Soapbox Page" -msgstr "" - -#: mod/settings.php:1141 -msgid "" -"Account for a public profile that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:1144 -msgid "Public Forum" -msgstr "" - -#: mod/settings.php:1145 -msgid "Automatically approves all contact requests." -msgstr "" - -#: mod/settings.php:1148 -msgid "Automatic Friend Page" -msgstr "" - -#: mod/settings.php:1149 -msgid "" -"Account for a popular profile that automatically approves contact requests " -"as \"Friends\"." -msgstr "" - -#: mod/settings.php:1152 -msgid "Private Forum [Experimental]" -msgstr "" - -#: mod/settings.php:1153 -msgid "Requires manual approval of contact requests." -msgstr "" - -#: mod/settings.php:1164 -msgid "OpenID:" -msgstr "" - -#: mod/settings.php:1164 -msgid "(Optional) Allow this OpenID to login to this account." -msgstr "" - -#: mod/settings.php:1172 -msgid "Publish your default profile in your local site directory?" -msgstr "" - -#: mod/settings.php:1172 -msgid "Your profile may be visible in public." -msgstr "" - -#: mod/settings.php:1178 -msgid "Publish your default profile in the global social directory?" -msgstr "" - -#: mod/settings.php:1185 -msgid "Hide your contact/friend list from viewers of your default profile?" -msgstr "" - -#: mod/settings.php:1189 -msgid "" -"If enabled, posting public messages to Diaspora and other networks isn't " -"possible." -msgstr "" - -#: mod/settings.php:1194 -msgid "Allow friends to post to your profile page?" -msgstr "" - -#: mod/settings.php:1199 -msgid "Allow friends to tag your posts?" -msgstr "" - -#: mod/settings.php:1204 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: mod/settings.php:1209 -msgid "Permit unknown people to send you private mail?" -msgstr "" - -#: mod/settings.php:1217 -msgid "Profile is <strong>not published</strong>." -msgstr "" - -#: mod/settings.php:1225 -#, php-format -msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." -msgstr "" - -#: mod/settings.php:1232 -msgid "Automatically expire posts after this many days:" -msgstr "" - -#: mod/settings.php:1232 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "" - -#: mod/settings.php:1233 -msgid "Advanced expiration settings" -msgstr "" - -#: mod/settings.php:1234 -msgid "Advanced Expiration" -msgstr "" - -#: mod/settings.php:1235 -msgid "Expire posts:" -msgstr "" - -#: mod/settings.php:1236 -msgid "Expire personal notes:" -msgstr "" - -#: mod/settings.php:1237 -msgid "Expire starred posts:" -msgstr "" - -#: mod/settings.php:1238 -msgid "Expire photos:" -msgstr "" - -#: mod/settings.php:1239 -msgid "Only expire posts by others:" -msgstr "" - -#: mod/settings.php:1270 -msgid "Account Settings" -msgstr "" - -#: mod/settings.php:1278 -msgid "Password Settings" -msgstr "" - -#: mod/settings.php:1281 -msgid "Current Password:" -msgstr "" - -#: mod/settings.php:1281 mod/settings.php:1282 -msgid "Your current password to confirm the changes" -msgstr "" - -#: mod/settings.php:1282 -msgid "Password:" -msgstr "" - -#: mod/settings.php:1286 -msgid "Basic Settings" -msgstr "" - -#: mod/settings.php:1288 -msgid "Email Address:" -msgstr "" - -#: mod/settings.php:1289 -msgid "Your Timezone:" -msgstr "" - -#: mod/settings.php:1290 -msgid "Your Language:" -msgstr "" - -#: mod/settings.php:1290 -msgid "" -"Set the language we use to show you friendica interface and to send you " -"emails" -msgstr "" - -#: mod/settings.php:1291 -msgid "Default Post Location:" -msgstr "" - -#: mod/settings.php:1292 -msgid "Use Browser Location:" -msgstr "" - -#: mod/settings.php:1295 -msgid "Security and Privacy Settings" -msgstr "" - -#: mod/settings.php:1297 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: mod/settings.php:1297 mod/settings.php:1327 -msgid "(to prevent spam abuse)" -msgstr "" - -#: mod/settings.php:1298 -msgid "Default Post Permissions" -msgstr "" - -#: mod/settings.php:1299 -msgid "(click to open/close)" -msgstr "" - -#: mod/settings.php:1310 -msgid "Default Private Post" -msgstr "" - -#: mod/settings.php:1311 -msgid "Default Public Post" -msgstr "" - -#: mod/settings.php:1315 -msgid "Default Permissions for New Posts" -msgstr "" - -#: mod/settings.php:1327 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: mod/settings.php:1330 -msgid "Notification Settings" -msgstr "" - -#: mod/settings.php:1331 -msgid "By default post a status message when:" -msgstr "" - -#: mod/settings.php:1332 -msgid "accepting a friend request" -msgstr "" - -#: mod/settings.php:1333 -msgid "joining a forum/community" -msgstr "" - -#: mod/settings.php:1334 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: mod/settings.php:1335 -msgid "Send a notification email when:" -msgstr "" - -#: mod/settings.php:1336 -msgid "You receive an introduction" -msgstr "" - -#: mod/settings.php:1337 -msgid "Your introductions are confirmed" -msgstr "" - -#: mod/settings.php:1338 -msgid "Someone writes on your profile wall" -msgstr "" - -#: mod/settings.php:1339 -msgid "Someone writes a followup comment" -msgstr "" - -#: mod/settings.php:1340 -msgid "You receive a private message" -msgstr "" - -#: mod/settings.php:1341 -msgid "You receive a friend suggestion" -msgstr "" - -#: mod/settings.php:1342 -msgid "You are tagged in a post" -msgstr "" - -#: mod/settings.php:1343 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: mod/settings.php:1345 -msgid "Activate desktop notifications" -msgstr "" - -#: mod/settings.php:1345 -msgid "Show desktop popup on new notifications" -msgstr "" - -#: mod/settings.php:1347 -msgid "Text-only notification emails" -msgstr "" - -#: mod/settings.php:1349 -msgid "Send text only notification emails, without the html part" -msgstr "" - -#: mod/settings.php:1351 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: mod/settings.php:1352 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: mod/settings.php:1355 -msgid "Relocate" -msgstr "" - -#: mod/settings.php:1356 -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:1357 -msgid "Resend relocate message to contacts" -msgstr "" - #: mod/admin.php:97 msgid "Theme settings updated." msgstr "" @@ -7372,10 +6622,18 @@ msgstr "" msgid "Users" msgstr "" +#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76 +msgid "Plugins" +msgstr "" + #: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 msgid "Themes" msgstr "" +#: mod/admin.php:170 mod/settings.php:54 +msgid "Additional features" +msgstr "" + #: mod/admin.php:171 msgid "DB updates" msgstr "" @@ -7624,6 +6882,10 @@ msgstr "" msgid "Site settings updated." msgstr "" +#: mod/admin.php:948 mod/settings.php:944 +msgid "No special theme for mobile devices" +msgstr "" + #: mod/admin.php:977 msgid "No community page" msgstr "" @@ -7692,6 +6954,13 @@ msgstr "" msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" +#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 +#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793 +#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006 +#: mod/settings.php:1272 +msgid "Save Settings" +msgstr "" + #: mod/admin.php:1063 msgid "File upload" msgstr "" @@ -8520,6 +7789,10 @@ msgstr "" msgid "Last item" msgstr "" +#: mod/admin.php:1496 mod/settings.php:45 +msgid "Account" +msgstr "" + #: mod/admin.php:1505 msgid "Add User" msgstr "" @@ -8710,6 +7983,14 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "" +#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 +msgid "Off" +msgstr "" + +#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 +msgid "On" +msgstr "" + #: mod/admin.php:2166 #, php-format msgid "Lock feature %s" @@ -8719,6 +8000,729 @@ msgstr "" msgid "Manage Additional Features" msgstr "" +#: mod/settings.php:62 +msgid "Display" +msgstr "" + +#: mod/settings.php:69 mod/settings.php:891 +msgid "Social Networks" +msgstr "" + +#: mod/settings.php:90 +msgid "Connected apps" +msgstr "" + +#: mod/settings.php:104 +msgid "Remove account" +msgstr "" + +#: mod/settings.php:159 +msgid "Missing some important data!" +msgstr "" + +#: mod/settings.php:273 +msgid "Failed to connect with email account using the settings provided." +msgstr "" + +#: mod/settings.php:278 +msgid "Email settings updated." +msgstr "" + +#: mod/settings.php:293 +msgid "Features updated" +msgstr "" + +#: mod/settings.php:363 +msgid "Relocate message has been send to your contacts" +msgstr "" + +#: mod/settings.php:382 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: mod/settings.php:390 +msgid "Wrong password." +msgstr "" + +#: mod/settings.php:401 +msgid "Password changed." +msgstr "" + +#: mod/settings.php:403 +msgid "Password update failed. Please try again." +msgstr "" + +#: mod/settings.php:483 +msgid " Please use a shorter name." +msgstr "" + +#: mod/settings.php:485 +msgid " Name too short." +msgstr "" + +#: mod/settings.php:494 +msgid "Wrong Password" +msgstr "" + +#: mod/settings.php:499 +msgid " Not valid email." +msgstr "" + +#: mod/settings.php:505 +msgid " Cannot change to that email." +msgstr "" + +#: mod/settings.php:561 +msgid "Private forum has no privacy permissions. Using default privacy group." +msgstr "" + +#: mod/settings.php:565 +msgid "Private forum has no privacy permissions and no default privacy group." +msgstr "" + +#: mod/settings.php:605 +msgid "Settings updated." +msgstr "" + +#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 +msgid "Add application" +msgstr "" + +#: mod/settings.php:685 mod/settings.php:711 +msgid "Consumer Key" +msgstr "" + +#: mod/settings.php:686 mod/settings.php:712 +msgid "Consumer Secret" +msgstr "" + +#: mod/settings.php:687 mod/settings.php:713 +msgid "Redirect" +msgstr "" + +#: mod/settings.php:688 mod/settings.php:714 +msgid "Icon url" +msgstr "" + +#: mod/settings.php:699 +msgid "You can't edit this application." +msgstr "" + +#: mod/settings.php:742 +msgid "Connected Apps" +msgstr "" + +#: mod/settings.php:746 +msgid "Client key starts with" +msgstr "" + +#: mod/settings.php:747 +msgid "No name" +msgstr "" + +#: mod/settings.php:748 +msgid "Remove authorization" +msgstr "" + +#: mod/settings.php:760 +msgid "No Plugin settings configured" +msgstr "" + +#: mod/settings.php:769 +msgid "Plugin Settings" +msgstr "" + +#: mod/settings.php:791 +msgid "Additional Features" +msgstr "" + +#: mod/settings.php:801 mod/settings.php:805 +msgid "General Social Media Settings" +msgstr "" + +#: mod/settings.php:811 +msgid "Disable intelligent shortening" +msgstr "" + +#: mod/settings.php:813 +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:819 +msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" +msgstr "" + +#: mod/settings.php:821 +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:827 +msgid "Default group for OStatus contacts" +msgstr "" + +#: mod/settings.php:835 +msgid "Your legacy GNU Social account" +msgstr "" + +#: mod/settings.php:837 +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:840 +msgid "Repair OStatus subscriptions" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +#, php-format +msgid "Built-in support for %s connectivity is %s" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "enabled" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "disabled" +msgstr "" + +#: mod/settings.php:850 +msgid "GNU Social (OStatus)" +msgstr "" + +#: mod/settings.php:884 +msgid "Email access is disabled on this site." +msgstr "" + +#: mod/settings.php:896 +msgid "Email/Mailbox Setup" +msgstr "" + +#: mod/settings.php:897 +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:898 +msgid "Last successful email check:" +msgstr "" + +#: mod/settings.php:900 +msgid "IMAP server name:" +msgstr "" + +#: mod/settings.php:901 +msgid "IMAP port:" +msgstr "" + +#: mod/settings.php:902 +msgid "Security:" +msgstr "" + +#: mod/settings.php:902 mod/settings.php:907 +msgid "None" +msgstr "" + +#: mod/settings.php:903 +msgid "Email login name:" +msgstr "" + +#: mod/settings.php:904 +msgid "Email password:" +msgstr "" + +#: mod/settings.php:905 +msgid "Reply-to address:" +msgstr "" + +#: mod/settings.php:906 +msgid "Send public posts to all email contacts:" +msgstr "" + +#: mod/settings.php:907 +msgid "Action after import:" +msgstr "" + +#: mod/settings.php:907 +msgid "Move to folder" +msgstr "" + +#: mod/settings.php:908 +msgid "Move to folder:" +msgstr "" + +#: mod/settings.php:1004 +msgid "Display Settings" +msgstr "" + +#: mod/settings.php:1010 mod/settings.php:1033 +msgid "Display Theme:" +msgstr "" + +#: mod/settings.php:1011 +msgid "Mobile Theme:" +msgstr "" + +#: mod/settings.php:1012 +msgid "Suppress warning of insecure networks" +msgstr "" + +#: mod/settings.php:1012 +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:1013 +msgid "Update browser every xx seconds" +msgstr "" + +#: mod/settings.php:1013 +msgid "Minimum of 10 seconds. Enter -1 to disable it." +msgstr "" + +#: mod/settings.php:1014 +msgid "Number of items to display per page:" +msgstr "" + +#: mod/settings.php:1014 mod/settings.php:1015 +msgid "Maximum of 100 items" +msgstr "" + +#: mod/settings.php:1015 +msgid "Number of items to display per page when viewed from mobile device:" +msgstr "" + +#: mod/settings.php:1016 +msgid "Don't show emoticons" +msgstr "" + +#: mod/settings.php:1017 +msgid "Calendar" +msgstr "" + +#: mod/settings.php:1018 +msgid "Beginning of week:" +msgstr "" + +#: mod/settings.php:1019 +msgid "Don't show notices" +msgstr "" + +#: mod/settings.php:1020 +msgid "Infinite scroll" +msgstr "" + +#: mod/settings.php:1021 +msgid "Automatic updates only at the top of the network page" +msgstr "" + +#: mod/settings.php:1022 +msgid "Bandwith Saver Mode" +msgstr "" + +#: mod/settings.php:1022 +msgid "" +"When enabled, embedded content is not displayed on automatic updates, they " +"only show on page reload." +msgstr "" + +#: mod/settings.php:1024 +msgid "General Theme Settings" +msgstr "" + +#: mod/settings.php:1025 +msgid "Custom Theme Settings" +msgstr "" + +#: mod/settings.php:1026 +msgid "Content Settings" +msgstr "" + +#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 +#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 +#: view/theme/vier/config.php:115 +msgid "Theme settings" +msgstr "" + +#: mod/settings.php:1111 +msgid "Account Types" +msgstr "" + +#: mod/settings.php:1112 +msgid "Personal Page Subtypes" +msgstr "" + +#: mod/settings.php:1113 +msgid "Community Forum Subtypes" +msgstr "" + +#: mod/settings.php:1120 +msgid "Personal Page" +msgstr "" + +#: mod/settings.php:1121 +msgid "Account for a personal profile." +msgstr "" + +#: mod/settings.php:1124 +msgid "Organisation Page" +msgstr "" + +#: mod/settings.php:1125 +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1128 +msgid "News Page" +msgstr "" + +#: mod/settings.php:1129 +msgid "" +"Account for a news reflector that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1132 +msgid "Community Forum" +msgstr "" + +#: mod/settings.php:1133 +msgid "Account for community discussions." +msgstr "" + +#: mod/settings.php:1136 +msgid "Normal Account Page" +msgstr "" + +#: mod/settings.php:1137 +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "" + +#: mod/settings.php:1140 +msgid "Soapbox Page" +msgstr "" + +#: mod/settings.php:1141 +msgid "" +"Account for a public profile that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1144 +msgid "Public Forum" +msgstr "" + +#: mod/settings.php:1145 +msgid "Automatically approves all contact requests." +msgstr "" + +#: mod/settings.php:1148 +msgid "Automatic Friend Page" +msgstr "" + +#: mod/settings.php:1149 +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "" + +#: mod/settings.php:1152 +msgid "Private Forum [Experimental]" +msgstr "" + +#: mod/settings.php:1153 +msgid "Requires manual approval of contact requests." +msgstr "" + +#: mod/settings.php:1164 +msgid "OpenID:" +msgstr "" + +#: mod/settings.php:1164 +msgid "(Optional) Allow this OpenID to login to this account." +msgstr "" + +#: mod/settings.php:1172 +msgid "Publish your default profile in your local site directory?" +msgstr "" + +#: mod/settings.php:1172 +msgid "Your profile may be visible in public." +msgstr "" + +#: mod/settings.php:1178 +msgid "Publish your default profile in the global social directory?" +msgstr "" + +#: mod/settings.php:1185 +msgid "Hide your contact/friend list from viewers of your default profile?" +msgstr "" + +#: mod/settings.php:1189 +msgid "" +"If enabled, posting public messages to Diaspora and other networks isn't " +"possible." +msgstr "" + +#: mod/settings.php:1194 +msgid "Allow friends to post to your profile page?" +msgstr "" + +#: mod/settings.php:1199 +msgid "Allow friends to tag your posts?" +msgstr "" + +#: mod/settings.php:1204 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: mod/settings.php:1209 +msgid "Permit unknown people to send you private mail?" +msgstr "" + +#: mod/settings.php:1217 +msgid "Profile is <strong>not published</strong>." +msgstr "" + +#: mod/settings.php:1225 +#, php-format +msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." +msgstr "" + +#: mod/settings.php:1232 +msgid "Automatically expire posts after this many days:" +msgstr "" + +#: mod/settings.php:1232 +msgid "If empty, posts will not expire. Expired posts will be deleted" +msgstr "" + +#: mod/settings.php:1233 +msgid "Advanced expiration settings" +msgstr "" + +#: mod/settings.php:1234 +msgid "Advanced Expiration" +msgstr "" + +#: mod/settings.php:1235 +msgid "Expire posts:" +msgstr "" + +#: mod/settings.php:1236 +msgid "Expire personal notes:" +msgstr "" + +#: mod/settings.php:1237 +msgid "Expire starred posts:" +msgstr "" + +#: mod/settings.php:1238 +msgid "Expire photos:" +msgstr "" + +#: mod/settings.php:1239 +msgid "Only expire posts by others:" +msgstr "" + +#: mod/settings.php:1270 +msgid "Account Settings" +msgstr "" + +#: mod/settings.php:1278 +msgid "Password Settings" +msgstr "" + +#: mod/settings.php:1280 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: mod/settings.php:1281 +msgid "Current Password:" +msgstr "" + +#: mod/settings.php:1281 mod/settings.php:1282 +msgid "Your current password to confirm the changes" +msgstr "" + +#: mod/settings.php:1282 +msgid "Password:" +msgstr "" + +#: mod/settings.php:1286 +msgid "Basic Settings" +msgstr "" + +#: mod/settings.php:1288 +msgid "Email Address:" +msgstr "" + +#: mod/settings.php:1289 +msgid "Your Timezone:" +msgstr "" + +#: mod/settings.php:1290 +msgid "Your Language:" +msgstr "" + +#: mod/settings.php:1290 +msgid "" +"Set the language we use to show you friendica interface and to send you " +"emails" +msgstr "" + +#: mod/settings.php:1291 +msgid "Default Post Location:" +msgstr "" + +#: mod/settings.php:1292 +msgid "Use Browser Location:" +msgstr "" + +#: mod/settings.php:1295 +msgid "Security and Privacy Settings" +msgstr "" + +#: mod/settings.php:1297 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: mod/settings.php:1297 mod/settings.php:1327 +msgid "(to prevent spam abuse)" +msgstr "" + +#: mod/settings.php:1298 +msgid "Default Post Permissions" +msgstr "" + +#: mod/settings.php:1299 +msgid "(click to open/close)" +msgstr "" + +#: mod/settings.php:1310 +msgid "Default Private Post" +msgstr "" + +#: mod/settings.php:1311 +msgid "Default Public Post" +msgstr "" + +#: mod/settings.php:1315 +msgid "Default Permissions for New Posts" +msgstr "" + +#: mod/settings.php:1327 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: mod/settings.php:1330 +msgid "Notification Settings" +msgstr "" + +#: mod/settings.php:1331 +msgid "By default post a status message when:" +msgstr "" + +#: mod/settings.php:1332 +msgid "accepting a friend request" +msgstr "" + +#: mod/settings.php:1333 +msgid "joining a forum/community" +msgstr "" + +#: mod/settings.php:1334 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: mod/settings.php:1335 +msgid "Send a notification email when:" +msgstr "" + +#: mod/settings.php:1336 +msgid "You receive an introduction" +msgstr "" + +#: mod/settings.php:1337 +msgid "Your introductions are confirmed" +msgstr "" + +#: mod/settings.php:1338 +msgid "Someone writes on your profile wall" +msgstr "" + +#: mod/settings.php:1339 +msgid "Someone writes a followup comment" +msgstr "" + +#: mod/settings.php:1340 +msgid "You receive a private message" +msgstr "" + +#: mod/settings.php:1341 +msgid "You receive a friend suggestion" +msgstr "" + +#: mod/settings.php:1342 +msgid "You are tagged in a post" +msgstr "" + +#: mod/settings.php:1343 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: mod/settings.php:1345 +msgid "Activate desktop notifications" +msgstr "" + +#: mod/settings.php:1345 +msgid "Show desktop popup on new notifications" +msgstr "" + +#: mod/settings.php:1347 +msgid "Text-only notification emails" +msgstr "" + +#: mod/settings.php:1349 +msgid "Send text only notification emails, without the html part" +msgstr "" + +#: mod/settings.php:1351 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: mod/settings.php:1352 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: mod/settings.php:1355 +msgid "Relocate" +msgstr "" + +#: mod/settings.php:1356 +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:1357 +msgid "Resend relocate message to contacts" +msgstr "" + #: object/Item.php:356 msgid "via" msgstr "" From 4f70682f7ad272543c08d0d46b8554590caa1a30 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 11 Jun 2017 07:41:38 +0000 Subject: [PATCH 063/160] Inherit the creation date --- boot.php | 6 +++++- include/notifier.php | 13 +++++++++---- include/pubsubpublish.php | 13 ++++++++++++- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index 15341c0fed..2ad057d4ca 100644 --- a/boot.php +++ b/boot.php @@ -1069,6 +1069,7 @@ function proc_run($cmd) { $priority = PRIORITY_MEDIUM; $dont_fork = get_config("system", "worker_dont_fork"); + $created = datetime_convert(); if (is_int($run_parameter)) { $priority = $run_parameter; @@ -1076,6 +1077,9 @@ function proc_run($cmd) { if (isset($run_parameter['priority'])) { $priority = $run_parameter['priority']; } + if (isset($run_parameter['created'])) { + $created = $run_parameter['created']; + } if (isset($run_parameter['dont_fork'])) { $dont_fork = $run_parameter['dont_fork']; } @@ -1088,7 +1092,7 @@ function proc_run($cmd) { $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters), array('limit' => 1)); if (!dbm::is_result($found)) { - dba::insert('workerqueue', array('parameter' => $parameters, 'created' => datetime_convert(), 'priority' => $priority)); + dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority)); } // Should we quit and wait for the poller to be called as a cronjob? diff --git a/include/notifier.php b/include/notifier.php index a08057f677..a5f378a55c 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -56,13 +56,15 @@ function notifier_run(&$argv, &$argc){ } // Inherit the priority - $queue = dba::select('workerqueue', array('priority'), array('pid' => getmypid()), array('limit' => 1)); + $queue = dba::select('workerqueue', array('priority', 'created'), array('pid' => getmypid()), array('limit' => 1)); if (dbm::is_result($queue)) { $priority = (int)$queue['priority']; + $process_created = $queue['created']; logger('inherited priority: '.$priority); } else { // Normally this shouldn't happen. $priority = PRIORITY_HIGH; + $process_created = datetime_convert(); logger('no inherited priority! Something is wrong.'); } @@ -498,7 +500,8 @@ function notifier_run(&$argv, &$argc){ } logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG); - proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/delivery.php', $cmd, $item_id, $contact['id']); + proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true), + 'include/delivery.php', $cmd, $item_id, $contact['id']); } } @@ -563,7 +566,8 @@ function notifier_run(&$argv, &$argc){ if ((! $mail) && (! $fsuggest) && (! $followup)) { logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]); - proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/delivery.php', $cmd, $item_id, $rr['id']); + proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true), + 'include/delivery.php', $cmd, $item_id, $rr['id']); } } } @@ -603,7 +607,8 @@ function notifier_run(&$argv, &$argc){ } // Handling the pubsubhubbub requests - proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php'); + proc_run(array('priority' => PRIORITY_HIGH, 'created' => $process_created, 'dont_fork' => true), + 'include/pubsubpublish.php'); } logger('notifier: calling hooks', LOGGER_DEBUG); diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 1112969f27..7c70059f90 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -11,13 +11,24 @@ function pubsubpublish_run(&$argv, &$argc){ if ($argc > 1) { $pubsubpublish_id = intval($argv[1]); } else { + // Inherit the creation time + $queue = dba::select('workerqueue', array('created'), array('pid' => getmypid()), array('limit' => 1)); + if (dbm::is_result($queue)) { + $process_created = $queue['created']; + } else { + // Normally this shouldn't happen. + $process_created = datetime_convert(); + logger('no inherited priority! Something is wrong.'); + } + // We'll push to each subscriber that has push > 0, // i.e. there has been an update (set in notifier.php). $r = q("SELECT `id`, `callback_url` FROM `push_subscriber` WHERE `push` > 0"); foreach ($r as $rr) { logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); - proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/pubsubpublish.php', $rr["id"]); + proc_run(array('priority' => PRIORITY_HIGH, 'created' => $process_created, 'dont_fork' => true), + 'include/pubsubpublish.php', $rr["id"]); } } From 7d0a7f6be9e6c281ddafdfed799bf8b46785424a Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 11 Jun 2017 19:51:18 +0000 Subject: [PATCH 064/160] We got rid of two workerqueue queries, yeah! --- include/notifier.php | 21 ++++----------------- include/poller.php | 5 +++++ include/pubsubpublish.php | 13 ++----------- src/App.php | 1 + 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index d7e8a9ccec..28d437f4ce 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -55,19 +55,6 @@ function notifier_run(&$argv, &$argc){ return; } - // Inherit the priority - $queue = dba::select('workerqueue', array('priority', 'created'), array('pid' => getmypid()), array('limit' => 1)); - if (dbm::is_result($queue)) { - $priority = (int)$queue['priority']; - $process_created = $queue['created']; - logger('inherited priority: '.$priority); - } else { - // Normally this shouldn't happen. - $priority = PRIORITY_HIGH; - $process_created = datetime_convert(); - logger('no inherited priority! Something is wrong.'); - } - logger('notifier: invoked: ' . print_r($argv,true), LOGGER_DEBUG); $cmd = $argv[1]; @@ -361,7 +348,7 @@ function notifier_run(&$argv, &$argc){ // a delivery fork. private groups (forum_mode == 2) do not uplink if ((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) { - proc_run($priority, 'include/notifier.php', 'uplink', $item_id); + proc_run($a->queue['priority'], 'include/notifier.php', 'uplink', $item_id); } $conversants = array(); @@ -500,7 +487,7 @@ function notifier_run(&$argv, &$argc){ } logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG); - proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true), + proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true), 'include/delivery.php', $cmd, $item_id, $contact['id']); } } @@ -566,7 +553,7 @@ function notifier_run(&$argv, &$argc){ if ((! $mail) && (! $fsuggest) && (! $followup)) { logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]); - proc_run(array('priority' => $priority, 'created' => $process_created, 'dont_fork' => true), + proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true), 'include/delivery.php', $cmd, $item_id, $rr['id']); } } @@ -607,7 +594,7 @@ function notifier_run(&$argv, &$argc){ } // Handling the pubsubhubbub requests - proc_run(array('priority' => PRIORITY_HIGH, 'created' => $process_created, 'dont_fork' => true), + proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), 'include/pubsubpublish.php'); } diff --git a/include/poller.php b/include/poller.php index 8784931d3c..89b0a24dbc 100644 --- a/include/poller.php +++ b/include/poller.php @@ -84,6 +84,9 @@ function poller_run($argv, $argc){ // We fetch the next queue entry that is about to be executed while ($r = poller_worker_process()) { + // Assure that the priority is an integer value + $r[0]['priority'] = (int)$r[0]['priority']; + // If we got that queue entry we claim it for us if (!poller_claim_process($r[0])) { dba::unlock(); @@ -255,10 +258,12 @@ function poller_exec_function($queue, $funcname, $argv) { // But preserve the old one for the worker $old_process_id = $a->process_id; $a->process_id = uniqid("wrk", true); + $a->queue = $queue; $funcname($argv, $argc); $a->process_id = $old_process_id; + unset($a->queue); $duration = number_format(microtime(true) - $stamp, 3); diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 7c70059f90..3265fd1e16 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -7,27 +7,18 @@ require_once('include/items.php'); require_once('include/ostatus.php'); function pubsubpublish_run(&$argv, &$argc){ + global $a; if ($argc > 1) { $pubsubpublish_id = intval($argv[1]); } else { - // Inherit the creation time - $queue = dba::select('workerqueue', array('created'), array('pid' => getmypid()), array('limit' => 1)); - if (dbm::is_result($queue)) { - $process_created = $queue['created']; - } else { - // Normally this shouldn't happen. - $process_created = datetime_convert(); - logger('no inherited priority! Something is wrong.'); - } - // We'll push to each subscriber that has push > 0, // i.e. there has been an update (set in notifier.php). $r = q("SELECT `id`, `callback_url` FROM `push_subscriber` WHERE `push` > 0"); foreach ($r as $rr) { logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); - proc_run(array('priority' => PRIORITY_HIGH, 'created' => $process_created, 'dont_fork' => true), + proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), 'include/pubsubpublish.php', $rr["id"]); } } diff --git a/src/App.php b/src/App.php index f6b568ae8a..94ca007511 100644 --- a/src/App.php +++ b/src/App.php @@ -100,6 +100,7 @@ class App { */ public $template_engine_instance = array(); public $process_id; + public $queue; private $ldelim = array( 'internal' => '', 'smarty3' => '{{' From 4fdaca861b5df3c72e6c5f294c2b2f3da872d996 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 11 Jun 2017 20:25:51 +0000 Subject: [PATCH 065/160] Contact ID is integer --- include/notifier.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 28d437f4ce..c110984dde 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -488,7 +488,7 @@ function notifier_run(&$argv, &$argc){ logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG); proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true), - 'include/delivery.php', $cmd, $item_id, $contact['id']); + 'include/delivery.php', $cmd, $item_id, (int)$contact['id']); } } @@ -554,7 +554,7 @@ function notifier_run(&$argv, &$argc){ if ((! $mail) && (! $fsuggest) && (! $followup)) { logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]); proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true), - 'include/delivery.php', $cmd, $item_id, $rr['id']); + 'include/delivery.php', $cmd, $item_id, (int)$rr['id']); } } } From d4fc7c3f6862fa9326d482077aaf1793e0f7f4d3 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 11 Jun 2017 20:41:01 +0000 Subject: [PATCH 066/160] And some more integer --- include/pubsubpublish.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 3265fd1e16..580e3ffce1 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -19,7 +19,7 @@ function pubsubpublish_run(&$argv, &$argc){ foreach ($r as $rr) { logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), - 'include/pubsubpublish.php', $rr["id"]); + 'include/pubsubpublish.php', (int)$rr["id"]); } } From 8be52424f5d2727fd53fc564a9e41ac29ba622ac Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 12 Jun 2017 09:44:46 +0000 Subject: [PATCH 067/160] Only check for stale processes every 5 minutes --- boot.php | 11 ++++++++++- include/poller.php | 11 +++++------ include/pubsubpublish.php | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/boot.php b/boot.php index fe1ee63e06..b93810d774 100644 --- a/boot.php +++ b/boot.php @@ -22,6 +22,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'a use Friendica\App; use Friendica\Core\Config; +use Friendica\Util\Lock; require_once 'include/config.php'; require_once 'include/network.php'; @@ -1100,8 +1101,16 @@ function proc_run($cmd) { return; } + // If there is a lock then we don't have to check for too much worker + if (!Lock::set('poller_worker', 0)) { + return; + } + // If there are already enough workers running, don't fork another one - if (poller_too_much_workers()) { + $quit = poller_too_much_workers(); + Lock::remove('poller_worker'); + + if ($quit) { return; } diff --git a/include/poller.php b/include/poller.php index 89b0a24dbc..04dcfa431a 100644 --- a/include/poller.php +++ b/include/poller.php @@ -47,13 +47,12 @@ function poller_run($argv, $argc){ // We now start the process. This is done after the load check since this could increase the load. $a->start_process(); - // At first we check the number of workers and quit if there are too much of them - // This is done at the top to avoid that too much code is executed without a need to do so, - // since the poller mostly quits here. - if (poller_too_much_workers()) { + // Kill stale processes every 5 minutes + $last_cleanup = Config::get('system', 'poller_last_cleaned', 0); + if (time() > ($last_cleanup + 300)) { + logger('CLEAN: '.time().' > '.($last_cleanup + 300).' - '.$last_cleanup); + Config::set('system', 'poller_last_cleaned', time()); poller_kill_stale_workers(); - logger('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG); - return; } // Do we have too few memory? diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 3265fd1e16..580e3ffce1 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -19,7 +19,7 @@ function pubsubpublish_run(&$argv, &$argc){ foreach ($r as $rr) { logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), - 'include/pubsubpublish.php', $rr["id"]); + 'include/pubsubpublish.php', (int)$rr["id"]); } } From dc00d89b9aafdd2136e97154588e5dd36816b785 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 12 Jun 2017 09:45:13 +0000 Subject: [PATCH 068/160] Remove test message --- include/poller.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 04dcfa431a..4b5d6287ec 100644 --- a/include/poller.php +++ b/include/poller.php @@ -50,7 +50,6 @@ function poller_run($argv, $argc){ // Kill stale processes every 5 minutes $last_cleanup = Config::get('system', 'poller_last_cleaned', 0); if (time() > ($last_cleanup + 300)) { - logger('CLEAN: '.time().' > '.($last_cleanup + 300).' - '.$last_cleanup); Config::set('system', 'poller_last_cleaned', time()); poller_kill_stale_workers(); } From 2372ef7fd52eb6d213bb8bccd2cf192ab622fc48 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 12 Jun 2017 12:28:48 +0000 Subject: [PATCH 069/160] Locking seems to be better here --- boot.php | 4 ++++ include/pubsubpublish.php | 1 + 2 files changed, 5 insertions(+) diff --git a/boot.php b/boot.php index b93810d774..d30d978cad 100644 --- a/boot.php +++ b/boot.php @@ -1089,6 +1089,8 @@ function proc_run($cmd) { $argv = $args; array_shift($argv); + dba::lock('workerqueue'); + $parameters = json_encode($argv); $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters), array('limit' => 1)); @@ -1096,6 +1098,8 @@ function proc_run($cmd) { dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority)); } + dba::unlock(); + // Should we quit and wait for the poller to be called as a cronjob? if ($dont_fork) { return; diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 580e3ffce1..0cefa5531d 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -20,6 +20,7 @@ function pubsubpublish_run(&$argv, &$argc){ logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), 'include/pubsubpublish.php', (int)$rr["id"]); + logger("Publish feed to ".$rr["callback_url"].' - done', LOGGER_DEBUG); } } From 1932a6d634ad1bc79d42d80d98997e4f0b2c03cd Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 12 Jun 2017 14:19:47 +0000 Subject: [PATCH 070/160] Replaced "table lock" - it is not so good, it seems --- boot.php | 4 ---- include/poller.php | 15 ++++++++------- include/pubsubpublish.php | 1 - 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/boot.php b/boot.php index d30d978cad..b93810d774 100644 --- a/boot.php +++ b/boot.php @@ -1089,8 +1089,6 @@ function proc_run($cmd) { $argv = $args; array_shift($argv); - dba::lock('workerqueue'); - $parameters = json_encode($argv); $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters), array('limit' => 1)); @@ -1098,8 +1096,6 @@ function proc_run($cmd) { dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority)); } - dba::unlock(); - // Should we quit and wait for the poller to be called as a cronjob? if ($dont_fork) { return; diff --git a/include/poller.php b/include/poller.php index 4b5d6287ec..53f8557853 100644 --- a/include/poller.php +++ b/include/poller.php @@ -87,7 +87,7 @@ function poller_run($argv, $argc){ // If we got that queue entry we claim it for us if (!poller_claim_process($r[0])) { - dba::unlock(); + Lock::remove('poller_fetch_worker'); continue; } else { // Fetch all workerqueue data while the table is still locked @@ -95,7 +95,7 @@ function poller_run($argv, $argc){ $entries = poller_total_entries(); $top_priority = poller_highest_priority(); $high_running = poller_process_with_priority_active($top_priority); - dba::unlock(); + Lock::remove('poller_fetch_worker'); } // To avoid the quitting of multiple pollers only one poller at a time will execute the check @@ -616,9 +616,11 @@ function poller_worker_process() { // Check if we should pass some low priority process $highest_priority = 0; - if (poller_passing_slow($highest_priority)) { - dba::lock('workerqueue'); + if (!Lock::set('poller_fetch_worker')) { + return false; + } + 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` <= '%s' AND `priority` < %d @@ -638,8 +640,6 @@ function poller_worker_process() { if (dbm::is_result($r)) { return $r; } - } else { - dba::lock('workerqueue'); } // If there is no result (or we shouldn't pass lower processes) we check without priority limit @@ -649,7 +649,7 @@ function poller_worker_process() { // We only unlock the tables here, when we got no data if (!dbm::is_result($r)) { - dba::unlock(); + Lock::remove('poller_fetch_worker'); } return $r; @@ -800,6 +800,7 @@ if (array_search(__file__,get_included_files())===0){ get_app()->end_process(); Lock::remove('poller_worker'); + Lock::remove('poller_fetch_worker'); killme(); } diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php index 0cefa5531d..580e3ffce1 100644 --- a/include/pubsubpublish.php +++ b/include/pubsubpublish.php @@ -20,7 +20,6 @@ function pubsubpublish_run(&$argv, &$argc){ logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG); proc_run(array('priority' => PRIORITY_HIGH, 'created' => $a->queue['created'], 'dont_fork' => true), 'include/pubsubpublish.php', (int)$rr["id"]); - logger("Publish feed to ".$rr["callback_url"].' - done', LOGGER_DEBUG); } } From 16df7715b96b436ac3133a92830b37a2673633de Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 12 Jun 2017 15:42:54 +0000 Subject: [PATCH 071/160] Avoid locking problems in lock class --- src/Util/Lock.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index b2c5afc662..6d7952ffa9 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -61,6 +61,8 @@ class Lock { $cachekey = get_app()->get_hostname().";lock:".$fn_name; do { + // We only lock to be sure that nothing happens at exactly the same time + dba::lock('locks'); $lock = $memcache->get($cachekey); if (!is_bool($lock)) { @@ -76,6 +78,9 @@ class Lock { $memcache->set($cachekey, getmypid(), MEMCACHE_COMPRESSED, 300); $got_lock = true; } + + dba::unlock(); + if (!$got_lock && ($timeout > 0)) { usleep($wait_sec * 1000000); } From 1301a2950536afafd9993c4ff2c542699771e351 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 12 Jun 2017 19:20:50 +0000 Subject: [PATCH 072/160] It's faster without locks, gnarl ... --- include/poller.php | 11 +---------- src/Util/Lock.php | 7 ++----- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/poller.php b/include/poller.php index 53f8557853..42bf589137 100644 --- a/include/poller.php +++ b/include/poller.php @@ -88,6 +88,7 @@ function poller_run($argv, $argc){ // If we got that queue entry we claim it for us if (!poller_claim_process($r[0])) { Lock::remove('poller_fetch_worker'); + usleep(rand(0, 200000)); continue; } else { // Fetch all workerqueue data while the table is still locked @@ -95,7 +96,6 @@ function poller_run($argv, $argc){ $entries = poller_total_entries(); $top_priority = poller_highest_priority(); $high_running = poller_process_with_priority_active($top_priority); - Lock::remove('poller_fetch_worker'); } // To avoid the quitting of multiple pollers only one poller at a time will execute the check @@ -616,10 +616,6 @@ function poller_worker_process() { // Check if we should pass some low priority process $highest_priority = 0; - if (!Lock::set('poller_fetch_worker')) { - return false; - } - if (poller_passing_slow($highest_priority)) { // Are there waiting processes with a higher priority than the currently highest? $r = q("SELECT * FROM `workerqueue` @@ -647,11 +643,6 @@ function poller_worker_process() { $r = q("SELECT * FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority`, `created` LIMIT 1", dbesc(NULL_DATE)); } - // We only unlock the tables here, when we got no data - if (!dbm::is_result($r)) { - Lock::remove('poller_fetch_worker'); - } - return $r; } diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 6d7952ffa9..36f408cf32 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -57,7 +57,6 @@ class Lock { $memcache = self::connectMemcache(); if (is_object($memcache)) { - $wait_sec = 0.2; $cachekey = get_app()->get_hostname().";lock:".$fn_name; do { @@ -82,15 +81,13 @@ class Lock { dba::unlock(); if (!$got_lock && ($timeout > 0)) { - usleep($wait_sec * 1000000); + usleep(rand(10000, 200000)); } } while (!$got_lock && ((time() - $start) < $timeout)); return $got_lock; } - $wait_sec = 2; - do { dba::lock('locks'); $lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1)); @@ -118,7 +115,7 @@ class Lock { dba::unlock(); if (!$got_lock && ($timeout > 0)) { - sleep($wait_sec); + usleep(rand(100000, 2000000)); } } while (!$got_lock && ((time() - $start) < $timeout)); From 228993596a532ad1be54e9ac4fa04cca25d6e1ca Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 12 Jun 2017 21:39:20 +0000 Subject: [PATCH 073/160] Really fast, sadly with deadlocks --- include/poller.php | 201 +++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 108 deletions(-) diff --git a/include/poller.php b/include/poller.php index 42bf589137..9da8dddf75 100644 --- a/include/poller.php +++ b/include/poller.php @@ -54,6 +54,12 @@ function poller_run($argv, $argc){ poller_kill_stale_workers(); } + // Count active workers and compare them with a maximum value that depends on the load + if (poller_too_much_workers()) { + logger('Pre check: Active worker limit reached, quitting.', LOGGER_DEBUG); + return; + } + // Do we have too few memory? if ($a->min_memory_reached()) { logger('Pre check: Memory limit reached, quitting.', LOGGER_DEBUG); @@ -81,43 +87,31 @@ function poller_run($argv, $argc){ // We fetch the next queue entry that is about to be executed while ($r = poller_worker_process()) { + foreach ($r AS $entry) { + // Assure that the priority is an integer value + $entry['priority'] = (int)$entry['priority']; - // Assure that the priority is an integer value - $r[0]['priority'] = (int)$r[0]['priority']; - - // If we got that queue entry we claim it for us - if (!poller_claim_process($r[0])) { - Lock::remove('poller_fetch_worker'); - usleep(rand(0, 200000)); - continue; - } else { - // Fetch all workerqueue data while the table is still locked - // This is redundant, but this speeds up the processing - $entries = poller_total_entries(); - $top_priority = poller_highest_priority(); - $high_running = poller_process_with_priority_active($top_priority); - } - - // To avoid the quitting of multiple pollers only one poller at a time will execute the check - if (Lock::set('poller_worker', 0)) { - // Count active workers and compare them with a maximum value that depends on the load - if (poller_too_much_workers($entries, $top_priority, $high_running)) { - logger('Active worker limit reached, quitting.', LOGGER_DEBUG); + // The work will be done + if (!poller_execute($entry)) { + logger('Process execution failed, quitting.', LOGGER_DEBUG); return; } - // Check free memory - if ($a->min_memory_reached()) { - logger('Memory limit reached, quitting.', LOGGER_DEBUG); - return; - } - Lock::remove('poller_worker'); - } + // To avoid the quitting of multiple pollers only one poller at a time will execute the check + if (Lock::set('poller_worker', 0)) { + // Count active workers and compare them with a maximum value that depends on the load + if (poller_too_much_workers()) { + logger('Active worker limit reached, quitting.', LOGGER_DEBUG); + return; + } - // finally the work will be done - if (!poller_execute($r[0])) { - logger('Process execution failed, quitting.', LOGGER_DEBUG); - return; + // Check free memory + if ($a->min_memory_reached()) { + logger('Memory limit reached, quitting.', LOGGER_DEBUG); + return; + } + Lock::remove('poller_worker'); + } } // Quit the poller once every hour @@ -200,7 +194,10 @@ function poller_execute($queue) { if (!validate_include($include)) { logger("Include file ".$argv[0]." is not valid!"); - dba::delete('workerqueue', array('id' => $queue["id"])); + $timeout = 10; + while (!dba::delete('workerqueue', array('id' => $queue["id"])) && (--$timeout > 0)) { + sleep(1); + } return true; } @@ -210,7 +207,11 @@ function poller_execute($queue) { if (function_exists($funcname)) { poller_exec_function($queue, $funcname, $argv); - dba::delete('workerqueue', array('id' => $queue["id"])); + $timeout = 10; + while (!dba::delete('workerqueue', array('id' => $queue["id"])) && (--$timeout > 0)) { + logger('Delete ID '.$queue["id"], LOGGER_DEBUG); + sleep(1); + } } else { logger("Function ".$funcname." does not exist"); } @@ -471,7 +472,7 @@ function poller_kill_stale_workers() { * * @return bool Are there too much workers running? */ -function poller_too_much_workers($entries = NULL, $top_priority = NULL, $high_running = NULL) { +function poller_too_much_workers() { $queues = Config::get("system", "worker_queues", 4); $maxqueues = $queues; @@ -514,16 +515,12 @@ function poller_too_much_workers($entries = NULL, $top_priority = NULL, $high_ru $processlist = ' ('.implode(', ', $listitem).')'; } - if (is_null($entries)) { - $entries = poller_total_entries(); - } + $entries = poller_total_entries(); + if (Config::get("system", "worker_fastlane", false) && ($queues > 0) && ($entries > 0) && ($active >= $queues)) { - if (is_null($top_priority)) { - $top_priority = poller_highest_priority(); - } - if (is_null($high_running)) { - $high_running = poller_process_with_priority_active($top_priority); - } + $top_priority = poller_highest_priority(); + $high_running = poller_process_with_priority_active($top_priority); + if (!$high_running && ($top_priority > PRIORITY_UNDEFINED) && ($top_priority < PRIORITY_NEGLIGIBLE)) { logger("There are jobs with priority ".$top_priority." waiting but none is executed. Open a fastlane.", LOGGER_DEBUG); $queues = $active + 1; @@ -606,6 +603,52 @@ function poller_passing_slow(&$highest_priority) { return $passing_slow; } +/** + * @brief Find and claim the next worker process for us + * + * @return boolean Have we found something? + */ +function find_worker_processes() { + // Check if we should pass some low priority process + $highest_priority = 0; + $found = false; + + if (poller_passing_slow($highest_priority)) { + // Are there waiting processes with a higher priority than the currently highest? + $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? + WHERE `executed` <= ? AND `priority` < ? + ORDER BY `priority`, `created` LIMIT 1", + datetime_convert(), getmypid(), NULL_DATE, $highest_priority); + if (dbm::is_result($result)) { + $found = (dba::num_rows($result) > 0); + } + dba::close($result); + + if (!$found) { + // Give slower processes some processing time + $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? + WHERE `executed` <= ? AND `priority` > ? + ORDER BY `priority`, `created` LIMIT 1", + datetime_convert(), getmypid(), NULL_DATE, $highest_priority); + if (dbm::is_result($result)) { + $found = (dba::num_rows($result) > 0); + } + dba::close($result); + } + } + + // If there is no result (or we shouldn't pass lower processes) we check without priority limit + if (!$found) { + $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? ORDER BY `priority`, `created` LIMIT 1", + datetime_convert(), getmypid(), NULL_DATE); + if (dbm::is_result($result)) { + $found = (dba::num_rows($result) > 0); + } + dba::close($result); + } + return $found; +} + /** * @brief Returns the next worker process * @@ -613,74 +656,17 @@ function poller_passing_slow(&$highest_priority) { */ function poller_worker_process() { - // Check if we should pass some low priority process - $highest_priority = 0; + $timeout = 10; + do { + $found = find_worker_processes(); + } while (!$found && (poller_total_entries() > 0) && (--$timeout > 0)); - 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` <= '%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` <= '%s' AND `priority` > %d - ORDER BY `priority`, `created` LIMIT 1", - dbesc(NULL_DATE), - intval($highest_priority)); - - if (dbm::is_result($r)) { - return $r; - } + if ($found) { + $r = q("SELECT * FROM `workerqueue` WHERE `pid` = %d", intval(getmypid())); } - - // If there is no result (or we shouldn't pass lower processes) we check without priority limit - if (!dbm::is_result($r)) { - $r = q("SELECT * FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority`, `created` LIMIT 1", dbesc(NULL_DATE)); - } - return $r; } -/** - * @brief Assigns a workerqueue entry to the current process - * - * When we are sure that the table locks are working correctly, we can remove the checks from here - * - * @param array $queue Workerqueue entry - * - * @return boolean "true" if the claiming was successful - */ -function poller_claim_process($queue) { - $mypid = getmypid(); - - $success = dba::update('workerqueue', array('executed' => datetime_convert(), 'pid' => $mypid), - array('id' => $queue["id"], 'pid' => 0)); - - if (!$success) { - logger("Couldn't update queue entry ".$queue["id"]." - skip this execution", LOGGER_DEBUG); - return false; - } - - // Assure that there are no tasks executed twice - $id = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `id` = %d", intval($queue["id"])); - if (!$id) { - logger("Queue item ".$queue["id"]." vanished - skip this execution", LOGGER_DEBUG); - return false; - } elseif ((strtotime($id[0]["executed"]) <= 0) || ($id[0]["pid"] == 0)) { - logger("Entry for queue item ".$queue["id"]." wasn't stored - skip this execution", LOGGER_DEBUG); - return false; - } elseif ($id[0]["pid"] != $mypid) { - logger("Queue item ".$queue["id"]." is to be executed by process ".$id[0]["pid"]." and not by me (".$mypid.") - skip this execution", LOGGER_DEBUG); - return false; - } - return true; -} - /** * @brief Removes a workerqueue entry from the current process */ @@ -791,7 +777,6 @@ if (array_search(__file__,get_included_files())===0){ get_app()->end_process(); Lock::remove('poller_worker'); - Lock::remove('poller_fetch_worker'); killme(); } From 97be344a4a103d4f4fbd5945640afc9912fd3c81 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 05:52:59 +0000 Subject: [PATCH 074/160] Handle deadlocks centrally --- include/dba.php | 53 ++++++++++++++++++++++++++++++++++++---------- include/poller.php | 11 ++-------- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/include/dba.php b/include/dba.php index e4846899dc..e1330d4424 100644 --- a/include/dba.php +++ b/include/dba.php @@ -625,8 +625,21 @@ class dba { } if (self::$dbo->errorno != 0) { - logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n". - $a->callstack(8))."\n".self::replace_parameters($sql, $args); + $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); + $called_from = array_shift($trace); + + // We are having an own error logging in the function "p" + if ($called_from['function'] != 'p') { + // We have to preserve the error code, somewhere in the logging it get lost + $error = self::$dbo->error; + $errorno = self::$dbo->errorno; + + logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n". + $a->callstack(8))."\n".self::replace_parameters($sql, $args); + + self::$dbo->error = $error; + self::$dbo->errorno = $errorno; + } } $a->save_timestamp($stamp1, 'database'); @@ -662,18 +675,36 @@ class dba { $args = func_get_args(); - $stmt = call_user_func_array('self::p', $args); + // In a case of a deadlock we are repeating the query 10 times + $timeout = 10; - if (is_bool($stmt)) { - $retval = $stmt; - } elseif (is_object($stmt)) { - $retval = true; - } else { - $retval = false; + do { + $stmt = call_user_func_array('self::p', $args); + + if (is_bool($stmt)) { + $retval = $stmt; + } elseif (is_object($stmt)) { + $retval = true; + } else { + $retval = false; + } + + self::close($stmt); + + } while ((self::$dbo->errorno = 1213) && (--$timeout > 0)); + + if (self::$dbo->errorno != 0) { + // We have to preserve the error code, somewhere in the logging it get lost + $error = self::$dbo->error; + $errorno = self::$dbo->errorno; + + logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n". + $a->callstack(8))."\n".self::replace_parameters($sql, $args); + + self::$dbo->error = $error; + self::$dbo->errorno = $errorno; } - self::close($stmt); - $a->save_timestamp($stamp, "database_write"); return $retval; diff --git a/include/poller.php b/include/poller.php index 9da8dddf75..e0b83dd73c 100644 --- a/include/poller.php +++ b/include/poller.php @@ -194,10 +194,7 @@ function poller_execute($queue) { if (!validate_include($include)) { logger("Include file ".$argv[0]." is not valid!"); - $timeout = 10; - while (!dba::delete('workerqueue', array('id' => $queue["id"])) && (--$timeout > 0)) { - sleep(1); - } + dba::delete('workerqueue', array('id' => $queue["id"])); return true; } @@ -207,11 +204,7 @@ function poller_execute($queue) { if (function_exists($funcname)) { poller_exec_function($queue, $funcname, $argv); - $timeout = 10; - while (!dba::delete('workerqueue', array('id' => $queue["id"])) && (--$timeout > 0)) { - logger('Delete ID '.$queue["id"], LOGGER_DEBUG); - sleep(1); - } + dba::delete('workerqueue', array('id' => $queue["id"])); } else { logger("Function ".$funcname." does not exist"); } From cd129665ef3baab31489dae51282341d5d8763e3 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 05:56:02 +0000 Subject: [PATCH 075/160] =?UTF-8?q?=C3=B6rgs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/dba.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dba.php b/include/dba.php index e1330d4424..3e62da892f 100644 --- a/include/dba.php +++ b/include/dba.php @@ -691,7 +691,7 @@ class dba { self::close($stmt); - } while ((self::$dbo->errorno = 1213) && (--$timeout > 0)); + } while ((self::$dbo->errorno == 1213) && (--$timeout > 0)); if (self::$dbo->errorno != 0) { // We have to preserve the error code, somewhere in the logging it get lost From e232c683b612800c4c3a8b15dd43c9a3fed6191b Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 09:03:19 +0000 Subject: [PATCH 076/160] Changed timeout, logging added --- include/dba.php | 4 ++-- include/poller.php | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/dba.php b/include/dba.php index 3e62da892f..d310ad04cc 100644 --- a/include/dba.php +++ b/include/dba.php @@ -675,8 +675,8 @@ class dba { $args = func_get_args(); - // In a case of a deadlock we are repeating the query 10 times - $timeout = 10; + // In a case of a deadlock we are repeating the query 20 times + $timeout = 20; do { $stmt = call_user_func_array('self::p', $args); diff --git a/include/poller.php b/include/poller.php index e0b83dd73c..0c92d00875 100644 --- a/include/poller.php +++ b/include/poller.php @@ -649,11 +649,15 @@ function find_worker_processes() { */ function poller_worker_process() { + $stamp = (float)microtime(true); + $timeout = 10; do { $found = find_worker_processes(); } while (!$found && (poller_total_entries() > 0) && (--$timeout > 0)); + logger('Duration: '.number_format(microtime(true) - $stamp, 3), LOGGER_DEBUG); + if ($found) { $r = q("SELECT * FROM `workerqueue` WHERE `pid` = %d", intval(getmypid())); } From 21e84e4d2558cb9be02ba89adc7cefe6971e898c Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 13:51:25 +0000 Subject: [PATCH 077/160] Fetching new queue tasks in a bulk to increase speed --- include/poller.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/include/poller.php b/include/poller.php index 0c92d00875..4801ea8fdf 100644 --- a/include/poller.php +++ b/include/poller.php @@ -96,26 +96,26 @@ function poller_run($argv, $argc){ logger('Process execution failed, quitting.', LOGGER_DEBUG); return; } - - // To avoid the quitting of multiple pollers only one poller at a time will execute the check - if (Lock::set('poller_worker', 0)) { - // Count active workers and compare them with a maximum value that depends on the load - if (poller_too_much_workers()) { - logger('Active worker limit reached, quitting.', LOGGER_DEBUG); - return; - } - - // Check free memory - if ($a->min_memory_reached()) { - logger('Memory limit reached, quitting.', LOGGER_DEBUG); - return; - } - Lock::remove('poller_worker'); - } } - // Quit the poller once every hour - if (time() > ($starttime + 3600)) { + // To avoid the quitting of multiple pollers only one poller at a time will execute the check + if (Lock::set('poller_worker', 0)) { + // Count active workers and compare them with a maximum value that depends on the load + if (poller_too_much_workers()) { + logger('Active worker limit reached, quitting.', LOGGER_DEBUG); + return; + } + + // Check free memory + if ($a->min_memory_reached()) { + logger('Memory limit reached, quitting.', LOGGER_DEBUG); + return; + } + Lock::remove('poller_worker'); + } + + // Quit the poller once every 5 minutes + if (time() > ($starttime + 300)) { logger('Process lifetime reached, quitting.', LOGGER_DEBUG); return; } @@ -610,7 +610,7 @@ function find_worker_processes() { // Are there waiting processes with a higher priority than the currently highest? $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND `priority` < ? - ORDER BY `priority`, `created` LIMIT 1", + ORDER BY `priority`, `created` LIMIT 5", datetime_convert(), getmypid(), NULL_DATE, $highest_priority); if (dbm::is_result($result)) { $found = (dba::num_rows($result) > 0); @@ -632,7 +632,7 @@ function find_worker_processes() { // If there is no result (or we shouldn't pass lower processes) we check without priority limit if (!$found) { - $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? ORDER BY `priority`, `created` LIMIT 1", + $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? ORDER BY `priority`, `created` LIMIT 5", datetime_convert(), getmypid(), NULL_DATE); if (dbm::is_result($result)) { $found = (dba::num_rows($result) > 0); From 5183de8075c4d460038f0f99f2e71429de3bfa44 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 15:14:53 +0000 Subject: [PATCH 078/160] Don't fork these calls --- include/items.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index eb30763909..8649a1bd1a 100644 --- a/include/items.php +++ b/include/items.php @@ -1139,7 +1139,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f check_item_notification($current_post, $uid); if ($notify) { - proc_run(PRIORITY_HIGH, "include/notifier.php", $notify_type, $current_post); + proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), "include/notifier.php", $notify_type, $current_post); } return $current_post; @@ -1430,7 +1430,7 @@ function tag_deliver($uid, $item_id) { ); update_thread($item_id); - proc_run(PRIORITY_HIGH,'include/notifier.php', 'tgroup', $item_id); + proc_run(array('priority' => PRIORITY_HIGH, 'dont_fork' => true), 'include/notifier.php', 'tgroup', $item_id); } @@ -2076,7 +2076,7 @@ function item_expire($uid, $days, $network = "", $force = false) { drop_item($item['id'], false); } - proc_run(PRIORITY_LOW, "include/notifier.php", "expire", $uid); + proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/notifier.php", "expire", $uid); } @@ -2099,7 +2099,7 @@ function drop_items($items) { // multiple threads may have been deleted, send an expire notification if ($uid) { - proc_run(PRIORITY_LOW, "include/notifier.php", "expire", $uid); + proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/notifier.php", "expire", $uid); } } @@ -2295,7 +2295,7 @@ function drop_item($id, $interactive = true) { $drop_id = intval($item['id']); $priority = ($interactive ? PRIORITY_HIGH : PRIORITY_LOW); - proc_run($priority, "include/notifier.php", "drop", $drop_id); + proc_run(array('priority' => $priority, 'dont_fork' => true), "include/notifier.php", "drop", $drop_id); if (! $interactive) { return $owner; From a056afd566e796c9d45204a908416549f6c58d63 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 20:51:24 +0000 Subject: [PATCH 079/160] Small corrections --- doc/htconfig.md | 2 +- include/poller.php | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/htconfig.md b/doc/htconfig.md index ec961c200f..ed2c816dea 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -68,7 +68,7 @@ Example: To set the directory value please add this line to your .htconfig.php: * **ostatus_poll_timeframe** - Defines how old an item can be to try to complete the conversation with it. * **paranoia** (Boolean) - Log out users if their IP address changed. * **permit_crawling** (Boolean) - Restricts the search for not logged in users to one search per minute. -* **worker_debug** (Boolean) - If activated, it prints out the number of running processes split by priority. +* **worker_debug** (Boolean) - If enabled, it prints out the number of running processes split by priority. * **profiler** (Boolean) - Enable internal timings to help optimize code. Needed for "rendertime" addon. Default is false. * **free_crawls** - Number of "free" searches when "permit_crawling" is activated (Default value is 10) * **crawl_permit_period** - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60) diff --git a/include/poller.php b/include/poller.php index 4801ea8fdf..6c2f9a0d6f 100644 --- a/include/poller.php +++ b/include/poller.php @@ -130,7 +130,11 @@ function poller_run($argv, $argc){ */ function poller_total_entries() { $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE)); - return $s[0]["total"]; + if (dbm::is_result($s)) { + return $s[0]["total"]; + } else { + return 0; + } } /** @@ -140,7 +144,11 @@ function poller_total_entries() { */ function poller_highest_priority() { $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority` LIMIT 1", dbesc(NULL_DATE)); - return $s[0]["priority"]; + if (dbm::is_result($s)) { + return $s[0]["priority"]; + } else { + return 0; + } } /** @@ -459,10 +467,6 @@ function poller_kill_stale_workers() { /** * @brief Checks if the number of active workers exceeds the given limits * - * @param integer $entries The number of not executed entries in the worker queue - * @param integer $top_priority The highest not executed priority in the worker queue - * @param boolean $high_running Is a process with priority "$top_priority" running? - * * @return bool Are there too much workers running? */ function poller_too_much_workers() { From a7526f12917a628204a241c639687b10f513d580 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 21:56:50 +0000 Subject: [PATCH 080/160] New function for affected rows --- include/dba.php | 16 ++++++++++++++++ include/poller.php | 21 +++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/include/dba.php b/include/dba.php index d310ad04cc..1c63fa5054 100644 --- a/include/dba.php +++ b/include/dba.php @@ -21,6 +21,8 @@ class dba { private $driver; public $connected = false; public $error = false; + public $errorno = 0; + public $affected_rows = 0; private $_server_info = ''; private static $in_transaction = false; private static $dbo; @@ -551,6 +553,7 @@ class dba { self::$dbo->error = ''; self::$dbo->errorno = 0; + self::$dbo->affected_rows = 0; switch (self::$dbo->driver) { case 'pdo': @@ -573,6 +576,7 @@ class dba { $retval = false; } else { $retval = $stmt; + self::$dbo->affected_rows = $retval->rowCount(); } break; case 'mysqli': @@ -612,6 +616,7 @@ class dba { } else { $stmt->store_result(); $retval = $stmt; + self::$dbo->affected_rows = $retval->affected_rows; } break; case 'mysql': @@ -620,6 +625,8 @@ class dba { if (mysql_errno(self::$dbo->db)) { self::$dbo->error = mysql_error(self::$dbo->db); self::$dbo->errorno = mysql_errno(self::$dbo->db); + } else { + self::$dbo->affected_rows = mysql_affected_rows($retval); } break; } @@ -754,6 +761,15 @@ class dba { return $retval; } + /** + * @brief Returns the number of affected rows of the last statement + * + * @return int Number of rows + */ + static public function affected_rows() { + return self::$dbo->affected_rows; + } + /** * @brief Returns the number of rows of a statement * diff --git a/include/poller.php b/include/poller.php index 6c2f9a0d6f..dbfc51100f 100644 --- a/include/poller.php +++ b/include/poller.php @@ -612,36 +612,33 @@ function find_worker_processes() { if (poller_passing_slow($highest_priority)) { // Are there waiting processes with a higher priority than the currently highest? - $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? + $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND `priority` < ? ORDER BY `priority`, `created` LIMIT 5", datetime_convert(), getmypid(), NULL_DATE, $highest_priority); - if (dbm::is_result($result)) { - $found = (dba::num_rows($result) > 0); + if ($result) { + $found = (dba::affected_rows() > 0); } - dba::close($result); if (!$found) { // Give slower processes some processing time - $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? + $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND `priority` > ? ORDER BY `priority`, `created` LIMIT 1", datetime_convert(), getmypid(), NULL_DATE, $highest_priority); - if (dbm::is_result($result)) { - $found = (dba::num_rows($result) > 0); + if ($result) { + $found = (dba::affected_rows() > 0); } - dba::close($result); } } // If there is no result (or we shouldn't pass lower processes) we check without priority limit if (!$found) { - $result = dba::p("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? ORDER BY `priority`, `created` LIMIT 5", + $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? ORDER BY `priority`, `created` LIMIT 5", datetime_convert(), getmypid(), NULL_DATE); - if (dbm::is_result($result)) { - $found = (dba::num_rows($result) > 0); + if ($result) { + $found = (dba::affected_rows() > 0); } - dba::close($result); } return $found; } From bafa26c060bd198eb55cdb7a205eb1a8c98133f3 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 13 Jun 2017 22:25:24 +0000 Subject: [PATCH 081/160] We don't need the timeout there anymore --- include/poller.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/poller.php b/include/poller.php index dbfc51100f..ef6fbd69de 100644 --- a/include/poller.php +++ b/include/poller.php @@ -652,10 +652,7 @@ function poller_worker_process() { $stamp = (float)microtime(true); - $timeout = 10; - do { - $found = find_worker_processes(); - } while (!$found && (poller_total_entries() > 0) && (--$timeout > 0)); + $found = find_worker_processes(); logger('Duration: '.number_format(microtime(true) - $stamp, 3), LOGGER_DEBUG); From 648249500116ea0ce9484b15f73c1440fd3bf5c8 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 15 Jun 2017 20:50:53 +0000 Subject: [PATCH 082/160] We now use the new Diaspora format while sending --- include/diaspora.php | 81 +++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 62c77f5b2f..49871fb598 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -29,6 +29,8 @@ require_once 'include/cache.php'; */ class Diaspora { + private static $new = false; + /** * @brief Return a list of relay servers * @@ -2949,7 +2951,11 @@ class Diaspora { */ public static function build_post_xml($type, $message) { - $data = array("XML" => array("post" => array($type => $message))); + if (!self::$new) { + $data = array("XML" => array("post" => array($type => $message))); + } else { + $data = array($type => $message); + } return xml::from_array($data, $xml); } @@ -3193,6 +3199,8 @@ class Diaspora { */ public static function build_status($item, $owner) { + self::$new = true; + $cachekey = "diaspora:build_status:".$item['guid']; $result = Cache::get($cachekey); @@ -3206,15 +3214,17 @@ class Diaspora { $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); + //self::$new = Config::get('system', 'new_diaspora', null, true); + // Detect a share element and do a reshare if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) { - $message = array("root_diaspora_id" => $ret["root_handle"], - "root_guid" => $ret["root_guid"], + $message = array("author" => $myaddr, "guid" => $item["guid"], - "diaspora_handle" => $myaddr, - "public" => $public, "created_at" => $created, - "provider_display_name" => $item["app"]); + "root_author" => $ret["root_handle"], + "root_guid" => $ret["root_guid"], + "provider_display_name" => $item["app"], + "public" => $public); $type = "reshare"; } else { @@ -3248,13 +3258,13 @@ class Diaspora { $location["lng"] = $coord[1]; } - $message = array("raw_message" => $body, - "location" => $location, + $message = array("author" => $myaddr, "guid" => $item["guid"], - "diaspora_handle" => $myaddr, - "public" => $public, "created_at" => $created, - "provider_display_name" => $item["app"]); + "public" => $public, + "text" => $body, + "provider_display_name" => $item["app"], + "location" => $location); // Diaspora rejects messages when they contain a location without "lat" or "lng" if (!isset($location["lat"]) || !isset($location["lng"])) { @@ -3267,7 +3277,7 @@ class Diaspora { $message['event'] = $event; /// @todo Once Diaspora supports it, we will remove the body - // $message['raw_message'] = ''; + // $message['text'] = ''; } } @@ -3308,6 +3318,8 @@ class Diaspora { */ private static function construct_like($item, $owner) { + self::$new = true; + $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3322,12 +3334,12 @@ class Diaspora { $positive = "false"; } - return(array("positive" => $positive, + return(array("author" => self::my_handle($owner), "guid" => $item["guid"], - "target_type" => $target_type, "parent_guid" => $parent["guid"], - "author_signature" => "", - "diaspora_handle" => self::my_handle($owner))); + "parent_type" => $target_type, + "positive" => $positive, + "author_signature" => "")); } /** @@ -3340,6 +3352,8 @@ class Diaspora { */ private static function construct_attend($item, $owner) { + self::$new = true; + $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3379,6 +3393,8 @@ class Diaspora { */ private static function construct_comment($item, $owner) { + self::$new = true; + $cachekey = "diaspora:construct_comment:".$item['guid']; $result = Cache::get($cachekey); @@ -3399,12 +3415,12 @@ class Diaspora { $text = html_entity_decode(bb2diaspora($item["body"])); $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); - $comment = array("guid" => $item["guid"], + $comment = array("author" => self::my_handle($owner), + "guid" => $item["guid"], + "created_at" => $created, "parent_guid" => $parent["guid"], - "author_signature" => "", "text" => $text, - /// @todo Currently disabled until Diaspora supports it: "created_at" => $created, - "diaspora_handle" => self::my_handle($owner)); + "author_signature" => ""); // Send the thread parent guid only if it is a threaded comment if ($item['thr-parent'] != $item['parent-uri']) { @@ -3612,6 +3628,8 @@ class Diaspora { */ public static function send_mail($item, $owner, $contact) { + self::$new = true; + $myaddr = self::my_handle($owner); $r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -3626,11 +3644,11 @@ class Diaspora { $cnv = $r[0]; $conv = array( + "author" => $cnv["creator"], "guid" => $cnv["guid"], "subject" => $cnv["subject"], "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'), - "diaspora_handle" => $cnv["creator"], - "participant_handles" => $cnv["recips"] + "participants" => $cnv["recips"] ); $body = bb2diaspora($item["body"]); @@ -3640,26 +3658,27 @@ class Diaspora { $sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256")); $msg = array( + "author" => $myaddr, "guid" => $item["guid"], - "parent_guid" => $cnv["guid"], - "parent_author_signature" => $sig, - "author_signature" => $sig, + "conversation_guid" => $cnv["guid"], "text" => $body, "created_at" => $created, - "diaspora_handle" => $myaddr, - "conversation_guid" => $cnv["guid"] + //"parent_guid" => $cnv["guid"], + //"parent_author_signature" => $sig, + //"author_signature" => $sig, ); if ($item["reply"]) { $message = $msg; $type = "message"; } else { - $message = array("guid" => $cnv["guid"], + $message = array( + "author" => $cnv["creator"], + "guid" => $cnv["guid"], "subject" => $cnv["subject"], "created_at" => datetime_convert("UTC", "UTC", $cnv['created'], 'Y-m-d\TH:i:s\Z'), - "message" => $msg, - "diaspora_handle" => $cnv["creator"], - "participant_handles" => $cnv["recips"]); + "participants" => $cnv["recips"], + "message" => $msg); $type = "conversation"; } From f36ffe3c0329958aa4fe190d528207301c0058e7 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 15 Jun 2017 21:20:18 +0000 Subject: [PATCH 083/160] Just some more message types --- include/diaspora.php | 37 ++++++++++++++----------------------- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 49871fb598..ff3caa5744 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2501,7 +2501,8 @@ class Diaspora { switch ($target_type) { case "Comment": case "Like": - case "Post": // "Post" will be supported in a future version + case "Post": + return self::item_retraction($importer, $contact, $data); case "Reshare": case "StatusMessage": return self::item_retraction($importer, $contact, $data); @@ -3024,9 +3025,11 @@ class Diaspora { */ public static function send_unshare($owner,$contact) { - $message = array("post_guid" => $owner["guid"], - "diaspora_handle" => self::my_handle($owner), - "type" => "Person"); + self::$new = true; + + $message = array("author" => self::my_handle($owner), + "target_guid" => $owner["guid"], + "target_type" => "Person"); logger("Send unshare ".print_r($message, true), LOGGER_DEBUG); @@ -3589,28 +3592,16 @@ class Diaspora { */ public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false) { + self::$new = true; + $itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]); - // Check whether the retraction is for a top-level post or whether it's a relayable - if ($item["uri"] !== $item["parent-uri"]) { - $msg_type = "relayable_retraction"; - $target_type = (($item["verb"] === ACTIVITY_LIKE) ? "Like" : "Comment"); - } else { - $msg_type = "signed_retraction"; - $target_type = "StatusMessage"; - } + $msg_type = "retraction"; + $target_type = "Post"; - if ($relay && ($item["uri"] !== $item["parent-uri"])) - $signature = "parent_author_signature"; - else - $signature = "target_author_signature"; - - $signed_text = $item["guid"].";".$target_type; - - $message = array("target_guid" => $item['guid'], - "target_type" => $target_type, - "sender_handle" => $itemaddr, - $signature => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))); + $message = array("author" => $itemaddr, + "target_guid" => $item['guid'], + "target_type" => $target_type); logger("Got message ".print_r($message, true), LOGGER_DEBUG); From a453ae4f66319eda31487d49db7f7ae1b3e65fd0 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 15 Jun 2017 21:45:36 +0000 Subject: [PATCH 084/160] Removed unneeded stuff --- include/diaspora.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index ff3caa5744..a134c5e254 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2502,7 +2502,6 @@ class Diaspora { case "Comment": case "Like": case "Post": - return self::item_retraction($importer, $contact, $data); case "Reshare": case "StatusMessage": return self::item_retraction($importer, $contact, $data); @@ -3645,18 +3644,12 @@ class Diaspora { $body = bb2diaspora($item["body"]); $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); - $signed_text = $item["guid"].";".$cnv["guid"].";".$body.";".$created.";".$myaddr.";".$cnv['guid']; - $sig = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256")); - $msg = array( "author" => $myaddr, "guid" => $item["guid"], "conversation_guid" => $cnv["guid"], "text" => $body, "created_at" => $created, - //"parent_guid" => $cnv["guid"], - //"parent_author_signature" => $sig, - //"author_signature" => $sig, ); if ($item["reply"]) { From 0dc1c932f8e403fc64c390b5887598758719fd3f Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Fri, 16 Jun 2017 05:21:25 +0000 Subject: [PATCH 085/160] We now should send all data in the new format --- include/diaspora.php | 71 +++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 43 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index a134c5e254..6b899a2799 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -29,8 +29,6 @@ require_once 'include/cache.php'; */ class Diaspora { - private static $new = false; - /** * @brief Return a list of relay servers * @@ -2843,6 +2841,8 @@ class Diaspora { */ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) { + //$new = Config::get('system', 'new_diaspora', null, true); + if ($public) $magic_env = self::build_public_message($msg,$user,$contact,$prvkey,$pubkey); else @@ -2951,11 +2951,8 @@ class Diaspora { */ public static function build_post_xml($type, $message) { - if (!self::$new) { - $data = array("XML" => array("post" => array($type => $message))); - } else { - $data = array($type => $message); - } + $data = array($type => $message); + return xml::from_array($data, $xml); } @@ -3006,12 +3003,15 @@ class Diaspora { */ public static function send_share($owner,$contact) { - $message = array("sender_handle" => self::my_handle($owner), - "recipient_handle" => $contact["addr"]); + /// @todo support the different possible combinations of "following" and "sharing" + $message = array("author" => self::my_handle($owner), + "recipient" => $contact["addr"], + "following" => "true", + "sharing" => "true"); logger("Send share ".print_r($message, true), LOGGER_DEBUG); - return self::build_and_transmit($owner, $contact, "request", $message); + return self::build_and_transmit($owner, $contact, "contact", $message); } /** @@ -3024,8 +3024,6 @@ class Diaspora { */ public static function send_unshare($owner,$contact) { - self::$new = true; - $message = array("author" => self::my_handle($owner), "target_guid" => $owner["guid"], "target_type" => "Person"); @@ -3201,8 +3199,6 @@ class Diaspora { */ public static function build_status($item, $owner) { - self::$new = true; - $cachekey = "diaspora:build_status:".$item['guid']; $result = Cache::get($cachekey); @@ -3216,8 +3212,6 @@ class Diaspora { $created = datetime_convert("UTC", "UTC", $item["created"], 'Y-m-d\TH:i:s\Z'); - //self::$new = Config::get('system', 'new_diaspora', null, true); - // Detect a share element and do a reshare if (!$item['private'] && ($ret = self::is_reshare($item["body"]))) { $message = array("author" => $myaddr, @@ -3320,8 +3314,6 @@ class Diaspora { */ private static function construct_like($item, $owner) { - self::$new = true; - $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3354,8 +3346,6 @@ class Diaspora { */ private static function construct_attend($item, $owner) { - self::$new = true; - $p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($item["thr-parent"])); if (!dbm::is_result($p)) @@ -3395,8 +3385,6 @@ class Diaspora { */ private static function construct_comment($item, $owner) { - self::$new = true; - $cachekey = "diaspora:construct_comment:".$item['guid']; $result = Cache::get($cachekey); @@ -3479,19 +3467,17 @@ class Diaspora { $signed_parts = explode(";", $signature['signed_text']); if ($item["deleted"]) - $message = array("parent_author_signature" => "", + $message = array("author" => $signature['signer'], "target_guid" => $signed_parts[0], - "target_type" => $signed_parts[1], - "sender_handle" => $signature['signer'], - "target_author_signature" => $signature['signature']); + "target_type" => $signed_parts[1]); elseif ($item['verb'] === ACTIVITY_LIKE) - $message = array("positive" => $signed_parts[0], + $message = array("author" => $signed_parts[4], "guid" => $signed_parts[1], - "target_type" => $signed_parts[2], "parent_guid" => $signed_parts[3], - "parent_author_signature" => "", + "parent_type" => $signed_parts[2], + "positive" => $signed_parts[0], "author_signature" => $signature['signature'], - "diaspora_handle" => $signed_parts[4]); + "parent_author_signature" => ""); else { // Remove the comment guid $guid = array_shift($signed_parts); @@ -3505,12 +3491,12 @@ class Diaspora { // Glue the parts together $text = implode(";", $signed_parts); - $message = array("guid" => $guid, + $message = array("author" => $handle, + "guid" => $guid, "parent_guid" => $parent_guid, - "parent_author_signature" => "", - "author_signature" => $signature['signature'], "text" => implode(";", $signed_parts), - "diaspora_handle" => $handle); + "author_signature" => $signature['signature'], + "parent_author_signature" => ""); } return $message; } @@ -3559,10 +3545,12 @@ class Diaspora { if (is_array($msg)) { foreach ($msg AS $field => $data) { if (!$item["deleted"]) { - if ($field == "author") - $field = "diaspora_handle"; - if ($field == "parent_type") - $field = "target_type"; + if ($field == "diaspora_handle") { + $field = "author"; + } + if ($field == "target_type") { + $field = "parent_type"; + } } $message[$field] = $data; @@ -3591,8 +3579,6 @@ class Diaspora { */ public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false) { - self::$new = true; - $itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]); $msg_type = "retraction"; @@ -3618,8 +3604,6 @@ class Diaspora { */ public static function send_mail($item, $owner, $contact) { - self::$new = true; - $myaddr = self::my_handle($owner); $r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -3737,7 +3721,7 @@ class Diaspora { $tags = trim($tags); } - $message = array("diaspora_handle" => $handle, + $message = array("author" => $handle, "first_name" => $first, "last_name" => $last, "image_url" => $large, @@ -3748,6 +3732,7 @@ class Diaspora { "bio" => $about, "location" => $location, "searchable" => $searchable, + "nsfw" => "false", "tag_string" => $tags); foreach ($recips as $recip) { From c031482d7d12b6a20f2f7a17d09888f0182f01b1 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Fri, 16 Jun 2017 16:39:17 +0000 Subject: [PATCH 086/160] "unsharing" is now done different --- include/diaspora.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 6b899a2799..696a612bbc 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -3001,9 +3001,15 @@ class Diaspora { * * @return int The result of the transmission */ - public static function send_share($owner,$contact) { + public static function send_share($owner, $contact) { /// @todo support the different possible combinations of "following" and "sharing" +/* + if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) { + $new_relation = CONTACT_IS_FRIEND; + $new_relation = CONTACT_IS_SHARING; + $new_relation = CONTACT_IS_FOLLOWER; +*/ $message = array("author" => self::my_handle($owner), "recipient" => $contact["addr"], "following" => "true", @@ -3022,15 +3028,16 @@ class Diaspora { * * @return int The result of the transmission */ - public static function send_unshare($owner,$contact) { + public static function send_unshare($owner, $contact) { $message = array("author" => self::my_handle($owner), - "target_guid" => $owner["guid"], - "target_type" => "Person"); + "recipient" => $contact["addr"], + "following" => "false", + "sharing" => "false"); logger("Send unshare ".print_r($message, true), LOGGER_DEBUG); - return self::build_and_transmit($owner, $contact, "retraction", $message); + return self::build_and_transmit($owner, $contact, "contact", $message); } /** From 9c4bf6b0d5cd404b54695a1398265d21c6b3b3af Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Fri, 16 Jun 2017 20:57:35 +0000 Subject: [PATCH 087/160] The new envelope could work now --- include/diaspora.php | 90 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 14 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 696a612bbc..b8462f6631 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2659,15 +2659,54 @@ class Diaspora { return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3); } + /** - * @brief Creates the envelope for the "fetch" endpoint + * @brief Creates the data for a private message in the new format + * + * @param string $msg The message that is to be transmitted + * @param array $user The record of the sender + * @param array $contact Target of the communication + * @param string $prvkey The private key of the sender + * @param string $pubkey The public key of the receiver + * + * @return string The encrypted data + */ + public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey) { + + logger("Message: ".$msg, LOGGER_DATA); + + // without a public key nothing will work + if (!$pubkey) { + logger("pubkey missing: contact id: ".$contact["id"]); + return false; + } + + $aes_key = openssl_random_pseudo_bytes(32); + $b_aes_key = base64_encode($aes_key); + $iv = openssl_random_pseudo_bytes(16); + $b_iv = base64_encode($iv); + + $ciphertext = self::aes_encrypt($aes_key, $iv, $msg); + + $json = json_encode(array("iv" => $b_iv, "key" => $b_aes_key)); + + $encrypted_key_bundle = ""; + openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey); + + $json_object = json_encode(array("aes_key" => base64_encode($encrypted_key_bundle), + "encrypted_magic_envelope" => base64_encode($ciphertext))); + + return $json_object; + } + + /** + * @brief Creates the envelope for the "fetch" endpoint and for the new format * * @param string $msg The message that is to be transmitted * @param array $user The record of the sender * * @return string The envelope */ - public static function build_magic_envelope($msg, $user) { $b64url_data = base64url_encode($msg); @@ -2841,13 +2880,22 @@ class Diaspora { */ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) { - //$new = Config::get('system', 'new_diaspora', null, true); + $new = Config::get('system', 'new_diaspora', null, true); - if ($public) - $magic_env = self::build_public_message($msg,$user,$contact,$prvkey,$pubkey); - else - $magic_env = self::build_private_message($msg,$user,$contact,$prvkey,$pubkey); + if ($new) { + if ($public) { + $msg = Diaspora::encode_private_data($msg, $user, $contact, $prvkey, $pubkey); + } + $slap = Diaspora::build_magic_envelope($msg, $user); + return $slap; + } + + if ($public) { + $magic_env = self::build_public_message($msg, $user, $contact, $prvkey, $pubkey); + } else { + $magic_env = self::build_private_message($msg, $user, $contact, $prvkey, $pubkey); + } // The data that will be transmitted is double encoded via "urlencode", strange ... $slap = "xml=".urlencode(urlencode($magic_env)); return $slap; @@ -3003,13 +3051,27 @@ class Diaspora { */ public static function send_share($owner, $contact) { - /// @todo support the different possible combinations of "following" and "sharing" -/* - if (in_array($contact["rel"], array(CONTACT_IS_FRIEND, CONTACT_IS_FOLLOWER))) { - $new_relation = CONTACT_IS_FRIEND; - $new_relation = CONTACT_IS_SHARING; - $new_relation = CONTACT_IS_FOLLOWER; -*/ + /** + * @todo support the different possible combinations of "following" and "sharing" + * Currently, Diaspora only interprets the "sharing" field + * + * Before switching this code productive, we have to check all "send_share" calls if "rel" is set correctly + */ + + /* + switch ($contact["rel"]) { + case CONTACT_IS_FRIEND: + $following = true; + $sharing = true; + case CONTACT_IS_SHARING: + $following = false; + $sharing = true; + case CONTACT_IS_FOLLOWER: + $following = true; + $sharing = false; + } + */ + $message = array("author" => self::my_handle($owner), "recipient" => $contact["addr"], "following" => "true", From 2ee8d1694f85c15bf4f331c048b7c67045db734f Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Fri, 16 Jun 2017 21:01:56 +0000 Subject: [PATCH 088/160] Added documentation --- include/diaspora.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index b8462f6631..ac87bcacb3 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -4,8 +4,8 @@ * @brief The implementation of the diaspora protocol * * The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html - * Currently this implementation here interprets the old and the new protocol and sends the old one. - * This will change in the future. + * This implementation here interprets the old and the new protocol and sends the new one. + * In the future we will remove most stuff from "valid_posting" and interpret only the new protocol. */ use Friendica\App; @@ -2883,7 +2883,7 @@ class Diaspora { $new = Config::get('system', 'new_diaspora', null, true); if ($new) { - if ($public) { + if (!$public) { $msg = Diaspora::encode_private_data($msg, $user, $contact, $prvkey, $pubkey); } From d7b411e9bc7c115bcb88ce362ef7f211fff2c868 Mon Sep 17 00:00:00 2001 From: AndyHee <andy@hubup.pro> Date: Sat, 17 Jun 2017 12:36:14 +0700 Subject: [PATCH 089/160] Corrected names of account-types --- mod/admin.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 98558a6de4..81fa1fb575 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -558,11 +558,11 @@ function admin_page_summary(App $a) { $r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`"); $accounts = array( array(t('Normal Account'), 0), - array(t('Soapbox Account'), 0), - array(t('Community/Celebrity Account'), 0), + array(t('Automatic Follower Account'), 0), + array(t('Public Forum Account'), 0), array(t('Automatic Friend Account'), 0), array(t('Blog Account'), 0), - array(t('Private Forum'), 0) + array(t('Private Forum Account'), 0) ); $users=0; @@ -1451,8 +1451,8 @@ function admin_page_users(App $a) { $_setup_users = function ($e) use ($adminlist) { $accounts = array( t('Normal Account'), - t('Soapbox Account'), - t('Community/Celebrity Account'), + t('Automatic Follower Account'), + t('Public Forum Account'), t('Automatic Friend Account') ); $e['page-flags'] = $accounts[$e['page-flags']]; From e33ac224b00e243601d37dd622d7c5fc3a172be3 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sat, 17 Jun 2017 08:58:28 +0000 Subject: [PATCH 090/160] Now the Salmons flys --- include/diaspora.php | 181 ++++++------------------------------------- 1 file changed, 22 insertions(+), 159 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index ac87bcacb3..671bb34ae5 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2717,7 +2717,12 @@ class Diaspora { $encoding = "base64url"; $alg = "RSA-SHA256"; $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg); - $signature = rsa_sign($signable_data, $user["prvkey"]); + + // Fallback if the private key wasn't transmitted in the expected field + if ($user['uprvkey'] == "") + $user['uprvkey'] = $user['prvkey']; + + $signature = rsa_sign($signable_data, $user["uprvkey"]); $sig = base64url_encode($signature); $xmldata = array("me:env" => array("me:data" => $data, @@ -2732,140 +2737,6 @@ class Diaspora { return xml::from_array($xmldata, $xml, false, $namespaces); } - /** - * @brief Creates the envelope for a public message - * - * @param string $msg The message that is to be transmitted - * @param array $user The record of the sender - * @param array $contact Target of the communication - * @param string $prvkey The private key of the sender - * @param string $pubkey The public key of the receiver - * - * @return string The envelope - */ - private static function build_public_message($msg, $user, $contact, $prvkey, $pubkey) { - - logger("Message: ".$msg, LOGGER_DATA); - - $handle = self::my_handle($user); - - $b64url_data = base64url_encode($msg); - - $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data); - - $type = "application/xml"; - $encoding = "base64url"; - $alg = "RSA-SHA256"; - - $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg); - - $signature = rsa_sign($signable_data,$prvkey); - $sig = base64url_encode($signature); - - $xmldata = array("diaspora" => array("header" => array("author_id" => $handle), - "me:env" => array("me:encoding" => $encoding, - "me:alg" => $alg, - "me:data" => $data, - "@attributes" => array("type" => $type), - "me:sig" => $sig))); - - $namespaces = array("" => "https://joindiaspora.com/protocol", - "me" => "http://salmon-protocol.org/ns/magic-env"); - - $magic_env = xml::from_array($xmldata, $xml, false, $namespaces); - - logger("magic_env: ".$magic_env, LOGGER_DATA); - return $magic_env; - } - - /** - * @brief Creates the envelope for a private message - * - * @param string $msg The message that is to be transmitted - * @param array $user The record of the sender - * @param array $contact Target of the communication - * @param string $prvkey The private key of the sender - * @param string $pubkey The public key of the receiver - * - * @return string The envelope - */ - private static function build_private_message($msg, $user, $contact, $prvkey, $pubkey) { - - logger("Message: ".$msg, LOGGER_DATA); - - // without a public key nothing will work - - if (!$pubkey) { - logger("pubkey missing: contact id: ".$contact["id"]); - return false; - } - - $inner_aes_key = openssl_random_pseudo_bytes(32); - $b_inner_aes_key = base64_encode($inner_aes_key); - $inner_iv = openssl_random_pseudo_bytes(16); - $b_inner_iv = base64_encode($inner_iv); - - $outer_aes_key = openssl_random_pseudo_bytes(32); - $b_outer_aes_key = base64_encode($outer_aes_key); - $outer_iv = openssl_random_pseudo_bytes(16); - $b_outer_iv = base64_encode($outer_iv); - - $handle = self::my_handle($user); - - $inner_encrypted = self::aes_encrypt($inner_aes_key, $inner_iv, $msg); - - $b64_data = base64_encode($inner_encrypted); - - - $b64url_data = base64url_encode($b64_data); - $data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data); - - $type = "application/xml"; - $encoding = "base64url"; - $alg = "RSA-SHA256"; - - $signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg); - - $signature = rsa_sign($signable_data,$prvkey); - $sig = base64url_encode($signature); - - $xmldata = array("decrypted_header" => array("iv" => $b_inner_iv, - "aes_key" => $b_inner_aes_key, - "author_id" => $handle)); - - $decrypted_header = xml::from_array($xmldata, $xml, true); - - $ciphertext = self::aes_encrypt($outer_aes_key, $outer_iv, $decrypted_header); - - $outer_json = json_encode(array("iv" => $b_outer_iv, "key" => $b_outer_aes_key)); - - $encrypted_outer_key_bundle = ""; - openssl_public_encrypt($outer_json, $encrypted_outer_key_bundle, $pubkey); - - $b64_encrypted_outer_key_bundle = base64_encode($encrypted_outer_key_bundle); - - logger("outer_bundle: ".$b64_encrypted_outer_key_bundle." key: ".$pubkey, LOGGER_DATA); - - $encrypted_header_json_object = json_encode(array("aes_key" => base64_encode($encrypted_outer_key_bundle), - "ciphertext" => base64_encode($ciphertext))); - $cipher_json = base64_encode($encrypted_header_json_object); - - $xmldata = array("diaspora" => array("encrypted_header" => $cipher_json, - "me:env" => array("me:encoding" => $encoding, - "me:alg" => $alg, - "me:data" => $data, - "@attributes" => array("type" => $type), - "me:sig" => $sig))); - - $namespaces = array("" => "https://joindiaspora.com/protocol", - "me" => "http://salmon-protocol.org/ns/magic-env"); - - $magic_env = xml::from_array($xmldata, $xml, false, $namespaces); - - logger("magic_env: ".$magic_env, LOGGER_DATA); - return $magic_env; - } - /** * @brief Create the envelope for a message * @@ -2880,25 +2751,15 @@ class Diaspora { */ private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) { - $new = Config::get('system', 'new_diaspora', null, true); + // The message is put into an envelope with the sender's signature + $envelope = self::build_magic_envelope($msg, $user); - if ($new) { - if (!$public) { - $msg = Diaspora::encode_private_data($msg, $user, $contact, $prvkey, $pubkey); - } - - $slap = Diaspora::build_magic_envelope($msg, $user); - return $slap; + // Private messages are put into a second envelope, encrypted with the receivers public key + if (!$public) { + $envelope = self::encode_private_data($envelope, $user, $contact, $prvkey, $pubkey); } - if ($public) { - $magic_env = self::build_public_message($msg, $user, $contact, $prvkey, $pubkey); - } else { - $magic_env = self::build_private_message($msg, $user, $contact, $prvkey, $pubkey); - } - // The data that will be transmitted is double encoded via "urlencode", strange ... - $slap = "xml=".urlencode(urlencode($magic_env)); - return $slap; + return $envelope; } /** @@ -2924,14 +2785,14 @@ class Diaspora { * * @param array $owner the array of the item owner * @param array $contact Target of the communication - * @param string $slap The message that is to be transmitted + * @param string $envelope The message that is to be transmitted * @param bool $public_batch Is it a public post? * @param bool $queue_run Is the transmission called from the queue? * @param string $guid message guid * * @return int Result of the transmission */ - public static function transmit($owner, $contact, $slap, $public_batch, $queue_run=false, $guid = "") { + public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run=false, $guid = "") { $a = get_app(); @@ -2952,7 +2813,9 @@ class Diaspora { $return_code = 0; } else { if (!intval(get_config("system", "diaspora_test"))) { - post_url($dest_url."/", $slap); + $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json"); + + post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type)); $return_code = $a->get_curl_code(); } else { logger("test_mode"); @@ -2968,14 +2831,14 @@ class Diaspora { $r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1", intval($contact["id"]), dbesc(NETWORK_DIASPORA), - dbesc($slap), + dbesc($envelope), intval($public_batch) ); if ($r) { logger("add_to_queue ignored - identical item already in queue"); } else { // queue message for redelivery - add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch); + add_to_queue($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch); // The message could not be delivered. We mark the contact as "dead" mark_for_death($contact); @@ -3028,13 +2891,13 @@ class Diaspora { if ($owner['uprvkey'] == "") $owner['uprvkey'] = $owner['prvkey']; - $slap = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch); + $envelope = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch); if ($spool) { - add_to_queue($contact['id'], NETWORK_DIASPORA, $slap, $public_batch); + add_to_queue($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch); return true; } else - $return_code = self::transmit($owner, $contact, $slap, $public_batch, false, $guid); + $return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid); logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG); From cf179188b6b2a341c2d91c253370feab95c7e0a4 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sat, 17 Jun 2017 13:58:18 +0000 Subject: [PATCH 091/160] Some more worker fine tuning --- boot.php | 2 +- doc/htconfig.md | 2 +- include/cron.php | 3 +++ include/dbstructure.php | 1 + include/poller.php | 51 +++++++++++++++++++++++++++++------------ mod/display.php | 5 +++- update.php | 2 +- 7 files changed, 47 insertions(+), 19 deletions(-) diff --git a/boot.php b/boot.php index b93810d774..cfb82f5381 100644 --- a/boot.php +++ b/boot.php @@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.3-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1229 ); +define ( 'DB_UPDATE_VERSION', 1230 ); /** * @brief Constant with a HTML line break. diff --git a/doc/htconfig.md b/doc/htconfig.md index ed2c816dea..a452ecfc14 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -37,7 +37,6 @@ Example: To set the directory value please add this line to your .htconfig.php: * **dbclean** (Boolean) - Enable the automatic database cleanup process * **dbclean-expire-days** (Integer) - Days after which remote items will be deleted. Own items, and marked or filed items are kept. * **default_service_class** - -* **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker) * **diaspora_test** (Boolean) - For development only. Disables the message transfer. * **directory** - The path to global directory. If not set then "http://dir.friendica.social" is used. * **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS. @@ -69,6 +68,7 @@ Example: To set the directory value please add this line to your .htconfig.php: * **paranoia** (Boolean) - Log out users if their IP address changed. * **permit_crawling** (Boolean) - Restricts the search for not logged in users to one search per minute. * **worker_debug** (Boolean) - If enabled, it prints out the number of running processes split by priority. +* **worker_fetch_limit** - Number of worker tasks that are fetched in a single query. Default is 5. * **profiler** (Boolean) - Enable internal timings to help optimize code. Needed for "rendertime" addon. Default is false. * **free_crawls** - Number of "free" searches when "permit_crawling" is activated (Default value is 10) * **crawl_permit_period** - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60) diff --git a/include/cron.php b/include/cron.php index 76f3e41019..9c2e6aeaa3 100644 --- a/include/cron.php +++ b/include/cron.php @@ -82,6 +82,9 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_MEDIUM, 'include/dbclean.php'); proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_photo_albums"); + + // Delete all done workerqueue entries + dba::delete('workerqueue', array('done' => true)); } // Poll contacts diff --git a/include/dbstructure.php b/include/dbstructure.php index 8ab9bf9d58..9b4921eb83 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1739,6 +1739,7 @@ function db_definition() { "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" => NULL_DATE), + "done" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"), ), "indexes" => array( "PRIMARY" => array("id"), diff --git a/include/poller.php b/include/poller.php index ef6fbd69de..816bcb53ec 100644 --- a/include/poller.php +++ b/include/poller.php @@ -18,7 +18,9 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) { require_once("boot.php"); function poller_run($argv, $argc){ - global $a, $db; + global $a, $db, $poller_up_start; + + $poller_up_start = microtime(true); $a = new App(dirname(__DIR__)); @@ -129,7 +131,7 @@ function poller_run($argv, $argc){ * @return integer Number of non executed entries in the worker queue */ function poller_total_entries() { - $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE)); + $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s' AND NOT `done`", dbesc(NULL_DATE)); if (dbm::is_result($s)) { return $s[0]["total"]; } else { @@ -143,7 +145,7 @@ function poller_total_entries() { * @return integer Number of active poller processes */ function poller_highest_priority() { - $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority` LIMIT 1", dbesc(NULL_DATE)); + $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` <= '%s' AND NOT `done` ORDER BY `priority` LIMIT 1", dbesc(NULL_DATE)); if (dbm::is_result($s)) { return $s[0]["priority"]; } else { @@ -159,7 +161,7 @@ function poller_highest_priority() { * @return integer Is there a process running with that priority? */ function poller_process_with_priority_active($priority) { - $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` > '%s' LIMIT 1", + $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` > '%s' AND NOT `done` LIMIT 1", intval($priority), dbesc(NULL_DATE)); return dbm::is_result($s); } @@ -172,6 +174,7 @@ function poller_process_with_priority_active($priority) { * @return boolean "true" if further processing should be stopped */ function poller_execute($queue) { + global $poller_db_duration; $a = get_app(); @@ -212,9 +215,13 @@ function poller_execute($queue) { if (function_exists($funcname)) { poller_exec_function($queue, $funcname, $argv); - dba::delete('workerqueue', array('id' => $queue["id"])); + + $stamp = (float)microtime(true); + dba::update('workerqueue', array('done' => true), array('id' => $queue["id"])); + $poller_db_duration = (microtime(true) - $stamp); } else { logger("Function ".$funcname." does not exist"); + dba::delete('workerqueue', array('id' => $queue["id"])); } return true; @@ -228,6 +235,7 @@ function poller_execute($queue) { * @param array $argv Array of values to be passed to the function */ function poller_exec_function($queue, $funcname, $argv) { + global $poller_up_start, $poller_db_duration; $a = get_app(); @@ -260,6 +268,8 @@ function poller_exec_function($queue, $funcname, $argv) { $a->process_id = uniqid("wrk", true); $a->queue = $queue; + $up_duration = number_format(microtime(true) - $poller_up_start, 3); + $funcname($argv, $argc); $a->process_id = $old_process_id; @@ -267,6 +277,15 @@ function poller_exec_function($queue, $funcname, $argv) { $duration = number_format(microtime(true) - $stamp, 3); + $poller_up_start = microtime(true); + + /** With these values we can analyze how effective the worker is. + * The database and rest time should be low since this is the unproductive time. + * The execution time is the productive time. + * By changing parameters like the maximum number of workers we can check the effectivness. + */ + logger('DB: '.number_format($poller_db_duration, 2).' - Rest: '.number_format($up_duration - $poller_db_duration, 2).' - Execution: '.number_format($duration, 2), LOGGER_DEBUG); + if ($duration > 3600) { logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG); } elseif ($duration > 600) { @@ -419,7 +438,7 @@ function poller_max_connections_reached() { * */ function poller_kill_stale_workers() { - $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > '%s'", dbesc(NULL_DATE)); + $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > '%s' AND NOT `done`", dbesc(NULL_DATE)); if (!dbm::is_result($r)) { // No processing here needed @@ -493,16 +512,16 @@ function poller_too_much_workers() { $listitem = array(); // Adding all processes with no workerqueue entry - $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS (SELECT id FROM `workerqueue` WHERE `workerqueue`.`pid` = `process`.`pid`)"); + $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS (SELECT id FROM `workerqueue` WHERE `workerqueue`.`pid` = `process`.`pid` AND NOT `done`)"); if ($process = dba::fetch($processes)) { $listitem[0] = "0:".$process["running"]; } dba::close($processes); // Now adding all processes with workerqueue entries - $entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` GROUP BY `priority`"); + $entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` AND NOT `done` GROUP BY `priority`"); while ($entry = dba::fetch($entries)) { - $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` WHERE `priority` = ?", $entry["priority"]); + $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]); if ($process = dba::fetch($processes)) { $listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"]; } @@ -564,7 +583,7 @@ function poller_passing_slow(&$highest_priority) { $r = q("SELECT `priority` FROM `process` - INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid`"); + INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done`"); // No active processes at all? Fine if (!dbm::is_result($r)) { @@ -609,12 +628,13 @@ function find_worker_processes() { // Check if we should pass some low priority process $highest_priority = 0; $found = false; + $limit = Config::get('system', 'worker_fetch_limit', 5); if (poller_passing_slow($highest_priority)) { // Are there waiting processes with a higher priority than the currently highest? $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? - WHERE `executed` <= ? AND `priority` < ? - ORDER BY `priority`, `created` LIMIT 5", + WHERE `executed` <= ? AND `priority` < ? AND NOT `done` + ORDER BY `priority`, `created` LIMIT ".intval($limit), datetime_convert(), getmypid(), NULL_DATE, $highest_priority); if ($result) { $found = (dba::affected_rows() > 0); @@ -623,7 +643,7 @@ function find_worker_processes() { if (!$found) { // Give slower processes some processing time $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? - WHERE `executed` <= ? AND `priority` > ? + WHERE `executed` <= ? AND `priority` > ? AND NOT `done` ORDER BY `priority`, `created` LIMIT 1", datetime_convert(), getmypid(), NULL_DATE, $highest_priority); if ($result) { @@ -634,7 +654,7 @@ function find_worker_processes() { // If there is no result (or we shouldn't pass lower processes) we check without priority limit if (!$found) { - $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? ORDER BY `priority`, `created` LIMIT 5", + $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), datetime_convert(), getmypid(), NULL_DATE); if ($result) { $found = (dba::affected_rows() > 0); @@ -649,12 +669,13 @@ function find_worker_processes() { * @return string SQL statement */ function poller_worker_process() { + global $poller_db_duration; $stamp = (float)microtime(true); $found = find_worker_processes(); - logger('Duration: '.number_format(microtime(true) - $stamp, 3), LOGGER_DEBUG); + $poller_db_duration += (microtime(true) - $stamp); if ($found) { $r = q("SELECT * FROM `workerqueue` WHERE `pid` = %d", intval(getmypid())); diff --git a/mod/display.php b/mod/display.php index a9816b06ce..0d347882e2 100644 --- a/mod/display.php +++ b/mod/display.php @@ -17,9 +17,12 @@ function display_init(App $a) { if (substr($a->argv[2], -5) == '.atom') { $item_id = substr($a->argv[2], 0, -5); $xml = dfrn::itemFeed($item_id); + if ($xml == '') { + http_status_exit(500); + } header("Content-type: application/atom+xml"); echo $xml; - http_status_exit(($xml) ? 200 : 500); + killme(); } } diff --git a/update.php b/update.php index aaa7aa0b9e..09f11918c5 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define('UPDATE_VERSION' , 1229); +define('UPDATE_VERSION' , 1230); /** * From ec8a9451892dba5be719b08182a2bf3cd9737939 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sat, 17 Jun 2017 14:15:17 +0000 Subject: [PATCH 092/160] Corrected query --- include/poller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index 816bcb53ec..55aa82a3f5 100644 --- a/include/poller.php +++ b/include/poller.php @@ -519,7 +519,7 @@ function poller_too_much_workers() { dba::close($processes); // Now adding all processes with workerqueue entries - $entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` AND NOT `done` GROUP BY `priority`"); + $entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`"); while ($entry = dba::fetch($entries)) { $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]); if ($process = dba::fetch($processes)) { From fda4cd60012265650695fc7e2440bbea21c89907 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sat, 17 Jun 2017 19:13:40 +0000 Subject: [PATCH 093/160] Changed documentation --- doc/database/db_workerqueue.md | 1 + include/poller.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md index 8ab68466be..182358a4c4 100644 --- a/doc/database/db_workerqueue.md +++ b/doc/database/db_workerqueue.md @@ -9,5 +9,6 @@ Table workerqueue | created | | datetime | NO | MUL | 0001-01-01 00:00:00 | | | pid | | int(11) | NO | | 0 | | | executed | | datetime | NO | | 0001-01-01 00:00:00 | | +| done | set to 1 if done | tinyint(1) | NO | | 0 | | Return to [database documentation](help/database) diff --git a/include/poller.php b/include/poller.php index 55aa82a3f5..29a31a96f8 100644 --- a/include/poller.php +++ b/include/poller.php @@ -279,7 +279,7 @@ function poller_exec_function($queue, $funcname, $argv) { $poller_up_start = microtime(true); - /** With these values we can analyze how effective the worker is. + /* With these values we can analyze how effective the worker is. * The database and rest time should be low since this is the unproductive time. * The execution time is the productive time. * By changing parameters like the maximum number of workers we can check the effectivness. From 470556764b16e5669f1a014690bcd57a8707c9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Sun, 18 Jun 2017 22:10:03 +0200 Subject: [PATCH 094/160] Fixed some stuff as requested by @Hypolite MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/security.php | 68 +++++++++---------- include/socgraph.php | 154 ++++++++++++++++++++++++++----------------- 2 files changed, 126 insertions(+), 96 deletions(-) diff --git a/include/security.php b/include/security.php index ac462d1df1..51fb6f7259 100644 --- a/include/security.php +++ b/include/security.php @@ -235,7 +235,7 @@ function can_write_wall(App $a, $owner) { } -function permissions_sql($owner_id,$remote_verified = false,$groups = null) { +function permissions_sql($owner_id, $remote_verified = false, $groups = null) { $local_user = local_user(); $remote_user = remote_user(); @@ -245,7 +245,6 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { * * default permissions - anonymous user */ - $sql = " AND allow_cid = '' AND allow_gid = '' AND deny_cid = '' @@ -258,17 +257,14 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { if (($local_user) && ($local_user == $owner_id)) { $sql = ''; - } - - /** - * Authenticated visitor. Unless pre-verified, - * check that the contact belongs to this $owner_id - * and load the groups the visitor belongs to. - * If pre-verified, the caller is expected to have already - * done this and passed the groups into this function. - */ - - elseif ($remote_user) { + } elseif ($remote_user) { + /* + * Authenticated visitor. Unless pre-verified, + * check that the contact belongs to this $owner_id + * and load the groups the visitor belongs to. + * If pre-verified, the caller is expected to have already + * done this and passed the groups into this function. + */ if (! $remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", @@ -289,7 +285,9 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { $gs .= '|<' . intval($g) . '>'; } - /*$sql = sprintf( + /* + * @TODO old-lost code found? + $sql = sprintf( " AND ( allow_cid = '' OR allow_cid REGEXP '<%d>' ) AND ( deny_cid = '' OR NOT deny_cid REGEXP '<%d>' ) AND ( allow_gid = '' OR allow_gid REGEXP '%s' ) @@ -299,7 +297,8 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { intval($remote_user), dbesc($gs), dbesc($gs) - );*/ + ); + */ $sql = sprintf( " AND ( NOT (deny_cid REGEXP '<%d>' OR deny_gid REGEXP '%s') AND ( allow_cid REGEXP '<%d>' OR allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '') ) @@ -316,7 +315,7 @@ function permissions_sql($owner_id,$remote_verified = false,$groups = null) { } -function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) { +function item_permissions_sql($owner_id, $remote_verified = false, $groups = null) { $local_user = local_user(); $remote_user = remote_user(); @@ -326,7 +325,6 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) * * default permissions - anonymous user */ - $sql = " AND `item`.allow_cid = '' AND `item`.allow_gid = '' AND `item`.deny_cid = '' @@ -337,21 +335,16 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) /** * Profile owner - everything is visible */ - if ($local_user && ($local_user == $owner_id)) { $sql = ''; - } - - /** - * Authenticated visitor. Unless pre-verified, - * check that the contact belongs to this $owner_id - * and load the groups the visitor belongs to. - * If pre-verified, the caller is expected to have already - * done this and passed the groups into this function. - */ - - elseif ($remote_user) { - + } elseif ($remote_user) { + /* + * Authenticated visitor. Unless pre-verified, + * check that the contact belongs to this $owner_id + * and load the groups the visitor belongs to. + * If pre-verified, the caller is expected to have already + * done this and passed the groups into this function. + */ if (! $remote_verified) { $r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1", intval($remote_user), @@ -367,8 +360,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null) $gs = '<<>>'; // should be impossible to match if (is_array($groups) && count($groups)) { - foreach ($groups as $g) + foreach ($groups as $g) { $gs .= '|<' . intval($g) . '>'; + } } $sql = sprintf( @@ -419,7 +413,11 @@ function get_form_security_token($typename = '') { } function check_form_security_token($typename = '', $formname = 'form_security_token') { - if (!x($_REQUEST, $formname)) return false; + if (!x($_REQUEST, $formname)) { + return false; + } + + /// @TODO Careful, not secured! $hash = $_REQUEST[$formname]; $max_livetime = 10800; // 3 hours @@ -427,7 +425,9 @@ function check_form_security_token($typename = '', $formname = 'form_security_to $a = get_app(); $x = explode('.', $hash); - if (time() > (IntVal($x[0]) + $max_livetime)) return false; + if (time() > (IntVal($x[0]) + $max_livetime)) { + return false; + } $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $x[0] . $typename); @@ -448,7 +448,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '', } function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') { if (!check_form_security_token($typename, $formname)) { - $a = get_app(); + $a = get_app(); logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename); logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA); header('HTTP/1.1 403 Forbidden'); diff --git a/include/socgraph.php b/include/socgraph.php index 7fa73a45ca..aea2175d44 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -63,12 +63,14 @@ function poco_load_worker($cid, $uid, $zcid, $url) { $uid = $r[0]['uid']; } } - if (! $uid) + if (! $uid) { return; + } } - if (! $url) + if (! $url) { return; + } $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation') ; @@ -80,15 +82,17 @@ function poco_load_worker($cid, $uid, $zcid, $url) { logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG); - if (($a->get_curl_code() > 299) || (! $s)) + if (($a->get_curl_code() > 299) || (! $s)) { return; + } $j = json_decode($s); logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA); - if (! isset($j->entry)) + if (! isset($j->entry)) { return; + } $total = 0; foreach ($j->entry as $entry) { @@ -160,8 +164,9 @@ function poco_load_worker($cid, $uid, $zcid, $url) { } } - if (isset($entry->contactType) && ($entry->contactType >= 0)) + if (isset($entry->contactType) && ($entry->contactType >= 0)) { $contact_type = $entry->contactType; + } $gcontact = array("url" => $profile_url, "name" => $name, @@ -267,7 +272,7 @@ function sanitize_gcontact($gcontact) { dbesc(normalise_link($gcontact['url'])) ); - if (count($x)) { + if (dbm::is_result($x)) { if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) { $gcontact['network'] = $x[0]["network"]; } @@ -299,7 +304,7 @@ function sanitize_gcontact($gcontact) { if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) { // Delete the old entry - if it exists $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile))); - if ($r) { + if (dbm::is_result($r)) { q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile))); q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"])); } @@ -353,6 +358,7 @@ function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) { intval($gcid), intval($zcid) ); + if (!dbm::is_result($r)) { q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ", intval($cid), @@ -696,48 +702,55 @@ function poco_last_updated($profile, $force = false) { function poco_do_update($created, $updated, $last_failure, $last_contact) { $now = strtotime(datetime_convert()); - if ($updated > $last_contact) + if ($updated > $last_contact) { $contact_time = strtotime($updated); - else + } else { $contact_time = strtotime($last_contact); + } $failure_time = strtotime($last_failure); $created_time = strtotime($created); // If there is no "created" time then use the current time - if ($created_time <= 0) + if ($created_time <= 0) { $created_time = $now; + } // If the last contact was less than 24 hours then don't update - if (($now - $contact_time) < (60 * 60 * 24)) + if (($now - $contact_time) < (60 * 60 * 24)) { return false; + } // If the last failure was less than 24 hours then don't update - if (($now - $failure_time) < (60 * 60 * 24)) + if (($now - $failure_time) < (60 * 60 * 24)) { return false; + } // If the last contact was less than a week ago and the last failure is older than a week then don't update //if ((($now - $contact_time) < (60 * 60 * 24 * 7)) && ($contact_time > $failure_time)) // return false; // If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week - if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) + if ((($now - $contact_time) > (60 * 60 * 24 * 7)) && (($now - $created_time) > (60 * 60 * 24 * 7)) && (($now - $failure_time) < (60 * 60 * 24 * 7))) { return false; + } // If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month - if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) + if ((($now - $contact_time) > (60 * 60 * 24 * 30)) && (($now - $created_time) > (60 * 60 * 24 * 30)) && (($now - $failure_time) < (60 * 60 * 24 * 30))) { return false; + } return true; } function poco_to_boolean($val) { - if (($val == "true") || ($val == 1)) - return(true); - if (($val == "false") || ($val == 0)) - return(false); + if (($val == "true") || ($val == 1)) { + return true; + } elseif (($val == "false") || ($val == 0)) { + return false; + } - return ($val); + return $val; } /** @@ -928,13 +941,11 @@ function poco_detect_server_type($body) { $attr[$attribute->name] = $attribute->value; } } - if ($attr['property'] == 'generator') { - if (in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) { - $server = array(); - $server["platform"] = $attr['content']; - $server["version"] = ""; - $server["network"] = NETWORK_DIASPORA; - } + if ($attr['property'] == 'generator' && in_array($attr['content'], array("hubzilla", "BlaBlaNet"))) { + $server = array(); + $server["platform"] = $attr['content']; + $server["version"] = ""; + $server["network"] = NETWORK_DIASPORA; } } } @@ -953,8 +964,9 @@ function poco_check_server($server_url, $network = "", $force = false) { $server_url = trim($server_url, "/"); $server_url = str_replace("/index.php", "", $server_url); - if ($server_url == "") + if ($server_url == "") { return false; + } $servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url))); if (dbm::is_result($servers)) { @@ -966,8 +978,9 @@ function poco_check_server($server_url, $network = "", $force = false) { $poco = $servers[0]["poco"]; $noscrape = $servers[0]["noscrape"]; - if ($network == "") + if ($network == "") { $network = $servers[0]["network"]; + } $last_contact = $servers[0]["last_contact"]; $last_failure = $servers[0]["last_failure"]; @@ -1304,7 +1317,7 @@ function poco_check_server($server_url, $network = "", $force = false) { if (($last_contact <= $last_failure) && !$failure) { logger("Server ".$server_url." seems to be alive, but last contact wasn't set - could be a bug", LOGGER_DEBUG); - } else if (($last_contact >= $last_failure) && $failure) { + } elseif (($last_contact >= $last_failure) && $failure) { logger("Server ".$server_url." seems to be dead, but last failure wasn't set - could be a bug", LOGGER_DEBUG); } @@ -1351,12 +1364,12 @@ function poco_check_server($server_url, $network = "", $force = false) { dbesc(datetime_convert()) ); } - logger("End discovery for server ".$server_url, LOGGER_DEBUG); + logger("End discovery for server " . $server_url, LOGGER_DEBUG); return !$failure; } -function count_common_friends($uid,$cid) { +function count_common_friends($uid, $cid) { $r = q("SELECT count(*) as `total` FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id` @@ -1369,15 +1382,16 @@ function count_common_friends($uid,$cid) { intval($cid) ); -// logger("count_common_friends: $uid $cid {$r[0]['total']}"); - if (dbm::is_result($r)) + // logger("count_common_friends: $uid $cid {$r[0]['total']}"); + if (dbm::is_result($r)) { return $r[0]['total']; + } return 0; } -function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) { +function common_friends($uid, $cid, $start = 0, $limit = 9999, $shuffle = false) { if ($shuffle) { $sql_extra = " order by rand() "; @@ -1408,7 +1422,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) { } -function count_common_friends_zcid($uid,$zcid) { +function count_common_friends_zcid($uid, $zcid) { $r = q("SELECT count(*) as `total` FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id` @@ -1418,18 +1432,20 @@ function count_common_friends_zcid($uid,$zcid) { intval($uid) ); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { return $r[0]['total']; + } return 0; } -function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) { +function common_friends_zcid($uid, $zcid, $start = 0, $limit = 9999, $shuffle = false) { - if ($shuffle) + if ($shuffle) { $sql_extra = " order by rand() "; - else + } else { $sql_extra = " order by `gcontact`.`name` asc "; + } $r = q("SELECT `gcontact`.* FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id` @@ -1448,7 +1464,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal } -function count_all_friends($uid,$cid) { +function count_all_friends($uid, $cid) { $r = q("SELECT count(*) as `total` FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id` @@ -1466,7 +1482,7 @@ function count_all_friends($uid,$cid) { } -function all_friends($uid,$cid,$start = 0, $limit = 80) { +function all_friends($uid, $cid, $start = 0, $limit = 80) { $r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid` FROM `glink` @@ -1494,12 +1510,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) { return array(); } -// Uncommented because the result of the queries are to big to store it in the cache. -// We need to decide if we want to change the db column type or if we want to delete it. -// $list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit); -// if (!is_null($list)) { -// return $list; -// } + /* + * Uncommented because the result of the queries are to big to store it in the cache. + * We need to decide if we want to change the db column type or if we want to delete it. + */ + //$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit); + //if (!is_null($list)) { + // return $list; + //} $network = array(NETWORK_DFRN); @@ -1536,9 +1554,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) { ); if (dbm::is_result($r) && count($r) >= ($limit -1)) { -// Uncommented because the result of the queries are to big to store it in the cache. -// We need to decide if we want to change the db column type or if we want to delete it. -// Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES); + /* + * Uncommented because the result of the queries are to big to store it in the cache. + * We need to decide if we want to change the db column type or if we want to delete it. + */ + //Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES); return $r; } @@ -1574,9 +1594,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) { array_pop($list); } -// Uncommented because the result of the queries are to big to store it in the cache. -// We need to decide if we want to change the db column type or if we want to delete it. -// Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES); + /* + * Uncommented because the result of the queries are to big to store it in the cache. + * We need to decide if we want to change the db column type or if we want to delete it. + */ + //Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $list, CACHE_FIVE_MINUTES); return $list; } @@ -1587,7 +1609,7 @@ function update_suggestions() { $done = array(); /// @TODO Check if it is really neccessary to poll the own server - poco_load(0,0,0,App::get_baseurl() . '/poco'); + poco_load(0, 0, 0, App::get_baseurl() . '/poco'); $done[] = App::get_baseurl() . '/poco'; @@ -2273,10 +2295,11 @@ function update_gcontact_for_user($uid) { "country-name" => $r[0]["country-name"])); // The "addr" field was added in 3.4.3 so it can be empty for older users - if ($r[0]["addr"] != "") + if ($r[0]["addr"] != "") { $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl()); - else + } else { $addr = $r[0]["addr"]; + } $gcontact = array("name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"], "gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"], @@ -2304,25 +2327,29 @@ function gs_fetch_users($server) { $url = $server."/main/statistics"; $result = z_fetch_url($url); - if (!$result["success"]) + if (!$result["success"]) { return false; + } $statistics = json_decode($result["body"]); if (is_object($statistics->config)) { - if ($statistics->config->instance_with_ssl) + if ($statistics->config->instance_with_ssl) { $server = "https://"; - else + } else { $server = "http://"; + } $server .= $statistics->config->instance_address; $hostname = $statistics->config->instance_address; } else { - if ($statistics->instance_with_ssl) + /// @TODO is_object() above means here no object, still $statistics is being used as object + if ($statistics->instance_with_ssl) { $server = "https://"; - else + } else { $server = "http://"; + } $server .= $statistics->instance_address; @@ -2342,6 +2369,7 @@ function gs_fetch_users($server) { "photo" => App::get_baseurl()."/images/person-175.jpg"); get_gcontact_id($contact); } + } } /** @@ -2357,8 +2385,9 @@ function gs_discover() { $r = q("SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5", dbesc(NETWORK_OSTATUS), dbesc($last_update)); - if (!$r) + if (!dbm::is_result($r)) { return; + } foreach ($r AS $server) { gs_fetch_users($server["url"]); @@ -2379,5 +2408,6 @@ function poco_serverlist() { if (!dbm::is_result($r)) { return false; } + return $r; } From dc8f7588606ce8bbd3f2a196926345595b26ade0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Sun, 18 Jun 2017 22:14:21 +0200 Subject: [PATCH 095/160] Opps, also this! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index aea2175d44..f19c53e1f2 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -2356,7 +2356,7 @@ function gs_fetch_users($server) { $hostname = $statistics->instance_address; } - if (is_object($statistics->users)) + if (is_object($statistics->users)) { foreach ($statistics->users AS $nick => $user) { $profile_url = $server."/".$user->nickname; From c0a0748831dacea72ad1575b20baa0eeb60b0796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Sun, 18 Jun 2017 23:14:52 +0200 Subject: [PATCH 096/160] converted upper-case to lower-case as they are no constants but keywords MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/socgraph.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index f19c53e1f2..d17265b3ea 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -669,7 +669,7 @@ function poco_last_updated($profile, $force = false) { $last_updated = ""; - foreach ($entries AS $entry) { + foreach ($entries as $entry) { $published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue; $updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue; @@ -778,7 +778,7 @@ function poco_detect_poco_data($data) { return false; } - foreach ($data->entry[0]->urls AS $url) { + foreach ($data->entry[0]->urls as $url) { if ($url->type == 'zot') { $server = array(); $server["platform"] = 'Hubzilla'; @@ -813,7 +813,7 @@ function poco_fetch_nodeinfo($server_url) { $nodeinfo_url = ''; - foreach ($nodeinfo->links AS $link) { + foreach ($nodeinfo->links as $link) { if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/1.0') { $nodeinfo_url = $link->href; } @@ -866,7 +866,7 @@ function poco_fetch_nodeinfo($server_url) { $gnusocial = false; if (is_array($nodeinfo->protocols->inbound)) { - foreach ($nodeinfo->protocols->inbound AS $inbound) { + foreach ($nodeinfo->protocols->inbound as $inbound) { if ($inbound == 'diaspora') { $diaspora = true; } @@ -1582,11 +1582,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) { ); $list = array(); - foreach ($r2 AS $suggestion) { + foreach ($r2 as $suggestion) { $list[$suggestion["nurl"]] = $suggestion; } - foreach ($r AS $suggestion) { + foreach ($r as $suggestion) { $list[$suggestion["nurl"]] = $suggestion; } @@ -1662,7 +1662,7 @@ function poco_fetch_serverlist($poco) { return; } - foreach ($serverlist AS $server) { + foreach ($serverlist as $server) { $server_url = str_replace("/index.php", "", $server->url); $r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url))); @@ -1689,7 +1689,7 @@ function poco_discover_federation() { if ($serverdata) { $servers = json_decode($serverdata); - foreach ($servers->pods AS $server) { + foreach ($servers->pods as $server) { proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host)); } } @@ -1701,7 +1701,7 @@ function poco_discover_federation() { if ($serverdata) { $servers = json_decode($serverdata); - foreach ($servers AS $server) { + foreach ($servers as $server) { $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name; proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url)); } @@ -1718,7 +1718,7 @@ function poco_discover_federation() { // if ($result["success"]) { // $servers = json_decode($result["body"]); - // foreach($servers->data AS $server) + // foreach($servers->data as $server) // poco_check_server($server->instance_address); // } //} @@ -1804,7 +1804,7 @@ function poco_discover($complete = false) { $r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update)); if (dbm::is_result($r)) { - foreach ($r AS $server) { + foreach ($r as $server) { if (!poco_check_server($server["url"], $server["network"])) { // The server is not reachable? Okay, then we will try it later @@ -1828,7 +1828,7 @@ function poco_discover_server_users($data, $server) { return; } - foreach ($data->entry AS $entry) { + foreach ($data->entry as $entry) { $username = ""; if (isset($entry->urls)) { foreach ($entry->urls as $url) { @@ -1861,7 +1861,7 @@ function poco_discover_server($data, $default_generation = 0) { $success = false; - foreach ($data->entry AS $entry) { + foreach ($data->entry as $entry) { $profile_url = ''; $profile_photo = ''; $connect_url = ''; @@ -2125,7 +2125,7 @@ function update_gcontact($contact) { // Get all field names $fields = array(); - foreach ($r[0] AS $field => $data) { + foreach ($r[0] as $field => $data) { $fields[$field] = $data; } @@ -2198,7 +2198,7 @@ function update_gcontact($contact) { unset($fields["generation"]); if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) { - foreach ($fields AS $field => $data) { + foreach ($fields as $field => $data) { if ($contact[$field] != $r[0][$field]) { logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG); $update = true; @@ -2357,7 +2357,7 @@ function gs_fetch_users($server) { } if (is_object($statistics->users)) { - foreach ($statistics->users AS $nick => $user) { + foreach ($statistics->users as $nick => $user) { $profile_url = $server."/".$user->nickname; $contact = array("url" => $profile_url, @@ -2389,7 +2389,7 @@ function gs_discover() { return; } - foreach ($r AS $server) { + foreach ($r as $server) { gs_fetch_users($server["url"]); q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); } From 29ca5b30216e9180b6ef703db784777c3ef14046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= <roland@mxchange.org> Date: Sun, 18 Jun 2017 23:15:50 +0200 Subject: [PATCH 097/160] added missing curly brace ... :-( MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder <roland@mxchange.org> --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index d17265b3ea..f055aebdf8 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -2144,7 +2144,7 @@ function update_gcontact($contact) { } // assign all unassigned fields from the database entry - foreach ($fields as $field => $data) + foreach ($fields as $field => $data) { if (!isset($contact[$field]) || ($contact[$field] == "")) { $contact[$field] = $r[0][$field]; } From 45ef0a9ee0aa0a22b90f6aaa7a62db1f3389e09a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 19 Jun 2017 17:03:08 +0200 Subject: [PATCH 098/160] DE translations --- view/lang/de/messages.po | 2198 +++++++++++++++++++------------------- view/lang/de/strings.php | 524 ++++----- 2 files changed, 1366 insertions(+), 1356 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index f38e76b21e..dd57915e5e 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -5,6 +5,7 @@ # Translators: # Andreas H., 2015 # Andreas H., 2015-2017 +# Andy H3 <andy@hubup.pro>, 2017 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2011 # David Rabel <david.rabel@noresoft.com>, 2016 # Erkan Yilmaz <erkan77@gmail.com>, 2011 @@ -35,9 +36,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-28 11:09+0200\n" -"PO-Revision-Date: 2017-05-29 05:11+0000\n" -"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n" +"POT-Creation-Date: 2017-06-09 16:42+0700\n" +"PO-Revision-Date: 2017-06-18 04:37+0000\n" +"Last-Translator: Andy H3 <andy@hubup.pro>\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -410,95 +411,20 @@ msgid "add" msgstr "hinzufügen" #: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133 -#: view/theme/vier/theme.php:256 +#: view/theme/vier/theme.php:248 msgid "Forums" msgstr "Foren" -#: include/ForumManager.php:118 view/theme/vier/theme.php:258 +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 msgid "External link to forum" msgstr "Externer Link zum Forum" #: include/ForumManager.php:121 include/contact_widgets.php:271 #: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: view/theme/vier/theme.php:261 src/App.php:506 +#: view/theme/vier/theme.php:253 src/App.php:506 msgid "show more" msgstr "mehr anzeigen" -#: include/NotificationsManager.php:153 -msgid "System" -msgstr "System" - -#: include/NotificationsManager.php:160 include/nav.php:160 mod/admin.php:518 -#: view/theme/frio/theme.php:255 -msgid "Network" -msgstr "Netzwerk" - -#: include/NotificationsManager.php:167 mod/network.php:835 -#: mod/profiles.php:699 -msgid "Personal" -msgstr "Persönlich" - -#: include/NotificationsManager.php:174 include/nav.php:107 -#: include/nav.php:163 -msgid "Home" -msgstr "Pinnwand" - -#: include/NotificationsManager.php:181 include/nav.php:168 -msgid "Introductions" -msgstr "Kontaktanfragen" - -#: include/NotificationsManager.php:239 include/NotificationsManager.php:251 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s hat %ss Beitrag kommentiert" - -#: include/NotificationsManager.php:250 -#, php-format -msgid "%s created a new post" -msgstr "%s hat einen neuen Beitrag erstellt" - -#: include/NotificationsManager.php:265 -#, php-format -msgid "%s liked %s's post" -msgstr "%s mag %ss Beitrag" - -#: include/NotificationsManager.php:278 -#, php-format -msgid "%s disliked %s's post" -msgstr "%s mag %ss Beitrag nicht" - -#: include/NotificationsManager.php:291 -#, php-format -msgid "%s is attending %s's event" -msgstr "%s nimmt an %s's Event teil" - -#: include/NotificationsManager.php:304 -#, php-format -msgid "%s is not attending %s's event" -msgstr "%s nimmt nicht an %s's Event teil" - -#: include/NotificationsManager.php:317 -#, php-format -msgid "%s may attend %s's event" -msgstr "%s nimmt eventuell an %s's Event teil" - -#: include/NotificationsManager.php:334 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s ist jetzt mit %s befreundet" - -#: include/NotificationsManager.php:770 -msgid "Friend Suggestion" -msgstr "Kontaktvorschlag" - -#: include/NotificationsManager.php:803 -msgid "Friend/Connect Request" -msgstr "Kontakt-/Freundschaftsanfrage" - -#: include/NotificationsManager.php:803 -msgid "New Follower" -msgstr "Neuer Bewunderer" - #: include/acl_selectors.php:355 msgid "Post to Email" msgstr "An E-Mail senden" @@ -627,11 +553,11 @@ msgid "Find" msgstr "Finde" #: include/contact_widgets.php:37 mod/suggest.php:116 -#: view/theme/vier/theme.php:203 +#: view/theme/vier/theme.php:195 msgid "Friend Suggestions" msgstr "Kontaktvorschläge" -#: include/contact_widgets.php:38 view/theme/vier/theme.php:202 +#: include/contact_widgets.php:38 view/theme/vier/theme.php:194 msgid "Similar Interests" msgstr "Ähnliche Interessen" @@ -639,7 +565,7 @@ msgstr "Ähnliche Interessen" msgid "Random Profile" msgstr "Zufälliges Profil" -#: include/contact_widgets.php:40 view/theme/vier/theme.php:204 +#: include/contact_widgets.php:40 view/theme/vier/theme.php:196 msgid "Invite Friends" msgstr "Freunde einladen" @@ -769,8 +695,8 @@ msgid "Select" msgstr "Auswählen" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 -#: mod/photos.php:1731 mod/admin.php:1514 mod/contacts.php:819 -#: mod/contacts.php:1018 mod/settings.php:745 object/Item.php:138 +#: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 +#: mod/admin.php:1514 mod/settings.php:745 object/Item.php:138 msgid "Delete" msgstr "Löschen" @@ -1752,22 +1678,6 @@ msgstr "Beitrag" msgid "Item filed" msgstr "Beitrag abgelegt" -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "Kontakt löschen" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "Organisation" - -#: include/Contact.php:822 -msgid "News" -msgstr "Nachrichten" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "Forum" - #: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 msgid "Image/photo" msgstr "Bild/Foto" @@ -1793,6 +1703,22 @@ msgstr "Ungültiges Quell-Protokoll" msgid "Invalid link protocol" msgstr "Ungültiges Link-Protokoll" +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "Kontakt löschen" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "Organisation" + +#: include/Contact.php:822 +msgid "News" +msgstr "Nachrichten" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "Forum" + #: include/enotify.php:27 msgid "Friendica Notification" msgstr "Friendica-Benachrichtigung" @@ -2104,7 +2030,7 @@ msgstr "Keine Neuigkeiten" msgid "Clear notifications" msgstr "Bereinige Benachrichtigungen" -#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:862 +#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:869 msgid "Logout" msgstr "Abmelden" @@ -2167,7 +2093,7 @@ msgstr "Persönliche Notizen" msgid "Your personal notes" msgstr "Deine persönlichen Notizen" -#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:863 +#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:870 msgid "Login" msgstr "Anmeldung" @@ -2175,11 +2101,16 @@ msgstr "Anmeldung" msgid "Sign in" msgstr "Anmelden" +#: include/nav.php:107 include/nav.php:163 +#: include/NotificationsManager.php:176 +msgid "Home" +msgstr "Pinnwand" + #: include/nav.php:107 msgid "Home Page" msgstr "Homepage" -#: include/nav.php:111 mod/register.php:291 boot.php:839 +#: include/nav.php:111 mod/register.php:291 boot.php:846 msgid "Register" msgstr "Registrieren" @@ -2187,7 +2118,7 @@ msgstr "Registrieren" msgid "Create an account" msgstr "Nutzerkonto erstellen" -#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:299 +#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 msgid "Help" msgstr "Hilfe" @@ -2240,6 +2171,11 @@ msgstr "Information" msgid "Information about this friendica instance" msgstr "Informationen zu dieser Friendica Instanz" +#: include/nav.php:160 include/NotificationsManager.php:162 mod/admin.php:518 +#: view/theme/frio/theme.php:255 +msgid "Network" +msgstr "Netzwerk" + #: include/nav.php:160 view/theme/frio/theme.php:255 msgid "Conversations from your friends" msgstr "Unterhaltungen Deiner Kontakte" @@ -2252,6 +2188,10 @@ msgstr "Netzwerk zurücksetzen" msgid "Load Network page with no filters" msgstr "Netzwerk-Seite ohne Filter laden" +#: include/nav.php:168 include/NotificationsManager.php:183 +msgid "Introductions" +msgstr "Kontaktanfragen" + #: include/nav.php:168 msgid "Friend Requests" msgstr "Kontaktanfragen" @@ -2472,7 +2412,7 @@ msgid "Friends" msgstr "Kontakte" #: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3697 mod/photos.php:73 mod/photos.php:189 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 #: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 #: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 #: mod/profile_photo.php:90 mod/profile_photo.php:214 @@ -2538,6 +2478,308 @@ msgstr "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\ msgid "Registration details for %s" msgstr "Details der Registration von %s" +#: include/dba_pdo.php:76 include/dba.php:57 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln." + +#: include/plugin.php:532 include/plugin.php:534 +msgid "Click here to upgrade." +msgstr "Zum Upgraden hier klicken." + +#: include/plugin.php:541 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." + +#: include/plugin.php:546 +msgid "This action is not available under your subscription plan." +msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." + +#: include/profile_selectors.php:6 +msgid "Male" +msgstr "Männlich" + +#: include/profile_selectors.php:6 +msgid "Female" +msgstr "Weiblich" + +#: include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Momentan männlich" + +#: include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Momentan weiblich" + +#: include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Hauptsächlich männlich" + +#: include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Hauptsächlich weiblich" + +#: include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transgender" + +#: include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Intersex" + +#: include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transsexuell" + +#: include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Hermaphrodit" + +#: include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Neuter" + +#: include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "Nicht spezifiziert" + +#: include/profile_selectors.php:6 +msgid "Other" +msgstr "Andere" + +#: include/profile_selectors.php:23 +msgid "Males" +msgstr "Männer" + +#: include/profile_selectors.php:23 +msgid "Females" +msgstr "Frauen" + +#: include/profile_selectors.php:23 +msgid "Gay" +msgstr "Schwul" + +#: include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "Lesbisch" + +#: include/profile_selectors.php:23 +msgid "No Preference" +msgstr "Keine Vorlieben" + +#: include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "Bisexuell" + +#: include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "Autosexual" + +#: include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "Abstinent" + +#: include/profile_selectors.php:23 +msgid "Virgin" +msgstr "Jungfrauen" + +#: include/profile_selectors.php:23 +msgid "Deviant" +msgstr "Deviant" + +#: include/profile_selectors.php:23 +msgid "Fetish" +msgstr "Fetish" + +#: include/profile_selectors.php:23 +msgid "Oodles" +msgstr "Oodles" + +#: include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "Nonsexual" + +#: include/profile_selectors.php:42 +msgid "Single" +msgstr "Single" + +#: include/profile_selectors.php:42 +msgid "Lonely" +msgstr "Einsam" + +#: include/profile_selectors.php:42 +msgid "Available" +msgstr "Verfügbar" + +#: include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "Nicht verfügbar" + +#: include/profile_selectors.php:42 +msgid "Has crush" +msgstr "verknallt" + +#: include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "verliebt" + +#: include/profile_selectors.php:42 +msgid "Dating" +msgstr "Dating" + +#: include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "Untreu" + +#: include/profile_selectors.php:42 +msgid "Sex Addict" +msgstr "Sexbesessen" + +#: include/profile_selectors.php:42 +msgid "Friends/Benefits" +msgstr "Freunde/Zuwendungen" + +#: include/profile_selectors.php:42 +msgid "Casual" +msgstr "Casual" + +#: include/profile_selectors.php:42 +msgid "Engaged" +msgstr "Verlobt" + +#: include/profile_selectors.php:42 +msgid "Married" +msgstr "Verheiratet" + +#: include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "imaginär verheiratet" + +#: include/profile_selectors.php:42 +msgid "Partners" +msgstr "Partner" + +#: include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "zusammenlebend" + +#: include/profile_selectors.php:42 +msgid "Common law" +msgstr "wilde Ehe" + +#: include/profile_selectors.php:42 +msgid "Happy" +msgstr "Glücklich" + +#: include/profile_selectors.php:42 +msgid "Not looking" +msgstr "Nicht auf der Suche" + +#: include/profile_selectors.php:42 +msgid "Swinger" +msgstr "Swinger" + +#: include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "Betrogen" + +#: include/profile_selectors.php:42 +msgid "Separated" +msgstr "Getrennt" + +#: include/profile_selectors.php:42 +msgid "Unstable" +msgstr "Unstabil" + +#: include/profile_selectors.php:42 +msgid "Divorced" +msgstr "Geschieden" + +#: include/profile_selectors.php:42 +msgid "Imaginarily divorced" +msgstr "imaginär geschieden" + +#: include/profile_selectors.php:42 +msgid "Widowed" +msgstr "Verwitwet" + +#: include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "Unsicher" + +#: include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "Ist kompliziert" + +#: include/profile_selectors.php:42 +msgid "Don't care" +msgstr "Ist mir nicht wichtig" + +#: include/profile_selectors.php:42 +msgid "Ask me" +msgstr "Frag mich" + +#: include/NotificationsManager.php:155 +msgid "System" +msgstr "System" + +#: include/NotificationsManager.php:169 mod/network.php:835 +#: mod/profiles.php:699 +msgid "Personal" +msgstr "Persönlich" + +#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 +#, php-format +msgid "%s commented on %s's post" +msgstr "%s hat %ss Beitrag kommentiert" + +#: include/NotificationsManager.php:252 +#, php-format +msgid "%s created a new post" +msgstr "%s hat einen neuen Beitrag erstellt" + +#: include/NotificationsManager.php:267 +#, php-format +msgid "%s liked %s's post" +msgstr "%s mag %ss Beitrag" + +#: include/NotificationsManager.php:280 +#, php-format +msgid "%s disliked %s's post" +msgstr "%s mag %ss Beitrag nicht" + +#: include/NotificationsManager.php:293 +#, php-format +msgid "%s is attending %s's event" +msgstr "%s nimmt an %s's Event teil" + +#: include/NotificationsManager.php:306 +#, php-format +msgid "%s is not attending %s's event" +msgstr "%s nimmt nicht an %s's Event teil" + +#: include/NotificationsManager.php:319 +#, php-format +msgid "%s may attend %s's event" +msgstr "%s nimmt eventuell an %s's Event teil" + +#: include/NotificationsManager.php:336 +#, php-format +msgid "%s is now friends with %s" +msgstr "%s ist jetzt mit %s befreundet" + +#: include/NotificationsManager.php:774 +msgid "Friend Suggestion" +msgstr "Kontaktvorschlag" + +#: include/NotificationsManager.php:803 +msgid "Friend/Connect Request" +msgstr "Kontakt-/Freundschaftsanfrage" + +#: include/NotificationsManager.php:803 +msgid "New Follower" +msgstr "Neuer Bewunderer" + #: include/api.php:1102 #, php-format msgid "Daily posting limit of %d posts reached. The post was rejected." @@ -2553,11 +2795,6 @@ msgstr "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Di msgid "Monthly posting limit of %d posts reached. The post was rejected." msgstr "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." -#: include/dba.php:57 include/dba_pdo.php:75 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln." - #: include/dbstructure.php:25 msgid "There are no tables on MyISAM." msgstr "Es gibt keine MyISAM Tabellen." @@ -2800,8 +3037,8 @@ msgstr "Foren:" msgid "Basic" msgstr "Allgemein" -#: include/identity.php:761 mod/events.php:510 mod/admin.php:1065 -#: mod/contacts.php:881 +#: include/identity.php:761 mod/events.php:510 mod/contacts.php:881 +#: mod/admin.php:1065 msgid "Advanced" msgstr "Erweitert" @@ -2893,242 +3130,6 @@ msgstr "%s hat aufgehört %s zu folgen" msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: include/plugin.php:531 include/plugin.php:533 -msgid "Click here to upgrade." -msgstr "Zum Upgraden hier klicken." - -#: include/plugin.php:539 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." - -#: include/plugin.php:544 -msgid "This action is not available under your subscription plan." -msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." - -#: include/profile_selectors.php:6 -msgid "Male" -msgstr "Männlich" - -#: include/profile_selectors.php:6 -msgid "Female" -msgstr "Weiblich" - -#: include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Momentan männlich" - -#: include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Momentan weiblich" - -#: include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Hauptsächlich männlich" - -#: include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Hauptsächlich weiblich" - -#: include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transgender" - -#: include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Intersex" - -#: include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transsexuell" - -#: include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Hermaphrodit" - -#: include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Neuter" - -#: include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Nicht spezifiziert" - -#: include/profile_selectors.php:6 -msgid "Other" -msgstr "Andere" - -#: include/profile_selectors.php:23 -msgid "Males" -msgstr "Männer" - -#: include/profile_selectors.php:23 -msgid "Females" -msgstr "Frauen" - -#: include/profile_selectors.php:23 -msgid "Gay" -msgstr "Schwul" - -#: include/profile_selectors.php:23 -msgid "Lesbian" -msgstr "Lesbisch" - -#: include/profile_selectors.php:23 -msgid "No Preference" -msgstr "Keine Vorlieben" - -#: include/profile_selectors.php:23 -msgid "Bisexual" -msgstr "Bisexuell" - -#: include/profile_selectors.php:23 -msgid "Autosexual" -msgstr "Autosexual" - -#: include/profile_selectors.php:23 -msgid "Abstinent" -msgstr "Abstinent" - -#: include/profile_selectors.php:23 -msgid "Virgin" -msgstr "Jungfrauen" - -#: include/profile_selectors.php:23 -msgid "Deviant" -msgstr "Deviant" - -#: include/profile_selectors.php:23 -msgid "Fetish" -msgstr "Fetish" - -#: include/profile_selectors.php:23 -msgid "Oodles" -msgstr "Oodles" - -#: include/profile_selectors.php:23 -msgid "Nonsexual" -msgstr "Nonsexual" - -#: include/profile_selectors.php:42 -msgid "Single" -msgstr "Single" - -#: include/profile_selectors.php:42 -msgid "Lonely" -msgstr "Einsam" - -#: include/profile_selectors.php:42 -msgid "Available" -msgstr "Verfügbar" - -#: include/profile_selectors.php:42 -msgid "Unavailable" -msgstr "Nicht verfügbar" - -#: include/profile_selectors.php:42 -msgid "Has crush" -msgstr "verknallt" - -#: include/profile_selectors.php:42 -msgid "Infatuated" -msgstr "verliebt" - -#: include/profile_selectors.php:42 -msgid "Dating" -msgstr "Dating" - -#: include/profile_selectors.php:42 -msgid "Unfaithful" -msgstr "Untreu" - -#: include/profile_selectors.php:42 -msgid "Sex Addict" -msgstr "Sexbesessen" - -#: include/profile_selectors.php:42 -msgid "Friends/Benefits" -msgstr "Freunde/Zuwendungen" - -#: include/profile_selectors.php:42 -msgid "Casual" -msgstr "Casual" - -#: include/profile_selectors.php:42 -msgid "Engaged" -msgstr "Verlobt" - -#: include/profile_selectors.php:42 -msgid "Married" -msgstr "Verheiratet" - -#: include/profile_selectors.php:42 -msgid "Imaginarily married" -msgstr "imaginär verheiratet" - -#: include/profile_selectors.php:42 -msgid "Partners" -msgstr "Partner" - -#: include/profile_selectors.php:42 -msgid "Cohabiting" -msgstr "zusammenlebend" - -#: include/profile_selectors.php:42 -msgid "Common law" -msgstr "wilde Ehe" - -#: include/profile_selectors.php:42 -msgid "Happy" -msgstr "Glücklich" - -#: include/profile_selectors.php:42 -msgid "Not looking" -msgstr "Nicht auf der Suche" - -#: include/profile_selectors.php:42 -msgid "Swinger" -msgstr "Swinger" - -#: include/profile_selectors.php:42 -msgid "Betrayed" -msgstr "Betrogen" - -#: include/profile_selectors.php:42 -msgid "Separated" -msgstr "Getrennt" - -#: include/profile_selectors.php:42 -msgid "Unstable" -msgstr "Unstabil" - -#: include/profile_selectors.php:42 -msgid "Divorced" -msgstr "Geschieden" - -#: include/profile_selectors.php:42 -msgid "Imaginarily divorced" -msgstr "imaginär geschieden" - -#: include/profile_selectors.php:42 -msgid "Widowed" -msgstr "Verwitwet" - -#: include/profile_selectors.php:42 -msgid "Uncertain" -msgstr "Unsicher" - -#: include/profile_selectors.php:42 -msgid "It's complicated" -msgstr "Ist kompliziert" - -#: include/profile_selectors.php:42 -msgid "Don't care" -msgstr "Ist mir nicht wichtig" - -#: include/profile_selectors.php:42 -msgid "Ask me" -msgstr "Frag mich" - #: mod/allfriends.php:48 msgid "No friends to display." msgstr "Keine Kontakte zum Anzeigen." @@ -3697,7 +3698,7 @@ msgstr "%1$s ist %2$s beigetreten" msgid "%1$s welcomes %2$s" msgstr "%1$s heißt %2$s herzlich willkommen" -#: mod/directory.php:195 view/theme/vier/theme.php:201 +#: mod/directory.php:195 view/theme/vier/theme.php:193 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -4530,7 +4531,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: mod/lostpass.php:112 boot.php:877 +#: mod/lostpass.php:112 boot.php:884 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -4596,7 +4597,7 @@ msgid "" "your email for further instructions." msgstr "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet." -#: mod/lostpass.php:163 boot.php:865 +#: mod/lostpass.php:163 boot.php:872 msgid "Nickname or Email: " msgstr "Spitzname oder E-Mail:" @@ -5380,18 +5381,6 @@ msgstr "Karte" msgid "View Album" msgstr "Album betrachten" -#: mod/ping.php:273 -msgid "{0} wants to be your friend" -msgstr "{0} möchte mit Dir in Kontakt treten" - -#: mod/ping.php:288 -msgid "{0} sent you a message" -msgstr "{0} schickte Dir eine Nachricht" - -#: mod/ping.php:303 -msgid "{0} requested registration" -msgstr "{0} möchte sich registrieren" - #: mod/poke.php:197 msgid "Poke/Prod" msgstr "Anstupsen" @@ -5945,6 +5934,712 @@ msgid "" "select \"Export account\"" msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"" +#: mod/contacts.php:137 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "%d Kontakt bearbeitet." +msgstr[1] "%d Kontakte bearbeitet." + +#: mod/contacts.php:172 mod/contacts.php:381 +msgid "Could not access contact record." +msgstr "Konnte nicht auf die Kontaktdaten zugreifen." + +#: mod/contacts.php:186 +msgid "Could not locate selected profile." +msgstr "Konnte das ausgewählte Profil nicht finden." + +#: mod/contacts.php:219 +msgid "Contact updated." +msgstr "Kontakt aktualisiert." + +#: mod/contacts.php:402 +msgid "Contact has been blocked" +msgstr "Kontakt wurde blockiert" + +#: mod/contacts.php:402 +msgid "Contact has been unblocked" +msgstr "Kontakt wurde wieder freigegeben" + +#: mod/contacts.php:413 +msgid "Contact has been ignored" +msgstr "Kontakt wurde ignoriert" + +#: mod/contacts.php:413 +msgid "Contact has been unignored" +msgstr "Kontakt wird nicht mehr ignoriert" + +#: mod/contacts.php:425 +msgid "Contact has been archived" +msgstr "Kontakt wurde archiviert" + +#: mod/contacts.php:425 +msgid "Contact has been unarchived" +msgstr "Kontakt wurde aus dem Archiv geholt" + +#: mod/contacts.php:450 +msgid "Drop contact" +msgstr "Kontakt löschen" + +#: mod/contacts.php:453 mod/contacts.php:812 +msgid "Do you really want to delete this contact?" +msgstr "Möchtest Du wirklich diesen Kontakt löschen?" + +#: mod/contacts.php:472 +msgid "Contact has been removed." +msgstr "Kontakt wurde entfernt." + +#: mod/contacts.php:509 +#, php-format +msgid "You are mutual friends with %s" +msgstr "Du hast mit %s eine beidseitige Freundschaft" + +#: mod/contacts.php:513 +#, php-format +msgid "You are sharing with %s" +msgstr "Du teilst mit %s" + +#: mod/contacts.php:518 +#, php-format +msgid "%s is sharing with you" +msgstr "%s teilt mit Dir" + +#: mod/contacts.php:538 +msgid "Private communications are not available for this contact." +msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." + +#: mod/contacts.php:541 mod/admin.php:984 +msgid "Never" +msgstr "Niemals" + +#: mod/contacts.php:545 +msgid "(Update was successful)" +msgstr "(Aktualisierung war erfolgreich)" + +#: mod/contacts.php:545 +msgid "(Update was not successful)" +msgstr "(Aktualisierung war nicht erfolgreich)" + +#: mod/contacts.php:547 mod/contacts.php:975 +msgid "Suggest friends" +msgstr "Kontakte vorschlagen" + +#: mod/contacts.php:551 +#, php-format +msgid "Network type: %s" +msgstr "Netzwerktyp: %s" + +#: mod/contacts.php:564 +msgid "Communications lost with this contact!" +msgstr "Verbindungen mit diesem Kontakt verloren!" + +#: mod/contacts.php:567 +msgid "Fetch further information for feeds" +msgstr "Weitere Informationen zu Feeds holen" + +#: mod/contacts.php:568 mod/admin.php:993 +msgid "Disabled" +msgstr "Deaktiviert" + +#: mod/contacts.php:568 +msgid "Fetch information" +msgstr "Beziehe Information" + +#: mod/contacts.php:568 +msgid "Fetch information and keywords" +msgstr "Beziehe Information und Schlüsselworte" + +#: mod/contacts.php:586 +msgid "Contact" +msgstr "Kontakt" + +#: mod/contacts.php:589 +msgid "Profile Visibility" +msgstr "Profil-Sichtbarkeit" + +#: mod/contacts.php:590 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft." + +#: mod/contacts.php:591 +msgid "Contact Information / Notes" +msgstr "Kontakt Informationen / Notizen" + +#: mod/contacts.php:592 +msgid "Edit contact notes" +msgstr "Notizen zum Kontakt bearbeiten" + +#: mod/contacts.php:598 +msgid "Block/Unblock contact" +msgstr "Kontakt blockieren/freischalten" + +#: mod/contacts.php:599 +msgid "Ignore contact" +msgstr "Ignoriere den Kontakt" + +#: mod/contacts.php:600 +msgid "Repair URL settings" +msgstr "URL Einstellungen reparieren" + +#: mod/contacts.php:601 +msgid "View conversations" +msgstr "Unterhaltungen anzeigen" + +#: mod/contacts.php:607 +msgid "Last update:" +msgstr "Letzte Aktualisierung: " + +#: mod/contacts.php:609 +msgid "Update public posts" +msgstr "Öffentliche Beiträge aktualisieren" + +#: mod/contacts.php:611 mod/contacts.php:985 +msgid "Update now" +msgstr "Jetzt aktualisieren" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1516 +msgid "Unblock" +msgstr "Entsperren" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1515 +msgid "Block" +msgstr "Sperren" + +#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 +msgid "Unignore" +msgstr "Ignorieren aufheben" + +#: mod/contacts.php:621 +msgid "Currently blocked" +msgstr "Derzeit geblockt" + +#: mod/contacts.php:622 +msgid "Currently ignored" +msgstr "Derzeit ignoriert" + +#: mod/contacts.php:623 +msgid "Currently archived" +msgstr "Momentan archiviert" + +#: mod/contacts.php:624 +msgid "" +"Replies/likes to your public posts <strong>may</strong> still be visible" +msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein" + +#: mod/contacts.php:625 +msgid "Notification for new posts" +msgstr "Benachrichtigung bei neuen Beiträgen" + +#: mod/contacts.php:625 +msgid "Send a notification of every new post of this contact" +msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt." + +#: mod/contacts.php:628 +msgid "Blacklisted keywords" +msgstr "Blacklistete Schlüsselworte " + +#: mod/contacts.php:628 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde" + +#: mod/contacts.php:646 +msgid "Actions" +msgstr "Aktionen" + +#: mod/contacts.php:649 +msgid "Contact Settings" +msgstr "Kontakteinstellungen" + +#: mod/contacts.php:695 +msgid "Suggestions" +msgstr "Kontaktvorschläge" + +#: mod/contacts.php:698 +msgid "Suggest potential friends" +msgstr "Kontakte vorschlagen" + +#: mod/contacts.php:706 +msgid "Show all contacts" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:711 +msgid "Unblocked" +msgstr "Ungeblockt" + +#: mod/contacts.php:714 +msgid "Only show unblocked contacts" +msgstr "Nur nicht-blockierte Kontakte anzeigen" + +#: mod/contacts.php:720 +msgid "Blocked" +msgstr "Geblockt" + +#: mod/contacts.php:723 +msgid "Only show blocked contacts" +msgstr "Nur blockierte Kontakte anzeigen" + +#: mod/contacts.php:729 +msgid "Ignored" +msgstr "Ignoriert" + +#: mod/contacts.php:732 +msgid "Only show ignored contacts" +msgstr "Nur ignorierte Kontakte anzeigen" + +#: mod/contacts.php:738 +msgid "Archived" +msgstr "Archiviert" + +#: mod/contacts.php:741 +msgid "Only show archived contacts" +msgstr "Nur archivierte Kontakte anzeigen" + +#: mod/contacts.php:747 +msgid "Hidden" +msgstr "Verborgen" + +#: mod/contacts.php:750 +msgid "Only show hidden contacts" +msgstr "Nur verborgene Kontakte anzeigen" + +#: mod/contacts.php:807 +msgid "Search your contacts" +msgstr "Suche in deinen Kontakten" + +#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 +msgid "Update" +msgstr "Aktualisierungen" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Archive" +msgstr "Archivieren" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Unarchive" +msgstr "Aus Archiv zurückholen" + +#: mod/contacts.php:821 +msgid "Batch Actions" +msgstr "Stapelverarbeitung" + +#: mod/contacts.php:867 +msgid "View all contacts" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:877 +msgid "View all common friends" +msgstr "Alle Kontakte anzeigen" + +#: mod/contacts.php:884 +msgid "Advanced Contact Settings" +msgstr "Fortgeschrittene Kontakteinstellungen" + +#: mod/contacts.php:918 +msgid "Mutual Friendship" +msgstr "Beidseitige Freundschaft" + +#: mod/contacts.php:922 +msgid "is a fan of yours" +msgstr "ist ein Fan von dir" + +#: mod/contacts.php:926 +msgid "you are a fan of" +msgstr "Du bist Fan von" + +#: mod/contacts.php:996 +msgid "Toggle Blocked status" +msgstr "Geblockt-Status ein-/ausschalten" + +#: mod/contacts.php:1004 +msgid "Toggle Ignored status" +msgstr "Ignoriert-Status ein-/ausschalten" + +#: mod/contacts.php:1012 +msgid "Toggle Archive status" +msgstr "Archiviert-Status ein-/ausschalten" + +#: mod/contacts.php:1020 +msgid "Delete contact" +msgstr "Lösche den Kontakt" + +#: mod/ping.php:274 +msgid "{0} wants to be your friend" +msgstr "{0} möchte mit Dir in Kontakt treten" + +#: mod/ping.php:289 +msgid "{0} sent you a message" +msgstr "{0} schickte Dir eine Nachricht" + +#: mod/ping.php:304 +msgid "{0} requested registration" +msgstr "{0} möchte sich registrieren" + +#: mod/profile_photo.php:44 +msgid "Image uploaded but image cropping failed." +msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl." + +#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: mod/profile_photo.php:322 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "Verkleinern der Bildgröße von [%s] scheiterte." + +#: mod/profile_photo.php:127 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." + +#: mod/profile_photo.php:136 +msgid "Unable to process image" +msgstr "Bild konnte nicht verarbeitet werden" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "Datei hochladen:" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "Profil auswählen:" + +#: mod/profile_photo.php:256 +msgid "Upload" +msgstr "Hochladen" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "oder" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "diesen Schritt überspringen" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "wähle ein Foto aus deinen Fotoalben" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "Bild zurechtschneiden" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "Bearbeitung abgeschlossen" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "Bild erfolgreich hochgeladen." + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "Profil gelöscht." + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "Profil-" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "Neues Profil angelegt." + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "Profil nicht zum Duplizieren verfügbar." + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "Profilname ist erforderlich." + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "Familienstand" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "Romanze" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "Arbeit / Beschäftigung" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "Religion" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "Politische Ansichten" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "Geschlecht" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "Sexuelle Vorlieben" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "XMPP" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "Webseite" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "Interessen" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "Adresse" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "Wohnort" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "Profil aktualisiert." + +#: mod/profiles.php:567 +msgid " and " +msgstr " und " + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "öffentliches Profil" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s hat %2$s geändert auf “%3$s”" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " – %1$ss %2$s besuchen" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "Kontakte und Freunde verbergen" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "Zeige mehr Profil-Felder:" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "Profilaktionen" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "Profil bearbeiten" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "Profilbild ändern" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "Dieses Profil anzeigen" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "Neues Profil anlegen und diese Einstellungen verwenden" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "Dieses Profil duplizieren" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "Dieses Profil löschen" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "Grundinformationen" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "Profilbild" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "Vorlieben" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "Status Informationen" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "Zusätzliche Informationen" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "Beziehung" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "Dein Geschlecht:" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "Beispiel: Fischen Fotografie Software" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "Profilname:" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "Dein kompletter Name:" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "Titel/Beschreibung:" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "Adresse:" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "Wohnort:" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "Region/Bundesstaat:" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "Postleitzahl:" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "Land:" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "Wer: (falls anwendbar)" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "Seit [Datum]:" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "Erzähle uns ein bisschen von Dir …" + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "XMPP (Jabber) Adresse" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow" +" you." +msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können." + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "Adresse der Homepage:" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "Religiöse Ansichten:" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "Öffentliche Schlüsselwörter:" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "Private Schlüsselwörter:" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "Musikalische Interessen" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "Bücher, Literatur" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "Fernsehen" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "Filme/Tänze/Kultur/Unterhaltung" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "Hobbies/Interessen" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "Liebe/Romantik" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "Arbeit/Anstellung" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "Schule/Ausbildung" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "Kontaktinformationen und Soziale Netzwerke" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "Bearbeite/Verwalte Profile" + #: mod/admin.php:97 msgid "Theme settings updated." msgstr "Themeneinstellungen aktualisiert." @@ -6235,18 +6930,10 @@ msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite" msgid "Global community page" msgstr "Globale Gemeinschaftsseite" -#: mod/admin.php:984 mod/contacts.php:541 -msgid "Never" -msgstr "Niemals" - #: mod/admin.php:985 msgid "At post arrival" msgstr "Beim Empfang von Nachrichten" -#: mod/admin.php:993 mod/contacts.php:568 -msgid "Disabled" -msgstr "Deaktiviert" - #: mod/admin.php:995 msgid "Users, Global Contacts" msgstr "Nutzer, globale Kontakte" @@ -7166,16 +7853,6 @@ msgstr "Hinweis vom Nutzer" msgid "Deny" msgstr "Verwehren" -#: mod/admin.php:1515 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Block" -msgstr "Sperren" - -#: mod/admin.php:1516 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Unblock" -msgstr "Entsperren" - #: mod/admin.php:1517 msgid "Site admin" msgstr "Seitenadministrator" @@ -7351,682 +8028,6 @@ msgstr "Feature festlegen: %s" msgid "Manage Additional Features" msgstr "Zusätzliche Features Verwalten" -#: mod/contacts.php:137 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "%d Kontakt bearbeitet." -msgstr[1] "%d Kontakte bearbeitet." - -#: mod/contacts.php:172 mod/contacts.php:381 -msgid "Could not access contact record." -msgstr "Konnte nicht auf die Kontaktdaten zugreifen." - -#: mod/contacts.php:186 -msgid "Could not locate selected profile." -msgstr "Konnte das ausgewählte Profil nicht finden." - -#: mod/contacts.php:219 -msgid "Contact updated." -msgstr "Kontakt aktualisiert." - -#: mod/contacts.php:402 -msgid "Contact has been blocked" -msgstr "Kontakt wurde blockiert" - -#: mod/contacts.php:402 -msgid "Contact has been unblocked" -msgstr "Kontakt wurde wieder freigegeben" - -#: mod/contacts.php:413 -msgid "Contact has been ignored" -msgstr "Kontakt wurde ignoriert" - -#: mod/contacts.php:413 -msgid "Contact has been unignored" -msgstr "Kontakt wird nicht mehr ignoriert" - -#: mod/contacts.php:425 -msgid "Contact has been archived" -msgstr "Kontakt wurde archiviert" - -#: mod/contacts.php:425 -msgid "Contact has been unarchived" -msgstr "Kontakt wurde aus dem Archiv geholt" - -#: mod/contacts.php:450 -msgid "Drop contact" -msgstr "Kontakt löschen" - -#: mod/contacts.php:453 mod/contacts.php:812 -msgid "Do you really want to delete this contact?" -msgstr "Möchtest Du wirklich diesen Kontakt löschen?" - -#: mod/contacts.php:472 -msgid "Contact has been removed." -msgstr "Kontakt wurde entfernt." - -#: mod/contacts.php:509 -#, php-format -msgid "You are mutual friends with %s" -msgstr "Du hast mit %s eine beidseitige Freundschaft" - -#: mod/contacts.php:513 -#, php-format -msgid "You are sharing with %s" -msgstr "Du teilst mit %s" - -#: mod/contacts.php:518 -#, php-format -msgid "%s is sharing with you" -msgstr "%s teilt mit Dir" - -#: mod/contacts.php:538 -msgid "Private communications are not available for this contact." -msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." - -#: mod/contacts.php:545 -msgid "(Update was successful)" -msgstr "(Aktualisierung war erfolgreich)" - -#: mod/contacts.php:545 -msgid "(Update was not successful)" -msgstr "(Aktualisierung war nicht erfolgreich)" - -#: mod/contacts.php:547 mod/contacts.php:975 -msgid "Suggest friends" -msgstr "Kontakte vorschlagen" - -#: mod/contacts.php:551 -#, php-format -msgid "Network type: %s" -msgstr "Netzwerktyp: %s" - -#: mod/contacts.php:564 -msgid "Communications lost with this contact!" -msgstr "Verbindungen mit diesem Kontakt verloren!" - -#: mod/contacts.php:567 -msgid "Fetch further information for feeds" -msgstr "Weitere Informationen zu Feeds holen" - -#: mod/contacts.php:568 -msgid "Fetch information" -msgstr "Beziehe Information" - -#: mod/contacts.php:568 -msgid "Fetch information and keywords" -msgstr "Beziehe Information und Schlüsselworte" - -#: mod/contacts.php:586 -msgid "Contact" -msgstr "Kontakt" - -#: mod/contacts.php:589 -msgid "Profile Visibility" -msgstr "Profil-Sichtbarkeit" - -#: mod/contacts.php:590 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft." - -#: mod/contacts.php:591 -msgid "Contact Information / Notes" -msgstr "Kontakt Informationen / Notizen" - -#: mod/contacts.php:592 -msgid "Edit contact notes" -msgstr "Notizen zum Kontakt bearbeiten" - -#: mod/contacts.php:598 -msgid "Block/Unblock contact" -msgstr "Kontakt blockieren/freischalten" - -#: mod/contacts.php:599 -msgid "Ignore contact" -msgstr "Ignoriere den Kontakt" - -#: mod/contacts.php:600 -msgid "Repair URL settings" -msgstr "URL Einstellungen reparieren" - -#: mod/contacts.php:601 -msgid "View conversations" -msgstr "Unterhaltungen anzeigen" - -#: mod/contacts.php:607 -msgid "Last update:" -msgstr "Letzte Aktualisierung: " - -#: mod/contacts.php:609 -msgid "Update public posts" -msgstr "Öffentliche Beiträge aktualisieren" - -#: mod/contacts.php:611 mod/contacts.php:985 -msgid "Update now" -msgstr "Jetzt aktualisieren" - -#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 -msgid "Unignore" -msgstr "Ignorieren aufheben" - -#: mod/contacts.php:621 -msgid "Currently blocked" -msgstr "Derzeit geblockt" - -#: mod/contacts.php:622 -msgid "Currently ignored" -msgstr "Derzeit ignoriert" - -#: mod/contacts.php:623 -msgid "Currently archived" -msgstr "Momentan archiviert" - -#: mod/contacts.php:624 -msgid "" -"Replies/likes to your public posts <strong>may</strong> still be visible" -msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein" - -#: mod/contacts.php:625 -msgid "Notification for new posts" -msgstr "Benachrichtigung bei neuen Beiträgen" - -#: mod/contacts.php:625 -msgid "Send a notification of every new post of this contact" -msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt." - -#: mod/contacts.php:628 -msgid "Blacklisted keywords" -msgstr "Blacklistete Schlüsselworte " - -#: mod/contacts.php:628 -msgid "" -"Comma separated list of keywords that should not be converted to hashtags, " -"when \"Fetch information and keywords\" is selected" -msgstr "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde" - -#: mod/contacts.php:646 -msgid "Actions" -msgstr "Aktionen" - -#: mod/contacts.php:649 -msgid "Contact Settings" -msgstr "Kontakteinstellungen" - -#: mod/contacts.php:695 -msgid "Suggestions" -msgstr "Kontaktvorschläge" - -#: mod/contacts.php:698 -msgid "Suggest potential friends" -msgstr "Kontakte vorschlagen" - -#: mod/contacts.php:706 -msgid "Show all contacts" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:711 -msgid "Unblocked" -msgstr "Ungeblockt" - -#: mod/contacts.php:714 -msgid "Only show unblocked contacts" -msgstr "Nur nicht-blockierte Kontakte anzeigen" - -#: mod/contacts.php:720 -msgid "Blocked" -msgstr "Geblockt" - -#: mod/contacts.php:723 -msgid "Only show blocked contacts" -msgstr "Nur blockierte Kontakte anzeigen" - -#: mod/contacts.php:729 -msgid "Ignored" -msgstr "Ignoriert" - -#: mod/contacts.php:732 -msgid "Only show ignored contacts" -msgstr "Nur ignorierte Kontakte anzeigen" - -#: mod/contacts.php:738 -msgid "Archived" -msgstr "Archiviert" - -#: mod/contacts.php:741 -msgid "Only show archived contacts" -msgstr "Nur archivierte Kontakte anzeigen" - -#: mod/contacts.php:747 -msgid "Hidden" -msgstr "Verborgen" - -#: mod/contacts.php:750 -msgid "Only show hidden contacts" -msgstr "Nur verborgene Kontakte anzeigen" - -#: mod/contacts.php:807 -msgid "Search your contacts" -msgstr "Suche in deinen Kontakten" - -#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 -msgid "Update" -msgstr "Aktualisierungen" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Archive" -msgstr "Archivieren" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Unarchive" -msgstr "Aus Archiv zurückholen" - -#: mod/contacts.php:821 -msgid "Batch Actions" -msgstr "Stapelverarbeitung" - -#: mod/contacts.php:867 -msgid "View all contacts" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:877 -msgid "View all common friends" -msgstr "Alle Kontakte anzeigen" - -#: mod/contacts.php:884 -msgid "Advanced Contact Settings" -msgstr "Fortgeschrittene Kontakteinstellungen" - -#: mod/contacts.php:918 -msgid "Mutual Friendship" -msgstr "Beidseitige Freundschaft" - -#: mod/contacts.php:922 -msgid "is a fan of yours" -msgstr "ist ein Fan von dir" - -#: mod/contacts.php:926 -msgid "you are a fan of" -msgstr "Du bist Fan von" - -#: mod/contacts.php:996 -msgid "Toggle Blocked status" -msgstr "Geblockt-Status ein-/ausschalten" - -#: mod/contacts.php:1004 -msgid "Toggle Ignored status" -msgstr "Ignoriert-Status ein-/ausschalten" - -#: mod/contacts.php:1012 -msgid "Toggle Archive status" -msgstr "Archiviert-Status ein-/ausschalten" - -#: mod/contacts.php:1020 -msgid "Delete contact" -msgstr "Lösche den Kontakt" - -#: mod/profile_photo.php:44 -msgid "Image uploaded but image cropping failed." -msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl." - -#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 -#: mod/profile_photo.php:322 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "Verkleinern der Bildgröße von [%s] scheiterte." - -#: mod/profile_photo.php:127 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." - -#: mod/profile_photo.php:136 -msgid "Unable to process image" -msgstr "Bild konnte nicht verarbeitet werden" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "Datei hochladen:" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "Profil auswählen:" - -#: mod/profile_photo.php:256 -msgid "Upload" -msgstr "Hochladen" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "oder" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "diesen Schritt überspringen" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "wähle ein Foto aus deinen Fotoalben" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "Bild zurechtschneiden" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "Bearbeitung abgeschlossen" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "Bild erfolgreich hochgeladen." - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "Profil gelöscht." - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "Profil-" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "Neues Profil angelegt." - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "Profil nicht zum Duplizieren verfügbar." - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "Profilname ist erforderlich." - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "Familienstand" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "Romanze" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "Arbeit / Beschäftigung" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "Religion" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "Politische Ansichten" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "Geschlecht" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "Sexuelle Vorlieben" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "XMPP" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "Webseite" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "Interessen" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "Adresse" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "Wohnort" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "Profil aktualisiert." - -#: mod/profiles.php:567 -msgid " and " -msgstr " und " - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "öffentliches Profil" - -#: mod/profiles.php:579 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s hat %2$s geändert auf “%3$s”" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " – %1$ss %2$s besuchen" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "Kontakte und Freunde verbergen" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "Zeige mehr Profil-Felder:" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "Profilaktionen" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "Profil bearbeiten" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "Profilbild ändern" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "Dieses Profil anzeigen" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "Neues Profil anlegen und diese Einstellungen verwenden" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "Dieses Profil duplizieren" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "Dieses Profil löschen" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "Grundinformationen" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "Profilbild" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "Vorlieben" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "Status Informationen" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "Zusätzliche Informationen" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "Beziehung" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "Dein Geschlecht:" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "Beispiel: Fischen Fotografie Software" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "Profilname:" - -#: mod/profiles.php:714 -msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." - -#: mod/profiles.php:715 -msgid "Your Full Name:" -msgstr "Dein kompletter Name:" - -#: mod/profiles.php:716 -msgid "Title/Description:" -msgstr "Titel/Beschreibung:" - -#: mod/profiles.php:719 -msgid "Street Address:" -msgstr "Adresse:" - -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "Wohnort:" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "Region/Bundesstaat:" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "Postleitzahl:" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "Land:" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "Wer: (falls anwendbar)" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "Seit [Datum]:" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "Erzähle uns ein bisschen von Dir …" - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "XMPP (Jabber) Adresse" - -#: mod/profiles.php:731 -msgid "" -"The XMPP address will be propagated to your contacts so that they can follow" -" you." -msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können." - -#: mod/profiles.php:732 -msgid "Homepage URL:" -msgstr "Adresse der Homepage:" - -#: mod/profiles.php:735 -msgid "Religious Views:" -msgstr "Religiöse Ansichten:" - -#: mod/profiles.php:736 -msgid "Public Keywords:" -msgstr "Öffentliche Schlüsselwörter:" - -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" - -#: mod/profiles.php:737 -msgid "Private Keywords:" -msgstr "Private Schlüsselwörter:" - -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" -msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" - -#: mod/profiles.php:740 -msgid "Musical interests" -msgstr "Musikalische Interessen" - -#: mod/profiles.php:741 -msgid "Books, literature" -msgstr "Bücher, Literatur" - -#: mod/profiles.php:742 -msgid "Television" -msgstr "Fernsehen" - -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" -msgstr "Filme/Tänze/Kultur/Unterhaltung" - -#: mod/profiles.php:744 -msgid "Hobbies/Interests" -msgstr "Hobbies/Interessen" - -#: mod/profiles.php:745 -msgid "Love/romance" -msgstr "Liebe/Romantik" - -#: mod/profiles.php:746 -msgid "Work/employment" -msgstr "Arbeit/Anstellung" - -#: mod/profiles.php:747 -msgid "School/education" -msgstr "Schule/Ausbildung" - -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" -msgstr "Kontaktinformationen und Soziale Netzwerke" - -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" -msgstr "Bearbeite/Verwalte Profile" - #: mod/settings.php:62 msgid "Display" msgstr "Anzeige" @@ -8398,73 +8399,82 @@ msgid "Personal Page" msgstr "Persönliche Seite" #: mod/settings.php:1121 -msgid "This account is a regular personal profile" -msgstr "Dieses Konto ist ein normales persönliches Profil" +msgid "Account for a personal profile." +msgstr "Konto für ein persönliches Profil." #: mod/settings.php:1124 msgid "Organisation Page" msgstr "Organisationsseite" #: mod/settings.php:1125 -msgid "This account is a profile for an organisation" -msgstr "Diese Konto ist ein Profil für eine Organisation" +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt." #: mod/settings.php:1128 msgid "News Page" msgstr "Nachrichtenseite" #: mod/settings.php:1129 -msgid "This account is a news account/reflector" -msgstr "Dieses Konto ist ein News-Konto bzw. -Spiegel" +msgid "" +"Account for a news reflector that automatically approves contact requests as" +" \"Followers\"." +msgstr "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt." #: mod/settings.php:1132 msgid "Community Forum" msgstr "Gemeinschaftsforum" #: mod/settings.php:1133 -msgid "" -"This account is a community forum where people can discuss with each other" -msgstr "Dieses Konto ist ein Gemeinschaftskonto wo sich Leute untereinander austauschen können" +msgid "Account for community discussions." +msgstr "Konto für Diskussionsforen. " #: mod/settings.php:1136 msgid "Normal Account Page" msgstr "Normales Konto" #: mod/settings.php:1137 -msgid "This account is a normal personal profile" -msgstr "Dieses Konto ist ein normales persönliches Profil" +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden." #: mod/settings.php:1140 msgid "Soapbox Page" msgstr "Marktschreier-Konto" #: mod/settings.php:1141 -msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" +msgid "" +"Account for a public profile that automatically approves contact requests as" +" \"Followers\"." +msgstr "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt." #: mod/settings.php:1144 msgid "Public Forum" msgstr "Öffentliches Forum" #: mod/settings.php:1145 -msgid "Automatically approve all contact requests" -msgstr "Bestätige alle Kontaktanfragen automatisch" +msgid "Automatically approves all contact requests." +msgstr "Akzeptiert automatisch alle Kontaktanfragen." #: mod/settings.php:1148 msgid "Automatic Friend Page" msgstr "Automatische Freunde Seite" #: mod/settings.php:1149 -msgid "Automatically approve all connection/friend requests as friends" -msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert" +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt." #: mod/settings.php:1152 msgid "Private Forum [Experimental]" msgstr "Privates Forum [Versuchsstadium]" #: mod/settings.php:1153 -msgid "Private forum - approved members only" -msgstr "Privates Forum, nur für Mitglieder" +msgid "Requires manual approval of contact requests." +msgstr "Kontaktanfragen müssen manuell bestätigt werden." #: mod/settings.php:1164 msgid "OpenID:" @@ -8889,7 +8899,7 @@ msgstr "Stil auswählen" msgid "Community Pages" msgstr "Foren" -#: view/theme/vier/config.php:118 view/theme/vier/theme.php:151 +#: view/theme/vier/config.php:118 view/theme/vier/theme.php:143 msgid "Community Profiles" msgstr "Community-Profile" @@ -8897,23 +8907,23 @@ msgstr "Community-Profile" msgid "Help or @NewHere ?" msgstr "Hilfe oder @NewHere" -#: view/theme/vier/config.php:120 view/theme/vier/theme.php:392 +#: view/theme/vier/config.php:120 view/theme/vier/theme.php:384 msgid "Connect Services" msgstr "Verbinde Dienste" -#: view/theme/vier/config.php:121 view/theme/vier/theme.php:199 +#: view/theme/vier/config.php:121 view/theme/vier/theme.php:191 msgid "Find Friends" msgstr "Kontakte finden" -#: view/theme/vier/config.php:122 view/theme/vier/theme.php:181 +#: view/theme/vier/config.php:122 view/theme/vier/theme.php:173 msgid "Last users" msgstr "Letzte Nutzer" -#: view/theme/vier/theme.php:200 +#: view/theme/vier/theme.php:192 msgid "Local Directory" msgstr "Lokales Verzeichnis" -#: view/theme/vier/theme.php:292 +#: view/theme/vier/theme.php:284 msgid "Quick Start" msgstr "Schnell-Start" @@ -8929,43 +8939,43 @@ msgstr "weniger anzeigen" msgid "toggle mobile" msgstr "auf/von Mobile Ansicht wechseln" -#: boot.php:726 +#: boot.php:733 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: boot.php:838 +#: boot.php:845 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: boot.php:866 +#: boot.php:873 msgid "Password: " msgstr "Passwort: " -#: boot.php:867 +#: boot.php:874 msgid "Remember me" msgstr "Anmeldedaten merken" -#: boot.php:870 +#: boot.php:877 msgid "Or login using OpenID: " msgstr "Oder melde Dich mit Deiner OpenID an: " -#: boot.php:876 +#: boot.php:883 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: boot.php:879 +#: boot.php:886 msgid "Website Terms of Service" msgstr "Website Nutzungsbedingungen" -#: boot.php:880 +#: boot.php:887 msgid "terms of service" msgstr "Nutzungsbedingungen" -#: boot.php:882 +#: boot.php:889 msgid "Website Privacy Policy" msgstr "Website Datenschutzerklärung" -#: boot.php:883 +#: boot.php:890 msgid "privacy policy" msgstr "Datenschutzerklärung" diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index dfd1777035..eef03ce72a 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -97,22 +97,6 @@ $a->strings["add"] = "hinzufügen"; $a->strings["Forums"] = "Foren"; $a->strings["External link to forum"] = "Externer Link zum Forum"; $a->strings["show more"] = "mehr anzeigen"; -$a->strings["System"] = "System"; -$a->strings["Network"] = "Netzwerk"; -$a->strings["Personal"] = "Persönlich"; -$a->strings["Home"] = "Pinnwand"; -$a->strings["Introductions"] = "Kontaktanfragen"; -$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; -$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; -$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; -$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; -$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil"; -$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil"; -$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil"; -$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; -$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; -$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; -$a->strings["New Follower"] = "Neuer Bewunderer"; $a->strings["Post to Email"] = "An E-Mail senden"; $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."; $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?"; @@ -423,16 +407,16 @@ $a->strings["comment"] = array( ); $a->strings["post"] = "Beitrag"; $a->strings["Item filed"] = "Beitrag abgelegt"; -$a->strings["Drop Contact"] = "Kontakt löschen"; -$a->strings["Organisation"] = "Organisation"; -$a->strings["News"] = "Nachrichten"; -$a->strings["Forum"] = "Forum"; $a->strings["Image/photo"] = "Bild/Foto"; $a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"; $a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; $a->strings["Invalid source protocol"] = "Ungültiges Quell-Protokoll"; $a->strings["Invalid link protocol"] = "Ungültiges Link-Protokoll"; +$a->strings["Drop Contact"] = "Kontakt löschen"; +$a->strings["Organisation"] = "Organisation"; +$a->strings["News"] = "Nachrichten"; +$a->strings["Forum"] = "Forum"; $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung"; $a->strings["Thank You,"] = "Danke,"; $a->strings["%s Administrator"] = "der Administrator von %s"; @@ -512,6 +496,7 @@ $a->strings["Personal notes"] = "Persönliche Notizen"; $a->strings["Your personal notes"] = "Deine persönlichen Notizen"; $a->strings["Login"] = "Anmeldung"; $a->strings["Sign in"] = "Anmelden"; +$a->strings["Home"] = "Pinnwand"; $a->strings["Home Page"] = "Homepage"; $a->strings["Register"] = "Registrieren"; $a->strings["Create an account"] = "Nutzerkonto erstellen"; @@ -528,9 +513,11 @@ $a->strings["Directory"] = "Verzeichnis"; $a->strings["People directory"] = "Nutzerverzeichnis"; $a->strings["Information"] = "Information"; $a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz"; +$a->strings["Network"] = "Netzwerk"; $a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte"; $a->strings["Network Reset"] = "Netzwerk zurücksetzen"; $a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden"; +$a->strings["Introductions"] = "Kontaktanfragen"; $a->strings["Friend Requests"] = "Kontaktanfragen"; $a->strings["Notifications"] = "Benachrichtigungen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; @@ -593,10 +580,82 @@ $a->strings["Registration at %s"] = "Registrierung als %s"; $a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; $a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; $a->strings["Registration details for %s"] = "Details der Registration von %s"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; +$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; +$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; +$a->strings["Male"] = "Männlich"; +$a->strings["Female"] = "Weiblich"; +$a->strings["Currently Male"] = "Momentan männlich"; +$a->strings["Currently Female"] = "Momentan weiblich"; +$a->strings["Mostly Male"] = "Hauptsächlich männlich"; +$a->strings["Mostly Female"] = "Hauptsächlich weiblich"; +$a->strings["Transgender"] = "Transgender"; +$a->strings["Intersex"] = "Intersex"; +$a->strings["Transsexual"] = "Transsexuell"; +$a->strings["Hermaphrodite"] = "Hermaphrodit"; +$a->strings["Neuter"] = "Neuter"; +$a->strings["Non-specific"] = "Nicht spezifiziert"; +$a->strings["Other"] = "Andere"; +$a->strings["Males"] = "Männer"; +$a->strings["Females"] = "Frauen"; +$a->strings["Gay"] = "Schwul"; +$a->strings["Lesbian"] = "Lesbisch"; +$a->strings["No Preference"] = "Keine Vorlieben"; +$a->strings["Bisexual"] = "Bisexuell"; +$a->strings["Autosexual"] = "Autosexual"; +$a->strings["Abstinent"] = "Abstinent"; +$a->strings["Virgin"] = "Jungfrauen"; +$a->strings["Deviant"] = "Deviant"; +$a->strings["Fetish"] = "Fetish"; +$a->strings["Oodles"] = "Oodles"; +$a->strings["Nonsexual"] = "Nonsexual"; +$a->strings["Single"] = "Single"; +$a->strings["Lonely"] = "Einsam"; +$a->strings["Available"] = "Verfügbar"; +$a->strings["Unavailable"] = "Nicht verfügbar"; +$a->strings["Has crush"] = "verknallt"; +$a->strings["Infatuated"] = "verliebt"; +$a->strings["Dating"] = "Dating"; +$a->strings["Unfaithful"] = "Untreu"; +$a->strings["Sex Addict"] = "Sexbesessen"; +$a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; +$a->strings["Casual"] = "Casual"; +$a->strings["Engaged"] = "Verlobt"; +$a->strings["Married"] = "Verheiratet"; +$a->strings["Imaginarily married"] = "imaginär verheiratet"; +$a->strings["Partners"] = "Partner"; +$a->strings["Cohabiting"] = "zusammenlebend"; +$a->strings["Common law"] = "wilde Ehe"; +$a->strings["Happy"] = "Glücklich"; +$a->strings["Not looking"] = "Nicht auf der Suche"; +$a->strings["Swinger"] = "Swinger"; +$a->strings["Betrayed"] = "Betrogen"; +$a->strings["Separated"] = "Getrennt"; +$a->strings["Unstable"] = "Unstabil"; +$a->strings["Divorced"] = "Geschieden"; +$a->strings["Imaginarily divorced"] = "imaginär geschieden"; +$a->strings["Widowed"] = "Verwitwet"; +$a->strings["Uncertain"] = "Unsicher"; +$a->strings["It's complicated"] = "Ist kompliziert"; +$a->strings["Don't care"] = "Ist mir nicht wichtig"; +$a->strings["Ask me"] = "Frag mich"; +$a->strings["System"] = "System"; +$a->strings["Personal"] = "Persönlich"; +$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; +$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; +$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; +$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; +$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil"; +$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil"; +$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil"; +$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; +$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; +$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; +$a->strings["New Follower"] = "Neuer Bewunderer"; $a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; $a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM Tabellen."; $a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."; $a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]"; @@ -669,65 +728,6 @@ $a->strings["%s is now following %s."] = "%s folgt nun %s"; $a->strings["following"] = "folgen"; $a->strings["%s stopped following %s."] = "%s hat aufgehört %s zu folgen"; $a->strings["stopped following"] = "wird nicht mehr gefolgt"; -$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; -$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; -$a->strings["Male"] = "Männlich"; -$a->strings["Female"] = "Weiblich"; -$a->strings["Currently Male"] = "Momentan männlich"; -$a->strings["Currently Female"] = "Momentan weiblich"; -$a->strings["Mostly Male"] = "Hauptsächlich männlich"; -$a->strings["Mostly Female"] = "Hauptsächlich weiblich"; -$a->strings["Transgender"] = "Transgender"; -$a->strings["Intersex"] = "Intersex"; -$a->strings["Transsexual"] = "Transsexuell"; -$a->strings["Hermaphrodite"] = "Hermaphrodit"; -$a->strings["Neuter"] = "Neuter"; -$a->strings["Non-specific"] = "Nicht spezifiziert"; -$a->strings["Other"] = "Andere"; -$a->strings["Males"] = "Männer"; -$a->strings["Females"] = "Frauen"; -$a->strings["Gay"] = "Schwul"; -$a->strings["Lesbian"] = "Lesbisch"; -$a->strings["No Preference"] = "Keine Vorlieben"; -$a->strings["Bisexual"] = "Bisexuell"; -$a->strings["Autosexual"] = "Autosexual"; -$a->strings["Abstinent"] = "Abstinent"; -$a->strings["Virgin"] = "Jungfrauen"; -$a->strings["Deviant"] = "Deviant"; -$a->strings["Fetish"] = "Fetish"; -$a->strings["Oodles"] = "Oodles"; -$a->strings["Nonsexual"] = "Nonsexual"; -$a->strings["Single"] = "Single"; -$a->strings["Lonely"] = "Einsam"; -$a->strings["Available"] = "Verfügbar"; -$a->strings["Unavailable"] = "Nicht verfügbar"; -$a->strings["Has crush"] = "verknallt"; -$a->strings["Infatuated"] = "verliebt"; -$a->strings["Dating"] = "Dating"; -$a->strings["Unfaithful"] = "Untreu"; -$a->strings["Sex Addict"] = "Sexbesessen"; -$a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; -$a->strings["Casual"] = "Casual"; -$a->strings["Engaged"] = "Verlobt"; -$a->strings["Married"] = "Verheiratet"; -$a->strings["Imaginarily married"] = "imaginär verheiratet"; -$a->strings["Partners"] = "Partner"; -$a->strings["Cohabiting"] = "zusammenlebend"; -$a->strings["Common law"] = "wilde Ehe"; -$a->strings["Happy"] = "Glücklich"; -$a->strings["Not looking"] = "Nicht auf der Suche"; -$a->strings["Swinger"] = "Swinger"; -$a->strings["Betrayed"] = "Betrogen"; -$a->strings["Separated"] = "Getrennt"; -$a->strings["Unstable"] = "Unstabil"; -$a->strings["Divorced"] = "Geschieden"; -$a->strings["Imaginarily divorced"] = "imaginär geschieden"; -$a->strings["Widowed"] = "Verwitwet"; -$a->strings["Uncertain"] = "Unsicher"; -$a->strings["It's complicated"] = "Ist kompliziert"; -$a->strings["Don't care"] = "Ist mir nicht wichtig"; -$a->strings["Ask me"] = "Frag mich"; $a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen."; $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; @@ -1234,9 +1234,6 @@ $a->strings["Private photo"] = "Privates Foto"; $a->strings["Public photo"] = "Öffentliches Foto"; $a->strings["Map"] = "Karte"; $a->strings["View Album"] = "Album betrachten"; -$a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; -$a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; -$a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; $a->strings["Poke/Prod"] = "Anstupsen"; $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen"; $a->strings["Recipient"] = "Empfänger"; @@ -1361,6 +1358,179 @@ $a->strings["You need to export your account from the old server and upload it h $a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"; $a->strings["Account file"] = "Account Datei"; $a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""; +$a->strings["%d contact edited."] = array( + 0 => "%d Kontakt bearbeitet.", + 1 => "%d Kontakte bearbeitet.", +); +$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; +$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; +$a->strings["Contact updated."] = "Kontakt aktualisiert."; +$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; +$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; +$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; +$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; +$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; +$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; +$a->strings["Drop contact"] = "Kontakt löschen"; +$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?"; +$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; +$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; +$a->strings["You are sharing with %s"] = "Du teilst mit %s"; +$a->strings["%s is sharing with you"] = "%s teilt mit Dir"; +$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar."; +$a->strings["Never"] = "Niemals"; +$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; +$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; +$a->strings["Suggest friends"] = "Kontakte vorschlagen"; +$a->strings["Network type: %s"] = "Netzwerktyp: %s"; +$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; +$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen"; +$a->strings["Disabled"] = "Deaktiviert"; +$a->strings["Fetch information"] = "Beziehe Information"; +$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte"; +$a->strings["Contact"] = "Kontakt"; +$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; +$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."; +$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; +$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; +$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; +$a->strings["Ignore contact"] = "Ignoriere den Kontakt"; +$a->strings["Repair URL settings"] = "URL Einstellungen reparieren"; +$a->strings["View conversations"] = "Unterhaltungen anzeigen"; +$a->strings["Last update:"] = "Letzte Aktualisierung: "; +$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; +$a->strings["Update now"] = "Jetzt aktualisieren"; +$a->strings["Unblock"] = "Entsperren"; +$a->strings["Block"] = "Sperren"; +$a->strings["Unignore"] = "Ignorieren aufheben"; +$a->strings["Currently blocked"] = "Derzeit geblockt"; +$a->strings["Currently ignored"] = "Derzeit ignoriert"; +$a->strings["Currently archived"] = "Momentan archiviert"; +$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"; +$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen"; +$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."; +$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte "; +$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"; +$a->strings["Actions"] = "Aktionen"; +$a->strings["Contact Settings"] = "Kontakteinstellungen"; +$a->strings["Suggestions"] = "Kontaktvorschläge"; +$a->strings["Suggest potential friends"] = "Kontakte vorschlagen"; +$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; +$a->strings["Unblocked"] = "Ungeblockt"; +$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; +$a->strings["Blocked"] = "Geblockt"; +$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; +$a->strings["Ignored"] = "Ignoriert"; +$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; +$a->strings["Archived"] = "Archiviert"; +$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; +$a->strings["Hidden"] = "Verborgen"; +$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; +$a->strings["Search your contacts"] = "Suche in deinen Kontakten"; +$a->strings["Update"] = "Aktualisierungen"; +$a->strings["Archive"] = "Archivieren"; +$a->strings["Unarchive"] = "Aus Archiv zurückholen"; +$a->strings["Batch Actions"] = "Stapelverarbeitung"; +$a->strings["View all contacts"] = "Alle Kontakte anzeigen"; +$a->strings["View all common friends"] = "Alle Kontakte anzeigen"; +$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; +$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; +$a->strings["is a fan of yours"] = "ist ein Fan von dir"; +$a->strings["you are a fan of"] = "Du bist Fan von"; +$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; +$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; +$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; +$a->strings["Delete contact"] = "Lösche den Kontakt"; +$a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; +$a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; +$a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; +$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; +$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; +$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden"; +$a->strings["Upload File:"] = "Datei hochladen:"; +$a->strings["Select a profile:"] = "Profil auswählen:"; +$a->strings["Upload"] = "Hochladen"; +$a->strings["or"] = "oder"; +$a->strings["skip this step"] = "diesen Schritt überspringen"; +$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben"; +$a->strings["Crop Image"] = "Bild zurechtschneiden"; +$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."; +$a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; +$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; +$a->strings["Profile deleted."] = "Profil gelöscht."; +$a->strings["Profile-"] = "Profil-"; +$a->strings["New profile created."] = "Neues Profil angelegt."; +$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; +$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; +$a->strings["Marital Status"] = "Familienstand"; +$a->strings["Romantic Partner"] = "Romanze"; +$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; +$a->strings["Religion"] = "Religion"; +$a->strings["Political Views"] = "Politische Ansichten"; +$a->strings["Gender"] = "Geschlecht"; +$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; +$a->strings["XMPP"] = "XMPP"; +$a->strings["Homepage"] = "Webseite"; +$a->strings["Interests"] = "Interessen"; +$a->strings["Address"] = "Adresse"; +$a->strings["Location"] = "Wohnort"; +$a->strings["Profile updated."] = "Profil aktualisiert."; +$a->strings[" and "] = " und "; +$a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; +$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; +$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; +$a->strings["Profile Actions"] = "Profilaktionen"; +$a->strings["Edit Profile Details"] = "Profil bearbeiten"; +$a->strings["Change Profile Photo"] = "Profilbild ändern"; +$a->strings["View this profile"] = "Dieses Profil anzeigen"; +$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; +$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; +$a->strings["Delete this profile"] = "Dieses Profil löschen"; +$a->strings["Basic information"] = "Grundinformationen"; +$a->strings["Profile picture"] = "Profilbild"; +$a->strings["Preferences"] = "Vorlieben"; +$a->strings["Status information"] = "Status Informationen"; +$a->strings["Additional information"] = "Zusätzliche Informationen"; +$a->strings["Relation"] = "Beziehung"; +$a->strings["Your Gender:"] = "Dein Geschlecht:"; +$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:"; +$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; +$a->strings["Profile Name:"] = "Profilname:"; +$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."; +$a->strings["Your Full Name:"] = "Dein kompletter Name:"; +$a->strings["Title/Description:"] = "Titel/Beschreibung:"; +$a->strings["Street Address:"] = "Adresse:"; +$a->strings["Locality/City:"] = "Wohnort:"; +$a->strings["Region/State:"] = "Region/Bundesstaat:"; +$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; +$a->strings["Country:"] = "Land:"; +$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Seit [Datum]:"; +$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; +$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse"; +$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können."; +$a->strings["Homepage URL:"] = "Adresse der Homepage:"; +$a->strings["Religious Views:"] = "Religiöse Ansichten:"; +$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; +$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; +$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; +$a->strings["Musical interests"] = "Musikalische Interessen"; +$a->strings["Books, literature"] = "Bücher, Literatur"; +$a->strings["Television"] = "Fernsehen"; +$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; +$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; +$a->strings["Love/romance"] = "Liebe/Romantik"; +$a->strings["Work/employment"] = "Arbeit/Anstellung"; +$a->strings["School/education"] = "Schule/Ausbildung"; +$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; +$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert."; $a->strings["Site"] = "Seite"; $a->strings["Users"] = "Nutzer"; @@ -1426,9 +1596,7 @@ $a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für $a->strings["No community page"] = "Keine Gemeinschaftsseite"; $a->strings["Public postings from users of this site"] = "Öffentliche Beiträge von Nutzer_innen dieser Seite"; $a->strings["Global community page"] = "Globale Gemeinschaftsseite"; -$a->strings["Never"] = "Niemals"; $a->strings["At post arrival"] = "Beim Empfang von Nachrichten"; -$a->strings["Disabled"] = "Deaktiviert"; $a->strings["Users, Global Contacts"] = "Nutzer, globale Kontakte"; $a->strings["Users, Global Contacts/fallback"] = "Nutzer, globale Kontakte / Fallback"; $a->strings["One month"] = "ein Monat"; @@ -1624,8 +1792,6 @@ $a->strings["Request date"] = "Anfragedatum"; $a->strings["No registrations."] = "Keine Neuanmeldungen."; $a->strings["Note from the user"] = "Hinweis vom Nutzer"; $a->strings["Deny"] = "Verwehren"; -$a->strings["Block"] = "Sperren"; -$a->strings["Unblock"] = "Entsperren"; $a->strings["Site admin"] = "Seitenadministrator"; $a->strings["Account expired"] = "Account ist abgelaufen"; $a->strings["New User"] = "Neuer Nutzer"; @@ -1665,172 +1831,6 @@ $a->strings["Off"] = "Aus"; $a->strings["On"] = "An"; $a->strings["Lock feature %s"] = "Feature festlegen: %s"; $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten"; -$a->strings["%d contact edited."] = array( - 0 => "%d Kontakt bearbeitet.", - 1 => "%d Kontakte bearbeitet.", -); -$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; -$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; -$a->strings["Contact updated."] = "Kontakt aktualisiert."; -$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; -$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; -$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; -$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; -$a->strings["Contact has been archived"] = "Kontakt wurde archiviert"; -$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt"; -$a->strings["Drop contact"] = "Kontakt löschen"; -$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?"; -$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; -$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; -$a->strings["You are sharing with %s"] = "Du teilst mit %s"; -$a->strings["%s is sharing with you"] = "%s teilt mit Dir"; -$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar."; -$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)"; -$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)"; -$a->strings["Suggest friends"] = "Kontakte vorschlagen"; -$a->strings["Network type: %s"] = "Netzwerktyp: %s"; -$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!"; -$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen"; -$a->strings["Fetch information"] = "Beziehe Information"; -$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte"; -$a->strings["Contact"] = "Kontakt"; -$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."; -$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; -$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten"; -$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten"; -$a->strings["Ignore contact"] = "Ignoriere den Kontakt"; -$a->strings["Repair URL settings"] = "URL Einstellungen reparieren"; -$a->strings["View conversations"] = "Unterhaltungen anzeigen"; -$a->strings["Last update:"] = "Letzte Aktualisierung: "; -$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren"; -$a->strings["Update now"] = "Jetzt aktualisieren"; -$a->strings["Unignore"] = "Ignorieren aufheben"; -$a->strings["Currently blocked"] = "Derzeit geblockt"; -$a->strings["Currently ignored"] = "Derzeit ignoriert"; -$a->strings["Currently archived"] = "Momentan archiviert"; -$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"; -$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen"; -$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."; -$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte "; -$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"; -$a->strings["Actions"] = "Aktionen"; -$a->strings["Contact Settings"] = "Kontakteinstellungen"; -$a->strings["Suggestions"] = "Kontaktvorschläge"; -$a->strings["Suggest potential friends"] = "Kontakte vorschlagen"; -$a->strings["Show all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["Unblocked"] = "Ungeblockt"; -$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen"; -$a->strings["Blocked"] = "Geblockt"; -$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen"; -$a->strings["Ignored"] = "Ignoriert"; -$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen"; -$a->strings["Archived"] = "Archiviert"; -$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen"; -$a->strings["Hidden"] = "Verborgen"; -$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; -$a->strings["Search your contacts"] = "Suche in deinen Kontakten"; -$a->strings["Update"] = "Aktualisierungen"; -$a->strings["Archive"] = "Archivieren"; -$a->strings["Unarchive"] = "Aus Archiv zurückholen"; -$a->strings["Batch Actions"] = "Stapelverarbeitung"; -$a->strings["View all contacts"] = "Alle Kontakte anzeigen"; -$a->strings["View all common friends"] = "Alle Kontakte anzeigen"; -$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; -$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; -$a->strings["is a fan of yours"] = "ist ein Fan von dir"; -$a->strings["you are a fan of"] = "Du bist Fan von"; -$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; -$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; -$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; -$a->strings["Delete contact"] = "Lösche den Kontakt"; -$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; -$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; -$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; -$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden"; -$a->strings["Upload File:"] = "Datei hochladen:"; -$a->strings["Select a profile:"] = "Profil auswählen:"; -$a->strings["Upload"] = "Hochladen"; -$a->strings["or"] = "oder"; -$a->strings["skip this step"] = "diesen Schritt überspringen"; -$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben"; -$a->strings["Crop Image"] = "Bild zurechtschneiden"; -$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."; -$a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; -$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; -$a->strings["Profile deleted."] = "Profil gelöscht."; -$a->strings["Profile-"] = "Profil-"; -$a->strings["New profile created."] = "Neues Profil angelegt."; -$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; -$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; -$a->strings["Marital Status"] = "Familienstand"; -$a->strings["Romantic Partner"] = "Romanze"; -$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; -$a->strings["Religion"] = "Religion"; -$a->strings["Political Views"] = "Politische Ansichten"; -$a->strings["Gender"] = "Geschlecht"; -$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; -$a->strings["XMPP"] = "XMPP"; -$a->strings["Homepage"] = "Webseite"; -$a->strings["Interests"] = "Interessen"; -$a->strings["Address"] = "Adresse"; -$a->strings["Location"] = "Wohnort"; -$a->strings["Profile updated."] = "Profil aktualisiert."; -$a->strings[" and "] = " und "; -$a->strings["public profile"] = "öffentliches Profil"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; -$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; -$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; -$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; -$a->strings["Profile Actions"] = "Profilaktionen"; -$a->strings["Edit Profile Details"] = "Profil bearbeiten"; -$a->strings["Change Profile Photo"] = "Profilbild ändern"; -$a->strings["View this profile"] = "Dieses Profil anzeigen"; -$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; -$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; -$a->strings["Delete this profile"] = "Dieses Profil löschen"; -$a->strings["Basic information"] = "Grundinformationen"; -$a->strings["Profile picture"] = "Profilbild"; -$a->strings["Preferences"] = "Vorlieben"; -$a->strings["Status information"] = "Status Informationen"; -$a->strings["Additional information"] = "Zusätzliche Informationen"; -$a->strings["Relation"] = "Beziehung"; -$a->strings["Your Gender:"] = "Dein Geschlecht:"; -$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:"; -$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; -$a->strings["Profile Name:"] = "Profilname:"; -$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."; -$a->strings["Your Full Name:"] = "Dein kompletter Name:"; -$a->strings["Title/Description:"] = "Titel/Beschreibung:"; -$a->strings["Street Address:"] = "Adresse:"; -$a->strings["Locality/City:"] = "Wohnort:"; -$a->strings["Region/State:"] = "Region/Bundesstaat:"; -$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; -$a->strings["Country:"] = "Land:"; -$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Seit [Datum]:"; -$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; -$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse"; -$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können."; -$a->strings["Homepage URL:"] = "Adresse der Homepage:"; -$a->strings["Religious Views:"] = "Religiöse Ansichten:"; -$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; -$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; -$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; -$a->strings["Musical interests"] = "Musikalische Interessen"; -$a->strings["Books, literature"] = "Bücher, Literatur"; -$a->strings["Television"] = "Fernsehen"; -$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; -$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; -$a->strings["Love/romance"] = "Liebe/Romantik"; -$a->strings["Work/employment"] = "Arbeit/Anstellung"; -$a->strings["School/education"] = "Schule/Ausbildung"; -$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; -$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Display"] = "Anzeige"; $a->strings["Social Networks"] = "Soziale Netzwerke"; $a->strings["Connected apps"] = "Verbundene Programme"; @@ -1919,23 +1919,23 @@ $a->strings["Account Types"] = "Kontenarten"; $a->strings["Personal Page Subtypes"] = "Unterarten der persönlichen Seite"; $a->strings["Community Forum Subtypes"] = "Unterarten des Gemeinschaftsforums"; $a->strings["Personal Page"] = "Persönliche Seite"; -$a->strings["This account is a regular personal profile"] = "Dieses Konto ist ein normales persönliches Profil"; +$a->strings["Account for a personal profile."] = "Konto für ein persönliches Profil."; $a->strings["Organisation Page"] = "Organisationsseite"; -$a->strings["This account is a profile for an organisation"] = "Diese Konto ist ein Profil für eine Organisation"; +$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt."; $a->strings["News Page"] = "Nachrichtenseite"; -$a->strings["This account is a news account/reflector"] = "Dieses Konto ist ein News-Konto bzw. -Spiegel"; +$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt."; $a->strings["Community Forum"] = "Gemeinschaftsforum"; -$a->strings["This account is a community forum where people can discuss with each other"] = "Dieses Konto ist ein Gemeinschaftskonto wo sich Leute untereinander austauschen können"; +$a->strings["Account for community discussions."] = "Konto für Diskussionsforen. "; $a->strings["Normal Account Page"] = "Normales Konto"; -$a->strings["This account is a normal personal profile"] = "Dieses Konto ist ein normales persönliches Profil"; +$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."; $a->strings["Soapbox Page"] = "Marktschreier-Konto"; -$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"; +$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt."; $a->strings["Public Forum"] = "Öffentliches Forum"; -$a->strings["Automatically approve all contact requests"] = "Bestätige alle Kontaktanfragen automatisch"; +$a->strings["Automatically approves all contact requests."] = "Akzeptiert automatisch alle Kontaktanfragen."; $a->strings["Automatic Friend Page"] = "Automatische Freunde Seite"; -$a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert"; +$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt."; $a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]"; -$a->strings["Private forum - approved members only"] = "Privates Forum, nur für Mitglieder"; +$a->strings["Requires manual approval of contact requests."] = "Kontaktanfragen müssen manuell bestätigt werden."; $a->strings["OpenID:"] = "OpenID:"; $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."; $a->strings["Publish your default profile in your local site directory?"] = "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"; From ceaa191d8c3237732fe05c1965d4de4ee3a1835c Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 19 Jun 2017 18:20:19 +0000 Subject: [PATCH 099/160] Recurring had been executed only once - and then never again --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index cfb82f5381..b4f36eb84e 100644 --- a/boot.php +++ b/boot.php @@ -1090,7 +1090,7 @@ function proc_run($cmd) { array_shift($argv); $parameters = json_encode($argv); - $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters), array('limit' => 1)); + $found = dba::select('workerqueue', array('id'), array('parameter' => $parameters, 'done' => false), array('limit' => 1)); if (!dbm::is_result($found)) { dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority)); From be3bfaec80a8283f5e6f49e05e231756bb755548 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 20 Jun 2017 02:05:16 +0000 Subject: [PATCH 100/160] Only show the number of workerqueue entries that aren't done --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 98558a6de4..349e9c19b3 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -579,7 +579,7 @@ function admin_page_summary(App $a) { $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1"); $queue = (($r) ? $r[0]['total'] : 0); - $r = qu("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE 1"); + $r = qu("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE NOT `done`"); $workerqueue = (($r) ? $r[0]['total'] : 0); // We can do better, but this is a quick queue status From 0a71a55fd08fefcc46b105d2896be0f35e24a4f5 Mon Sep 17 00:00:00 2001 From: AndyHee <andy@hubup.pro> Date: Tue, 20 Jun 2017 13:15:23 +0700 Subject: [PATCH 101/160] Regenerated master messages.po file --- util/messages.po | 6795 +++++++++++++++++++++++----------------------- 1 file changed, 3399 insertions(+), 3396 deletions(-) diff --git a/util/messages.po b/util/messages.po index ba987ec953..41ef1f3185 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-06-09 16:42+0700\n" +"POT-Creation-Date: 2017-06-19 16:23+0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,122 +18,325 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: include/contact_selectors.php:32 -msgid "Unknown | Not categorised" +#: include/ForumManager.php:116 include/nav.php:133 include/text.php:1094 +#: view/theme/vier/theme.php:248 +msgid "Forums" msgstr "" -#: include/contact_selectors.php:33 -msgid "Block immediately" +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 +msgid "External link to forum" msgstr "" -#: include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" +#: include/ForumManager.php:121 include/contact_widgets.php:271 +#: include/items.php:2432 mod/content.php:625 object/Item.php:417 +#: src/App.php:507 view/theme/vier/theme.php:253 +msgid "show more" msgstr "" -#: include/contact_selectors.php:35 -msgid "Known to me, but no opinion" +#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: include/contact_selectors.php:36 -msgid "OK, probably harmless" +#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 +#: include/event.php:459 +msgid "Starts:" msgstr "" -#: include/contact_selectors.php:37 -msgid "Reputable, has my trust" +#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 +#: include/event.php:460 +msgid "Finishes:" msgstr "" -#: include/contact_selectors.php:56 mod/admin.php:986 -msgid "Frequently" +#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 +#: include/event.php:461 include/identity.php:342 mod/directory.php:135 +#: mod/notifications.php:246 mod/contacts.php:639 mod/events.php:496 +msgid "Location:" msgstr "" -#: include/contact_selectors.php:57 mod/admin.php:987 -msgid "Hourly" +#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 +msgid "Miscellaneous" msgstr "" -#: include/contact_selectors.php:58 mod/admin.php:988 -msgid "Twice daily" +#: include/datetime.php:196 include/identity.php:656 +msgid "Birthday:" msgstr "" -#: include/contact_selectors.php:59 mod/admin.php:989 -msgid "Daily" +#: include/datetime.php:198 mod/profiles.php:724 +msgid "Age: " msgstr "" -#: include/contact_selectors.php:60 -msgid "Weekly" +#: include/datetime.php:200 +msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: include/contact_selectors.php:61 -msgid "Monthly" +#: include/datetime.php:370 +msgid "never" msgstr "" -#: include/contact_selectors.php:76 mod/dfrn_request.php:886 -msgid "Friendica" +#: include/datetime.php:376 +msgid "less than a second ago" msgstr "" -#: include/contact_selectors.php:77 -msgid "OStatus" +#: include/datetime.php:379 +msgid "year" msgstr "" -#: include/contact_selectors.php:78 -msgid "RSS/Atom" +#: include/datetime.php:379 +msgid "years" msgstr "" -#: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 -msgid "Email" +#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 +#: mod/events.php:387 +msgid "month" msgstr "" -#: include/contact_selectors.php:80 mod/dfrn_request.php:888 -#: mod/settings.php:849 -msgid "Diaspora" +#: include/datetime.php:380 +msgid "months" msgstr "" -#: include/contact_selectors.php:81 -msgid "Facebook" +#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 +#: mod/events.php:388 +msgid "week" msgstr "" -#: include/contact_selectors.php:82 -msgid "Zot!" +#: include/datetime.php:381 +msgid "weeks" msgstr "" -#: include/contact_selectors.php:83 -msgid "LinkedIn" +#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 +#: mod/events.php:389 +msgid "day" msgstr "" -#: include/contact_selectors.php:84 -msgid "XMPP/IM" +#: include/datetime.php:382 +msgid "days" msgstr "" -#: include/contact_selectors.php:85 -msgid "MySpace" +#: include/datetime.php:383 +msgid "hour" msgstr "" -#: include/contact_selectors.php:87 -msgid "Google+" +#: include/datetime.php:383 +msgid "hours" msgstr "" -#: include/contact_selectors.php:88 -msgid "pump.io" +#: include/datetime.php:384 +msgid "minute" msgstr "" -#: include/contact_selectors.php:89 -msgid "Twitter" +#: include/datetime.php:384 +msgid "minutes" msgstr "" -#: include/contact_selectors.php:90 -msgid "Diaspora Connector" +#: include/datetime.php:385 +msgid "second" msgstr "" -#: include/contact_selectors.php:91 -msgid "GNU Social Connector" +#: include/datetime.php:385 +msgid "seconds" msgstr "" -#: include/contact_selectors.php:92 -msgid "pnut" +#: include/datetime.php:394 +#, php-format +msgid "%1$d %2$s ago" msgstr "" -#: include/contact_selectors.php:93 -msgid "App.net" +#: include/datetime.php:620 +#, php-format +msgid "%s's birthday" +msgstr "" + +#: include/datetime.php:621 include/dfrn.php:1310 +#, php-format +msgid "Happy Birthday %s" +msgstr "" + +#: include/event.php:408 +msgid "all-day" +msgstr "" + +#: include/event.php:410 +msgid "Sun" +msgstr "" + +#: include/event.php:411 +msgid "Mon" +msgstr "" + +#: include/event.php:412 +msgid "Tue" +msgstr "" + +#: include/event.php:413 +msgid "Wed" +msgstr "" + +#: include/event.php:414 +msgid "Thu" +msgstr "" + +#: include/event.php:415 +msgid "Fri" +msgstr "" + +#: include/event.php:416 +msgid "Sat" +msgstr "" + +#: include/event.php:418 include/text.php:1199 mod/settings.php:982 +msgid "Sunday" +msgstr "" + +#: include/event.php:419 include/text.php:1199 mod/settings.php:982 +msgid "Monday" +msgstr "" + +#: include/event.php:420 include/text.php:1199 +msgid "Tuesday" +msgstr "" + +#: include/event.php:421 include/text.php:1199 +msgid "Wednesday" +msgstr "" + +#: include/event.php:422 include/text.php:1199 +msgid "Thursday" +msgstr "" + +#: include/event.php:423 include/text.php:1199 +msgid "Friday" +msgstr "" + +#: include/event.php:424 include/text.php:1199 +msgid "Saturday" +msgstr "" + +#: include/event.php:426 +msgid "Jan" +msgstr "" + +#: include/event.php:427 +msgid "Feb" +msgstr "" + +#: include/event.php:428 +msgid "Mar" +msgstr "" + +#: include/event.php:429 +msgid "Apr" +msgstr "" + +#: include/event.php:430 include/event.php:443 include/text.php:1203 +msgid "May" +msgstr "" + +#: include/event.php:431 +msgid "Jun" +msgstr "" + +#: include/event.php:432 +msgid "Jul" +msgstr "" + +#: include/event.php:433 +msgid "Aug" +msgstr "" + +#: include/event.php:434 +msgid "Sept" +msgstr "" + +#: include/event.php:435 +msgid "Oct" +msgstr "" + +#: include/event.php:436 +msgid "Nov" +msgstr "" + +#: include/event.php:437 +msgid "Dec" +msgstr "" + +#: include/event.php:439 include/text.php:1203 +msgid "January" +msgstr "" + +#: include/event.php:440 include/text.php:1203 +msgid "February" +msgstr "" + +#: include/event.php:441 include/text.php:1203 +msgid "March" +msgstr "" + +#: include/event.php:442 include/text.php:1203 +msgid "April" +msgstr "" + +#: include/event.php:444 include/text.php:1203 +msgid "June" +msgstr "" + +#: include/event.php:445 include/text.php:1203 +msgid "July" +msgstr "" + +#: include/event.php:446 include/text.php:1203 +msgid "August" +msgstr "" + +#: include/event.php:447 include/text.php:1203 +msgid "September" +msgstr "" + +#: include/event.php:448 include/text.php:1203 +msgid "October" +msgstr "" + +#: include/event.php:449 include/text.php:1203 +msgid "November" +msgstr "" + +#: include/event.php:450 include/text.php:1203 +msgid "December" +msgstr "" + +#: include/event.php:452 mod/cal.php:280 mod/events.php:386 +msgid "today" +msgstr "" + +#: include/event.php:457 +msgid "No events to display" +msgstr "" + +#: include/event.php:570 +msgid "l, F j" +msgstr "" + +#: include/event.php:592 +msgid "Edit event" +msgstr "" + +#: include/event.php:593 +msgid "Delete event" +msgstr "" + +#: include/event.php:619 include/text.php:1601 include/text.php:1608 +msgid "link to source" +msgstr "" + +#: include/event.php:873 +msgid "Export" +msgstr "" + +#: include/event.php:874 +msgid "Export calendar as ical" +msgstr "" + +#: include/event.php:875 +msgid "Export calendar as csv" msgstr "" #: include/features.php:65 @@ -335,66 +538,626 @@ msgstr "" msgid "Show visitors public community forums at the Advanced Profile Page" msgstr "" -#: include/group.php:25 +#: include/like.php:30 include/conversation.php:154 include/diaspora.php:1649 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: include/like.php:34 include/like.php:39 include/conversation.php:157 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: include/like.php:44 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "" + +#: include/like.php:49 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "" + +#: include/like.php:54 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "" + +#: include/like.php:181 include/conversation.php:142 +#: include/conversation.php:294 include/text.php:1873 mod/subthread.php:89 +#: mod/tagger.php:63 +msgid "photo" +msgstr "" + +#: include/like.php:181 include/conversation.php:137 +#: include/conversation.php:147 include/conversation.php:289 +#: include/conversation.php:298 include/diaspora.php:1653 mod/subthread.php:89 +#: mod/tagger.php:63 +msgid "status" +msgstr "" + +#: include/like.php:183 include/conversation.php:134 +#: include/conversation.php:286 include/text.php:1871 +msgid "event" +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:6 include/conversation.php:1548 +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: include/profile_selectors.php:23 +msgid "Males" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Females" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Gay" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "No Preference" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Virgin" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Deviant" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Fetish" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Oodles" +msgstr "" + +#: include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "" + +#: include/profile_selectors.php:42 +msgid "Single" +msgstr "" + +#: include/profile_selectors.php:42 +msgid "Lonely" +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:260 include/user.php:264 +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:63 +msgid "Welcome " +msgstr "" + +#: include/security.php:64 +msgid "Please upload a profile photo." +msgstr "" + +#: include/security.php:67 +msgid "Welcome back " +msgstr "" + +#: include/security.php:431 msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." +"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/group.php:210 -msgid "Default privacy group for new contacts" +#: include/uimport.php:85 +msgid "Error decoding account file" msgstr "" -#: include/group.php:243 -msgid "Everybody" +#: include/uimport.php:91 +msgid "Error! No version data in file! This is not a Friendica account file?" msgstr "" -#: include/group.php:266 -msgid "edit" +#: include/uimport.php:108 include/uimport.php:119 +msgid "Error! Cannot check nickname" msgstr "" -#: include/group.php:287 mod/newmember.php:39 -msgid "Groups" +#: include/uimport.php:112 include/uimport.php:123 +#, php-format +msgid "User '%s' already exists on this server!" msgstr "" -#: include/group.php:289 -msgid "Edit groups" +#: include/uimport.php:145 +msgid "User creation error" msgstr "" -#: include/group.php:291 -msgid "Edit group" +#: include/uimport.php:166 +msgid "User profile creation error" msgstr "" -#: include/group.php:292 -msgid "Create a new group" +#: include/uimport.php:215 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "" +msgstr[1] "" + +#: include/uimport.php:281 +msgid "Done. You can now login with your username and password" msgstr "" -#: include/group.php:293 mod/group.php:100 mod/group.php:197 -msgid "Group Name: " +#: include/user.php:39 mod/settings.php:377 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: include/group.php:295 -msgid "Contacts not in any group" +#: include/user.php:48 +msgid "An invitation is required." msgstr "" -#: include/group.php:297 mod/network.php:210 -msgid "add" +#: include/user.php:53 +msgid "Invitation could not be verified." msgstr "" -#: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133 -#: view/theme/vier/theme.php:248 -msgid "Forums" +#: include/user.php:61 +msgid "Invalid OpenID url" msgstr "" -#: include/ForumManager.php:118 view/theme/vier/theme.php:250 -msgid "External link to forum" +#: include/user.php:75 include/auth.php:139 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." msgstr "" -#: include/ForumManager.php:121 include/contact_widgets.php:271 -#: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: view/theme/vier/theme.php:253 src/App.php:506 -msgid "show more" +#: include/user.php:75 include/auth.php:139 +msgid "The error message was:" +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:106 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "" + +#: include/user.php:111 +msgid "Your email domain is not among those allowed on this site." +msgstr "" + +#: include/user.php:114 +msgid "Not a valid email address." +msgstr "" + +#: include/user.php:127 +msgid "Cannot use that email." +msgstr "" + +#: include/user.php:133 +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." +msgstr "" + +#: include/user.php:140 include/user.php:228 +msgid "Nickname is already registered. Please choose another." +msgstr "" + +#: include/user.php:150 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "" + +#: include/user.php:166 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "" + +#: include/user.php:214 +msgid "An error occurred during registration. Please try again." +msgstr "" + +#: include/user.php:237 view/theme/duepuntozero/config.php:46 +msgid "default" +msgstr "" + +#: include/user.php:247 +msgid "An error occurred creating your default profile. Please try again." +msgstr "" + +#: include/user.php:306 include/user.php:314 include/user.php:322 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 mod/photos.php:776 +#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1865 +#: mod/profile_photo.php:74 mod/profile_photo.php:82 mod/profile_photo.php:90 +#: mod/profile_photo.php:214 mod/profile_photo.php:309 +#: mod/profile_photo.php:319 +msgid "Profile Photos" +msgstr "" + +#: include/user.php:397 +#, 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:407 +#, php-format +msgid "Registration at %s" +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 has been created.\n" +"\t" +msgstr "" + +#: include/user.php:421 +#, 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:453 mod/admin.php:1314 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 +#: include/conversation.php:1005 include/conversation.php:1021 +#: mod/allfriends.php:70 mod/directory.php:153 mod/match.php:76 +#: mod/suggest.php:84 mod/dirfind.php:211 +msgid "View Profile" +msgstr "" + +#: include/Contact.php:389 include/contact_widgets.php:34 +#: include/conversation.php:1018 mod/allfriends.php:71 mod/match.php:77 +#: mod/suggest.php:85 mod/contacts.php:613 mod/dirfind.php:212 +#: mod/follow.php:108 +msgid "Connect/Follow" +msgstr "" + +#: include/Contact.php:432 include/conversation.php:1004 +msgid "View Status" +msgstr "" + +#: include/Contact.php:434 include/conversation.php:1006 +msgid "View Photos" +msgstr "" + +#: include/Contact.php:435 include/conversation.php:1007 +msgid "Network Posts" +msgstr "" + +#: include/Contact.php:436 include/conversation.php:1008 +msgid "View Contact" +msgstr "" + +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "" + +#: include/Contact.php:438 include/conversation.php:1009 +msgid "Send PM" +msgstr "" + +#: include/Contact.php:439 include/conversation.php:1013 +msgid "Poke" +msgstr "" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "" + +#: include/Contact.php:822 +msgid "News" +msgstr "" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "" + +#: include/NotificationsManager.php:155 +msgid "System" +msgstr "" + +#: include/NotificationsManager.php:162 include/nav.php:160 mod/admin.php:518 +#: view/theme/frio/theme.php:255 +msgid "Network" +msgstr "" + +#: include/NotificationsManager.php:169 mod/profiles.php:699 +#: mod/network.php:835 +msgid "Personal" +msgstr "" + +#: include/NotificationsManager.php:176 include/nav.php:107 include/nav.php:163 +msgid "Home" +msgstr "" + +#: include/NotificationsManager.php:183 include/nav.php:168 +msgid "Introductions" +msgstr "" + +#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 +#, php-format +msgid "%s commented on %s's post" +msgstr "" + +#: include/NotificationsManager.php:252 +#, php-format +msgid "%s created a new post" +msgstr "" + +#: include/NotificationsManager.php:267 +#, php-format +msgid "%s liked %s's post" +msgstr "" + +#: include/NotificationsManager.php:280 +#, php-format +msgid "%s disliked %s's post" +msgstr "" + +#: include/NotificationsManager.php:293 +#, php-format +msgid "%s is attending %s's event" +msgstr "" + +#: include/NotificationsManager.php:306 +#, php-format +msgid "%s is not attending %s's event" +msgstr "" + +#: include/NotificationsManager.php:319 +#, php-format +msgid "%s may attend %s's event" +msgstr "" + +#: include/NotificationsManager.php:336 +#, php-format +msgid "%s is now friends with %s" +msgstr "" + +#: include/NotificationsManager.php:774 +msgid "Friend Suggestion" +msgstr "" + +#: include/NotificationsManager.php:803 +msgid "Friend/Connect Request" +msgstr "" + +#: include/NotificationsManager.php:803 +msgid "New Follower" +msgstr "" + +#: include/Photo.php:1075 include/Photo.php:1091 include/Photo.php:1099 +#: include/Photo.php:1124 include/message.php:145 mod/wall_upload.php:249 +#: mod/item.php:468 +msgid "Wall Photos" msgstr "" #: include/acl_selectors.php:355 @@ -430,8 +1193,8 @@ msgstr "" msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: include/acl_selectors.php:378 mod/events.php:511 mod/photos.php:1198 -#: mod/photos.php:1595 +#: include/acl_selectors.php:378 mod/photos.php:1198 mod/photos.php:1595 +#: mod/events.php:511 msgid "Permissions" msgstr "" @@ -439,6 +1202,21 @@ msgstr "" msgid "Close" msgstr "" +#: include/api.php:1102 +#, php-format +msgid "Daily posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:1123 +#, php-format +msgid "Weekly posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:1144 +#, php-format +msgid "Monthly posting limit of %d posts reached. The post was rejected." +msgstr "" + #: include/auth.php:52 msgid "Logged out." msgstr "" @@ -447,34 +1225,147 @@ msgstr "" msgid "Login failed." msgstr "" -#: include/auth.php:139 include/user.php:75 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." +#: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 +msgid "Image/photo" msgstr "" -#: include/auth.php:139 include/user.php:75 -msgid "The error message was:" +#: include/bbcode.php:536 +#, php-format +msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" msgstr "" -#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 -msgid "l F d, Y \\@ g:i A" +#: include/bbcode.php:1135 include/bbcode.php:1157 +msgid "$1 wrote:" msgstr "" -#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 -#: include/event.php:459 -msgid "Starts:" +#: include/bbcode.php:1187 include/bbcode.php:1188 +msgid "Encrypted content" msgstr "" -#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 -#: include/event.php:460 -msgid "Finishes:" +#: include/bbcode.php:1303 +msgid "Invalid source protocol" msgstr "" -#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 -#: include/event.php:461 include/identity.php:342 mod/directory.php:135 -#: mod/events.php:496 mod/notifications.php:246 mod/contacts.php:639 -msgid "Location:" +#: include/bbcode.php:1313 +msgid "Invalid link protocol" +msgstr "" + +#: 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:986 +msgid "Frequently" +msgstr "" + +#: include/contact_selectors.php:57 mod/admin.php:987 +msgid "Hourly" +msgstr "" + +#: include/contact_selectors.php:58 mod/admin.php:988 +msgid "Twice daily" +msgstr "" + +#: include/contact_selectors.php:59 mod/admin.php:989 +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:886 +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:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 +msgid "Email" +msgstr "" + +#: include/contact_selectors.php:80 mod/dfrn_request.php:888 +#: mod/settings.php:849 +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 Connector" +msgstr "" + +#: include/contact_selectors.php:92 +msgid "pnut" +msgstr "" + +#: include/contact_selectors.php:93 +msgid "App.net" msgstr "" #: include/contact_widgets.php:8 @@ -490,8 +1381,8 @@ msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" #: include/contact_widgets.php:12 include/identity.php:230 -#: mod/allfriends.php:87 mod/dirfind.php:209 mod/match.php:92 -#: mod/suggest.php:103 +#: mod/allfriends.php:87 mod/match.php:92 mod/suggest.php:103 +#: mod/dirfind.php:209 msgid "Connect" msgstr "" @@ -510,12 +1401,6 @@ msgstr "" msgid "Enter name or interest" msgstr "" -#: include/contact_widgets.php:34 include/conversation.php:1018 -#: include/Contact.php:389 mod/allfriends.php:71 mod/dirfind.php:212 -#: mod/follow.php:108 mod/match.php:77 mod/suggest.php:85 mod/contacts.php:613 -msgid "Connect/Follow" -msgstr "" - #: include/contact_widgets.php:35 msgid "Examples: Robert Morgenstein, Fishing" msgstr "" @@ -564,34 +1449,6 @@ msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:134 include/conversation.php:286 -#: include/like.php:183 include/text.php:1871 -msgid "event" -msgstr "" - -#: include/conversation.php:137 include/conversation.php:147 -#: include/conversation.php:289 include/conversation.php:298 -#: include/like.php:181 include/diaspora.php:1653 mod/subthread.php:89 -#: mod/tagger.php:63 -msgid "status" -msgstr "" - -#: include/conversation.php:142 include/conversation.php:294 -#: include/like.php:181 include/text.php:1873 mod/subthread.php:89 -#: mod/tagger.php:63 -msgid "photo" -msgstr "" - -#: include/conversation.php:154 include/like.php:30 include/diaspora.php:1649 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: include/conversation.php:157 include/like.php:34 include/like.php:39 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - #: include/conversation.php:160 #, php-format msgid "%1$s attends %2$s's %3$s" @@ -668,7 +1525,7 @@ msgstr "" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 #: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 -#: mod/admin.php:1514 mod/settings.php:745 object/Item.php:138 +#: mod/settings.php:745 mod/admin.php:1514 object/Item.php:138 msgid "Delete" msgstr "" @@ -715,37 +1572,6 @@ msgstr "" msgid "Follow Thread" msgstr "" -#: include/conversation.php:1004 include/Contact.php:432 -msgid "View Status" -msgstr "" - -#: include/conversation.php:1005 include/conversation.php:1021 -#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 -#: mod/allfriends.php:70 mod/directory.php:153 mod/dirfind.php:211 -#: mod/match.php:76 mod/suggest.php:84 -msgid "View Profile" -msgstr "" - -#: include/conversation.php:1006 include/Contact.php:434 -msgid "View Photos" -msgstr "" - -#: include/conversation.php:1007 include/Contact.php:435 -msgid "Network Posts" -msgstr "" - -#: include/conversation.php:1008 include/Contact.php:436 -msgid "View Contact" -msgstr "" - -#: include/conversation.php:1009 include/Contact.php:438 -msgid "Send PM" -msgstr "" - -#: include/conversation.php:1013 include/Contact.php:439 -msgid "Poke" -msgstr "" - #: include/conversation.php:1140 #, php-format msgid "%s likes this." @@ -947,16 +1773,16 @@ msgid "Public post" msgstr "" #: include/conversation.php:1314 mod/content.php:738 mod/editpost.php:137 -#: mod/events.php:506 mod/photos.php:1649 mod/photos.php:1691 -#: mod/photos.php:1771 object/Item.php:711 +#: mod/photos.php:1649 mod/photos.php:1691 mod/photos.php:1771 +#: mod/events.php:506 object/Item.php:711 msgid "Preview" msgstr "" #: include/conversation.php:1318 include/items.php:2165 mod/editpost.php:140 -#: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/follow.php:126 -#: mod/message.php:211 mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34 -#: mod/tagrm.php:13 mod/tagrm.php:98 mod/videos.php:134 -#: mod/dfrn_request.php:894 mod/contacts.php:458 mod/settings.php:683 +#: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/message.php:211 +#: mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34 mod/tagrm.php:13 +#: mod/tagrm.php:98 mod/videos.php:134 mod/contacts.php:458 +#: mod/dfrn_request.php:894 mod/follow.php:126 mod/settings.php:683 #: mod/settings.php:709 msgid "Cancel" msgstr "" @@ -1003,108 +1829,52 @@ msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: include/conversation.php:1548 include/profile_selectors.php:6 -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 -msgid "Miscellaneous" -msgstr "" - -#: include/datetime.php:196 include/identity.php:656 -msgid "Birthday:" -msgstr "" - -#: include/datetime.php:198 mod/profiles.php:724 -msgid "Age: " -msgstr "" - -#: include/datetime.php:200 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: include/datetime.php:370 -msgid "never" -msgstr "" - -#: include/datetime.php:376 -msgid "less than a second ago" -msgstr "" - -#: include/datetime.php:379 -msgid "year" -msgstr "" - -#: include/datetime.php:379 -msgid "years" -msgstr "" - -#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 -#: mod/events.php:387 -msgid "month" -msgstr "" - -#: include/datetime.php:380 -msgid "months" -msgstr "" - -#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 -#: mod/events.php:388 -msgid "week" -msgstr "" - -#: include/datetime.php:381 -msgid "weeks" -msgstr "" - -#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 -#: mod/events.php:389 -msgid "day" -msgstr "" - -#: include/datetime.php:382 -msgid "days" -msgstr "" - -#: include/datetime.php:383 -msgid "hour" -msgstr "" - -#: include/datetime.php:383 -msgid "hours" -msgstr "" - -#: include/datetime.php:384 -msgid "minute" -msgstr "" - -#: include/datetime.php:384 -msgid "minutes" -msgstr "" - -#: include/datetime.php:385 -msgid "second" -msgstr "" - -#: include/datetime.php:385 -msgid "seconds" -msgstr "" - -#: include/datetime.php:394 +#: include/dba.php:59 include/dba_pdo.php:76 #, php-format -msgid "%1$d %2$s ago" +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: include/datetime.php:620 -#, php-format -msgid "%s's birthday" +#: include/dbstructure.php:25 +msgid "There are no tables on MyISAM." msgstr "" -#: include/datetime.php:621 include/dfrn.php:1254 +#: include/dbstructure.php:66 #, php-format -msgid "Happy Birthday %s" +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:71 +#, php-format +msgid "" +"The error message is\n" +"[pre]%s[/pre]" +msgstr "" + +#: include/dbstructure.php:195 +#, php-format +msgid "" +"\n" +"Error %d occurred during database update:\n" +"%s\n" +msgstr "" + +#: include/dbstructure.php:198 +msgid "Errors encountered performing database changes: " +msgstr "" + +#: include/dbstructure.php:206 +msgid ": Database update" +msgstr "" + +#: include/dbstructure.php:438 +#, php-format +msgid "%s: updating %s table." msgstr "" #: include/delivery.php:428 @@ -1115,578 +1885,17 @@ msgstr "" msgid "noreply" msgstr "" -#: include/dfrn.php:1253 +#: include/dfrn.php:1309 #, php-format msgid "%s\\'s birthday" msgstr "" -#: include/event.php:408 -msgid "all-day" +#: include/diaspora.php:2214 +msgid "Sharing notification from Diaspora network" msgstr "" -#: include/event.php:410 -msgid "Sun" -msgstr "" - -#: include/event.php:411 -msgid "Mon" -msgstr "" - -#: include/event.php:412 -msgid "Tue" -msgstr "" - -#: include/event.php:413 -msgid "Wed" -msgstr "" - -#: include/event.php:414 -msgid "Thu" -msgstr "" - -#: include/event.php:415 -msgid "Fri" -msgstr "" - -#: include/event.php:416 -msgid "Sat" -msgstr "" - -#: include/event.php:418 include/text.php:1199 mod/settings.php:982 -msgid "Sunday" -msgstr "" - -#: include/event.php:419 include/text.php:1199 mod/settings.php:982 -msgid "Monday" -msgstr "" - -#: include/event.php:420 include/text.php:1199 -msgid "Tuesday" -msgstr "" - -#: include/event.php:421 include/text.php:1199 -msgid "Wednesday" -msgstr "" - -#: include/event.php:422 include/text.php:1199 -msgid "Thursday" -msgstr "" - -#: include/event.php:423 include/text.php:1199 -msgid "Friday" -msgstr "" - -#: include/event.php:424 include/text.php:1199 -msgid "Saturday" -msgstr "" - -#: include/event.php:426 -msgid "Jan" -msgstr "" - -#: include/event.php:427 -msgid "Feb" -msgstr "" - -#: include/event.php:428 -msgid "Mar" -msgstr "" - -#: include/event.php:429 -msgid "Apr" -msgstr "" - -#: include/event.php:430 include/event.php:443 include/text.php:1203 -msgid "May" -msgstr "" - -#: include/event.php:431 -msgid "Jun" -msgstr "" - -#: include/event.php:432 -msgid "Jul" -msgstr "" - -#: include/event.php:433 -msgid "Aug" -msgstr "" - -#: include/event.php:434 -msgid "Sept" -msgstr "" - -#: include/event.php:435 -msgid "Oct" -msgstr "" - -#: include/event.php:436 -msgid "Nov" -msgstr "" - -#: include/event.php:437 -msgid "Dec" -msgstr "" - -#: include/event.php:439 include/text.php:1203 -msgid "January" -msgstr "" - -#: include/event.php:440 include/text.php:1203 -msgid "February" -msgstr "" - -#: include/event.php:441 include/text.php:1203 -msgid "March" -msgstr "" - -#: include/event.php:442 include/text.php:1203 -msgid "April" -msgstr "" - -#: include/event.php:444 include/text.php:1203 -msgid "June" -msgstr "" - -#: include/event.php:445 include/text.php:1203 -msgid "July" -msgstr "" - -#: include/event.php:446 include/text.php:1203 -msgid "August" -msgstr "" - -#: include/event.php:447 include/text.php:1203 -msgid "September" -msgstr "" - -#: include/event.php:448 include/text.php:1203 -msgid "October" -msgstr "" - -#: include/event.php:449 include/text.php:1203 -msgid "November" -msgstr "" - -#: include/event.php:450 include/text.php:1203 -msgid "December" -msgstr "" - -#: include/event.php:452 mod/cal.php:280 mod/events.php:386 -msgid "today" -msgstr "" - -#: include/event.php:457 -msgid "No events to display" -msgstr "" - -#: include/event.php:570 -msgid "l, F j" -msgstr "" - -#: include/event.php:592 -msgid "Edit event" -msgstr "" - -#: include/event.php:593 -msgid "Delete event" -msgstr "" - -#: include/event.php:619 include/text.php:1601 include/text.php:1608 -msgid "link to source" -msgstr "" - -#: include/event.php:873 -msgid "Export" -msgstr "" - -#: include/event.php:874 -msgid "Export calendar as ical" -msgstr "" - -#: include/event.php:875 -msgid "Export calendar as csv" -msgstr "" - -#: include/follow.php:84 mod/dfrn_request.php:514 -msgid "Disallowed profile URL." -msgstr "" - -#: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 -#: mod/admin.php:280 mod/admin.php:298 -msgid "Blocked domain" -msgstr "" - -#: include/follow.php:94 -msgid "Connect URL missing." -msgstr "" - -#: include/follow.php:122 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "" - -#: include/follow.php:123 include/follow.php:137 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "" - -#: include/follow.php:135 -msgid "The profile address specified does not provide adequate information." -msgstr "" - -#: include/follow.php:140 -msgid "An author or name was not found." -msgstr "" - -#: include/follow.php:143 -msgid "No browser URL could be matched to this address." -msgstr "" - -#: include/follow.php:146 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "" - -#: include/follow.php:147 -msgid "Use mailto: in front of address to force email check." -msgstr "" - -#: include/follow.php:153 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "" - -#: include/follow.php:158 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "" - -#: include/follow.php:259 -msgid "Unable to retrieve contact information." -msgstr "" - -#: include/like.php:44 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "" - -#: include/like.php:49 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "" - -#: include/like.php:54 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "" - -#: include/photos.php:57 include/photos.php:66 mod/fbrowser.php:42 -#: mod/fbrowser.php:63 mod/photos.php:189 mod/photos.php:1125 -#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1841 -#: mod/photos.php:1855 -msgid "Contact Photos" -msgstr "" - -#: include/security.php:63 -msgid "Welcome " -msgstr "" - -#: include/security.php:64 -msgid "Please upload a profile photo." -msgstr "" - -#: include/security.php:67 -msgid "Welcome back " -msgstr "" - -#: include/security.php:431 -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:308 -msgid "newer" -msgstr "" - -#: include/text.php:309 -msgid "older" -msgstr "" - -#: include/text.php:314 -msgid "first" -msgstr "" - -#: include/text.php:315 -msgid "prev" -msgstr "" - -#: include/text.php:349 -msgid "next" -msgstr "" - -#: include/text.php:350 -msgid "last" -msgstr "" - -#: include/text.php:404 -msgid "Loading more entries..." -msgstr "" - -#: include/text.php:405 -msgid "The end" -msgstr "" - -#: include/text.php:956 -msgid "No contacts" -msgstr "" - -#: include/text.php:981 -#, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" -msgstr[0] "" -msgstr[1] "" - -#: include/text.php:994 -msgid "View Contacts" -msgstr "" - -#: include/text.php:1081 include/nav.php:125 mod/search.php:152 -msgid "Search" -msgstr "" - -#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 mod/notes.php:64 -msgid "Save" -msgstr "" - -#: include/text.php:1084 include/nav.php:42 -msgid "@name, !forum, #tags, content" -msgstr "" - -#: include/text.php:1089 include/nav.php:128 -msgid "Full Text" -msgstr "" - -#: include/text.php:1090 include/nav.php:129 -msgid "Tags" -msgstr "" - -#: include/text.php:1091 include/nav.php:130 include/nav.php:194 -#: include/identity.php:853 include/identity.php:856 mod/viewcontacts.php:124 -#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 -msgid "Contacts" -msgstr "" - -#: include/text.php:1145 -msgid "poke" -msgstr "" - -#: include/text.php:1145 -msgid "poked" -msgstr "" - -#: include/text.php:1146 -msgid "ping" -msgstr "" - -#: include/text.php:1146 -msgid "pinged" -msgstr "" - -#: include/text.php:1147 -msgid "prod" -msgstr "" - -#: include/text.php:1147 -msgid "prodded" -msgstr "" - -#: include/text.php:1148 -msgid "slap" -msgstr "" - -#: include/text.php:1148 -msgid "slapped" -msgstr "" - -#: include/text.php:1149 -msgid "finger" -msgstr "" - -#: include/text.php:1149 -msgid "fingered" -msgstr "" - -#: include/text.php:1150 -msgid "rebuff" -msgstr "" - -#: include/text.php:1150 -msgid "rebuffed" -msgstr "" - -#: include/text.php:1164 -msgid "happy" -msgstr "" - -#: include/text.php:1165 -msgid "sad" -msgstr "" - -#: include/text.php:1166 -msgid "mellow" -msgstr "" - -#: include/text.php:1167 -msgid "tired" -msgstr "" - -#: include/text.php:1168 -msgid "perky" -msgstr "" - -#: include/text.php:1169 -msgid "angry" -msgstr "" - -#: include/text.php:1170 -msgid "stupified" -msgstr "" - -#: include/text.php:1171 -msgid "puzzled" -msgstr "" - -#: include/text.php:1172 -msgid "interested" -msgstr "" - -#: include/text.php:1173 -msgid "bitter" -msgstr "" - -#: include/text.php:1174 -msgid "cheerful" -msgstr "" - -#: include/text.php:1175 -msgid "alive" -msgstr "" - -#: include/text.php:1176 -msgid "annoyed" -msgstr "" - -#: include/text.php:1177 -msgid "anxious" -msgstr "" - -#: include/text.php:1178 -msgid "cranky" -msgstr "" - -#: include/text.php:1179 -msgid "disturbed" -msgstr "" - -#: include/text.php:1180 -msgid "frustrated" -msgstr "" - -#: include/text.php:1181 -msgid "motivated" -msgstr "" - -#: include/text.php:1182 -msgid "relaxed" -msgstr "" - -#: include/text.php:1183 -msgid "surprised" -msgstr "" - -#: include/text.php:1393 mod/videos.php:388 -msgid "View Video" -msgstr "" - -#: include/text.php:1425 -msgid "bytes" -msgstr "" - -#: include/text.php:1457 include/text.php:1469 -msgid "Click to open/close" -msgstr "" - -#: include/text.php:1595 -msgid "View on separate page" -msgstr "" - -#: include/text.php:1596 -msgid "view on separate page" -msgstr "" - -#: include/text.php:1875 -msgid "activity" -msgstr "" - -#: include/text.php:1877 mod/content.php:624 object/Item.php:416 -#: object/Item.php:428 -msgid "comment" -msgid_plural "comments" -msgstr[0] "" -msgstr[1] "" - -#: include/text.php:1878 -msgid "post" -msgstr "" - -#: include/text.php:2046 -msgid "Item filed" -msgstr "" - -#: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 -msgid "Image/photo" -msgstr "" - -#: include/bbcode.php:536 -#, php-format -msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" -msgstr "" - -#: include/bbcode.php:1135 include/bbcode.php:1157 -msgid "$1 wrote:" -msgstr "" - -#: include/bbcode.php:1187 include/bbcode.php:1188 -msgid "Encrypted content" -msgstr "" - -#: include/bbcode.php:1303 -msgid "Invalid source protocol" -msgstr "" - -#: include/bbcode.php:1313 -msgid "Invalid link protocol" -msgstr "" - -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "" - -#: include/Contact.php:822 -msgid "News" -msgstr "" - -#: include/Contact.php:825 -msgid "Forum" +#: include/diaspora.php:3234 +msgid "Attachments:" msgstr "" #: include/enotify.php:27 @@ -1981,843 +2190,111 @@ msgstr "" msgid "Please visit %s to approve or reject the request." msgstr "" -#: include/message.php:14 include/message.php:168 -msgid "[no subject]" +#: include/follow.php:84 mod/dfrn_request.php:514 +msgid "Disallowed profile URL." msgstr "" -#: include/message.php:145 include/Photo.php:1075 include/Photo.php:1091 -#: include/Photo.php:1099 include/Photo.php:1124 mod/wall_upload.php:249 -#: mod/item.php:468 -msgid "Wall Photos" +#: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 +#: mod/admin.php:280 mod/admin.php:298 +msgid "Blocked domain" msgstr "" -#: include/nav.php:37 mod/navigation.php:21 -msgid "Nothing new here" +#: include/follow.php:94 +msgid "Connect URL missing." msgstr "" -#: include/nav.php:41 mod/navigation.php:25 -msgid "Clear notifications" -msgstr "" - -#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:869 -msgid "Logout" -msgstr "" - -#: include/nav.php:80 view/theme/frio/theme.php:245 -msgid "End this session" -msgstr "" - -#: include/nav.php:83 include/identity.php:784 mod/contacts.php:648 -#: mod/contacts.php:844 view/theme/frio/theme.php:248 -msgid "Status" -msgstr "" - -#: include/nav.php:83 include/nav.php:163 view/theme/frio/theme.php:248 -msgid "Your posts and conversations" -msgstr "" - -#: include/nav.php:84 include/identity.php:632 include/identity.php:759 -#: include/identity.php:792 mod/newmember.php:20 mod/profperm.php:107 -#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 -msgid "Profile" -msgstr "" - -#: include/nav.php:84 view/theme/frio/theme.php:249 -msgid "Your profile page" -msgstr "" - -#: include/nav.php:85 include/identity.php:800 mod/fbrowser.php:33 -#: view/theme/frio/theme.php:250 -msgid "Photos" -msgstr "" - -#: include/nav.php:85 view/theme/frio/theme.php:250 -msgid "Your photos" -msgstr "" - -#: include/nav.php:86 include/identity.php:808 include/identity.php:811 -#: view/theme/frio/theme.php:251 -msgid "Videos" -msgstr "" - -#: include/nav.php:86 view/theme/frio/theme.php:251 -msgid "Your videos" -msgstr "" - -#: include/nav.php:87 include/nav.php:151 include/identity.php:820 -#: include/identity.php:831 mod/cal.php:272 mod/events.php:377 -#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 -msgid "Events" -msgstr "" - -#: include/nav.php:87 view/theme/frio/theme.php:252 -msgid "Your events" -msgstr "" - -#: include/nav.php:88 -msgid "Personal notes" -msgstr "" - -#: include/nav.php:88 -msgid "Your personal notes" -msgstr "" - -#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:870 -msgid "Login" -msgstr "" - -#: include/nav.php:97 -msgid "Sign in" -msgstr "" - -#: include/nav.php:107 include/nav.php:163 include/NotificationsManager.php:176 -msgid "Home" -msgstr "" - -#: include/nav.php:107 -msgid "Home Page" -msgstr "" - -#: include/nav.php:111 mod/register.php:291 boot.php:846 -msgid "Register" -msgstr "" - -#: include/nav.php:111 -msgid "Create an account" -msgstr "" - -#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 -msgid "Help" -msgstr "" - -#: include/nav.php:117 -msgid "Help and documentation" -msgstr "" - -#: include/nav.php:121 -msgid "Apps" -msgstr "" - -#: include/nav.php:121 -msgid "Addon applications, utilities, games" -msgstr "" - -#: include/nav.php:125 -msgid "Search site content" -msgstr "" - -#: include/nav.php:145 include/nav.php:147 mod/community.php:32 -msgid "Community" -msgstr "" - -#: include/nav.php:145 -msgid "Conversations on this site" -msgstr "" - -#: include/nav.php:147 -msgid "Conversations on the network" -msgstr "" - -#: include/nav.php:151 include/identity.php:823 include/identity.php:834 -#: view/theme/frio/theme.php:256 -msgid "Events and Calendar" -msgstr "" - -#: include/nav.php:154 -msgid "Directory" -msgstr "" - -#: include/nav.php:154 -msgid "People directory" -msgstr "" - -#: include/nav.php:156 -msgid "Information" -msgstr "" - -#: include/nav.php:156 -msgid "Information about this friendica instance" -msgstr "" - -#: include/nav.php:160 include/NotificationsManager.php:162 mod/admin.php:518 -#: view/theme/frio/theme.php:255 -msgid "Network" -msgstr "" - -#: include/nav.php:160 view/theme/frio/theme.php:255 -msgid "Conversations from your friends" -msgstr "" - -#: include/nav.php:161 -msgid "Network Reset" -msgstr "" - -#: include/nav.php:161 -msgid "Load Network page with no filters" -msgstr "" - -#: include/nav.php:168 include/NotificationsManager.php:183 -msgid "Introductions" -msgstr "" - -#: include/nav.php:168 -msgid "Friend Requests" -msgstr "" - -#: include/nav.php:171 mod/notifications.php:98 -msgid "Notifications" -msgstr "" - -#: include/nav.php:172 -msgid "See all notifications" -msgstr "" - -#: include/nav.php:173 mod/settings.php:907 -msgid "Mark as seen" -msgstr "" - -#: include/nav.php:173 -msgid "Mark all system notifications seen" -msgstr "" - -#: include/nav.php:177 mod/message.php:181 view/theme/frio/theme.php:257 -msgid "Messages" -msgstr "" - -#: include/nav.php:177 view/theme/frio/theme.php:257 -msgid "Private mail" -msgstr "" - -#: include/nav.php:178 -msgid "Inbox" -msgstr "" - -#: include/nav.php:179 -msgid "Outbox" -msgstr "" - -#: include/nav.php:180 mod/message.php:18 -msgid "New Message" -msgstr "" - -#: include/nav.php:183 -msgid "Manage" -msgstr "" - -#: include/nav.php:183 -msgid "Manage other pages" -msgstr "" - -#: include/nav.php:186 mod/settings.php:83 -msgid "Delegations" -msgstr "" - -#: include/nav.php:186 mod/delegate.php:132 -msgid "Delegate Page Management" -msgstr "" - -#: include/nav.php:188 mod/newmember.php:15 mod/admin.php:1624 -#: mod/admin.php:1900 mod/settings.php:113 view/theme/frio/theme.php:258 -msgid "Settings" -msgstr "" - -#: include/nav.php:188 view/theme/frio/theme.php:258 -msgid "Account settings" -msgstr "" - -#: include/nav.php:191 include/identity.php:296 -msgid "Profiles" -msgstr "" - -#: include/nav.php:191 -msgid "Manage/Edit Profiles" -msgstr "" - -#: include/nav.php:194 view/theme/frio/theme.php:259 -msgid "Manage/edit friends and contacts" -msgstr "" - -#: include/nav.php:199 mod/admin.php:197 -msgid "Admin" -msgstr "" - -#: include/nav.php:199 -msgid "Site setup and configuration" -msgstr "" - -#: include/nav.php:202 -msgid "Navigation" -msgstr "" - -#: include/nav.php:202 -msgid "Site map" -msgstr "" - -#: include/network.php:687 -msgid "view full size" -msgstr "" - -#: include/oembed.php:256 -msgid "Embedded content" -msgstr "" - -#: include/oembed.php:264 -msgid "Embedding disabled" -msgstr "" - -#: include/uimport.php:85 -msgid "Error decoding account file" -msgstr "" - -#: include/uimport.php:91 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "" - -#: include/uimport.php:108 include/uimport.php:119 -msgid "Error! Cannot check nickname" -msgstr "" - -#: include/uimport.php:112 include/uimport.php:123 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "" - -#: include/uimport.php:145 -msgid "User creation error" -msgstr "" - -#: include/uimport.php:166 -msgid "User profile creation error" -msgstr "" - -#: include/uimport.php:215 -#, php-format -msgid "%d contact not imported" -msgid_plural "%d contacts not imported" -msgstr[0] "" -msgstr[1] "" - -#: include/uimport.php:281 -msgid "Done. You can now login with your username and password" -msgstr "" - -#: include/user.php:39 mod/settings.php:377 -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:106 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "" - -#: include/user.php:111 -msgid "Your email domain is not among those allowed on this site." -msgstr "" - -#: include/user.php:114 -msgid "Not a valid email address." -msgstr "" - -#: include/user.php:127 -msgid "Cannot use that email." -msgstr "" - -#: include/user.php:133 -msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." -msgstr "" - -#: include/user.php:140 include/user.php:228 -msgid "Nickname is already registered. Please choose another." -msgstr "" - -#: include/user.php:150 +#: include/follow.php:122 msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." +"This site is not configured to allow communications with other networks." msgstr "" -#: include/user.php:166 -msgid "SERIOUS ERROR: Generation of security keys failed." +#: include/follow.php:123 include/follow.php:137 +msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: include/user.php:214 -msgid "An error occurred during registration. Please try again." +#: include/follow.php:135 +msgid "The profile address specified does not provide adequate information." msgstr "" -#: include/user.php:237 view/theme/duepuntozero/config.php:46 -msgid "default" +#: include/follow.php:140 +msgid "An author or name was not found." msgstr "" -#: include/user.php:247 -msgid "An error occurred creating your default profile. Please try again." +#: include/follow.php:143 +msgid "No browser URL could be matched to this address." msgstr "" -#: include/user.php:260 include/user.php:264 include/profile_selectors.php:42 -msgid "Friends" -msgstr "" - -#: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 mod/photos.php:776 -#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1865 -#: mod/profile_photo.php:74 mod/profile_photo.php:82 mod/profile_photo.php:90 -#: mod/profile_photo.php:214 mod/profile_photo.php:309 -#: mod/profile_photo.php:319 -msgid "Profile Photos" -msgstr "" - -#: include/user.php:397 -#, php-format +#: include/follow.php:146 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" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." msgstr "" -#: include/user.php:407 -#, php-format -msgid "Registration at %s" +#: include/follow.php:147 +msgid "Use mailto: in front of address to force email check." msgstr "" -#: include/user.php:417 -#, php-format +#: include/follow.php:153 msgid "" -"\n" -"\t\tDear %1$s,\n" -"\t\t\tThank you for registering at %2$s. Your account has been created.\n" -"\t" +"The profile address specified belongs to a network which has been disabled " +"on this site." msgstr "" -#: include/user.php:421 -#, php-format +#: include/follow.php:158 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." +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." msgstr "" -#: include/user.php:453 mod/admin.php:1314 -#, php-format -msgid "Registration details for %s" +#: include/follow.php:259 +msgid "Unable to retrieve contact information." msgstr "" -#: include/dba_pdo.php:76 include/dba.php:57 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "" - -#: include/plugin.php:532 include/plugin.php:534 -msgid "Click here to upgrade." -msgstr "" - -#: include/plugin.php:541 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: include/plugin.php:546 -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 -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/NotificationsManager.php:155 -msgid "System" -msgstr "" - -#: include/NotificationsManager.php:169 mod/network.php:835 -#: mod/profiles.php:699 -msgid "Personal" -msgstr "" - -#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 -#, php-format -msgid "%s commented on %s's post" -msgstr "" - -#: include/NotificationsManager.php:252 -#, php-format -msgid "%s created a new post" -msgstr "" - -#: include/NotificationsManager.php:267 -#, php-format -msgid "%s liked %s's post" -msgstr "" - -#: include/NotificationsManager.php:280 -#, php-format -msgid "%s disliked %s's post" -msgstr "" - -#: include/NotificationsManager.php:293 -#, php-format -msgid "%s is attending %s's event" -msgstr "" - -#: include/NotificationsManager.php:306 -#, php-format -msgid "%s is not attending %s's event" -msgstr "" - -#: include/NotificationsManager.php:319 -#, php-format -msgid "%s may attend %s's event" -msgstr "" - -#: include/NotificationsManager.php:336 -#, php-format -msgid "%s is now friends with %s" -msgstr "" - -#: include/NotificationsManager.php:774 -msgid "Friend Suggestion" -msgstr "" - -#: include/NotificationsManager.php:803 -msgid "Friend/Connect Request" -msgstr "" - -#: include/NotificationsManager.php:803 -msgid "New Follower" -msgstr "" - -#: include/api.php:1102 -#, php-format -msgid "Daily posting limit of %d posts reached. The post was rejected." -msgstr "" - -#: include/api.php:1123 -#, php-format -msgid "Weekly posting limit of %d posts reached. The post was rejected." -msgstr "" - -#: include/api.php:1144 -#, php-format -msgid "Monthly posting limit of %d posts reached. The post was rejected." -msgstr "" - -#: include/dbstructure.php:25 -msgid "There are no tables on MyISAM." -msgstr "" - -#: include/dbstructure.php:66 -#, php-format +#: include/group.php:25 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." +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." msgstr "" -#: include/dbstructure.php:71 -#, php-format -msgid "" -"The error message is\n" -"[pre]%s[/pre]" +#: include/group.php:210 +msgid "Default privacy group for new contacts" msgstr "" -#: include/dbstructure.php:195 -#, php-format -msgid "" -"\n" -"Error %d occurred during database update:\n" -"%s\n" +#: include/group.php:243 +msgid "Everybody" msgstr "" -#: include/dbstructure.php:198 -msgid "Errors encountered performing database changes: " +#: include/group.php:266 +msgid "edit" msgstr "" -#: include/dbstructure.php:206 -msgid ": Database update" +#: include/group.php:287 mod/newmember.php:39 +msgid "Groups" msgstr "" -#: include/dbstructure.php:438 -#, php-format -msgid "%s: updating %s table." +#: include/group.php:289 +msgid "Edit groups" msgstr "" -#: include/diaspora.php:2214 -msgid "Sharing notification from Diaspora network" +#: include/group.php:291 +msgid "Edit group" msgstr "" -#: include/diaspora.php:3234 -msgid "Attachments:" +#: include/group.php:292 +msgid "Create a new group" +msgstr "" + +#: include/group.php:293 mod/group.php:100 mod/group.php:197 +msgid "Group Name: " +msgstr "" + +#: include/group.php:295 +msgid "Contacts not in any group" +msgstr "" + +#: include/group.php:297 mod/network.php:210 +msgid "add" msgstr "" #: include/identity.php:45 @@ -2836,6 +2313,10 @@ msgstr "" msgid "Atom feed" msgstr "" +#: include/identity.php:296 include/nav.php:191 +msgid "Profiles" +msgstr "" + #: include/identity.php:296 msgid "Manage/edit profiles" msgstr "" @@ -2918,6 +2399,12 @@ msgstr "" msgid "Events this week:" msgstr "" +#: include/identity.php:632 include/identity.php:759 include/identity.php:792 +#: include/nav.php:84 mod/newmember.php:20 mod/profperm.php:107 +#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 +msgid "Profile" +msgstr "" + #: include/identity.php:641 mod/settings.php:1287 msgid "Full Name:" msgstr "" @@ -2947,8 +2434,8 @@ msgstr "" msgid "Hometown:" msgstr "" -#: include/identity.php:690 mod/follow.php:139 mod/notifications.php:250 -#: mod/contacts.php:645 +#: include/identity.php:690 mod/notifications.php:250 mod/contacts.php:645 +#: mod/follow.php:139 msgid "Tags:" msgstr "" @@ -3012,12 +2499,17 @@ msgstr "" msgid "Basic" msgstr "" -#: include/identity.php:761 mod/events.php:510 mod/contacts.php:881 +#: include/identity.php:761 mod/contacts.php:881 mod/events.php:510 #: mod/admin.php:1065 msgid "Advanced" msgstr "" -#: include/identity.php:787 mod/follow.php:147 mod/contacts.php:847 +#: include/identity.php:784 include/nav.php:83 mod/contacts.php:648 +#: mod/contacts.php:844 view/theme/frio/theme.php:248 +msgid "Status" +msgstr "" + +#: include/identity.php:787 mod/contacts.php:847 mod/follow.php:147 msgid "Status Messages and Posts" msgstr "" @@ -3025,10 +2517,31 @@ msgstr "" msgid "Profile Details" msgstr "" +#: include/identity.php:800 include/nav.php:85 mod/fbrowser.php:33 +#: view/theme/frio/theme.php:250 +msgid "Photos" +msgstr "" + #: include/identity.php:803 mod/photos.php:95 msgid "Photo Albums" msgstr "" +#: include/identity.php:808 include/identity.php:811 include/nav.php:86 +#: view/theme/frio/theme.php:251 +msgid "Videos" +msgstr "" + +#: include/identity.php:820 include/identity.php:831 include/nav.php:87 +#: include/nav.php:151 mod/cal.php:272 mod/events.php:377 +#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 +msgid "Events" +msgstr "" + +#: include/identity.php:823 include/identity.php:834 include/nav.php:151 +#: view/theme/frio/theme.php:256 +msgid "Events and Calendar" +msgstr "" + #: include/identity.php:842 mod/notes.php:49 msgid "Personal Notes" msgstr "" @@ -3037,13 +2550,19 @@ msgstr "" msgid "Only You Can See This" msgstr "" +#: include/identity.php:853 include/identity.php:856 include/nav.php:130 +#: include/nav.php:194 include/text.php:1091 mod/viewcontacts.php:124 +#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 +msgid "Contacts" +msgstr "" + #: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759 msgid "[Name Withheld]" msgstr "" -#: include/items.php:2121 mod/display.php:105 mod/display.php:280 -#: mod/display.php:485 mod/notice.php:17 mod/viewsrc.php:16 mod/admin.php:248 -#: mod/admin.php:1571 mod/admin.php:1822 +#: include/items.php:2121 mod/notice.php:17 mod/viewsrc.php:16 +#: mod/display.php:117 mod/display.php:289 mod/display.php:504 +#: mod/admin.php:248 mod/admin.php:1571 mod/admin.php:1822 msgid "Item not found." msgstr "" @@ -3051,10 +2570,10 @@ msgstr "" msgid "Do you really want to delete this item?" msgstr "" -#: include/items.php:2162 mod/api.php:107 mod/follow.php:115 -#: mod/message.php:208 mod/register.php:247 mod/suggest.php:31 -#: mod/dfrn_request.php:880 mod/contacts.php:455 mod/profiles.php:643 -#: mod/profiles.php:646 mod/profiles.php:673 mod/settings.php:1172 +#: include/items.php:2162 mod/api.php:107 mod/message.php:208 +#: mod/profiles.php:643 mod/profiles.php:646 mod/profiles.php:673 +#: mod/suggest.php:31 mod/contacts.php:455 mod/dfrn_request.php:880 +#: mod/follow.php:115 mod/register.php:247 mod/settings.php:1172 #: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189 #: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204 #: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236 @@ -3064,21 +2583,22 @@ msgstr "" #: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 #: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105 -#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/dirfind.php:15 -#: mod/display.php:482 mod/editpost.php:12 mod/events.php:188 mod/follow.php:13 -#: mod/follow.php:76 mod/follow.php:160 mod/fsuggest.php:80 mod/group.php:20 -#: mod/invite.php:17 mod/invite.php:105 mod/manage.php:103 mod/message.php:48 -#: mod/message.php:173 mod/mood.php:116 mod/network.php:7 mod/nogroup.php:29 -#: mod/notes.php:25 mod/notifications.php:73 mod/ostatus_subscribe.php:11 -#: mod/photos.php:168 mod/photos.php:1111 mod/poke.php:155 mod/register.php:44 -#: mod/repair_ostatus.php:11 mod/suggest.php:60 mod/viewcontacts.php:49 +#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/editpost.php:12 +#: mod/fsuggest.php:80 mod/group.php:20 mod/invite.php:17 mod/invite.php:105 +#: mod/manage.php:103 mod/message.php:48 mod/message.php:173 mod/mood.php:116 +#: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73 +#: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111 +#: mod/poke.php:155 mod/profile_photo.php:19 mod/profile_photo.php:179 +#: mod/profile_photo.php:190 mod/profile_photo.php:203 mod/profiles.php:172 +#: mod/profiles.php:610 mod/regmod.php:106 mod/repair_ostatus.php:11 +#: mod/suggest.php:60 mod/uimport.php:26 mod/viewcontacts.php:49 #: mod/wall_attach.php:69 mod/wall_attach.php:72 mod/wall_upload.php:101 #: mod/wall_upload.php:104 mod/wallmessage.php:11 mod/wallmessage.php:35 -#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/item.php:197 -#: mod/item.php:209 mod/regmod.php:106 mod/uimport.php:26 mod/contacts.php:363 -#: mod/profile_photo.php:19 mod/profile_photo.php:179 mod/profile_photo.php:190 -#: mod/profile_photo.php:203 mod/profiles.php:172 mod/profiles.php:610 -#: mod/settings.php:24 mod/settings.php:132 mod/settings.php:669 index.php:410 +#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/contacts.php:363 +#: mod/dirfind.php:15 mod/display.php:501 mod/events.php:188 mod/follow.php:13 +#: mod/follow.php:76 mod/follow.php:160 mod/item.php:197 mod/item.php:209 +#: mod/network.php:7 mod/register.php:44 mod/settings.php:24 +#: mod/settings.php:132 mod/settings.php:669 index.php:410 msgid "Permission denied." msgstr "" @@ -3086,6 +2606,251 @@ msgstr "" msgid "Archives" msgstr "" +#: include/message.php:14 include/message.php:168 +msgid "[no subject]" +msgstr "" + +#: include/nav.php:37 mod/navigation.php:21 +msgid "Nothing new here" +msgstr "" + +#: include/nav.php:41 mod/navigation.php:25 +msgid "Clear notifications" +msgstr "" + +#: include/nav.php:42 include/text.php:1084 +msgid "@name, !forum, #tags, content" +msgstr "" + +#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:871 +msgid "Logout" +msgstr "" + +#: include/nav.php:80 view/theme/frio/theme.php:245 +msgid "End this session" +msgstr "" + +#: include/nav.php:83 include/nav.php:163 view/theme/frio/theme.php:248 +msgid "Your posts and conversations" +msgstr "" + +#: include/nav.php:84 view/theme/frio/theme.php:249 +msgid "Your profile page" +msgstr "" + +#: include/nav.php:85 view/theme/frio/theme.php:250 +msgid "Your photos" +msgstr "" + +#: include/nav.php:86 view/theme/frio/theme.php:251 +msgid "Your videos" +msgstr "" + +#: include/nav.php:87 view/theme/frio/theme.php:252 +msgid "Your events" +msgstr "" + +#: include/nav.php:88 +msgid "Personal notes" +msgstr "" + +#: include/nav.php:88 +msgid "Your personal notes" +msgstr "" + +#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:872 +msgid "Login" +msgstr "" + +#: include/nav.php:97 +msgid "Sign in" +msgstr "" + +#: include/nav.php:107 +msgid "Home Page" +msgstr "" + +#: include/nav.php:111 mod/register.php:291 boot.php:848 +msgid "Register" +msgstr "" + +#: include/nav.php:111 +msgid "Create an account" +msgstr "" + +#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 +msgid "Help" +msgstr "" + +#: include/nav.php:117 +msgid "Help and documentation" +msgstr "" + +#: include/nav.php:121 +msgid "Apps" +msgstr "" + +#: include/nav.php:121 +msgid "Addon applications, utilities, games" +msgstr "" + +#: include/nav.php:125 include/text.php:1081 mod/search.php:152 +msgid "Search" +msgstr "" + +#: include/nav.php:125 +msgid "Search site content" +msgstr "" + +#: include/nav.php:128 include/text.php:1089 +msgid "Full Text" +msgstr "" + +#: include/nav.php:129 include/text.php:1090 +msgid "Tags" +msgstr "" + +#: include/nav.php:145 include/nav.php:147 mod/community.php:32 +msgid "Community" +msgstr "" + +#: include/nav.php:145 +msgid "Conversations on this site" +msgstr "" + +#: include/nav.php:147 +msgid "Conversations on the network" +msgstr "" + +#: include/nav.php:154 +msgid "Directory" +msgstr "" + +#: include/nav.php:154 +msgid "People directory" +msgstr "" + +#: include/nav.php:156 +msgid "Information" +msgstr "" + +#: include/nav.php:156 +msgid "Information about this friendica instance" +msgstr "" + +#: include/nav.php:160 view/theme/frio/theme.php:255 +msgid "Conversations from your friends" +msgstr "" + +#: include/nav.php:161 +msgid "Network Reset" +msgstr "" + +#: include/nav.php:161 +msgid "Load Network page with no filters" +msgstr "" + +#: include/nav.php:168 +msgid "Friend Requests" +msgstr "" + +#: include/nav.php:171 mod/notifications.php:98 +msgid "Notifications" +msgstr "" + +#: include/nav.php:172 +msgid "See all notifications" +msgstr "" + +#: include/nav.php:173 mod/settings.php:907 +msgid "Mark as seen" +msgstr "" + +#: include/nav.php:173 +msgid "Mark all system notifications seen" +msgstr "" + +#: include/nav.php:177 mod/message.php:181 view/theme/frio/theme.php:257 +msgid "Messages" +msgstr "" + +#: include/nav.php:177 view/theme/frio/theme.php:257 +msgid "Private mail" +msgstr "" + +#: include/nav.php:178 +msgid "Inbox" +msgstr "" + +#: include/nav.php:179 +msgid "Outbox" +msgstr "" + +#: include/nav.php:180 mod/message.php:18 +msgid "New Message" +msgstr "" + +#: include/nav.php:183 +msgid "Manage" +msgstr "" + +#: include/nav.php:183 +msgid "Manage other pages" +msgstr "" + +#: include/nav.php:186 mod/settings.php:83 +msgid "Delegations" +msgstr "" + +#: include/nav.php:186 mod/delegate.php:132 +msgid "Delegate Page Management" +msgstr "" + +#: include/nav.php:188 mod/newmember.php:15 mod/settings.php:113 +#: mod/admin.php:1624 mod/admin.php:1900 view/theme/frio/theme.php:258 +msgid "Settings" +msgstr "" + +#: include/nav.php:188 view/theme/frio/theme.php:258 +msgid "Account settings" +msgstr "" + +#: include/nav.php:191 +msgid "Manage/Edit Profiles" +msgstr "" + +#: include/nav.php:194 view/theme/frio/theme.php:259 +msgid "Manage/edit friends and contacts" +msgstr "" + +#: include/nav.php:199 mod/admin.php:197 +msgid "Admin" +msgstr "" + +#: include/nav.php:199 +msgid "Site setup and configuration" +msgstr "" + +#: include/nav.php:202 +msgid "Navigation" +msgstr "" + +#: include/nav.php:202 +msgid "Site map" +msgstr "" + +#: include/network.php:687 +msgid "view full size" +msgstr "" + +#: include/oembed.php:256 +msgid "Embedded content" +msgstr "" + +#: include/oembed.php:264 +msgid "Embedding disabled" +msgstr "" + #: include/ostatus.php:1962 #, php-format msgid "%s is now following %s." @@ -3104,6 +2869,243 @@ msgstr "" msgid "stopped following" msgstr "" +#: include/photos.php:57 include/photos.php:66 mod/fbrowser.php:42 +#: mod/fbrowser.php:63 mod/photos.php:189 mod/photos.php:1125 +#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1841 +#: mod/photos.php:1855 +msgid "Contact Photos" +msgstr "" + +#: include/plugin.php:532 include/plugin.php:534 +msgid "Click here to upgrade." +msgstr "" + +#: include/plugin.php:541 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: include/plugin.php:546 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: include/text.php:308 +msgid "newer" +msgstr "" + +#: include/text.php:309 +msgid "older" +msgstr "" + +#: include/text.php:314 +msgid "first" +msgstr "" + +#: include/text.php:315 +msgid "prev" +msgstr "" + +#: include/text.php:349 +msgid "next" +msgstr "" + +#: include/text.php:350 +msgid "last" +msgstr "" + +#: include/text.php:404 +msgid "Loading more entries..." +msgstr "" + +#: include/text.php:405 +msgid "The end" +msgstr "" + +#: include/text.php:956 +msgid "No contacts" +msgstr "" + +#: include/text.php:981 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "" +msgstr[1] "" + +#: include/text.php:994 +msgid "View Contacts" +msgstr "" + +#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 mod/notes.php:64 +msgid "Save" +msgstr "" + +#: include/text.php:1145 +msgid "poke" +msgstr "" + +#: include/text.php:1145 +msgid "poked" +msgstr "" + +#: include/text.php:1146 +msgid "ping" +msgstr "" + +#: include/text.php:1146 +msgid "pinged" +msgstr "" + +#: include/text.php:1147 +msgid "prod" +msgstr "" + +#: include/text.php:1147 +msgid "prodded" +msgstr "" + +#: include/text.php:1148 +msgid "slap" +msgstr "" + +#: include/text.php:1148 +msgid "slapped" +msgstr "" + +#: include/text.php:1149 +msgid "finger" +msgstr "" + +#: include/text.php:1149 +msgid "fingered" +msgstr "" + +#: include/text.php:1150 +msgid "rebuff" +msgstr "" + +#: include/text.php:1150 +msgid "rebuffed" +msgstr "" + +#: include/text.php:1164 +msgid "happy" +msgstr "" + +#: include/text.php:1165 +msgid "sad" +msgstr "" + +#: include/text.php:1166 +msgid "mellow" +msgstr "" + +#: include/text.php:1167 +msgid "tired" +msgstr "" + +#: include/text.php:1168 +msgid "perky" +msgstr "" + +#: include/text.php:1169 +msgid "angry" +msgstr "" + +#: include/text.php:1170 +msgid "stupified" +msgstr "" + +#: include/text.php:1171 +msgid "puzzled" +msgstr "" + +#: include/text.php:1172 +msgid "interested" +msgstr "" + +#: include/text.php:1173 +msgid "bitter" +msgstr "" + +#: include/text.php:1174 +msgid "cheerful" +msgstr "" + +#: include/text.php:1175 +msgid "alive" +msgstr "" + +#: include/text.php:1176 +msgid "annoyed" +msgstr "" + +#: include/text.php:1177 +msgid "anxious" +msgstr "" + +#: include/text.php:1178 +msgid "cranky" +msgstr "" + +#: include/text.php:1179 +msgid "disturbed" +msgstr "" + +#: include/text.php:1180 +msgid "frustrated" +msgstr "" + +#: include/text.php:1181 +msgid "motivated" +msgstr "" + +#: include/text.php:1182 +msgid "relaxed" +msgstr "" + +#: include/text.php:1183 +msgid "surprised" +msgstr "" + +#: include/text.php:1393 mod/videos.php:388 +msgid "View Video" +msgstr "" + +#: include/text.php:1425 +msgid "bytes" +msgstr "" + +#: include/text.php:1457 include/text.php:1469 +msgid "Click to open/close" +msgstr "" + +#: include/text.php:1595 +msgid "View on separate page" +msgstr "" + +#: include/text.php:1596 +msgid "view on separate page" +msgstr "" + +#: include/text.php:1875 +msgid "activity" +msgstr "" + +#: include/text.php:1877 mod/content.php:624 object/Item.php:416 +#: object/Item.php:428 +msgid "comment" +msgid_plural "comments" +msgstr[0] "" +msgstr[1] "" + +#: include/text.php:1878 +msgid "post" +msgstr "" + +#: include/text.php:2046 +msgid "Item filed" +msgstr "" + #: mod/allfriends.php:48 msgid "No friends to display." msgstr "" @@ -3126,9 +3128,9 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: mod/api.php:108 mod/follow.php:115 mod/register.php:248 -#: mod/dfrn_request.php:880 mod/profiles.php:643 mod/profiles.php:647 -#: mod/profiles.php:673 mod/settings.php:1172 mod/settings.php:1178 +#: mod/api.php:108 mod/profiles.php:643 mod/profiles.php:647 +#: mod/profiles.php:673 mod/dfrn_request.php:880 mod/follow.php:115 +#: mod/register.php:248 mod/settings.php:1172 mod/settings.php:1178 #: mod/settings.php:1185 mod/settings.php:1189 mod/settings.php:1194 #: mod/settings.php:1199 mod/settings.php:1204 mod/settings.php:1209 #: mod/settings.php:1235 mod/settings.php:1236 mod/settings.php:1237 @@ -3208,7 +3210,7 @@ msgstr "" msgid "The post was created" msgstr "" -#: mod/cal.php:145 mod/display.php:329 mod/profile.php:156 +#: mod/cal.php:145 mod/profile.php:156 mod/display.php:348 msgid "Access to this profile has been restricted." msgstr "" @@ -3220,7 +3222,7 @@ msgstr "" msgid "Previous" msgstr "" -#: mod/cal.php:275 mod/events.php:381 mod/install.php:203 +#: mod/cal.php:275 mod/install.php:203 mod/events.php:381 msgid "Next" msgstr "" @@ -3252,21 +3254,6 @@ msgstr "" msgid "Common Friends" msgstr "" -#: mod/community.php:18 mod/directory.php:33 mod/display.php:201 -#: mod/photos.php:981 mod/search.php:96 mod/search.php:102 mod/videos.php:200 -#: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/dfrn_request.php:804 -#: mod/probe.php:9 -msgid "Public access denied." -msgstr "" - -#: mod/community.php:23 -msgid "Not available." -msgstr "" - -#: mod/community.php:50 mod/search.php:222 -msgid "No results." -msgstr "" - #: mod/content.php:120 mod/network.php:478 msgid "No such group" msgstr "" @@ -3330,13 +3317,13 @@ msgstr "" msgid "Comment" msgstr "" -#: mod/content.php:729 mod/crepair.php:159 mod/events.php:508 -#: mod/fsuggest.php:109 mod/install.php:244 mod/install.php:284 -#: mod/invite.php:144 mod/localtime.php:46 mod/manage.php:156 -#: mod/message.php:340 mod/message.php:523 mod/mood.php:139 mod/photos.php:1143 -#: mod/photos.php:1273 mod/photos.php:1599 mod/photos.php:1648 -#: mod/photos.php:1690 mod/photos.php:1770 mod/poke.php:204 -#: mod/contacts.php:588 mod/profiles.php:684 object/Item.php:702 +#: mod/content.php:729 mod/crepair.php:159 mod/fsuggest.php:109 +#: mod/install.php:244 mod/install.php:284 mod/invite.php:144 +#: mod/localtime.php:46 mod/manage.php:156 mod/message.php:340 +#: mod/message.php:523 mod/mood.php:139 mod/photos.php:1143 mod/photos.php:1273 +#: mod/photos.php:1599 mod/photos.php:1648 mod/photos.php:1690 +#: mod/photos.php:1770 mod/poke.php:204 mod/profiles.php:684 +#: mod/contacts.php:588 mod/events.php:508 object/Item.php:702 #: view/theme/duepuntozero/config.php:64 view/theme/frio/config.php:67 #: view/theme/quattro/config.php:70 view/theme/vier/config.php:113 msgid "Submit" @@ -3513,8 +3500,8 @@ msgid "" "entries from this contact." msgstr "" -#: mod/crepair.php:170 mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 -#: mod/admin.php:1538 mod/settings.php:684 mod/settings.php:710 +#: mod/crepair.php:170 mod/settings.php:684 mod/settings.php:710 +#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1538 msgid "Name" msgstr "" @@ -3670,6 +3657,13 @@ msgstr "" msgid "%1$s welcomes %2$s" msgstr "" +#: mod/directory.php:33 mod/photos.php:981 mod/probe.php:9 mod/videos.php:200 +#: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/community.php:18 +#: mod/dfrn_request.php:804 mod/display.php:213 mod/search.php:96 +#: mod/search.php:102 +msgid "Public access denied." +msgstr "" + #: mod/directory.php:195 view/theme/vier/theme.php:193 msgid "Global Directory" msgstr "" @@ -3690,24 +3684,6 @@ msgstr "" msgid "No entries (some entries may be hidden)." msgstr "" -#: mod/dirfind.php:39 -#, php-format -msgid "People Search - %s" -msgstr "" - -#: mod/dirfind.php:50 -#, php-format -msgid "Forum Search - %s" -msgstr "" - -#: mod/dirfind.php:247 mod/match.php:112 -msgid "No matches" -msgstr "" - -#: mod/display.php:480 -msgid "Item has been removed." -msgstr "" - #: mod/editpost.php:19 mod/editpost.php:29 msgid "Item not found" msgstr "" @@ -3716,124 +3692,14 @@ msgstr "" msgid "Edit post" msgstr "" -#: mod/events.php:96 mod/events.php:98 -msgid "Event can not end before it has started." -msgstr "" - -#: mod/events.php:105 mod/events.php:107 -msgid "Event title and start time are required." -msgstr "" - -#: mod/events.php:379 -msgid "Create New Event" -msgstr "" - -#: mod/events.php:484 -msgid "Event details" -msgstr "" - -#: mod/events.php:485 -msgid "Starting date and Title are required." -msgstr "" - -#: mod/events.php:486 mod/events.php:487 -msgid "Event Starts:" -msgstr "" - -#: mod/events.php:486 mod/events.php:498 mod/profiles.php:712 -msgid "Required" -msgstr "" - -#: mod/events.php:488 mod/events.php:504 -msgid "Finish date/time is not known or not relevant" -msgstr "" - -#: mod/events.php:490 mod/events.php:491 -msgid "Event Finishes:" -msgstr "" - -#: mod/events.php:492 mod/events.php:505 -msgid "Adjust for viewer timezone" -msgstr "" - -#: mod/events.php:494 -msgid "Description:" -msgstr "" - -#: mod/events.php:498 mod/events.php:500 -msgid "Title:" -msgstr "" - -#: mod/events.php:501 mod/events.php:502 -msgid "Share this event" -msgstr "" - -#: mod/events.php:531 -msgid "Failed to remove event" -msgstr "" - -#: mod/events.php:533 -msgid "Event removed" -msgstr "" - #: mod/fbrowser.php:134 msgid "Files" msgstr "" -#: mod/fetch.php:15 mod/fetch.php:42 mod/fetch.php:51 mod/help.php:56 -#: mod/p.php:19 mod/p.php:46 mod/p.php:55 index.php:301 -msgid "Not Found" -msgstr "" - #: mod/filer.php:31 msgid "- select -" msgstr "" -#: mod/follow.php:21 mod/dfrn_request.php:893 -msgid "Submit Request" -msgstr "" - -#: mod/follow.php:32 -msgid "You already added this contact." -msgstr "" - -#: mod/follow.php:41 -msgid "Diaspora support isn't enabled. Contact can't be added." -msgstr "" - -#: mod/follow.php:48 -msgid "OStatus support is disabled. Contact can't be added." -msgstr "" - -#: mod/follow.php:55 -msgid "The network type couldn't be detected. Contact can't be added." -msgstr "" - -#: mod/follow.php:114 mod/dfrn_request.php:879 -msgid "Please answer the following:" -msgstr "" - -#: mod/follow.php:115 mod/dfrn_request.php:880 -#, php-format -msgid "Does %s know you?" -msgstr "" - -#: mod/follow.php:116 mod/dfrn_request.php:884 -msgid "Add a personal note:" -msgstr "" - -#: mod/follow.php:122 mod/dfrn_request.php:890 -msgid "Your Identity Address:" -msgstr "" - -#: mod/follow.php:131 mod/notifications.php:257 mod/contacts.php:635 -msgid "Profile URL" -msgstr "" - -#: mod/follow.php:188 -msgid "Contact added" -msgstr "" - #: mod/friendica.php:69 msgid "This is Friendica, version" msgstr "" @@ -3967,6 +3833,11 @@ msgstr "" msgid "Help:" msgstr "" +#: mod/help.php:56 mod/p.php:19 mod/p.php:46 mod/p.php:55 mod/fetch.php:15 +#: mod/fetch.php:42 mod/fetch.php:51 index.php:301 +msgid "Not Found" +msgstr "" + #: mod/help.php:59 index.php:304 msgid "Page not found." msgstr "" @@ -4504,7 +4375,7 @@ msgid "" "Password reset failed." msgstr "" -#: mod/lostpass.php:112 boot.php:884 +#: mod/lostpass.php:112 boot.php:886 msgid "Password Reset" msgstr "" @@ -4572,7 +4443,7 @@ msgid "" "your email for further instructions." msgstr "" -#: mod/lostpass.php:163 boot.php:872 +#: mod/lostpass.php:163 boot.php:874 msgid "Nickname or Email: " msgstr "" @@ -4610,6 +4481,10 @@ msgstr "" msgid "Profile Match" msgstr "" +#: mod/match.php:112 mod/dirfind.php:247 +msgid "No matches" +msgstr "" + #: mod/message.php:62 mod/wallmessage.php:52 msgid "No recipient selected." msgstr "" @@ -4714,82 +4589,6 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: mod/network.php:154 mod/search.php:230 mod/contacts.php:808 -#, php-format -msgid "Results for: %s" -msgstr "" - -#: mod/network.php:200 mod/search.php:28 -msgid "Remove term" -msgstr "" - -#: mod/network.php:407 -#, 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:410 -msgid "Messages in this group won't be send to these receivers." -msgstr "" - -#: mod/network.php:538 -msgid "Private messages to this person are at risk of public disclosure." -msgstr "" - -#: mod/network.php:543 -msgid "Invalid contact." -msgstr "" - -#: mod/network.php:816 -msgid "Commented Order" -msgstr "" - -#: mod/network.php:819 -msgid "Sort by Comment Date" -msgstr "" - -#: mod/network.php:824 -msgid "Posted Order" -msgstr "" - -#: mod/network.php:827 -msgid "Sort by Post Date" -msgstr "" - -#: mod/network.php:838 -msgid "Posts that mention or involve you" -msgstr "" - -#: mod/network.php:846 -msgid "New" -msgstr "" - -#: mod/network.php:849 -msgid "Activity Stream - by date" -msgstr "" - -#: mod/network.php:857 -msgid "Shared Links" -msgstr "" - -#: mod/network.php:860 -msgid "Interesting Links" -msgstr "" - -#: mod/network.php:868 -msgid "Starred" -msgstr "" - -#: mod/network.php:871 -msgid "Favourite Posts" -msgstr "" - #: mod/newmember.php:7 msgid "Welcome to Friendica" msgstr "" @@ -5084,6 +4883,10 @@ msgstr "" msgid "Subscriber" msgstr "" +#: mod/notifications.php:257 mod/contacts.php:635 mod/follow.php:131 +msgid "Profile URL" +msgstr "" + #: mod/notifications.php:274 msgid "No introductions." msgstr "" @@ -5199,7 +5002,7 @@ msgstr "" msgid "a photo" msgstr "" -#: mod/photos.php:815 mod/wall_upload.php:181 mod/profile_photo.php:155 +#: mod/photos.php:815 mod/profile_photo.php:155 mod/wall_upload.php:181 #, php-format msgid "Image exceeds size limit of %s" msgstr "" @@ -5208,11 +5011,11 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: mod/photos.php:856 mod/wall_upload.php:218 mod/profile_photo.php:164 +#: mod/photos.php:856 mod/profile_photo.php:164 mod/wall_upload.php:218 msgid "Unable to process image." msgstr "" -#: mod/photos.php:885 mod/wall_upload.php:257 mod/profile_photo.php:314 +#: mod/photos.php:885 mod/profile_photo.php:314 mod/wall_upload.php:257 msgid "Image upload failed." msgstr "" @@ -5373,10 +5176,378 @@ msgstr "" msgid "Make this post private" msgstr "" +#: mod/probe.php:10 mod/webfinger.php:11 +msgid "Only logged in users are permitted to perform a probing." +msgstr "" + #: mod/profile.php:176 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:322 +#, 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:136 +msgid "Unable to process image" +msgstr "" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "" + +#: mod/profile_photo.php:256 +#: view/smarty3/compiled/04b5adc938a37b0a51a14fb26634819e90d47ba4.file.filebrowser.tpl.php:119 +msgid "Upload" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "" + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "" + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "" + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "" + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "" + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "" + +#: mod/profiles.php:567 +msgid " and " +msgstr "" + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "" + +#: mod/profiles.php:712 mod/events.php:486 mod/events.php:498 +msgid "Required" +msgstr "" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "" + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "" + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow " +"you." +msgstr "" + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "" + #: mod/profperm.php:28 mod/profperm.php:59 msgid "Invalid profile identifier." msgstr "" @@ -5393,113 +5564,17 @@ msgstr "" msgid "All Contacts (with secure profile access)" msgstr "" -#: mod/register.php:95 -msgid "" -"Registration successful. Please check your email for further instructions." +#: mod/regmod.php:60 +msgid "Account approved." msgstr "" -#: mod/register.php:100 +#: mod/regmod.php:88 #, php-format -msgid "" -"Failed to send email message. Here your accout details:<br> login: %s<br> " -"password: %s<br><br>You can change your password after login." +msgid "Registration revoked for %s" msgstr "" -#: mod/register.php:107 -msgid "Registration successful." -msgstr "" - -#: mod/register.php:113 -msgid "Your registration can not be processed." -msgstr "" - -#: mod/register.php:162 -msgid "Your registration is pending approval by the site owner." -msgstr "" - -#: mod/register.php:200 mod/uimport.php:53 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "" - -#: mod/register.php:228 -msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." -msgstr "" - -#: mod/register.php:229 -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:230 -msgid "Your OpenID (optional): " -msgstr "" - -#: mod/register.php:244 -msgid "Include your profile in member directory?" -msgstr "" - -#: mod/register.php:269 -msgid "Note for the admin" -msgstr "" - -#: mod/register.php:269 -msgid "Leave a message for the admin, why you want to join this node" -msgstr "" - -#: mod/register.php:270 -msgid "Membership on this site is by invitation only." -msgstr "" - -#: mod/register.php:271 -msgid "Your invitation ID: " -msgstr "" - -#: mod/register.php:274 mod/admin.php:1062 -msgid "Registration" -msgstr "" - -#: mod/register.php:282 -msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " -msgstr "" - -#: mod/register.php:283 -msgid "Your Email Address: " -msgstr "" - -#: mod/register.php:285 mod/settings.php:1279 -msgid "New Password:" -msgstr "" - -#: mod/register.php:285 -msgid "Leave empty for an auto generated password." -msgstr "" - -#: mod/register.php:286 mod/settings.php:1280 -msgid "Confirm:" -msgstr "" - -#: mod/register.php:287 -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be '<strong>nickname@$sitename</" -"strong>'." -msgstr "" - -#: mod/register.php:288 -msgid "Choose a nickname: " -msgstr "" - -#: mod/register.php:297 mod/uimport.php:68 -msgid "Import" -msgstr "" - -#: mod/register.php:298 -msgid "Import your profile to this friendica instance" +#: mod/regmod.php:100 +msgid "Please login." msgstr "" #: mod/removeme.php:54 mod/removeme.php:57 @@ -5524,23 +5599,6 @@ msgstr "" msgid "Error" msgstr "" -#: mod/search.php:103 -msgid "Only logged in users are permitted to perform a search." -msgstr "" - -#: mod/search.php:127 -msgid "Too Many Requests" -msgstr "" - -#: mod/search.php:128 -msgid "Only one search per minute is permitted for not logged in users." -msgstr "" - -#: mod/search.php:228 -#, php-format -msgid "Items tagged with: %s" -msgstr "" - #: mod/subthread.php:105 #, php-format msgid "%1$s is following %2$s's %3$s" @@ -5597,8 +5655,49 @@ msgstr "" msgid "Export personal data" msgstr "" +#: mod/uimport.php:53 mod/register.php:200 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "" + +#: mod/uimport.php:68 mod/register.php:297 +msgid "Import" +msgstr "" + +#: mod/uimport.php:70 +msgid "Move account" +msgstr "" + +#: mod/uimport.php:71 +msgid "You can import an account from another Friendica server." +msgstr "" + +#: mod/uimport.php:72 +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:73 +msgid "" +"This feature is experimental. We can't import contacts from the OStatus " +"network (GNU Social/Statusnet) or from Diaspora" +msgstr "" + +#: mod/uimport.php:74 +msgid "Account file" +msgstr "" + +#: mod/uimport.php:74 +msgid "" +"To export your account, go to \"Settings->Export your personal data\" and " +"select \"Export account\"" +msgstr "" + #: mod/update_community.php:21 mod/update_display.php:25 -#: mod/update_network.php:29 mod/update_notes.php:38 mod/update_profile.php:37 +#: mod/update_notes.php:38 mod/update_profile.php:37 mod/update_network.php:29 msgid "[Embedded content - reload page to view]" msgstr "" @@ -5673,235 +5772,12 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: mod/webfinger.php:11 mod/probe.php:10 -msgid "Only logged in users are permitted to perform a probing." +#: mod/community.php:23 +msgid "Not available." msgstr "" -#: mod/dfrn_request.php:103 -msgid "This introduction has already been accepted." -msgstr "" - -#: mod/dfrn_request.php:126 mod/dfrn_request.php:528 -msgid "Profile location is not valid or does not contain profile information." -msgstr "" - -#: mod/dfrn_request.php:131 mod/dfrn_request.php:533 -msgid "Warning: profile location has no identifiable owner name." -msgstr "" - -#: mod/dfrn_request.php:134 mod/dfrn_request.php:536 -msgid "Warning: profile location has no profile photo." -msgstr "" - -#: mod/dfrn_request.php:138 mod/dfrn_request.php:540 -#, php-format -msgid "%d required parameter was not found at the given location" -msgid_plural "%d required parameters were not found at the given location" -msgstr[0] "" -msgstr[1] "" - -#: mod/dfrn_request.php:182 -msgid "Introduction complete." -msgstr "" - -#: mod/dfrn_request.php:227 -msgid "Unrecoverable protocol error." -msgstr "" - -#: mod/dfrn_request.php:255 -msgid "Profile unavailable." -msgstr "" - -#: mod/dfrn_request.php:282 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "" - -#: mod/dfrn_request.php:283 -msgid "Spam protection measures have been invoked." -msgstr "" - -#: mod/dfrn_request.php:284 -msgid "Friends are advised to please try again in 24 hours." -msgstr "" - -#: mod/dfrn_request.php:346 -msgid "Invalid locator" -msgstr "" - -#: mod/dfrn_request.php:355 -msgid "Invalid email address." -msgstr "" - -#: mod/dfrn_request.php:380 -msgid "This account has not been configured for email. Request failed." -msgstr "" - -#: mod/dfrn_request.php:483 -msgid "You have already introduced yourself here." -msgstr "" - -#: mod/dfrn_request.php:487 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "" - -#: mod/dfrn_request.php:508 -msgid "Invalid profile URL." -msgstr "" - -#: mod/dfrn_request.php:593 mod/contacts.php:221 -msgid "Failed to update contact record." -msgstr "" - -#: mod/dfrn_request.php:614 -msgid "Your introduction has been sent." -msgstr "" - -#: mod/dfrn_request.php:656 -msgid "" -"Remote subscription can't be done for your network. Please subscribe " -"directly on your system." -msgstr "" - -#: mod/dfrn_request.php:677 -msgid "Please login to confirm introduction." -msgstr "" - -#: mod/dfrn_request.php:687 -msgid "" -"Incorrect identity currently logged in. Please login to <strong>this</" -"strong> profile." -msgstr "" - -#: mod/dfrn_request.php:701 mod/dfrn_request.php:718 -msgid "Confirm" -msgstr "" - -#: mod/dfrn_request.php:713 -msgid "Hide this contact" -msgstr "" - -#: mod/dfrn_request.php:716 -#, php-format -msgid "Welcome home %s." -msgstr "" - -#: mod/dfrn_request.php:717 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "" - -#: mod/dfrn_request.php:848 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"communications networks:" -msgstr "" - -#: mod/dfrn_request.php:872 -#, php-format -msgid "" -"If you are not yet a member of the free social web, <a href=\"%s/siteinfo" -"\">follow this link to find a public Friendica site and join us today</a>." -msgstr "" - -#: mod/dfrn_request.php:877 -msgid "Friend/Connection Request" -msgstr "" - -#: mod/dfrn_request.php:878 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" -msgstr "" - -#: mod/dfrn_request.php:887 -msgid "StatusNet/Federated Social Web" -msgstr "" - -#: mod/dfrn_request.php:889 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search " -"bar." -msgstr "" - -#: mod/item.php:118 -msgid "Unable to locate original post." -msgstr "" - -#: mod/item.php:345 -msgid "Empty post discarded." -msgstr "" - -#: mod/item.php:904 -msgid "System error. Post not saved." -msgstr "" - -#: mod/item.php:995 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social network." -msgstr "" - -#: mod/item.php:997 -#, php-format -msgid "You may visit them online at %s" -msgstr "" - -#: mod/item.php:998 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." -msgstr "" - -#: mod/item.php:1002 -#, php-format -msgid "%s posted an update." -msgstr "" - -#: mod/regmod.php:60 -msgid "Account approved." -msgstr "" - -#: mod/regmod.php:88 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: mod/regmod.php:100 -msgid "Please login." -msgstr "" - -#: mod/uimport.php:70 -msgid "Move account" -msgstr "" - -#: mod/uimport.php:71 -msgid "You can import an account from another Friendica server." -msgstr "" - -#: mod/uimport.php:72 -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:73 -msgid "" -"This feature is experimental. We can't import contacts from the OStatus " -"network (GNU Social/Statusnet) or from Diaspora" -msgstr "" - -#: mod/uimport.php:74 -msgid "Account file" -msgstr "" - -#: mod/uimport.php:74 -msgid "" -"To export your account, go to \"Settings->Export your personal data\" and " -"select \"Export account\"" +#: mod/community.php:50 mod/search.php:222 +msgid "No results." msgstr "" #: mod/contacts.php:137 @@ -5923,6 +5799,10 @@ msgstr "" msgid "Contact updated." msgstr "" +#: mod/contacts.php:221 mod/dfrn_request.php:593 +msgid "Failed to update contact record." +msgstr "" + #: mod/contacts.php:402 msgid "Contact has been blocked" msgstr "" @@ -6183,6 +6063,11 @@ msgstr "" msgid "Search your contacts" msgstr "" +#: mod/contacts.php:808 mod/network.php:154 mod/search.php:230 +#, php-format +msgid "Results for: %s" +msgstr "" + #: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 msgid "Update" msgstr "" @@ -6239,6 +6124,367 @@ msgstr "" msgid "Delete contact" msgstr "" +#: mod/dfrn_request.php:103 +msgid "This introduction has already been accepted." +msgstr "" + +#: mod/dfrn_request.php:126 mod/dfrn_request.php:528 +msgid "Profile location is not valid or does not contain profile information." +msgstr "" + +#: mod/dfrn_request.php:131 mod/dfrn_request.php:533 +msgid "Warning: profile location has no identifiable owner name." +msgstr "" + +#: mod/dfrn_request.php:134 mod/dfrn_request.php:536 +msgid "Warning: profile location has no profile photo." +msgstr "" + +#: mod/dfrn_request.php:138 mod/dfrn_request.php:540 +#, php-format +msgid "%d required parameter was not found at the given location" +msgid_plural "%d required parameters were not found at the given location" +msgstr[0] "" +msgstr[1] "" + +#: mod/dfrn_request.php:182 +msgid "Introduction complete." +msgstr "" + +#: mod/dfrn_request.php:227 +msgid "Unrecoverable protocol error." +msgstr "" + +#: mod/dfrn_request.php:255 +msgid "Profile unavailable." +msgstr "" + +#: mod/dfrn_request.php:282 +#, php-format +msgid "%s has received too many connection requests today." +msgstr "" + +#: mod/dfrn_request.php:283 +msgid "Spam protection measures have been invoked." +msgstr "" + +#: mod/dfrn_request.php:284 +msgid "Friends are advised to please try again in 24 hours." +msgstr "" + +#: mod/dfrn_request.php:346 +msgid "Invalid locator" +msgstr "" + +#: mod/dfrn_request.php:355 +msgid "Invalid email address." +msgstr "" + +#: mod/dfrn_request.php:380 +msgid "This account has not been configured for email. Request failed." +msgstr "" + +#: mod/dfrn_request.php:483 +msgid "You have already introduced yourself here." +msgstr "" + +#: mod/dfrn_request.php:487 +#, php-format +msgid "Apparently you are already friends with %s." +msgstr "" + +#: mod/dfrn_request.php:508 +msgid "Invalid profile URL." +msgstr "" + +#: mod/dfrn_request.php:614 +msgid "Your introduction has been sent." +msgstr "" + +#: mod/dfrn_request.php:656 +msgid "" +"Remote subscription can't be done for your network. Please subscribe " +"directly on your system." +msgstr "" + +#: mod/dfrn_request.php:677 +msgid "Please login to confirm introduction." +msgstr "" + +#: mod/dfrn_request.php:687 +msgid "" +"Incorrect identity currently logged in. Please login to <strong>this</" +"strong> profile." +msgstr "" + +#: mod/dfrn_request.php:701 mod/dfrn_request.php:718 +msgid "Confirm" +msgstr "" + +#: mod/dfrn_request.php:713 +msgid "Hide this contact" +msgstr "" + +#: mod/dfrn_request.php:716 +#, php-format +msgid "Welcome home %s." +msgstr "" + +#: mod/dfrn_request.php:717 +#, php-format +msgid "Please confirm your introduction/connection request to %s." +msgstr "" + +#: mod/dfrn_request.php:848 +msgid "" +"Please enter your 'Identity Address' from one of the following supported " +"communications networks:" +msgstr "" + +#: mod/dfrn_request.php:872 +#, php-format +msgid "" +"If you are not yet a member of the free social web, <a href=\"%s/siteinfo" +"\">follow this link to find a public Friendica site and join us today</a>." +msgstr "" + +#: mod/dfrn_request.php:877 +msgid "Friend/Connection Request" +msgstr "" + +#: mod/dfrn_request.php:878 +msgid "" +"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " +"testuser@identi.ca" +msgstr "" + +#: mod/dfrn_request.php:879 mod/follow.php:114 +msgid "Please answer the following:" +msgstr "" + +#: mod/dfrn_request.php:880 mod/follow.php:115 +#, php-format +msgid "Does %s know you?" +msgstr "" + +#: mod/dfrn_request.php:884 mod/follow.php:116 +msgid "Add a personal note:" +msgstr "" + +#: mod/dfrn_request.php:887 +msgid "StatusNet/Federated Social Web" +msgstr "" + +#: mod/dfrn_request.php:889 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search " +"bar." +msgstr "" + +#: mod/dfrn_request.php:890 mod/follow.php:122 +msgid "Your Identity Address:" +msgstr "" + +#: mod/dfrn_request.php:893 mod/follow.php:21 +msgid "Submit Request" +msgstr "" + +#: mod/dirfind.php:39 +#, php-format +msgid "People Search - %s" +msgstr "" + +#: mod/dirfind.php:50 +#, php-format +msgid "Forum Search - %s" +msgstr "" + +#: mod/display.php:499 +msgid "Item has been removed." +msgstr "" + +#: mod/events.php:96 mod/events.php:98 +msgid "Event can not end before it has started." +msgstr "" + +#: mod/events.php:105 mod/events.php:107 +msgid "Event title and start time are required." +msgstr "" + +#: mod/events.php:379 +msgid "Create New Event" +msgstr "" + +#: mod/events.php:484 +msgid "Event details" +msgstr "" + +#: mod/events.php:485 +msgid "Starting date and Title are required." +msgstr "" + +#: mod/events.php:486 mod/events.php:487 +msgid "Event Starts:" +msgstr "" + +#: mod/events.php:488 mod/events.php:504 +msgid "Finish date/time is not known or not relevant" +msgstr "" + +#: mod/events.php:490 mod/events.php:491 +msgid "Event Finishes:" +msgstr "" + +#: mod/events.php:492 mod/events.php:505 +msgid "Adjust for viewer timezone" +msgstr "" + +#: mod/events.php:494 +msgid "Description:" +msgstr "" + +#: mod/events.php:498 mod/events.php:500 +msgid "Title:" +msgstr "" + +#: mod/events.php:501 mod/events.php:502 +msgid "Share this event" +msgstr "" + +#: mod/events.php:531 +msgid "Failed to remove event" +msgstr "" + +#: mod/events.php:533 +msgid "Event removed" +msgstr "" + +#: mod/follow.php:32 +msgid "You already added this contact." +msgstr "" + +#: mod/follow.php:41 +msgid "Diaspora support isn't enabled. Contact can't be added." +msgstr "" + +#: mod/follow.php:48 +msgid "OStatus support is disabled. Contact can't be added." +msgstr "" + +#: mod/follow.php:55 +msgid "The network type couldn't be detected. Contact can't be added." +msgstr "" + +#: mod/follow.php:188 +msgid "Contact added" +msgstr "" + +#: mod/item.php:118 +msgid "Unable to locate original post." +msgstr "" + +#: mod/item.php:345 +msgid "Empty post discarded." +msgstr "" + +#: mod/item.php:904 +msgid "System error. Post not saved." +msgstr "" + +#: mod/item.php:995 +#, php-format +msgid "" +"This message was sent to you by %s, a member of the Friendica social network." +msgstr "" + +#: mod/item.php:997 +#, php-format +msgid "You may visit them online at %s" +msgstr "" + +#: mod/item.php:998 +msgid "" +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." +msgstr "" + +#: mod/item.php:1002 +#, php-format +msgid "%s posted an update." +msgstr "" + +#: mod/network.php:200 mod/search.php:28 +msgid "Remove term" +msgstr "" + +#: mod/network.php:407 +#, 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:410 +msgid "Messages in this group won't be send to these receivers." +msgstr "" + +#: mod/network.php:538 +msgid "Private messages to this person are at risk of public disclosure." +msgstr "" + +#: mod/network.php:543 +msgid "Invalid contact." +msgstr "" + +#: mod/network.php:816 +msgid "Commented Order" +msgstr "" + +#: mod/network.php:819 +msgid "Sort by Comment Date" +msgstr "" + +#: mod/network.php:824 +msgid "Posted Order" +msgstr "" + +#: mod/network.php:827 +msgid "Sort by Post Date" +msgstr "" + +#: mod/network.php:838 +msgid "Posts that mention or involve you" +msgstr "" + +#: mod/network.php:846 +msgid "New" +msgstr "" + +#: mod/network.php:849 +msgid "Activity Stream - by date" +msgstr "" + +#: mod/network.php:857 +msgid "Shared Links" +msgstr "" + +#: mod/network.php:860 +msgid "Interesting Links" +msgstr "" + +#: mod/network.php:868 +msgid "Starred" +msgstr "" + +#: mod/network.php:871 +msgid "Favourite Posts" +msgstr "" + #: mod/ping.php:274 msgid "{0} wants to be your friend" msgstr "" @@ -6251,363 +6497,874 @@ msgstr "" msgid "{0} requested registration" 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:322 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "" - -#: mod/profile_photo.php:127 +#: mod/register.php:95 msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." +"Registration successful. Please check your email for further instructions." msgstr "" -#: mod/profile_photo.php:136 -msgid "Unable to process image" -msgstr "" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "" - -#: mod/profile_photo.php:256 -msgid "Upload" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "" - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "" - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "" - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "" - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "" - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "" - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "" - -#: mod/profiles.php:567 -msgid " and " -msgstr "" - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "" - -#: mod/profiles.php:579 +#: mod/register.php:100 #, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr "" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "" - -#: mod/profiles.php:714 msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." +"Failed to send email message. Here your accout details:<br> login: %s<br> " +"password: %s<br><br>You can change your password after login." msgstr "" -#: mod/profiles.php:715 -msgid "Your Full Name:" +#: mod/register.php:107 +msgid "Registration successful." msgstr "" -#: mod/profiles.php:716 -msgid "Title/Description:" +#: mod/register.php:113 +msgid "Your registration can not be processed." msgstr "" -#: mod/profiles.php:719 -msgid "Street Address:" +#: mod/register.php:162 +msgid "Your registration is pending approval by the site owner." msgstr "" -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "" - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "" - -#: mod/profiles.php:731 +#: mod/register.php:228 msgid "" -"The XMPP address will be propagated to your contacts so that they can follow " -"you." +"You may (optionally) fill in this form via OpenID by supplying your OpenID " +"and clicking 'Register'." msgstr "" -#: mod/profiles.php:732 -msgid "Homepage URL:" +#: mod/register.php:229 +msgid "" +"If you are not familiar with OpenID, please leave that field blank and fill " +"in the rest of the items." msgstr "" -#: mod/profiles.php:735 -msgid "Religious Views:" +#: mod/register.php:230 +msgid "Your OpenID (optional): " msgstr "" -#: mod/profiles.php:736 -msgid "Public Keywords:" +#: mod/register.php:244 +msgid "Include your profile in member directory?" msgstr "" -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" +#: mod/register.php:269 +msgid "Note for the admin" msgstr "" -#: mod/profiles.php:737 -msgid "Private Keywords:" +#: mod/register.php:269 +msgid "Leave a message for the admin, why you want to join this node" msgstr "" -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" +#: mod/register.php:270 +msgid "Membership on this site is by invitation only." msgstr "" -#: mod/profiles.php:740 -msgid "Musical interests" +#: mod/register.php:271 +msgid "Your invitation ID: " msgstr "" -#: mod/profiles.php:741 -msgid "Books, literature" +#: mod/register.php:274 mod/admin.php:1062 +msgid "Registration" msgstr "" -#: mod/profiles.php:742 -msgid "Television" +#: mod/register.php:282 +msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " msgstr "" -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" +#: mod/register.php:283 +msgid "Your Email Address: " msgstr "" -#: mod/profiles.php:744 -msgid "Hobbies/Interests" +#: mod/register.php:285 mod/settings.php:1279 +msgid "New Password:" msgstr "" -#: mod/profiles.php:745 -msgid "Love/romance" +#: mod/register.php:285 +msgid "Leave empty for an auto generated password." msgstr "" -#: mod/profiles.php:746 -msgid "Work/employment" +#: mod/register.php:286 mod/settings.php:1280 +msgid "Confirm:" msgstr "" -#: mod/profiles.php:747 -msgid "School/education" +#: mod/register.php:287 +msgid "" +"Choose a profile nickname. This must begin with a text character. Your " +"profile address on this site will then be '<strong>nickname@$sitename</" +"strong>'." msgstr "" -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" +#: mod/register.php:288 +msgid "Choose a nickname: " msgstr "" -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" +#: mod/register.php:298 +msgid "Import your profile to this friendica instance" +msgstr "" + +#: mod/search.php:103 +msgid "Only logged in users are permitted to perform a search." +msgstr "" + +#: mod/search.php:127 +msgid "Too Many Requests" +msgstr "" + +#: mod/search.php:128 +msgid "Only one search per minute is permitted for not logged in users." +msgstr "" + +#: mod/search.php:228 +#, php-format +msgid "Items tagged with: %s" +msgstr "" + +#: mod/settings.php:45 mod/admin.php:1496 +msgid "Account" +msgstr "" + +#: mod/settings.php:54 mod/admin.php:170 +msgid "Additional features" +msgstr "" + +#: mod/settings.php:62 +msgid "Display" +msgstr "" + +#: mod/settings.php:69 mod/settings.php:891 +msgid "Social Networks" +msgstr "" + +#: mod/settings.php:76 mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 +msgid "Plugins" +msgstr "" + +#: mod/settings.php:90 +msgid "Connected apps" +msgstr "" + +#: mod/settings.php:104 +msgid "Remove account" +msgstr "" + +#: mod/settings.php:159 +msgid "Missing some important data!" +msgstr "" + +#: mod/settings.php:273 +msgid "Failed to connect with email account using the settings provided." +msgstr "" + +#: mod/settings.php:278 +msgid "Email settings updated." +msgstr "" + +#: mod/settings.php:293 +msgid "Features updated" +msgstr "" + +#: mod/settings.php:363 +msgid "Relocate message has been send to your contacts" +msgstr "" + +#: mod/settings.php:382 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: mod/settings.php:390 +msgid "Wrong password." +msgstr "" + +#: mod/settings.php:401 +msgid "Password changed." +msgstr "" + +#: mod/settings.php:403 +msgid "Password update failed. Please try again." +msgstr "" + +#: mod/settings.php:483 +msgid " Please use a shorter name." +msgstr "" + +#: mod/settings.php:485 +msgid " Name too short." +msgstr "" + +#: mod/settings.php:494 +msgid "Wrong Password" +msgstr "" + +#: mod/settings.php:499 +msgid " Not valid email." +msgstr "" + +#: mod/settings.php:505 +msgid " Cannot change to that email." +msgstr "" + +#: mod/settings.php:561 +msgid "Private forum has no privacy permissions. Using default privacy group." +msgstr "" + +#: mod/settings.php:565 +msgid "Private forum has no privacy permissions and no default privacy group." +msgstr "" + +#: mod/settings.php:605 +msgid "Settings updated." +msgstr "" + +#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 +msgid "Add application" +msgstr "" + +#: mod/settings.php:682 mod/settings.php:793 mod/settings.php:842 +#: mod/settings.php:909 mod/settings.php:1006 mod/settings.php:1272 +#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 +#: mod/admin.php:2176 +msgid "Save Settings" +msgstr "" + +#: mod/settings.php:685 mod/settings.php:711 +msgid "Consumer Key" +msgstr "" + +#: mod/settings.php:686 mod/settings.php:712 +msgid "Consumer Secret" +msgstr "" + +#: mod/settings.php:687 mod/settings.php:713 +msgid "Redirect" +msgstr "" + +#: mod/settings.php:688 mod/settings.php:714 +msgid "Icon url" +msgstr "" + +#: mod/settings.php:699 +msgid "You can't edit this application." +msgstr "" + +#: mod/settings.php:742 +msgid "Connected Apps" +msgstr "" + +#: mod/settings.php:746 +msgid "Client key starts with" +msgstr "" + +#: mod/settings.php:747 +msgid "No name" +msgstr "" + +#: mod/settings.php:748 +msgid "Remove authorization" +msgstr "" + +#: mod/settings.php:760 +msgid "No Plugin settings configured" +msgstr "" + +#: mod/settings.php:769 +msgid "Plugin Settings" +msgstr "" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "Off" +msgstr "" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "On" +msgstr "" + +#: mod/settings.php:791 +msgid "Additional Features" +msgstr "" + +#: mod/settings.php:801 mod/settings.php:805 +msgid "General Social Media Settings" +msgstr "" + +#: mod/settings.php:811 +msgid "Disable intelligent shortening" +msgstr "" + +#: mod/settings.php:813 +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:819 +msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" +msgstr "" + +#: mod/settings.php:821 +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:827 +msgid "Default group for OStatus contacts" +msgstr "" + +#: mod/settings.php:835 +msgid "Your legacy GNU Social account" +msgstr "" + +#: mod/settings.php:837 +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:840 +msgid "Repair OStatus subscriptions" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +#, php-format +msgid "Built-in support for %s connectivity is %s" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "enabled" +msgstr "" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "disabled" +msgstr "" + +#: mod/settings.php:850 +msgid "GNU Social (OStatus)" +msgstr "" + +#: mod/settings.php:884 +msgid "Email access is disabled on this site." +msgstr "" + +#: mod/settings.php:896 +msgid "Email/Mailbox Setup" +msgstr "" + +#: mod/settings.php:897 +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:898 +msgid "Last successful email check:" +msgstr "" + +#: mod/settings.php:900 +msgid "IMAP server name:" +msgstr "" + +#: mod/settings.php:901 +msgid "IMAP port:" +msgstr "" + +#: mod/settings.php:902 +msgid "Security:" +msgstr "" + +#: mod/settings.php:902 mod/settings.php:907 +msgid "None" +msgstr "" + +#: mod/settings.php:903 +msgid "Email login name:" +msgstr "" + +#: mod/settings.php:904 +msgid "Email password:" +msgstr "" + +#: mod/settings.php:905 +msgid "Reply-to address:" +msgstr "" + +#: mod/settings.php:906 +msgid "Send public posts to all email contacts:" +msgstr "" + +#: mod/settings.php:907 +msgid "Action after import:" +msgstr "" + +#: mod/settings.php:907 +msgid "Move to folder" +msgstr "" + +#: mod/settings.php:908 +msgid "Move to folder:" +msgstr "" + +#: mod/settings.php:944 mod/admin.php:948 +msgid "No special theme for mobile devices" +msgstr "" + +#: mod/settings.php:1004 +msgid "Display Settings" +msgstr "" + +#: mod/settings.php:1010 mod/settings.php:1033 +msgid "Display Theme:" +msgstr "" + +#: mod/settings.php:1011 +msgid "Mobile Theme:" +msgstr "" + +#: mod/settings.php:1012 +msgid "Suppress warning of insecure networks" +msgstr "" + +#: mod/settings.php:1012 +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:1013 +msgid "Update browser every xx seconds" +msgstr "" + +#: mod/settings.php:1013 +msgid "Minimum of 10 seconds. Enter -1 to disable it." +msgstr "" + +#: mod/settings.php:1014 +msgid "Number of items to display per page:" +msgstr "" + +#: mod/settings.php:1014 mod/settings.php:1015 +msgid "Maximum of 100 items" +msgstr "" + +#: mod/settings.php:1015 +msgid "Number of items to display per page when viewed from mobile device:" +msgstr "" + +#: mod/settings.php:1016 +msgid "Don't show emoticons" +msgstr "" + +#: mod/settings.php:1017 +msgid "Calendar" +msgstr "" + +#: mod/settings.php:1018 +msgid "Beginning of week:" +msgstr "" + +#: mod/settings.php:1019 +msgid "Don't show notices" +msgstr "" + +#: mod/settings.php:1020 +msgid "Infinite scroll" +msgstr "" + +#: mod/settings.php:1021 +msgid "Automatic updates only at the top of the network page" +msgstr "" + +#: mod/settings.php:1022 +msgid "Bandwith Saver Mode" +msgstr "" + +#: mod/settings.php:1022 +msgid "" +"When enabled, embedded content is not displayed on automatic updates, they " +"only show on page reload." +msgstr "" + +#: mod/settings.php:1024 +msgid "General Theme Settings" +msgstr "" + +#: mod/settings.php:1025 +msgid "Custom Theme Settings" +msgstr "" + +#: mod/settings.php:1026 +msgid "Content Settings" +msgstr "" + +#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 +#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 +#: view/theme/vier/config.php:115 +msgid "Theme settings" +msgstr "" + +#: mod/settings.php:1111 +msgid "Account Types" +msgstr "" + +#: mod/settings.php:1112 +msgid "Personal Page Subtypes" +msgstr "" + +#: mod/settings.php:1113 +msgid "Community Forum Subtypes" +msgstr "" + +#: mod/settings.php:1120 +msgid "Personal Page" +msgstr "" + +#: mod/settings.php:1121 +msgid "Account for a personal profile." +msgstr "" + +#: mod/settings.php:1124 +msgid "Organisation Page" +msgstr "" + +#: mod/settings.php:1125 +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1128 +msgid "News Page" +msgstr "" + +#: mod/settings.php:1129 +msgid "" +"Account for a news reflector that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1132 +msgid "Community Forum" +msgstr "" + +#: mod/settings.php:1133 +msgid "Account for community discussions." +msgstr "" + +#: mod/settings.php:1136 +msgid "Normal Account Page" +msgstr "" + +#: mod/settings.php:1137 +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "" + +#: mod/settings.php:1140 +msgid "Soapbox Page" +msgstr "" + +#: mod/settings.php:1141 +msgid "" +"Account for a public profile that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1144 +msgid "Public Forum" +msgstr "" + +#: mod/settings.php:1145 +msgid "Automatically approves all contact requests." +msgstr "" + +#: mod/settings.php:1148 +msgid "Automatic Friend Page" +msgstr "" + +#: mod/settings.php:1149 +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "" + +#: mod/settings.php:1152 +msgid "Private Forum [Experimental]" +msgstr "" + +#: mod/settings.php:1153 +msgid "Requires manual approval of contact requests." +msgstr "" + +#: mod/settings.php:1164 +msgid "OpenID:" +msgstr "" + +#: mod/settings.php:1164 +msgid "(Optional) Allow this OpenID to login to this account." +msgstr "" + +#: mod/settings.php:1172 +msgid "Publish your default profile in your local site directory?" +msgstr "" + +#: mod/settings.php:1172 +msgid "Your profile may be visible in public." +msgstr "" + +#: mod/settings.php:1178 +msgid "Publish your default profile in the global social directory?" +msgstr "" + +#: mod/settings.php:1185 +msgid "Hide your contact/friend list from viewers of your default profile?" +msgstr "" + +#: mod/settings.php:1189 +msgid "" +"If enabled, posting public messages to Diaspora and other networks isn't " +"possible." +msgstr "" + +#: mod/settings.php:1194 +msgid "Allow friends to post to your profile page?" +msgstr "" + +#: mod/settings.php:1199 +msgid "Allow friends to tag your posts?" +msgstr "" + +#: mod/settings.php:1204 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: mod/settings.php:1209 +msgid "Permit unknown people to send you private mail?" +msgstr "" + +#: mod/settings.php:1217 +msgid "Profile is <strong>not published</strong>." +msgstr "" + +#: mod/settings.php:1225 +#, php-format +msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." +msgstr "" + +#: mod/settings.php:1232 +msgid "Automatically expire posts after this many days:" +msgstr "" + +#: mod/settings.php:1232 +msgid "If empty, posts will not expire. Expired posts will be deleted" +msgstr "" + +#: mod/settings.php:1233 +msgid "Advanced expiration settings" +msgstr "" + +#: mod/settings.php:1234 +msgid "Advanced Expiration" +msgstr "" + +#: mod/settings.php:1235 +msgid "Expire posts:" +msgstr "" + +#: mod/settings.php:1236 +msgid "Expire personal notes:" +msgstr "" + +#: mod/settings.php:1237 +msgid "Expire starred posts:" +msgstr "" + +#: mod/settings.php:1238 +msgid "Expire photos:" +msgstr "" + +#: mod/settings.php:1239 +msgid "Only expire posts by others:" +msgstr "" + +#: mod/settings.php:1270 +msgid "Account Settings" +msgstr "" + +#: mod/settings.php:1278 +msgid "Password Settings" +msgstr "" + +#: mod/settings.php:1280 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: mod/settings.php:1281 +msgid "Current Password:" +msgstr "" + +#: mod/settings.php:1281 mod/settings.php:1282 +msgid "Your current password to confirm the changes" +msgstr "" + +#: mod/settings.php:1282 +msgid "Password:" +msgstr "" + +#: mod/settings.php:1286 +msgid "Basic Settings" +msgstr "" + +#: mod/settings.php:1288 +msgid "Email Address:" +msgstr "" + +#: mod/settings.php:1289 +msgid "Your Timezone:" +msgstr "" + +#: mod/settings.php:1290 +msgid "Your Language:" +msgstr "" + +#: mod/settings.php:1290 +msgid "" +"Set the language we use to show you friendica interface and to send you " +"emails" +msgstr "" + +#: mod/settings.php:1291 +msgid "Default Post Location:" +msgstr "" + +#: mod/settings.php:1292 +msgid "Use Browser Location:" +msgstr "" + +#: mod/settings.php:1295 +msgid "Security and Privacy Settings" +msgstr "" + +#: mod/settings.php:1297 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: mod/settings.php:1297 mod/settings.php:1327 +msgid "(to prevent spam abuse)" +msgstr "" + +#: mod/settings.php:1298 +msgid "Default Post Permissions" +msgstr "" + +#: mod/settings.php:1299 +msgid "(click to open/close)" +msgstr "" + +#: mod/settings.php:1310 +msgid "Default Private Post" +msgstr "" + +#: mod/settings.php:1311 +msgid "Default Public Post" +msgstr "" + +#: mod/settings.php:1315 +msgid "Default Permissions for New Posts" +msgstr "" + +#: mod/settings.php:1327 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: mod/settings.php:1330 +msgid "Notification Settings" +msgstr "" + +#: mod/settings.php:1331 +msgid "By default post a status message when:" +msgstr "" + +#: mod/settings.php:1332 +msgid "accepting a friend request" +msgstr "" + +#: mod/settings.php:1333 +msgid "joining a forum/community" +msgstr "" + +#: mod/settings.php:1334 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: mod/settings.php:1335 +msgid "Send a notification email when:" +msgstr "" + +#: mod/settings.php:1336 +msgid "You receive an introduction" +msgstr "" + +#: mod/settings.php:1337 +msgid "Your introductions are confirmed" +msgstr "" + +#: mod/settings.php:1338 +msgid "Someone writes on your profile wall" +msgstr "" + +#: mod/settings.php:1339 +msgid "Someone writes a followup comment" +msgstr "" + +#: mod/settings.php:1340 +msgid "You receive a private message" +msgstr "" + +#: mod/settings.php:1341 +msgid "You receive a friend suggestion" +msgstr "" + +#: mod/settings.php:1342 +msgid "You are tagged in a post" +msgstr "" + +#: mod/settings.php:1343 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: mod/settings.php:1345 +msgid "Activate desktop notifications" +msgstr "" + +#: mod/settings.php:1345 +msgid "Show desktop popup on new notifications" +msgstr "" + +#: mod/settings.php:1347 +msgid "Text-only notification emails" +msgstr "" + +#: mod/settings.php:1349 +msgid "Send text only notification emails, without the html part" +msgstr "" + +#: mod/settings.php:1351 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: mod/settings.php:1352 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: mod/settings.php:1355 +msgid "Relocate" +msgstr "" + +#: mod/settings.php:1356 +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:1357 +msgid "Resend relocate message to contacts" msgstr "" #: mod/admin.php:97 @@ -6622,18 +7379,10 @@ msgstr "" msgid "Users" msgstr "" -#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76 -msgid "Plugins" -msgstr "" - #: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 msgid "Themes" msgstr "" -#: mod/admin.php:170 mod/settings.php:54 -msgid "Additional features" -msgstr "" - #: mod/admin.php:171 msgid "DB updates" msgstr "" @@ -6831,11 +7580,11 @@ msgid "Normal Account" msgstr "" #: mod/admin.php:561 mod/admin.php:1454 -msgid "Soapbox Account" +msgid "Automatic Follower Account" msgstr "" #: mod/admin.php:562 mod/admin.php:1455 -msgid "Community/Celebrity Account" +msgid "Public Forum Account" msgstr "" #: mod/admin.php:563 mod/admin.php:1456 @@ -6847,7 +7596,7 @@ msgid "Blog Account" msgstr "" #: mod/admin.php:565 -msgid "Private Forum" +msgid "Private Forum Account" msgstr "" #: mod/admin.php:587 @@ -6882,10 +7631,6 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: mod/admin.php:948 mod/settings.php:944 -msgid "No special theme for mobile devices" -msgstr "" - #: mod/admin.php:977 msgid "No community page" msgstr "" @@ -6954,13 +7699,6 @@ msgstr "" msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793 -#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006 -#: mod/settings.php:1272 -msgid "Save Settings" -msgstr "" - #: mod/admin.php:1063 msgid "File upload" msgstr "" @@ -7789,10 +8527,6 @@ msgstr "" msgid "Last item" msgstr "" -#: mod/admin.php:1496 mod/settings.php:45 -msgid "Account" -msgstr "" - #: mod/admin.php:1505 msgid "Add User" msgstr "" @@ -7983,14 +8717,6 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "" -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "Off" -msgstr "" - -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "On" -msgstr "" - #: mod/admin.php:2166 #, php-format msgid "Lock feature %s" @@ -8000,733 +8726,18 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: mod/settings.php:62 -msgid "Display" -msgstr "" - -#: mod/settings.php:69 mod/settings.php:891 -msgid "Social Networks" -msgstr "" - -#: mod/settings.php:90 -msgid "Connected apps" -msgstr "" - -#: mod/settings.php:104 -msgid "Remove account" -msgstr "" - -#: mod/settings.php:159 -msgid "Missing some important data!" -msgstr "" - -#: mod/settings.php:273 -msgid "Failed to connect with email account using the settings provided." -msgstr "" - -#: mod/settings.php:278 -msgid "Email settings updated." -msgstr "" - -#: mod/settings.php:293 -msgid "Features updated" -msgstr "" - -#: mod/settings.php:363 -msgid "Relocate message has been send to your contacts" -msgstr "" - -#: mod/settings.php:382 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: mod/settings.php:390 -msgid "Wrong password." -msgstr "" - -#: mod/settings.php:401 -msgid "Password changed." -msgstr "" - -#: mod/settings.php:403 -msgid "Password update failed. Please try again." -msgstr "" - -#: mod/settings.php:483 -msgid " Please use a shorter name." -msgstr "" - -#: mod/settings.php:485 -msgid " Name too short." -msgstr "" - -#: mod/settings.php:494 -msgid "Wrong Password" -msgstr "" - -#: mod/settings.php:499 -msgid " Not valid email." -msgstr "" - -#: mod/settings.php:505 -msgid " Cannot change to that email." -msgstr "" - -#: mod/settings.php:561 -msgid "Private forum has no privacy permissions. Using default privacy group." -msgstr "" - -#: mod/settings.php:565 -msgid "Private forum has no privacy permissions and no default privacy group." -msgstr "" - -#: mod/settings.php:605 -msgid "Settings updated." -msgstr "" - -#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 -msgid "Add application" -msgstr "" - -#: mod/settings.php:685 mod/settings.php:711 -msgid "Consumer Key" -msgstr "" - -#: mod/settings.php:686 mod/settings.php:712 -msgid "Consumer Secret" -msgstr "" - -#: mod/settings.php:687 mod/settings.php:713 -msgid "Redirect" -msgstr "" - -#: mod/settings.php:688 mod/settings.php:714 -msgid "Icon url" -msgstr "" - -#: mod/settings.php:699 -msgid "You can't edit this application." -msgstr "" - -#: mod/settings.php:742 -msgid "Connected Apps" -msgstr "" - -#: mod/settings.php:746 -msgid "Client key starts with" -msgstr "" - -#: mod/settings.php:747 -msgid "No name" -msgstr "" - -#: mod/settings.php:748 -msgid "Remove authorization" -msgstr "" - -#: mod/settings.php:760 -msgid "No Plugin settings configured" -msgstr "" - -#: mod/settings.php:769 -msgid "Plugin Settings" -msgstr "" - -#: mod/settings.php:791 -msgid "Additional Features" -msgstr "" - -#: mod/settings.php:801 mod/settings.php:805 -msgid "General Social Media Settings" -msgstr "" - -#: mod/settings.php:811 -msgid "Disable intelligent shortening" -msgstr "" - -#: mod/settings.php:813 -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:819 -msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" -msgstr "" - -#: mod/settings.php:821 -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:827 -msgid "Default group for OStatus contacts" -msgstr "" - -#: mod/settings.php:835 -msgid "Your legacy GNU Social account" -msgstr "" - -#: mod/settings.php:837 -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:840 -msgid "Repair OStatus subscriptions" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -#, php-format -msgid "Built-in support for %s connectivity is %s" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "enabled" -msgstr "" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "disabled" -msgstr "" - -#: mod/settings.php:850 -msgid "GNU Social (OStatus)" -msgstr "" - -#: mod/settings.php:884 -msgid "Email access is disabled on this site." -msgstr "" - -#: mod/settings.php:896 -msgid "Email/Mailbox Setup" -msgstr "" - -#: mod/settings.php:897 -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:898 -msgid "Last successful email check:" -msgstr "" - -#: mod/settings.php:900 -msgid "IMAP server name:" -msgstr "" - -#: mod/settings.php:901 -msgid "IMAP port:" -msgstr "" - -#: mod/settings.php:902 -msgid "Security:" -msgstr "" - -#: mod/settings.php:902 mod/settings.php:907 -msgid "None" -msgstr "" - -#: mod/settings.php:903 -msgid "Email login name:" -msgstr "" - -#: mod/settings.php:904 -msgid "Email password:" -msgstr "" - -#: mod/settings.php:905 -msgid "Reply-to address:" -msgstr "" - -#: mod/settings.php:906 -msgid "Send public posts to all email contacts:" -msgstr "" - -#: mod/settings.php:907 -msgid "Action after import:" -msgstr "" - -#: mod/settings.php:907 -msgid "Move to folder" -msgstr "" - -#: mod/settings.php:908 -msgid "Move to folder:" -msgstr "" - -#: mod/settings.php:1004 -msgid "Display Settings" -msgstr "" - -#: mod/settings.php:1010 mod/settings.php:1033 -msgid "Display Theme:" -msgstr "" - -#: mod/settings.php:1011 -msgid "Mobile Theme:" -msgstr "" - -#: mod/settings.php:1012 -msgid "Suppress warning of insecure networks" -msgstr "" - -#: mod/settings.php:1012 -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:1013 -msgid "Update browser every xx seconds" -msgstr "" - -#: mod/settings.php:1013 -msgid "Minimum of 10 seconds. Enter -1 to disable it." -msgstr "" - -#: mod/settings.php:1014 -msgid "Number of items to display per page:" -msgstr "" - -#: mod/settings.php:1014 mod/settings.php:1015 -msgid "Maximum of 100 items" -msgstr "" - -#: mod/settings.php:1015 -msgid "Number of items to display per page when viewed from mobile device:" -msgstr "" - -#: mod/settings.php:1016 -msgid "Don't show emoticons" -msgstr "" - -#: mod/settings.php:1017 -msgid "Calendar" -msgstr "" - -#: mod/settings.php:1018 -msgid "Beginning of week:" -msgstr "" - -#: mod/settings.php:1019 -msgid "Don't show notices" -msgstr "" - -#: mod/settings.php:1020 -msgid "Infinite scroll" -msgstr "" - -#: mod/settings.php:1021 -msgid "Automatic updates only at the top of the network page" -msgstr "" - -#: mod/settings.php:1022 -msgid "Bandwith Saver Mode" -msgstr "" - -#: mod/settings.php:1022 -msgid "" -"When enabled, embedded content is not displayed on automatic updates, they " -"only show on page reload." -msgstr "" - -#: mod/settings.php:1024 -msgid "General Theme Settings" -msgstr "" - -#: mod/settings.php:1025 -msgid "Custom Theme Settings" -msgstr "" - -#: mod/settings.php:1026 -msgid "Content Settings" -msgstr "" - -#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 -#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 -#: view/theme/vier/config.php:115 -msgid "Theme settings" -msgstr "" - -#: mod/settings.php:1111 -msgid "Account Types" -msgstr "" - -#: mod/settings.php:1112 -msgid "Personal Page Subtypes" -msgstr "" - -#: mod/settings.php:1113 -msgid "Community Forum Subtypes" -msgstr "" - -#: mod/settings.php:1120 -msgid "Personal Page" -msgstr "" - -#: mod/settings.php:1121 -msgid "Account for a personal profile." -msgstr "" - -#: mod/settings.php:1124 -msgid "Organisation Page" -msgstr "" - -#: mod/settings.php:1125 -msgid "" -"Account for an organisation that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:1128 -msgid "News Page" -msgstr "" - -#: mod/settings.php:1129 -msgid "" -"Account for a news reflector that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:1132 -msgid "Community Forum" -msgstr "" - -#: mod/settings.php:1133 -msgid "Account for community discussions." -msgstr "" - -#: mod/settings.php:1136 -msgid "Normal Account Page" -msgstr "" - -#: mod/settings.php:1137 -msgid "" -"Account for a regular personal profile that requires manual approval of " -"\"Friends\" and \"Followers\"." -msgstr "" - -#: mod/settings.php:1140 -msgid "Soapbox Page" -msgstr "" - -#: mod/settings.php:1141 -msgid "" -"Account for a public profile that automatically approves contact requests as " -"\"Followers\"." -msgstr "" - -#: mod/settings.php:1144 -msgid "Public Forum" -msgstr "" - -#: mod/settings.php:1145 -msgid "Automatically approves all contact requests." -msgstr "" - -#: mod/settings.php:1148 -msgid "Automatic Friend Page" -msgstr "" - -#: mod/settings.php:1149 -msgid "" -"Account for a popular profile that automatically approves contact requests " -"as \"Friends\"." -msgstr "" - -#: mod/settings.php:1152 -msgid "Private Forum [Experimental]" -msgstr "" - -#: mod/settings.php:1153 -msgid "Requires manual approval of contact requests." -msgstr "" - -#: mod/settings.php:1164 -msgid "OpenID:" -msgstr "" - -#: mod/settings.php:1164 -msgid "(Optional) Allow this OpenID to login to this account." -msgstr "" - -#: mod/settings.php:1172 -msgid "Publish your default profile in your local site directory?" -msgstr "" - -#: mod/settings.php:1172 -msgid "Your profile may be visible in public." -msgstr "" - -#: mod/settings.php:1178 -msgid "Publish your default profile in the global social directory?" -msgstr "" - -#: mod/settings.php:1185 -msgid "Hide your contact/friend list from viewers of your default profile?" -msgstr "" - -#: mod/settings.php:1189 -msgid "" -"If enabled, posting public messages to Diaspora and other networks isn't " -"possible." -msgstr "" - -#: mod/settings.php:1194 -msgid "Allow friends to post to your profile page?" -msgstr "" - -#: mod/settings.php:1199 -msgid "Allow friends to tag your posts?" -msgstr "" - -#: mod/settings.php:1204 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: mod/settings.php:1209 -msgid "Permit unknown people to send you private mail?" -msgstr "" - -#: mod/settings.php:1217 -msgid "Profile is <strong>not published</strong>." -msgstr "" - -#: mod/settings.php:1225 -#, php-format -msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." -msgstr "" - -#: mod/settings.php:1232 -msgid "Automatically expire posts after this many days:" -msgstr "" - -#: mod/settings.php:1232 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "" - -#: mod/settings.php:1233 -msgid "Advanced expiration settings" -msgstr "" - -#: mod/settings.php:1234 -msgid "Advanced Expiration" -msgstr "" - -#: mod/settings.php:1235 -msgid "Expire posts:" -msgstr "" - -#: mod/settings.php:1236 -msgid "Expire personal notes:" -msgstr "" - -#: mod/settings.php:1237 -msgid "Expire starred posts:" -msgstr "" - -#: mod/settings.php:1238 -msgid "Expire photos:" -msgstr "" - -#: mod/settings.php:1239 -msgid "Only expire posts by others:" -msgstr "" - -#: mod/settings.php:1270 -msgid "Account Settings" -msgstr "" - -#: mod/settings.php:1278 -msgid "Password Settings" -msgstr "" - -#: mod/settings.php:1280 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: mod/settings.php:1281 -msgid "Current Password:" -msgstr "" - -#: mod/settings.php:1281 mod/settings.php:1282 -msgid "Your current password to confirm the changes" -msgstr "" - -#: mod/settings.php:1282 -msgid "Password:" -msgstr "" - -#: mod/settings.php:1286 -msgid "Basic Settings" -msgstr "" - -#: mod/settings.php:1288 -msgid "Email Address:" -msgstr "" - -#: mod/settings.php:1289 -msgid "Your Timezone:" -msgstr "" - -#: mod/settings.php:1290 -msgid "Your Language:" -msgstr "" - -#: mod/settings.php:1290 -msgid "" -"Set the language we use to show you friendica interface and to send you " -"emails" -msgstr "" - -#: mod/settings.php:1291 -msgid "Default Post Location:" -msgstr "" - -#: mod/settings.php:1292 -msgid "Use Browser Location:" -msgstr "" - -#: mod/settings.php:1295 -msgid "Security and Privacy Settings" -msgstr "" - -#: mod/settings.php:1297 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: mod/settings.php:1297 mod/settings.php:1327 -msgid "(to prevent spam abuse)" -msgstr "" - -#: mod/settings.php:1298 -msgid "Default Post Permissions" -msgstr "" - -#: mod/settings.php:1299 -msgid "(click to open/close)" -msgstr "" - -#: mod/settings.php:1310 -msgid "Default Private Post" -msgstr "" - -#: mod/settings.php:1311 -msgid "Default Public Post" -msgstr "" - -#: mod/settings.php:1315 -msgid "Default Permissions for New Posts" -msgstr "" - -#: mod/settings.php:1327 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: mod/settings.php:1330 -msgid "Notification Settings" -msgstr "" - -#: mod/settings.php:1331 -msgid "By default post a status message when:" -msgstr "" - -#: mod/settings.php:1332 -msgid "accepting a friend request" -msgstr "" - -#: mod/settings.php:1333 -msgid "joining a forum/community" -msgstr "" - -#: mod/settings.php:1334 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: mod/settings.php:1335 -msgid "Send a notification email when:" -msgstr "" - -#: mod/settings.php:1336 -msgid "You receive an introduction" -msgstr "" - -#: mod/settings.php:1337 -msgid "Your introductions are confirmed" -msgstr "" - -#: mod/settings.php:1338 -msgid "Someone writes on your profile wall" -msgstr "" - -#: mod/settings.php:1339 -msgid "Someone writes a followup comment" -msgstr "" - -#: mod/settings.php:1340 -msgid "You receive a private message" -msgstr "" - -#: mod/settings.php:1341 -msgid "You receive a friend suggestion" -msgstr "" - -#: mod/settings.php:1342 -msgid "You are tagged in a post" -msgstr "" - -#: mod/settings.php:1343 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: mod/settings.php:1345 -msgid "Activate desktop notifications" -msgstr "" - -#: mod/settings.php:1345 -msgid "Show desktop popup on new notifications" -msgstr "" - -#: mod/settings.php:1347 -msgid "Text-only notification emails" -msgstr "" - -#: mod/settings.php:1349 -msgid "Send text only notification emails, without the html part" -msgstr "" - -#: mod/settings.php:1351 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: mod/settings.php:1352 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: mod/settings.php:1355 -msgid "Relocate" -msgstr "" - -#: mod/settings.php:1356 -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:1357 -msgid "Resend relocate message to contacts" -msgstr "" - #: object/Item.php:356 msgid "via" msgstr "" +#: src/App.php:506 +msgid "Delete this item?" +msgstr "" + +#: src/App.php:508 +msgid "show fewer" +msgstr "" + #: view/theme/duepuntozero/config.php:47 msgid "greenzero" msgstr "" @@ -8755,38 +8766,6 @@ msgstr "" msgid "Variations" 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:50 msgid "Default" msgstr "" @@ -8827,6 +8806,38 @@ msgstr "" 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:228 msgid "Guest" msgstr "" @@ -8899,55 +8910,47 @@ msgstr "" msgid "Quick Start" msgstr "" -#: src/App.php:505 -msgid "Delete this item?" +#: boot.php:735 +#, php-format +msgid "Update %s failed. See error logs." msgstr "" -#: src/App.php:507 -msgid "show fewer" +#: boot.php:847 +msgid "Create a New Account" +msgstr "" + +#: boot.php:875 +msgid "Password: " +msgstr "" + +#: boot.php:876 +msgid "Remember me" +msgstr "" + +#: boot.php:879 +msgid "Or login using OpenID: " +msgstr "" + +#: boot.php:885 +msgid "Forgot your password?" +msgstr "" + +#: boot.php:888 +msgid "Website Terms of Service" +msgstr "" + +#: boot.php:889 +msgid "terms of service" +msgstr "" + +#: boot.php:891 +msgid "Website Privacy Policy" +msgstr "" + +#: boot.php:892 +msgid "privacy policy" msgstr "" #: index.php:436 msgid "toggle mobile" msgstr "" - -#: boot.php:733 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - -#: boot.php:845 -msgid "Create a New Account" -msgstr "" - -#: boot.php:873 -msgid "Password: " -msgstr "" - -#: boot.php:874 -msgid "Remember me" -msgstr "" - -#: boot.php:877 -msgid "Or login using OpenID: " -msgstr "" - -#: boot.php:883 -msgid "Forgot your password?" -msgstr "" - -#: boot.php:886 -msgid "Website Terms of Service" -msgstr "" - -#: boot.php:887 -msgid "terms of service" -msgstr "" - -#: boot.php:889 -msgid "Website Privacy Policy" -msgstr "" - -#: boot.php:890 -msgid "privacy policy" -msgstr "" From 7097673fa19d21a631d4d7b22dab9e98382059ae Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 21 Jun 2017 03:49:05 +0000 Subject: [PATCH 102/160] Bugfix: Poller entries had been executed multiple times --- include/items.php | 4 ++++ include/notifier.php | 7 +++---- include/poller.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index 8649a1bd1a..31a709fcbf 100644 --- a/include/items.php +++ b/include/items.php @@ -2124,6 +2124,10 @@ function drop_item($id, $interactive = true) { $item = $r[0]; + if ($item['deleted']) { + return 0; + } + $owner = $item['uid']; $contact_id = 0; diff --git a/include/notifier.php b/include/notifier.php index c110984dde..81f55f7101 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -519,8 +519,8 @@ function notifier_run(&$argv, &$argc){ } $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network` - FROM `contact` WHERE `network` = '%s' - AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch` ORDER BY rand()", + FROM `contact` WHERE `network` = '%s' AND `batch` != '' + AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`", dbesc(NETWORK_DIASPORA), intval($owner['uid']), intval(CONTACT_IS_SHARING) @@ -528,8 +528,7 @@ function notifier_run(&$argv, &$argc){ } $r2 = q("SELECT `id`, `name`,`network` FROM `contact` - WHERE `network` in ( '%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `rel` != %d order by rand() ", + WHERE `network` in ('%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d", dbesc(NETWORK_DFRN), dbesc(NETWORK_MAIL2), intval($owner['uid']), diff --git a/include/poller.php b/include/poller.php index 29a31a96f8..379aadcd67 100644 --- a/include/poller.php +++ b/include/poller.php @@ -678,7 +678,7 @@ function poller_worker_process() { $poller_db_duration += (microtime(true) - $stamp); if ($found) { - $r = q("SELECT * FROM `workerqueue` WHERE `pid` = %d", intval(getmypid())); + $r = q("SELECT * FROM `workerqueue` WHERE `pid` = %d AND NOT `done`", intval(getmypid())); } return $r; } From e0c46678e5cc0a2c6cf5eefee0dfa5cea5be9e95 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Sat, 24 Jun 2017 10:17:16 +0200 Subject: [PATCH 103/160] autofocus for search input field --- view/templates/searchbox.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/searchbox.tpl b/view/templates/searchbox.tpl index 4b1a51f877..38d282a8c9 100644 --- a/view/templates/searchbox.tpl +++ b/view/templates/searchbox.tpl @@ -1,7 +1,7 @@ <div id="{{$id}}" class="input-group"> <form action="{{$action_url}}" method="get" > {{strip}} - <input type="text" name="search" id="search-text" placeholder="{{$search_label}}" value="{{$s}}" /> + <input type="text" name="search" id="search-text" placeholder="{{$search_label}}" value="{{$s}}" autofocus /> {{if $searchoption}} <select name="search-option" id="search-options"> <option value="fulltext">{{$searchoption.0}}</option> From d06245262f18eb48778ad6c13e3b59ff500e1890 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 26 Jun 2017 11:03:28 +0200 Subject: [PATCH 104/160] Vagrant > 1.5 needs an additional parameter --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index ff38151520..3d58ef7a5a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -47,7 +47,7 @@ Vagrant.configure(2) do |config| ###################################################################### # Share a folder between host and guest - config.vm.synced_folder "./", "/vagrant/", owner: "www-data", group: "vagrant" + config.vm.synced_folder ".", "/vagrant", id: "vagrant-root", owner: "www-data", group: "vagrant" # Provider-specific configuration so you can fine-tune various From 6672dcc36f973a8c597e44f7166037e7d54e70b1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 26 Jun 2017 11:07:18 +0200 Subject: [PATCH 105/160] DE translations --- view/lang/de/messages.po | 6 +++--- view/lang/de/strings.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index dd57915e5e..96fb158137 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-09 16:42+0700\n" -"PO-Revision-Date: 2017-06-18 04:37+0000\n" +"PO-Revision-Date: 2017-06-20 07:43+0000\n" "Last-Translator: Andy H3 <andy@hubup.pro>\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "" #: include/contact_selectors.php:32 msgid "Unknown | Not categorised" -msgstr "Unbekannt | Nicht kategorisiert" +msgstr "Unbekannt | Nicht kategorisiertomatu" #: include/contact_selectors.php:33 msgid "Block immediately" @@ -8456,7 +8456,7 @@ msgstr "Öffentliches Forum" #: mod/settings.php:1145 msgid "Automatically approves all contact requests." -msgstr "Akzeptiert automatisch alle Kontaktanfragen." +msgstr "Bestätigt alle Kontaktanfragen automatisch." #: mod/settings.php:1148 msgid "Automatic Friend Page" diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index eef03ce72a..65e2ec1ddb 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -5,7 +5,7 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; +$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiertomatu"; $a->strings["Block immediately"] = "Sofort blockieren"; $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; $a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung"; @@ -1931,7 +1931,7 @@ $a->strings["Account for a regular personal profile that requires manual approva $a->strings["Soapbox Page"] = "Marktschreier-Konto"; $a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt."; $a->strings["Public Forum"] = "Öffentliches Forum"; -$a->strings["Automatically approves all contact requests."] = "Akzeptiert automatisch alle Kontaktanfragen."; +$a->strings["Automatically approves all contact requests."] = "Bestätigt alle Kontaktanfragen automatisch."; $a->strings["Automatic Friend Page"] = "Automatische Freunde Seite"; $a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt."; $a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]"; From bee466532fb24a42e6ac395a9bfd9823b2009d89 Mon Sep 17 00:00:00 2001 From: AndyHee <andy@hubup.pro> Date: Mon, 26 Jun 2017 17:31:12 +0700 Subject: [PATCH 106/160] DE Translation --- view/lang/de/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index 96fb158137..b1c20d4469 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-09 16:42+0700\n" -"PO-Revision-Date: 2017-06-20 07:43+0000\n" +"PO-Revision-Date: 2017-06-26 10:14+0000\n" "Last-Translator: Andy H3 <andy@hubup.pro>\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "" #: include/contact_selectors.php:32 msgid "Unknown | Not categorised" -msgstr "Unbekannt | Nicht kategorisiertomatu" +msgstr "Unbekannt | Nicht kategorisiert" #: include/contact_selectors.php:33 msgid "Block immediately" From afa7421aa2f51a1047ebff035161a7fb0bd137ec Mon Sep 17 00:00:00 2001 From: AndyHee <andy@hubup.pro> Date: Mon, 26 Jun 2017 17:43:00 +0700 Subject: [PATCH 107/160] DE Translation --- view/lang/de/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index 65e2ec1ddb..64428b8592 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -5,7 +5,7 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiertomatu"; +$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; $a->strings["Block immediately"] = "Sofort blockieren"; $a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; $a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung"; From 0f604538ba725d410f87fc8abeab4ae71129d536 Mon Sep 17 00:00:00 2001 From: AndyHee <andy@hubup.pro> Date: Mon, 26 Jun 2017 18:03:32 +0700 Subject: [PATCH 108/160] EN-GB and EN-US Translations --- view/lang/en-gb/messages.po | 3641 ++++++++++++++++++----------------- view/lang/en-gb/strings.php | 816 ++++---- view/lang/en-us/messages.po | 2230 ++++++++++----------- view/lang/en-us/strings.php | 560 +++--- 4 files changed, 3633 insertions(+), 3614 deletions(-) diff --git a/view/lang/en-gb/messages.po b/view/lang/en-gb/messages.po index 0483f1afd5..3962a4804d 100644 --- a/view/lang/en-gb/messages.po +++ b/view/lang/en-gb/messages.po @@ -1,15 +1,15 @@ # FRIENDICA Distributed Social Network # Copyright (C) 2010, 2011, 2012, 2013 the Friendica Project # This file is distributed under the same license as the Friendica package. -# +# # Translators: # Andy H3 <andy@hubup.pro>, 2017 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-28 11:09+0200\n" -"PO-Revision-Date: 2017-06-05 14:16+0000\n" +"POT-Creation-Date: 2017-06-09 16:42+0700\n" +"PO-Revision-Date: 2017-06-17 12:56+0000\n" "Last-Translator: Andy H3 <andy@hubup.pro>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -383,95 +383,20 @@ msgid "add" msgstr "add" #: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133 -#: view/theme/vier/theme.php:256 +#: view/theme/vier/theme.php:248 msgid "Forums" msgstr "Forums" -#: include/ForumManager.php:118 view/theme/vier/theme.php:258 +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 msgid "External link to forum" msgstr "External link to forum" #: include/ForumManager.php:121 include/contact_widgets.php:271 #: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: view/theme/vier/theme.php:261 src/App.php:506 +#: view/theme/vier/theme.php:253 src/App.php:506 msgid "show more" msgstr "Show more..." -#: include/NotificationsManager.php:153 -msgid "System" -msgstr "System" - -#: include/NotificationsManager.php:160 include/nav.php:160 mod/admin.php:518 -#: view/theme/frio/theme.php:255 -msgid "Network" -msgstr "Network" - -#: include/NotificationsManager.php:167 mod/network.php:835 -#: mod/profiles.php:699 -msgid "Personal" -msgstr "Personal" - -#: include/NotificationsManager.php:174 include/nav.php:107 -#: include/nav.php:163 -msgid "Home" -msgstr "Home" - -#: include/NotificationsManager.php:181 include/nav.php:168 -msgid "Introductions" -msgstr "Introductions" - -#: include/NotificationsManager.php:239 include/NotificationsManager.php:251 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s commented on %s's post" - -#: include/NotificationsManager.php:250 -#, php-format -msgid "%s created a new post" -msgstr "%s posted something new" - -#: include/NotificationsManager.php:265 -#, php-format -msgid "%s liked %s's post" -msgstr "%s liked %s's post" - -#: include/NotificationsManager.php:278 -#, php-format -msgid "%s disliked %s's post" -msgstr "%s disliked %s's post" - -#: include/NotificationsManager.php:291 -#, php-format -msgid "%s is attending %s's event" -msgstr "%s is going to %s's event" - -#: include/NotificationsManager.php:304 -#, php-format -msgid "%s is not attending %s's event" -msgstr "%s is not going to %s's event" - -#: include/NotificationsManager.php:317 -#, php-format -msgid "%s may attend %s's event" -msgstr "%s may go to %s's event" - -#: include/NotificationsManager.php:334 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s is now friends with %s" - -#: include/NotificationsManager.php:770 -msgid "Friend Suggestion" -msgstr "Friend suggestion" - -#: include/NotificationsManager.php:803 -msgid "Friend/Connect Request" -msgstr "Friend/Contact request" - -#: include/NotificationsManager.php:803 -msgid "New Follower" -msgstr "New follower" - #: include/acl_selectors.php:355 msgid "Post to Email" msgstr "Post to email" @@ -600,11 +525,11 @@ msgid "Find" msgstr "Find" #: include/contact_widgets.php:37 mod/suggest.php:116 -#: view/theme/vier/theme.php:203 +#: view/theme/vier/theme.php:195 msgid "Friend Suggestions" msgstr "Friend suggestions" -#: include/contact_widgets.php:38 view/theme/vier/theme.php:202 +#: include/contact_widgets.php:38 view/theme/vier/theme.php:194 msgid "Similar Interests" msgstr "Similar interests" @@ -612,7 +537,7 @@ msgstr "Similar interests" msgid "Random Profile" msgstr "Random profile" -#: include/contact_widgets.php:40 view/theme/vier/theme.php:204 +#: include/contact_widgets.php:40 view/theme/vier/theme.php:196 msgid "Invite Friends" msgstr "Invite friends" @@ -742,8 +667,8 @@ msgid "Select" msgstr "Select" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 -#: mod/photos.php:1731 mod/admin.php:1514 mod/contacts.php:819 -#: mod/contacts.php:1018 mod/settings.php:745 object/Item.php:138 +#: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 +#: mod/admin.php:1514 mod/settings.php:745 object/Item.php:138 msgid "Delete" msgstr "Delete" @@ -1725,22 +1650,6 @@ msgstr "post" msgid "Item filed" msgstr "Item filed" -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "Drop contact" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "Organisation" - -#: include/Contact.php:822 -msgid "News" -msgstr "News" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "Forum" - #: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 msgid "Image/photo" msgstr "Image/Photo" @@ -1766,6 +1675,22 @@ msgstr "Invalid source protocol" msgid "Invalid link protocol" msgstr "Invalid link protocol" +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "Drop contact" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "Organisation" + +#: include/Contact.php:822 +msgid "News" +msgstr "News" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "Forum" + #: include/enotify.php:27 msgid "Friendica Notification" msgstr "Friendica notification" @@ -2077,7 +2002,7 @@ msgstr "Nothing new here" msgid "Clear notifications" msgstr "Clear notifications" -#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:862 +#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:869 msgid "Logout" msgstr "Logout" @@ -2140,7 +2065,7 @@ msgstr "Personal notes" msgid "Your personal notes" msgstr "My personal notes" -#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:863 +#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:870 msgid "Login" msgstr "Login" @@ -2148,19 +2073,24 @@ msgstr "Login" msgid "Sign in" msgstr "Sign in" +#: include/nav.php:107 include/nav.php:163 +#: include/NotificationsManager.php:176 +msgid "Home" +msgstr "Home" + #: include/nav.php:107 msgid "Home Page" msgstr "Home page" -#: include/nav.php:111 mod/register.php:291 boot.php:839 +#: include/nav.php:111 mod/register.php:291 boot.php:846 msgid "Register" -msgstr "Register" +msgstr "Sign up now >>" #: include/nav.php:111 msgid "Create an account" msgstr "Create account" -#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:299 +#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 msgid "Help" msgstr "Help" @@ -2213,6 +2143,11 @@ msgstr "Information" msgid "Information about this friendica instance" msgstr "Information about this Friendica instance" +#: include/nav.php:160 include/NotificationsManager.php:162 mod/admin.php:518 +#: view/theme/frio/theme.php:255 +msgid "Network" +msgstr "Network" + #: include/nav.php:160 view/theme/frio/theme.php:255 msgid "Conversations from your friends" msgstr "My friends' conversations" @@ -2225,6 +2160,10 @@ msgstr "Network reset" msgid "Load Network page with no filters" msgstr "Load network page without filters" +#: include/nav.php:168 include/NotificationsManager.php:183 +msgid "Introductions" +msgstr "Introductions" + #: include/nav.php:168 msgid "Friend Requests" msgstr "Friend requests" @@ -2445,7 +2384,7 @@ msgid "Friends" msgstr "Friends" #: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3697 mod/photos.php:73 mod/photos.php:189 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 #: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 #: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 #: mod/profile_photo.php:90 mod/profile_photo.php:214 @@ -2460,7 +2399,7 @@ msgid "" "\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 "\n\t\tDear %1$s,\n\t\t\tThank you for registering at %2$s. Your account is pending approval by the administrator.\n\t" +msgstr "\n\t\tDear %1$s,\n\t\t\tThank you for signing up at %2$s. Your account is pending approval by the administrator.\n\t" #: include/user.php:407 #, php-format @@ -2474,7 +2413,7 @@ msgid "" "\t\tDear %1$s,\n" "\t\t\tThank you for registering at %2$s. Your account has been created.\n" "\t" -msgstr "\n\t\tDear %1$s,\n\t\t\tThank you for registering at %2$s. Your account has been created.\n\t" +msgstr "\n\t\tDear %1$s,\n\t\t\tThank you for signing up at %2$s. Your account has been created.\n\t" #: include/user.php:421 #, php-format @@ -2511,6 +2450,308 @@ msgstr "\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3$s\n\t\ msgid "Registration details for %s" msgstr "Registration details for %s" +#: include/dba_pdo.php:76 include/dba.php:57 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Cannot locate DNS info for database server '%s'" + +#: include/plugin.php:532 include/plugin.php:534 +msgid "Click here to upgrade." +msgstr "Click here to upgrade." + +#: include/plugin.php:541 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "This action exceeds the limits set by your subscription plan." + +#: include/plugin.php:546 +msgid "This action is not available under your subscription plan." +msgstr "This action is not available under your subscription plan." + +#: include/profile_selectors.php:6 +msgid "Male" +msgstr "Male" + +#: include/profile_selectors.php:6 +msgid "Female" +msgstr "Female" + +#: include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Currently Male" + +#: include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Currently Female" + +#: include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Mostly Male" + +#: include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Mostly Female" + +#: include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transgender" + +#: include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Intersex" + +#: include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transsexual" + +#: include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Hermaphrodite" + +#: include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Neuter" + +#: include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "Non-specific" + +#: include/profile_selectors.php:6 +msgid "Other" +msgstr "Other" + +#: include/profile_selectors.php:23 +msgid "Males" +msgstr "Males" + +#: include/profile_selectors.php:23 +msgid "Females" +msgstr "Females" + +#: include/profile_selectors.php:23 +msgid "Gay" +msgstr "Gay" + +#: include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "Lesbian" + +#: include/profile_selectors.php:23 +msgid "No Preference" +msgstr "No Preference" + +#: include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "Bisexual" + +#: include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "Auto-sexual" + +#: include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "Abstinent" + +#: include/profile_selectors.php:23 +msgid "Virgin" +msgstr "Virgin" + +#: include/profile_selectors.php:23 +msgid "Deviant" +msgstr "Deviant" + +#: include/profile_selectors.php:23 +msgid "Fetish" +msgstr "Fetish" + +#: include/profile_selectors.php:23 +msgid "Oodles" +msgstr "Oodles" + +#: include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "Asexual" + +#: include/profile_selectors.php:42 +msgid "Single" +msgstr "Single" + +#: include/profile_selectors.php:42 +msgid "Lonely" +msgstr "Lonely" + +#: include/profile_selectors.php:42 +msgid "Available" +msgstr "Available" + +#: include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "Unavailable" + +#: include/profile_selectors.php:42 +msgid "Has crush" +msgstr "Having a crush" + +#: include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "Infatuated" + +#: include/profile_selectors.php:42 +msgid "Dating" +msgstr "Dating" + +#: include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "Unfaithful" + +#: include/profile_selectors.php:42 +msgid "Sex Addict" +msgstr "Sex addict" + +#: include/profile_selectors.php:42 +msgid "Friends/Benefits" +msgstr "Friends with benefits" + +#: include/profile_selectors.php:42 +msgid "Casual" +msgstr "Casual" + +#: include/profile_selectors.php:42 +msgid "Engaged" +msgstr "Engaged" + +#: include/profile_selectors.php:42 +msgid "Married" +msgstr "Married" + +#: include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "Imaginarily married" + +#: include/profile_selectors.php:42 +msgid "Partners" +msgstr "Partners" + +#: include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "Cohabiting" + +#: include/profile_selectors.php:42 +msgid "Common law" +msgstr "Common law spouse" + +#: include/profile_selectors.php:42 +msgid "Happy" +msgstr "Happy" + +#: include/profile_selectors.php:42 +msgid "Not looking" +msgstr "Not looking" + +#: include/profile_selectors.php:42 +msgid "Swinger" +msgstr "Swinger" + +#: include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "Betrayed" + +#: include/profile_selectors.php:42 +msgid "Separated" +msgstr "Separated" + +#: include/profile_selectors.php:42 +msgid "Unstable" +msgstr "Unstable" + +#: include/profile_selectors.php:42 +msgid "Divorced" +msgstr "Divorced" + +#: include/profile_selectors.php:42 +msgid "Imaginarily divorced" +msgstr "Imaginarily divorced" + +#: include/profile_selectors.php:42 +msgid "Widowed" +msgstr "Widowed" + +#: include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "Uncertain" + +#: include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "It's complicated" + +#: include/profile_selectors.php:42 +msgid "Don't care" +msgstr "Don't care" + +#: include/profile_selectors.php:42 +msgid "Ask me" +msgstr "Ask me" + +#: include/NotificationsManager.php:155 +msgid "System" +msgstr "System" + +#: include/NotificationsManager.php:169 mod/network.php:835 +#: mod/profiles.php:699 +msgid "Personal" +msgstr "Personal" + +#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 +#, php-format +msgid "%s commented on %s's post" +msgstr "%s commented on %s's post" + +#: include/NotificationsManager.php:252 +#, php-format +msgid "%s created a new post" +msgstr "%s posted something new" + +#: include/NotificationsManager.php:267 +#, php-format +msgid "%s liked %s's post" +msgstr "%s liked %s's post" + +#: include/NotificationsManager.php:280 +#, php-format +msgid "%s disliked %s's post" +msgstr "%s disliked %s's post" + +#: include/NotificationsManager.php:293 +#, php-format +msgid "%s is attending %s's event" +msgstr "%s is going to %s's event" + +#: include/NotificationsManager.php:306 +#, php-format +msgid "%s is not attending %s's event" +msgstr "%s is not going to %s's event" + +#: include/NotificationsManager.php:319 +#, php-format +msgid "%s may attend %s's event" +msgstr "%s may go to %s's event" + +#: include/NotificationsManager.php:336 +#, php-format +msgid "%s is now friends with %s" +msgstr "%s is now friends with %s" + +#: include/NotificationsManager.php:774 +msgid "Friend Suggestion" +msgstr "Friend suggestion" + +#: include/NotificationsManager.php:803 +msgid "Friend/Connect Request" +msgstr "Friend/Contact request" + +#: include/NotificationsManager.php:803 +msgid "New Follower" +msgstr "New follower" + #: include/api.php:1102 #, php-format msgid "Daily posting limit of %d posts reached. The post was rejected." @@ -2526,11 +2767,6 @@ msgstr "Weekly posting limit of %d posts reached. This post was rejected." msgid "Monthly posting limit of %d posts reached. The post was rejected." msgstr "Monthly posting limit of %d posts reached. This post was rejected." -#: include/dba.php:57 include/dba_pdo.php:75 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "Cannot locate DNS info for database server '%s'" - #: include/dbstructure.php:25 msgid "There are no tables on MyISAM." msgstr "There are no tables on MyISAM." @@ -2773,8 +3009,8 @@ msgstr "Forums:" msgid "Basic" msgstr "Basic" -#: include/identity.php:761 mod/events.php:510 mod/admin.php:1065 -#: mod/contacts.php:881 +#: include/identity.php:761 mod/events.php:510 mod/contacts.php:881 +#: mod/admin.php:1065 msgid "Advanced" msgstr "Advanced" @@ -2866,242 +3102,6 @@ msgstr "%s stopped following %s." msgid "stopped following" msgstr "stopped following" -#: include/plugin.php:531 include/plugin.php:533 -msgid "Click here to upgrade." -msgstr "Click here to upgrade." - -#: include/plugin.php:539 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "This action exceeds the limits set by your subscription plan." - -#: include/plugin.php:544 -msgid "This action is not available under your subscription plan." -msgstr "This action is not available under your subscription plan." - -#: include/profile_selectors.php:6 -msgid "Male" -msgstr "Male" - -#: include/profile_selectors.php:6 -msgid "Female" -msgstr "Female" - -#: include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Currently Male" - -#: include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Currently Female" - -#: include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Mostly Male" - -#: include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Mostly Female" - -#: include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transgender" - -#: include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Intersex" - -#: include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transsexual" - -#: include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Hermaphrodite" - -#: include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Neuter" - -#: include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Non-specific" - -#: include/profile_selectors.php:6 -msgid "Other" -msgstr "Other" - -#: include/profile_selectors.php:23 -msgid "Males" -msgstr "Males" - -#: include/profile_selectors.php:23 -msgid "Females" -msgstr "Females" - -#: include/profile_selectors.php:23 -msgid "Gay" -msgstr "Gay" - -#: include/profile_selectors.php:23 -msgid "Lesbian" -msgstr "Lesbian" - -#: include/profile_selectors.php:23 -msgid "No Preference" -msgstr "No Preference" - -#: include/profile_selectors.php:23 -msgid "Bisexual" -msgstr "Bisexual" - -#: include/profile_selectors.php:23 -msgid "Autosexual" -msgstr "Auto-sexual" - -#: include/profile_selectors.php:23 -msgid "Abstinent" -msgstr "Abstinent" - -#: include/profile_selectors.php:23 -msgid "Virgin" -msgstr "Virgin" - -#: include/profile_selectors.php:23 -msgid "Deviant" -msgstr "Deviant" - -#: include/profile_selectors.php:23 -msgid "Fetish" -msgstr "Fetish" - -#: include/profile_selectors.php:23 -msgid "Oodles" -msgstr "Oodles" - -#: include/profile_selectors.php:23 -msgid "Nonsexual" -msgstr "Asexual" - -#: include/profile_selectors.php:42 -msgid "Single" -msgstr "Single" - -#: include/profile_selectors.php:42 -msgid "Lonely" -msgstr "Lonely" - -#: include/profile_selectors.php:42 -msgid "Available" -msgstr "Available" - -#: include/profile_selectors.php:42 -msgid "Unavailable" -msgstr "Unavailable" - -#: include/profile_selectors.php:42 -msgid "Has crush" -msgstr "Having a crush" - -#: include/profile_selectors.php:42 -msgid "Infatuated" -msgstr "Infatuated" - -#: include/profile_selectors.php:42 -msgid "Dating" -msgstr "Dating" - -#: include/profile_selectors.php:42 -msgid "Unfaithful" -msgstr "Unfaithful" - -#: include/profile_selectors.php:42 -msgid "Sex Addict" -msgstr "Sex addict" - -#: include/profile_selectors.php:42 -msgid "Friends/Benefits" -msgstr "Friends with benefits" - -#: include/profile_selectors.php:42 -msgid "Casual" -msgstr "Casual" - -#: include/profile_selectors.php:42 -msgid "Engaged" -msgstr "Engaged" - -#: include/profile_selectors.php:42 -msgid "Married" -msgstr "Married" - -#: include/profile_selectors.php:42 -msgid "Imaginarily married" -msgstr "Imaginarily married" - -#: include/profile_selectors.php:42 -msgid "Partners" -msgstr "Partners" - -#: include/profile_selectors.php:42 -msgid "Cohabiting" -msgstr "Cohabiting" - -#: include/profile_selectors.php:42 -msgid "Common law" -msgstr "Common law spouse" - -#: include/profile_selectors.php:42 -msgid "Happy" -msgstr "Happy" - -#: include/profile_selectors.php:42 -msgid "Not looking" -msgstr "Not looking" - -#: include/profile_selectors.php:42 -msgid "Swinger" -msgstr "Swinger" - -#: include/profile_selectors.php:42 -msgid "Betrayed" -msgstr "Betrayed" - -#: include/profile_selectors.php:42 -msgid "Separated" -msgstr "Separated" - -#: include/profile_selectors.php:42 -msgid "Unstable" -msgstr "Unstable" - -#: include/profile_selectors.php:42 -msgid "Divorced" -msgstr "Divorced" - -#: include/profile_selectors.php:42 -msgid "Imaginarily divorced" -msgstr "Imaginarily divorced" - -#: include/profile_selectors.php:42 -msgid "Widowed" -msgstr "Widowed" - -#: include/profile_selectors.php:42 -msgid "Uncertain" -msgstr "Uncertain" - -#: include/profile_selectors.php:42 -msgid "It's complicated" -msgstr "It's complicated" - -#: include/profile_selectors.php:42 -msgid "Don't care" -msgstr "Don't care" - -#: include/profile_selectors.php:42 -msgid "Ask me" -msgstr "Ask me" - #: mod/allfriends.php:48 msgid "No friends to display." msgstr "No friends to display." @@ -3670,7 +3670,7 @@ msgstr "%1$s has joined %2$s" msgid "%1$s welcomes %2$s" msgstr "%1$s welcomes %2$s" -#: mod/directory.php:195 view/theme/vier/theme.php:201 +#: mod/directory.php:195 view/theme/vier/theme.php:193 msgid "Global Directory" msgstr "Global Directory" @@ -4363,7 +4363,7 @@ msgstr "Visit %s for a list of public sites that you can join. Friendica members msgid "" "To accept this invitation, please visit and register at %s or any other " "public Friendica website." -msgstr "To accept this invitation, please register at %s or any other public Friendica website." +msgstr "To accept this invitation, please sign up at %s or any other public Friendica website." #: mod/invite.php:127 #, php-format @@ -4406,7 +4406,7 @@ msgstr "You will need to supply this invitation code: $invite_code" #: mod/invite.php:141 msgid "" "Once you have registered, please connect with me via my profile page at:" -msgstr "Once you have registered, please connect with me via my profile page at:" +msgstr "Once you have signed up, please connect with me via my profile page at:" #: mod/invite.php:143 msgid "" @@ -4503,9 +4503,9 @@ msgid "" "Password reset failed." msgstr "Request could not be verified. (You may have previously submitted it.) Password reset failed." -#: mod/lostpass.php:112 boot.php:877 +#: mod/lostpass.php:112 boot.php:884 msgid "Password Reset" -msgstr "Password reset" +msgstr "Forgotten password?" #: mod/lostpass.php:113 msgid "Your password has been reset as requested." @@ -4569,7 +4569,7 @@ msgid "" "your email for further instructions." msgstr "Enter email address or nickname to reset your password. You will receive further instruction via email." -#: mod/lostpass.php:163 boot.php:865 +#: mod/lostpass.php:163 boot.php:872 msgid "Nickname or Email: " msgstr "Nickname or email: " @@ -5353,18 +5353,6 @@ msgstr "Map" msgid "View Album" msgstr "View album" -#: mod/ping.php:273 -msgid "{0} wants to be your friend" -msgstr "{0} wants to be your friend" - -#: mod/ping.php:288 -msgid "{0} sent you a message" -msgstr "{0} sent you a message" - -#: mod/ping.php:303 -msgid "{0} requested registration" -msgstr "{0} requested registration" - #: mod/poke.php:197 msgid "Poke/Prod" msgstr "Poke/Prod" @@ -5439,7 +5427,7 @@ msgstr "This site has exceeded the number of allowed daily account registrations msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." -msgstr "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'." +msgstr "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Sign up now'." #: mod/register.php:229 msgid "" @@ -5473,7 +5461,7 @@ msgstr "Your invitation ID: " #: mod/register.php:274 mod/admin.php:1062 msgid "Registration" -msgstr "Registration" +msgstr "Join this Friendica Node Today" #: mod/register.php:282 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " @@ -5918,1412 +5906,6 @@ msgid "" "select \"Export account\"" msgstr "To export your account, go to \"Settings->Export personal data\" and select \"Export account\"" -#: mod/admin.php:97 -msgid "Theme settings updated." -msgstr "Theme settings updated." - -#: mod/admin.php:166 mod/admin.php:1060 -msgid "Site" -msgstr "Site" - -#: mod/admin.php:167 mod/admin.php:994 mod/admin.php:1504 mod/admin.php:1520 -msgid "Users" -msgstr "Users" - -#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76 -msgid "Plugins" -msgstr "Plugins" - -#: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 -msgid "Themes" -msgstr "Theme selection" - -#: mod/admin.php:170 mod/settings.php:54 -msgid "Additional features" -msgstr "Additional features" - -#: mod/admin.php:171 -msgid "DB updates" -msgstr "DB updates" - -#: mod/admin.php:172 mod/admin.php:513 -msgid "Inspect Queue" -msgstr "Inspect queue" - -#: mod/admin.php:173 mod/admin.php:289 -msgid "Server Blocklist" -msgstr "Server blocklist" - -#: mod/admin.php:174 mod/admin.php:479 -msgid "Federation Statistics" -msgstr "Federation statistics" - -#: mod/admin.php:188 mod/admin.php:199 mod/admin.php:2022 -msgid "Logs" -msgstr "Logs" - -#: mod/admin.php:189 mod/admin.php:2090 -msgid "View Logs" -msgstr "View logs" - -#: mod/admin.php:190 -msgid "probe address" -msgstr "Probe address" - -#: mod/admin.php:191 -msgid "check webfinger" -msgstr "Check webfinger" - -#: mod/admin.php:198 -msgid "Plugin Features" -msgstr "Plugin Features" - -#: mod/admin.php:200 -msgid "diagnostics" -msgstr "Diagnostics" - -#: mod/admin.php:201 -msgid "User registrations waiting for confirmation" -msgstr "User registrations awaiting confirmation" - -#: mod/admin.php:280 -msgid "The blocked domain" -msgstr "Blocked domain" - -#: mod/admin.php:281 mod/admin.php:294 -msgid "The reason why you blocked this domain." -msgstr "Reason why you blocked this domain." - -#: mod/admin.php:282 -msgid "Delete domain" -msgstr "Delete domain" - -#: mod/admin.php:282 -msgid "Check to delete this entry from the blocklist" -msgstr "Check to delete this entry from the blocklist" - -#: mod/admin.php:288 mod/admin.php:478 mod/admin.php:512 mod/admin.php:592 -#: mod/admin.php:1059 mod/admin.php:1503 mod/admin.php:1621 mod/admin.php:1684 -#: mod/admin.php:1897 mod/admin.php:1947 mod/admin.php:2021 mod/admin.php:2089 -msgid "Administration" -msgstr "Administration" - -#: mod/admin.php:290 -msgid "" -"This page can be used to define a black list of servers from the federated " -"network that are not allowed to interact with your node. For all entered " -"domains you should also give a reason why you have blocked the remote " -"server." -msgstr "This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server." - -#: mod/admin.php:291 -msgid "" -"The list of blocked servers will be made publically available on the " -"/friendica page so that your users and people investigating communication " -"problems can find the reason easily." -msgstr "The list of blocked servers will publicly available on the Friendica page so that your users and people investigating communication problems can readily find the reason." - -#: mod/admin.php:292 -msgid "Add new entry to block list" -msgstr "Add new entry to block list" - -#: mod/admin.php:293 -msgid "Server Domain" -msgstr "Server domain" - -#: mod/admin.php:293 -msgid "" -"The domain of the new server to add to the block list. Do not include the " -"protocol." -msgstr "The domain of the new server to add to the block list. Do not include the protocol." - -#: mod/admin.php:294 -msgid "Block reason" -msgstr "Block reason" - -#: mod/admin.php:295 -msgid "Add Entry" -msgstr "Add entry" - -#: mod/admin.php:296 -msgid "Save changes to the blocklist" -msgstr "Save changes to the blocklist" - -#: mod/admin.php:297 -msgid "Current Entries in the Blocklist" -msgstr "Current entries in the blocklist" - -#: mod/admin.php:300 -msgid "Delete entry from blocklist" -msgstr "Delete entry from blocklist" - -#: mod/admin.php:303 -msgid "Delete entry from blocklist?" -msgstr "Delete entry from blocklist?" - -#: mod/admin.php:328 -msgid "Server added to blocklist." -msgstr "Server added to blocklist." - -#: mod/admin.php:344 -msgid "Site blocklist updated." -msgstr "Site blocklist updated." - -#: mod/admin.php:409 -msgid "unknown" -msgstr "unknown" - -#: mod/admin.php:472 -msgid "" -"This page offers you some numbers to the known part of the federated social " -"network your Friendica node is part of. These numbers are not complete but " -"only reflect the part of the network your node is aware of." -msgstr "This page offers you the amount of known part of the federated social network your Friendica node is part of. These numbers are not complete and only reflect the part of the network your node is aware of." - -#: mod/admin.php:473 -msgid "" -"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it " -"will improve the data displayed here." -msgstr "The <em>Auto Discovered Contact Directory</em> feature is not enabled; enabling it will improve the data displayed here." - -#: mod/admin.php:485 -#, php-format -msgid "Currently this node is aware of %d nodes from the following platforms:" -msgstr "Currently this node is aware of %d nodes from the following platforms:" - -#: mod/admin.php:515 -msgid "ID" -msgstr "ID" - -#: mod/admin.php:516 -msgid "Recipient Name" -msgstr "Recipient name" - -#: mod/admin.php:517 -msgid "Recipient Profile" -msgstr "Recipient profile" - -#: mod/admin.php:519 -msgid "Created" -msgstr "Created" - -#: mod/admin.php:520 -msgid "Last Tried" -msgstr "Last Tried" - -#: mod/admin.php:521 -msgid "" -"This page lists the content of the queue for outgoing postings. These are " -"postings the initial delivery failed for. They will be resend later and " -"eventually deleted if the delivery fails permanently." -msgstr "This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently." - -#: mod/admin.php:546 -#, php-format -msgid "" -"Your DB still runs with MyISAM tables. You should change the engine type to " -"InnoDB. As Friendica will use InnoDB only features in the future, you should" -" change this! See <a href=\"%s\">here</a> for a guide that may be helpful " -"converting the table engines. You may also use the command <tt>php " -"include/dbstructure.php toinnodb</tt> of your Friendica installation for an " -"automatic conversion.<br />" -msgstr "Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />" - -#: mod/admin.php:555 -msgid "" -"The database update failed. Please run \"php include/dbstructure.php " -"update\" from the command line and have a look at the errors that might " -"appear." -msgstr "The database update failed. Please run 'php include/dbstructure.php update' from the command line and have a look at the errors that might appear." - -#: mod/admin.php:560 mod/admin.php:1453 -msgid "Normal Account" -msgstr "Standard account" - -#: mod/admin.php:561 mod/admin.php:1454 -msgid "Soapbox Account" -msgstr "Soapbox account" - -#: mod/admin.php:562 mod/admin.php:1455 -msgid "Community/Celebrity Account" -msgstr "Community/Celebrity account" - -#: mod/admin.php:563 mod/admin.php:1456 -msgid "Automatic Friend Account" -msgstr "Automatic friend account" - -#: mod/admin.php:564 -msgid "Blog Account" -msgstr "Blog account" - -#: mod/admin.php:565 -msgid "Private Forum" -msgstr "Private forum" - -#: mod/admin.php:587 -msgid "Message queues" -msgstr "Message queues" - -#: mod/admin.php:593 -msgid "Summary" -msgstr "Summary" - -#: mod/admin.php:595 -msgid "Registered users" -msgstr "Registered users" - -#: mod/admin.php:597 -msgid "Pending registrations" -msgstr "Pending registrations" - -#: mod/admin.php:598 -msgid "Version" -msgstr "Version" - -#: mod/admin.php:603 -msgid "Active plugins" -msgstr "Active plugins" - -#: mod/admin.php:628 -msgid "Can not parse base url. Must have at least <scheme>://<domain>" -msgstr "Can not parse base URL. Must have at least <scheme>://<domain>" - -#: mod/admin.php:920 -msgid "Site settings updated." -msgstr "Site settings updated." - -#: mod/admin.php:948 mod/settings.php:944 -msgid "No special theme for mobile devices" -msgstr "No special theme for mobile devices" - -#: mod/admin.php:977 -msgid "No community page" -msgstr "No community page" - -#: mod/admin.php:978 -msgid "Public postings from users of this site" -msgstr "Public postings from users of this site" - -#: mod/admin.php:979 -msgid "Global community page" -msgstr "Global community page" - -#: mod/admin.php:984 mod/contacts.php:541 -msgid "Never" -msgstr "Never" - -#: mod/admin.php:985 -msgid "At post arrival" -msgstr "At post arrival" - -#: mod/admin.php:993 mod/contacts.php:568 -msgid "Disabled" -msgstr "Disabled" - -#: mod/admin.php:995 -msgid "Users, Global Contacts" -msgstr "Users, Global Contacts" - -#: mod/admin.php:996 -msgid "Users, Global Contacts/fallback" -msgstr "Users, Global Contacts/fallback" - -#: mod/admin.php:1000 -msgid "One month" -msgstr "One month" - -#: mod/admin.php:1001 -msgid "Three months" -msgstr "Three months" - -#: mod/admin.php:1002 -msgid "Half a year" -msgstr "Half a year" - -#: mod/admin.php:1003 -msgid "One year" -msgstr "One a year" - -#: mod/admin.php:1008 -msgid "Multi user instance" -msgstr "Multi user instance" - -#: mod/admin.php:1031 -msgid "Closed" -msgstr "Closed" - -#: mod/admin.php:1032 -msgid "Requires approval" -msgstr "Requires approval" - -#: mod/admin.php:1033 -msgid "Open" -msgstr "Open" - -#: mod/admin.php:1037 -msgid "No SSL policy, links will track page SSL state" -msgstr "No SSL policy, links will track page SSL state" - -#: mod/admin.php:1038 -msgid "Force all links to use SSL" -msgstr "Force all links to use SSL" - -#: mod/admin.php:1039 -msgid "Self-signed certificate, use SSL for local links only (discouraged)" -msgstr "Self-signed certificate, use SSL for local links only (discouraged)" - -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793 -#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006 -#: mod/settings.php:1272 -msgid "Save Settings" -msgstr "Save settings" - -#: mod/admin.php:1063 -msgid "File upload" -msgstr "File upload" - -#: mod/admin.php:1064 -msgid "Policies" -msgstr "Policies" - -#: mod/admin.php:1066 -msgid "Auto Discovered Contact Directory" -msgstr "Auto-discovered contact directory" - -#: mod/admin.php:1067 -msgid "Performance" -msgstr "Performance" - -#: mod/admin.php:1068 -msgid "Worker" -msgstr "Worker" - -#: mod/admin.php:1069 -msgid "" -"Relocate - WARNING: advanced function. Could make this server unreachable." -msgstr "Relocate - Warning, advanced function: This could make this server unreachable." - -#: mod/admin.php:1072 -msgid "Site name" -msgstr "Site name" - -#: mod/admin.php:1073 -msgid "Host name" -msgstr "Host name" - -#: mod/admin.php:1074 -msgid "Sender Email" -msgstr "Sender email" - -#: mod/admin.php:1074 -msgid "" -"The email address your server shall use to send notification emails from." -msgstr "The email address your server shall use to send notification emails from." - -#: mod/admin.php:1075 -msgid "Banner/Logo" -msgstr "Banner/Logo" - -#: mod/admin.php:1076 -msgid "Shortcut icon" -msgstr "Shortcut icon" - -#: mod/admin.php:1076 -msgid "Link to an icon that will be used for browsers." -msgstr "Link to an icon that will be used for browsers." - -#: mod/admin.php:1077 -msgid "Touch icon" -msgstr "Touch icon" - -#: mod/admin.php:1077 -msgid "Link to an icon that will be used for tablets and mobiles." -msgstr "Link to an icon that will be used for tablets and mobiles." - -#: mod/admin.php:1078 -msgid "Additional Info" -msgstr "Additional Info" - -#: mod/admin.php:1078 -#, php-format -msgid "" -"For public servers: you can add additional information here that will be " -"listed at %s/siteinfo." -msgstr "For public servers: add additional information here that will be listed at %s/siteinfo." - -#: mod/admin.php:1079 -msgid "System language" -msgstr "System language" - -#: mod/admin.php:1080 -msgid "System theme" -msgstr "System theme" - -#: mod/admin.php:1080 -msgid "" -"Default system theme - may be over-ridden by user profiles - <a href='#' " -"id='cnftheme'>change theme settings</a>" -msgstr "Default system theme - may be overridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>" - -#: mod/admin.php:1081 -msgid "Mobile system theme" -msgstr "Mobile system theme" - -#: mod/admin.php:1081 -msgid "Theme for mobile devices" -msgstr "Theme for mobile devices" - -#: mod/admin.php:1082 -msgid "SSL link policy" -msgstr "SSL link policy" - -#: mod/admin.php:1082 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "Determines whether generated links should be forced to use SSL" - -#: mod/admin.php:1083 -msgid "Force SSL" -msgstr "Force SSL" - -#: mod/admin.php:1083 -msgid "" -"Force all Non-SSL requests to SSL - Attention: on some systems it could lead" -" to endless loops." -msgstr "Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops." - -#: mod/admin.php:1084 -msgid "Hide help entry from navigation menu" -msgstr "Hide help entry from navigation menu" - -#: mod/admin.php:1084 -msgid "" -"Hides the menu entry for the Help pages from the navigation menu. You can " -"still access it calling /help directly." -msgstr "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL." - -#: mod/admin.php:1085 -msgid "Single user instance" -msgstr "Single user instance" - -#: mod/admin.php:1085 -msgid "Make this instance multi-user or single-user for the named user" -msgstr "Make this instance multi-user or single-user for the named user" - -#: mod/admin.php:1086 -msgid "Maximum image size" -msgstr "Maximum image size" - -#: mod/admin.php:1086 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "Maximum size in bytes of uploaded images. Default is 0, which means no limits." - -#: mod/admin.php:1087 -msgid "Maximum image length" -msgstr "Maximum image length" - -#: mod/admin.php:1087 -msgid "" -"Maximum length in pixels of the longest side of uploaded images. Default is " -"-1, which means no limits." -msgstr "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits." - -#: mod/admin.php:1088 -msgid "JPEG image quality" -msgstr "JPEG image quality" - -#: mod/admin.php:1088 -msgid "" -"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " -"100, which is full quality." -msgstr "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is the original quality level." - -#: mod/admin.php:1090 -msgid "Register policy" -msgstr "Register policy" - -#: mod/admin.php:1091 -msgid "Maximum Daily Registrations" -msgstr "Maximum daily registrations" - -#: mod/admin.php:1091 -msgid "" -"If registration is permitted above, this sets the maximum number of new user" -" registrations to accept per day. If register is set to closed, this " -"setting has no effect." -msgstr "If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect." - -#: mod/admin.php:1092 -msgid "Register text" -msgstr "Register text" - -#: mod/admin.php:1092 -msgid "Will be displayed prominently on the registration page." -msgstr "Will be displayed prominently on the registration page." - -#: mod/admin.php:1093 -msgid "Accounts abandoned after x days" -msgstr "Accounts abandoned after so many days" - -#: mod/admin.php:1093 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit." - -#: mod/admin.php:1094 -msgid "Allowed friend domains" -msgstr "Allowed friend domains" - -#: mod/admin.php:1094 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains" - -#: mod/admin.php:1095 -msgid "Allowed email domains" -msgstr "Allowed email domains" - -#: mod/admin.php:1095 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" -msgstr "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains" - -#: mod/admin.php:1096 -msgid "Block public" -msgstr "Block public" - -#: mod/admin.php:1096 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." -msgstr "Block public access to all otherwise public personal pages on this site, except for local users when logged in." - -#: mod/admin.php:1097 -msgid "Force publish" -msgstr "Mandatory directory listing" - -#: mod/admin.php:1097 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "Force all profiles on this site to be listed in the site directory." - -#: mod/admin.php:1098 -msgid "Global directory URL" -msgstr "Global directory URL" - -#: mod/admin.php:1098 -msgid "" -"URL to the global directory. If this is not set, the global directory is " -"completely unavailable to the application." -msgstr "URL to the global directory: If this is not set, the global directory is completely unavailable to the application." - -#: mod/admin.php:1099 -msgid "Allow threaded items" -msgstr "Allow threaded items" - -#: mod/admin.php:1099 -msgid "Allow infinite level threading for items on this site." -msgstr "Allow infinite levels of threading for items on this site." - -#: mod/admin.php:1100 -msgid "Private posts by default for new users" -msgstr "Private posts by default for new users" - -#: mod/admin.php:1100 -msgid "" -"Set default post permissions for all new members to the default privacy " -"group rather than public." -msgstr "Set default post permissions for all new members to the default privacy group rather than public." - -#: mod/admin.php:1101 -msgid "Don't include post content in email notifications" -msgstr "Don't include post content in email notifications" - -#: mod/admin.php:1101 -msgid "" -"Don't include the content of a post/comment/private message/etc. in the " -"email notifications that are sent out from this site, as a privacy measure." -msgstr "Don't include the content of a post/comment/private message in the email notifications sent from this site, as a privacy measure." - -#: mod/admin.php:1102 -msgid "Disallow public access to addons listed in the apps menu." -msgstr "Disallow public access to addons listed in the apps menu." - -#: mod/admin.php:1102 -msgid "" -"Checking this box will restrict addons listed in the apps menu to members " -"only." -msgstr "Checking this box will restrict addons listed in the apps menu to members only." - -#: mod/admin.php:1103 -msgid "Don't embed private images in posts" -msgstr "Don't embed private images in posts" - -#: mod/admin.php:1103 -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 "Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while." - -#: mod/admin.php:1104 -msgid "Allow Users to set remote_self" -msgstr "Allow users to set \"Remote self\"" - -#: mod/admin.php:1104 -msgid "" -"With checking this, every user is allowed to mark every contact as a " -"remote_self in the repair contact dialog. Setting this flag on a contact " -"causes mirroring every posting of that contact in the users stream." -msgstr "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream." - -#: mod/admin.php:1105 -msgid "Block multiple registrations" -msgstr "Block multiple registrations" - -#: mod/admin.php:1105 -msgid "Disallow users to register additional accounts for use as pages." -msgstr "Disallow users to register additional accounts for use as pages." - -#: mod/admin.php:1106 -msgid "OpenID support" -msgstr "OpenID support" - -#: mod/admin.php:1106 -msgid "OpenID support for registration and logins." -msgstr "OpenID support for registration and logins." - -#: mod/admin.php:1107 -msgid "Fullname check" -msgstr "Full name check" - -#: mod/admin.php:1107 -msgid "" -"Force users to register with a space between firstname and lastname in Full " -"name, as an antispam measure" -msgstr "Force users to register with a space between first name and last name in the full name field; it may reduce spam and abuse registrations." - -#: mod/admin.php:1108 -msgid "Community Page Style" -msgstr "Community page style" - -#: mod/admin.php:1108 -msgid "" -"Type of community page to show. 'Global community' shows every public " -"posting from an open distributed network that arrived on this server." -msgstr "Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server." - -#: mod/admin.php:1109 -msgid "Posts per user on community page" -msgstr "Posts per user on community page" - -#: mod/admin.php:1109 -msgid "" -"The maximum number of posts per user on the community page. (Not valid for " -"'Global Community')" -msgstr "Maximum number of posts per user on the community page (not valid for 'Global Community')." - -#: mod/admin.php:1110 -msgid "Enable OStatus support" -msgstr "Enable OStatus support" - -#: mod/admin.php:1110 -msgid "" -"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " -"communications in OStatus are public, so privacy warnings will be " -"occasionally displayed." -msgstr "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed." - -#: mod/admin.php:1111 -msgid "OStatus conversation completion interval" -msgstr "OStatus conversation completion interval" - -#: mod/admin.php:1111 -msgid "" -"How often shall the poller check for new entries in OStatus conversations? " -"This can be a very ressource task." -msgstr "How often shall the poller check for new entries in OStatus conversations? This can be rather resources consuming." - -#: mod/admin.php:1112 -msgid "Only import OStatus threads from our contacts" -msgstr "Only import OStatus threads from known contacts" - -#: mod/admin.php:1112 -msgid "" -"Normally we import every content from our OStatus contacts. With this option" -" we only store threads that are started by a contact that is known on our " -"system." -msgstr "Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system." - -#: mod/admin.php:1113 -msgid "OStatus support can only be enabled if threading is enabled." -msgstr "OStatus support can only be enabled if threading is enabled." - -#: mod/admin.php:1115 -msgid "" -"Diaspora support can't be enabled because Friendica was installed into a sub" -" directory." -msgstr "Diaspora support can't be enabled because Friendica was installed into a sub directory." - -#: mod/admin.php:1116 -msgid "Enable Diaspora support" -msgstr "Enable Diaspora support" - -#: mod/admin.php:1116 -msgid "Provide built-in Diaspora network compatibility." -msgstr "Provide built-in Diaspora network compatibility." - -#: mod/admin.php:1117 -msgid "Only allow Friendica contacts" -msgstr "Only allow Friendica contacts" - -#: mod/admin.php:1117 -msgid "" -"All contacts must use Friendica protocols. All other built-in communication " -"protocols disabled." -msgstr "All contacts must use Friendica protocols. All other built-in communication protocols will be disabled." - -#: mod/admin.php:1118 -msgid "Verify SSL" -msgstr "Verify SSL" - -#: mod/admin.php:1118 -msgid "" -"If you wish, you can turn on strict certificate checking. This will mean you" -" cannot connect (at all) to self-signed SSL sites." -msgstr "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites." - -#: mod/admin.php:1119 -msgid "Proxy user" -msgstr "Proxy user" - -#: mod/admin.php:1120 -msgid "Proxy URL" -msgstr "Proxy URL" - -#: mod/admin.php:1121 -msgid "Network timeout" -msgstr "Network timeout" - -#: mod/admin.php:1121 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "Value is in seconds. Set to 0 for unlimited (not recommended)." - -#: mod/admin.php:1122 -msgid "Maximum Load Average" -msgstr "Maximum load average" - -#: mod/admin.php:1122 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "Maximum system load before delivery and poll processes are deferred (default 50)." - -#: mod/admin.php:1123 -msgid "Maximum Load Average (Frontend)" -msgstr "Maximum load average (frontend)" - -#: mod/admin.php:1123 -msgid "Maximum system load before the frontend quits service - default 50." -msgstr "Maximum system load before the frontend quits service (default 50)." - -#: mod/admin.php:1124 -msgid "Minimal Memory" -msgstr "Minimal memory" - -#: mod/admin.php:1124 -msgid "" -"Minimal free memory in MB for the poller. Needs access to /proc/meminfo - " -"default 0 (deactivated)." -msgstr "Minimal free memory in MB for the poller. Needs access to /proc/meminfo (default 0 - deactivated)." - -#: mod/admin.php:1125 -msgid "Maximum table size for optimization" -msgstr "Maximum table size for optimization" - -#: mod/admin.php:1125 -msgid "" -"Maximum table size (in MB) for the automatic optimization - default 100 MB. " -"Enter -1 to disable it." -msgstr "Maximum table size (in MB) for the automatic optimization (default 100 MB; -1 to deactivate)." - -#: mod/admin.php:1126 -msgid "Minimum level of fragmentation" -msgstr "Minimum level of fragmentation" - -#: mod/admin.php:1126 -msgid "" -"Minimum fragmenation level to start the automatic optimization - default " -"value is 30%." -msgstr "Minimum fragmentation level to start the automatic optimization (default 30%)." - -#: mod/admin.php:1128 -msgid "Periodical check of global contacts" -msgstr "Periodical check of global contacts" - -#: mod/admin.php:1128 -msgid "" -"If enabled, the global contacts are checked periodically for missing or " -"outdated data and the vitality of the contacts and servers." -msgstr "This checks global contacts periodically for missing or outdated data and the vitality of the contacts and servers." - -#: mod/admin.php:1129 -msgid "Days between requery" -msgstr "Days between enquiry" - -#: mod/admin.php:1129 -msgid "Number of days after which a server is requeried for his contacts." -msgstr "Number of days after which a server is required check contacts." - -#: mod/admin.php:1130 -msgid "Discover contacts from other servers" -msgstr "Discover contacts from other servers" - -#: mod/admin.php:1130 -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 "Periodically query other servers for contacts. You can choose between 'Users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older Friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommend setting is 'Users, Global Contacts'." - -#: mod/admin.php:1131 -msgid "Timeframe for fetching global contacts" -msgstr "Time-frame for fetching global contacts" - -#: mod/admin.php:1131 -msgid "" -"When the discovery is activated, this value defines the timeframe for the " -"activity of the global contacts that are fetched from other servers." -msgstr "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers." - -#: mod/admin.php:1132 -msgid "Search the local directory" -msgstr "Search the local directory" - -#: mod/admin.php:1132 -msgid "" -"Search the local directory instead of the global directory. When searching " -"locally, every search will be executed on the global directory in the " -"background. This improves the search results when the search is repeated." -msgstr "Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated." - -#: mod/admin.php:1134 -msgid "Publish server information" -msgstr "Publish server information" - -#: mod/admin.php:1134 -msgid "" -"If enabled, general server and usage data will be published. The data " -"contains the name and version of the server, number of users with public " -"profiles, number of posts and the activated protocols and connectors. See <a" -" href='http://the-federation.info/'>the-federation.info</a> for details." -msgstr "This publishes generic data about the server and its usage. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details." - -#: mod/admin.php:1136 -msgid "Suppress Tags" -msgstr "Suppress tags" - -#: mod/admin.php:1136 -msgid "Suppress showing a list of hashtags at the end of the posting." -msgstr "Suppress listed hashtags at the end of posts." - -#: mod/admin.php:1137 -msgid "Path to item cache" -msgstr "Path to item cache" - -#: mod/admin.php:1137 -msgid "The item caches buffers generated bbcode and external images." -msgstr "The item caches buffers generated bbcode and external images." - -#: mod/admin.php:1138 -msgid "Cache duration in seconds" -msgstr "Cache duration in seconds" - -#: mod/admin.php:1138 -msgid "" -"How long should the cache files be hold? Default value is 86400 seconds (One" -" day). To disable the item cache, set the value to -1." -msgstr "How long should cache files be held? (Default 86400 seconds - one day; -1 disables item cache)" - -#: mod/admin.php:1139 -msgid "Maximum numbers of comments per post" -msgstr "Maximum numbers of comments per post" - -#: mod/admin.php:1139 -msgid "How much comments should be shown for each post? Default value is 100." -msgstr "How many comments should be shown for each post? (Default 100)" - -#: mod/admin.php:1140 -msgid "Temp path" -msgstr "Temp path" - -#: mod/admin.php:1140 -msgid "" -"If you have a restricted system where the webserver can't access the system " -"temp path, enter another path here." -msgstr "Enter a different tmp path, if your system restricts the webserver's access to the system temp path." - -#: mod/admin.php:1141 -msgid "Base path to installation" -msgstr "Base path to installation" - -#: mod/admin.php:1141 -msgid "" -"If the system cannot detect the correct path to your installation, enter the" -" correct path here. This setting should only be set if you are using a " -"restricted system and symbolic links to your webroot." -msgstr "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot." - -#: mod/admin.php:1142 -msgid "Disable picture proxy" -msgstr "Disable picture proxy" - -#: mod/admin.php:1142 -msgid "" -"The picture proxy increases performance and privacy. It shouldn't be used on" -" systems with very low bandwith." -msgstr "The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith." - -#: mod/admin.php:1143 -msgid "Only search in tags" -msgstr "Only search in tags" - -#: mod/admin.php:1143 -msgid "On large systems the text search can slow down the system extremely." -msgstr "On large systems the text search can slow down the system significantly." - -#: mod/admin.php:1145 -msgid "New base url" -msgstr "New base URL" - -#: mod/admin.php:1145 -msgid "" -"Change base url for this server. Sends relocate message to all DFRN contacts" -" of all users." -msgstr "Change base URL for this server. Sends relocate message to all DFRN contacts of all users." - -#: mod/admin.php:1147 -msgid "RINO Encryption" -msgstr "RINO Encryption" - -#: mod/admin.php:1147 -msgid "Encryption layer between nodes." -msgstr "Encryption layer between nodes." - -#: mod/admin.php:1149 -msgid "Maximum number of parallel workers" -msgstr "Maximum number of parallel workers" - -#: mod/admin.php:1149 -msgid "" -"On shared hosters set this to 2. On larger systems, values of 10 are great. " -"Default value is 4." -msgstr "On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4." - -#: mod/admin.php:1150 -msgid "Don't use 'proc_open' with the worker" -msgstr "Don't use 'proc_open' with the worker" - -#: mod/admin.php:1150 -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 "Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosts. If this is enabled you should increase the frequency of poller calls in your crontab." - -#: mod/admin.php:1151 -msgid "Enable fastlane" -msgstr "Enable fast-lane" - -#: mod/admin.php:1151 -msgid "" -"When enabed, the fastlane mechanism starts an additional worker if processes" -" with higher priority are blocked by processes of lower priority." -msgstr "The fast-lane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority." - -#: mod/admin.php:1152 -msgid "Enable frontend worker" -msgstr "Enable frontend worker" - -#: mod/admin.php:1152 -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 "If enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this." - -#: mod/admin.php:1182 -msgid "Update has been marked successful" -msgstr "Update has been marked successful" - -#: mod/admin.php:1190 -#, php-format -msgid "Database structure update %s was successfully applied." -msgstr "Database structure update %s was successfully applied." - -#: mod/admin.php:1193 -#, php-format -msgid "Executing of database structure update %s failed with error: %s" -msgstr "Executing of database structure update %s failed with error: %s" - -#: mod/admin.php:1207 -#, php-format -msgid "Executing %s failed with error: %s" -msgstr "Executing %s failed with error: %s" - -#: mod/admin.php:1210 -#, php-format -msgid "Update %s was successfully applied." -msgstr "Update %s was successfully applied." - -#: mod/admin.php:1213 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "Update %s did not return a status. Unknown if it succeeded." - -#: mod/admin.php:1216 -#, php-format -msgid "There was no additional update function %s that needed to be called." -msgstr "There was no additional update function %s that needed to be called." - -#: mod/admin.php:1236 -msgid "No failed updates." -msgstr "No failed updates." - -#: mod/admin.php:1237 -msgid "Check database structure" -msgstr "Check database structure" - -#: mod/admin.php:1242 -msgid "Failed Updates" -msgstr "Failed updates" - -#: mod/admin.php:1243 -msgid "" -"This does not include updates prior to 1139, which did not return a status." -msgstr "This does not include updates prior to 1139, which did not return a status." - -#: mod/admin.php:1244 -msgid "Mark success (if update was manually applied)" -msgstr "Mark success (if update was manually applied)" - -#: mod/admin.php:1245 -msgid "Attempt to execute this update step automatically" -msgstr "Attempt to execute this update step automatically" - -#: mod/admin.php:1279 -#, php-format -msgid "" -"\n" -"\t\t\tDear %1$s,\n" -"\t\t\t\tthe administrator of %2$s has set up an account for you." -msgstr "\n\t\t\tDear %1$s,\n\t\t\t\tThe administrator of %2$s has set up an account for you." - -#: mod/admin.php:1282 -#, 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 "\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, this may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4$s." - -#: mod/admin.php:1326 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "%s user blocked/unblocked" -msgstr[1] "%s users blocked/unblocked" - -#: mod/admin.php:1333 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "%s user deleted" -msgstr[1] "%s users deleted" - -#: mod/admin.php:1380 -#, php-format -msgid "User '%s' deleted" -msgstr "User '%s' deleted" - -#: mod/admin.php:1388 -#, php-format -msgid "User '%s' unblocked" -msgstr "User '%s' unblocked" - -#: mod/admin.php:1388 -#, php-format -msgid "User '%s' blocked" -msgstr "User '%s' blocked" - -#: mod/admin.php:1496 mod/admin.php:1522 -msgid "Register date" -msgstr "Register date" - -#: mod/admin.php:1496 mod/admin.php:1522 -msgid "Last login" -msgstr "Last login" - -#: mod/admin.php:1496 mod/admin.php:1522 -msgid "Last item" -msgstr "Last item" - -#: mod/admin.php:1496 mod/settings.php:45 -msgid "Account" -msgstr "Account" - -#: mod/admin.php:1505 -msgid "Add User" -msgstr "Add user" - -#: mod/admin.php:1506 -msgid "select all" -msgstr "select all" - -#: mod/admin.php:1507 -msgid "User registrations waiting for confirm" -msgstr "User registrations awaiting confirmation" - -#: mod/admin.php:1508 -msgid "User waiting for permanent deletion" -msgstr "User awaiting permanent deletion" - -#: mod/admin.php:1509 -msgid "Request date" -msgstr "Request date" - -#: mod/admin.php:1510 -msgid "No registrations." -msgstr "No registrations." - -#: mod/admin.php:1511 -msgid "Note from the user" -msgstr "Note from the user" - -#: mod/admin.php:1513 -msgid "Deny" -msgstr "Deny" - -#: mod/admin.php:1515 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Block" -msgstr "Block" - -#: mod/admin.php:1516 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Unblock" -msgstr "Unblock" - -#: mod/admin.php:1517 -msgid "Site admin" -msgstr "Site admin" - -#: mod/admin.php:1518 -msgid "Account expired" -msgstr "Account expired" - -#: mod/admin.php:1521 -msgid "New User" -msgstr "New user" - -#: mod/admin.php:1522 -msgid "Deleted since" -msgstr "Deleted since" - -#: mod/admin.php:1527 -msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" -msgstr "Selected users will be deleted!\\n\\nEverything these users has posted on this site will be permanently deleted!\\n\\nAre you sure?" - -#: mod/admin.php:1528 -msgid "" -"The user {0} will be deleted!\\n\\nEverything this user has posted on this " -"site will be permanently deleted!\\n\\nAre you sure?" -msgstr "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?" - -#: mod/admin.php:1538 -msgid "Name of the new user." -msgstr "Name of the new user." - -#: mod/admin.php:1539 -msgid "Nickname" -msgstr "Nickname" - -#: mod/admin.php:1539 -msgid "Nickname of the new user." -msgstr "Nickname of the new user." - -#: mod/admin.php:1540 -msgid "Email address of the new user." -msgstr "Email address of the new user." - -#: mod/admin.php:1583 -#, php-format -msgid "Plugin %s disabled." -msgstr "Plugin %s disabled." - -#: mod/admin.php:1587 -#, php-format -msgid "Plugin %s enabled." -msgstr "Plugin %s enabled." - -#: mod/admin.php:1598 mod/admin.php:1850 -msgid "Disable" -msgstr "Disable" - -#: mod/admin.php:1600 mod/admin.php:1852 -msgid "Enable" -msgstr "Enable" - -#: mod/admin.php:1623 mod/admin.php:1899 -msgid "Toggle" -msgstr "Toggle" - -#: mod/admin.php:1631 mod/admin.php:1908 -msgid "Author: " -msgstr "Author: " - -#: mod/admin.php:1632 mod/admin.php:1909 -msgid "Maintainer: " -msgstr "Maintainer: " - -#: mod/admin.php:1687 -msgid "Reload active plugins" -msgstr "Reload active plugins" - -#: mod/admin.php:1692 -#, php-format -msgid "" -"There are currently no plugins available on your node. You can find the " -"official plugin repository at %1$s and might find other interesting plugins " -"in the open plugin registry at %2$s" -msgstr "There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s" - -#: mod/admin.php:1811 -msgid "No themes found." -msgstr "No themes found." - -#: mod/admin.php:1890 -msgid "Screenshot" -msgstr "Screenshot" - -#: mod/admin.php:1950 -msgid "Reload active themes" -msgstr "Reload active themes" - -#: mod/admin.php:1955 -#, php-format -msgid "No themes found on the system. They should be paced in %1$s" -msgstr "No themes found on the system. They should be paced in %1$s" - -#: mod/admin.php:1956 -msgid "[Experimental]" -msgstr "[Experimental]" - -#: mod/admin.php:1957 -msgid "[Unsupported]" -msgstr "[Unsupported]" - -#: mod/admin.php:1981 -msgid "Log settings updated." -msgstr "Log settings updated." - -#: mod/admin.php:2013 -msgid "PHP log currently enabled." -msgstr "PHP log currently enabled." - -#: mod/admin.php:2015 -msgid "PHP log currently disabled." -msgstr "PHP log currently disabled." - -#: mod/admin.php:2024 -msgid "Clear" -msgstr "Clear" - -#: mod/admin.php:2029 -msgid "Enable Debugging" -msgstr "Enable debugging" - -#: mod/admin.php:2030 -msgid "Log file" -msgstr "Log file" - -#: mod/admin.php:2030 -msgid "" -"Must be writable by web server. Relative to your Friendica top-level " -"directory." -msgstr "Must be writable by web server and relative to your Friendica top-level directory." - -#: mod/admin.php:2031 -msgid "Log level" -msgstr "Log level" - -#: mod/admin.php:2034 -msgid "PHP logging" -msgstr "PHP logging" - -#: mod/admin.php:2035 -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 "To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The file name set in the 'error_log' line is relative to the Friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them." - -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "Off" -msgstr "Off" - -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "On" -msgstr "On" - -#: mod/admin.php:2166 -#, php-format -msgid "Lock feature %s" -msgstr "Lock feature %s" - -#: mod/admin.php:2174 -msgid "Manage Additional Features" -msgstr "Manage additional features" - #: mod/contacts.php:137 #, php-format msgid "%d contact edited." @@ -7398,6 +5980,10 @@ msgstr "%s is sharing with you" msgid "Private communications are not available for this contact." msgstr "Private communications are not available for this contact." +#: mod/contacts.php:541 mod/admin.php:984 +msgid "Never" +msgstr "Never" + #: mod/contacts.php:545 msgid "(Update was successful)" msgstr "(Update was successful)" @@ -7423,6 +6009,10 @@ msgstr "Communications lost with this contact!" msgid "Fetch further information for feeds" msgstr "Fetch further information for feeds" +#: mod/contacts.php:568 mod/admin.php:993 +msgid "Disabled" +msgstr "Disabled" + #: mod/contacts.php:568 msgid "Fetch information" msgstr "Fetch information" @@ -7482,6 +6072,16 @@ msgstr "Update public posts" msgid "Update now" msgstr "Update now" +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1516 +msgid "Unblock" +msgstr "Unblock" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1515 +msgid "Block" +msgstr "Block" + #: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 msgid "Unignore" msgstr "Unignore" @@ -7641,6 +6241,18 @@ msgstr "Toggle archive status" msgid "Delete contact" msgstr "Delete contact" +#: mod/ping.php:274 +msgid "{0} wants to be your friend" +msgstr "{0} wants to be your friend" + +#: mod/ping.php:289 +msgid "{0} sent you a message" +msgstr "{0} sent you a message" + +#: mod/ping.php:304 +msgid "{0} requested registration" +msgstr "{0} requested registration" + #: mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." msgstr "Image uploaded but image cropping failed." @@ -8000,6 +6612,1394 @@ msgstr "Contact information and other social networks:" msgid "Edit/Manage Profiles" msgstr "Edit/Manage Profiles" +#: mod/admin.php:97 +msgid "Theme settings updated." +msgstr "Theme settings updated." + +#: mod/admin.php:166 mod/admin.php:1060 +msgid "Site" +msgstr "Site" + +#: mod/admin.php:167 mod/admin.php:994 mod/admin.php:1504 mod/admin.php:1520 +msgid "Users" +msgstr "Users" + +#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76 +msgid "Plugins" +msgstr "Plugins" + +#: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 +msgid "Themes" +msgstr "Theme selection" + +#: mod/admin.php:170 mod/settings.php:54 +msgid "Additional features" +msgstr "Additional features" + +#: mod/admin.php:171 +msgid "DB updates" +msgstr "DB updates" + +#: mod/admin.php:172 mod/admin.php:513 +msgid "Inspect Queue" +msgstr "Inspect queue" + +#: mod/admin.php:173 mod/admin.php:289 +msgid "Server Blocklist" +msgstr "Server blocklist" + +#: mod/admin.php:174 mod/admin.php:479 +msgid "Federation Statistics" +msgstr "Federation statistics" + +#: mod/admin.php:188 mod/admin.php:199 mod/admin.php:2022 +msgid "Logs" +msgstr "Logs" + +#: mod/admin.php:189 mod/admin.php:2090 +msgid "View Logs" +msgstr "View logs" + +#: mod/admin.php:190 +msgid "probe address" +msgstr "Probe address" + +#: mod/admin.php:191 +msgid "check webfinger" +msgstr "Check webfinger" + +#: mod/admin.php:198 +msgid "Plugin Features" +msgstr "Plugin Features" + +#: mod/admin.php:200 +msgid "diagnostics" +msgstr "Diagnostics" + +#: mod/admin.php:201 +msgid "User registrations waiting for confirmation" +msgstr "User registrations awaiting confirmation" + +#: mod/admin.php:280 +msgid "The blocked domain" +msgstr "Blocked domain" + +#: mod/admin.php:281 mod/admin.php:294 +msgid "The reason why you blocked this domain." +msgstr "Reason why you blocked this domain." + +#: mod/admin.php:282 +msgid "Delete domain" +msgstr "Delete domain" + +#: mod/admin.php:282 +msgid "Check to delete this entry from the blocklist" +msgstr "Check to delete this entry from the blocklist" + +#: mod/admin.php:288 mod/admin.php:478 mod/admin.php:512 mod/admin.php:592 +#: mod/admin.php:1059 mod/admin.php:1503 mod/admin.php:1621 mod/admin.php:1684 +#: mod/admin.php:1897 mod/admin.php:1947 mod/admin.php:2021 mod/admin.php:2089 +msgid "Administration" +msgstr "Administration" + +#: mod/admin.php:290 +msgid "" +"This page can be used to define a black list of servers from the federated " +"network that are not allowed to interact with your node. For all entered " +"domains you should also give a reason why you have blocked the remote " +"server." +msgstr "This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server." + +#: mod/admin.php:291 +msgid "" +"The list of blocked servers will be made publically available on the " +"/friendica page so that your users and people investigating communication " +"problems can find the reason easily." +msgstr "The list of blocked servers will publicly available on the Friendica page so that your users and people investigating communication problems can readily find the reason." + +#: mod/admin.php:292 +msgid "Add new entry to block list" +msgstr "Add new entry to block list" + +#: mod/admin.php:293 +msgid "Server Domain" +msgstr "Server domain" + +#: mod/admin.php:293 +msgid "" +"The domain of the new server to add to the block list. Do not include the " +"protocol." +msgstr "The domain of the new server to add to the block list. Do not include the protocol." + +#: mod/admin.php:294 +msgid "Block reason" +msgstr "Block reason" + +#: mod/admin.php:295 +msgid "Add Entry" +msgstr "Add entry" + +#: mod/admin.php:296 +msgid "Save changes to the blocklist" +msgstr "Save changes to the blocklist" + +#: mod/admin.php:297 +msgid "Current Entries in the Blocklist" +msgstr "Current entries in the blocklist" + +#: mod/admin.php:300 +msgid "Delete entry from blocklist" +msgstr "Delete entry from blocklist" + +#: mod/admin.php:303 +msgid "Delete entry from blocklist?" +msgstr "Delete entry from blocklist?" + +#: mod/admin.php:328 +msgid "Server added to blocklist." +msgstr "Server added to blocklist." + +#: mod/admin.php:344 +msgid "Site blocklist updated." +msgstr "Site blocklist updated." + +#: mod/admin.php:409 +msgid "unknown" +msgstr "unknown" + +#: mod/admin.php:472 +msgid "" +"This page offers you some numbers to the known part of the federated social " +"network your Friendica node is part of. These numbers are not complete but " +"only reflect the part of the network your node is aware of." +msgstr "This page offers you the amount of known part of the federated social network your Friendica node is part of. These numbers are not complete and only reflect the part of the network your node is aware of." + +#: mod/admin.php:473 +msgid "" +"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it " +"will improve the data displayed here." +msgstr "The <em>Auto Discovered Contact Directory</em> feature is not enabled; enabling it will improve the data displayed here." + +#: mod/admin.php:485 +#, php-format +msgid "Currently this node is aware of %d nodes from the following platforms:" +msgstr "Currently this node is aware of %d nodes from the following platforms:" + +#: mod/admin.php:515 +msgid "ID" +msgstr "ID" + +#: mod/admin.php:516 +msgid "Recipient Name" +msgstr "Recipient name" + +#: mod/admin.php:517 +msgid "Recipient Profile" +msgstr "Recipient profile" + +#: mod/admin.php:519 +msgid "Created" +msgstr "Created" + +#: mod/admin.php:520 +msgid "Last Tried" +msgstr "Last Tried" + +#: mod/admin.php:521 +msgid "" +"This page lists the content of the queue for outgoing postings. These are " +"postings the initial delivery failed for. They will be resend later and " +"eventually deleted if the delivery fails permanently." +msgstr "This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently." + +#: mod/admin.php:546 +#, php-format +msgid "" +"Your DB still runs with MyISAM tables. You should change the engine type to " +"InnoDB. As Friendica will use InnoDB only features in the future, you should" +" change this! See <a href=\"%s\">here</a> for a guide that may be helpful " +"converting the table engines. You may also use the command <tt>php " +"include/dbstructure.php toinnodb</tt> of your Friendica installation for an " +"automatic conversion.<br />" +msgstr "Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />" + +#: mod/admin.php:555 +msgid "" +"The database update failed. Please run \"php include/dbstructure.php " +"update\" from the command line and have a look at the errors that might " +"appear." +msgstr "The database update failed. Please run 'php include/dbstructure.php update' from the command line and have a look at the errors that might appear." + +#: mod/admin.php:560 mod/admin.php:1453 +msgid "Normal Account" +msgstr "Standard account" + +#: mod/admin.php:561 mod/admin.php:1454 +msgid "Soapbox Account" +msgstr "Soapbox account" + +#: mod/admin.php:562 mod/admin.php:1455 +msgid "Community/Celebrity Account" +msgstr "Community/Celebrity account" + +#: mod/admin.php:563 mod/admin.php:1456 +msgid "Automatic Friend Account" +msgstr "Automatic friend account" + +#: mod/admin.php:564 +msgid "Blog Account" +msgstr "Blog account" + +#: mod/admin.php:565 +msgid "Private Forum" +msgstr "Private forum" + +#: mod/admin.php:587 +msgid "Message queues" +msgstr "Message queues" + +#: mod/admin.php:593 +msgid "Summary" +msgstr "Summary" + +#: mod/admin.php:595 +msgid "Registered users" +msgstr "Registered users" + +#: mod/admin.php:597 +msgid "Pending registrations" +msgstr "Pending registrations" + +#: mod/admin.php:598 +msgid "Version" +msgstr "Version" + +#: mod/admin.php:603 +msgid "Active plugins" +msgstr "Active plugins" + +#: mod/admin.php:628 +msgid "Can not parse base url. Must have at least <scheme>://<domain>" +msgstr "Can not parse base URL. Must have at least <scheme>://<domain>" + +#: mod/admin.php:920 +msgid "Site settings updated." +msgstr "Site settings updated." + +#: mod/admin.php:948 mod/settings.php:944 +msgid "No special theme for mobile devices" +msgstr "No special theme for mobile devices" + +#: mod/admin.php:977 +msgid "No community page" +msgstr "No community page" + +#: mod/admin.php:978 +msgid "Public postings from users of this site" +msgstr "Public postings from users of this site" + +#: mod/admin.php:979 +msgid "Global community page" +msgstr "Global community page" + +#: mod/admin.php:985 +msgid "At post arrival" +msgstr "At post arrival" + +#: mod/admin.php:995 +msgid "Users, Global Contacts" +msgstr "Users, Global Contacts" + +#: mod/admin.php:996 +msgid "Users, Global Contacts/fallback" +msgstr "Users, Global Contacts/fallback" + +#: mod/admin.php:1000 +msgid "One month" +msgstr "One month" + +#: mod/admin.php:1001 +msgid "Three months" +msgstr "Three months" + +#: mod/admin.php:1002 +msgid "Half a year" +msgstr "Half a year" + +#: mod/admin.php:1003 +msgid "One year" +msgstr "One a year" + +#: mod/admin.php:1008 +msgid "Multi user instance" +msgstr "Multi user instance" + +#: mod/admin.php:1031 +msgid "Closed" +msgstr "Closed" + +#: mod/admin.php:1032 +msgid "Requires approval" +msgstr "Requires approval" + +#: mod/admin.php:1033 +msgid "Open" +msgstr "Open" + +#: mod/admin.php:1037 +msgid "No SSL policy, links will track page SSL state" +msgstr "No SSL policy, links will track page SSL state" + +#: mod/admin.php:1038 +msgid "Force all links to use SSL" +msgstr "Force all links to use SSL" + +#: mod/admin.php:1039 +msgid "Self-signed certificate, use SSL for local links only (discouraged)" +msgstr "Self-signed certificate, use SSL for local links only (discouraged)" + +#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 +#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793 +#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006 +#: mod/settings.php:1272 +msgid "Save Settings" +msgstr "Save settings" + +#: mod/admin.php:1063 +msgid "File upload" +msgstr "File upload" + +#: mod/admin.php:1064 +msgid "Policies" +msgstr "Policies" + +#: mod/admin.php:1066 +msgid "Auto Discovered Contact Directory" +msgstr "Auto-discovered contact directory" + +#: mod/admin.php:1067 +msgid "Performance" +msgstr "Performance" + +#: mod/admin.php:1068 +msgid "Worker" +msgstr "Worker" + +#: mod/admin.php:1069 +msgid "" +"Relocate - WARNING: advanced function. Could make this server unreachable." +msgstr "Relocate - Warning, advanced function: This could make this server unreachable." + +#: mod/admin.php:1072 +msgid "Site name" +msgstr "Site name" + +#: mod/admin.php:1073 +msgid "Host name" +msgstr "Host name" + +#: mod/admin.php:1074 +msgid "Sender Email" +msgstr "Sender email" + +#: mod/admin.php:1074 +msgid "" +"The email address your server shall use to send notification emails from." +msgstr "The email address your server shall use to send notification emails from." + +#: mod/admin.php:1075 +msgid "Banner/Logo" +msgstr "Banner/Logo" + +#: mod/admin.php:1076 +msgid "Shortcut icon" +msgstr "Shortcut icon" + +#: mod/admin.php:1076 +msgid "Link to an icon that will be used for browsers." +msgstr "Link to an icon that will be used for browsers." + +#: mod/admin.php:1077 +msgid "Touch icon" +msgstr "Touch icon" + +#: mod/admin.php:1077 +msgid "Link to an icon that will be used for tablets and mobiles." +msgstr "Link to an icon that will be used for tablets and mobiles." + +#: mod/admin.php:1078 +msgid "Additional Info" +msgstr "Additional Info" + +#: mod/admin.php:1078 +#, php-format +msgid "" +"For public servers: you can add additional information here that will be " +"listed at %s/siteinfo." +msgstr "For public servers: add additional information here that will be listed at %s/siteinfo." + +#: mod/admin.php:1079 +msgid "System language" +msgstr "System language" + +#: mod/admin.php:1080 +msgid "System theme" +msgstr "System theme" + +#: mod/admin.php:1080 +msgid "" +"Default system theme - may be over-ridden by user profiles - <a href='#' " +"id='cnftheme'>change theme settings</a>" +msgstr "Default system theme - may be overridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>" + +#: mod/admin.php:1081 +msgid "Mobile system theme" +msgstr "Mobile system theme" + +#: mod/admin.php:1081 +msgid "Theme for mobile devices" +msgstr "Theme for mobile devices" + +#: mod/admin.php:1082 +msgid "SSL link policy" +msgstr "SSL link policy" + +#: mod/admin.php:1082 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "Determines whether generated links should be forced to use SSL" + +#: mod/admin.php:1083 +msgid "Force SSL" +msgstr "Force SSL" + +#: mod/admin.php:1083 +msgid "" +"Force all Non-SSL requests to SSL - Attention: on some systems it could lead" +" to endless loops." +msgstr "Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops." + +#: mod/admin.php:1084 +msgid "Hide help entry from navigation menu" +msgstr "Hide help entry from navigation menu" + +#: mod/admin.php:1084 +msgid "" +"Hides the menu entry for the Help pages from the navigation menu. You can " +"still access it calling /help directly." +msgstr "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL." + +#: mod/admin.php:1085 +msgid "Single user instance" +msgstr "Single user instance" + +#: mod/admin.php:1085 +msgid "Make this instance multi-user or single-user for the named user" +msgstr "Make this instance multi-user or single-user for the named user" + +#: mod/admin.php:1086 +msgid "Maximum image size" +msgstr "Maximum image size" + +#: mod/admin.php:1086 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "Maximum size in bytes of uploaded images. Default is 0, which means no limits." + +#: mod/admin.php:1087 +msgid "Maximum image length" +msgstr "Maximum image length" + +#: mod/admin.php:1087 +msgid "" +"Maximum length in pixels of the longest side of uploaded images. Default is " +"-1, which means no limits." +msgstr "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits." + +#: mod/admin.php:1088 +msgid "JPEG image quality" +msgstr "JPEG image quality" + +#: mod/admin.php:1088 +msgid "" +"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " +"100, which is full quality." +msgstr "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is the original quality level." + +#: mod/admin.php:1090 +msgid "Register policy" +msgstr "Registration policy" + +#: mod/admin.php:1091 +msgid "Maximum Daily Registrations" +msgstr "Maximum daily registrations" + +#: mod/admin.php:1091 +msgid "" +"If registration is permitted above, this sets the maximum number of new user" +" registrations to accept per day. If register is set to closed, this " +"setting has no effect." +msgstr "If open registration is permitted, this sets the maximum number of new registrations per day. This setting has no effect for registrations by approval." + +#: mod/admin.php:1092 +msgid "Register text" +msgstr "Registration text" + +#: mod/admin.php:1092 +msgid "Will be displayed prominently on the registration page." +msgstr "Will be displayed prominently on the registration page." + +#: mod/admin.php:1093 +msgid "Accounts abandoned after x days" +msgstr "Accounts abandoned after so many days" + +#: mod/admin.php:1093 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit." + +#: mod/admin.php:1094 +msgid "Allowed friend domains" +msgstr "Allowed friend domains" + +#: mod/admin.php:1094 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains" + +#: mod/admin.php:1095 +msgid "Allowed email domains" +msgstr "Allowed email domains" + +#: mod/admin.php:1095 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains" + +#: mod/admin.php:1096 +msgid "Block public" +msgstr "Block public" + +#: mod/admin.php:1096 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently logged in." +msgstr "Block public access to all otherwise public personal pages on this site, except for local users when logged in." + +#: mod/admin.php:1097 +msgid "Force publish" +msgstr "Mandatory directory listing" + +#: mod/admin.php:1097 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "Force all profiles on this site to be listed in the site directory." + +#: mod/admin.php:1098 +msgid "Global directory URL" +msgstr "Global directory URL" + +#: mod/admin.php:1098 +msgid "" +"URL to the global directory. If this is not set, the global directory is " +"completely unavailable to the application." +msgstr "URL to the global directory: If this is not set, the global directory is completely unavailable to the application." + +#: mod/admin.php:1099 +msgid "Allow threaded items" +msgstr "Allow threaded items" + +#: mod/admin.php:1099 +msgid "Allow infinite level threading for items on this site." +msgstr "Allow infinite levels of threading for items on this site." + +#: mod/admin.php:1100 +msgid "Private posts by default for new users" +msgstr "Private posts by default for new users" + +#: mod/admin.php:1100 +msgid "" +"Set default post permissions for all new members to the default privacy " +"group rather than public." +msgstr "Set default post permissions for all new members to the default privacy group rather than public." + +#: mod/admin.php:1101 +msgid "Don't include post content in email notifications" +msgstr "Don't include post content in email notifications" + +#: mod/admin.php:1101 +msgid "" +"Don't include the content of a post/comment/private message/etc. in the " +"email notifications that are sent out from this site, as a privacy measure." +msgstr "Don't include the content of a post/comment/private message in the email notifications sent from this site, as a privacy measure." + +#: mod/admin.php:1102 +msgid "Disallow public access to addons listed in the apps menu." +msgstr "Disallow public access to addons listed in the apps menu." + +#: mod/admin.php:1102 +msgid "" +"Checking this box will restrict addons listed in the apps menu to members " +"only." +msgstr "Checking this box will restrict addons listed in the apps menu to members only." + +#: mod/admin.php:1103 +msgid "Don't embed private images in posts" +msgstr "Don't embed private images in posts" + +#: mod/admin.php:1103 +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 "Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while." + +#: mod/admin.php:1104 +msgid "Allow Users to set remote_self" +msgstr "Allow users to set \"Remote self\"" + +#: mod/admin.php:1104 +msgid "" +"With checking this, every user is allowed to mark every contact as a " +"remote_self in the repair contact dialog. Setting this flag on a contact " +"causes mirroring every posting of that contact in the users stream." +msgstr "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream." + +#: mod/admin.php:1105 +msgid "Block multiple registrations" +msgstr "Block multiple registrations" + +#: mod/admin.php:1105 +msgid "Disallow users to register additional accounts for use as pages." +msgstr "Disallow users to sign up for additional accounts." + +#: mod/admin.php:1106 +msgid "OpenID support" +msgstr "OpenID support" + +#: mod/admin.php:1106 +msgid "OpenID support for registration and logins." +msgstr "OpenID support for registration and logins." + +#: mod/admin.php:1107 +msgid "Fullname check" +msgstr "Full name check" + +#: mod/admin.php:1107 +msgid "" +"Force users to register with a space between firstname and lastname in Full " +"name, as an antispam measure" +msgstr "Force users to sign up with a space between first name and last name in the full name field; it may reduce spam and abuse registrations." + +#: mod/admin.php:1108 +msgid "Community Page Style" +msgstr "Community page style" + +#: mod/admin.php:1108 +msgid "" +"Type of community page to show. 'Global community' shows every public " +"posting from an open distributed network that arrived on this server." +msgstr "Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server." + +#: mod/admin.php:1109 +msgid "Posts per user on community page" +msgstr "Posts per user on community page" + +#: mod/admin.php:1109 +msgid "" +"The maximum number of posts per user on the community page. (Not valid for " +"'Global Community')" +msgstr "Maximum number of posts per user on the community page (not valid for 'Global Community')." + +#: mod/admin.php:1110 +msgid "Enable OStatus support" +msgstr "Enable OStatus support" + +#: mod/admin.php:1110 +msgid "" +"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " +"communications in OStatus are public, so privacy warnings will be " +"occasionally displayed." +msgstr "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed." + +#: mod/admin.php:1111 +msgid "OStatus conversation completion interval" +msgstr "OStatus conversation completion interval" + +#: mod/admin.php:1111 +msgid "" +"How often shall the poller check for new entries in OStatus conversations? " +"This can be a very ressource task." +msgstr "How often shall the poller check for new entries in OStatus conversations? This can be rather resources consuming." + +#: mod/admin.php:1112 +msgid "Only import OStatus threads from our contacts" +msgstr "Only import OStatus threads from known contacts" + +#: mod/admin.php:1112 +msgid "" +"Normally we import every content from our OStatus contacts. With this option" +" we only store threads that are started by a contact that is known on our " +"system." +msgstr "Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system." + +#: mod/admin.php:1113 +msgid "OStatus support can only be enabled if threading is enabled." +msgstr "OStatus support can only be enabled if threading is enabled." + +#: mod/admin.php:1115 +msgid "" +"Diaspora support can't be enabled because Friendica was installed into a sub" +" directory." +msgstr "Diaspora support can't be enabled because Friendica was installed into a sub directory." + +#: mod/admin.php:1116 +msgid "Enable Diaspora support" +msgstr "Enable Diaspora support" + +#: mod/admin.php:1116 +msgid "Provide built-in Diaspora network compatibility." +msgstr "Provide built-in Diaspora network compatibility." + +#: mod/admin.php:1117 +msgid "Only allow Friendica contacts" +msgstr "Only allow Friendica contacts" + +#: mod/admin.php:1117 +msgid "" +"All contacts must use Friendica protocols. All other built-in communication " +"protocols disabled." +msgstr "All contacts must use Friendica protocols. All other built-in communication protocols will be disabled." + +#: mod/admin.php:1118 +msgid "Verify SSL" +msgstr "Verify SSL" + +#: mod/admin.php:1118 +msgid "" +"If you wish, you can turn on strict certificate checking. This will mean you" +" cannot connect (at all) to self-signed SSL sites." +msgstr "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites." + +#: mod/admin.php:1119 +msgid "Proxy user" +msgstr "Proxy user" + +#: mod/admin.php:1120 +msgid "Proxy URL" +msgstr "Proxy URL" + +#: mod/admin.php:1121 +msgid "Network timeout" +msgstr "Network timeout" + +#: mod/admin.php:1121 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "Value is in seconds. Set to 0 for unlimited (not recommended)." + +#: mod/admin.php:1122 +msgid "Maximum Load Average" +msgstr "Maximum load average" + +#: mod/admin.php:1122 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "Maximum system load before delivery and poll processes are deferred (default 50)." + +#: mod/admin.php:1123 +msgid "Maximum Load Average (Frontend)" +msgstr "Maximum load average (frontend)" + +#: mod/admin.php:1123 +msgid "Maximum system load before the frontend quits service - default 50." +msgstr "Maximum system load before the frontend quits service (default 50)." + +#: mod/admin.php:1124 +msgid "Minimal Memory" +msgstr "Minimal memory" + +#: mod/admin.php:1124 +msgid "" +"Minimal free memory in MB for the poller. Needs access to /proc/meminfo - " +"default 0 (deactivated)." +msgstr "Minimal free memory in MB for the poller. Needs access to /proc/meminfo (default 0 - deactivated)." + +#: mod/admin.php:1125 +msgid "Maximum table size for optimization" +msgstr "Maximum table size for optimization" + +#: mod/admin.php:1125 +msgid "" +"Maximum table size (in MB) for the automatic optimization - default 100 MB. " +"Enter -1 to disable it." +msgstr "Maximum table size (in MB) for the automatic optimization (default 100 MB; -1 to deactivate)." + +#: mod/admin.php:1126 +msgid "Minimum level of fragmentation" +msgstr "Minimum level of fragmentation" + +#: mod/admin.php:1126 +msgid "" +"Minimum fragmenation level to start the automatic optimization - default " +"value is 30%." +msgstr "Minimum fragmentation level to start the automatic optimization (default 30%)." + +#: mod/admin.php:1128 +msgid "Periodical check of global contacts" +msgstr "Periodical check of global contacts" + +#: mod/admin.php:1128 +msgid "" +"If enabled, the global contacts are checked periodically for missing or " +"outdated data and the vitality of the contacts and servers." +msgstr "This checks global contacts periodically for missing or outdated data and the vitality of the contacts and servers." + +#: mod/admin.php:1129 +msgid "Days between requery" +msgstr "Days between enquiry" + +#: mod/admin.php:1129 +msgid "Number of days after which a server is requeried for his contacts." +msgstr "Number of days after which a server is required check contacts." + +#: mod/admin.php:1130 +msgid "Discover contacts from other servers" +msgstr "Discover contacts from other servers" + +#: mod/admin.php:1130 +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 "Periodically query other servers for contacts. You can choose between 'Users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older Friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommend setting is 'Users, Global Contacts'." + +#: mod/admin.php:1131 +msgid "Timeframe for fetching global contacts" +msgstr "Time-frame for fetching global contacts" + +#: mod/admin.php:1131 +msgid "" +"When the discovery is activated, this value defines the timeframe for the " +"activity of the global contacts that are fetched from other servers." +msgstr "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers." + +#: mod/admin.php:1132 +msgid "Search the local directory" +msgstr "Search the local directory" + +#: mod/admin.php:1132 +msgid "" +"Search the local directory instead of the global directory. When searching " +"locally, every search will be executed on the global directory in the " +"background. This improves the search results when the search is repeated." +msgstr "Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated." + +#: mod/admin.php:1134 +msgid "Publish server information" +msgstr "Publish server information" + +#: mod/admin.php:1134 +msgid "" +"If enabled, general server and usage data will be published. The data " +"contains the name and version of the server, number of users with public " +"profiles, number of posts and the activated protocols and connectors. See <a" +" href='http://the-federation.info/'>the-federation.info</a> for details." +msgstr "This publishes generic data about the server and its usage. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details." + +#: mod/admin.php:1136 +msgid "Suppress Tags" +msgstr "Suppress tags" + +#: mod/admin.php:1136 +msgid "Suppress showing a list of hashtags at the end of the posting." +msgstr "Suppress listed hashtags at the end of posts." + +#: mod/admin.php:1137 +msgid "Path to item cache" +msgstr "Path to item cache" + +#: mod/admin.php:1137 +msgid "The item caches buffers generated bbcode and external images." +msgstr "The item caches buffers generated bbcode and external images." + +#: mod/admin.php:1138 +msgid "Cache duration in seconds" +msgstr "Cache duration in seconds" + +#: mod/admin.php:1138 +msgid "" +"How long should the cache files be hold? Default value is 86400 seconds (One" +" day). To disable the item cache, set the value to -1." +msgstr "How long should cache files be held? (Default 86400 seconds - one day; -1 disables item cache)" + +#: mod/admin.php:1139 +msgid "Maximum numbers of comments per post" +msgstr "Maximum numbers of comments per post" + +#: mod/admin.php:1139 +msgid "How much comments should be shown for each post? Default value is 100." +msgstr "How many comments should be shown for each post? (Default 100)" + +#: mod/admin.php:1140 +msgid "Temp path" +msgstr "Temp path" + +#: mod/admin.php:1140 +msgid "" +"If you have a restricted system where the webserver can't access the system " +"temp path, enter another path here." +msgstr "Enter a different tmp path, if your system restricts the webserver's access to the system temp path." + +#: mod/admin.php:1141 +msgid "Base path to installation" +msgstr "Base path to installation" + +#: mod/admin.php:1141 +msgid "" +"If the system cannot detect the correct path to your installation, enter the" +" correct path here. This setting should only be set if you are using a " +"restricted system and symbolic links to your webroot." +msgstr "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot." + +#: mod/admin.php:1142 +msgid "Disable picture proxy" +msgstr "Disable picture proxy" + +#: mod/admin.php:1142 +msgid "" +"The picture proxy increases performance and privacy. It shouldn't be used on" +" systems with very low bandwith." +msgstr "The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith." + +#: mod/admin.php:1143 +msgid "Only search in tags" +msgstr "Only search in tags" + +#: mod/admin.php:1143 +msgid "On large systems the text search can slow down the system extremely." +msgstr "On large systems the text search can slow down the system significantly." + +#: mod/admin.php:1145 +msgid "New base url" +msgstr "New base URL" + +#: mod/admin.php:1145 +msgid "" +"Change base url for this server. Sends relocate message to all DFRN contacts" +" of all users." +msgstr "Change base URL for this server. Sends relocate message to all DFRN contacts of all users." + +#: mod/admin.php:1147 +msgid "RINO Encryption" +msgstr "RINO Encryption" + +#: mod/admin.php:1147 +msgid "Encryption layer between nodes." +msgstr "Encryption layer between nodes." + +#: mod/admin.php:1149 +msgid "Maximum number of parallel workers" +msgstr "Maximum number of parallel workers" + +#: mod/admin.php:1149 +msgid "" +"On shared hosters set this to 2. On larger systems, values of 10 are great. " +"Default value is 4." +msgstr "On shared hosts set this to 2. On larger systems, values of 10 are great. Default value is 4." + +#: mod/admin.php:1150 +msgid "Don't use 'proc_open' with the worker" +msgstr "Don't use 'proc_open' with the worker" + +#: mod/admin.php:1150 +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 "Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosts. If this is enabled you should increase the frequency of poller calls in your crontab." + +#: mod/admin.php:1151 +msgid "Enable fastlane" +msgstr "Enable fast-lane" + +#: mod/admin.php:1151 +msgid "" +"When enabed, the fastlane mechanism starts an additional worker if processes" +" with higher priority are blocked by processes of lower priority." +msgstr "The fast-lane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority." + +#: mod/admin.php:1152 +msgid "Enable frontend worker" +msgstr "Enable frontend worker" + +#: mod/admin.php:1152 +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 "If enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this." + +#: mod/admin.php:1182 +msgid "Update has been marked successful" +msgstr "Update has been marked successful" + +#: mod/admin.php:1190 +#, php-format +msgid "Database structure update %s was successfully applied." +msgstr "Database structure update %s was successfully applied." + +#: mod/admin.php:1193 +#, php-format +msgid "Executing of database structure update %s failed with error: %s" +msgstr "Executing of database structure update %s failed with error: %s" + +#: mod/admin.php:1207 +#, php-format +msgid "Executing %s failed with error: %s" +msgstr "Executing %s failed with error: %s" + +#: mod/admin.php:1210 +#, php-format +msgid "Update %s was successfully applied." +msgstr "Update %s was successfully applied." + +#: mod/admin.php:1213 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "Update %s did not return a status. Unknown if it succeeded." + +#: mod/admin.php:1216 +#, php-format +msgid "There was no additional update function %s that needed to be called." +msgstr "There was no additional update function %s that needed to be called." + +#: mod/admin.php:1236 +msgid "No failed updates." +msgstr "No failed updates." + +#: mod/admin.php:1237 +msgid "Check database structure" +msgstr "Check database structure" + +#: mod/admin.php:1242 +msgid "Failed Updates" +msgstr "Failed updates" + +#: mod/admin.php:1243 +msgid "" +"This does not include updates prior to 1139, which did not return a status." +msgstr "This does not include updates prior to 1139, which did not return a status." + +#: mod/admin.php:1244 +msgid "Mark success (if update was manually applied)" +msgstr "Mark success (if update was manually applied)" + +#: mod/admin.php:1245 +msgid "Attempt to execute this update step automatically" +msgstr "Attempt to execute this update step automatically" + +#: mod/admin.php:1279 +#, php-format +msgid "" +"\n" +"\t\t\tDear %1$s,\n" +"\t\t\t\tthe administrator of %2$s has set up an account for you." +msgstr "\n\t\t\tDear %1$s,\n\t\t\t\tThe administrator of %2$s has set up an account for you." + +#: mod/admin.php:1282 +#, 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 "\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, this may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4$s." + +#: mod/admin.php:1326 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "%s user blocked/unblocked" +msgstr[1] "%s users blocked/unblocked" + +#: mod/admin.php:1333 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "%s user deleted" +msgstr[1] "%s users deleted" + +#: mod/admin.php:1380 +#, php-format +msgid "User '%s' deleted" +msgstr "User '%s' deleted" + +#: mod/admin.php:1388 +#, php-format +msgid "User '%s' unblocked" +msgstr "User '%s' unblocked" + +#: mod/admin.php:1388 +#, php-format +msgid "User '%s' blocked" +msgstr "User '%s' blocked" + +#: mod/admin.php:1496 mod/admin.php:1522 +msgid "Register date" +msgstr "Registration date" + +#: mod/admin.php:1496 mod/admin.php:1522 +msgid "Last login" +msgstr "Last login" + +#: mod/admin.php:1496 mod/admin.php:1522 +msgid "Last item" +msgstr "Last item" + +#: mod/admin.php:1496 mod/settings.php:45 +msgid "Account" +msgstr "Account" + +#: mod/admin.php:1505 +msgid "Add User" +msgstr "Add user" + +#: mod/admin.php:1506 +msgid "select all" +msgstr "select all" + +#: mod/admin.php:1507 +msgid "User registrations waiting for confirm" +msgstr "User registrations awaiting confirmation" + +#: mod/admin.php:1508 +msgid "User waiting for permanent deletion" +msgstr "User awaiting permanent deletion" + +#: mod/admin.php:1509 +msgid "Request date" +msgstr "Request date" + +#: mod/admin.php:1510 +msgid "No registrations." +msgstr "No registrations." + +#: mod/admin.php:1511 +msgid "Note from the user" +msgstr "Note from the user" + +#: mod/admin.php:1513 +msgid "Deny" +msgstr "Deny" + +#: mod/admin.php:1517 +msgid "Site admin" +msgstr "Site admin" + +#: mod/admin.php:1518 +msgid "Account expired" +msgstr "Account expired" + +#: mod/admin.php:1521 +msgid "New User" +msgstr "New user" + +#: mod/admin.php:1522 +msgid "Deleted since" +msgstr "Deleted since" + +#: mod/admin.php:1527 +msgid "" +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "Selected users will be deleted!\\n\\nEverything these users has posted on this site will be permanently deleted!\\n\\nAre you sure?" + +#: mod/admin.php:1528 +msgid "" +"The user {0} will be deleted!\\n\\nEverything this user has posted on this " +"site will be permanently deleted!\\n\\nAre you sure?" +msgstr "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?" + +#: mod/admin.php:1538 +msgid "Name of the new user." +msgstr "Name of the new user." + +#: mod/admin.php:1539 +msgid "Nickname" +msgstr "Nickname" + +#: mod/admin.php:1539 +msgid "Nickname of the new user." +msgstr "Nickname of the new user." + +#: mod/admin.php:1540 +msgid "Email address of the new user." +msgstr "Email address of the new user." + +#: mod/admin.php:1583 +#, php-format +msgid "Plugin %s disabled." +msgstr "Plugin %s disabled." + +#: mod/admin.php:1587 +#, php-format +msgid "Plugin %s enabled." +msgstr "Plugin %s enabled." + +#: mod/admin.php:1598 mod/admin.php:1850 +msgid "Disable" +msgstr "Disable" + +#: mod/admin.php:1600 mod/admin.php:1852 +msgid "Enable" +msgstr "Enable" + +#: mod/admin.php:1623 mod/admin.php:1899 +msgid "Toggle" +msgstr "Toggle" + +#: mod/admin.php:1631 mod/admin.php:1908 +msgid "Author: " +msgstr "Author: " + +#: mod/admin.php:1632 mod/admin.php:1909 +msgid "Maintainer: " +msgstr "Maintainer: " + +#: mod/admin.php:1687 +msgid "Reload active plugins" +msgstr "Reload active plugins" + +#: mod/admin.php:1692 +#, php-format +msgid "" +"There are currently no plugins available on your node. You can find the " +"official plugin repository at %1$s and might find other interesting plugins " +"in the open plugin registry at %2$s" +msgstr "There are currently no plugins available on your node. You can find the official plugin repository at %1$s and might find other interesting plugins in the open plugin registry at %2$s" + +#: mod/admin.php:1811 +msgid "No themes found." +msgstr "No themes found." + +#: mod/admin.php:1890 +msgid "Screenshot" +msgstr "Screenshot" + +#: mod/admin.php:1950 +msgid "Reload active themes" +msgstr "Reload active themes" + +#: mod/admin.php:1955 +#, php-format +msgid "No themes found on the system. They should be paced in %1$s" +msgstr "No themes found on the system. They should be paced in %1$s" + +#: mod/admin.php:1956 +msgid "[Experimental]" +msgstr "[Experimental]" + +#: mod/admin.php:1957 +msgid "[Unsupported]" +msgstr "[Unsupported]" + +#: mod/admin.php:1981 +msgid "Log settings updated." +msgstr "Log settings updated." + +#: mod/admin.php:2013 +msgid "PHP log currently enabled." +msgstr "PHP log currently enabled." + +#: mod/admin.php:2015 +msgid "PHP log currently disabled." +msgstr "PHP log currently disabled." + +#: mod/admin.php:2024 +msgid "Clear" +msgstr "Clear" + +#: mod/admin.php:2029 +msgid "Enable Debugging" +msgstr "Enable debugging" + +#: mod/admin.php:2030 +msgid "Log file" +msgstr "Log file" + +#: mod/admin.php:2030 +msgid "" +"Must be writable by web server. Relative to your Friendica top-level " +"directory." +msgstr "Must be writable by web server and relative to your Friendica top-level directory." + +#: mod/admin.php:2031 +msgid "Log level" +msgstr "Log level" + +#: mod/admin.php:2034 +msgid "PHP logging" +msgstr "PHP logging" + +#: mod/admin.php:2035 +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 "To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The file name set in the 'error_log' line is relative to the Friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them." + +#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 +msgid "Off" +msgstr "Off" + +#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 +msgid "On" +msgstr "On" + +#: mod/admin.php:2166 +#, php-format +msgid "Lock feature %s" +msgstr "Lock feature %s" + +#: mod/admin.php:2174 +msgid "Manage Additional Features" +msgstr "Manage additional features" + #: mod/settings.php:62 msgid "Display" msgstr "Display" @@ -8371,73 +8371,82 @@ msgid "Personal Page" msgstr "Personal Page" #: mod/settings.php:1121 -msgid "This account is a regular personal profile" -msgstr "Regular personal profile" +msgid "Account for a personal profile." +msgstr "Account for a personal profile." #: mod/settings.php:1124 msgid "Organisation Page" msgstr "Organisation Page" #: mod/settings.php:1125 -msgid "This account is a profile for an organisation" -msgstr "Profile for an organisation" +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "Account for an organisation that automatically approves contact requests as \"Followers\"." #: mod/settings.php:1128 msgid "News Page" msgstr "News Page" #: mod/settings.php:1129 -msgid "This account is a news account/reflector" -msgstr "News reflector" +msgid "" +"Account for a news reflector that automatically approves contact requests as" +" \"Followers\"." +msgstr "Account for a news reflector that automatically approves contact requests as \"Followers\"." #: mod/settings.php:1132 msgid "Community Forum" msgstr "Community Forum" #: mod/settings.php:1133 -msgid "" -"This account is a community forum where people can discuss with each other" -msgstr "Discussion forum for community" +msgid "Account for community discussions." +msgstr "Account for community discussions." #: mod/settings.php:1136 msgid "Normal Account Page" msgstr "Standard" #: mod/settings.php:1137 -msgid "This account is a normal personal profile" -msgstr "Regular personal profile" +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"." #: mod/settings.php:1140 msgid "Soapbox Page" msgstr "Soapbox" #: mod/settings.php:1141 -msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "Automatically approves contact requests as followers" +msgid "" +"Account for a public profile that automatically approves contact requests as" +" \"Followers\"." +msgstr "Account for a public profile that automatically approves contact requests as \"Followers\"." #: mod/settings.php:1144 msgid "Public Forum" msgstr "Public forum" #: mod/settings.php:1145 -msgid "Automatically approve all contact requests" -msgstr "Automatically approve all contact requests" +msgid "Automatically approves all contact requests." +msgstr "Automatically approves all contact requests." #: mod/settings.php:1148 msgid "Automatic Friend Page" -msgstr "Popularity" +msgstr "Love-all" #: mod/settings.php:1149 -msgid "Automatically approve all connection/friend requests as friends" -msgstr "Automatically approves contact requests as friends" +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "Account for a popular profile that automatically approves contact requests as \"Friends\"." #: mod/settings.php:1152 msgid "Private Forum [Experimental]" msgstr "Private forum [Experimental]" #: mod/settings.php:1153 -msgid "Private forum - approved members only" -msgstr "Private forum - approved members only" +msgid "Requires manual approval of contact requests." +msgstr "Requires manual approval of contact requests." #: mod/settings.php:1164 msgid "OpenID:" @@ -8848,7 +8857,7 @@ msgstr "Posts font size" #: view/theme/quattro/config.php:76 msgid "Textareas font size" -msgstr "Textareas font size" +msgstr "Text areas font size" #: view/theme/vier/config.php:70 msgid "Comma separated list of helper forums" @@ -8862,7 +8871,7 @@ msgstr "Set style" msgid "Community Pages" msgstr "Community pages" -#: view/theme/vier/config.php:118 view/theme/vier/theme.php:151 +#: view/theme/vier/config.php:118 view/theme/vier/theme.php:143 msgid "Community Profiles" msgstr "Community profiles" @@ -8870,23 +8879,23 @@ msgstr "Community profiles" msgid "Help or @NewHere ?" msgstr "Help or @NewHere ?" -#: view/theme/vier/config.php:120 view/theme/vier/theme.php:392 +#: view/theme/vier/config.php:120 view/theme/vier/theme.php:384 msgid "Connect Services" msgstr "Connect services" -#: view/theme/vier/config.php:121 view/theme/vier/theme.php:199 +#: view/theme/vier/config.php:121 view/theme/vier/theme.php:191 msgid "Find Friends" msgstr "Find friends" -#: view/theme/vier/config.php:122 view/theme/vier/theme.php:181 +#: view/theme/vier/config.php:122 view/theme/vier/theme.php:173 msgid "Last users" msgstr "Last users" -#: view/theme/vier/theme.php:200 +#: view/theme/vier/theme.php:192 msgid "Local Directory" msgstr "Local directory" -#: view/theme/vier/theme.php:292 +#: view/theme/vier/theme.php:284 msgid "Quick Start" msgstr "Quick start" @@ -8902,43 +8911,43 @@ msgstr "Show fewer." msgid "toggle mobile" msgstr "Toggle mobile" -#: boot.php:726 +#: boot.php:733 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s failed. See error logs." -#: boot.php:838 +#: boot.php:845 msgid "Create a New Account" msgstr "Create a new account" -#: boot.php:866 +#: boot.php:873 msgid "Password: " msgstr "Password: " -#: boot.php:867 +#: boot.php:874 msgid "Remember me" msgstr "Remember me" -#: boot.php:870 +#: boot.php:877 msgid "Or login using OpenID: " msgstr "Or login with OpenID: " -#: boot.php:876 +#: boot.php:883 msgid "Forgot your password?" msgstr "Forgot your password?" -#: boot.php:879 +#: boot.php:886 msgid "Website Terms of Service" msgstr "Website Terms of Service" -#: boot.php:880 +#: boot.php:887 msgid "terms of service" msgstr "Terms of service" -#: boot.php:882 +#: boot.php:889 msgid "Website Privacy Policy" msgstr "Website Privacy Policy" -#: boot.php:883 +#: boot.php:890 msgid "privacy policy" msgstr "Privacy policy" diff --git a/view/lang/en-gb/strings.php b/view/lang/en-gb/strings.php index 2a4f0c5cb9..22521cd9ed 100644 --- a/view/lang/en-gb/strings.php +++ b/view/lang/en-gb/strings.php @@ -1,7 +1,7 @@ <?php -if(! function_exists("string_plural_select_en_GB")) { -function string_plural_select_en_GB($n){ +if(! function_exists("string_plural_select_en_gb")) { +function string_plural_select_en_gb($n){ return ($n != 1);; }} ; @@ -97,22 +97,6 @@ $a->strings["add"] = "add"; $a->strings["Forums"] = "Forums"; $a->strings["External link to forum"] = "External link to forum"; $a->strings["show more"] = "Show more..."; -$a->strings["System"] = "System"; -$a->strings["Network"] = "Network"; -$a->strings["Personal"] = "Personal"; -$a->strings["Home"] = "Home"; -$a->strings["Introductions"] = "Introductions"; -$a->strings["%s commented on %s's post"] = "%s commented on %s's post"; -$a->strings["%s created a new post"] = "%s posted something new"; -$a->strings["%s liked %s's post"] = "%s liked %s's post"; -$a->strings["%s disliked %s's post"] = "%s disliked %s's post"; -$a->strings["%s is attending %s's event"] = "%s is going to %s's event"; -$a->strings["%s is not attending %s's event"] = "%s is not going to %s's event"; -$a->strings["%s may attend %s's event"] = "%s may go to %s's event"; -$a->strings["%s is now friends with %s"] = "%s is now friends with %s"; -$a->strings["Friend Suggestion"] = "Friend suggestion"; -$a->strings["Friend/Connect Request"] = "Friend/Contact request"; -$a->strings["New Follower"] = "New follower"; $a->strings["Post to Email"] = "Post to email"; $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Connectors are disabled since \"%s\" is enabled."; $a->strings["Hide your profile details from unknown viewers?"] = "Hide profile details from unknown viewers?"; @@ -423,16 +407,16 @@ $a->strings["comment"] = array( ); $a->strings["post"] = "post"; $a->strings["Item filed"] = "Item filed"; -$a->strings["Drop Contact"] = "Drop contact"; -$a->strings["Organisation"] = "Organisation"; -$a->strings["News"] = "News"; -$a->strings["Forum"] = "Forum"; $a->strings["Image/photo"] = "Image/Photo"; $a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"; $a->strings["$1 wrote:"] = "$1 wrote:"; $a->strings["Encrypted content"] = "Encrypted content"; $a->strings["Invalid source protocol"] = "Invalid source protocol"; $a->strings["Invalid link protocol"] = "Invalid link protocol"; +$a->strings["Drop Contact"] = "Drop contact"; +$a->strings["Organisation"] = "Organisation"; +$a->strings["News"] = "News"; +$a->strings["Forum"] = "Forum"; $a->strings["Friendica Notification"] = "Friendica notification"; $a->strings["Thank You,"] = "Thank you"; $a->strings["%s Administrator"] = "%s Administrator"; @@ -512,8 +496,9 @@ $a->strings["Personal notes"] = "Personal notes"; $a->strings["Your personal notes"] = "My personal notes"; $a->strings["Login"] = "Login"; $a->strings["Sign in"] = "Sign in"; +$a->strings["Home"] = "Home"; $a->strings["Home Page"] = "Home page"; -$a->strings["Register"] = "Register"; +$a->strings["Register"] = "Sign up now >>"; $a->strings["Create an account"] = "Create account"; $a->strings["Help"] = "Help"; $a->strings["Help and documentation"] = "Help and documentation"; @@ -528,9 +513,11 @@ $a->strings["Directory"] = "Directory"; $a->strings["People directory"] = "People directory"; $a->strings["Information"] = "Information"; $a->strings["Information about this friendica instance"] = "Information about this Friendica instance"; +$a->strings["Network"] = "Network"; $a->strings["Conversations from your friends"] = "My friends' conversations"; $a->strings["Network Reset"] = "Network reset"; $a->strings["Load Network page with no filters"] = "Load network page without filters"; +$a->strings["Introductions"] = "Introductions"; $a->strings["Friend Requests"] = "Friend requests"; $a->strings["Notifications"] = "Notifications"; $a->strings["See all notifications"] = "See all notifications"; @@ -588,15 +575,87 @@ $a->strings["default"] = "default"; $a->strings["An error occurred creating your default profile. Please try again."] = "An error occurred creating your default profile. Please try again."; $a->strings["Friends"] = "Friends"; $a->strings["Profile Photos"] = "Profile photos"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending approval by the administrator.\n\t"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for signing up at %2\$s. Your account is pending approval by the administrator.\n\t"; $a->strings["Registration at %s"] = "Registration at %s"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for signing up at %2\$s. Your account has been created.\n\t"; $a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\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 for your account \"Settings\" 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 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, these settings may help to\n\t\tmake new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."; $a->strings["Registration details for %s"] = "Registration details for %s"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Cannot locate DNS info for database server '%s'"; +$a->strings["Click here to upgrade."] = "Click here to upgrade."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "This action exceeds the limits set by your subscription plan."; +$a->strings["This action is not available under your subscription plan."] = "This action is not available under your subscription plan."; +$a->strings["Male"] = "Male"; +$a->strings["Female"] = "Female"; +$a->strings["Currently Male"] = "Currently Male"; +$a->strings["Currently Female"] = "Currently Female"; +$a->strings["Mostly Male"] = "Mostly Male"; +$a->strings["Mostly Female"] = "Mostly Female"; +$a->strings["Transgender"] = "Transgender"; +$a->strings["Intersex"] = "Intersex"; +$a->strings["Transsexual"] = "Transsexual"; +$a->strings["Hermaphrodite"] = "Hermaphrodite"; +$a->strings["Neuter"] = "Neuter"; +$a->strings["Non-specific"] = "Non-specific"; +$a->strings["Other"] = "Other"; +$a->strings["Males"] = "Males"; +$a->strings["Females"] = "Females"; +$a->strings["Gay"] = "Gay"; +$a->strings["Lesbian"] = "Lesbian"; +$a->strings["No Preference"] = "No Preference"; +$a->strings["Bisexual"] = "Bisexual"; +$a->strings["Autosexual"] = "Auto-sexual"; +$a->strings["Abstinent"] = "Abstinent"; +$a->strings["Virgin"] = "Virgin"; +$a->strings["Deviant"] = "Deviant"; +$a->strings["Fetish"] = "Fetish"; +$a->strings["Oodles"] = "Oodles"; +$a->strings["Nonsexual"] = "Asexual"; +$a->strings["Single"] = "Single"; +$a->strings["Lonely"] = "Lonely"; +$a->strings["Available"] = "Available"; +$a->strings["Unavailable"] = "Unavailable"; +$a->strings["Has crush"] = "Having a crush"; +$a->strings["Infatuated"] = "Infatuated"; +$a->strings["Dating"] = "Dating"; +$a->strings["Unfaithful"] = "Unfaithful"; +$a->strings["Sex Addict"] = "Sex addict"; +$a->strings["Friends/Benefits"] = "Friends with benefits"; +$a->strings["Casual"] = "Casual"; +$a->strings["Engaged"] = "Engaged"; +$a->strings["Married"] = "Married"; +$a->strings["Imaginarily married"] = "Imaginarily married"; +$a->strings["Partners"] = "Partners"; +$a->strings["Cohabiting"] = "Cohabiting"; +$a->strings["Common law"] = "Common law spouse"; +$a->strings["Happy"] = "Happy"; +$a->strings["Not looking"] = "Not looking"; +$a->strings["Swinger"] = "Swinger"; +$a->strings["Betrayed"] = "Betrayed"; +$a->strings["Separated"] = "Separated"; +$a->strings["Unstable"] = "Unstable"; +$a->strings["Divorced"] = "Divorced"; +$a->strings["Imaginarily divorced"] = "Imaginarily divorced"; +$a->strings["Widowed"] = "Widowed"; +$a->strings["Uncertain"] = "Uncertain"; +$a->strings["It's complicated"] = "It's complicated"; +$a->strings["Don't care"] = "Don't care"; +$a->strings["Ask me"] = "Ask me"; +$a->strings["System"] = "System"; +$a->strings["Personal"] = "Personal"; +$a->strings["%s commented on %s's post"] = "%s commented on %s's post"; +$a->strings["%s created a new post"] = "%s posted something new"; +$a->strings["%s liked %s's post"] = "%s liked %s's post"; +$a->strings["%s disliked %s's post"] = "%s disliked %s's post"; +$a->strings["%s is attending %s's event"] = "%s is going to %s's event"; +$a->strings["%s is not attending %s's event"] = "%s is not going to %s's event"; +$a->strings["%s may attend %s's event"] = "%s may go to %s's event"; +$a->strings["%s is now friends with %s"] = "%s is now friends with %s"; +$a->strings["Friend Suggestion"] = "Friend suggestion"; +$a->strings["Friend/Connect Request"] = "Friend/Contact request"; +$a->strings["New Follower"] = "New follower"; $a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Daily posting limit of %d posts reached. This post was rejected."; $a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Weekly posting limit of %d posts reached. This post was rejected."; $a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Monthly posting limit of %d posts reached. This post was rejected."; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Cannot locate DNS info for database server '%s'"; $a->strings["There are no tables on MyISAM."] = "There are no tables on MyISAM."; $a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tThe Friendica 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\n might be invalid."; $a->strings["The error message is\n[pre]%s[/pre]"] = "The error message is\n[pre]%s[/pre]"; @@ -669,65 +728,6 @@ $a->strings["%s is now following %s."] = "%s is now following %s."; $a->strings["following"] = "following"; $a->strings["%s stopped following %s."] = "%s stopped following %s."; $a->strings["stopped following"] = "stopped following"; -$a->strings["Click here to upgrade."] = "Click here to upgrade."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "This action exceeds the limits set by your subscription plan."; -$a->strings["This action is not available under your subscription plan."] = "This action is not available under your subscription plan."; -$a->strings["Male"] = "Male"; -$a->strings["Female"] = "Female"; -$a->strings["Currently Male"] = "Currently Male"; -$a->strings["Currently Female"] = "Currently Female"; -$a->strings["Mostly Male"] = "Mostly Male"; -$a->strings["Mostly Female"] = "Mostly Female"; -$a->strings["Transgender"] = "Transgender"; -$a->strings["Intersex"] = "Intersex"; -$a->strings["Transsexual"] = "Transsexual"; -$a->strings["Hermaphrodite"] = "Hermaphrodite"; -$a->strings["Neuter"] = "Neuter"; -$a->strings["Non-specific"] = "Non-specific"; -$a->strings["Other"] = "Other"; -$a->strings["Males"] = "Males"; -$a->strings["Females"] = "Females"; -$a->strings["Gay"] = "Gay"; -$a->strings["Lesbian"] = "Lesbian"; -$a->strings["No Preference"] = "No Preference"; -$a->strings["Bisexual"] = "Bisexual"; -$a->strings["Autosexual"] = "Auto-sexual"; -$a->strings["Abstinent"] = "Abstinent"; -$a->strings["Virgin"] = "Virgin"; -$a->strings["Deviant"] = "Deviant"; -$a->strings["Fetish"] = "Fetish"; -$a->strings["Oodles"] = "Oodles"; -$a->strings["Nonsexual"] = "Asexual"; -$a->strings["Single"] = "Single"; -$a->strings["Lonely"] = "Lonely"; -$a->strings["Available"] = "Available"; -$a->strings["Unavailable"] = "Unavailable"; -$a->strings["Has crush"] = "Having a crush"; -$a->strings["Infatuated"] = "Infatuated"; -$a->strings["Dating"] = "Dating"; -$a->strings["Unfaithful"] = "Unfaithful"; -$a->strings["Sex Addict"] = "Sex addict"; -$a->strings["Friends/Benefits"] = "Friends with benefits"; -$a->strings["Casual"] = "Casual"; -$a->strings["Engaged"] = "Engaged"; -$a->strings["Married"] = "Married"; -$a->strings["Imaginarily married"] = "Imaginarily married"; -$a->strings["Partners"] = "Partners"; -$a->strings["Cohabiting"] = "Cohabiting"; -$a->strings["Common law"] = "Common law spouse"; -$a->strings["Happy"] = "Happy"; -$a->strings["Not looking"] = "Not looking"; -$a->strings["Swinger"] = "Swinger"; -$a->strings["Betrayed"] = "Betrayed"; -$a->strings["Separated"] = "Separated"; -$a->strings["Unstable"] = "Unstable"; -$a->strings["Divorced"] = "Divorced"; -$a->strings["Imaginarily divorced"] = "Imaginarily divorced"; -$a->strings["Widowed"] = "Widowed"; -$a->strings["Uncertain"] = "Uncertain"; -$a->strings["It's complicated"] = "It's complicated"; -$a->strings["Don't care"] = "Don't care"; -$a->strings["Ask me"] = "Ask me"; $a->strings["No friends to display."] = "No friends to display."; $a->strings["Authorize application connection"] = "Authorize application connection"; $a->strings["Return to your app and insert this Securty Code:"] = "Return to your app and insert this security code:"; @@ -1018,7 +1018,7 @@ $a->strings["%d message sent."] = array( ); $a->strings["You have no more invitations available"] = "You have no more invitations available."; $a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."; -$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "To accept this invitation, please register at %s or any other public Friendica website."; +$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "To accept this invitation, please sign up at %s or any other public Friendica website."; $a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica sites are all inter-connect to create a large privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."; $a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Our apologies. This system is not currently configured to connect with other public sites or invite members."; $a->strings["Send invitations"] = "Send invitations"; @@ -1026,7 +1026,7 @@ $a->strings["Enter email addresses, one per line:"] = "Enter email addresses, on $a->strings["Your message:"] = "Your message:"; $a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."; $a->strings["You will need to supply this invitation code: \$invite_code"] = "You will need to supply this invitation code: \$invite_code"; -$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Once you have registered, please connect with me via my profile page at:"; +$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Once you have signed up, please connect with me via my profile page at:"; $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"; $a->strings["Time Conversion"] = "Time conversion"; $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provides this service for sharing events with other networks and friends in unknown time zones."; @@ -1042,7 +1042,7 @@ $a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s $a->strings["\n\t\tFollow this link to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\n\t\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"; $a->strings["Password reset requested at %s"] = "Password reset requested at %s"; $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Request could not be verified. (You may have previously submitted it.) Password reset failed."; -$a->strings["Password Reset"] = "Password reset"; +$a->strings["Password Reset"] = "Forgotten password?"; $a->strings["Your password has been reset as requested."] = "Your password has been reset as requested."; $a->strings["Your new password is"] = "Your new password is"; $a->strings["Save or copy your new password - and then"] = "Save or copy your new password - and then"; @@ -1234,9 +1234,6 @@ $a->strings["Private photo"] = "Private photo"; $a->strings["Public photo"] = "Public photo"; $a->strings["Map"] = "Map"; $a->strings["View Album"] = "View album"; -$a->strings["{0} wants to be your friend"] = "{0} wants to be your friend"; -$a->strings["{0} sent you a message"] = "{0} sent you a message"; -$a->strings["{0} requested registration"] = "{0} requested registration"; $a->strings["Poke/Prod"] = "Poke/Prod"; $a->strings["poke, prod or do other things to somebody"] = "Poke, prod or do other things to somebody"; $a->strings["Recipient"] = "Recipient:"; @@ -1253,7 +1250,7 @@ $a->strings["Registration successful."] = "Registration successful."; $a->strings["Your registration can not be processed."] = "Your registration cannot be processed."; $a->strings["Your registration is pending approval by the site owner."] = "Your registration is pending approval by the site administrator."; $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."; -$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; +$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Sign up now'."; $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."; $a->strings["Your OpenID (optional): "] = "Your OpenID (optional): "; $a->strings["Include your profile in member directory?"] = "Include your profile in member directory?"; @@ -1261,7 +1258,7 @@ $a->strings["Note for the admin"] = "Note for the admin"; $a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin, why you want to join this node."; $a->strings["Membership on this site is by invitation only."] = "Membership on this site is by invitation only."; $a->strings["Your invitation ID: "] = "Your invitation ID: "; -$a->strings["Registration"] = "Registration"; +$a->strings["Registration"] = "Join this Friendica Node Today"; $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Your full name: "; $a->strings["Your Email Address: "] = "Your email address: "; $a->strings["New Password:"] = "New password:"; @@ -1361,310 +1358,6 @@ $a->strings["You need to export your account from the old server and upload it h $a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora."; $a->strings["Account file"] = "Account file:"; $a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "To export your account, go to \"Settings->Export personal data\" and select \"Export account\""; -$a->strings["Theme settings updated."] = "Theme settings updated."; -$a->strings["Site"] = "Site"; -$a->strings["Users"] = "Users"; -$a->strings["Plugins"] = "Plugins"; -$a->strings["Themes"] = "Theme selection"; -$a->strings["Additional features"] = "Additional features"; -$a->strings["DB updates"] = "DB updates"; -$a->strings["Inspect Queue"] = "Inspect queue"; -$a->strings["Server Blocklist"] = "Server blocklist"; -$a->strings["Federation Statistics"] = "Federation statistics"; -$a->strings["Logs"] = "Logs"; -$a->strings["View Logs"] = "View logs"; -$a->strings["probe address"] = "Probe address"; -$a->strings["check webfinger"] = "Check webfinger"; -$a->strings["Plugin Features"] = "Plugin Features"; -$a->strings["diagnostics"] = "Diagnostics"; -$a->strings["User registrations waiting for confirmation"] = "User registrations awaiting confirmation"; -$a->strings["The blocked domain"] = "Blocked domain"; -$a->strings["The reason why you blocked this domain."] = "Reason why you blocked this domain."; -$a->strings["Delete domain"] = "Delete domain"; -$a->strings["Check to delete this entry from the blocklist"] = "Check to delete this entry from the blocklist"; -$a->strings["Administration"] = "Administration"; -$a->strings["This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."] = "This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."; -$a->strings["The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily."] = "The list of blocked servers will publicly available on the Friendica page so that your users and people investigating communication problems can readily find the reason."; -$a->strings["Add new entry to block list"] = "Add new entry to block list"; -$a->strings["Server Domain"] = "Server domain"; -$a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "The domain of the new server to add to the block list. Do not include the protocol."; -$a->strings["Block reason"] = "Block reason"; -$a->strings["Add Entry"] = "Add entry"; -$a->strings["Save changes to the blocklist"] = "Save changes to the blocklist"; -$a->strings["Current Entries in the Blocklist"] = "Current entries in the blocklist"; -$a->strings["Delete entry from blocklist"] = "Delete entry from blocklist"; -$a->strings["Delete entry from blocklist?"] = "Delete entry from blocklist?"; -$a->strings["Server added to blocklist."] = "Server added to blocklist."; -$a->strings["Site blocklist updated."] = "Site blocklist updated."; -$a->strings["unknown"] = "unknown"; -$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "This page offers you the amount of known part of the federated social network your Friendica node is part of. These numbers are not complete and only reflect the part of the network your node is aware of."; -$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "The <em>Auto Discovered Contact Directory</em> feature is not enabled; enabling it will improve the data displayed here."; -$a->strings["Currently this node is aware of %d nodes from the following platforms:"] = "Currently this node is aware of %d nodes from the following platforms:"; -$a->strings["ID"] = "ID"; -$a->strings["Recipient Name"] = "Recipient name"; -$a->strings["Recipient Profile"] = "Recipient profile"; -$a->strings["Created"] = "Created"; -$a->strings["Last Tried"] = "Last Tried"; -$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."; -$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"; -$a->strings["The database update failed. Please run \"php include/dbstructure.php update\" from the command line and have a look at the errors that might appear."] = "The database update failed. Please run 'php include/dbstructure.php update' from the command line and have a look at the errors that might appear."; -$a->strings["Normal Account"] = "Standard account"; -$a->strings["Soapbox Account"] = "Soapbox account"; -$a->strings["Community/Celebrity Account"] = "Community/Celebrity account"; -$a->strings["Automatic Friend Account"] = "Automatic friend account"; -$a->strings["Blog Account"] = "Blog account"; -$a->strings["Private Forum"] = "Private forum"; -$a->strings["Message queues"] = "Message queues"; -$a->strings["Summary"] = "Summary"; -$a->strings["Registered users"] = "Registered users"; -$a->strings["Pending registrations"] = "Pending registrations"; -$a->strings["Version"] = "Version"; -$a->strings["Active plugins"] = "Active plugins"; -$a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Can not parse base URL. Must have at least <scheme>://<domain>"; -$a->strings["Site settings updated."] = "Site settings updated."; -$a->strings["No special theme for mobile devices"] = "No special theme for mobile devices"; -$a->strings["No community page"] = "No community page"; -$a->strings["Public postings from users of this site"] = "Public postings from users of this site"; -$a->strings["Global community page"] = "Global community page"; -$a->strings["Never"] = "Never"; -$a->strings["At post arrival"] = "At post arrival"; -$a->strings["Disabled"] = "Disabled"; -$a->strings["Users, Global Contacts"] = "Users, Global Contacts"; -$a->strings["Users, Global Contacts/fallback"] = "Users, Global Contacts/fallback"; -$a->strings["One month"] = "One month"; -$a->strings["Three months"] = "Three months"; -$a->strings["Half a year"] = "Half a year"; -$a->strings["One year"] = "One a year"; -$a->strings["Multi user instance"] = "Multi user instance"; -$a->strings["Closed"] = "Closed"; -$a->strings["Requires approval"] = "Requires approval"; -$a->strings["Open"] = "Open"; -$a->strings["No SSL policy, links will track page SSL state"] = "No SSL policy, links will track page SSL state"; -$a->strings["Force all links to use SSL"] = "Force all links to use SSL"; -$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Self-signed certificate, use SSL for local links only (discouraged)"; -$a->strings["Save Settings"] = "Save settings"; -$a->strings["File upload"] = "File upload"; -$a->strings["Policies"] = "Policies"; -$a->strings["Auto Discovered Contact Directory"] = "Auto-discovered contact directory"; -$a->strings["Performance"] = "Performance"; -$a->strings["Worker"] = "Worker"; -$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Relocate - Warning, advanced function: This could make this server unreachable."; -$a->strings["Site name"] = "Site name"; -$a->strings["Host name"] = "Host name"; -$a->strings["Sender Email"] = "Sender email"; -$a->strings["The email address your server shall use to send notification emails from."] = "The email address your server shall use to send notification emails from."; -$a->strings["Banner/Logo"] = "Banner/Logo"; -$a->strings["Shortcut icon"] = "Shortcut icon"; -$a->strings["Link to an icon that will be used for browsers."] = "Link to an icon that will be used for browsers."; -$a->strings["Touch icon"] = "Touch icon"; -$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Link to an icon that will be used for tablets and mobiles."; -$a->strings["Additional Info"] = "Additional Info"; -$a->strings["For public servers: you can add additional information here that will be listed at %s/siteinfo."] = "For public servers: add additional information here that will be listed at %s/siteinfo."; -$a->strings["System language"] = "System language"; -$a->strings["System theme"] = "System theme"; -$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Default system theme - may be overridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"; -$a->strings["Mobile system theme"] = "Mobile system theme"; -$a->strings["Theme for mobile devices"] = "Theme for mobile devices"; -$a->strings["SSL link policy"] = "SSL link policy"; -$a->strings["Determines whether generated links should be forced to use SSL"] = "Determines whether generated links should be forced to use SSL"; -$a->strings["Force SSL"] = "Force SSL"; -$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."; -$a->strings["Hide help entry from navigation menu"] = "Hide help entry from navigation menu"; -$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL."; -$a->strings["Single user instance"] = "Single user instance"; -$a->strings["Make this instance multi-user or single-user for the named user"] = "Make this instance multi-user or single-user for the named user"; -$a->strings["Maximum image size"] = "Maximum image size"; -$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximum size in bytes of uploaded images. Default is 0, which means no limits."; -$a->strings["Maximum image length"] = "Maximum image length"; -$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."; -$a->strings["JPEG image quality"] = "JPEG image quality"; -$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is the original quality level."; -$a->strings["Register policy"] = "Register policy"; -$a->strings["Maximum Daily Registrations"] = "Maximum daily registrations"; -$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect."] = "If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect."; -$a->strings["Register text"] = "Register text"; -$a->strings["Will be displayed prominently on the registration page."] = "Will be displayed prominently on the registration page."; -$a->strings["Accounts abandoned after x days"] = "Accounts abandoned after so many days"; -$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."; -$a->strings["Allowed friend domains"] = "Allowed friend domains"; -$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains"; -$a->strings["Allowed email domains"] = "Allowed email domains"; -$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains"; -$a->strings["Block public"] = "Block public"; -$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Block public access to all otherwise public personal pages on this site, except for local users when logged in."; -$a->strings["Force publish"] = "Mandatory directory listing"; -$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Force all profiles on this site to be listed in the site directory."; -$a->strings["Global directory URL"] = "Global directory URL"; -$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL to the global directory: If this is not set, the global directory is completely unavailable to the application."; -$a->strings["Allow threaded items"] = "Allow threaded items"; -$a->strings["Allow infinite level threading for items on this site."] = "Allow infinite levels of threading for items on this site."; -$a->strings["Private posts by default for new users"] = "Private posts by default for new users"; -$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Set default post permissions for all new members to the default privacy group rather than public."; -$a->strings["Don't include post content in email notifications"] = "Don't include post content in email notifications"; -$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Don't include the content of a post/comment/private message in the email notifications sent from this site, as a privacy measure."; -$a->strings["Disallow public access to addons listed in the apps menu."] = "Disallow public access to addons listed in the apps menu."; -$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Checking this box will restrict addons listed in the apps menu to members only."; -$a->strings["Don't embed private images in posts"] = "Don't embed private images in posts"; -$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."; -$a->strings["Allow Users to set remote_self"] = "Allow users to set \"Remote self\""; -$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream."; -$a->strings["Block multiple registrations"] = "Block multiple registrations"; -$a->strings["Disallow users to register additional accounts for use as pages."] = "Disallow users to register additional accounts for use as pages."; -$a->strings["OpenID support"] = "OpenID support"; -$a->strings["OpenID support for registration and logins."] = "OpenID support for registration and logins."; -$a->strings["Fullname check"] = "Full name check"; -$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Force users to register with a space between first name and last name in the full name field; it may reduce spam and abuse registrations."; -$a->strings["Community Page Style"] = "Community page style"; -$a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."; -$a->strings["Posts per user on community page"] = "Posts per user on community page"; -$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Maximum number of posts per user on the community page (not valid for 'Global Community')."; -$a->strings["Enable OStatus support"] = "Enable OStatus support"; -$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."; -$a->strings["OStatus conversation completion interval"] = "OStatus conversation completion interval"; -$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "How often shall the poller check for new entries in OStatus conversations? This can be rather resources consuming."; -$a->strings["Only import OStatus threads from our contacts"] = "Only import OStatus threads from known contacts"; -$a->strings["Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."; -$a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus support can only be enabled if threading is enabled."; -$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Diaspora support can't be enabled because Friendica was installed into a sub directory."; -$a->strings["Enable Diaspora support"] = "Enable Diaspora support"; -$a->strings["Provide built-in Diaspora network compatibility."] = "Provide built-in Diaspora network compatibility."; -$a->strings["Only allow Friendica contacts"] = "Only allow Friendica contacts"; -$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "All contacts must use Friendica protocols. All other built-in communication protocols will be disabled."; -$a->strings["Verify SSL"] = "Verify SSL"; -$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."; -$a->strings["Proxy user"] = "Proxy user"; -$a->strings["Proxy URL"] = "Proxy URL"; -$a->strings["Network timeout"] = "Network timeout"; -$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Value is in seconds. Set to 0 for unlimited (not recommended)."; -$a->strings["Maximum Load Average"] = "Maximum load average"; -$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximum system load before delivery and poll processes are deferred (default 50)."; -$a->strings["Maximum Load Average (Frontend)"] = "Maximum load average (frontend)"; -$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximum system load before the frontend quits service (default 50)."; -$a->strings["Minimal Memory"] = "Minimal memory"; -$a->strings["Minimal free memory in MB for the poller. Needs access to /proc/meminfo - default 0 (deactivated)."] = "Minimal free memory in MB for the poller. Needs access to /proc/meminfo (default 0 - deactivated)."; -$a->strings["Maximum table size for optimization"] = "Maximum table size for optimization"; -$a->strings["Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it."] = "Maximum table size (in MB) for the automatic optimization (default 100 MB; -1 to deactivate)."; -$a->strings["Minimum level of fragmentation"] = "Minimum level of fragmentation"; -$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Minimum fragmentation level to start the automatic optimization (default 30%)."; -$a->strings["Periodical check of global contacts"] = "Periodical check of global contacts"; -$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "This checks global contacts periodically for missing or outdated data and the vitality of the contacts and servers."; -$a->strings["Days between requery"] = "Days between enquiry"; -$a->strings["Number of days after which a server is requeried for his contacts."] = "Number of days after which a server is required check contacts."; -$a->strings["Discover contacts from other servers"] = "Discover contacts from other servers"; -$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "Periodically query other servers for contacts. You can choose between 'Users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older Friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommend setting is 'Users, Global Contacts'."; -$a->strings["Timeframe for fetching global contacts"] = "Time-frame for fetching global contacts"; -$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers."; -$a->strings["Search the local directory"] = "Search the local directory"; -$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."; -$a->strings["Publish server information"] = "Publish server information"; -$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "This publishes generic data about the server and its usage. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."; -$a->strings["Suppress Tags"] = "Suppress tags"; -$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Suppress listed hashtags at the end of posts."; -$a->strings["Path to item cache"] = "Path to item cache"; -$a->strings["The item caches buffers generated bbcode and external images."] = "The item caches buffers generated bbcode and external images."; -$a->strings["Cache duration in seconds"] = "Cache duration in seconds"; -$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "How long should cache files be held? (Default 86400 seconds - one day; -1 disables item cache)"; -$a->strings["Maximum numbers of comments per post"] = "Maximum numbers of comments per post"; -$a->strings["How much comments should be shown for each post? Default value is 100."] = "How many comments should be shown for each post? (Default 100)"; -$a->strings["Temp path"] = "Temp path"; -$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Enter a different tmp path, if your system restricts the webserver's access to the system temp path."; -$a->strings["Base path to installation"] = "Base path to installation"; -$a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."; -$a->strings["Disable picture proxy"] = "Disable picture proxy"; -$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."; -$a->strings["Only search in tags"] = "Only search in tags"; -$a->strings["On large systems the text search can slow down the system extremely."] = "On large systems the text search can slow down the system significantly."; -$a->strings["New base url"] = "New base URL"; -$a->strings["Change base url for this server. Sends relocate message to all DFRN contacts of all users."] = "Change base URL for this server. Sends relocate message to all DFRN contacts of all users."; -$a->strings["RINO Encryption"] = "RINO Encryption"; -$a->strings["Encryption layer between nodes."] = "Encryption layer between nodes."; -$a->strings["Maximum number of parallel workers"] = "Maximum number of parallel workers"; -$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."; -$a->strings["Don't use 'proc_open' with the worker"] = "Don't use 'proc_open' with the worker"; -$a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab."] = "Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosts. If this is enabled you should increase the frequency of poller calls in your crontab."; -$a->strings["Enable fastlane"] = "Enable fast-lane"; -$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "The fast-lane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."; -$a->strings["Enable frontend worker"] = "Enable frontend worker"; -$a->strings["When enabled the Worker process is triggered when backend access is performed (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."] = "If enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this."; -$a->strings["Update has been marked successful"] = "Update has been marked successful"; -$a->strings["Database structure update %s was successfully applied."] = "Database structure update %s was successfully applied."; -$a->strings["Executing of database structure update %s failed with error: %s"] = "Executing of database structure update %s failed with error: %s"; -$a->strings["Executing %s failed with error: %s"] = "Executing %s failed with error: %s"; -$a->strings["Update %s was successfully applied."] = "Update %s was successfully applied."; -$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s did not return a status. Unknown if it succeeded."; -$a->strings["There was no additional update function %s that needed to be called."] = "There was no additional update function %s that needed to be called."; -$a->strings["No failed updates."] = "No failed updates."; -$a->strings["Check database structure"] = "Check database structure"; -$a->strings["Failed Updates"] = "Failed updates"; -$a->strings["This does not include updates prior to 1139, which did not return a status."] = "This does not include updates prior to 1139, which did not return a status."; -$a->strings["Mark success (if update was manually applied)"] = "Mark success (if update was manually applied)"; -$a->strings["Attempt to execute this update step automatically"] = "Attempt to execute this update step automatically"; -$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\n\t\t\tDear %1\$s,\n\t\t\t\tThe administrator of %2\$s has set up an account for you."; -$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4\$s."] = "\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, this may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4\$s."; -$a->strings["%s user blocked/unblocked"] = array( - 0 => "%s user blocked/unblocked", - 1 => "%s users blocked/unblocked", -); -$a->strings["%s user deleted"] = array( - 0 => "%s user deleted", - 1 => "%s users deleted", -); -$a->strings["User '%s' deleted"] = "User '%s' deleted"; -$a->strings["User '%s' unblocked"] = "User '%s' unblocked"; -$a->strings["User '%s' blocked"] = "User '%s' blocked"; -$a->strings["Register date"] = "Register date"; -$a->strings["Last login"] = "Last login"; -$a->strings["Last item"] = "Last item"; -$a->strings["Account"] = "Account"; -$a->strings["Add User"] = "Add user"; -$a->strings["select all"] = "select all"; -$a->strings["User registrations waiting for confirm"] = "User registrations awaiting confirmation"; -$a->strings["User waiting for permanent deletion"] = "User awaiting permanent deletion"; -$a->strings["Request date"] = "Request date"; -$a->strings["No registrations."] = "No registrations."; -$a->strings["Note from the user"] = "Note from the user"; -$a->strings["Deny"] = "Deny"; -$a->strings["Block"] = "Block"; -$a->strings["Unblock"] = "Unblock"; -$a->strings["Site admin"] = "Site admin"; -$a->strings["Account expired"] = "Account expired"; -$a->strings["New User"] = "New user"; -$a->strings["Deleted since"] = "Deleted since"; -$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Selected users will be deleted!\\n\\nEverything these users has posted on this site will be permanently deleted!\\n\\nAre you sure?"; -$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"; -$a->strings["Name of the new user."] = "Name of the new user."; -$a->strings["Nickname"] = "Nickname"; -$a->strings["Nickname of the new user."] = "Nickname of the new user."; -$a->strings["Email address of the new user."] = "Email address of the new user."; -$a->strings["Plugin %s disabled."] = "Plugin %s disabled."; -$a->strings["Plugin %s enabled."] = "Plugin %s enabled."; -$a->strings["Disable"] = "Disable"; -$a->strings["Enable"] = "Enable"; -$a->strings["Toggle"] = "Toggle"; -$a->strings["Author: "] = "Author: "; -$a->strings["Maintainer: "] = "Maintainer: "; -$a->strings["Reload active plugins"] = "Reload active plugins"; -$a->strings["There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"] = "There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"; -$a->strings["No themes found."] = "No themes found."; -$a->strings["Screenshot"] = "Screenshot"; -$a->strings["Reload active themes"] = "Reload active themes"; -$a->strings["No themes found on the system. They should be paced in %1\$s"] = "No themes found on the system. They should be paced in %1\$s"; -$a->strings["[Experimental]"] = "[Experimental]"; -$a->strings["[Unsupported]"] = "[Unsupported]"; -$a->strings["Log settings updated."] = "Log settings updated."; -$a->strings["PHP log currently enabled."] = "PHP log currently enabled."; -$a->strings["PHP log currently disabled."] = "PHP log currently disabled."; -$a->strings["Clear"] = "Clear"; -$a->strings["Enable Debugging"] = "Enable debugging"; -$a->strings["Log file"] = "Log file"; -$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Must be writable by web server and relative to your Friendica top-level directory."; -$a->strings["Log level"] = "Log level"; -$a->strings["PHP logging"] = "PHP logging"; -$a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The file name set in the 'error_log' line is relative to the Friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."; -$a->strings["Off"] = "Off"; -$a->strings["On"] = "On"; -$a->strings["Lock feature %s"] = "Lock feature %s"; -$a->strings["Manage Additional Features"] = "Manage additional features"; $a->strings["%d contact edited."] = array( 0 => "%d contact edited.", 1 => "%d contacts edited.", @@ -1685,12 +1378,14 @@ $a->strings["You are mutual friends with %s"] = "You are mutual friends with %s" $a->strings["You are sharing with %s"] = "You are sharing with %s"; $a->strings["%s is sharing with you"] = "%s is sharing with you"; $a->strings["Private communications are not available for this contact."] = "Private communications are not available for this contact."; +$a->strings["Never"] = "Never"; $a->strings["(Update was successful)"] = "(Update was successful)"; $a->strings["(Update was not successful)"] = "(Update was not successful)"; $a->strings["Suggest friends"] = "Suggest friends"; $a->strings["Network type: %s"] = "Network type: %s"; $a->strings["Communications lost with this contact!"] = "Communications lost with this contact!"; $a->strings["Fetch further information for feeds"] = "Fetch further information for feeds"; +$a->strings["Disabled"] = "Disabled"; $a->strings["Fetch information"] = "Fetch information"; $a->strings["Fetch information and keywords"] = "Fetch information and keywords"; $a->strings["Contact"] = "Contact"; @@ -1705,6 +1400,8 @@ $a->strings["View conversations"] = "View conversations"; $a->strings["Last update:"] = "Last update:"; $a->strings["Update public posts"] = "Update public posts"; $a->strings["Update now"] = "Update now"; +$a->strings["Unblock"] = "Unblock"; +$a->strings["Block"] = "Block"; $a->strings["Unignore"] = "Unignore"; $a->strings["Currently blocked"] = "Currently blocked"; $a->strings["Currently ignored"] = "Currently ignored"; @@ -1744,6 +1441,9 @@ $a->strings["Toggle Blocked status"] = "Toggle blocked status"; $a->strings["Toggle Ignored status"] = "Toggle ignored status"; $a->strings["Toggle Archive status"] = "Toggle archive status"; $a->strings["Delete contact"] = "Delete contact"; +$a->strings["{0} wants to be your friend"] = "{0} wants to be your friend"; +$a->strings["{0} sent you a message"] = "{0} sent you a message"; +$a->strings["{0} requested registration"] = "{0} requested registration"; $a->strings["Image uploaded but image cropping failed."] = "Image uploaded but image cropping failed."; $a->strings["Image size reduction [%s] failed."] = "Image size reduction [%s] failed."; $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-reload the page or clear browser cache if the new photo does not display immediately."; @@ -1831,6 +1531,306 @@ $a->strings["Work/employment"] = "Work/Employment:"; $a->strings["School/education"] = "School/Education:"; $a->strings["Contact information and Social Networks"] = "Contact information and other social networks:"; $a->strings["Edit/Manage Profiles"] = "Edit/Manage Profiles"; +$a->strings["Theme settings updated."] = "Theme settings updated."; +$a->strings["Site"] = "Site"; +$a->strings["Users"] = "Users"; +$a->strings["Plugins"] = "Plugins"; +$a->strings["Themes"] = "Theme selection"; +$a->strings["Additional features"] = "Additional features"; +$a->strings["DB updates"] = "DB updates"; +$a->strings["Inspect Queue"] = "Inspect queue"; +$a->strings["Server Blocklist"] = "Server blocklist"; +$a->strings["Federation Statistics"] = "Federation statistics"; +$a->strings["Logs"] = "Logs"; +$a->strings["View Logs"] = "View logs"; +$a->strings["probe address"] = "Probe address"; +$a->strings["check webfinger"] = "Check webfinger"; +$a->strings["Plugin Features"] = "Plugin Features"; +$a->strings["diagnostics"] = "Diagnostics"; +$a->strings["User registrations waiting for confirmation"] = "User registrations awaiting confirmation"; +$a->strings["The blocked domain"] = "Blocked domain"; +$a->strings["The reason why you blocked this domain."] = "Reason why you blocked this domain."; +$a->strings["Delete domain"] = "Delete domain"; +$a->strings["Check to delete this entry from the blocklist"] = "Check to delete this entry from the blocklist"; +$a->strings["Administration"] = "Administration"; +$a->strings["This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."] = "This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server."; +$a->strings["The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily."] = "The list of blocked servers will publicly available on the Friendica page so that your users and people investigating communication problems can readily find the reason."; +$a->strings["Add new entry to block list"] = "Add new entry to block list"; +$a->strings["Server Domain"] = "Server domain"; +$a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "The domain of the new server to add to the block list. Do not include the protocol."; +$a->strings["Block reason"] = "Block reason"; +$a->strings["Add Entry"] = "Add entry"; +$a->strings["Save changes to the blocklist"] = "Save changes to the blocklist"; +$a->strings["Current Entries in the Blocklist"] = "Current entries in the blocklist"; +$a->strings["Delete entry from blocklist"] = "Delete entry from blocklist"; +$a->strings["Delete entry from blocklist?"] = "Delete entry from blocklist?"; +$a->strings["Server added to blocklist."] = "Server added to blocklist."; +$a->strings["Site blocklist updated."] = "Site blocklist updated."; +$a->strings["unknown"] = "unknown"; +$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "This page offers you the amount of known part of the federated social network your Friendica node is part of. These numbers are not complete and only reflect the part of the network your node is aware of."; +$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "The <em>Auto Discovered Contact Directory</em> feature is not enabled; enabling it will improve the data displayed here."; +$a->strings["Currently this node is aware of %d nodes from the following platforms:"] = "Currently this node is aware of %d nodes from the following platforms:"; +$a->strings["ID"] = "ID"; +$a->strings["Recipient Name"] = "Recipient name"; +$a->strings["Recipient Profile"] = "Recipient profile"; +$a->strings["Created"] = "Created"; +$a->strings["Last Tried"] = "Last Tried"; +$a->strings["This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."] = "This page lists the content of the queue for outgoing postings. These are postings the initial delivery failed for. They will be resend later and eventually deleted if the delivery fails permanently."; +$a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"; +$a->strings["The database update failed. Please run \"php include/dbstructure.php update\" from the command line and have a look at the errors that might appear."] = "The database update failed. Please run 'php include/dbstructure.php update' from the command line and have a look at the errors that might appear."; +$a->strings["Normal Account"] = "Standard account"; +$a->strings["Soapbox Account"] = "Soapbox account"; +$a->strings["Community/Celebrity Account"] = "Community/Celebrity account"; +$a->strings["Automatic Friend Account"] = "Automatic friend account"; +$a->strings["Blog Account"] = "Blog account"; +$a->strings["Private Forum"] = "Private forum"; +$a->strings["Message queues"] = "Message queues"; +$a->strings["Summary"] = "Summary"; +$a->strings["Registered users"] = "Registered users"; +$a->strings["Pending registrations"] = "Pending registrations"; +$a->strings["Version"] = "Version"; +$a->strings["Active plugins"] = "Active plugins"; +$a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Can not parse base URL. Must have at least <scheme>://<domain>"; +$a->strings["Site settings updated."] = "Site settings updated."; +$a->strings["No special theme for mobile devices"] = "No special theme for mobile devices"; +$a->strings["No community page"] = "No community page"; +$a->strings["Public postings from users of this site"] = "Public postings from users of this site"; +$a->strings["Global community page"] = "Global community page"; +$a->strings["At post arrival"] = "At post arrival"; +$a->strings["Users, Global Contacts"] = "Users, Global Contacts"; +$a->strings["Users, Global Contacts/fallback"] = "Users, Global Contacts/fallback"; +$a->strings["One month"] = "One month"; +$a->strings["Three months"] = "Three months"; +$a->strings["Half a year"] = "Half a year"; +$a->strings["One year"] = "One a year"; +$a->strings["Multi user instance"] = "Multi user instance"; +$a->strings["Closed"] = "Closed"; +$a->strings["Requires approval"] = "Requires approval"; +$a->strings["Open"] = "Open"; +$a->strings["No SSL policy, links will track page SSL state"] = "No SSL policy, links will track page SSL state"; +$a->strings["Force all links to use SSL"] = "Force all links to use SSL"; +$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Self-signed certificate, use SSL for local links only (discouraged)"; +$a->strings["Save Settings"] = "Save settings"; +$a->strings["File upload"] = "File upload"; +$a->strings["Policies"] = "Policies"; +$a->strings["Auto Discovered Contact Directory"] = "Auto-discovered contact directory"; +$a->strings["Performance"] = "Performance"; +$a->strings["Worker"] = "Worker"; +$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Relocate - Warning, advanced function: This could make this server unreachable."; +$a->strings["Site name"] = "Site name"; +$a->strings["Host name"] = "Host name"; +$a->strings["Sender Email"] = "Sender email"; +$a->strings["The email address your server shall use to send notification emails from."] = "The email address your server shall use to send notification emails from."; +$a->strings["Banner/Logo"] = "Banner/Logo"; +$a->strings["Shortcut icon"] = "Shortcut icon"; +$a->strings["Link to an icon that will be used for browsers."] = "Link to an icon that will be used for browsers."; +$a->strings["Touch icon"] = "Touch icon"; +$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Link to an icon that will be used for tablets and mobiles."; +$a->strings["Additional Info"] = "Additional Info"; +$a->strings["For public servers: you can add additional information here that will be listed at %s/siteinfo."] = "For public servers: add additional information here that will be listed at %s/siteinfo."; +$a->strings["System language"] = "System language"; +$a->strings["System theme"] = "System theme"; +$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Default system theme - may be overridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"; +$a->strings["Mobile system theme"] = "Mobile system theme"; +$a->strings["Theme for mobile devices"] = "Theme for mobile devices"; +$a->strings["SSL link policy"] = "SSL link policy"; +$a->strings["Determines whether generated links should be forced to use SSL"] = "Determines whether generated links should be forced to use SSL"; +$a->strings["Force SSL"] = "Force SSL"; +$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."; +$a->strings["Hide help entry from navigation menu"] = "Hide help entry from navigation menu"; +$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL."; +$a->strings["Single user instance"] = "Single user instance"; +$a->strings["Make this instance multi-user or single-user for the named user"] = "Make this instance multi-user or single-user for the named user"; +$a->strings["Maximum image size"] = "Maximum image size"; +$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximum size in bytes of uploaded images. Default is 0, which means no limits."; +$a->strings["Maximum image length"] = "Maximum image length"; +$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."; +$a->strings["JPEG image quality"] = "JPEG image quality"; +$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is the original quality level."; +$a->strings["Register policy"] = "Registration policy"; +$a->strings["Maximum Daily Registrations"] = "Maximum daily registrations"; +$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect."] = "If open registration is permitted, this sets the maximum number of new registrations per day. This setting has no effect for registrations by approval."; +$a->strings["Register text"] = "Registration text"; +$a->strings["Will be displayed prominently on the registration page."] = "Will be displayed prominently on the registration page."; +$a->strings["Accounts abandoned after x days"] = "Accounts abandoned after so many days"; +$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."; +$a->strings["Allowed friend domains"] = "Allowed friend domains"; +$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains"; +$a->strings["Allowed email domains"] = "Allowed email domains"; +$a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains"; +$a->strings["Block public"] = "Block public"; +$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Block public access to all otherwise public personal pages on this site, except for local users when logged in."; +$a->strings["Force publish"] = "Mandatory directory listing"; +$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Force all profiles on this site to be listed in the site directory."; +$a->strings["Global directory URL"] = "Global directory URL"; +$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL to the global directory: If this is not set, the global directory is completely unavailable to the application."; +$a->strings["Allow threaded items"] = "Allow threaded items"; +$a->strings["Allow infinite level threading for items on this site."] = "Allow infinite levels of threading for items on this site."; +$a->strings["Private posts by default for new users"] = "Private posts by default for new users"; +$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Set default post permissions for all new members to the default privacy group rather than public."; +$a->strings["Don't include post content in email notifications"] = "Don't include post content in email notifications"; +$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "Don't include the content of a post/comment/private message in the email notifications sent from this site, as a privacy measure."; +$a->strings["Disallow public access to addons listed in the apps menu."] = "Disallow public access to addons listed in the apps menu."; +$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Checking this box will restrict addons listed in the apps menu to members only."; +$a->strings["Don't embed private images in posts"] = "Don't embed private images in posts"; +$a->strings["Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."] = "Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while."; +$a->strings["Allow Users to set remote_self"] = "Allow users to set \"Remote self\""; +$a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream."; +$a->strings["Block multiple registrations"] = "Block multiple registrations"; +$a->strings["Disallow users to register additional accounts for use as pages."] = "Disallow users to sign up for additional accounts."; +$a->strings["OpenID support"] = "OpenID support"; +$a->strings["OpenID support for registration and logins."] = "OpenID support for registration and logins."; +$a->strings["Fullname check"] = "Full name check"; +$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Force users to sign up with a space between first name and last name in the full name field; it may reduce spam and abuse registrations."; +$a->strings["Community Page Style"] = "Community page style"; +$a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."; +$a->strings["Posts per user on community page"] = "Posts per user on community page"; +$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Maximum number of posts per user on the community page (not valid for 'Global Community')."; +$a->strings["Enable OStatus support"] = "Enable OStatus support"; +$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."; +$a->strings["OStatus conversation completion interval"] = "OStatus conversation completion interval"; +$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "How often shall the poller check for new entries in OStatus conversations? This can be rather resources consuming."; +$a->strings["Only import OStatus threads from our contacts"] = "Only import OStatus threads from known contacts"; +$a->strings["Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."] = "Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."; +$a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus support can only be enabled if threading is enabled."; +$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Diaspora support can't be enabled because Friendica was installed into a sub directory."; +$a->strings["Enable Diaspora support"] = "Enable Diaspora support"; +$a->strings["Provide built-in Diaspora network compatibility."] = "Provide built-in Diaspora network compatibility."; +$a->strings["Only allow Friendica contacts"] = "Only allow Friendica contacts"; +$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "All contacts must use Friendica protocols. All other built-in communication protocols will be disabled."; +$a->strings["Verify SSL"] = "Verify SSL"; +$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."; +$a->strings["Proxy user"] = "Proxy user"; +$a->strings["Proxy URL"] = "Proxy URL"; +$a->strings["Network timeout"] = "Network timeout"; +$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Value is in seconds. Set to 0 for unlimited (not recommended)."; +$a->strings["Maximum Load Average"] = "Maximum load average"; +$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximum system load before delivery and poll processes are deferred (default 50)."; +$a->strings["Maximum Load Average (Frontend)"] = "Maximum load average (frontend)"; +$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximum system load before the frontend quits service (default 50)."; +$a->strings["Minimal Memory"] = "Minimal memory"; +$a->strings["Minimal free memory in MB for the poller. Needs access to /proc/meminfo - default 0 (deactivated)."] = "Minimal free memory in MB for the poller. Needs access to /proc/meminfo (default 0 - deactivated)."; +$a->strings["Maximum table size for optimization"] = "Maximum table size for optimization"; +$a->strings["Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it."] = "Maximum table size (in MB) for the automatic optimization (default 100 MB; -1 to deactivate)."; +$a->strings["Minimum level of fragmentation"] = "Minimum level of fragmentation"; +$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Minimum fragmentation level to start the automatic optimization (default 30%)."; +$a->strings["Periodical check of global contacts"] = "Periodical check of global contacts"; +$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "This checks global contacts periodically for missing or outdated data and the vitality of the contacts and servers."; +$a->strings["Days between requery"] = "Days between enquiry"; +$a->strings["Number of days after which a server is requeried for his contacts."] = "Number of days after which a server is required check contacts."; +$a->strings["Discover contacts from other servers"] = "Discover contacts from other servers"; +$a->strings["Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."] = "Periodically query other servers for contacts. You can choose between 'Users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older Friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommend setting is 'Users, Global Contacts'."; +$a->strings["Timeframe for fetching global contacts"] = "Time-frame for fetching global contacts"; +$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers."; +$a->strings["Search the local directory"] = "Search the local directory"; +$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."; +$a->strings["Publish server information"] = "Publish server information"; +$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "This publishes generic data about the server and its usage. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."; +$a->strings["Suppress Tags"] = "Suppress tags"; +$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Suppress listed hashtags at the end of posts."; +$a->strings["Path to item cache"] = "Path to item cache"; +$a->strings["The item caches buffers generated bbcode and external images."] = "The item caches buffers generated bbcode and external images."; +$a->strings["Cache duration in seconds"] = "Cache duration in seconds"; +$a->strings["How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1."] = "How long should cache files be held? (Default 86400 seconds - one day; -1 disables item cache)"; +$a->strings["Maximum numbers of comments per post"] = "Maximum numbers of comments per post"; +$a->strings["How much comments should be shown for each post? Default value is 100."] = "How many comments should be shown for each post? (Default 100)"; +$a->strings["Temp path"] = "Temp path"; +$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Enter a different tmp path, if your system restricts the webserver's access to the system temp path."; +$a->strings["Base path to installation"] = "Base path to installation"; +$a->strings["If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."] = "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."; +$a->strings["Disable picture proxy"] = "Disable picture proxy"; +$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."; +$a->strings["Only search in tags"] = "Only search in tags"; +$a->strings["On large systems the text search can slow down the system extremely."] = "On large systems the text search can slow down the system significantly."; +$a->strings["New base url"] = "New base URL"; +$a->strings["Change base url for this server. Sends relocate message to all DFRN contacts of all users."] = "Change base URL for this server. Sends relocate message to all DFRN contacts of all users."; +$a->strings["RINO Encryption"] = "RINO Encryption"; +$a->strings["Encryption layer between nodes."] = "Encryption layer between nodes."; +$a->strings["Maximum number of parallel workers"] = "Maximum number of parallel workers"; +$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "On shared hosts set this to 2. On larger systems, values of 10 are great. Default value is 4."; +$a->strings["Don't use 'proc_open' with the worker"] = "Don't use 'proc_open' with the worker"; +$a->strings["Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab."] = "Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosts. If this is enabled you should increase the frequency of poller calls in your crontab."; +$a->strings["Enable fastlane"] = "Enable fast-lane"; +$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "The fast-lane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."; +$a->strings["Enable frontend worker"] = "Enable frontend worker"; +$a->strings["When enabled the Worker process is triggered when backend access is performed (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."] = "If enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server. The worker background process needs to be activated for this."; +$a->strings["Update has been marked successful"] = "Update has been marked successful"; +$a->strings["Database structure update %s was successfully applied."] = "Database structure update %s was successfully applied."; +$a->strings["Executing of database structure update %s failed with error: %s"] = "Executing of database structure update %s failed with error: %s"; +$a->strings["Executing %s failed with error: %s"] = "Executing %s failed with error: %s"; +$a->strings["Update %s was successfully applied."] = "Update %s was successfully applied."; +$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s did not return a status. Unknown if it succeeded."; +$a->strings["There was no additional update function %s that needed to be called."] = "There was no additional update function %s that needed to be called."; +$a->strings["No failed updates."] = "No failed updates."; +$a->strings["Check database structure"] = "Check database structure"; +$a->strings["Failed Updates"] = "Failed updates"; +$a->strings["This does not include updates prior to 1139, which did not return a status."] = "This does not include updates prior to 1139, which did not return a status."; +$a->strings["Mark success (if update was manually applied)"] = "Mark success (if update was manually applied)"; +$a->strings["Attempt to execute this update step automatically"] = "Attempt to execute this update step automatically"; +$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "\n\t\t\tDear %1\$s,\n\t\t\t\tThe administrator of %2\$s has set up an account for you."; +$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%1\$s\n\t\t\tLogin Name:\t\t%2\$s\n\t\t\tPassword:\t\t%3\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4\$s."] = "\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, this may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tThank you and welcome to %4\$s."; +$a->strings["%s user blocked/unblocked"] = array( + 0 => "%s user blocked/unblocked", + 1 => "%s users blocked/unblocked", +); +$a->strings["%s user deleted"] = array( + 0 => "%s user deleted", + 1 => "%s users deleted", +); +$a->strings["User '%s' deleted"] = "User '%s' deleted"; +$a->strings["User '%s' unblocked"] = "User '%s' unblocked"; +$a->strings["User '%s' blocked"] = "User '%s' blocked"; +$a->strings["Register date"] = "Registration date"; +$a->strings["Last login"] = "Last login"; +$a->strings["Last item"] = "Last item"; +$a->strings["Account"] = "Account"; +$a->strings["Add User"] = "Add user"; +$a->strings["select all"] = "select all"; +$a->strings["User registrations waiting for confirm"] = "User registrations awaiting confirmation"; +$a->strings["User waiting for permanent deletion"] = "User awaiting permanent deletion"; +$a->strings["Request date"] = "Request date"; +$a->strings["No registrations."] = "No registrations."; +$a->strings["Note from the user"] = "Note from the user"; +$a->strings["Deny"] = "Deny"; +$a->strings["Site admin"] = "Site admin"; +$a->strings["Account expired"] = "Account expired"; +$a->strings["New User"] = "New user"; +$a->strings["Deleted since"] = "Deleted since"; +$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Selected users will be deleted!\\n\\nEverything these users has posted on this site will be permanently deleted!\\n\\nAre you sure?"; +$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"; +$a->strings["Name of the new user."] = "Name of the new user."; +$a->strings["Nickname"] = "Nickname"; +$a->strings["Nickname of the new user."] = "Nickname of the new user."; +$a->strings["Email address of the new user."] = "Email address of the new user."; +$a->strings["Plugin %s disabled."] = "Plugin %s disabled."; +$a->strings["Plugin %s enabled."] = "Plugin %s enabled."; +$a->strings["Disable"] = "Disable"; +$a->strings["Enable"] = "Enable"; +$a->strings["Toggle"] = "Toggle"; +$a->strings["Author: "] = "Author: "; +$a->strings["Maintainer: "] = "Maintainer: "; +$a->strings["Reload active plugins"] = "Reload active plugins"; +$a->strings["There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"] = "There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"; +$a->strings["No themes found."] = "No themes found."; +$a->strings["Screenshot"] = "Screenshot"; +$a->strings["Reload active themes"] = "Reload active themes"; +$a->strings["No themes found on the system. They should be paced in %1\$s"] = "No themes found on the system. They should be paced in %1\$s"; +$a->strings["[Experimental]"] = "[Experimental]"; +$a->strings["[Unsupported]"] = "[Unsupported]"; +$a->strings["Log settings updated."] = "Log settings updated."; +$a->strings["PHP log currently enabled."] = "PHP log currently enabled."; +$a->strings["PHP log currently disabled."] = "PHP log currently disabled."; +$a->strings["Clear"] = "Clear"; +$a->strings["Enable Debugging"] = "Enable debugging"; +$a->strings["Log file"] = "Log file"; +$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Must be writable by web server and relative to your Friendica top-level directory."; +$a->strings["Log level"] = "Log level"; +$a->strings["PHP logging"] = "PHP logging"; +$a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The file name set in the 'error_log' line is relative to the Friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."; +$a->strings["Off"] = "Off"; +$a->strings["On"] = "On"; +$a->strings["Lock feature %s"] = "Lock feature %s"; +$a->strings["Manage Additional Features"] = "Manage additional features"; $a->strings["Display"] = "Display"; $a->strings["Social Networks"] = "Social networks"; $a->strings["Connected apps"] = "Connected apps"; @@ -1919,23 +1919,23 @@ $a->strings["Account Types"] = "Account types:"; $a->strings["Personal Page Subtypes"] = "Personal Page subtypes"; $a->strings["Community Forum Subtypes"] = "Community forum subtypes"; $a->strings["Personal Page"] = "Personal Page"; -$a->strings["This account is a regular personal profile"] = "Regular personal profile"; +$a->strings["Account for a personal profile."] = "Account for a personal profile."; $a->strings["Organisation Page"] = "Organisation Page"; -$a->strings["This account is a profile for an organisation"] = "Profile for an organisation"; +$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Account for an organisation that automatically approves contact requests as \"Followers\"."; $a->strings["News Page"] = "News Page"; -$a->strings["This account is a news account/reflector"] = "News reflector"; +$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Account for a news reflector that automatically approves contact requests as \"Followers\"."; $a->strings["Community Forum"] = "Community Forum"; -$a->strings["This account is a community forum where people can discuss with each other"] = "Discussion forum for community"; +$a->strings["Account for community discussions."] = "Account for community discussions."; $a->strings["Normal Account Page"] = "Standard"; -$a->strings["This account is a normal personal profile"] = "Regular personal profile"; +$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."; $a->strings["Soapbox Page"] = "Soapbox"; -$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Automatically approves contact requests as followers"; +$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Account for a public profile that automatically approves contact requests as \"Followers\"."; $a->strings["Public Forum"] = "Public forum"; -$a->strings["Automatically approve all contact requests"] = "Automatically approve all contact requests"; -$a->strings["Automatic Friend Page"] = "Popularity"; -$a->strings["Automatically approve all connection/friend requests as friends"] = "Automatically approves contact requests as friends"; +$a->strings["Automatically approves all contact requests."] = "Automatically approves all contact requests."; +$a->strings["Automatic Friend Page"] = "Love-all"; +$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Account for a popular profile that automatically approves contact requests as \"Friends\"."; $a->strings["Private Forum [Experimental]"] = "Private forum [Experimental]"; -$a->strings["Private forum - approved members only"] = "Private forum - approved members only"; +$a->strings["Requires manual approval of contact requests."] = "Requires manual approval of contact requests."; $a->strings["OpenID:"] = "OpenID:"; $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Allow this OpenID to login to this account."; $a->strings["Publish your default profile in your local site directory?"] = "Publish default profile in local site directory?"; @@ -2036,7 +2036,7 @@ $a->strings["Left"] = "Left"; $a->strings["Center"] = "Centre"; $a->strings["Color scheme"] = "Colour scheme"; $a->strings["Posts font size"] = "Posts font size"; -$a->strings["Textareas font size"] = "Textareas font size"; +$a->strings["Textareas font size"] = "Text areas font size"; $a->strings["Comma separated list of helper forums"] = "Comma separated list of helper forums"; $a->strings["Set style"] = "Set style"; $a->strings["Community Pages"] = "Community pages"; diff --git a/view/lang/en-us/messages.po b/view/lang/en-us/messages.po index 2d5a0b4196..6622fa3810 100644 --- a/view/lang/en-us/messages.po +++ b/view/lang/en-us/messages.po @@ -1,14 +1,15 @@ # FRIENDICA Distributed Social Network # Copyright (C) 2010, 2011, 2012, 2013 the Friendica Project # This file is distributed under the same license as the Friendica package. -# +# # Translators: +# Andy H3 <andy@hubup.pro>, 2017 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-28 11:09+0200\n" -"PO-Revision-Date: 2017-06-05 15:09+0000\n" +"POT-Creation-Date: 2017-06-09 16:42+0700\n" +"PO-Revision-Date: 2017-06-17 12:57+0000\n" "Last-Translator: Andy H3 <andy@hubup.pro>\n" "Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n" "MIME-Version: 1.0\n" @@ -382,95 +383,20 @@ msgid "add" msgstr "add" #: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133 -#: view/theme/vier/theme.php:256 +#: view/theme/vier/theme.php:248 msgid "Forums" msgstr "Forums" -#: include/ForumManager.php:118 view/theme/vier/theme.php:258 +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 msgid "External link to forum" msgstr "External link to forum" #: include/ForumManager.php:121 include/contact_widgets.php:271 #: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: view/theme/vier/theme.php:261 src/App.php:506 +#: view/theme/vier/theme.php:253 src/App.php:506 msgid "show more" msgstr "Show more..." -#: include/NotificationsManager.php:153 -msgid "System" -msgstr "System" - -#: include/NotificationsManager.php:160 include/nav.php:160 mod/admin.php:518 -#: view/theme/frio/theme.php:255 -msgid "Network" -msgstr "Network" - -#: include/NotificationsManager.php:167 mod/network.php:835 -#: mod/profiles.php:699 -msgid "Personal" -msgstr "Personal" - -#: include/NotificationsManager.php:174 include/nav.php:107 -#: include/nav.php:163 -msgid "Home" -msgstr "Home" - -#: include/NotificationsManager.php:181 include/nav.php:168 -msgid "Introductions" -msgstr "Introductions" - -#: include/NotificationsManager.php:239 include/NotificationsManager.php:251 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s commented on %s's post" - -#: include/NotificationsManager.php:250 -#, php-format -msgid "%s created a new post" -msgstr "%s posted something new" - -#: include/NotificationsManager.php:265 -#, php-format -msgid "%s liked %s's post" -msgstr "%s liked %s's post" - -#: include/NotificationsManager.php:278 -#, php-format -msgid "%s disliked %s's post" -msgstr "%s disliked %s's post" - -#: include/NotificationsManager.php:291 -#, php-format -msgid "%s is attending %s's event" -msgstr "%s is going to %s's event" - -#: include/NotificationsManager.php:304 -#, php-format -msgid "%s is not attending %s's event" -msgstr "%s is not going to %s's event" - -#: include/NotificationsManager.php:317 -#, php-format -msgid "%s may attend %s's event" -msgstr "%s may go to %s's event" - -#: include/NotificationsManager.php:334 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s is now friends with %s" - -#: include/NotificationsManager.php:770 -msgid "Friend Suggestion" -msgstr "Friend suggestion" - -#: include/NotificationsManager.php:803 -msgid "Friend/Connect Request" -msgstr "Friend/Contact request" - -#: include/NotificationsManager.php:803 -msgid "New Follower" -msgstr "New follower" - #: include/acl_selectors.php:355 msgid "Post to Email" msgstr "Post to email" @@ -599,11 +525,11 @@ msgid "Find" msgstr "Find" #: include/contact_widgets.php:37 mod/suggest.php:116 -#: view/theme/vier/theme.php:203 +#: view/theme/vier/theme.php:195 msgid "Friend Suggestions" msgstr "Friend suggestions" -#: include/contact_widgets.php:38 view/theme/vier/theme.php:202 +#: include/contact_widgets.php:38 view/theme/vier/theme.php:194 msgid "Similar Interests" msgstr "Similar interests" @@ -611,7 +537,7 @@ msgstr "Similar interests" msgid "Random Profile" msgstr "Random profile" -#: include/contact_widgets.php:40 view/theme/vier/theme.php:204 +#: include/contact_widgets.php:40 view/theme/vier/theme.php:196 msgid "Invite Friends" msgstr "Invite friends" @@ -741,8 +667,8 @@ msgid "Select" msgstr "Select" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 -#: mod/photos.php:1731 mod/admin.php:1514 mod/contacts.php:819 -#: mod/contacts.php:1018 mod/settings.php:745 object/Item.php:138 +#: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 +#: mod/admin.php:1514 mod/settings.php:745 object/Item.php:138 msgid "Delete" msgstr "Delete" @@ -1724,22 +1650,6 @@ msgstr "post" msgid "Item filed" msgstr "Item filed" -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "Drop contact" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "Organization" - -#: include/Contact.php:822 -msgid "News" -msgstr "News" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "Forum" - #: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 msgid "Image/photo" msgstr "Image/Photo" @@ -1765,6 +1675,22 @@ msgstr "Invalid source protocol" msgid "Invalid link protocol" msgstr "Invalid link protocol" +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "Drop contact" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "Organization" + +#: include/Contact.php:822 +msgid "News" +msgstr "News" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "Forum" + #: include/enotify.php:27 msgid "Friendica Notification" msgstr "Friendica notification" @@ -2076,7 +2002,7 @@ msgstr "Nothing new here" msgid "Clear notifications" msgstr "Clear notifications" -#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:862 +#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:869 msgid "Logout" msgstr "Logout" @@ -2139,7 +2065,7 @@ msgstr "Personal notes" msgid "Your personal notes" msgstr "My personal notes" -#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:863 +#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:870 msgid "Login" msgstr "Login" @@ -2147,19 +2073,24 @@ msgstr "Login" msgid "Sign in" msgstr "Sign in" +#: include/nav.php:107 include/nav.php:163 +#: include/NotificationsManager.php:176 +msgid "Home" +msgstr "Home" + #: include/nav.php:107 msgid "Home Page" msgstr "Home page" -#: include/nav.php:111 mod/register.php:291 boot.php:839 +#: include/nav.php:111 mod/register.php:291 boot.php:846 msgid "Register" -msgstr "Register" +msgstr "Sign up now >>" #: include/nav.php:111 msgid "Create an account" msgstr "Create account" -#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:299 +#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 msgid "Help" msgstr "Help" @@ -2212,6 +2143,11 @@ msgstr "Information" msgid "Information about this friendica instance" msgstr "Information about this Friendica instance" +#: include/nav.php:160 include/NotificationsManager.php:162 mod/admin.php:518 +#: view/theme/frio/theme.php:255 +msgid "Network" +msgstr "Network" + #: include/nav.php:160 view/theme/frio/theme.php:255 msgid "Conversations from your friends" msgstr "My friends' conversations" @@ -2224,6 +2160,10 @@ msgstr "Network reset" msgid "Load Network page with no filters" msgstr "Load network page without filters" +#: include/nav.php:168 include/NotificationsManager.php:183 +msgid "Introductions" +msgstr "Introductions" + #: include/nav.php:168 msgid "Friend Requests" msgstr "Friend requests" @@ -2444,7 +2384,7 @@ msgid "Friends" msgstr "Friends" #: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3697 mod/photos.php:73 mod/photos.php:189 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 #: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 #: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 #: mod/profile_photo.php:90 mod/profile_photo.php:214 @@ -2459,7 +2399,7 @@ msgid "" "\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 "\n\t\tDear %1$s,\n\t\t\tThank you for registering at %2$s. Your account is pending approval by the administrator.\n\t" +msgstr "\n\t\tDear %1$s,\n\t\t\tThank you for signing up at %2$s. Your account is pending approval by the administrator.\n\t" #: include/user.php:407 #, php-format @@ -2473,7 +2413,7 @@ msgid "" "\t\tDear %1$s,\n" "\t\t\tThank you for registering at %2$s. Your account has been created.\n" "\t" -msgstr "\n\t\tDear %1$s,\n\t\t\tThank you for registering at %2$s. Your account has been created.\n\t" +msgstr "\n\t\tDear %1$s,\n\t\t\tThank you for signing up at %2$s. Your account has been created.\n\t" #: include/user.php:421 #, php-format @@ -2510,6 +2450,308 @@ msgstr "\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3$s\n\t\ msgid "Registration details for %s" msgstr "Registration details for %s" +#: include/dba_pdo.php:76 include/dba.php:57 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Cannot locate DNS info for database server '%s'" + +#: include/plugin.php:532 include/plugin.php:534 +msgid "Click here to upgrade." +msgstr "Click here to upgrade." + +#: include/plugin.php:541 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "This action exceeds the limits set by your subscription plan." + +#: include/plugin.php:546 +msgid "This action is not available under your subscription plan." +msgstr "This action is not available under your subscription plan." + +#: include/profile_selectors.php:6 +msgid "Male" +msgstr "Male" + +#: include/profile_selectors.php:6 +msgid "Female" +msgstr "Female" + +#: include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Currently Male" + +#: include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Currently Female" + +#: include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Mostly Male" + +#: include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Mostly Female" + +#: include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transgender" + +#: include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Intersex" + +#: include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transsexual" + +#: include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Hermaphrodite" + +#: include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Neuter" + +#: include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "Non-specific" + +#: include/profile_selectors.php:6 +msgid "Other" +msgstr "Other" + +#: include/profile_selectors.php:23 +msgid "Males" +msgstr "Males" + +#: include/profile_selectors.php:23 +msgid "Females" +msgstr "Females" + +#: include/profile_selectors.php:23 +msgid "Gay" +msgstr "Gay" + +#: include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "Lesbian" + +#: include/profile_selectors.php:23 +msgid "No Preference" +msgstr "No Preference" + +#: include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "Bisexual" + +#: include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "Auto-sexual" + +#: include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "Abstinent" + +#: include/profile_selectors.php:23 +msgid "Virgin" +msgstr "Virgin" + +#: include/profile_selectors.php:23 +msgid "Deviant" +msgstr "Deviant" + +#: include/profile_selectors.php:23 +msgid "Fetish" +msgstr "Fetish" + +#: include/profile_selectors.php:23 +msgid "Oodles" +msgstr "Oodles" + +#: include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "Asexual" + +#: include/profile_selectors.php:42 +msgid "Single" +msgstr "Single" + +#: include/profile_selectors.php:42 +msgid "Lonely" +msgstr "Lonely" + +#: include/profile_selectors.php:42 +msgid "Available" +msgstr "Available" + +#: include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "Unavailable" + +#: include/profile_selectors.php:42 +msgid "Has crush" +msgstr "Having a crush" + +#: include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "Infatuated" + +#: include/profile_selectors.php:42 +msgid "Dating" +msgstr "Dating" + +#: include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "Unfaithful" + +#: include/profile_selectors.php:42 +msgid "Sex Addict" +msgstr "Sex addict" + +#: include/profile_selectors.php:42 +msgid "Friends/Benefits" +msgstr "Friends with benefits" + +#: include/profile_selectors.php:42 +msgid "Casual" +msgstr "Casual" + +#: include/profile_selectors.php:42 +msgid "Engaged" +msgstr "Engaged" + +#: include/profile_selectors.php:42 +msgid "Married" +msgstr "Married" + +#: include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "Imaginarily married" + +#: include/profile_selectors.php:42 +msgid "Partners" +msgstr "Partners" + +#: include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "Cohabiting" + +#: include/profile_selectors.php:42 +msgid "Common law" +msgstr "Common law spouse" + +#: include/profile_selectors.php:42 +msgid "Happy" +msgstr "Happy" + +#: include/profile_selectors.php:42 +msgid "Not looking" +msgstr "Not looking" + +#: include/profile_selectors.php:42 +msgid "Swinger" +msgstr "Swinger" + +#: include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "Betrayed" + +#: include/profile_selectors.php:42 +msgid "Separated" +msgstr "Separated" + +#: include/profile_selectors.php:42 +msgid "Unstable" +msgstr "Unstable" + +#: include/profile_selectors.php:42 +msgid "Divorced" +msgstr "Divorced" + +#: include/profile_selectors.php:42 +msgid "Imaginarily divorced" +msgstr "Imaginarily divorced" + +#: include/profile_selectors.php:42 +msgid "Widowed" +msgstr "Widowed" + +#: include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "Uncertain" + +#: include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "It's complicated" + +#: include/profile_selectors.php:42 +msgid "Don't care" +msgstr "Don't care" + +#: include/profile_selectors.php:42 +msgid "Ask me" +msgstr "Ask me" + +#: include/NotificationsManager.php:155 +msgid "System" +msgstr "System" + +#: include/NotificationsManager.php:169 mod/network.php:835 +#: mod/profiles.php:699 +msgid "Personal" +msgstr "Personal" + +#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 +#, php-format +msgid "%s commented on %s's post" +msgstr "%s commented on %s's post" + +#: include/NotificationsManager.php:252 +#, php-format +msgid "%s created a new post" +msgstr "%s posted something new" + +#: include/NotificationsManager.php:267 +#, php-format +msgid "%s liked %s's post" +msgstr "%s liked %s's post" + +#: include/NotificationsManager.php:280 +#, php-format +msgid "%s disliked %s's post" +msgstr "%s disliked %s's post" + +#: include/NotificationsManager.php:293 +#, php-format +msgid "%s is attending %s's event" +msgstr "%s is going to %s's event" + +#: include/NotificationsManager.php:306 +#, php-format +msgid "%s is not attending %s's event" +msgstr "%s is not going to %s's event" + +#: include/NotificationsManager.php:319 +#, php-format +msgid "%s may attend %s's event" +msgstr "%s may go to %s's event" + +#: include/NotificationsManager.php:336 +#, php-format +msgid "%s is now friends with %s" +msgstr "%s is now friends with %s" + +#: include/NotificationsManager.php:774 +msgid "Friend Suggestion" +msgstr "Friend suggestion" + +#: include/NotificationsManager.php:803 +msgid "Friend/Connect Request" +msgstr "Friend/Contact request" + +#: include/NotificationsManager.php:803 +msgid "New Follower" +msgstr "New follower" + #: include/api.php:1102 #, php-format msgid "Daily posting limit of %d posts reached. The post was rejected." @@ -2525,11 +2767,6 @@ msgstr "Weekly posting limit of %d posts reached. This post was rejected." msgid "Monthly posting limit of %d posts reached. The post was rejected." msgstr "Monthly posting limit of %d posts reached. This post was rejected." -#: include/dba.php:57 include/dba_pdo.php:75 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "Cannot locate DNS info for database server '%s'" - #: include/dbstructure.php:25 msgid "There are no tables on MyISAM." msgstr "There are no tables on MyISAM." @@ -2772,8 +3009,8 @@ msgstr "Forums:" msgid "Basic" msgstr "Basic" -#: include/identity.php:761 mod/events.php:510 mod/admin.php:1065 -#: mod/contacts.php:881 +#: include/identity.php:761 mod/events.php:510 mod/contacts.php:881 +#: mod/admin.php:1065 msgid "Advanced" msgstr "Advanced" @@ -2865,242 +3102,6 @@ msgstr "%s stopped following %s." msgid "stopped following" msgstr "stopped following" -#: include/plugin.php:531 include/plugin.php:533 -msgid "Click here to upgrade." -msgstr "Click here to upgrade." - -#: include/plugin.php:539 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "This action exceeds the limits set by your subscription plan." - -#: include/plugin.php:544 -msgid "This action is not available under your subscription plan." -msgstr "This action is not available under your subscription plan." - -#: include/profile_selectors.php:6 -msgid "Male" -msgstr "Male" - -#: include/profile_selectors.php:6 -msgid "Female" -msgstr "Female" - -#: include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Currently Male" - -#: include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Currently Female" - -#: include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Mostly Male" - -#: include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Mostly Female" - -#: include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transgender" - -#: include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Intersex" - -#: include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transsexual" - -#: include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Hermaphrodite" - -#: include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Neuter" - -#: include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Non-specific" - -#: include/profile_selectors.php:6 -msgid "Other" -msgstr "Other" - -#: include/profile_selectors.php:23 -msgid "Males" -msgstr "Males" - -#: include/profile_selectors.php:23 -msgid "Females" -msgstr "Females" - -#: include/profile_selectors.php:23 -msgid "Gay" -msgstr "Gay" - -#: include/profile_selectors.php:23 -msgid "Lesbian" -msgstr "Lesbian" - -#: include/profile_selectors.php:23 -msgid "No Preference" -msgstr "No Preference" - -#: include/profile_selectors.php:23 -msgid "Bisexual" -msgstr "Bisexual" - -#: include/profile_selectors.php:23 -msgid "Autosexual" -msgstr "Auto-sexual" - -#: include/profile_selectors.php:23 -msgid "Abstinent" -msgstr "Abstinent" - -#: include/profile_selectors.php:23 -msgid "Virgin" -msgstr "Virgin" - -#: include/profile_selectors.php:23 -msgid "Deviant" -msgstr "Deviant" - -#: include/profile_selectors.php:23 -msgid "Fetish" -msgstr "Fetish" - -#: include/profile_selectors.php:23 -msgid "Oodles" -msgstr "Oodles" - -#: include/profile_selectors.php:23 -msgid "Nonsexual" -msgstr "Asexual" - -#: include/profile_selectors.php:42 -msgid "Single" -msgstr "Single" - -#: include/profile_selectors.php:42 -msgid "Lonely" -msgstr "Lonely" - -#: include/profile_selectors.php:42 -msgid "Available" -msgstr "Available" - -#: include/profile_selectors.php:42 -msgid "Unavailable" -msgstr "Unavailable" - -#: include/profile_selectors.php:42 -msgid "Has crush" -msgstr "Having a crush" - -#: include/profile_selectors.php:42 -msgid "Infatuated" -msgstr "Infatuated" - -#: include/profile_selectors.php:42 -msgid "Dating" -msgstr "Dating" - -#: include/profile_selectors.php:42 -msgid "Unfaithful" -msgstr "Unfaithful" - -#: include/profile_selectors.php:42 -msgid "Sex Addict" -msgstr "Sex addict" - -#: include/profile_selectors.php:42 -msgid "Friends/Benefits" -msgstr "Friends with benefits" - -#: include/profile_selectors.php:42 -msgid "Casual" -msgstr "Casual" - -#: include/profile_selectors.php:42 -msgid "Engaged" -msgstr "Engaged" - -#: include/profile_selectors.php:42 -msgid "Married" -msgstr "Married" - -#: include/profile_selectors.php:42 -msgid "Imaginarily married" -msgstr "Imaginarily married" - -#: include/profile_selectors.php:42 -msgid "Partners" -msgstr "Partners" - -#: include/profile_selectors.php:42 -msgid "Cohabiting" -msgstr "Cohabiting" - -#: include/profile_selectors.php:42 -msgid "Common law" -msgstr "Common law spouse" - -#: include/profile_selectors.php:42 -msgid "Happy" -msgstr "Happy" - -#: include/profile_selectors.php:42 -msgid "Not looking" -msgstr "Not looking" - -#: include/profile_selectors.php:42 -msgid "Swinger" -msgstr "Swinger" - -#: include/profile_selectors.php:42 -msgid "Betrayed" -msgstr "Betrayed" - -#: include/profile_selectors.php:42 -msgid "Separated" -msgstr "Separated" - -#: include/profile_selectors.php:42 -msgid "Unstable" -msgstr "Unstable" - -#: include/profile_selectors.php:42 -msgid "Divorced" -msgstr "Divorced" - -#: include/profile_selectors.php:42 -msgid "Imaginarily divorced" -msgstr "Imaginarily divorced" - -#: include/profile_selectors.php:42 -msgid "Widowed" -msgstr "Widowed" - -#: include/profile_selectors.php:42 -msgid "Uncertain" -msgstr "Uncertain" - -#: include/profile_selectors.php:42 -msgid "It's complicated" -msgstr "It's complicated" - -#: include/profile_selectors.php:42 -msgid "Don't care" -msgstr "Don't care" - -#: include/profile_selectors.php:42 -msgid "Ask me" -msgstr "Ask me" - #: mod/allfriends.php:48 msgid "No friends to display." msgstr "No friends to display." @@ -3669,7 +3670,7 @@ msgstr "%1$s has joined %2$s" msgid "%1$s welcomes %2$s" msgstr "%1$s welcomes %2$s" -#: mod/directory.php:195 view/theme/vier/theme.php:201 +#: mod/directory.php:195 view/theme/vier/theme.php:193 msgid "Global Directory" msgstr "Global Directory" @@ -4362,7 +4363,7 @@ msgstr "Visit %s for a list of public sites that you can join. Friendica members msgid "" "To accept this invitation, please visit and register at %s or any other " "public Friendica website." -msgstr "To accept this invitation, please register at %s or any other public Friendica website." +msgstr "To accept this invitation, please sign up at %s or any other public Friendica website." #: mod/invite.php:127 #, php-format @@ -4405,7 +4406,7 @@ msgstr "You will need to supply this invitation code: $invite_code" #: mod/invite.php:141 msgid "" "Once you have registered, please connect with me via my profile page at:" -msgstr "Once you have registered, please connect with me via my profile page at:" +msgstr "Once you have signed up, please connect with me via my profile page at:" #: mod/invite.php:143 msgid "" @@ -4502,9 +4503,9 @@ msgid "" "Password reset failed." msgstr "Request could not be verified. (You may have previously submitted it.) Password reset failed." -#: mod/lostpass.php:112 boot.php:877 +#: mod/lostpass.php:112 boot.php:884 msgid "Password Reset" -msgstr "Password reset" +msgstr "Forgotten password?" #: mod/lostpass.php:113 msgid "Your password has been reset as requested." @@ -4568,7 +4569,7 @@ msgid "" "your email for further instructions." msgstr "Enter email address or nickname to reset your password. You will receive further instruction via email." -#: mod/lostpass.php:163 boot.php:865 +#: mod/lostpass.php:163 boot.php:872 msgid "Nickname or Email: " msgstr "Nickname or email: " @@ -5352,18 +5353,6 @@ msgstr "Map" msgid "View Album" msgstr "View album" -#: mod/ping.php:273 -msgid "{0} wants to be your friend" -msgstr "{0} wants to be your friend" - -#: mod/ping.php:288 -msgid "{0} sent you a message" -msgstr "{0} sent you a message" - -#: mod/ping.php:303 -msgid "{0} requested registration" -msgstr "{0} requested registration" - #: mod/poke.php:197 msgid "Poke/Prod" msgstr "Poke/Prod" @@ -5438,7 +5427,7 @@ msgstr "This site has exceeded the number of allowed daily account registrations msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." -msgstr "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'." +msgstr "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Sign up now'." #: mod/register.php:229 msgid "" @@ -5472,7 +5461,7 @@ msgstr "Your invitation ID: " #: mod/register.php:274 mod/admin.php:1062 msgid "Registration" -msgstr "Registration" +msgstr "Join this Friendica Node Today" #: mod/register.php:282 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " @@ -5917,6 +5906,712 @@ msgid "" "select \"Export account\"" msgstr "To export your account, go to \"Settings->Export personal data\" and select \"Export account\"" +#: mod/contacts.php:137 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "%d contact edited." +msgstr[1] "%d contacts edited." + +#: mod/contacts.php:172 mod/contacts.php:381 +msgid "Could not access contact record." +msgstr "Could not access contact record." + +#: mod/contacts.php:186 +msgid "Could not locate selected profile." +msgstr "Could not locate selected profile." + +#: mod/contacts.php:219 +msgid "Contact updated." +msgstr "Contact updated." + +#: mod/contacts.php:402 +msgid "Contact has been blocked" +msgstr "Contact has been blocked" + +#: mod/contacts.php:402 +msgid "Contact has been unblocked" +msgstr "Contact has been unblocked" + +#: mod/contacts.php:413 +msgid "Contact has been ignored" +msgstr "Contact has been ignored" + +#: mod/contacts.php:413 +msgid "Contact has been unignored" +msgstr "Contact has been unignored" + +#: mod/contacts.php:425 +msgid "Contact has been archived" +msgstr "Contact has been archived" + +#: mod/contacts.php:425 +msgid "Contact has been unarchived" +msgstr "Contact has been unarchived" + +#: mod/contacts.php:450 +msgid "Drop contact" +msgstr "Drop contact" + +#: mod/contacts.php:453 mod/contacts.php:812 +msgid "Do you really want to delete this contact?" +msgstr "Do you really want to delete this contact?" + +#: mod/contacts.php:472 +msgid "Contact has been removed." +msgstr "Contact has been removed." + +#: mod/contacts.php:509 +#, php-format +msgid "You are mutual friends with %s" +msgstr "You are mutual friends with %s" + +#: mod/contacts.php:513 +#, php-format +msgid "You are sharing with %s" +msgstr "You are sharing with %s" + +#: mod/contacts.php:518 +#, php-format +msgid "%s is sharing with you" +msgstr "%s is sharing with you" + +#: mod/contacts.php:538 +msgid "Private communications are not available for this contact." +msgstr "Private communications are not available for this contact." + +#: mod/contacts.php:541 mod/admin.php:984 +msgid "Never" +msgstr "Never" + +#: mod/contacts.php:545 +msgid "(Update was successful)" +msgstr "(Update was successful)" + +#: mod/contacts.php:545 +msgid "(Update was not successful)" +msgstr "(Update was not successful)" + +#: mod/contacts.php:547 mod/contacts.php:975 +msgid "Suggest friends" +msgstr "Suggest friends" + +#: mod/contacts.php:551 +#, php-format +msgid "Network type: %s" +msgstr "Network type: %s" + +#: mod/contacts.php:564 +msgid "Communications lost with this contact!" +msgstr "Communications lost with this contact!" + +#: mod/contacts.php:567 +msgid "Fetch further information for feeds" +msgstr "Fetch further information for feeds" + +#: mod/contacts.php:568 mod/admin.php:993 +msgid "Disabled" +msgstr "Disabled" + +#: mod/contacts.php:568 +msgid "Fetch information" +msgstr "Fetch information" + +#: mod/contacts.php:568 +msgid "Fetch information and keywords" +msgstr "Fetch information and keywords" + +#: mod/contacts.php:586 +msgid "Contact" +msgstr "Contact" + +#: mod/contacts.php:589 +msgid "Profile Visibility" +msgstr "Profile visibility" + +#: mod/contacts.php:590 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Please choose the profile you would like to display to %s when viewing your profile securely." + +#: mod/contacts.php:591 +msgid "Contact Information / Notes" +msgstr "Personal note" + +#: mod/contacts.php:592 +msgid "Edit contact notes" +msgstr "Edit contact notes" + +#: mod/contacts.php:598 +msgid "Block/Unblock contact" +msgstr "Block/Unblock contact" + +#: mod/contacts.php:599 +msgid "Ignore contact" +msgstr "Ignore contact" + +#: mod/contacts.php:600 +msgid "Repair URL settings" +msgstr "Repair URL settings" + +#: mod/contacts.php:601 +msgid "View conversations" +msgstr "View conversations" + +#: mod/contacts.php:607 +msgid "Last update:" +msgstr "Last update:" + +#: mod/contacts.php:609 +msgid "Update public posts" +msgstr "Update public posts" + +#: mod/contacts.php:611 mod/contacts.php:985 +msgid "Update now" +msgstr "Update now" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1516 +msgid "Unblock" +msgstr "Unblock" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1515 +msgid "Block" +msgstr "Block" + +#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 +msgid "Unignore" +msgstr "Unignore" + +#: mod/contacts.php:621 +msgid "Currently blocked" +msgstr "Currently blocked" + +#: mod/contacts.php:622 +msgid "Currently ignored" +msgstr "Currently ignored" + +#: mod/contacts.php:623 +msgid "Currently archived" +msgstr "Currently archived" + +#: mod/contacts.php:624 +msgid "" +"Replies/likes to your public posts <strong>may</strong> still be visible" +msgstr "Replies/Likes to your public posts <strong>may</strong> still be visible" + +#: mod/contacts.php:625 +msgid "Notification for new posts" +msgstr "Notification for new posts" + +#: mod/contacts.php:625 +msgid "Send a notification of every new post of this contact" +msgstr "Send notification for every new post from this contact" + +#: mod/contacts.php:628 +msgid "Blacklisted keywords" +msgstr "Blacklisted keywords" + +#: mod/contacts.php:628 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected" + +#: mod/contacts.php:646 +msgid "Actions" +msgstr "Actions" + +#: mod/contacts.php:649 +msgid "Contact Settings" +msgstr "Notification and privacy " + +#: mod/contacts.php:695 +msgid "Suggestions" +msgstr "Suggestions" + +#: mod/contacts.php:698 +msgid "Suggest potential friends" +msgstr "Suggest potential friends" + +#: mod/contacts.php:706 +msgid "Show all contacts" +msgstr "Show all contacts" + +#: mod/contacts.php:711 +msgid "Unblocked" +msgstr "Unblocked" + +#: mod/contacts.php:714 +msgid "Only show unblocked contacts" +msgstr "Only show unblocked contacts" + +#: mod/contacts.php:720 +msgid "Blocked" +msgstr "Blocked" + +#: mod/contacts.php:723 +msgid "Only show blocked contacts" +msgstr "Only show blocked contacts" + +#: mod/contacts.php:729 +msgid "Ignored" +msgstr "Ignored" + +#: mod/contacts.php:732 +msgid "Only show ignored contacts" +msgstr "Only show ignored contacts" + +#: mod/contacts.php:738 +msgid "Archived" +msgstr "Archived" + +#: mod/contacts.php:741 +msgid "Only show archived contacts" +msgstr "Only show archived contacts" + +#: mod/contacts.php:747 +msgid "Hidden" +msgstr "Hidden" + +#: mod/contacts.php:750 +msgid "Only show hidden contacts" +msgstr "Only show hidden contacts" + +#: mod/contacts.php:807 +msgid "Search your contacts" +msgstr "Search your contacts" + +#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 +msgid "Update" +msgstr "Update" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Archive" +msgstr "Archive" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Unarchive" +msgstr "Unarchive" + +#: mod/contacts.php:821 +msgid "Batch Actions" +msgstr "Batch actions" + +#: mod/contacts.php:867 +msgid "View all contacts" +msgstr "View all contacts" + +#: mod/contacts.php:877 +msgid "View all common friends" +msgstr "View all common friends" + +#: mod/contacts.php:884 +msgid "Advanced Contact Settings" +msgstr "Advanced contact settings" + +#: mod/contacts.php:918 +msgid "Mutual Friendship" +msgstr "Mutual friendship" + +#: mod/contacts.php:922 +msgid "is a fan of yours" +msgstr "is a fan of yours" + +#: mod/contacts.php:926 +msgid "you are a fan of" +msgstr "I follow them" + +#: mod/contacts.php:996 +msgid "Toggle Blocked status" +msgstr "Toggle blocked status" + +#: mod/contacts.php:1004 +msgid "Toggle Ignored status" +msgstr "Toggle ignored status" + +#: mod/contacts.php:1012 +msgid "Toggle Archive status" +msgstr "Toggle archive status" + +#: mod/contacts.php:1020 +msgid "Delete contact" +msgstr "Delete contact" + +#: mod/ping.php:274 +msgid "{0} wants to be your friend" +msgstr "{0} wants to be your friend" + +#: mod/ping.php:289 +msgid "{0} sent you a message" +msgstr "{0} sent you a message" + +#: mod/ping.php:304 +msgid "{0} requested registration" +msgstr "{0} requested registration" + +#: mod/profile_photo.php:44 +msgid "Image uploaded but image cropping failed." +msgstr "Image uploaded but image cropping failed." + +#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: mod/profile_photo.php:322 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "Image size reduction [%s] failed." + +#: mod/profile_photo.php:127 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Shift-reload the page or clear browser cache if the new photo does not display immediately." + +#: mod/profile_photo.php:136 +msgid "Unable to process image" +msgstr "Unable to process image" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "Upload File:" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "Select a profile:" + +#: mod/profile_photo.php:256 +msgid "Upload" +msgstr "Upload" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "or" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "skip this step" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "select a photo from your photo albums" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "Crop Image" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Please adjust the image cropping for optimum viewing." + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "Done editing" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "Image uploaded successfully." + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "Profile deleted." + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "Profile-" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "New profile created." + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "Profile unavailable to clone." + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "Profile name is required." + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "Marital status" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "Romantic partner" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "Work/Employment:" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "Religion" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "Political views" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "Gender" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "Sexual preference" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "XMPP" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "Homepage" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "Interests" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "Address" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "Location" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "Profile updated." + +#: mod/profiles.php:567 +msgid " and " +msgstr " and " + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "public profile" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s changed %2$s to “%3$s”" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " - Visit %1$s's %2$s" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s has an updated %2$s, changing %3$s." + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "Hide contacts and friends:" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Hide your contact/friend list from viewers of this profile?" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "Show more profile fields:" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "Profile actions" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "Edit Profile Details" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "Change profile photo" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "View this profile" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "Create a new profile using these settings" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "Clone this profile" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "Delete this profile" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "Basic information" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "Profile picture" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "Preferences" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "Status information" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "Additional information" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "Relation" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "Gender:" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "<span class=\"heart\">♥</span> Marital status:" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "Example: fishing photography software" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "Profile name:" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet." + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "My full name:" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "Title/Description:" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "Street address:" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "Locality/City:" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "Region/State:" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "Postcode:" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "Country:" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "Who: (if applicable)" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Examples: cathy123, Cathy Williams, cathy@example.com" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "Since when:" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "About myself:" + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "XMPP (Jabber) address:" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow" +" you." +msgstr "The XMPP address will be propagated to your contacts so that they can follow you." + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "Homepage URL:" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "Religious views:" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "Public keywords:" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "Used for suggesting potential friends, can be seen by others." + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "Private keywords:" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "Used for searching profiles, never shown to others." + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "Music:" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "Books, literature, poetry:" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "Television:" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "Film, dance, culture, entertainment" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "Hobbies/Interests:" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "Love/Romance:" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "Work/Employment:" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "School/Education:" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "Contact information and other social networks:" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "Edit/Manage Profiles" + #: mod/admin.php:97 msgid "Theme settings updated." msgstr "Theme settings updated." @@ -6169,7 +6864,7 @@ msgstr "Summary" #: mod/admin.php:595 msgid "Registered users" -msgstr "Registered users" +msgstr "Signed up users" #: mod/admin.php:597 msgid "Pending registrations" @@ -6207,18 +6902,10 @@ msgstr "Public postings from users of this site" msgid "Global community page" msgstr "Global community page" -#: mod/admin.php:984 mod/contacts.php:541 -msgid "Never" -msgstr "Never" - #: mod/admin.php:985 msgid "At post arrival" msgstr "At post arrival" -#: mod/admin.php:993 mod/contacts.php:568 -msgid "Disabled" -msgstr "Disabled" - #: mod/admin.php:995 msgid "Users, Global Contacts" msgstr "Users, Global Contacts" @@ -6441,7 +7128,7 @@ msgstr "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is #: mod/admin.php:1090 msgid "Register policy" -msgstr "Register policy" +msgstr "Registration policy" #: mod/admin.php:1091 msgid "Maximum Daily Registrations" @@ -6452,11 +7139,11 @@ msgid "" "If registration is permitted above, this sets the maximum number of new user" " registrations to accept per day. If register is set to closed, this " "setting has no effect." -msgstr "If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect." +msgstr "If open registration is permitted, this sets the maximum number of new registrations per day. This setting has no effect for registrations by approval." #: mod/admin.php:1092 msgid "Register text" -msgstr "Register text" +msgstr "Registration text" #: mod/admin.php:1092 msgid "Will be displayed prominently on the registration page." @@ -6589,7 +7276,7 @@ msgstr "Block multiple registrations" #: mod/admin.php:1105 msgid "Disallow users to register additional accounts for use as pages." -msgstr "Disallow users to register additional accounts for use as pages." +msgstr "Disallow users to sign up for additional accounts." #: mod/admin.php:1106 msgid "OpenID support" @@ -6607,7 +7294,7 @@ msgstr "Full name check" msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" -msgstr "Force users to register with a space between first name and last name in the full name field; it may reduce spam and abuse registrations." +msgstr "Force users to sign up with a space between first name and last name in the full name field; it may reduce spam and abuse registrations." #: mod/admin.php:1108 msgid "Community Page Style" @@ -7092,7 +7779,7 @@ msgstr "User '%s' blocked" #: mod/admin.php:1496 mod/admin.php:1522 msgid "Register date" -msgstr "Register date" +msgstr "Registration date" #: mod/admin.php:1496 mod/admin.php:1522 msgid "Last login" @@ -7138,16 +7825,6 @@ msgstr "Note from the user" msgid "Deny" msgstr "Deny" -#: mod/admin.php:1515 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Block" -msgstr "Block" - -#: mod/admin.php:1516 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Unblock" -msgstr "Unblock" - #: mod/admin.php:1517 msgid "Site admin" msgstr "Site admin" @@ -7323,682 +8000,6 @@ msgstr "Lock feature %s" msgid "Manage Additional Features" msgstr "Manage additional features" -#: mod/contacts.php:137 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "%d contact edited." -msgstr[1] "%d contacts edited." - -#: mod/contacts.php:172 mod/contacts.php:381 -msgid "Could not access contact record." -msgstr "Could not access contact record." - -#: mod/contacts.php:186 -msgid "Could not locate selected profile." -msgstr "Could not locate selected profile." - -#: mod/contacts.php:219 -msgid "Contact updated." -msgstr "Contact updated." - -#: mod/contacts.php:402 -msgid "Contact has been blocked" -msgstr "Contact has been blocked" - -#: mod/contacts.php:402 -msgid "Contact has been unblocked" -msgstr "Contact has been unblocked" - -#: mod/contacts.php:413 -msgid "Contact has been ignored" -msgstr "Contact has been ignored" - -#: mod/contacts.php:413 -msgid "Contact has been unignored" -msgstr "Contact has been unignored" - -#: mod/contacts.php:425 -msgid "Contact has been archived" -msgstr "Contact has been archived" - -#: mod/contacts.php:425 -msgid "Contact has been unarchived" -msgstr "Contact has been unarchived" - -#: mod/contacts.php:450 -msgid "Drop contact" -msgstr "Drop contact" - -#: mod/contacts.php:453 mod/contacts.php:812 -msgid "Do you really want to delete this contact?" -msgstr "Do you really want to delete this contact?" - -#: mod/contacts.php:472 -msgid "Contact has been removed." -msgstr "Contact has been removed." - -#: mod/contacts.php:509 -#, php-format -msgid "You are mutual friends with %s" -msgstr "You are mutual friends with %s" - -#: mod/contacts.php:513 -#, php-format -msgid "You are sharing with %s" -msgstr "You are sharing with %s" - -#: mod/contacts.php:518 -#, php-format -msgid "%s is sharing with you" -msgstr "%s is sharing with you" - -#: mod/contacts.php:538 -msgid "Private communications are not available for this contact." -msgstr "Private communications are not available for this contact." - -#: mod/contacts.php:545 -msgid "(Update was successful)" -msgstr "(Update was successful)" - -#: mod/contacts.php:545 -msgid "(Update was not successful)" -msgstr "(Update was not successful)" - -#: mod/contacts.php:547 mod/contacts.php:975 -msgid "Suggest friends" -msgstr "Suggest friends" - -#: mod/contacts.php:551 -#, php-format -msgid "Network type: %s" -msgstr "Network type: %s" - -#: mod/contacts.php:564 -msgid "Communications lost with this contact!" -msgstr "Communications lost with this contact!" - -#: mod/contacts.php:567 -msgid "Fetch further information for feeds" -msgstr "Fetch further information for feeds" - -#: mod/contacts.php:568 -msgid "Fetch information" -msgstr "Fetch information" - -#: mod/contacts.php:568 -msgid "Fetch information and keywords" -msgstr "Fetch information and keywords" - -#: mod/contacts.php:586 -msgid "Contact" -msgstr "Contact" - -#: mod/contacts.php:589 -msgid "Profile Visibility" -msgstr "Profile visibility" - -#: mod/contacts.php:590 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Please choose the profile you would like to display to %s when viewing your profile securely." - -#: mod/contacts.php:591 -msgid "Contact Information / Notes" -msgstr "Personal note" - -#: mod/contacts.php:592 -msgid "Edit contact notes" -msgstr "Edit contact notes" - -#: mod/contacts.php:598 -msgid "Block/Unblock contact" -msgstr "Block/Unblock contact" - -#: mod/contacts.php:599 -msgid "Ignore contact" -msgstr "Ignore contact" - -#: mod/contacts.php:600 -msgid "Repair URL settings" -msgstr "Repair URL settings" - -#: mod/contacts.php:601 -msgid "View conversations" -msgstr "View conversations" - -#: mod/contacts.php:607 -msgid "Last update:" -msgstr "Last update:" - -#: mod/contacts.php:609 -msgid "Update public posts" -msgstr "Update public posts" - -#: mod/contacts.php:611 mod/contacts.php:985 -msgid "Update now" -msgstr "Update now" - -#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 -msgid "Unignore" -msgstr "Unignore" - -#: mod/contacts.php:621 -msgid "Currently blocked" -msgstr "Currently blocked" - -#: mod/contacts.php:622 -msgid "Currently ignored" -msgstr "Currently ignored" - -#: mod/contacts.php:623 -msgid "Currently archived" -msgstr "Currently archived" - -#: mod/contacts.php:624 -msgid "" -"Replies/likes to your public posts <strong>may</strong> still be visible" -msgstr "Replies/Likes to your public posts <strong>may</strong> still be visible" - -#: mod/contacts.php:625 -msgid "Notification for new posts" -msgstr "Notification for new posts" - -#: mod/contacts.php:625 -msgid "Send a notification of every new post of this contact" -msgstr "Send notification for every new post from this contact" - -#: mod/contacts.php:628 -msgid "Blacklisted keywords" -msgstr "Blacklisted keywords" - -#: mod/contacts.php:628 -msgid "" -"Comma separated list of keywords that should not be converted to hashtags, " -"when \"Fetch information and keywords\" is selected" -msgstr "Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected" - -#: mod/contacts.php:646 -msgid "Actions" -msgstr "Actions" - -#: mod/contacts.php:649 -msgid "Contact Settings" -msgstr "Notification and privacy " - -#: mod/contacts.php:695 -msgid "Suggestions" -msgstr "Suggestions" - -#: mod/contacts.php:698 -msgid "Suggest potential friends" -msgstr "Suggest potential friends" - -#: mod/contacts.php:706 -msgid "Show all contacts" -msgstr "Show all contacts" - -#: mod/contacts.php:711 -msgid "Unblocked" -msgstr "Unblocked" - -#: mod/contacts.php:714 -msgid "Only show unblocked contacts" -msgstr "Only show unblocked contacts" - -#: mod/contacts.php:720 -msgid "Blocked" -msgstr "Blocked" - -#: mod/contacts.php:723 -msgid "Only show blocked contacts" -msgstr "Only show blocked contacts" - -#: mod/contacts.php:729 -msgid "Ignored" -msgstr "Ignored" - -#: mod/contacts.php:732 -msgid "Only show ignored contacts" -msgstr "Only show ignored contacts" - -#: mod/contacts.php:738 -msgid "Archived" -msgstr "Archived" - -#: mod/contacts.php:741 -msgid "Only show archived contacts" -msgstr "Only show archived contacts" - -#: mod/contacts.php:747 -msgid "Hidden" -msgstr "Hidden" - -#: mod/contacts.php:750 -msgid "Only show hidden contacts" -msgstr "Only show hidden contacts" - -#: mod/contacts.php:807 -msgid "Search your contacts" -msgstr "Search your contacts" - -#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 -msgid "Update" -msgstr "Update" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Archive" -msgstr "Archive" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Unarchive" -msgstr "Unarchive" - -#: mod/contacts.php:821 -msgid "Batch Actions" -msgstr "Batch actions" - -#: mod/contacts.php:867 -msgid "View all contacts" -msgstr "View all contacts" - -#: mod/contacts.php:877 -msgid "View all common friends" -msgstr "View all common friends" - -#: mod/contacts.php:884 -msgid "Advanced Contact Settings" -msgstr "Advanced contact settings" - -#: mod/contacts.php:918 -msgid "Mutual Friendship" -msgstr "Mutual friendship" - -#: mod/contacts.php:922 -msgid "is a fan of yours" -msgstr "is a fan of yours" - -#: mod/contacts.php:926 -msgid "you are a fan of" -msgstr "I follow them" - -#: mod/contacts.php:996 -msgid "Toggle Blocked status" -msgstr "Toggle blocked status" - -#: mod/contacts.php:1004 -msgid "Toggle Ignored status" -msgstr "Toggle ignored status" - -#: mod/contacts.php:1012 -msgid "Toggle Archive status" -msgstr "Toggle archive status" - -#: mod/contacts.php:1020 -msgid "Delete contact" -msgstr "Delete contact" - -#: mod/profile_photo.php:44 -msgid "Image uploaded but image cropping failed." -msgstr "Image uploaded but image cropping failed." - -#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 -#: mod/profile_photo.php:322 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "Image size reduction [%s] failed." - -#: mod/profile_photo.php:127 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Shift-reload the page or clear browser cache if the new photo does not display immediately." - -#: mod/profile_photo.php:136 -msgid "Unable to process image" -msgstr "Unable to process image" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "Upload File:" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "Select a profile:" - -#: mod/profile_photo.php:256 -msgid "Upload" -msgstr "Upload" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "or" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "skip this step" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "select a photo from your photo albums" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "Crop Image" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Please adjust the image cropping for optimum viewing." - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "Done editing" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "Image uploaded successfully." - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "Profile deleted." - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "Profile-" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "New profile created." - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "Profile unavailable to clone." - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "Profile name is required." - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "Marital status" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "Romantic partner" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "Work/Employment:" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "Religion" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "Political views" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "Gender" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "Sexual preference" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "XMPP" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "Homepage" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "Interests" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "Address" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "Location" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "Profile updated." - -#: mod/profiles.php:567 -msgid " and " -msgstr " and " - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "public profile" - -#: mod/profiles.php:579 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s changed %2$s to “%3$s”" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " - Visit %1$s's %2$s" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s has an updated %2$s, changing %3$s." - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "Hide contacts and friends:" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Hide your contact/friend list from viewers of this profile?" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "Show more profile fields:" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "Profile actions" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "Edit Profile Details" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "Change profile photo" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "View this profile" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "Create a new profile using these settings" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "Clone this profile" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "Delete this profile" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "Basic information" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "Profile picture" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "Preferences" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "Status information" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "Additional information" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "Relation" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "Gender:" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "<span class=\"heart\">♥</span> Marital status:" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "Example: fishing photography software" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "Profile name:" - -#: mod/profiles.php:714 -msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet." - -#: mod/profiles.php:715 -msgid "Your Full Name:" -msgstr "My full name:" - -#: mod/profiles.php:716 -msgid "Title/Description:" -msgstr "Title/Description:" - -#: mod/profiles.php:719 -msgid "Street Address:" -msgstr "Street address:" - -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "Locality/City:" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "Region/State:" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "Postcode:" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "Country:" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "Who: (if applicable)" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Examples: cathy123, Cathy Williams, cathy@example.com" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "Since when:" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "About myself:" - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "XMPP (Jabber) address:" - -#: mod/profiles.php:731 -msgid "" -"The XMPP address will be propagated to your contacts so that they can follow" -" you." -msgstr "The XMPP address will be propagated to your contacts so that they can follow you." - -#: mod/profiles.php:732 -msgid "Homepage URL:" -msgstr "Homepage URL:" - -#: mod/profiles.php:735 -msgid "Religious Views:" -msgstr "Religious views:" - -#: mod/profiles.php:736 -msgid "Public Keywords:" -msgstr "Public keywords:" - -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "Used for suggesting potential friends, can be seen by others." - -#: mod/profiles.php:737 -msgid "Private Keywords:" -msgstr "Private keywords:" - -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" -msgstr "Used for searching profiles, never shown to others." - -#: mod/profiles.php:740 -msgid "Musical interests" -msgstr "Music:" - -#: mod/profiles.php:741 -msgid "Books, literature" -msgstr "Books, literature, poetry:" - -#: mod/profiles.php:742 -msgid "Television" -msgstr "Television:" - -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" -msgstr "Film, dance, culture, entertainment" - -#: mod/profiles.php:744 -msgid "Hobbies/Interests" -msgstr "Hobbies/Interests:" - -#: mod/profiles.php:745 -msgid "Love/romance" -msgstr "Love/Romance:" - -#: mod/profiles.php:746 -msgid "Work/employment" -msgstr "Work/Employment:" - -#: mod/profiles.php:747 -msgid "School/education" -msgstr "School/Education:" - -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" -msgstr "Contact information and other social networks:" - -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" -msgstr "Edit/Manage Profiles" - #: mod/settings.php:62 msgid "Display" msgstr "Display" @@ -8370,73 +8371,82 @@ msgid "Personal Page" msgstr "Personal Page" #: mod/settings.php:1121 -msgid "This account is a regular personal profile" -msgstr "Regular personal profile" +msgid "Account for a personal profile." +msgstr "Account for a personal profile." #: mod/settings.php:1124 msgid "Organisation Page" msgstr "Organization Page" #: mod/settings.php:1125 -msgid "This account is a profile for an organisation" -msgstr "Profile for an organization" +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "Account for an organization that automatically approves contact requests as \"Followers\"." #: mod/settings.php:1128 msgid "News Page" msgstr "News Page" #: mod/settings.php:1129 -msgid "This account is a news account/reflector" -msgstr "News reflector" +msgid "" +"Account for a news reflector that automatically approves contact requests as" +" \"Followers\"." +msgstr "Account for a news reflector that automatically approves contact requests as \"Followers\"." #: mod/settings.php:1132 msgid "Community Forum" msgstr "Community Forum" #: mod/settings.php:1133 -msgid "" -"This account is a community forum where people can discuss with each other" -msgstr "Discussion forum for community" +msgid "Account for community discussions." +msgstr "Account for community discussions." #: mod/settings.php:1136 msgid "Normal Account Page" msgstr "Standard" #: mod/settings.php:1137 -msgid "This account is a normal personal profile" -msgstr "Regular personal profile" +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"." #: mod/settings.php:1140 msgid "Soapbox Page" msgstr "Soapbox" #: mod/settings.php:1141 -msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "Automatically approves contact requests as followers" +msgid "" +"Account for a public profile that automatically approves contact requests as" +" \"Followers\"." +msgstr "Account for a public profile that automatically approves contact requests as \"Followers\"." #: mod/settings.php:1144 msgid "Public Forum" msgstr "Public forum" #: mod/settings.php:1145 -msgid "Automatically approve all contact requests" -msgstr "Automatically approve all contact requests" +msgid "Automatically approves all contact requests." +msgstr "Automatically approves all contact requests." #: mod/settings.php:1148 msgid "Automatic Friend Page" -msgstr "Popularity" +msgstr "Love-all" #: mod/settings.php:1149 -msgid "Automatically approve all connection/friend requests as friends" -msgstr "Automatically approves contact requests as friends" +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "Account for a popular profile that automatically approves contact requests as \"Friends\"." #: mod/settings.php:1152 msgid "Private Forum [Experimental]" msgstr "Private forum [Experimental]" #: mod/settings.php:1153 -msgid "Private forum - approved members only" -msgstr "Private forum - approved members only" +msgid "Requires manual approval of contact requests." +msgstr "Requires manual approval of contact requests." #: mod/settings.php:1164 msgid "OpenID:" @@ -8861,7 +8871,7 @@ msgstr "Set style" msgid "Community Pages" msgstr "Community pages" -#: view/theme/vier/config.php:118 view/theme/vier/theme.php:151 +#: view/theme/vier/config.php:118 view/theme/vier/theme.php:143 msgid "Community Profiles" msgstr "Community profiles" @@ -8869,23 +8879,23 @@ msgstr "Community profiles" msgid "Help or @NewHere ?" msgstr "Help or @NewHere ?" -#: view/theme/vier/config.php:120 view/theme/vier/theme.php:392 +#: view/theme/vier/config.php:120 view/theme/vier/theme.php:384 msgid "Connect Services" msgstr "Connect services" -#: view/theme/vier/config.php:121 view/theme/vier/theme.php:199 +#: view/theme/vier/config.php:121 view/theme/vier/theme.php:191 msgid "Find Friends" msgstr "Find friends" -#: view/theme/vier/config.php:122 view/theme/vier/theme.php:181 +#: view/theme/vier/config.php:122 view/theme/vier/theme.php:173 msgid "Last users" msgstr "Last users" -#: view/theme/vier/theme.php:200 +#: view/theme/vier/theme.php:192 msgid "Local Directory" msgstr "Local directory" -#: view/theme/vier/theme.php:292 +#: view/theme/vier/theme.php:284 msgid "Quick Start" msgstr "Quick start" @@ -8901,43 +8911,43 @@ msgstr "Show fewer." msgid "toggle mobile" msgstr "Toggle mobile" -#: boot.php:726 +#: boot.php:733 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s failed. See error logs." -#: boot.php:838 +#: boot.php:845 msgid "Create a New Account" msgstr "Create a new account" -#: boot.php:866 +#: boot.php:873 msgid "Password: " msgstr "Password: " -#: boot.php:867 +#: boot.php:874 msgid "Remember me" msgstr "Remember me" -#: boot.php:870 +#: boot.php:877 msgid "Or login using OpenID: " msgstr "Or login with OpenID: " -#: boot.php:876 +#: boot.php:883 msgid "Forgot your password?" msgstr "Forgot your password?" -#: boot.php:879 +#: boot.php:886 msgid "Website Terms of Service" msgstr "Website Terms of Service" -#: boot.php:880 +#: boot.php:887 msgid "terms of service" msgstr "Terms of service" -#: boot.php:882 +#: boot.php:889 msgid "Website Privacy Policy" msgstr "Website Privacy Policy" -#: boot.php:883 +#: boot.php:890 msgid "privacy policy" msgstr "Privacy policy" diff --git a/view/lang/en-us/strings.php b/view/lang/en-us/strings.php index 7f1ca30a6f..d257fc8b8e 100644 --- a/view/lang/en-us/strings.php +++ b/view/lang/en-us/strings.php @@ -1,7 +1,7 @@ <?php -if(! function_exists("string_plural_select_en_US")) { -function string_plural_select_en_US($n){ +if(! function_exists("string_plural_select_en_us")) { +function string_plural_select_en_us($n){ return ($n != 1);; }} ; @@ -97,22 +97,6 @@ $a->strings["add"] = "add"; $a->strings["Forums"] = "Forums"; $a->strings["External link to forum"] = "External link to forum"; $a->strings["show more"] = "Show more..."; -$a->strings["System"] = "System"; -$a->strings["Network"] = "Network"; -$a->strings["Personal"] = "Personal"; -$a->strings["Home"] = "Home"; -$a->strings["Introductions"] = "Introductions"; -$a->strings["%s commented on %s's post"] = "%s commented on %s's post"; -$a->strings["%s created a new post"] = "%s posted something new"; -$a->strings["%s liked %s's post"] = "%s liked %s's post"; -$a->strings["%s disliked %s's post"] = "%s disliked %s's post"; -$a->strings["%s is attending %s's event"] = "%s is going to %s's event"; -$a->strings["%s is not attending %s's event"] = "%s is not going to %s's event"; -$a->strings["%s may attend %s's event"] = "%s may go to %s's event"; -$a->strings["%s is now friends with %s"] = "%s is now friends with %s"; -$a->strings["Friend Suggestion"] = "Friend suggestion"; -$a->strings["Friend/Connect Request"] = "Friend/Contact request"; -$a->strings["New Follower"] = "New follower"; $a->strings["Post to Email"] = "Post to email"; $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Connectors are disabled since \"%s\" is enabled."; $a->strings["Hide your profile details from unknown viewers?"] = "Hide profile details from unknown viewers?"; @@ -423,16 +407,16 @@ $a->strings["comment"] = array( ); $a->strings["post"] = "post"; $a->strings["Item filed"] = "Item filed"; -$a->strings["Drop Contact"] = "Drop contact"; -$a->strings["Organisation"] = "Organization"; -$a->strings["News"] = "News"; -$a->strings["Forum"] = "Forum"; $a->strings["Image/photo"] = "Image/Photo"; $a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"; $a->strings["$1 wrote:"] = "$1 wrote:"; $a->strings["Encrypted content"] = "Encrypted content"; $a->strings["Invalid source protocol"] = "Invalid source protocol"; $a->strings["Invalid link protocol"] = "Invalid link protocol"; +$a->strings["Drop Contact"] = "Drop contact"; +$a->strings["Organisation"] = "Organization"; +$a->strings["News"] = "News"; +$a->strings["Forum"] = "Forum"; $a->strings["Friendica Notification"] = "Friendica notification"; $a->strings["Thank You,"] = "Thank you"; $a->strings["%s Administrator"] = "%s Administrator"; @@ -512,8 +496,9 @@ $a->strings["Personal notes"] = "Personal notes"; $a->strings["Your personal notes"] = "My personal notes"; $a->strings["Login"] = "Login"; $a->strings["Sign in"] = "Sign in"; +$a->strings["Home"] = "Home"; $a->strings["Home Page"] = "Home page"; -$a->strings["Register"] = "Register"; +$a->strings["Register"] = "Sign up now >>"; $a->strings["Create an account"] = "Create account"; $a->strings["Help"] = "Help"; $a->strings["Help and documentation"] = "Help and documentation"; @@ -528,9 +513,11 @@ $a->strings["Directory"] = "Directory"; $a->strings["People directory"] = "People directory"; $a->strings["Information"] = "Information"; $a->strings["Information about this friendica instance"] = "Information about this Friendica instance"; +$a->strings["Network"] = "Network"; $a->strings["Conversations from your friends"] = "My friends' conversations"; $a->strings["Network Reset"] = "Network reset"; $a->strings["Load Network page with no filters"] = "Load network page without filters"; +$a->strings["Introductions"] = "Introductions"; $a->strings["Friend Requests"] = "Friend requests"; $a->strings["Notifications"] = "Notifications"; $a->strings["See all notifications"] = "See all notifications"; @@ -588,15 +575,87 @@ $a->strings["default"] = "default"; $a->strings["An error occurred creating your default profile. Please try again."] = "An error occurred creating your default profile. Please try again."; $a->strings["Friends"] = "Friends"; $a->strings["Profile Photos"] = "Profile photos"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending approval by the administrator.\n\t"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for signing up at %2\$s. Your account is pending approval by the administrator.\n\t"; $a->strings["Registration at %s"] = "Registration at %s"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDear %1\$s,\n\t\t\tThank you for signing up at %2\$s. Your account has been created.\n\t"; $a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\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 for your account \"Settings\" 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 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, these settings may help to\n\t\tmake new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."; $a->strings["Registration details for %s"] = "Registration details for %s"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Cannot locate DNS info for database server '%s'"; +$a->strings["Click here to upgrade."] = "Click here to upgrade."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "This action exceeds the limits set by your subscription plan."; +$a->strings["This action is not available under your subscription plan."] = "This action is not available under your subscription plan."; +$a->strings["Male"] = "Male"; +$a->strings["Female"] = "Female"; +$a->strings["Currently Male"] = "Currently Male"; +$a->strings["Currently Female"] = "Currently Female"; +$a->strings["Mostly Male"] = "Mostly Male"; +$a->strings["Mostly Female"] = "Mostly Female"; +$a->strings["Transgender"] = "Transgender"; +$a->strings["Intersex"] = "Intersex"; +$a->strings["Transsexual"] = "Transsexual"; +$a->strings["Hermaphrodite"] = "Hermaphrodite"; +$a->strings["Neuter"] = "Neuter"; +$a->strings["Non-specific"] = "Non-specific"; +$a->strings["Other"] = "Other"; +$a->strings["Males"] = "Males"; +$a->strings["Females"] = "Females"; +$a->strings["Gay"] = "Gay"; +$a->strings["Lesbian"] = "Lesbian"; +$a->strings["No Preference"] = "No Preference"; +$a->strings["Bisexual"] = "Bisexual"; +$a->strings["Autosexual"] = "Auto-sexual"; +$a->strings["Abstinent"] = "Abstinent"; +$a->strings["Virgin"] = "Virgin"; +$a->strings["Deviant"] = "Deviant"; +$a->strings["Fetish"] = "Fetish"; +$a->strings["Oodles"] = "Oodles"; +$a->strings["Nonsexual"] = "Asexual"; +$a->strings["Single"] = "Single"; +$a->strings["Lonely"] = "Lonely"; +$a->strings["Available"] = "Available"; +$a->strings["Unavailable"] = "Unavailable"; +$a->strings["Has crush"] = "Having a crush"; +$a->strings["Infatuated"] = "Infatuated"; +$a->strings["Dating"] = "Dating"; +$a->strings["Unfaithful"] = "Unfaithful"; +$a->strings["Sex Addict"] = "Sex addict"; +$a->strings["Friends/Benefits"] = "Friends with benefits"; +$a->strings["Casual"] = "Casual"; +$a->strings["Engaged"] = "Engaged"; +$a->strings["Married"] = "Married"; +$a->strings["Imaginarily married"] = "Imaginarily married"; +$a->strings["Partners"] = "Partners"; +$a->strings["Cohabiting"] = "Cohabiting"; +$a->strings["Common law"] = "Common law spouse"; +$a->strings["Happy"] = "Happy"; +$a->strings["Not looking"] = "Not looking"; +$a->strings["Swinger"] = "Swinger"; +$a->strings["Betrayed"] = "Betrayed"; +$a->strings["Separated"] = "Separated"; +$a->strings["Unstable"] = "Unstable"; +$a->strings["Divorced"] = "Divorced"; +$a->strings["Imaginarily divorced"] = "Imaginarily divorced"; +$a->strings["Widowed"] = "Widowed"; +$a->strings["Uncertain"] = "Uncertain"; +$a->strings["It's complicated"] = "It's complicated"; +$a->strings["Don't care"] = "Don't care"; +$a->strings["Ask me"] = "Ask me"; +$a->strings["System"] = "System"; +$a->strings["Personal"] = "Personal"; +$a->strings["%s commented on %s's post"] = "%s commented on %s's post"; +$a->strings["%s created a new post"] = "%s posted something new"; +$a->strings["%s liked %s's post"] = "%s liked %s's post"; +$a->strings["%s disliked %s's post"] = "%s disliked %s's post"; +$a->strings["%s is attending %s's event"] = "%s is going to %s's event"; +$a->strings["%s is not attending %s's event"] = "%s is not going to %s's event"; +$a->strings["%s may attend %s's event"] = "%s may go to %s's event"; +$a->strings["%s is now friends with %s"] = "%s is now friends with %s"; +$a->strings["Friend Suggestion"] = "Friend suggestion"; +$a->strings["Friend/Connect Request"] = "Friend/Contact request"; +$a->strings["New Follower"] = "New follower"; $a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Daily posting limit of %d posts reached. This post was rejected."; $a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Weekly posting limit of %d posts reached. This post was rejected."; $a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Monthly posting limit of %d posts reached. This post was rejected."; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Cannot locate DNS info for database server '%s'"; $a->strings["There are no tables on MyISAM."] = "There are no tables on MyISAM."; $a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tThe Friendica 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\n might be invalid."; $a->strings["The error message is\n[pre]%s[/pre]"] = "The error message is\n[pre]%s[/pre]"; @@ -669,65 +728,6 @@ $a->strings["%s is now following %s."] = "%s is now following %s."; $a->strings["following"] = "following"; $a->strings["%s stopped following %s."] = "%s stopped following %s."; $a->strings["stopped following"] = "stopped following"; -$a->strings["Click here to upgrade."] = "Click here to upgrade."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "This action exceeds the limits set by your subscription plan."; -$a->strings["This action is not available under your subscription plan."] = "This action is not available under your subscription plan."; -$a->strings["Male"] = "Male"; -$a->strings["Female"] = "Female"; -$a->strings["Currently Male"] = "Currently Male"; -$a->strings["Currently Female"] = "Currently Female"; -$a->strings["Mostly Male"] = "Mostly Male"; -$a->strings["Mostly Female"] = "Mostly Female"; -$a->strings["Transgender"] = "Transgender"; -$a->strings["Intersex"] = "Intersex"; -$a->strings["Transsexual"] = "Transsexual"; -$a->strings["Hermaphrodite"] = "Hermaphrodite"; -$a->strings["Neuter"] = "Neuter"; -$a->strings["Non-specific"] = "Non-specific"; -$a->strings["Other"] = "Other"; -$a->strings["Males"] = "Males"; -$a->strings["Females"] = "Females"; -$a->strings["Gay"] = "Gay"; -$a->strings["Lesbian"] = "Lesbian"; -$a->strings["No Preference"] = "No Preference"; -$a->strings["Bisexual"] = "Bisexual"; -$a->strings["Autosexual"] = "Auto-sexual"; -$a->strings["Abstinent"] = "Abstinent"; -$a->strings["Virgin"] = "Virgin"; -$a->strings["Deviant"] = "Deviant"; -$a->strings["Fetish"] = "Fetish"; -$a->strings["Oodles"] = "Oodles"; -$a->strings["Nonsexual"] = "Asexual"; -$a->strings["Single"] = "Single"; -$a->strings["Lonely"] = "Lonely"; -$a->strings["Available"] = "Available"; -$a->strings["Unavailable"] = "Unavailable"; -$a->strings["Has crush"] = "Having a crush"; -$a->strings["Infatuated"] = "Infatuated"; -$a->strings["Dating"] = "Dating"; -$a->strings["Unfaithful"] = "Unfaithful"; -$a->strings["Sex Addict"] = "Sex addict"; -$a->strings["Friends/Benefits"] = "Friends with benefits"; -$a->strings["Casual"] = "Casual"; -$a->strings["Engaged"] = "Engaged"; -$a->strings["Married"] = "Married"; -$a->strings["Imaginarily married"] = "Imaginarily married"; -$a->strings["Partners"] = "Partners"; -$a->strings["Cohabiting"] = "Cohabiting"; -$a->strings["Common law"] = "Common law spouse"; -$a->strings["Happy"] = "Happy"; -$a->strings["Not looking"] = "Not looking"; -$a->strings["Swinger"] = "Swinger"; -$a->strings["Betrayed"] = "Betrayed"; -$a->strings["Separated"] = "Separated"; -$a->strings["Unstable"] = "Unstable"; -$a->strings["Divorced"] = "Divorced"; -$a->strings["Imaginarily divorced"] = "Imaginarily divorced"; -$a->strings["Widowed"] = "Widowed"; -$a->strings["Uncertain"] = "Uncertain"; -$a->strings["It's complicated"] = "It's complicated"; -$a->strings["Don't care"] = "Don't care"; -$a->strings["Ask me"] = "Ask me"; $a->strings["No friends to display."] = "No friends to display."; $a->strings["Authorize application connection"] = "Authorize application connection"; $a->strings["Return to your app and insert this Securty Code:"] = "Return to your app and insert this security code:"; @@ -1018,7 +1018,7 @@ $a->strings["%d message sent."] = array( ); $a->strings["You have no more invitations available"] = "You have no more invitations available."; $a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."; -$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "To accept this invitation, please register at %s or any other public Friendica website."; +$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "To accept this invitation, please sign up at %s or any other public Friendica website."; $a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica sites are all inter-connect to create a large privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."; $a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Our apologies. This system is not currently configured to connect with other public sites or invite members."; $a->strings["Send invitations"] = "Send invitations"; @@ -1026,7 +1026,7 @@ $a->strings["Enter email addresses, one per line:"] = "Enter email addresses, on $a->strings["Your message:"] = "Your message:"; $a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."; $a->strings["You will need to supply this invitation code: \$invite_code"] = "You will need to supply this invitation code: \$invite_code"; -$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Once you have registered, please connect with me via my profile page at:"; +$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Once you have signed up, please connect with me via my profile page at:"; $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"; $a->strings["Time Conversion"] = "Time conversion"; $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica provides this service for sharing events with other networks and friends in unknown time zones."; @@ -1042,7 +1042,7 @@ $a->strings["\n\t\tDear %1\$s,\n\t\t\tA request was recently received at \"%2\$s $a->strings["\n\t\tFollow this link to verify your identity:\n\n\t\t%1\$s\n\n\t\tYou will then receive a follow-up message containing the new password.\n\t\tYou may change that password from your account settings page after logging in.\n\n\t\tThe login details are as follows:\n\n\t\tSite Location:\t%2\$s\n\t\tLogin Name:\t%3\$s"] = "\n\t\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"; $a->strings["Password reset requested at %s"] = "Password reset requested at %s"; $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Request could not be verified. (You may have previously submitted it.) Password reset failed."; -$a->strings["Password Reset"] = "Password reset"; +$a->strings["Password Reset"] = "Forgotten password?"; $a->strings["Your password has been reset as requested."] = "Your password has been reset as requested."; $a->strings["Your new password is"] = "Your new password is"; $a->strings["Save or copy your new password - and then"] = "Save or copy your new password - and then"; @@ -1234,9 +1234,6 @@ $a->strings["Private photo"] = "Private photo"; $a->strings["Public photo"] = "Public photo"; $a->strings["Map"] = "Map"; $a->strings["View Album"] = "View album"; -$a->strings["{0} wants to be your friend"] = "{0} wants to be your friend"; -$a->strings["{0} sent you a message"] = "{0} sent you a message"; -$a->strings["{0} requested registration"] = "{0} requested registration"; $a->strings["Poke/Prod"] = "Poke/Prod"; $a->strings["poke, prod or do other things to somebody"] = "Poke, prod or do other things to somebody"; $a->strings["Recipient"] = "Recipient:"; @@ -1253,7 +1250,7 @@ $a->strings["Registration successful."] = "Registration successful."; $a->strings["Your registration can not be processed."] = "Your registration cannot be processed."; $a->strings["Your registration is pending approval by the site owner."] = "Your registration is pending approval by the site administrator."; $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."; -$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."; +$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Sign up now'."; $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."; $a->strings["Your OpenID (optional): "] = "Your OpenID (optional): "; $a->strings["Include your profile in member directory?"] = "Include your profile in member directory?"; @@ -1261,7 +1258,7 @@ $a->strings["Note for the admin"] = "Note for the admin"; $a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin, why you want to join this node."; $a->strings["Membership on this site is by invitation only."] = "Membership on this site is by invitation only."; $a->strings["Your invitation ID: "] = "Your invitation ID: "; -$a->strings["Registration"] = "Registration"; +$a->strings["Registration"] = "Join this Friendica Node Today"; $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Your full name: "; $a->strings["Your Email Address: "] = "Your email address: "; $a->strings["New Password:"] = "New password:"; @@ -1361,6 +1358,179 @@ $a->strings["You need to export your account from the old server and upload it h $a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora."; $a->strings["Account file"] = "Account file:"; $a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "To export your account, go to \"Settings->Export personal data\" and select \"Export account\""; +$a->strings["%d contact edited."] = array( + 0 => "%d contact edited.", + 1 => "%d contacts edited.", +); +$a->strings["Could not access contact record."] = "Could not access contact record."; +$a->strings["Could not locate selected profile."] = "Could not locate selected profile."; +$a->strings["Contact updated."] = "Contact updated."; +$a->strings["Contact has been blocked"] = "Contact has been blocked"; +$a->strings["Contact has been unblocked"] = "Contact has been unblocked"; +$a->strings["Contact has been ignored"] = "Contact has been ignored"; +$a->strings["Contact has been unignored"] = "Contact has been unignored"; +$a->strings["Contact has been archived"] = "Contact has been archived"; +$a->strings["Contact has been unarchived"] = "Contact has been unarchived"; +$a->strings["Drop contact"] = "Drop contact"; +$a->strings["Do you really want to delete this contact?"] = "Do you really want to delete this contact?"; +$a->strings["Contact has been removed."] = "Contact has been removed."; +$a->strings["You are mutual friends with %s"] = "You are mutual friends with %s"; +$a->strings["You are sharing with %s"] = "You are sharing with %s"; +$a->strings["%s is sharing with you"] = "%s is sharing with you"; +$a->strings["Private communications are not available for this contact."] = "Private communications are not available for this contact."; +$a->strings["Never"] = "Never"; +$a->strings["(Update was successful)"] = "(Update was successful)"; +$a->strings["(Update was not successful)"] = "(Update was not successful)"; +$a->strings["Suggest friends"] = "Suggest friends"; +$a->strings["Network type: %s"] = "Network type: %s"; +$a->strings["Communications lost with this contact!"] = "Communications lost with this contact!"; +$a->strings["Fetch further information for feeds"] = "Fetch further information for feeds"; +$a->strings["Disabled"] = "Disabled"; +$a->strings["Fetch information"] = "Fetch information"; +$a->strings["Fetch information and keywords"] = "Fetch information and keywords"; +$a->strings["Contact"] = "Contact"; +$a->strings["Profile Visibility"] = "Profile visibility"; +$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Please choose the profile you would like to display to %s when viewing your profile securely."; +$a->strings["Contact Information / Notes"] = "Personal note"; +$a->strings["Edit contact notes"] = "Edit contact notes"; +$a->strings["Block/Unblock contact"] = "Block/Unblock contact"; +$a->strings["Ignore contact"] = "Ignore contact"; +$a->strings["Repair URL settings"] = "Repair URL settings"; +$a->strings["View conversations"] = "View conversations"; +$a->strings["Last update:"] = "Last update:"; +$a->strings["Update public posts"] = "Update public posts"; +$a->strings["Update now"] = "Update now"; +$a->strings["Unblock"] = "Unblock"; +$a->strings["Block"] = "Block"; +$a->strings["Unignore"] = "Unignore"; +$a->strings["Currently blocked"] = "Currently blocked"; +$a->strings["Currently ignored"] = "Currently ignored"; +$a->strings["Currently archived"] = "Currently archived"; +$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Replies/Likes to your public posts <strong>may</strong> still be visible"; +$a->strings["Notification for new posts"] = "Notification for new posts"; +$a->strings["Send a notification of every new post of this contact"] = "Send notification for every new post from this contact"; +$a->strings["Blacklisted keywords"] = "Blacklisted keywords"; +$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"; +$a->strings["Actions"] = "Actions"; +$a->strings["Contact Settings"] = "Notification and privacy "; +$a->strings["Suggestions"] = "Suggestions"; +$a->strings["Suggest potential friends"] = "Suggest potential friends"; +$a->strings["Show all contacts"] = "Show all contacts"; +$a->strings["Unblocked"] = "Unblocked"; +$a->strings["Only show unblocked contacts"] = "Only show unblocked contacts"; +$a->strings["Blocked"] = "Blocked"; +$a->strings["Only show blocked contacts"] = "Only show blocked contacts"; +$a->strings["Ignored"] = "Ignored"; +$a->strings["Only show ignored contacts"] = "Only show ignored contacts"; +$a->strings["Archived"] = "Archived"; +$a->strings["Only show archived contacts"] = "Only show archived contacts"; +$a->strings["Hidden"] = "Hidden"; +$a->strings["Only show hidden contacts"] = "Only show hidden contacts"; +$a->strings["Search your contacts"] = "Search your contacts"; +$a->strings["Update"] = "Update"; +$a->strings["Archive"] = "Archive"; +$a->strings["Unarchive"] = "Unarchive"; +$a->strings["Batch Actions"] = "Batch actions"; +$a->strings["View all contacts"] = "View all contacts"; +$a->strings["View all common friends"] = "View all common friends"; +$a->strings["Advanced Contact Settings"] = "Advanced contact settings"; +$a->strings["Mutual Friendship"] = "Mutual friendship"; +$a->strings["is a fan of yours"] = "is a fan of yours"; +$a->strings["you are a fan of"] = "I follow them"; +$a->strings["Toggle Blocked status"] = "Toggle blocked status"; +$a->strings["Toggle Ignored status"] = "Toggle ignored status"; +$a->strings["Toggle Archive status"] = "Toggle archive status"; +$a->strings["Delete contact"] = "Delete contact"; +$a->strings["{0} wants to be your friend"] = "{0} wants to be your friend"; +$a->strings["{0} sent you a message"] = "{0} sent you a message"; +$a->strings["{0} requested registration"] = "{0} requested registration"; +$a->strings["Image uploaded but image cropping failed."] = "Image uploaded but image cropping failed."; +$a->strings["Image size reduction [%s] failed."] = "Image size reduction [%s] failed."; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-reload the page or clear browser cache if the new photo does not display immediately."; +$a->strings["Unable to process image"] = "Unable to process image"; +$a->strings["Upload File:"] = "Upload File:"; +$a->strings["Select a profile:"] = "Select a profile:"; +$a->strings["Upload"] = "Upload"; +$a->strings["or"] = "or"; +$a->strings["skip this step"] = "skip this step"; +$a->strings["select a photo from your photo albums"] = "select a photo from your photo albums"; +$a->strings["Crop Image"] = "Crop Image"; +$a->strings["Please adjust the image cropping for optimum viewing."] = "Please adjust the image cropping for optimum viewing."; +$a->strings["Done Editing"] = "Done editing"; +$a->strings["Image uploaded successfully."] = "Image uploaded successfully."; +$a->strings["Profile deleted."] = "Profile deleted."; +$a->strings["Profile-"] = "Profile-"; +$a->strings["New profile created."] = "New profile created."; +$a->strings["Profile unavailable to clone."] = "Profile unavailable to clone."; +$a->strings["Profile Name is required."] = "Profile name is required."; +$a->strings["Marital Status"] = "Marital status"; +$a->strings["Romantic Partner"] = "Romantic partner"; +$a->strings["Work/Employment"] = "Work/Employment:"; +$a->strings["Religion"] = "Religion"; +$a->strings["Political Views"] = "Political views"; +$a->strings["Gender"] = "Gender"; +$a->strings["Sexual Preference"] = "Sexual preference"; +$a->strings["XMPP"] = "XMPP"; +$a->strings["Homepage"] = "Homepage"; +$a->strings["Interests"] = "Interests"; +$a->strings["Address"] = "Address"; +$a->strings["Location"] = "Location"; +$a->strings["Profile updated."] = "Profile updated."; +$a->strings[" and "] = " and "; +$a->strings["public profile"] = "public profile"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s changed %2\$s to “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = " - Visit %1\$s's %2\$s"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s has an updated %2\$s, changing %3\$s."; +$a->strings["Hide contacts and friends:"] = "Hide contacts and friends:"; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Hide your contact/friend list from viewers of this profile?"; +$a->strings["Show more profile fields:"] = "Show more profile fields:"; +$a->strings["Profile Actions"] = "Profile actions"; +$a->strings["Edit Profile Details"] = "Edit Profile Details"; +$a->strings["Change Profile Photo"] = "Change profile photo"; +$a->strings["View this profile"] = "View this profile"; +$a->strings["Create a new profile using these settings"] = "Create a new profile using these settings"; +$a->strings["Clone this profile"] = "Clone this profile"; +$a->strings["Delete this profile"] = "Delete this profile"; +$a->strings["Basic information"] = "Basic information"; +$a->strings["Profile picture"] = "Profile picture"; +$a->strings["Preferences"] = "Preferences"; +$a->strings["Status information"] = "Status information"; +$a->strings["Additional information"] = "Additional information"; +$a->strings["Relation"] = "Relation"; +$a->strings["Your Gender:"] = "Gender:"; +$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Marital status:"; +$a->strings["Example: fishing photography software"] = "Example: fishing photography software"; +$a->strings["Profile Name:"] = "Profile name:"; +$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."; +$a->strings["Your Full Name:"] = "My full name:"; +$a->strings["Title/Description:"] = "Title/Description:"; +$a->strings["Street Address:"] = "Street address:"; +$a->strings["Locality/City:"] = "Locality/City:"; +$a->strings["Region/State:"] = "Region/State:"; +$a->strings["Postal/Zip Code:"] = "Postcode:"; +$a->strings["Country:"] = "Country:"; +$a->strings["Who: (if applicable)"] = "Who: (if applicable)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Examples: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Since when:"; +$a->strings["Tell us about yourself..."] = "About myself:"; +$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) address:"; +$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "The XMPP address will be propagated to your contacts so that they can follow you."; +$a->strings["Homepage URL:"] = "Homepage URL:"; +$a->strings["Religious Views:"] = "Religious views:"; +$a->strings["Public Keywords:"] = "Public keywords:"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "Used for suggesting potential friends, can be seen by others."; +$a->strings["Private Keywords:"] = "Private keywords:"; +$a->strings["(Used for searching profiles, never shown to others)"] = "Used for searching profiles, never shown to others."; +$a->strings["Musical interests"] = "Music:"; +$a->strings["Books, literature"] = "Books, literature, poetry:"; +$a->strings["Television"] = "Television:"; +$a->strings["Film/dance/culture/entertainment"] = "Film, dance, culture, entertainment"; +$a->strings["Hobbies/Interests"] = "Hobbies/Interests:"; +$a->strings["Love/romance"] = "Love/Romance:"; +$a->strings["Work/employment"] = "Work/Employment:"; +$a->strings["School/education"] = "School/Education:"; +$a->strings["Contact information and Social Networks"] = "Contact information and other social networks:"; +$a->strings["Edit/Manage Profiles"] = "Edit/Manage Profiles"; $a->strings["Theme settings updated."] = "Theme settings updated."; $a->strings["Site"] = "Site"; $a->strings["Users"] = "Users"; @@ -1416,7 +1586,7 @@ $a->strings["Blog Account"] = "Blog account"; $a->strings["Private Forum"] = "Private forum"; $a->strings["Message queues"] = "Message queues"; $a->strings["Summary"] = "Summary"; -$a->strings["Registered users"] = "Registered users"; +$a->strings["Registered users"] = "Signed up users"; $a->strings["Pending registrations"] = "Pending registrations"; $a->strings["Version"] = "Version"; $a->strings["Active plugins"] = "Active plugins"; @@ -1426,9 +1596,7 @@ $a->strings["No special theme for mobile devices"] = "No special theme for mobil $a->strings["No community page"] = "No community page"; $a->strings["Public postings from users of this site"] = "Public postings from users of this site"; $a->strings["Global community page"] = "Global community page"; -$a->strings["Never"] = "Never"; $a->strings["At post arrival"] = "At post arrival"; -$a->strings["Disabled"] = "Disabled"; $a->strings["Users, Global Contacts"] = "Users, Global Contacts"; $a->strings["Users, Global Contacts/fallback"] = "Users, Global Contacts/fallback"; $a->strings["One month"] = "One month"; @@ -1479,10 +1647,10 @@ $a->strings["Maximum image length"] = "Maximum image length"; $a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."; $a->strings["JPEG image quality"] = "JPEG image quality"; $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is the original quality level."; -$a->strings["Register policy"] = "Register policy"; +$a->strings["Register policy"] = "Registration policy"; $a->strings["Maximum Daily Registrations"] = "Maximum daily registrations"; -$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect."] = "If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect."; -$a->strings["Register text"] = "Register text"; +$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect."] = "If open registration is permitted, this sets the maximum number of new registrations per day. This setting has no effect for registrations by approval."; +$a->strings["Register text"] = "Registration text"; $a->strings["Will be displayed prominently on the registration page."] = "Will be displayed prominently on the registration page."; $a->strings["Accounts abandoned after x days"] = "Accounts abandoned after so many days"; $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."; @@ -1509,11 +1677,11 @@ $a->strings["Don't replace locally-hosted private photos in posts with an embedd $a->strings["Allow Users to set remote_self"] = "Allow users to set \"Remote self\""; $a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream."; $a->strings["Block multiple registrations"] = "Block multiple registrations"; -$a->strings["Disallow users to register additional accounts for use as pages."] = "Disallow users to register additional accounts for use as pages."; +$a->strings["Disallow users to register additional accounts for use as pages."] = "Disallow users to sign up for additional accounts."; $a->strings["OpenID support"] = "OpenID support"; $a->strings["OpenID support for registration and logins."] = "OpenID support for registration and logins."; $a->strings["Fullname check"] = "Full name check"; -$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Force users to register with a space between first name and last name in the full name field; it may reduce spam and abuse registrations."; +$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Force users to sign up with a space between first name and last name in the full name field; it may reduce spam and abuse registrations."; $a->strings["Community Page Style"] = "Community page style"; $a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."; $a->strings["Posts per user on community page"] = "Posts per user on community page"; @@ -1612,7 +1780,7 @@ $a->strings["%s user deleted"] = array( $a->strings["User '%s' deleted"] = "User '%s' deleted"; $a->strings["User '%s' unblocked"] = "User '%s' unblocked"; $a->strings["User '%s' blocked"] = "User '%s' blocked"; -$a->strings["Register date"] = "Register date"; +$a->strings["Register date"] = "Registration date"; $a->strings["Last login"] = "Last login"; $a->strings["Last item"] = "Last item"; $a->strings["Account"] = "Account"; @@ -1624,8 +1792,6 @@ $a->strings["Request date"] = "Request date"; $a->strings["No registrations."] = "No registrations."; $a->strings["Note from the user"] = "Note from the user"; $a->strings["Deny"] = "Deny"; -$a->strings["Block"] = "Block"; -$a->strings["Unblock"] = "Unblock"; $a->strings["Site admin"] = "Site admin"; $a->strings["Account expired"] = "Account expired"; $a->strings["New User"] = "New user"; @@ -1665,172 +1831,6 @@ $a->strings["Off"] = "Off"; $a->strings["On"] = "On"; $a->strings["Lock feature %s"] = "Lock feature %s"; $a->strings["Manage Additional Features"] = "Manage additional features"; -$a->strings["%d contact edited."] = array( - 0 => "%d contact edited.", - 1 => "%d contacts edited.", -); -$a->strings["Could not access contact record."] = "Could not access contact record."; -$a->strings["Could not locate selected profile."] = "Could not locate selected profile."; -$a->strings["Contact updated."] = "Contact updated."; -$a->strings["Contact has been blocked"] = "Contact has been blocked"; -$a->strings["Contact has been unblocked"] = "Contact has been unblocked"; -$a->strings["Contact has been ignored"] = "Contact has been ignored"; -$a->strings["Contact has been unignored"] = "Contact has been unignored"; -$a->strings["Contact has been archived"] = "Contact has been archived"; -$a->strings["Contact has been unarchived"] = "Contact has been unarchived"; -$a->strings["Drop contact"] = "Drop contact"; -$a->strings["Do you really want to delete this contact?"] = "Do you really want to delete this contact?"; -$a->strings["Contact has been removed."] = "Contact has been removed."; -$a->strings["You are mutual friends with %s"] = "You are mutual friends with %s"; -$a->strings["You are sharing with %s"] = "You are sharing with %s"; -$a->strings["%s is sharing with you"] = "%s is sharing with you"; -$a->strings["Private communications are not available for this contact."] = "Private communications are not available for this contact."; -$a->strings["(Update was successful)"] = "(Update was successful)"; -$a->strings["(Update was not successful)"] = "(Update was not successful)"; -$a->strings["Suggest friends"] = "Suggest friends"; -$a->strings["Network type: %s"] = "Network type: %s"; -$a->strings["Communications lost with this contact!"] = "Communications lost with this contact!"; -$a->strings["Fetch further information for feeds"] = "Fetch further information for feeds"; -$a->strings["Fetch information"] = "Fetch information"; -$a->strings["Fetch information and keywords"] = "Fetch information and keywords"; -$a->strings["Contact"] = "Contact"; -$a->strings["Profile Visibility"] = "Profile visibility"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Please choose the profile you would like to display to %s when viewing your profile securely."; -$a->strings["Contact Information / Notes"] = "Personal note"; -$a->strings["Edit contact notes"] = "Edit contact notes"; -$a->strings["Block/Unblock contact"] = "Block/Unblock contact"; -$a->strings["Ignore contact"] = "Ignore contact"; -$a->strings["Repair URL settings"] = "Repair URL settings"; -$a->strings["View conversations"] = "View conversations"; -$a->strings["Last update:"] = "Last update:"; -$a->strings["Update public posts"] = "Update public posts"; -$a->strings["Update now"] = "Update now"; -$a->strings["Unignore"] = "Unignore"; -$a->strings["Currently blocked"] = "Currently blocked"; -$a->strings["Currently ignored"] = "Currently ignored"; -$a->strings["Currently archived"] = "Currently archived"; -$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Replies/Likes to your public posts <strong>may</strong> still be visible"; -$a->strings["Notification for new posts"] = "Notification for new posts"; -$a->strings["Send a notification of every new post of this contact"] = "Send notification for every new post from this contact"; -$a->strings["Blacklisted keywords"] = "Blacklisted keywords"; -$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"; -$a->strings["Actions"] = "Actions"; -$a->strings["Contact Settings"] = "Notification and privacy "; -$a->strings["Suggestions"] = "Suggestions"; -$a->strings["Suggest potential friends"] = "Suggest potential friends"; -$a->strings["Show all contacts"] = "Show all contacts"; -$a->strings["Unblocked"] = "Unblocked"; -$a->strings["Only show unblocked contacts"] = "Only show unblocked contacts"; -$a->strings["Blocked"] = "Blocked"; -$a->strings["Only show blocked contacts"] = "Only show blocked contacts"; -$a->strings["Ignored"] = "Ignored"; -$a->strings["Only show ignored contacts"] = "Only show ignored contacts"; -$a->strings["Archived"] = "Archived"; -$a->strings["Only show archived contacts"] = "Only show archived contacts"; -$a->strings["Hidden"] = "Hidden"; -$a->strings["Only show hidden contacts"] = "Only show hidden contacts"; -$a->strings["Search your contacts"] = "Search your contacts"; -$a->strings["Update"] = "Update"; -$a->strings["Archive"] = "Archive"; -$a->strings["Unarchive"] = "Unarchive"; -$a->strings["Batch Actions"] = "Batch actions"; -$a->strings["View all contacts"] = "View all contacts"; -$a->strings["View all common friends"] = "View all common friends"; -$a->strings["Advanced Contact Settings"] = "Advanced contact settings"; -$a->strings["Mutual Friendship"] = "Mutual friendship"; -$a->strings["is a fan of yours"] = "is a fan of yours"; -$a->strings["you are a fan of"] = "I follow them"; -$a->strings["Toggle Blocked status"] = "Toggle blocked status"; -$a->strings["Toggle Ignored status"] = "Toggle ignored status"; -$a->strings["Toggle Archive status"] = "Toggle archive status"; -$a->strings["Delete contact"] = "Delete contact"; -$a->strings["Image uploaded but image cropping failed."] = "Image uploaded but image cropping failed."; -$a->strings["Image size reduction [%s] failed."] = "Image size reduction [%s] failed."; -$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-reload the page or clear browser cache if the new photo does not display immediately."; -$a->strings["Unable to process image"] = "Unable to process image"; -$a->strings["Upload File:"] = "Upload File:"; -$a->strings["Select a profile:"] = "Select a profile:"; -$a->strings["Upload"] = "Upload"; -$a->strings["or"] = "or"; -$a->strings["skip this step"] = "skip this step"; -$a->strings["select a photo from your photo albums"] = "select a photo from your photo albums"; -$a->strings["Crop Image"] = "Crop Image"; -$a->strings["Please adjust the image cropping for optimum viewing."] = "Please adjust the image cropping for optimum viewing."; -$a->strings["Done Editing"] = "Done editing"; -$a->strings["Image uploaded successfully."] = "Image uploaded successfully."; -$a->strings["Profile deleted."] = "Profile deleted."; -$a->strings["Profile-"] = "Profile-"; -$a->strings["New profile created."] = "New profile created."; -$a->strings["Profile unavailable to clone."] = "Profile unavailable to clone."; -$a->strings["Profile Name is required."] = "Profile name is required."; -$a->strings["Marital Status"] = "Marital status"; -$a->strings["Romantic Partner"] = "Romantic partner"; -$a->strings["Work/Employment"] = "Work/Employment:"; -$a->strings["Religion"] = "Religion"; -$a->strings["Political Views"] = "Political views"; -$a->strings["Gender"] = "Gender"; -$a->strings["Sexual Preference"] = "Sexual preference"; -$a->strings["XMPP"] = "XMPP"; -$a->strings["Homepage"] = "Homepage"; -$a->strings["Interests"] = "Interests"; -$a->strings["Address"] = "Address"; -$a->strings["Location"] = "Location"; -$a->strings["Profile updated."] = "Profile updated."; -$a->strings[" and "] = " and "; -$a->strings["public profile"] = "public profile"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s changed %2\$s to “%3\$s”"; -$a->strings[" - Visit %1\$s's %2\$s"] = " - Visit %1\$s's %2\$s"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s has an updated %2\$s, changing %3\$s."; -$a->strings["Hide contacts and friends:"] = "Hide contacts and friends:"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Hide your contact/friend list from viewers of this profile?"; -$a->strings["Show more profile fields:"] = "Show more profile fields:"; -$a->strings["Profile Actions"] = "Profile actions"; -$a->strings["Edit Profile Details"] = "Edit Profile Details"; -$a->strings["Change Profile Photo"] = "Change profile photo"; -$a->strings["View this profile"] = "View this profile"; -$a->strings["Create a new profile using these settings"] = "Create a new profile using these settings"; -$a->strings["Clone this profile"] = "Clone this profile"; -$a->strings["Delete this profile"] = "Delete this profile"; -$a->strings["Basic information"] = "Basic information"; -$a->strings["Profile picture"] = "Profile picture"; -$a->strings["Preferences"] = "Preferences"; -$a->strings["Status information"] = "Status information"; -$a->strings["Additional information"] = "Additional information"; -$a->strings["Relation"] = "Relation"; -$a->strings["Your Gender:"] = "Gender:"; -$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Marital status:"; -$a->strings["Example: fishing photography software"] = "Example: fishing photography software"; -$a->strings["Profile Name:"] = "Profile name:"; -$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."; -$a->strings["Your Full Name:"] = "My full name:"; -$a->strings["Title/Description:"] = "Title/Description:"; -$a->strings["Street Address:"] = "Street address:"; -$a->strings["Locality/City:"] = "Locality/City:"; -$a->strings["Region/State:"] = "Region/State:"; -$a->strings["Postal/Zip Code:"] = "Postcode:"; -$a->strings["Country:"] = "Country:"; -$a->strings["Who: (if applicable)"] = "Who: (if applicable)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Examples: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Since when:"; -$a->strings["Tell us about yourself..."] = "About myself:"; -$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) address:"; -$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "The XMPP address will be propagated to your contacts so that they can follow you."; -$a->strings["Homepage URL:"] = "Homepage URL:"; -$a->strings["Religious Views:"] = "Religious views:"; -$a->strings["Public Keywords:"] = "Public keywords:"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "Used for suggesting potential friends, can be seen by others."; -$a->strings["Private Keywords:"] = "Private keywords:"; -$a->strings["(Used for searching profiles, never shown to others)"] = "Used for searching profiles, never shown to others."; -$a->strings["Musical interests"] = "Music:"; -$a->strings["Books, literature"] = "Books, literature, poetry:"; -$a->strings["Television"] = "Television:"; -$a->strings["Film/dance/culture/entertainment"] = "Film, dance, culture, entertainment"; -$a->strings["Hobbies/Interests"] = "Hobbies/Interests:"; -$a->strings["Love/romance"] = "Love/Romance:"; -$a->strings["Work/employment"] = "Work/Employment:"; -$a->strings["School/education"] = "School/Education:"; -$a->strings["Contact information and Social Networks"] = "Contact information and other social networks:"; -$a->strings["Edit/Manage Profiles"] = "Edit/Manage Profiles"; $a->strings["Display"] = "Display"; $a->strings["Social Networks"] = "Social networks"; $a->strings["Connected apps"] = "Connected apps"; @@ -1919,23 +1919,23 @@ $a->strings["Account Types"] = "Account types:"; $a->strings["Personal Page Subtypes"] = "Personal Page subtypes"; $a->strings["Community Forum Subtypes"] = "Community forum subtypes"; $a->strings["Personal Page"] = "Personal Page"; -$a->strings["This account is a regular personal profile"] = "Regular personal profile"; +$a->strings["Account for a personal profile."] = "Account for a personal profile."; $a->strings["Organisation Page"] = "Organization Page"; -$a->strings["This account is a profile for an organisation"] = "Profile for an organization"; +$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Account for an organization that automatically approves contact requests as \"Followers\"."; $a->strings["News Page"] = "News Page"; -$a->strings["This account is a news account/reflector"] = "News reflector"; +$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Account for a news reflector that automatically approves contact requests as \"Followers\"."; $a->strings["Community Forum"] = "Community Forum"; -$a->strings["This account is a community forum where people can discuss with each other"] = "Discussion forum for community"; +$a->strings["Account for community discussions."] = "Account for community discussions."; $a->strings["Normal Account Page"] = "Standard"; -$a->strings["This account is a normal personal profile"] = "Regular personal profile"; +$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."; $a->strings["Soapbox Page"] = "Soapbox"; -$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Automatically approves contact requests as followers"; +$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Account for a public profile that automatically approves contact requests as \"Followers\"."; $a->strings["Public Forum"] = "Public forum"; -$a->strings["Automatically approve all contact requests"] = "Automatically approve all contact requests"; -$a->strings["Automatic Friend Page"] = "Popularity"; -$a->strings["Automatically approve all connection/friend requests as friends"] = "Automatically approves contact requests as friends"; +$a->strings["Automatically approves all contact requests."] = "Automatically approves all contact requests."; +$a->strings["Automatic Friend Page"] = "Love-all"; +$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Account for a popular profile that automatically approves contact requests as \"Friends\"."; $a->strings["Private Forum [Experimental]"] = "Private forum [Experimental]"; -$a->strings["Private forum - approved members only"] = "Private forum - approved members only"; +$a->strings["Requires manual approval of contact requests."] = "Requires manual approval of contact requests."; $a->strings["OpenID:"] = "OpenID:"; $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Allow this OpenID to login to this account."; $a->strings["Publish your default profile in your local site directory?"] = "Publish default profile in local site directory?"; From 4515c36f69badb0b63a0f85666011c1369b98477 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 28 Jun 2017 04:53:11 +0000 Subject: [PATCH 109/160] Semaphore based locking and hopefully the fix for the workerqueue --- boot.php | 2 +- database.sql | 10 ++++--- include/cron.php | 2 +- include/dbstructure.php | 1 + include/poller.php | 65 ++++++++++++++++++++++++++++++++++------- src/Util/Lock.php | 33 +++++++++++++++++++++ update.php | 7 ++++- 7 files changed, 102 insertions(+), 18 deletions(-) diff --git a/boot.php b/boot.php index b4f36eb84e..7d7d66ab3e 100644 --- a/boot.php +++ b/boot.php @@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.3-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1230 ); +define ( 'DB_UPDATE_VERSION', 1231 ); /** * @brief Constant with a HTML line break. diff --git a/database.sql b/database.sql index 7f7e975e72..a3f937587c 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ --- Friendica 3.5.3dev (Asparagus) --- DB_UPDATE_VERSION 1228 +-- Friendica 3.5.3-dev (Asparagus) +-- DB_UPDATE_VERSION 1231 -- ------------------------------------------ @@ -1114,9 +1114,11 @@ CREATE TABLE IF NOT EXISTS `workerqueue` ( `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', `pid` int(11) NOT NULL DEFAULT 0, `executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00', + `done` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY(`id`), INDEX `pid` (`pid`), - INDEX `parameter` (`parameter`(192)), - INDEX `priority_created` (`priority`,`created`) + INDEX `parameter` (`parameter`(64)), + INDEX `priority_created` (`priority`,`created`), + INDEX `executed` (`executed`) ) DEFAULT COLLATE utf8mb4_general_ci; diff --git a/include/cron.php b/include/cron.php index 9c2e6aeaa3..0e58778440 100644 --- a/include/cron.php +++ b/include/cron.php @@ -84,7 +84,7 @@ function cron_run(&$argv, &$argc){ proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_photo_albums"); // Delete all done workerqueue entries - dba::delete('workerqueue', array('done' => true)); + dba::e('DELETE FROM `workerqueue` WHERE `done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR'); } // Poll contacts diff --git a/include/dbstructure.php b/include/dbstructure.php index 268bbbb669..32fd304f4b 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1747,6 +1747,7 @@ function db_definition() { "pid" => array("pid"), "parameter" => array("parameter(64)"), "priority_created" => array("priority", "created"), + "executed" => array("executed"), ) ); diff --git a/include/poller.php b/include/poller.php index 379aadcd67..d9394b080b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -85,6 +85,8 @@ function poller_run($argv, $argc){ poller_run_cron(); } + $refetched = false; + $starttime = time(); // We fetch the next queue entry that is about to be executed @@ -121,6 +123,13 @@ function poller_run($argv, $argc){ logger('Process lifetime reached, quitting.', LOGGER_DEBUG); return; } + + // If possible we will fetch new jobs for this worker + if (!$refetched && Lock::set('poller_worker_process', 0)) { + $refetched = find_worker_processes(); + Lock::remove('poller_worker_process'); + } + } logger("Couldn't select a workerqueue entry, quitting.", LOGGER_DEBUG); } @@ -235,7 +244,7 @@ function poller_execute($queue) { * @param array $argv Array of values to be passed to the function */ function poller_exec_function($queue, $funcname, $argv) { - global $poller_up_start, $poller_db_duration; + global $poller_up_start, $poller_db_duration, $poller_lock_duration; $a = get_app(); @@ -284,7 +293,11 @@ function poller_exec_function($queue, $funcname, $argv) { * The execution time is the productive time. * By changing parameters like the maximum number of workers we can check the effectivness. */ - logger('DB: '.number_format($poller_db_duration, 2).' - Rest: '.number_format($up_duration - $poller_db_duration, 2).' - Execution: '.number_format($duration, 2), LOGGER_DEBUG); + logger('DB: '.number_format($poller_db_duration, 2). + ' - Lock: '.number_format($poller_lock_duration, 2). + ' - Rest: '.number_format($up_duration - $poller_db_duration - $poller_lock_duration, 2). + ' - Execution: '.number_format($duration, 2), LOGGER_DEBUG); + $poller_lock_duration = 0; if ($duration > 3600) { logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG); @@ -448,7 +461,7 @@ function poller_kill_stale_workers() { foreach ($r AS $pid) { if (!posix_kill($pid["pid"], 0)) { dba::update('workerqueue', array('executed' => NULL_DATE, 'pid' => 0), - array('pid' => $pid["pid"])); + array('pid' => $pid["pid"], 'done' => false)); } else { // Kill long running processes @@ -475,7 +488,7 @@ function poller_kill_stale_workers() { // Additionally we are lowering the priority. dba::update('workerqueue', array('executed' => NULL_DATE, 'created' => datetime_convert(), 'priority' => PRIORITY_NEGLIGIBLE, 'pid' => 0), - array('pid' => $pid["pid"])); + array('pid' => $pid["pid"], 'done' => false)); } else { logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG); } @@ -512,7 +525,9 @@ function poller_too_much_workers() { $listitem = array(); // Adding all processes with no workerqueue entry - $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS (SELECT id FROM `workerqueue` WHERE `workerqueue`.`pid` = `process`.`pid` AND NOT `done`)"); + $processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS + (SELECT id FROM `workerqueue` + WHERE `workerqueue`.`pid` = `process`.`pid` AND NOT `done` AND `pid` != ?)", getmypid()); if ($process = dba::fetch($processes)) { $listitem[0] = "0:".$process["running"]; } @@ -528,7 +543,16 @@ function poller_too_much_workers() { dba::close($processes); } dba::close($entries); - $processlist = ' ('.implode(', ', $listitem).')'; + + $jobs_per_minute = 0; + + $jobs = dba::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE"); + if ($job = dba::fetch($jobs)) { + $jobs_per_minute = number_format($job['jobs'] / 10, 0); + } + dba::close($jobs); + + $processlist = ' - jpm: '.$jobs_per_minute.' ('.implode(', ', $listitem).')'; } $entries = poller_total_entries(); @@ -628,7 +652,10 @@ function find_worker_processes() { // Check if we should pass some low priority process $highest_priority = 0; $found = false; - $limit = Config::get('system', 'worker_fetch_limit', 5); + + // The higher the number of parallel workers, the more we prefetch to prevent concurring access + $limit = Config::get("system", "worker_queues", 4) * 2; + $limit = Config::get('system', 'worker_fetch_limit', $limit); if (poller_passing_slow($highest_priority)) { // Are there waiting processes with a higher priority than the currently highest? @@ -644,7 +671,7 @@ function find_worker_processes() { // Give slower processes some processing time $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND `priority` > ? AND NOT `done` - ORDER BY `priority`, `created` LIMIT 1", + ORDER BY `priority`, `created` LIMIT ".intval($limit), datetime_convert(), getmypid(), NULL_DATE, $highest_priority); if ($result) { $found = (dba::affected_rows() > 0); @@ -669,14 +696,29 @@ function find_worker_processes() { * @return string SQL statement */ function poller_worker_process() { - global $poller_db_duration; + global $poller_db_duration, $poller_lock_duration; $stamp = (float)microtime(true); - $found = find_worker_processes(); + // There can already be jobs for us in the queue. + $r = q("SELECT * FROM `workerqueue` WHERE `pid` = %d AND NOT `done`", intval(getmypid())); + if (dbm::is_result($r)) { + $poller_db_duration += (microtime(true) - $stamp); + return $r; + } + $stamp = (float)microtime(true); + if (!Lock::set('poller_worker_process')) { + return false; + } + $poller_lock_duration = (microtime(true) - $stamp); + + $stamp = (float)microtime(true); + $found = find_worker_processes(); $poller_db_duration += (microtime(true) - $stamp); + Lock::remove('poller_worker_process'); + if ($found) { $r = q("SELECT * FROM `workerqueue` WHERE `pid` = %d AND NOT `done`", intval(getmypid())); } @@ -689,7 +731,7 @@ function poller_worker_process() { function poller_unclaim_process() { $mypid = getmypid(); - dba::update('workerqueue', array('executed' => NULL_DATE, 'pid' => 0), array('pid' => $mypid)); + dba::update('workerqueue', array('executed' => NULL_DATE, 'pid' => 0), array('pid' => $mypid, 'done' => false)); } /** @@ -793,6 +835,7 @@ if (array_search(__file__,get_included_files())===0){ get_app()->end_process(); Lock::remove('poller_worker'); + Lock::remove('poller_worker_process'); killme(); } diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 36f408cf32..a50faf2d90 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -17,6 +17,8 @@ use dbm; * @brief This class contain Functions for preventing parallel execution of functions */ class Lock { + private static $semaphore = array(); + /** * @brief Check for memcache and open a connection if configured * @@ -43,6 +45,25 @@ class Lock { return $memcache; } + /** + * @brief Creates a semaphore key + * + * @param string $fn_name Name of the lock + * + * @return ressource the semaphore key + */ + private static function semaphore_key($fn_name) { + $temp = get_temppath(); + + $file = $temp.'/'.$fn_name.'.sem'; + + if (!file_exists($file)) { + file_put_contents($file, $function); + } + + return ftok($file, 'f'); + } + /** * @brief Sets a lock for a given name * @@ -55,6 +76,13 @@ class Lock { $got_lock = false; $start = time(); + if (function_exists('sem_get')) { + self::$semaphore[$fn_name] = sem_get(self::semaphore_key($fn_name)); + if (self::$semaphore[$fn_name]) { + return sem_acquire(self::$semaphore[$fn_name], ($timeout == 0)); + } + } + $memcache = self::connectMemcache(); if (is_object($memcache)) { $cachekey = get_app()->get_hostname().";lock:".$fn_name; @@ -128,6 +156,11 @@ class Lock { * @param string $fn_name Name of the lock */ public static function remove($fn_name) { + if (function_exists('sem_get') && self::$semaphore[$fn_name]) { + sem_release(self::$semaphore[$fn_name]); + return; + } + $memcache = self::connectMemcache(); if (is_object($memcache)) { $cachekey = get_app()->get_hostname().";lock:".$fn_name; diff --git a/update.php b/update.php index 09f11918c5..7cfdb231e0 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define('UPDATE_VERSION' , 1230); +define('UPDATE_VERSION' , 1231); /** * @@ -1729,3 +1729,8 @@ function update_1202() { $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)", dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP)); } + +function update_1230() { + // For this special case we have to use the old update routine + $r = q("ALTER TABLE `workerqueue` ADD `done2` tinyint(1) NOT NULL DEFAULT 0"); +} From 22a2c3b9bfadaee03adbe5e9209131138502d241 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Wed, 28 Jun 2017 15:10:57 +0200 Subject: [PATCH 110/160] added a short note about backups to the INSTALL files --- INSTALL.txt | 12 +++++++++++- doc/Install.md | 8 ++++++++ doc/de/Install.md | 8 ++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index c42c089716..1cab3412e2 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -140,7 +140,17 @@ $a->config['system']['addon'] = 'js_upload,poormancron'; and save your changes. -9. (Optional) Reverse-proxying and HTTPS +9. (Optional) Set up a backup plan + +Bad things will happen. Be them a hardware failure, a currupted database +or whatever you can think of. So once the installation of your Friendica +node is done, you should make yoursef a backup plan. + +The most important file is the `.htconfig.php` file in the base directory. +As it stores all your data, you should also have a recent dump of your +Friendica database at hand, should you have to recover your node. + +10. (Optional) Reverse-proxying and HTTPS Friendica looks for some well-known HTTP headers indicating a reverse-proxy terminating an HTTPS connection. While the standard from RFC 7239 specifies diff --git a/doc/Install.md b/doc/Install.md index 53df55be06..257d627785 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -144,3 +144,11 @@ The addon tree has to be updated separately like so: cd mywebsite/addon git pull + +###Set up a backup plan +Bad things will happen. +Be them a hardware failure, a currupted database or whatever you can think of. +So once the installation of your Friendica node is done, you should make yoursef a backup plan. + +The most important file is the `.htconfig.php` file in the base directory. +As it stores all your data, you should also have a recent dump of your Friendica database at hand, should you have to recover your node. diff --git a/doc/de/Install.md b/doc/de/Install.md index db8fb965d4..7c0b87fbb7 100644 --- a/doc/de/Install.md +++ b/doc/de/Install.md @@ -108,3 +108,11 @@ Du kannst auch weitere Addons/Plugins ergänzen. Ändere den Eintrag folgenderma `$a->config['system']['addon'] = 'js_upload,poormancron';` und speichere deine Änderungen. + +###Erstelle einen Backup Plan +Es werden schlimme Dinge geschehen. +Sei es nun ein Hardwareversage oder eine korrumpierte Datenbank. +Deshalb solltest du dir nachdem die Installation deines Friendica Knotens abgeschlossen ist einen Backup Plan erstellen. + +Die wichtigste Datei ist die `.htconfig.php` im Stammverzeichnis deiner Friendica Installation. +Und da alle Daten in der Datenbank gespeichert werden, solltest du einen nicht all zu alten Dump der Friendica Datenbank zur Hand haben, solltest du deinen Knoten wieder herstellen müssen. From 076cf702b03574d1ec154597b10d333ce5e9f68c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Wed, 28 Jun 2017 15:11:35 +0200 Subject: [PATCH 111/160] Added a short usage example of exportet profile data --- doc/Account-Basics.md | 5 ++++- doc/de/Account-Basics.md | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index 854e78b14e..6d7f86c085 100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -89,7 +89,10 @@ A ['Tips for New Members'](newmember) link will show up on your network and home Retrieving Personal Data --- -You can export a copy of your personal data in XML format from the "Export personal data" link at the top of your settings page. +You can export a copy of your personal data in JSON format from the "Export personal data" link at the top of your settings page. + +You need this file to relocate your Friendica account to another node. +This might be necessary, e.g. if your node suffers a severe hardware problem and is not recoverable. See Also --- diff --git a/doc/de/Account-Basics.md b/doc/de/Account-Basics.md index 9d2f3ac86c..bfeba69ffe 100644 --- a/doc/de/Account-Basics.md +++ b/doc/de/Account-Basics.md @@ -95,9 +95,11 @@ Ein ['Tipp für neue Mitglieder'](newmember)-Link zeigt sich in den ersten beide **Persönliche Daten exportieren** -Du kannst eine Kopie Deiner persönlichen Daten in einer XML-Datei exportieren. +Du kannst eine Kopie Deiner persönlichen Daten in einer JSON-Datei exportieren. Gehe hierzu in Deinen Einstellungen auf "Persönliche Daten exportieren". +Dies ist z.B. dann nützlich wenn du mit deinem Account auf einen anderen Friendica Knoten umziehen möchstest. +Ein Grund hierfür könnte sein, dass der Server auf dem dieser Friendica Knoten läuft dauerhaft wegen eines Hardware Problems ausfällt. **Schau Dir ebenfalls folgende Seiten an** From 4eaa6b94a60e069c94068c584adeed970448443f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite <alexandre@alapetite.fr> Date: Wed, 28 Jun 2017 18:38:18 +0200 Subject: [PATCH 112/160] Hide semaphone warning https://github.com/friendica/friendica/issues/3553 --- src/Util/Lock.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index a50faf2d90..3988294b0f 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -157,8 +157,7 @@ class Lock { */ public static function remove($fn_name) { if (function_exists('sem_get') && self::$semaphore[$fn_name]) { - sem_release(self::$semaphore[$fn_name]); - return; + return @sem_release(self::$semaphore[$fn_name]); } $memcache = self::connectMemcache(); From 526db18f5c6c4eef95e6ccd16b405619c960b3f0 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 28 Jun 2017 18:31:33 +0000 Subject: [PATCH 113/160] Hopefully a fix for semaphore warnings and for the missing field in the workerqueue --- boot.php | 2 +- include/poller.php | 3 --- update.php | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/boot.php b/boot.php index 7d7d66ab3e..76646f7483 100644 --- a/boot.php +++ b/boot.php @@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_CODENAME', 'Asparagus'); define ( 'FRIENDICA_VERSION', '3.5.3-dev' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1231 ); +define ( 'DB_UPDATE_VERSION', 1232 ); /** * @brief Constant with a HTML line break. diff --git a/include/poller.php b/include/poller.php index d9394b080b..266b1cb5b0 100644 --- a/include/poller.php +++ b/include/poller.php @@ -834,8 +834,5 @@ if (array_search(__file__,get_included_files())===0){ get_app()->end_process(); - Lock::remove('poller_worker'); - Lock::remove('poller_worker_process'); - killme(); } diff --git a/update.php b/update.php index 7cfdb231e0..d89e9ca06d 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ <?php -define('UPDATE_VERSION' , 1231); +define('UPDATE_VERSION' , 1232); /** * @@ -1730,7 +1730,7 @@ function update_1202() { dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP)); } -function update_1230() { +function update_1231() { // For this special case we have to use the old update routine - $r = q("ALTER TABLE `workerqueue` ADD `done2` tinyint(1) NOT NULL DEFAULT 0"); + $r = q("ALTER TABLE `workerqueue` ADD `done` tinyint(1) NOT NULL DEFAULT 0"); } From 329ab7d1533e2ae6f81249de036866fca6a2b964 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite <alexandre@alapetite.fr> Date: Wed, 28 Jun 2017 22:38:22 +0200 Subject: [PATCH 114/160] More general check for semaphore --- src/Util/Lock.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 3988294b0f..ca75b0d666 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -156,8 +156,14 @@ class Lock { * @param string $fn_name Name of the lock */ public static function remove($fn_name) { - if (function_exists('sem_get') && self::$semaphore[$fn_name]) { - return @sem_release(self::$semaphore[$fn_name]); + if (function_exists('sem_get')) { + if (empty(self::$semaphore[$fn_name])) { + return false; + } else { + $rid = self::$semaphore[$fn_name]; + self::$semaphore[$fn_name] = 0; + return @sem_release($rid); + } } $memcache = self::connectMemcache(); From 18d6eba8d00c2338036a780db2bf6df139077184 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 29 Jun 2017 05:40:02 +0000 Subject: [PATCH 115/160] Some more performance stuff --- include/poller.php | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/include/poller.php b/include/poller.php index d9394b080b..017c4bc5d3 100644 --- a/include/poller.php +++ b/include/poller.php @@ -85,12 +85,13 @@ function poller_run($argv, $argc){ poller_run_cron(); } - $refetched = false; - $starttime = time(); // We fetch the next queue entry that is about to be executed while ($r = poller_worker_process()) { + + $refetched = false; + foreach ($r AS $entry) { // Assure that the priority is an integer value $entry['priority'] = (int)$entry['priority']; @@ -100,6 +101,13 @@ function poller_run($argv, $argc){ logger('Process execution failed, quitting.', LOGGER_DEBUG); return; } + + // If possible we will fetch new jobs for this worker + if (!$refetched && Lock::set('poller_worker_process', 0)) { + logger('Blubb: a'); + $refetched = find_worker_processes(); + Lock::remove('poller_worker_process'); + } } // To avoid the quitting of multiple pollers only one poller at a time will execute the check @@ -123,13 +131,6 @@ function poller_run($argv, $argc){ logger('Process lifetime reached, quitting.', LOGGER_DEBUG); return; } - - // If possible we will fetch new jobs for this worker - if (!$refetched && Lock::set('poller_worker_process', 0)) { - $refetched = find_worker_processes(); - Lock::remove('poller_worker_process'); - } - } logger("Couldn't select a workerqueue entry, quitting.", LOGGER_DEBUG); } @@ -573,8 +574,7 @@ function poller_too_much_workers() { if (!Config::get("system", "worker_dont_fork") && ($queues > ($active + 1)) && ($entries > 1)) { logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG); $args = array("include/poller.php", "no_cron"); - $a = get_app(); - $a->proc_run($args); + get_app()->proc_run($args); } } @@ -648,7 +648,12 @@ function poller_passing_slow(&$highest_priority) { * * @return boolean Have we found something? */ -function find_worker_processes() { +function find_worker_processes($mypid = 0) { + + if ($mypid == 0) { + $mypid = getmypid(); + } + // Check if we should pass some low priority process $highest_priority = 0; $found = false; @@ -662,7 +667,7 @@ function find_worker_processes() { $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND `priority` < ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), - datetime_convert(), getmypid(), NULL_DATE, $highest_priority); + datetime_convert(), $mypid, NULL_DATE, $highest_priority); if ($result) { $found = (dba::affected_rows() > 0); } @@ -672,7 +677,7 @@ function find_worker_processes() { $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND `priority` > ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), - datetime_convert(), getmypid(), NULL_DATE, $highest_priority); + datetime_convert(), $mypid, NULL_DATE, $highest_priority); if ($result) { $found = (dba::affected_rows() > 0); } @@ -682,7 +687,7 @@ function find_worker_processes() { // If there is no result (or we shouldn't pass lower processes) we check without priority limit if (!$found) { $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), - datetime_convert(), getmypid(), NULL_DATE); + datetime_convert(), $mypid, NULL_DATE); if ($result) { $found = (dba::affected_rows() > 0); } @@ -778,8 +783,7 @@ function call_worker_if_idle() { logger('Call poller', LOGGER_DEBUG); $args = array("include/poller.php", "no_cron"); - $a = get_app(); - $a->proc_run($args); + get_app()->proc_run($args); return; } @@ -834,8 +838,5 @@ if (array_search(__file__,get_included_files())===0){ get_app()->end_process(); - Lock::remove('poller_worker'); - Lock::remove('poller_worker_process'); - killme(); } From 99b86c9fd9a14e90c0048b623db952d21624d239 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 29 Jun 2017 21:19:31 +0000 Subject: [PATCH 116/160] Just found the handbrake ... --- include/dba.php | 10 ++++++-- include/poller.php | 64 ++++++++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 24 deletions(-) diff --git a/include/dba.php b/include/dba.php index 1c63fa5054..e39e6f136e 100644 --- a/include/dba.php +++ b/include/dba.php @@ -627,6 +627,12 @@ class dba { self::$dbo->errorno = mysql_errno(self::$dbo->db); } else { self::$dbo->affected_rows = mysql_affected_rows($retval); + + // Due to missing mysql_* support this here wasn't tested at all + // See here: http://php.net/manual/en/function.mysql-num-rows.php + if (self::$dbo->affected_rows <= 0) { + self::$dbo->affected_rows = mysql_num_rows($retval); + } } break; } @@ -1038,7 +1044,7 @@ class dba { $sql = "DELETE FROM `".$command['table']."` WHERE `". implode("` = ? AND `", array_keys($command['param']))."` = ?"; - logger(dba::replace_parameters($sql, $command['param']), LOGGER_DATA); + logger(self::replace_parameters($sql, $command['param']), LOGGER_DATA); if (!self::e($sql, $command['param'])) { if ($do_transaction) { @@ -1068,7 +1074,7 @@ class dba { $sql = "DELETE FROM `".$table."` WHERE `".$field."` IN (". substr(str_repeat("?, ", count($field_values)), 0, -2).");"; - logger(dba::replace_parameters($sql, $field_values), LOGGER_DATA); + logger(self::replace_parameters($sql, $field_values), LOGGER_DATA); if (!self::e($sql, $field_values)) { if ($do_transaction) { diff --git a/include/poller.php b/include/poller.php index 017c4bc5d3..4ad9553882 100644 --- a/include/poller.php +++ b/include/poller.php @@ -18,7 +18,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) { require_once("boot.php"); function poller_run($argv, $argc){ - global $a, $db, $poller_up_start; + global $a, $db, $poller_up_start, $poller_db_duration; $poller_up_start = microtime(true); @@ -104,8 +104,9 @@ function poller_run($argv, $argc){ // If possible we will fetch new jobs for this worker if (!$refetched && Lock::set('poller_worker_process', 0)) { - logger('Blubb: a'); + $stamp = (float)microtime(true); $refetched = find_worker_processes(); + $poller_db_duration += (microtime(true) - $stamp); Lock::remove('poller_worker_process'); } } @@ -545,15 +546,16 @@ function poller_too_much_workers() { } dba::close($entries); - $jobs_per_minute = 0; - - $jobs = dba::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL 10 MINUTE"); - if ($job = dba::fetch($jobs)) { - $jobs_per_minute = number_format($job['jobs'] / 10, 0); + $intervals = array(1, 10, 60); + $jobs_per_minute = array(); + foreach ($intervals AS $interval) { + $jobs = dba::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ".intval($interval)." MINUTE"); + if ($job = dba::fetch($jobs)) { + $jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0); + } + dba::close($jobs); } - dba::close($jobs); - - $processlist = ' - jpm: '.$jobs_per_minute.' ('.implode(', ', $listitem).')'; + $processlist = ' - jpm: '.implode('/', $jobs_per_minute).' ('.implode(', ', $listitem).')'; } $entries = poller_total_entries(); @@ -664,34 +666,52 @@ function find_worker_processes($mypid = 0) { if (poller_passing_slow($highest_priority)) { // Are there waiting processes with a higher priority than the currently highest? - $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? + $result = dba::p("SELECT `id` FROM `workerqueue` WHERE `executed` <= ? AND `priority` < ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), - datetime_convert(), $mypid, NULL_DATE, $highest_priority); - if ($result) { - $found = (dba::affected_rows() > 0); + NULL_DATE, $highest_priority); + + while ($id = dba::fetch($result)) { + $ids[] = $id["id"]; } + dba::close($result); + + $found = (count($ids) > 0); if (!$found) { // Give slower processes some processing time - $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? + $result = dba::p("SELECT `id` FROM `workerqueue` WHERE `executed` <= ? AND `priority` > ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), - datetime_convert(), $mypid, NULL_DATE, $highest_priority); - if ($result) { - $found = (dba::affected_rows() > 0); + NULL_DATE, $highest_priority); + + while ($id = dba::fetch($result)) { + $ids[] = $id["id"]; } + dba::close($result); + + $found = (count($ids) > 0); } } // If there is no result (or we shouldn't pass lower processes) we check without priority limit if (!$found) { - $result = dba::e("UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `executed` <= ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), - datetime_convert(), $mypid, NULL_DATE); - if ($result) { - $found = (dba::affected_rows() > 0); + $result = dba::p("SELECT `id` FROM `workerqueue` WHERE `executed` <= ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), NULL_DATE); + + while ($id = dba::fetch($result)) { + $ids[] = $id["id"]; } + dba::close($result); + + $found = (count($ids) > 0); } + + if ($found) { + $sql = "UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`;"; + array_unshift($ids, datetime_convert(), $mypid); + dba::e($sql, $ids); + } + return $found; } From e515c20cbc016e8606a6c96991f1adde8a1acffd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 30 Jun 2017 08:24:45 +0200 Subject: [PATCH 117/160] DE translations --- view/lang/de/messages.po | 6959 +++++++++++++++++++------------------- view/lang/de/strings.php | 1668 ++++----- 2 files changed, 4314 insertions(+), 4313 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index b1c20d4469..a72d3368bb 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -36,9 +36,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-09 16:42+0700\n" -"PO-Revision-Date: 2017-06-26 10:14+0000\n" -"Last-Translator: Andy H3 <andy@hubup.pro>\n" +"POT-Creation-Date: 2017-06-19 16:23+0700\n" +"PO-Revision-Date: 2017-06-30 06:22+0000\n" +"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,123 +46,326 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: include/contact_selectors.php:32 -msgid "Unknown | Not categorised" -msgstr "Unbekannt | Nicht kategorisiert" +#: include/ForumManager.php:116 include/nav.php:133 include/text.php:1094 +#: view/theme/vier/theme.php:248 +msgid "Forums" +msgstr "Foren" -#: include/contact_selectors.php:33 -msgid "Block immediately" -msgstr "Sofort blockieren" +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 +msgid "External link to forum" +msgstr "Externer Link zum Forum" -#: include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" -msgstr "Zwielichtig, Spammer, Selbstdarsteller" +#: include/ForumManager.php:121 include/contact_widgets.php:271 +#: include/items.php:2432 mod/content.php:625 object/Item.php:417 +#: src/App.php:507 view/theme/vier/theme.php:253 +msgid "show more" +msgstr "mehr anzeigen" -#: include/contact_selectors.php:35 -msgid "Known to me, but no opinion" -msgstr "Ist mir bekannt, hab aber keine Meinung" +#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 +msgid "l F d, Y \\@ g:i A" +msgstr "l, d. F Y\\, H:i" -#: include/contact_selectors.php:36 -msgid "OK, probably harmless" -msgstr "OK, wahrscheinlich harmlos" +#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 +#: include/event.php:459 +msgid "Starts:" +msgstr "Beginnt:" -#: include/contact_selectors.php:37 -msgid "Reputable, has my trust" -msgstr "Seriös, hat mein Vertrauen" +#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 +#: include/event.php:460 +msgid "Finishes:" +msgstr "Endet:" -#: include/contact_selectors.php:56 mod/admin.php:986 -msgid "Frequently" -msgstr "immer wieder" +#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 +#: include/event.php:461 include/identity.php:342 mod/directory.php:135 +#: mod/notifications.php:246 mod/contacts.php:639 mod/events.php:496 +msgid "Location:" +msgstr "Ort:" -#: include/contact_selectors.php:57 mod/admin.php:987 -msgid "Hourly" -msgstr "Stündlich" +#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 +msgid "Miscellaneous" +msgstr "Verschiedenes" -#: include/contact_selectors.php:58 mod/admin.php:988 -msgid "Twice daily" -msgstr "Zweimal täglich" +#: include/datetime.php:196 include/identity.php:656 +msgid "Birthday:" +msgstr "Geburtstag:" -#: include/contact_selectors.php:59 mod/admin.php:989 -msgid "Daily" -msgstr "Täglich" +#: include/datetime.php:198 mod/profiles.php:724 +msgid "Age: " +msgstr "Alter: " -#: include/contact_selectors.php:60 -msgid "Weekly" -msgstr "Wöchentlich" +#: include/datetime.php:200 +msgid "YYYY-MM-DD or MM-DD" +msgstr "YYYY-MM-DD oder MM-DD" -#: include/contact_selectors.php:61 -msgid "Monthly" -msgstr "Monatlich" +#: include/datetime.php:370 +msgid "never" +msgstr "nie" -#: include/contact_selectors.php:76 mod/dfrn_request.php:886 -msgid "Friendica" -msgstr "Friendica" +#: include/datetime.php:376 +msgid "less than a second ago" +msgstr "vor weniger als einer Sekunde" -#: include/contact_selectors.php:77 -msgid "OStatus" -msgstr "OStatus" +#: include/datetime.php:379 +msgid "year" +msgstr "Jahr" -#: include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "RSS/Atom" +#: include/datetime.php:379 +msgid "years" +msgstr "Jahre" -#: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 -msgid "Email" -msgstr "E-Mail" +#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 +#: mod/events.php:387 +msgid "month" +msgstr "Monat" -#: include/contact_selectors.php:80 mod/dfrn_request.php:888 -#: mod/settings.php:849 -msgid "Diaspora" -msgstr "Diaspora" +#: include/datetime.php:380 +msgid "months" +msgstr "Monate" -#: include/contact_selectors.php:81 -msgid "Facebook" -msgstr "Facebook" +#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 +#: mod/events.php:388 +msgid "week" +msgstr "Woche" -#: include/contact_selectors.php:82 -msgid "Zot!" -msgstr "Zott" +#: include/datetime.php:381 +msgid "weeks" +msgstr "Wochen" -#: include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "LinkedIn" +#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 +#: mod/events.php:389 +msgid "day" +msgstr "Tag" -#: include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "XMPP/Chat" +#: include/datetime.php:382 +msgid "days" +msgstr "Tage" -#: include/contact_selectors.php:85 -msgid "MySpace" -msgstr "MySpace" +#: include/datetime.php:383 +msgid "hour" +msgstr "Stunde" -#: include/contact_selectors.php:87 -msgid "Google+" -msgstr "Google+" +#: include/datetime.php:383 +msgid "hours" +msgstr "Stunden" -#: include/contact_selectors.php:88 -msgid "pump.io" -msgstr "pump.io" +#: include/datetime.php:384 +msgid "minute" +msgstr "Minute" -#: include/contact_selectors.php:89 -msgid "Twitter" -msgstr "Twitter" +#: include/datetime.php:384 +msgid "minutes" +msgstr "Minuten" -#: include/contact_selectors.php:90 -msgid "Diaspora Connector" -msgstr "Diaspora" +#: include/datetime.php:385 +msgid "second" +msgstr "Sekunde" -#: include/contact_selectors.php:91 -msgid "GNU Social Connector" -msgstr "GNU social Connector" +#: include/datetime.php:385 +msgid "seconds" +msgstr "Sekunden" -#: include/contact_selectors.php:92 -msgid "pnut" -msgstr "pnut" +#: include/datetime.php:394 +#, php-format +msgid "%1$d %2$s ago" +msgstr "%1$d %2$s her" -#: include/contact_selectors.php:93 -msgid "App.net" -msgstr "App.net" +#: include/datetime.php:620 +#, php-format +msgid "%s's birthday" +msgstr "%ss Geburtstag" + +#: include/datetime.php:621 include/dfrn.php:1310 +#, php-format +msgid "Happy Birthday %s" +msgstr "Herzlichen Glückwunsch %s" + +#: include/event.php:408 +msgid "all-day" +msgstr "ganztägig" + +#: include/event.php:410 +msgid "Sun" +msgstr "So" + +#: include/event.php:411 +msgid "Mon" +msgstr "Mo" + +#: include/event.php:412 +msgid "Tue" +msgstr "Di" + +#: include/event.php:413 +msgid "Wed" +msgstr "Mi" + +#: include/event.php:414 +msgid "Thu" +msgstr "Do" + +#: include/event.php:415 +msgid "Fri" +msgstr "Fr" + +#: include/event.php:416 +msgid "Sat" +msgstr "Sa" + +#: include/event.php:418 include/text.php:1199 mod/settings.php:982 +msgid "Sunday" +msgstr "Sonntag" + +#: include/event.php:419 include/text.php:1199 mod/settings.php:982 +msgid "Monday" +msgstr "Montag" + +#: include/event.php:420 include/text.php:1199 +msgid "Tuesday" +msgstr "Dienstag" + +#: include/event.php:421 include/text.php:1199 +msgid "Wednesday" +msgstr "Mittwoch" + +#: include/event.php:422 include/text.php:1199 +msgid "Thursday" +msgstr "Donnerstag" + +#: include/event.php:423 include/text.php:1199 +msgid "Friday" +msgstr "Freitag" + +#: include/event.php:424 include/text.php:1199 +msgid "Saturday" +msgstr "Samstag" + +#: include/event.php:426 +msgid "Jan" +msgstr "Jan" + +#: include/event.php:427 +msgid "Feb" +msgstr "Feb" + +#: include/event.php:428 +msgid "Mar" +msgstr "März" + +#: include/event.php:429 +msgid "Apr" +msgstr "Apr" + +#: include/event.php:430 include/event.php:443 include/text.php:1203 +msgid "May" +msgstr "Mai" + +#: include/event.php:431 +msgid "Jun" +msgstr "Jun" + +#: include/event.php:432 +msgid "Jul" +msgstr "Juli" + +#: include/event.php:433 +msgid "Aug" +msgstr "Aug" + +#: include/event.php:434 +msgid "Sept" +msgstr "Sep" + +#: include/event.php:435 +msgid "Oct" +msgstr "Okt" + +#: include/event.php:436 +msgid "Nov" +msgstr "Nov" + +#: include/event.php:437 +msgid "Dec" +msgstr "Dez" + +#: include/event.php:439 include/text.php:1203 +msgid "January" +msgstr "Januar" + +#: include/event.php:440 include/text.php:1203 +msgid "February" +msgstr "Februar" + +#: include/event.php:441 include/text.php:1203 +msgid "March" +msgstr "März" + +#: include/event.php:442 include/text.php:1203 +msgid "April" +msgstr "April" + +#: include/event.php:444 include/text.php:1203 +msgid "June" +msgstr "Juni" + +#: include/event.php:445 include/text.php:1203 +msgid "July" +msgstr "Juli" + +#: include/event.php:446 include/text.php:1203 +msgid "August" +msgstr "August" + +#: include/event.php:447 include/text.php:1203 +msgid "September" +msgstr "September" + +#: include/event.php:448 include/text.php:1203 +msgid "October" +msgstr "Oktober" + +#: include/event.php:449 include/text.php:1203 +msgid "November" +msgstr "November" + +#: include/event.php:450 include/text.php:1203 +msgid "December" +msgstr "Dezember" + +#: include/event.php:452 mod/cal.php:280 mod/events.php:386 +msgid "today" +msgstr "Heute" + +#: include/event.php:457 +msgid "No events to display" +msgstr "Keine Veranstaltung zum Anzeigen" + +#: include/event.php:570 +msgid "l, F j" +msgstr "l, F j" + +#: include/event.php:592 +msgid "Edit event" +msgstr "Veranstaltung bearbeiten" + +#: include/event.php:593 +msgid "Delete event" +msgstr "Veranstaltung löschen" + +#: include/event.php:619 include/text.php:1601 include/text.php:1608 +msgid "link to source" +msgstr "Link zum Originalbeitrag" + +#: include/event.php:873 +msgid "Export" +msgstr "Exportieren" + +#: include/event.php:874 +msgid "Export calendar as ical" +msgstr "Kalender als ical exportieren" + +#: include/event.php:875 +msgid "Export calendar as csv" +msgstr "Kalender als csv exportieren" #: include/features.php:65 msgid "General Features" @@ -363,67 +566,622 @@ msgstr "Erweiterte Profil-Einstellungen" msgid "Show visitors public community forums at the Advanced Profile Page" msgstr "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite" -#: include/group.php:25 +#: include/like.php:30 include/conversation.php:154 include/diaspora.php:1649 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "%1$s mag %2$ss %3$s" + +#: include/like.php:34 include/like.php:39 include/conversation.php:157 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "%1$s mag %2$ss %3$s nicht" + +#: include/like.php:44 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s nimmt an %2$ss %3$s teil." + +#: include/like.php:49 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s nimmt nicht an %2$ss %3$s teil." + +#: include/like.php:54 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." + +#: include/like.php:181 include/conversation.php:142 +#: include/conversation.php:294 include/text.php:1873 mod/subthread.php:89 +#: mod/tagger.php:63 +msgid "photo" +msgstr "Foto" + +#: include/like.php:181 include/conversation.php:137 +#: include/conversation.php:147 include/conversation.php:289 +#: include/conversation.php:298 include/diaspora.php:1653 mod/subthread.php:89 +#: mod/tagger.php:63 +msgid "status" +msgstr "Status" + +#: include/like.php:183 include/conversation.php:134 +#: include/conversation.php:286 include/text.php:1871 +msgid "event" +msgstr "Event" + +#: include/profile_selectors.php:6 +msgid "Male" +msgstr "Männlich" + +#: include/profile_selectors.php:6 +msgid "Female" +msgstr "Weiblich" + +#: include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Momentan männlich" + +#: include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Momentan weiblich" + +#: include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Hauptsächlich männlich" + +#: include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Hauptsächlich weiblich" + +#: include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transgender" + +#: include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Intersex" + +#: include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transsexuell" + +#: include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Hermaphrodit" + +#: include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Neuter" + +#: include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "Nicht spezifiziert" + +#: include/profile_selectors.php:6 +msgid "Other" +msgstr "Andere" + +#: include/profile_selectors.php:6 include/conversation.php:1548 +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "Unentschieden" +msgstr[1] "Unentschieden" + +#: include/profile_selectors.php:23 +msgid "Males" +msgstr "Männer" + +#: include/profile_selectors.php:23 +msgid "Females" +msgstr "Frauen" + +#: include/profile_selectors.php:23 +msgid "Gay" +msgstr "Schwul" + +#: include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "Lesbisch" + +#: include/profile_selectors.php:23 +msgid "No Preference" +msgstr "Keine Vorlieben" + +#: include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "Bisexuell" + +#: include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "Autosexual" + +#: include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "Abstinent" + +#: include/profile_selectors.php:23 +msgid "Virgin" +msgstr "Jungfrauen" + +#: include/profile_selectors.php:23 +msgid "Deviant" +msgstr "Deviant" + +#: include/profile_selectors.php:23 +msgid "Fetish" +msgstr "Fetish" + +#: include/profile_selectors.php:23 +msgid "Oodles" +msgstr "Oodles" + +#: include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "Nonsexual" + +#: include/profile_selectors.php:42 +msgid "Single" +msgstr "Single" + +#: include/profile_selectors.php:42 +msgid "Lonely" +msgstr "Einsam" + +#: include/profile_selectors.php:42 +msgid "Available" +msgstr "Verfügbar" + +#: include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "Nicht verfügbar" + +#: include/profile_selectors.php:42 +msgid "Has crush" +msgstr "verknallt" + +#: include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "verliebt" + +#: include/profile_selectors.php:42 +msgid "Dating" +msgstr "Dating" + +#: include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "Untreu" + +#: include/profile_selectors.php:42 +msgid "Sex Addict" +msgstr "Sexbesessen" + +#: include/profile_selectors.php:42 include/user.php:260 include/user.php:264 +msgid "Friends" +msgstr "Kontakte" + +#: include/profile_selectors.php:42 +msgid "Friends/Benefits" +msgstr "Freunde/Zuwendungen" + +#: include/profile_selectors.php:42 +msgid "Casual" +msgstr "Casual" + +#: include/profile_selectors.php:42 +msgid "Engaged" +msgstr "Verlobt" + +#: include/profile_selectors.php:42 +msgid "Married" +msgstr "Verheiratet" + +#: include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "imaginär verheiratet" + +#: include/profile_selectors.php:42 +msgid "Partners" +msgstr "Partner" + +#: include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "zusammenlebend" + +#: include/profile_selectors.php:42 +msgid "Common law" +msgstr "wilde Ehe" + +#: include/profile_selectors.php:42 +msgid "Happy" +msgstr "Glücklich" + +#: include/profile_selectors.php:42 +msgid "Not looking" +msgstr "Nicht auf der Suche" + +#: include/profile_selectors.php:42 +msgid "Swinger" +msgstr "Swinger" + +#: include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "Betrogen" + +#: include/profile_selectors.php:42 +msgid "Separated" +msgstr "Getrennt" + +#: include/profile_selectors.php:42 +msgid "Unstable" +msgstr "Unstabil" + +#: include/profile_selectors.php:42 +msgid "Divorced" +msgstr "Geschieden" + +#: include/profile_selectors.php:42 +msgid "Imaginarily divorced" +msgstr "imaginär geschieden" + +#: include/profile_selectors.php:42 +msgid "Widowed" +msgstr "Verwitwet" + +#: include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "Unsicher" + +#: include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "Ist kompliziert" + +#: include/profile_selectors.php:42 +msgid "Don't care" +msgstr "Ist mir nicht wichtig" + +#: include/profile_selectors.php:42 +msgid "Ask me" +msgstr "Frag mich" + +#: include/security.php:63 +msgid "Welcome " +msgstr "Willkommen " + +#: include/security.php:64 +msgid "Please upload a profile photo." +msgstr "Bitte lade ein Profilbild hoch." + +#: include/security.php:67 +msgid "Welcome back " +msgstr "Willkommen zurück " + +#: include/security.php:431 msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen." +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." -#: include/group.php:210 -msgid "Default privacy group for new contacts" -msgstr "Voreingestellte Gruppe für neue Kontakte" +#: include/uimport.php:85 +msgid "Error decoding account file" +msgstr "Fehler beim Verarbeiten der Account Datei" -#: include/group.php:243 -msgid "Everybody" -msgstr "Alle Kontakte" +#: include/uimport.php:91 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?" -#: include/group.php:266 -msgid "edit" -msgstr "bearbeiten" +#: include/uimport.php:108 include/uimport.php:119 +msgid "Error! Cannot check nickname" +msgstr "Fehler! Konnte den Nickname nicht überprüfen." -#: include/group.php:287 mod/newmember.php:39 -msgid "Groups" -msgstr "Gruppen" +#: include/uimport.php:112 include/uimport.php:123 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "Nutzer '%s' existiert bereits auf diesem Server!" -#: include/group.php:289 -msgid "Edit groups" -msgstr "Gruppen bearbeiten" +#: include/uimport.php:145 +msgid "User creation error" +msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten" -#: include/group.php:291 -msgid "Edit group" -msgstr "Gruppe bearbeiten" +#: include/uimport.php:166 +msgid "User profile creation error" +msgstr "Fehler beim Anlegen des Nutzerkontos" -#: include/group.php:292 -msgid "Create a new group" -msgstr "Neue Gruppe erstellen" +#: include/uimport.php:215 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "%d Kontakt nicht importiert" +msgstr[1] "%d Kontakte nicht importiert" -#: include/group.php:293 mod/group.php:100 mod/group.php:197 -msgid "Group Name: " -msgstr "Gruppenname:" +#: include/uimport.php:281 +msgid "Done. You can now login with your username and password" +msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden" -#: include/group.php:295 -msgid "Contacts not in any group" -msgstr "Kontakte in keiner Gruppe" +#: include/user.php:39 mod/settings.php:377 +msgid "Passwords do not match. Password unchanged." +msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." -#: include/group.php:297 mod/network.php:210 -msgid "add" -msgstr "hinzufügen" +#: include/user.php:48 +msgid "An invitation is required." +msgstr "Du benötigst eine Einladung." -#: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133 -#: view/theme/vier/theme.php:248 -msgid "Forums" -msgstr "Foren" +#: include/user.php:53 +msgid "Invitation could not be verified." +msgstr "Die Einladung konnte nicht überprüft werden." -#: include/ForumManager.php:118 view/theme/vier/theme.php:250 -msgid "External link to forum" -msgstr "Externer Link zum Forum" +#: include/user.php:61 +msgid "Invalid OpenID url" +msgstr "Ungültige OpenID URL" -#: include/ForumManager.php:121 include/contact_widgets.php:271 -#: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: view/theme/vier/theme.php:253 src/App.php:506 -msgid "show more" -msgstr "mehr anzeigen" +#: include/user.php:75 include/auth.php:139 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast." + +#: include/user.php:75 include/auth.php:139 +msgid "The error message was:" +msgstr "Die Fehlermeldung lautete:" + +#: include/user.php:82 +msgid "Please enter the required information." +msgstr "Bitte trage die erforderlichen Informationen ein." + +#: include/user.php:96 +msgid "Please use a shorter name." +msgstr "Bitte verwende einen kürzeren Namen." + +#: include/user.php:98 +msgid "Name too short." +msgstr "Der Name ist zu kurz." + +#: include/user.php:106 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein." + +#: include/user.php:111 +msgid "Your email domain is not among those allowed on this site." +msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt." + +#: include/user.php:114 +msgid "Not a valid email address." +msgstr "Keine gültige E-Mail-Adresse." + +#: include/user.php:127 +msgid "Cannot use that email." +msgstr "Konnte diese E-Mail-Adresse nicht verwenden." + +#: include/user.php:133 +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." +msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen." + +#: include/user.php:140 include/user.php:228 +msgid "Nickname is already registered. Please choose another." +msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." + +#: include/user.php:150 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." + +#: include/user.php:166 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." + +#: include/user.php:214 +msgid "An error occurred during registration. Please try again." +msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." + +#: include/user.php:237 view/theme/duepuntozero/config.php:46 +msgid "default" +msgstr "Standard" + +#: include/user.php:247 +msgid "An error occurred creating your default profile. Please try again." +msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." + +#: include/user.php:306 include/user.php:314 include/user.php:322 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 +#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 +#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 +#: mod/profile_photo.php:90 mod/profile_photo.php:214 +#: mod/profile_photo.php:309 mod/profile_photo.php:319 +msgid "Profile Photos" +msgstr "Profilbilder" + +#: include/user.php:397 +#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden." + +#: include/user.php:407 +#, php-format +msgid "Registration at %s" +msgstr "Registrierung als %s" + +#: include/user.php:417 +#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet." + +#: include/user.php:421 +#, 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 "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s." + +#: include/user.php:453 mod/admin.php:1314 +#, php-format +msgid "Registration details for %s" +msgstr "Details der Registration von %s" + +#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 +#: include/conversation.php:1005 include/conversation.php:1021 +#: mod/allfriends.php:70 mod/directory.php:153 mod/match.php:76 +#: mod/suggest.php:84 mod/dirfind.php:211 +msgid "View Profile" +msgstr "Profil anschauen" + +#: include/Contact.php:389 include/contact_widgets.php:34 +#: include/conversation.php:1018 mod/allfriends.php:71 mod/match.php:77 +#: mod/suggest.php:85 mod/contacts.php:613 mod/dirfind.php:212 +#: mod/follow.php:108 +msgid "Connect/Follow" +msgstr "Verbinden/Folgen" + +#: include/Contact.php:432 include/conversation.php:1004 +msgid "View Status" +msgstr "Pinnwand anschauen" + +#: include/Contact.php:434 include/conversation.php:1006 +msgid "View Photos" +msgstr "Bilder anschauen" + +#: include/Contact.php:435 include/conversation.php:1007 +msgid "Network Posts" +msgstr "Netzwerkbeiträge" + +#: include/Contact.php:436 include/conversation.php:1008 +msgid "View Contact" +msgstr "Kontakt anzeigen" + +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "Kontakt löschen" + +#: include/Contact.php:438 include/conversation.php:1009 +msgid "Send PM" +msgstr "Private Nachricht senden" + +#: include/Contact.php:439 include/conversation.php:1013 +msgid "Poke" +msgstr "Anstupsen" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "Organisation" + +#: include/Contact.php:822 +msgid "News" +msgstr "Nachrichten" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "Forum" + +#: include/NotificationsManager.php:155 +msgid "System" +msgstr "System" + +#: include/NotificationsManager.php:162 include/nav.php:160 mod/admin.php:518 +#: view/theme/frio/theme.php:255 +msgid "Network" +msgstr "Netzwerk" + +#: include/NotificationsManager.php:169 mod/profiles.php:699 +#: mod/network.php:835 +msgid "Personal" +msgstr "Persönlich" + +#: include/NotificationsManager.php:176 include/nav.php:107 +#: include/nav.php:163 +msgid "Home" +msgstr "Pinnwand" + +#: include/NotificationsManager.php:183 include/nav.php:168 +msgid "Introductions" +msgstr "Kontaktanfragen" + +#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 +#, php-format +msgid "%s commented on %s's post" +msgstr "%s hat %ss Beitrag kommentiert" + +#: include/NotificationsManager.php:252 +#, php-format +msgid "%s created a new post" +msgstr "%s hat einen neuen Beitrag erstellt" + +#: include/NotificationsManager.php:267 +#, php-format +msgid "%s liked %s's post" +msgstr "%s mag %ss Beitrag" + +#: include/NotificationsManager.php:280 +#, php-format +msgid "%s disliked %s's post" +msgstr "%s mag %ss Beitrag nicht" + +#: include/NotificationsManager.php:293 +#, php-format +msgid "%s is attending %s's event" +msgstr "%s nimmt an %s's Event teil" + +#: include/NotificationsManager.php:306 +#, php-format +msgid "%s is not attending %s's event" +msgstr "%s nimmt nicht an %s's Event teil" + +#: include/NotificationsManager.php:319 +#, php-format +msgid "%s may attend %s's event" +msgstr "%s nimmt eventuell an %s's Event teil" + +#: include/NotificationsManager.php:336 +#, php-format +msgid "%s is now friends with %s" +msgstr "%s ist jetzt mit %s befreundet" + +#: include/NotificationsManager.php:774 +msgid "Friend Suggestion" +msgstr "Kontaktvorschlag" + +#: include/NotificationsManager.php:803 +msgid "Friend/Connect Request" +msgstr "Kontakt-/Freundschaftsanfrage" + +#: include/NotificationsManager.php:803 +msgid "New Follower" +msgstr "Neuer Bewunderer" + +#: include/Photo.php:1075 include/Photo.php:1091 include/Photo.php:1099 +#: include/Photo.php:1124 include/message.php:145 mod/wall_upload.php:249 +#: mod/item.php:468 +msgid "Wall Photos" +msgstr "Pinnwand-Bilder" #: include/acl_selectors.php:355 msgid "Post to Email" @@ -458,8 +1216,8 @@ msgstr "Cc: E-Mail-Addressen" msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" -#: include/acl_selectors.php:378 mod/events.php:511 mod/photos.php:1198 -#: mod/photos.php:1595 +#: include/acl_selectors.php:378 mod/photos.php:1198 mod/photos.php:1595 +#: mod/events.php:511 msgid "Permissions" msgstr "Berechtigungen" @@ -467,6 +1225,21 @@ msgstr "Berechtigungen" msgid "Close" msgstr "Schließen" +#: include/api.php:1102 +#, php-format +msgid "Daily posting limit of %d posts reached. The post was rejected." +msgstr "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." + +#: include/api.php:1123 +#, php-format +msgid "Weekly posting limit of %d posts reached. The post was rejected." +msgstr "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." + +#: include/api.php:1144 +#, php-format +msgid "Monthly posting limit of %d posts reached. The post was rejected." +msgstr "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." + #: include/auth.php:52 msgid "Logged out." msgstr "Abgemeldet." @@ -475,35 +1248,148 @@ msgstr "Abgemeldet." msgid "Login failed." msgstr "Anmeldung fehlgeschlagen." -#: include/auth.php:139 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 "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast." +#: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 +msgid "Image/photo" +msgstr "Bild/Foto" -#: include/auth.php:139 include/user.php:75 -msgid "The error message was:" -msgstr "Die Fehlermeldung lautete:" +#: include/bbcode.php:536 +#, php-format +msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" +msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" -#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 -msgid "l F d, Y \\@ g:i A" -msgstr "l, d. F Y\\, H:i" +#: include/bbcode.php:1135 include/bbcode.php:1157 +msgid "$1 wrote:" +msgstr "$1 hat geschrieben:" -#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 -#: include/event.php:459 -msgid "Starts:" -msgstr "Beginnt:" +#: include/bbcode.php:1187 include/bbcode.php:1188 +msgid "Encrypted content" +msgstr "Verschlüsselter Inhalt" -#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 -#: include/event.php:460 -msgid "Finishes:" -msgstr "Endet:" +#: include/bbcode.php:1303 +msgid "Invalid source protocol" +msgstr "Ungültiges Quell-Protokoll" -#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 -#: include/event.php:461 include/identity.php:342 mod/directory.php:135 -#: mod/events.php:496 mod/notifications.php:246 mod/contacts.php:639 -msgid "Location:" -msgstr "Ort:" +#: include/bbcode.php:1313 +msgid "Invalid link protocol" +msgstr "Ungültiges Link-Protokoll" + +#: include/contact_selectors.php:32 +msgid "Unknown | Not categorised" +msgstr "Unbekannt | Nicht kategorisiert" + +#: include/contact_selectors.php:33 +msgid "Block immediately" +msgstr "Sofort blockieren" + +#: include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" +msgstr "Zwielichtig, Spammer, Selbstdarsteller" + +#: include/contact_selectors.php:35 +msgid "Known to me, but no opinion" +msgstr "Ist mir bekannt, hab aber keine Meinung" + +#: include/contact_selectors.php:36 +msgid "OK, probably harmless" +msgstr "OK, wahrscheinlich harmlos" + +#: include/contact_selectors.php:37 +msgid "Reputable, has my trust" +msgstr "Seriös, hat mein Vertrauen" + +#: include/contact_selectors.php:56 mod/admin.php:986 +msgid "Frequently" +msgstr "immer wieder" + +#: include/contact_selectors.php:57 mod/admin.php:987 +msgid "Hourly" +msgstr "Stündlich" + +#: include/contact_selectors.php:58 mod/admin.php:988 +msgid "Twice daily" +msgstr "Zweimal täglich" + +#: include/contact_selectors.php:59 mod/admin.php:989 +msgid "Daily" +msgstr "Täglich" + +#: include/contact_selectors.php:60 +msgid "Weekly" +msgstr "Wöchentlich" + +#: include/contact_selectors.php:61 +msgid "Monthly" +msgstr "Monatlich" + +#: include/contact_selectors.php:76 mod/dfrn_request.php:886 +msgid "Friendica" +msgstr "Friendica" + +#: include/contact_selectors.php:77 +msgid "OStatus" +msgstr "OStatus" + +#: include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "RSS/Atom" + +#: include/contact_selectors.php:79 include/contact_selectors.php:86 +#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 +msgid "Email" +msgstr "E-Mail" + +#: include/contact_selectors.php:80 mod/dfrn_request.php:888 +#: mod/settings.php:849 +msgid "Diaspora" +msgstr "Diaspora" + +#: include/contact_selectors.php:81 +msgid "Facebook" +msgstr "Facebook" + +#: include/contact_selectors.php:82 +msgid "Zot!" +msgstr "Zott" + +#: include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "LinkedIn" + +#: include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "XMPP/Chat" + +#: include/contact_selectors.php:85 +msgid "MySpace" +msgstr "MySpace" + +#: include/contact_selectors.php:87 +msgid "Google+" +msgstr "Google+" + +#: include/contact_selectors.php:88 +msgid "pump.io" +msgstr "pump.io" + +#: include/contact_selectors.php:89 +msgid "Twitter" +msgstr "Twitter" + +#: include/contact_selectors.php:90 +msgid "Diaspora Connector" +msgstr "Diaspora" + +#: include/contact_selectors.php:91 +msgid "GNU Social Connector" +msgstr "GNU social Connector" + +#: include/contact_selectors.php:92 +msgid "pnut" +msgstr "pnut" + +#: include/contact_selectors.php:93 +msgid "App.net" +msgstr "App.net" #: include/contact_widgets.php:8 msgid "Add New Contact" @@ -518,8 +1404,8 @@ msgid "Example: bob@example.com, http://example.com/barbara" msgstr "Beispiel: bob@example.com, http://example.com/barbara" #: include/contact_widgets.php:12 include/identity.php:230 -#: mod/allfriends.php:87 mod/dirfind.php:209 mod/match.php:92 -#: mod/suggest.php:103 +#: mod/allfriends.php:87 mod/match.php:92 mod/suggest.php:103 +#: mod/dirfind.php:209 msgid "Connect" msgstr "Verbinden" @@ -538,12 +1424,6 @@ msgstr "Leute finden" msgid "Enter name or interest" msgstr "Name oder Interessen eingeben" -#: include/contact_widgets.php:34 include/conversation.php:1018 -#: include/Contact.php:389 mod/allfriends.php:71 mod/dirfind.php:212 -#: mod/follow.php:108 mod/match.php:77 mod/suggest.php:85 mod/contacts.php:613 -msgid "Connect/Follow" -msgstr "Verbinden/Folgen" - #: include/contact_widgets.php:35 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Beispiel: Robert Morgenstein, Angeln" @@ -592,34 +1472,6 @@ msgid_plural "%d contacts in common" msgstr[0] "%d gemeinsamer Kontakt" msgstr[1] "%d gemeinsame Kontakte" -#: include/conversation.php:134 include/conversation.php:286 -#: include/like.php:183 include/text.php:1871 -msgid "event" -msgstr "Event" - -#: include/conversation.php:137 include/conversation.php:147 -#: include/conversation.php:289 include/conversation.php:298 -#: include/like.php:181 include/diaspora.php:1653 mod/subthread.php:89 -#: mod/tagger.php:63 -msgid "status" -msgstr "Status" - -#: include/conversation.php:142 include/conversation.php:294 -#: include/like.php:181 include/text.php:1873 mod/subthread.php:89 -#: mod/tagger.php:63 -msgid "photo" -msgstr "Foto" - -#: include/conversation.php:154 include/like.php:30 include/diaspora.php:1649 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "%1$s mag %2$ss %3$s" - -#: include/conversation.php:157 include/like.php:34 include/like.php:39 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "%1$s mag %2$ss %3$s nicht" - #: include/conversation.php:160 #, php-format msgid "%1$s attends %2$s's %3$s" @@ -696,7 +1548,7 @@ msgstr "Auswählen" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 #: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 -#: mod/admin.php:1514 mod/settings.php:745 object/Item.php:138 +#: mod/settings.php:745 mod/admin.php:1514 object/Item.php:138 msgid "Delete" msgstr "Löschen" @@ -743,37 +1595,6 @@ msgstr "Lösche die markierten Beiträge" msgid "Follow Thread" msgstr "Folge der Unterhaltung" -#: include/conversation.php:1004 include/Contact.php:432 -msgid "View Status" -msgstr "Pinnwand anschauen" - -#: include/conversation.php:1005 include/conversation.php:1021 -#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 -#: mod/allfriends.php:70 mod/directory.php:153 mod/dirfind.php:211 -#: mod/match.php:76 mod/suggest.php:84 -msgid "View Profile" -msgstr "Profil anschauen" - -#: include/conversation.php:1006 include/Contact.php:434 -msgid "View Photos" -msgstr "Bilder anschauen" - -#: include/conversation.php:1007 include/Contact.php:435 -msgid "Network Posts" -msgstr "Netzwerkbeiträge" - -#: include/conversation.php:1008 include/Contact.php:436 -msgid "View Contact" -msgstr "Kontakt anzeigen" - -#: include/conversation.php:1009 include/Contact.php:438 -msgid "Send PM" -msgstr "Private Nachricht senden" - -#: include/conversation.php:1013 include/Contact.php:439 -msgid "Poke" -msgstr "Anstupsen" - #: include/conversation.php:1140 #, php-format msgid "%s likes this." @@ -976,16 +1797,16 @@ msgid "Public post" msgstr "Öffentlicher Beitrag" #: include/conversation.php:1314 mod/content.php:738 mod/editpost.php:137 -#: mod/events.php:506 mod/photos.php:1649 mod/photos.php:1691 -#: mod/photos.php:1771 object/Item.php:711 +#: mod/photos.php:1649 mod/photos.php:1691 mod/photos.php:1771 +#: mod/events.php:506 object/Item.php:711 msgid "Preview" msgstr "Vorschau" #: include/conversation.php:1318 include/items.php:2165 mod/editpost.php:140 -#: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/follow.php:126 -#: mod/message.php:211 mod/photos.php:247 mod/photos.php:339 -#: mod/suggest.php:34 mod/tagrm.php:13 mod/tagrm.php:98 mod/videos.php:134 -#: mod/dfrn_request.php:894 mod/contacts.php:458 mod/settings.php:683 +#: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/message.php:211 +#: mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34 mod/tagrm.php:13 +#: mod/tagrm.php:98 mod/videos.php:134 mod/contacts.php:458 +#: mod/dfrn_request.php:894 mod/follow.php:126 mod/settings.php:683 #: mod/settings.php:709 msgid "Cancel" msgstr "Abbrechen" @@ -1032,109 +1853,52 @@ msgid_plural "Not Attending" msgstr[0] "Nicht teilnehmend " msgstr[1] "Nicht teilnehmend" -#: include/conversation.php:1548 include/profile_selectors.php:6 -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "Unentschieden" -msgstr[1] "Unentschieden" - -#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 -msgid "Miscellaneous" -msgstr "Verschiedenes" - -#: include/datetime.php:196 include/identity.php:656 -msgid "Birthday:" -msgstr "Geburtstag:" - -#: include/datetime.php:198 mod/profiles.php:724 -msgid "Age: " -msgstr "Alter: " - -#: include/datetime.php:200 -msgid "YYYY-MM-DD or MM-DD" -msgstr "YYYY-MM-DD oder MM-DD" - -#: include/datetime.php:370 -msgid "never" -msgstr "nie" - -#: include/datetime.php:376 -msgid "less than a second ago" -msgstr "vor weniger als einer Sekunde" - -#: include/datetime.php:379 -msgid "year" -msgstr "Jahr" - -#: include/datetime.php:379 -msgid "years" -msgstr "Jahre" - -#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 -#: mod/events.php:387 -msgid "month" -msgstr "Monat" - -#: include/datetime.php:380 -msgid "months" -msgstr "Monate" - -#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 -#: mod/events.php:388 -msgid "week" -msgstr "Woche" - -#: include/datetime.php:381 -msgid "weeks" -msgstr "Wochen" - -#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 -#: mod/events.php:389 -msgid "day" -msgstr "Tag" - -#: include/datetime.php:382 -msgid "days" -msgstr "Tage" - -#: include/datetime.php:383 -msgid "hour" -msgstr "Stunde" - -#: include/datetime.php:383 -msgid "hours" -msgstr "Stunden" - -#: include/datetime.php:384 -msgid "minute" -msgstr "Minute" - -#: include/datetime.php:384 -msgid "minutes" -msgstr "Minuten" - -#: include/datetime.php:385 -msgid "second" -msgstr "Sekunde" - -#: include/datetime.php:385 -msgid "seconds" -msgstr "Sekunden" - -#: include/datetime.php:394 +#: include/dba.php:59 include/dba_pdo.php:76 #, php-format -msgid "%1$d %2$s ago" -msgstr "%1$d %2$s her" +msgid "Cannot locate DNS info for database server '%s'" +msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln." -#: include/datetime.php:620 -#, php-format -msgid "%s's birthday" -msgstr "%ss Geburtstag" +#: include/dbstructure.php:25 +msgid "There are no tables on MyISAM." +msgstr "Es gibt keine MyISAM Tabellen." -#: include/datetime.php:621 include/dfrn.php:1254 +#: include/dbstructure.php:66 #, php-format -msgid "Happy Birthday %s" -msgstr "Herzlichen Glückwunsch %s" +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 "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein." + +#: include/dbstructure.php:71 +#, php-format +msgid "" +"The error message is\n" +"[pre]%s[/pre]" +msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]" + +#: include/dbstructure.php:195 +#, php-format +msgid "" +"\n" +"Error %d occurred during database update:\n" +"%s\n" +msgstr "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n" + +#: include/dbstructure.php:198 +msgid "Errors encountered performing database changes: " +msgstr "Fehler beim Ändern der Datenbank aufgetreten" + +#: include/dbstructure.php:206 +msgid ": Database update" +msgstr ": Datenbank Update" + +#: include/dbstructure.php:438 +#, php-format +msgid "%s: updating %s table." +msgstr "%s: aktualisiere Tabelle %s" #: include/delivery.php:428 msgid "(no subject)" @@ -1144,580 +1908,18 @@ msgstr "(kein Betreff)" msgid "noreply" msgstr "noreply" -#: include/dfrn.php:1253 +#: include/dfrn.php:1309 #, php-format msgid "%s\\'s birthday" msgstr "%ss Geburtstag" -#: include/event.php:408 -msgid "all-day" -msgstr "ganztägig" +#: include/diaspora.php:2214 +msgid "Sharing notification from Diaspora network" +msgstr "Freigabe-Benachrichtigung von Diaspora" -#: include/event.php:410 -msgid "Sun" -msgstr "So" - -#: include/event.php:411 -msgid "Mon" -msgstr "Mo" - -#: include/event.php:412 -msgid "Tue" -msgstr "Di" - -#: include/event.php:413 -msgid "Wed" -msgstr "Mi" - -#: include/event.php:414 -msgid "Thu" -msgstr "Do" - -#: include/event.php:415 -msgid "Fri" -msgstr "Fr" - -#: include/event.php:416 -msgid "Sat" -msgstr "Sa" - -#: include/event.php:418 include/text.php:1199 mod/settings.php:982 -msgid "Sunday" -msgstr "Sonntag" - -#: include/event.php:419 include/text.php:1199 mod/settings.php:982 -msgid "Monday" -msgstr "Montag" - -#: include/event.php:420 include/text.php:1199 -msgid "Tuesday" -msgstr "Dienstag" - -#: include/event.php:421 include/text.php:1199 -msgid "Wednesday" -msgstr "Mittwoch" - -#: include/event.php:422 include/text.php:1199 -msgid "Thursday" -msgstr "Donnerstag" - -#: include/event.php:423 include/text.php:1199 -msgid "Friday" -msgstr "Freitag" - -#: include/event.php:424 include/text.php:1199 -msgid "Saturday" -msgstr "Samstag" - -#: include/event.php:426 -msgid "Jan" -msgstr "Jan" - -#: include/event.php:427 -msgid "Feb" -msgstr "Feb" - -#: include/event.php:428 -msgid "Mar" -msgstr "März" - -#: include/event.php:429 -msgid "Apr" -msgstr "Apr" - -#: include/event.php:430 include/event.php:443 include/text.php:1203 -msgid "May" -msgstr "Mai" - -#: include/event.php:431 -msgid "Jun" -msgstr "Jun" - -#: include/event.php:432 -msgid "Jul" -msgstr "Juli" - -#: include/event.php:433 -msgid "Aug" -msgstr "Aug" - -#: include/event.php:434 -msgid "Sept" -msgstr "Sep" - -#: include/event.php:435 -msgid "Oct" -msgstr "Okt" - -#: include/event.php:436 -msgid "Nov" -msgstr "Nov" - -#: include/event.php:437 -msgid "Dec" -msgstr "Dez" - -#: include/event.php:439 include/text.php:1203 -msgid "January" -msgstr "Januar" - -#: include/event.php:440 include/text.php:1203 -msgid "February" -msgstr "Februar" - -#: include/event.php:441 include/text.php:1203 -msgid "March" -msgstr "März" - -#: include/event.php:442 include/text.php:1203 -msgid "April" -msgstr "April" - -#: include/event.php:444 include/text.php:1203 -msgid "June" -msgstr "Juni" - -#: include/event.php:445 include/text.php:1203 -msgid "July" -msgstr "Juli" - -#: include/event.php:446 include/text.php:1203 -msgid "August" -msgstr "August" - -#: include/event.php:447 include/text.php:1203 -msgid "September" -msgstr "September" - -#: include/event.php:448 include/text.php:1203 -msgid "October" -msgstr "Oktober" - -#: include/event.php:449 include/text.php:1203 -msgid "November" -msgstr "November" - -#: include/event.php:450 include/text.php:1203 -msgid "December" -msgstr "Dezember" - -#: include/event.php:452 mod/cal.php:280 mod/events.php:386 -msgid "today" -msgstr "Heute" - -#: include/event.php:457 -msgid "No events to display" -msgstr "Keine Veranstaltung zum Anzeigen" - -#: include/event.php:570 -msgid "l, F j" -msgstr "l, F j" - -#: include/event.php:592 -msgid "Edit event" -msgstr "Veranstaltung bearbeiten" - -#: include/event.php:593 -msgid "Delete event" -msgstr "Veranstaltung löschen" - -#: include/event.php:619 include/text.php:1601 include/text.php:1608 -msgid "link to source" -msgstr "Link zum Originalbeitrag" - -#: include/event.php:873 -msgid "Export" -msgstr "Exportieren" - -#: include/event.php:874 -msgid "Export calendar as ical" -msgstr "Kalender als ical exportieren" - -#: include/event.php:875 -msgid "Export calendar as csv" -msgstr "Kalender als csv exportieren" - -#: include/follow.php:84 mod/dfrn_request.php:514 -msgid "Disallowed profile URL." -msgstr "Nicht erlaubte Profil-URL." - -#: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 -#: mod/admin.php:280 mod/admin.php:298 -msgid "Blocked domain" -msgstr "Blockierte Daimain" - -#: include/follow.php:94 -msgid "Connect URL missing." -msgstr "Connect-URL fehlt" - -#: include/follow.php:122 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." - -#: include/follow.php:123 include/follow.php:137 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." - -#: include/follow.php:135 -msgid "The profile address specified does not provide adequate information." -msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." - -#: include/follow.php:140 -msgid "An author or name was not found." -msgstr "Es wurde kein Autor oder Name gefunden." - -#: include/follow.php:143 -msgid "No browser URL could be matched to this address." -msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." - -#: include/follow.php:146 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." - -#: include/follow.php:147 -msgid "Use mailto: in front of address to force email check." -msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen." - -#: include/follow.php:153 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." - -#: include/follow.php:158 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können." - -#: include/follow.php:259 -msgid "Unable to retrieve contact information." -msgstr "Konnte die Kontaktinformationen nicht empfangen." - -#: include/like.php:44 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "%1$s nimmt an %2$ss %3$s teil." - -#: include/like.php:49 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "%1$s nimmt nicht an %2$ss %3$s teil." - -#: include/like.php:54 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." - -#: include/photos.php:57 include/photos.php:66 mod/fbrowser.php:42 -#: mod/fbrowser.php:63 mod/photos.php:189 mod/photos.php:1125 -#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1841 -#: mod/photos.php:1855 -msgid "Contact Photos" -msgstr "Kontaktbilder" - -#: include/security.php:63 -msgid "Welcome " -msgstr "Willkommen " - -#: include/security.php:64 -msgid "Please upload a profile photo." -msgstr "Bitte lade ein Profilbild hoch." - -#: include/security.php:67 -msgid "Welcome back " -msgstr "Willkommen zurück " - -#: include/security.php:431 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." - -#: include/text.php:308 -msgid "newer" -msgstr "neuer" - -#: include/text.php:309 -msgid "older" -msgstr "älter" - -#: include/text.php:314 -msgid "first" -msgstr "erste" - -#: include/text.php:315 -msgid "prev" -msgstr "vorige" - -#: include/text.php:349 -msgid "next" -msgstr "nächste" - -#: include/text.php:350 -msgid "last" -msgstr "letzte" - -#: include/text.php:404 -msgid "Loading more entries..." -msgstr "lade weitere Einträge..." - -#: include/text.php:405 -msgid "The end" -msgstr "Das Ende" - -#: include/text.php:956 -msgid "No contacts" -msgstr "Keine Kontakte" - -#: include/text.php:981 -#, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" -msgstr[0] "%d Kontakt" -msgstr[1] "%d Kontakte" - -#: include/text.php:994 -msgid "View Contacts" -msgstr "Kontakte anzeigen" - -#: include/text.php:1081 include/nav.php:125 mod/search.php:152 -msgid "Search" -msgstr "Suche" - -#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 -#: mod/notes.php:64 -msgid "Save" -msgstr "Speichern" - -#: include/text.php:1084 include/nav.php:42 -msgid "@name, !forum, #tags, content" -msgstr "@name, !forum, #tags, content" - -#: include/text.php:1089 include/nav.php:128 -msgid "Full Text" -msgstr "Volltext" - -#: include/text.php:1090 include/nav.php:129 -msgid "Tags" -msgstr "Tags" - -#: include/text.php:1091 include/nav.php:130 include/nav.php:194 -#: include/identity.php:853 include/identity.php:856 mod/viewcontacts.php:124 -#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 -msgid "Contacts" -msgstr "Kontakte" - -#: include/text.php:1145 -msgid "poke" -msgstr "anstupsen" - -#: include/text.php:1145 -msgid "poked" -msgstr "stupste" - -#: include/text.php:1146 -msgid "ping" -msgstr "anpingen" - -#: include/text.php:1146 -msgid "pinged" -msgstr "pingte" - -#: include/text.php:1147 -msgid "prod" -msgstr "knuffen" - -#: include/text.php:1147 -msgid "prodded" -msgstr "knuffte" - -#: include/text.php:1148 -msgid "slap" -msgstr "ohrfeigen" - -#: include/text.php:1148 -msgid "slapped" -msgstr "ohrfeigte" - -#: include/text.php:1149 -msgid "finger" -msgstr "befummeln" - -#: include/text.php:1149 -msgid "fingered" -msgstr "befummelte" - -#: include/text.php:1150 -msgid "rebuff" -msgstr "eine Abfuhr erteilen" - -#: include/text.php:1150 -msgid "rebuffed" -msgstr "abfuhrerteilte" - -#: include/text.php:1164 -msgid "happy" -msgstr "glücklich" - -#: include/text.php:1165 -msgid "sad" -msgstr "traurig" - -#: include/text.php:1166 -msgid "mellow" -msgstr "sanft" - -#: include/text.php:1167 -msgid "tired" -msgstr "müde" - -#: include/text.php:1168 -msgid "perky" -msgstr "frech" - -#: include/text.php:1169 -msgid "angry" -msgstr "sauer" - -#: include/text.php:1170 -msgid "stupified" -msgstr "verblüfft" - -#: include/text.php:1171 -msgid "puzzled" -msgstr "verwirrt" - -#: include/text.php:1172 -msgid "interested" -msgstr "interessiert" - -#: include/text.php:1173 -msgid "bitter" -msgstr "verbittert" - -#: include/text.php:1174 -msgid "cheerful" -msgstr "fröhlich" - -#: include/text.php:1175 -msgid "alive" -msgstr "lebendig" - -#: include/text.php:1176 -msgid "annoyed" -msgstr "verärgert" - -#: include/text.php:1177 -msgid "anxious" -msgstr "unruhig" - -#: include/text.php:1178 -msgid "cranky" -msgstr "schrullig" - -#: include/text.php:1179 -msgid "disturbed" -msgstr "verstört" - -#: include/text.php:1180 -msgid "frustrated" -msgstr "frustriert" - -#: include/text.php:1181 -msgid "motivated" -msgstr "motiviert" - -#: include/text.php:1182 -msgid "relaxed" -msgstr "entspannt" - -#: include/text.php:1183 -msgid "surprised" -msgstr "überrascht" - -#: include/text.php:1393 mod/videos.php:388 -msgid "View Video" -msgstr "Video ansehen" - -#: include/text.php:1425 -msgid "bytes" -msgstr "Byte" - -#: include/text.php:1457 include/text.php:1469 -msgid "Click to open/close" -msgstr "Zum öffnen/schließen klicken" - -#: include/text.php:1595 -msgid "View on separate page" -msgstr "Auf separater Seite ansehen" - -#: include/text.php:1596 -msgid "view on separate page" -msgstr "auf separater Seite ansehen" - -#: include/text.php:1875 -msgid "activity" -msgstr "Aktivität" - -#: include/text.php:1877 mod/content.php:624 object/Item.php:416 -#: object/Item.php:428 -msgid "comment" -msgid_plural "comments" -msgstr[0] "Kommentar" -msgstr[1] "Kommentare" - -#: include/text.php:1878 -msgid "post" -msgstr "Beitrag" - -#: include/text.php:2046 -msgid "Item filed" -msgstr "Beitrag abgelegt" - -#: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 -msgid "Image/photo" -msgstr "Bild/Foto" - -#: include/bbcode.php:536 -#, php-format -msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" -msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" - -#: include/bbcode.php:1135 include/bbcode.php:1157 -msgid "$1 wrote:" -msgstr "$1 hat geschrieben:" - -#: include/bbcode.php:1187 include/bbcode.php:1188 -msgid "Encrypted content" -msgstr "Verschlüsselter Inhalt" - -#: include/bbcode.php:1303 -msgid "Invalid source protocol" -msgstr "Ungültiges Quell-Protokoll" - -#: include/bbcode.php:1313 -msgid "Invalid link protocol" -msgstr "Ungültiges Link-Protokoll" - -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "Kontakt löschen" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "Organisation" - -#: include/Contact.php:822 -msgid "News" -msgstr "Nachrichten" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "Forum" +#: include/diaspora.php:3234 +msgid "Attachments:" +msgstr "Anhänge:" #: include/enotify.php:27 msgid "Friendica Notification" @@ -2012,838 +2214,112 @@ msgstr "Kompletter Name:\t%1$s\\nURL der Seite:\t%2$s\\nLogin Name:\t%3$s (%4$s) msgid "Please visit %s to approve or reject the request." msgstr "Bitte besuche %s um die Anfrage zu bearbeiten." -#: include/message.php:14 include/message.php:168 -msgid "[no subject]" -msgstr "[kein Betreff]" +#: include/follow.php:84 mod/dfrn_request.php:514 +msgid "Disallowed profile URL." +msgstr "Nicht erlaubte Profil-URL." -#: include/message.php:145 include/Photo.php:1075 include/Photo.php:1091 -#: include/Photo.php:1099 include/Photo.php:1124 mod/wall_upload.php:249 -#: mod/item.php:468 -msgid "Wall Photos" -msgstr "Pinnwand-Bilder" +#: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 +#: mod/admin.php:280 mod/admin.php:298 +msgid "Blocked domain" +msgstr "Blockierte Daimain" -#: include/nav.php:37 mod/navigation.php:21 -msgid "Nothing new here" -msgstr "Keine Neuigkeiten" +#: include/follow.php:94 +msgid "Connect URL missing." +msgstr "Connect-URL fehlt" -#: include/nav.php:41 mod/navigation.php:25 -msgid "Clear notifications" -msgstr "Bereinige Benachrichtigungen" - -#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:869 -msgid "Logout" -msgstr "Abmelden" - -#: include/nav.php:80 view/theme/frio/theme.php:245 -msgid "End this session" -msgstr "Diese Sitzung beenden" - -#: include/nav.php:83 include/identity.php:784 mod/contacts.php:648 -#: mod/contacts.php:844 view/theme/frio/theme.php:248 -msgid "Status" -msgstr "Status" - -#: include/nav.php:83 include/nav.php:163 view/theme/frio/theme.php:248 -msgid "Your posts and conversations" -msgstr "Deine Beiträge und Unterhaltungen" - -#: include/nav.php:84 include/identity.php:632 include/identity.php:759 -#: include/identity.php:792 mod/newmember.php:20 mod/profperm.php:107 -#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 -msgid "Profile" -msgstr "Profil" - -#: include/nav.php:84 view/theme/frio/theme.php:249 -msgid "Your profile page" -msgstr "Deine Profilseite" - -#: include/nav.php:85 include/identity.php:800 mod/fbrowser.php:33 -#: view/theme/frio/theme.php:250 -msgid "Photos" -msgstr "Bilder" - -#: include/nav.php:85 view/theme/frio/theme.php:250 -msgid "Your photos" -msgstr "Deine Fotos" - -#: include/nav.php:86 include/identity.php:808 include/identity.php:811 -#: view/theme/frio/theme.php:251 -msgid "Videos" -msgstr "Videos" - -#: include/nav.php:86 view/theme/frio/theme.php:251 -msgid "Your videos" -msgstr "Deine Videos" - -#: include/nav.php:87 include/nav.php:151 include/identity.php:820 -#: include/identity.php:831 mod/cal.php:272 mod/events.php:377 -#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 -msgid "Events" -msgstr "Veranstaltungen" - -#: include/nav.php:87 view/theme/frio/theme.php:252 -msgid "Your events" -msgstr "Deine Ereignisse" - -#: include/nav.php:88 -msgid "Personal notes" -msgstr "Persönliche Notizen" - -#: include/nav.php:88 -msgid "Your personal notes" -msgstr "Deine persönlichen Notizen" - -#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:870 -msgid "Login" -msgstr "Anmeldung" - -#: include/nav.php:97 -msgid "Sign in" -msgstr "Anmelden" - -#: include/nav.php:107 include/nav.php:163 -#: include/NotificationsManager.php:176 -msgid "Home" -msgstr "Pinnwand" - -#: include/nav.php:107 -msgid "Home Page" -msgstr "Homepage" - -#: include/nav.php:111 mod/register.php:291 boot.php:846 -msgid "Register" -msgstr "Registrieren" - -#: include/nav.php:111 -msgid "Create an account" -msgstr "Nutzerkonto erstellen" - -#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 -msgid "Help" -msgstr "Hilfe" - -#: include/nav.php:117 -msgid "Help and documentation" -msgstr "Hilfe und Dokumentation" - -#: include/nav.php:121 -msgid "Apps" -msgstr "Apps" - -#: include/nav.php:121 -msgid "Addon applications, utilities, games" -msgstr "Addon Anwendungen, Dienstprogramme, Spiele" - -#: include/nav.php:125 -msgid "Search site content" -msgstr "Inhalt der Seite durchsuchen" - -#: include/nav.php:145 include/nav.php:147 mod/community.php:32 -msgid "Community" -msgstr "Gemeinschaft" - -#: include/nav.php:145 -msgid "Conversations on this site" -msgstr "Unterhaltungen auf dieser Seite" - -#: include/nav.php:147 -msgid "Conversations on the network" -msgstr "Unterhaltungen im Netzwerk" - -#: include/nav.php:151 include/identity.php:823 include/identity.php:834 -#: view/theme/frio/theme.php:256 -msgid "Events and Calendar" -msgstr "Ereignisse und Kalender" - -#: include/nav.php:154 -msgid "Directory" -msgstr "Verzeichnis" - -#: include/nav.php:154 -msgid "People directory" -msgstr "Nutzerverzeichnis" - -#: include/nav.php:156 -msgid "Information" -msgstr "Information" - -#: include/nav.php:156 -msgid "Information about this friendica instance" -msgstr "Informationen zu dieser Friendica Instanz" - -#: include/nav.php:160 include/NotificationsManager.php:162 mod/admin.php:518 -#: view/theme/frio/theme.php:255 -msgid "Network" -msgstr "Netzwerk" - -#: include/nav.php:160 view/theme/frio/theme.php:255 -msgid "Conversations from your friends" -msgstr "Unterhaltungen Deiner Kontakte" - -#: include/nav.php:161 -msgid "Network Reset" -msgstr "Netzwerk zurücksetzen" - -#: include/nav.php:161 -msgid "Load Network page with no filters" -msgstr "Netzwerk-Seite ohne Filter laden" - -#: include/nav.php:168 include/NotificationsManager.php:183 -msgid "Introductions" -msgstr "Kontaktanfragen" - -#: include/nav.php:168 -msgid "Friend Requests" -msgstr "Kontaktanfragen" - -#: include/nav.php:171 mod/notifications.php:98 -msgid "Notifications" -msgstr "Benachrichtigungen" - -#: include/nav.php:172 -msgid "See all notifications" -msgstr "Alle Benachrichtigungen anzeigen" - -#: include/nav.php:173 mod/settings.php:907 -msgid "Mark as seen" -msgstr "Als gelesen markieren" - -#: include/nav.php:173 -msgid "Mark all system notifications seen" -msgstr "Markiere alle Systembenachrichtigungen als gelesen" - -#: include/nav.php:177 mod/message.php:181 view/theme/frio/theme.php:257 -msgid "Messages" -msgstr "Nachrichten" - -#: include/nav.php:177 view/theme/frio/theme.php:257 -msgid "Private mail" -msgstr "Private E-Mail" - -#: include/nav.php:178 -msgid "Inbox" -msgstr "Eingang" - -#: include/nav.php:179 -msgid "Outbox" -msgstr "Ausgang" - -#: include/nav.php:180 mod/message.php:18 -msgid "New Message" -msgstr "Neue Nachricht" - -#: include/nav.php:183 -msgid "Manage" -msgstr "Verwalten" - -#: include/nav.php:183 -msgid "Manage other pages" -msgstr "Andere Seiten verwalten" - -#: include/nav.php:186 mod/settings.php:83 -msgid "Delegations" -msgstr "Delegationen" - -#: include/nav.php:186 mod/delegate.php:132 -msgid "Delegate Page Management" -msgstr "Delegiere das Management für die Seite" - -#: include/nav.php:188 mod/newmember.php:15 mod/admin.php:1624 -#: mod/admin.php:1900 mod/settings.php:113 view/theme/frio/theme.php:258 -msgid "Settings" -msgstr "Einstellungen" - -#: include/nav.php:188 view/theme/frio/theme.php:258 -msgid "Account settings" -msgstr "Kontoeinstellungen" - -#: include/nav.php:191 include/identity.php:296 -msgid "Profiles" -msgstr "Profile" - -#: include/nav.php:191 -msgid "Manage/Edit Profiles" -msgstr "Profile Verwalten/Editieren" - -#: include/nav.php:194 view/theme/frio/theme.php:259 -msgid "Manage/edit friends and contacts" -msgstr " Kontakte verwalten/editieren" - -#: include/nav.php:199 mod/admin.php:197 -msgid "Admin" -msgstr "Administration" - -#: include/nav.php:199 -msgid "Site setup and configuration" -msgstr "Einstellungen der Seite und Konfiguration" - -#: include/nav.php:202 -msgid "Navigation" -msgstr "Navigation" - -#: include/nav.php:202 -msgid "Site map" -msgstr "Sitemap" - -#: include/network.php:687 -msgid "view full size" -msgstr "Volle Größe anzeigen" - -#: include/oembed.php:256 -msgid "Embedded content" -msgstr "Eingebetteter Inhalt" - -#: include/oembed.php:264 -msgid "Embedding disabled" -msgstr "Einbettungen deaktiviert" - -#: include/uimport.php:85 -msgid "Error decoding account file" -msgstr "Fehler beim Verarbeiten der Account Datei" - -#: include/uimport.php:91 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?" - -#: include/uimport.php:108 include/uimport.php:119 -msgid "Error! Cannot check nickname" -msgstr "Fehler! Konnte den Nickname nicht überprüfen." - -#: include/uimport.php:112 include/uimport.php:123 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "Nutzer '%s' existiert bereits auf diesem Server!" - -#: include/uimport.php:145 -msgid "User creation error" -msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten" - -#: include/uimport.php:166 -msgid "User profile creation error" -msgstr "Fehler beim Anlegen des Nutzerkontos" - -#: include/uimport.php:215 -#, php-format -msgid "%d contact not imported" -msgid_plural "%d contacts not imported" -msgstr[0] "%d Kontakt nicht importiert" -msgstr[1] "%d Kontakte nicht importiert" - -#: include/uimport.php:281 -msgid "Done. You can now login with your username and password" -msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden" - -#: include/user.php:39 mod/settings.php:377 -msgid "Passwords do not match. Password unchanged." -msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." - -#: include/user.php:48 -msgid "An invitation is required." -msgstr "Du benötigst eine Einladung." - -#: include/user.php:53 -msgid "Invitation could not be verified." -msgstr "Die Einladung konnte nicht überprüft werden." - -#: include/user.php:61 -msgid "Invalid OpenID url" -msgstr "Ungültige OpenID URL" - -#: include/user.php:82 -msgid "Please enter the required information." -msgstr "Bitte trage die erforderlichen Informationen ein." - -#: include/user.php:96 -msgid "Please use a shorter name." -msgstr "Bitte verwende einen kürzeren Namen." - -#: include/user.php:98 -msgid "Name too short." -msgstr "Der Name ist zu kurz." - -#: include/user.php:106 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein." - -#: include/user.php:111 -msgid "Your email domain is not among those allowed on this site." -msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt." - -#: include/user.php:114 -msgid "Not a valid email address." -msgstr "Keine gültige E-Mail-Adresse." - -#: include/user.php:127 -msgid "Cannot use that email." -msgstr "Konnte diese E-Mail-Adresse nicht verwenden." - -#: include/user.php:133 -msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." -msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen." - -#: include/user.php:140 include/user.php:228 -msgid "Nickname is already registered. Please choose another." -msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." - -#: include/user.php:150 +#: include/follow.php:122 msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." -msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." +"This site is not configured to allow communications with other networks." +msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." -#: include/user.php:166 -msgid "SERIOUS ERROR: Generation of security keys failed." -msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." +#: include/follow.php:123 include/follow.php:137 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." -#: include/user.php:214 -msgid "An error occurred during registration. Please try again." -msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." +#: include/follow.php:135 +msgid "The profile address specified does not provide adequate information." +msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." -#: include/user.php:237 view/theme/duepuntozero/config.php:46 -msgid "default" -msgstr "Standard" +#: include/follow.php:140 +msgid "An author or name was not found." +msgstr "Es wurde kein Autor oder Name gefunden." -#: include/user.php:247 -msgid "An error occurred creating your default profile. Please try again." -msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." +#: include/follow.php:143 +msgid "No browser URL could be matched to this address." +msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." -#: include/user.php:260 include/user.php:264 include/profile_selectors.php:42 -msgid "Friends" -msgstr "Kontakte" - -#: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 -#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 -#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 -#: mod/profile_photo.php:90 mod/profile_photo.php:214 -#: mod/profile_photo.php:309 mod/profile_photo.php:319 -msgid "Profile Photos" -msgstr "Profilbilder" - -#: include/user.php:397 -#, php-format +#: include/follow.php:146 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden." +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." -#: include/user.php:407 -#, php-format -msgid "Registration at %s" -msgstr "Registrierung als %s" +#: include/follow.php:147 +msgid "Use mailto: in front of address to force email check." +msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen." -#: include/user.php:417 -#, php-format +#: include/follow.php:153 msgid "" -"\n" -"\t\tDear %1$s,\n" -"\t\t\tThank you for registering at %2$s. Your account has been created.\n" -"\t" -msgstr "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet." +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde." -#: include/user.php:421 -#, php-format +#: include/follow.php:158 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 "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s." +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können." -#: include/user.php:453 mod/admin.php:1314 -#, php-format -msgid "Registration details for %s" -msgstr "Details der Registration von %s" +#: include/follow.php:259 +msgid "Unable to retrieve contact information." +msgstr "Konnte die Kontaktinformationen nicht empfangen." -#: include/dba_pdo.php:76 include/dba.php:57 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln." - -#: include/plugin.php:532 include/plugin.php:534 -msgid "Click here to upgrade." -msgstr "Zum Upgraden hier klicken." - -#: include/plugin.php:541 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." - -#: include/plugin.php:546 -msgid "This action is not available under your subscription plan." -msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." - -#: include/profile_selectors.php:6 -msgid "Male" -msgstr "Männlich" - -#: include/profile_selectors.php:6 -msgid "Female" -msgstr "Weiblich" - -#: include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Momentan männlich" - -#: include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Momentan weiblich" - -#: include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Hauptsächlich männlich" - -#: include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Hauptsächlich weiblich" - -#: include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transgender" - -#: include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Intersex" - -#: include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transsexuell" - -#: include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Hermaphrodit" - -#: include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Neuter" - -#: include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Nicht spezifiziert" - -#: include/profile_selectors.php:6 -msgid "Other" -msgstr "Andere" - -#: include/profile_selectors.php:23 -msgid "Males" -msgstr "Männer" - -#: include/profile_selectors.php:23 -msgid "Females" -msgstr "Frauen" - -#: include/profile_selectors.php:23 -msgid "Gay" -msgstr "Schwul" - -#: include/profile_selectors.php:23 -msgid "Lesbian" -msgstr "Lesbisch" - -#: include/profile_selectors.php:23 -msgid "No Preference" -msgstr "Keine Vorlieben" - -#: include/profile_selectors.php:23 -msgid "Bisexual" -msgstr "Bisexuell" - -#: include/profile_selectors.php:23 -msgid "Autosexual" -msgstr "Autosexual" - -#: include/profile_selectors.php:23 -msgid "Abstinent" -msgstr "Abstinent" - -#: include/profile_selectors.php:23 -msgid "Virgin" -msgstr "Jungfrauen" - -#: include/profile_selectors.php:23 -msgid "Deviant" -msgstr "Deviant" - -#: include/profile_selectors.php:23 -msgid "Fetish" -msgstr "Fetish" - -#: include/profile_selectors.php:23 -msgid "Oodles" -msgstr "Oodles" - -#: include/profile_selectors.php:23 -msgid "Nonsexual" -msgstr "Nonsexual" - -#: include/profile_selectors.php:42 -msgid "Single" -msgstr "Single" - -#: include/profile_selectors.php:42 -msgid "Lonely" -msgstr "Einsam" - -#: include/profile_selectors.php:42 -msgid "Available" -msgstr "Verfügbar" - -#: include/profile_selectors.php:42 -msgid "Unavailable" -msgstr "Nicht verfügbar" - -#: include/profile_selectors.php:42 -msgid "Has crush" -msgstr "verknallt" - -#: include/profile_selectors.php:42 -msgid "Infatuated" -msgstr "verliebt" - -#: include/profile_selectors.php:42 -msgid "Dating" -msgstr "Dating" - -#: include/profile_selectors.php:42 -msgid "Unfaithful" -msgstr "Untreu" - -#: include/profile_selectors.php:42 -msgid "Sex Addict" -msgstr "Sexbesessen" - -#: include/profile_selectors.php:42 -msgid "Friends/Benefits" -msgstr "Freunde/Zuwendungen" - -#: include/profile_selectors.php:42 -msgid "Casual" -msgstr "Casual" - -#: include/profile_selectors.php:42 -msgid "Engaged" -msgstr "Verlobt" - -#: include/profile_selectors.php:42 -msgid "Married" -msgstr "Verheiratet" - -#: include/profile_selectors.php:42 -msgid "Imaginarily married" -msgstr "imaginär verheiratet" - -#: include/profile_selectors.php:42 -msgid "Partners" -msgstr "Partner" - -#: include/profile_selectors.php:42 -msgid "Cohabiting" -msgstr "zusammenlebend" - -#: include/profile_selectors.php:42 -msgid "Common law" -msgstr "wilde Ehe" - -#: include/profile_selectors.php:42 -msgid "Happy" -msgstr "Glücklich" - -#: include/profile_selectors.php:42 -msgid "Not looking" -msgstr "Nicht auf der Suche" - -#: include/profile_selectors.php:42 -msgid "Swinger" -msgstr "Swinger" - -#: include/profile_selectors.php:42 -msgid "Betrayed" -msgstr "Betrogen" - -#: include/profile_selectors.php:42 -msgid "Separated" -msgstr "Getrennt" - -#: include/profile_selectors.php:42 -msgid "Unstable" -msgstr "Unstabil" - -#: include/profile_selectors.php:42 -msgid "Divorced" -msgstr "Geschieden" - -#: include/profile_selectors.php:42 -msgid "Imaginarily divorced" -msgstr "imaginär geschieden" - -#: include/profile_selectors.php:42 -msgid "Widowed" -msgstr "Verwitwet" - -#: include/profile_selectors.php:42 -msgid "Uncertain" -msgstr "Unsicher" - -#: include/profile_selectors.php:42 -msgid "It's complicated" -msgstr "Ist kompliziert" - -#: include/profile_selectors.php:42 -msgid "Don't care" -msgstr "Ist mir nicht wichtig" - -#: include/profile_selectors.php:42 -msgid "Ask me" -msgstr "Frag mich" - -#: include/NotificationsManager.php:155 -msgid "System" -msgstr "System" - -#: include/NotificationsManager.php:169 mod/network.php:835 -#: mod/profiles.php:699 -msgid "Personal" -msgstr "Persönlich" - -#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s hat %ss Beitrag kommentiert" - -#: include/NotificationsManager.php:252 -#, php-format -msgid "%s created a new post" -msgstr "%s hat einen neuen Beitrag erstellt" - -#: include/NotificationsManager.php:267 -#, php-format -msgid "%s liked %s's post" -msgstr "%s mag %ss Beitrag" - -#: include/NotificationsManager.php:280 -#, php-format -msgid "%s disliked %s's post" -msgstr "%s mag %ss Beitrag nicht" - -#: include/NotificationsManager.php:293 -#, php-format -msgid "%s is attending %s's event" -msgstr "%s nimmt an %s's Event teil" - -#: include/NotificationsManager.php:306 -#, php-format -msgid "%s is not attending %s's event" -msgstr "%s nimmt nicht an %s's Event teil" - -#: include/NotificationsManager.php:319 -#, php-format -msgid "%s may attend %s's event" -msgstr "%s nimmt eventuell an %s's Event teil" - -#: include/NotificationsManager.php:336 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s ist jetzt mit %s befreundet" - -#: include/NotificationsManager.php:774 -msgid "Friend Suggestion" -msgstr "Kontaktvorschlag" - -#: include/NotificationsManager.php:803 -msgid "Friend/Connect Request" -msgstr "Kontakt-/Freundschaftsanfrage" - -#: include/NotificationsManager.php:803 -msgid "New Follower" -msgstr "Neuer Bewunderer" - -#: include/api.php:1102 -#, php-format -msgid "Daily posting limit of %d posts reached. The post was rejected." -msgstr "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." - -#: include/api.php:1123 -#, php-format -msgid "Weekly posting limit of %d posts reached. The post was rejected." -msgstr "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." - -#: include/api.php:1144 -#, php-format -msgid "Monthly posting limit of %d posts reached. The post was rejected." -msgstr "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen." - -#: include/dbstructure.php:25 -msgid "There are no tables on MyISAM." -msgstr "Es gibt keine MyISAM Tabellen." - -#: include/dbstructure.php:66 -#, php-format +#: include/group.php:25 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 "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein." +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen." -#: include/dbstructure.php:71 -#, php-format -msgid "" -"The error message is\n" -"[pre]%s[/pre]" -msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]" +#: include/group.php:210 +msgid "Default privacy group for new contacts" +msgstr "Voreingestellte Gruppe für neue Kontakte" -#: include/dbstructure.php:195 -#, php-format -msgid "" -"\n" -"Error %d occurred during database update:\n" -"%s\n" -msgstr "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n" +#: include/group.php:243 +msgid "Everybody" +msgstr "Alle Kontakte" -#: include/dbstructure.php:198 -msgid "Errors encountered performing database changes: " -msgstr "Fehler beim Ändern der Datenbank aufgetreten" +#: include/group.php:266 +msgid "edit" +msgstr "bearbeiten" -#: include/dbstructure.php:206 -msgid ": Database update" -msgstr ": Datenbank Update" +#: include/group.php:287 mod/newmember.php:39 +msgid "Groups" +msgstr "Gruppen" -#: include/dbstructure.php:438 -#, php-format -msgid "%s: updating %s table." -msgstr "%s: aktualisiere Tabelle %s" +#: include/group.php:289 +msgid "Edit groups" +msgstr "Gruppen bearbeiten" -#: include/diaspora.php:2214 -msgid "Sharing notification from Diaspora network" -msgstr "Freigabe-Benachrichtigung von Diaspora" +#: include/group.php:291 +msgid "Edit group" +msgstr "Gruppe bearbeiten" -#: include/diaspora.php:3234 -msgid "Attachments:" -msgstr "Anhänge:" +#: include/group.php:292 +msgid "Create a new group" +msgstr "Neue Gruppe erstellen" + +#: include/group.php:293 mod/group.php:100 mod/group.php:197 +msgid "Group Name: " +msgstr "Gruppenname:" + +#: include/group.php:295 +msgid "Contacts not in any group" +msgstr "Kontakte in keiner Gruppe" + +#: include/group.php:297 mod/network.php:210 +msgid "add" +msgstr "hinzufügen" #: include/identity.php:45 msgid "Requested account is not available." @@ -2861,6 +2337,10 @@ msgstr "Profil bearbeiten" msgid "Atom feed" msgstr "Atom-Feed" +#: include/identity.php:296 include/nav.php:191 +msgid "Profiles" +msgstr "Profile" + #: include/identity.php:296 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" @@ -2943,6 +2423,12 @@ msgstr "Veranstaltungserinnerungen" msgid "Events this week:" msgstr "Veranstaltungen diese Woche" +#: include/identity.php:632 include/identity.php:759 include/identity.php:792 +#: include/nav.php:84 mod/newmember.php:20 mod/profperm.php:107 +#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 +msgid "Profile" +msgstr "Profil" + #: include/identity.php:641 mod/settings.php:1287 msgid "Full Name:" msgstr "Kompletter Name:" @@ -2972,8 +2458,8 @@ msgstr "Sexuelle Vorlieben:" msgid "Hometown:" msgstr "Heimatort:" -#: include/identity.php:690 mod/follow.php:139 mod/notifications.php:250 -#: mod/contacts.php:645 +#: include/identity.php:690 mod/notifications.php:250 mod/contacts.php:645 +#: mod/follow.php:139 msgid "Tags:" msgstr "Tags:" @@ -3037,12 +2523,17 @@ msgstr "Foren:" msgid "Basic" msgstr "Allgemein" -#: include/identity.php:761 mod/events.php:510 mod/contacts.php:881 +#: include/identity.php:761 mod/contacts.php:881 mod/events.php:510 #: mod/admin.php:1065 msgid "Advanced" msgstr "Erweitert" -#: include/identity.php:787 mod/follow.php:147 mod/contacts.php:847 +#: include/identity.php:784 include/nav.php:83 mod/contacts.php:648 +#: mod/contacts.php:844 view/theme/frio/theme.php:248 +msgid "Status" +msgstr "Status" + +#: include/identity.php:787 mod/contacts.php:847 mod/follow.php:147 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" @@ -3050,10 +2541,31 @@ msgstr "Statusnachrichten und Beiträge" msgid "Profile Details" msgstr "Profildetails" +#: include/identity.php:800 include/nav.php:85 mod/fbrowser.php:33 +#: view/theme/frio/theme.php:250 +msgid "Photos" +msgstr "Bilder" + #: include/identity.php:803 mod/photos.php:95 msgid "Photo Albums" msgstr "Fotoalben" +#: include/identity.php:808 include/identity.php:811 include/nav.php:86 +#: view/theme/frio/theme.php:251 +msgid "Videos" +msgstr "Videos" + +#: include/identity.php:820 include/identity.php:831 include/nav.php:87 +#: include/nav.php:151 mod/cal.php:272 mod/events.php:377 +#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 +msgid "Events" +msgstr "Veranstaltungen" + +#: include/identity.php:823 include/identity.php:834 include/nav.php:151 +#: view/theme/frio/theme.php:256 +msgid "Events and Calendar" +msgstr "Ereignisse und Kalender" + #: include/identity.php:842 mod/notes.php:49 msgid "Personal Notes" msgstr "Persönliche Notizen" @@ -3062,13 +2574,19 @@ msgstr "Persönliche Notizen" msgid "Only You Can See This" msgstr "Nur Du kannst das sehen" +#: include/identity.php:853 include/identity.php:856 include/nav.php:130 +#: include/nav.php:194 include/text.php:1091 mod/viewcontacts.php:124 +#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 +msgid "Contacts" +msgstr "Kontakte" + #: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: include/items.php:2121 mod/display.php:105 mod/display.php:280 -#: mod/display.php:485 mod/notice.php:17 mod/viewsrc.php:16 mod/admin.php:248 -#: mod/admin.php:1571 mod/admin.php:1822 +#: include/items.php:2121 mod/notice.php:17 mod/viewsrc.php:16 +#: mod/display.php:117 mod/display.php:289 mod/display.php:504 +#: mod/admin.php:248 mod/admin.php:1571 mod/admin.php:1822 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -3076,10 +2594,10 @@ msgstr "Beitrag nicht gefunden." msgid "Do you really want to delete this item?" msgstr "Möchtest Du wirklich dieses Item löschen?" -#: include/items.php:2162 mod/api.php:107 mod/follow.php:115 -#: mod/message.php:208 mod/register.php:247 mod/suggest.php:31 -#: mod/dfrn_request.php:880 mod/contacts.php:455 mod/profiles.php:643 -#: mod/profiles.php:646 mod/profiles.php:673 mod/settings.php:1172 +#: include/items.php:2162 mod/api.php:107 mod/message.php:208 +#: mod/profiles.php:643 mod/profiles.php:646 mod/profiles.php:673 +#: mod/suggest.php:31 mod/contacts.php:455 mod/dfrn_request.php:880 +#: mod/follow.php:115 mod/register.php:247 mod/settings.php:1172 #: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189 #: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204 #: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236 @@ -3089,22 +2607,22 @@ msgstr "Ja" #: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 #: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105 -#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/dirfind.php:15 -#: mod/display.php:482 mod/editpost.php:12 mod/events.php:188 -#: mod/follow.php:13 mod/follow.php:76 mod/follow.php:160 mod/fsuggest.php:80 -#: mod/group.php:20 mod/invite.php:17 mod/invite.php:105 mod/manage.php:103 -#: mod/message.php:48 mod/message.php:173 mod/mood.php:116 mod/network.php:7 +#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/editpost.php:12 +#: mod/fsuggest.php:80 mod/group.php:20 mod/invite.php:17 mod/invite.php:105 +#: mod/manage.php:103 mod/message.php:48 mod/message.php:173 mod/mood.php:116 #: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73 #: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111 -#: mod/poke.php:155 mod/register.php:44 mod/repair_ostatus.php:11 -#: mod/suggest.php:60 mod/viewcontacts.php:49 mod/wall_attach.php:69 -#: mod/wall_attach.php:72 mod/wall_upload.php:101 mod/wall_upload.php:104 -#: mod/wallmessage.php:11 mod/wallmessage.php:35 mod/wallmessage.php:75 -#: mod/wallmessage.php:99 mod/item.php:197 mod/item.php:209 mod/regmod.php:106 -#: mod/uimport.php:26 mod/contacts.php:363 mod/profile_photo.php:19 -#: mod/profile_photo.php:179 mod/profile_photo.php:190 -#: mod/profile_photo.php:203 mod/profiles.php:172 mod/profiles.php:610 -#: mod/settings.php:24 mod/settings.php:132 mod/settings.php:669 index.php:410 +#: mod/poke.php:155 mod/profile_photo.php:19 mod/profile_photo.php:179 +#: mod/profile_photo.php:190 mod/profile_photo.php:203 mod/profiles.php:172 +#: mod/profiles.php:610 mod/regmod.php:106 mod/repair_ostatus.php:11 +#: mod/suggest.php:60 mod/uimport.php:26 mod/viewcontacts.php:49 +#: mod/wall_attach.php:69 mod/wall_attach.php:72 mod/wall_upload.php:101 +#: mod/wall_upload.php:104 mod/wallmessage.php:11 mod/wallmessage.php:35 +#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/contacts.php:363 +#: mod/dirfind.php:15 mod/display.php:501 mod/events.php:188 mod/follow.php:13 +#: mod/follow.php:76 mod/follow.php:160 mod/item.php:197 mod/item.php:209 +#: mod/network.php:7 mod/register.php:44 mod/settings.php:24 +#: mod/settings.php:132 mod/settings.php:669 index.php:410 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -3112,6 +2630,251 @@ msgstr "Zugriff verweigert." msgid "Archives" msgstr "Archiv" +#: include/message.php:14 include/message.php:168 +msgid "[no subject]" +msgstr "[kein Betreff]" + +#: include/nav.php:37 mod/navigation.php:21 +msgid "Nothing new here" +msgstr "Keine Neuigkeiten" + +#: include/nav.php:41 mod/navigation.php:25 +msgid "Clear notifications" +msgstr "Bereinige Benachrichtigungen" + +#: include/nav.php:42 include/text.php:1084 +msgid "@name, !forum, #tags, content" +msgstr "@name, !forum, #tags, content" + +#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:871 +msgid "Logout" +msgstr "Abmelden" + +#: include/nav.php:80 view/theme/frio/theme.php:245 +msgid "End this session" +msgstr "Diese Sitzung beenden" + +#: include/nav.php:83 include/nav.php:163 view/theme/frio/theme.php:248 +msgid "Your posts and conversations" +msgstr "Deine Beiträge und Unterhaltungen" + +#: include/nav.php:84 view/theme/frio/theme.php:249 +msgid "Your profile page" +msgstr "Deine Profilseite" + +#: include/nav.php:85 view/theme/frio/theme.php:250 +msgid "Your photos" +msgstr "Deine Fotos" + +#: include/nav.php:86 view/theme/frio/theme.php:251 +msgid "Your videos" +msgstr "Deine Videos" + +#: include/nav.php:87 view/theme/frio/theme.php:252 +msgid "Your events" +msgstr "Deine Ereignisse" + +#: include/nav.php:88 +msgid "Personal notes" +msgstr "Persönliche Notizen" + +#: include/nav.php:88 +msgid "Your personal notes" +msgstr "Deine persönlichen Notizen" + +#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:872 +msgid "Login" +msgstr "Anmeldung" + +#: include/nav.php:97 +msgid "Sign in" +msgstr "Anmelden" + +#: include/nav.php:107 +msgid "Home Page" +msgstr "Homepage" + +#: include/nav.php:111 mod/register.php:291 boot.php:848 +msgid "Register" +msgstr "Registrieren" + +#: include/nav.php:111 +msgid "Create an account" +msgstr "Nutzerkonto erstellen" + +#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 +msgid "Help" +msgstr "Hilfe" + +#: include/nav.php:117 +msgid "Help and documentation" +msgstr "Hilfe und Dokumentation" + +#: include/nav.php:121 +msgid "Apps" +msgstr "Apps" + +#: include/nav.php:121 +msgid "Addon applications, utilities, games" +msgstr "Addon Anwendungen, Dienstprogramme, Spiele" + +#: include/nav.php:125 include/text.php:1081 mod/search.php:152 +msgid "Search" +msgstr "Suche" + +#: include/nav.php:125 +msgid "Search site content" +msgstr "Inhalt der Seite durchsuchen" + +#: include/nav.php:128 include/text.php:1089 +msgid "Full Text" +msgstr "Volltext" + +#: include/nav.php:129 include/text.php:1090 +msgid "Tags" +msgstr "Tags" + +#: include/nav.php:145 include/nav.php:147 mod/community.php:32 +msgid "Community" +msgstr "Gemeinschaft" + +#: include/nav.php:145 +msgid "Conversations on this site" +msgstr "Unterhaltungen auf dieser Seite" + +#: include/nav.php:147 +msgid "Conversations on the network" +msgstr "Unterhaltungen im Netzwerk" + +#: include/nav.php:154 +msgid "Directory" +msgstr "Verzeichnis" + +#: include/nav.php:154 +msgid "People directory" +msgstr "Nutzerverzeichnis" + +#: include/nav.php:156 +msgid "Information" +msgstr "Information" + +#: include/nav.php:156 +msgid "Information about this friendica instance" +msgstr "Informationen zu dieser Friendica Instanz" + +#: include/nav.php:160 view/theme/frio/theme.php:255 +msgid "Conversations from your friends" +msgstr "Unterhaltungen Deiner Kontakte" + +#: include/nav.php:161 +msgid "Network Reset" +msgstr "Netzwerk zurücksetzen" + +#: include/nav.php:161 +msgid "Load Network page with no filters" +msgstr "Netzwerk-Seite ohne Filter laden" + +#: include/nav.php:168 +msgid "Friend Requests" +msgstr "Kontaktanfragen" + +#: include/nav.php:171 mod/notifications.php:98 +msgid "Notifications" +msgstr "Benachrichtigungen" + +#: include/nav.php:172 +msgid "See all notifications" +msgstr "Alle Benachrichtigungen anzeigen" + +#: include/nav.php:173 mod/settings.php:907 +msgid "Mark as seen" +msgstr "Als gelesen markieren" + +#: include/nav.php:173 +msgid "Mark all system notifications seen" +msgstr "Markiere alle Systembenachrichtigungen als gelesen" + +#: include/nav.php:177 mod/message.php:181 view/theme/frio/theme.php:257 +msgid "Messages" +msgstr "Nachrichten" + +#: include/nav.php:177 view/theme/frio/theme.php:257 +msgid "Private mail" +msgstr "Private E-Mail" + +#: include/nav.php:178 +msgid "Inbox" +msgstr "Eingang" + +#: include/nav.php:179 +msgid "Outbox" +msgstr "Ausgang" + +#: include/nav.php:180 mod/message.php:18 +msgid "New Message" +msgstr "Neue Nachricht" + +#: include/nav.php:183 +msgid "Manage" +msgstr "Verwalten" + +#: include/nav.php:183 +msgid "Manage other pages" +msgstr "Andere Seiten verwalten" + +#: include/nav.php:186 mod/settings.php:83 +msgid "Delegations" +msgstr "Delegationen" + +#: include/nav.php:186 mod/delegate.php:132 +msgid "Delegate Page Management" +msgstr "Delegiere das Management für die Seite" + +#: include/nav.php:188 mod/newmember.php:15 mod/settings.php:113 +#: mod/admin.php:1624 mod/admin.php:1900 view/theme/frio/theme.php:258 +msgid "Settings" +msgstr "Einstellungen" + +#: include/nav.php:188 view/theme/frio/theme.php:258 +msgid "Account settings" +msgstr "Kontoeinstellungen" + +#: include/nav.php:191 +msgid "Manage/Edit Profiles" +msgstr "Profile Verwalten/Editieren" + +#: include/nav.php:194 view/theme/frio/theme.php:259 +msgid "Manage/edit friends and contacts" +msgstr " Kontakte verwalten/editieren" + +#: include/nav.php:199 mod/admin.php:197 +msgid "Admin" +msgstr "Administration" + +#: include/nav.php:199 +msgid "Site setup and configuration" +msgstr "Einstellungen der Seite und Konfiguration" + +#: include/nav.php:202 +msgid "Navigation" +msgstr "Navigation" + +#: include/nav.php:202 +msgid "Site map" +msgstr "Sitemap" + +#: include/network.php:687 +msgid "view full size" +msgstr "Volle Größe anzeigen" + +#: include/oembed.php:256 +msgid "Embedded content" +msgstr "Eingebetteter Inhalt" + +#: include/oembed.php:264 +msgid "Embedding disabled" +msgstr "Einbettungen deaktiviert" + #: include/ostatus.php:1962 #, php-format msgid "%s is now following %s." @@ -3130,6 +2893,244 @@ msgstr "%s hat aufgehört %s zu folgen" msgid "stopped following" msgstr "wird nicht mehr gefolgt" +#: include/photos.php:57 include/photos.php:66 mod/fbrowser.php:42 +#: mod/fbrowser.php:63 mod/photos.php:189 mod/photos.php:1125 +#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1841 +#: mod/photos.php:1855 +msgid "Contact Photos" +msgstr "Kontaktbilder" + +#: include/plugin.php:532 include/plugin.php:534 +msgid "Click here to upgrade." +msgstr "Zum Upgraden hier klicken." + +#: include/plugin.php:541 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." + +#: include/plugin.php:546 +msgid "This action is not available under your subscription plan." +msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." + +#: include/text.php:308 +msgid "newer" +msgstr "neuer" + +#: include/text.php:309 +msgid "older" +msgstr "älter" + +#: include/text.php:314 +msgid "first" +msgstr "erste" + +#: include/text.php:315 +msgid "prev" +msgstr "vorige" + +#: include/text.php:349 +msgid "next" +msgstr "nächste" + +#: include/text.php:350 +msgid "last" +msgstr "letzte" + +#: include/text.php:404 +msgid "Loading more entries..." +msgstr "lade weitere Einträge..." + +#: include/text.php:405 +msgid "The end" +msgstr "Das Ende" + +#: include/text.php:956 +msgid "No contacts" +msgstr "Keine Kontakte" + +#: include/text.php:981 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "%d Kontakt" +msgstr[1] "%d Kontakte" + +#: include/text.php:994 +msgid "View Contacts" +msgstr "Kontakte anzeigen" + +#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 +#: mod/notes.php:64 +msgid "Save" +msgstr "Speichern" + +#: include/text.php:1145 +msgid "poke" +msgstr "anstupsen" + +#: include/text.php:1145 +msgid "poked" +msgstr "stupste" + +#: include/text.php:1146 +msgid "ping" +msgstr "anpingen" + +#: include/text.php:1146 +msgid "pinged" +msgstr "pingte" + +#: include/text.php:1147 +msgid "prod" +msgstr "knuffen" + +#: include/text.php:1147 +msgid "prodded" +msgstr "knuffte" + +#: include/text.php:1148 +msgid "slap" +msgstr "ohrfeigen" + +#: include/text.php:1148 +msgid "slapped" +msgstr "ohrfeigte" + +#: include/text.php:1149 +msgid "finger" +msgstr "befummeln" + +#: include/text.php:1149 +msgid "fingered" +msgstr "befummelte" + +#: include/text.php:1150 +msgid "rebuff" +msgstr "eine Abfuhr erteilen" + +#: include/text.php:1150 +msgid "rebuffed" +msgstr "abfuhrerteilte" + +#: include/text.php:1164 +msgid "happy" +msgstr "glücklich" + +#: include/text.php:1165 +msgid "sad" +msgstr "traurig" + +#: include/text.php:1166 +msgid "mellow" +msgstr "sanft" + +#: include/text.php:1167 +msgid "tired" +msgstr "müde" + +#: include/text.php:1168 +msgid "perky" +msgstr "frech" + +#: include/text.php:1169 +msgid "angry" +msgstr "sauer" + +#: include/text.php:1170 +msgid "stupified" +msgstr "verblüfft" + +#: include/text.php:1171 +msgid "puzzled" +msgstr "verwirrt" + +#: include/text.php:1172 +msgid "interested" +msgstr "interessiert" + +#: include/text.php:1173 +msgid "bitter" +msgstr "verbittert" + +#: include/text.php:1174 +msgid "cheerful" +msgstr "fröhlich" + +#: include/text.php:1175 +msgid "alive" +msgstr "lebendig" + +#: include/text.php:1176 +msgid "annoyed" +msgstr "verärgert" + +#: include/text.php:1177 +msgid "anxious" +msgstr "unruhig" + +#: include/text.php:1178 +msgid "cranky" +msgstr "schrullig" + +#: include/text.php:1179 +msgid "disturbed" +msgstr "verstört" + +#: include/text.php:1180 +msgid "frustrated" +msgstr "frustriert" + +#: include/text.php:1181 +msgid "motivated" +msgstr "motiviert" + +#: include/text.php:1182 +msgid "relaxed" +msgstr "entspannt" + +#: include/text.php:1183 +msgid "surprised" +msgstr "überrascht" + +#: include/text.php:1393 mod/videos.php:388 +msgid "View Video" +msgstr "Video ansehen" + +#: include/text.php:1425 +msgid "bytes" +msgstr "Byte" + +#: include/text.php:1457 include/text.php:1469 +msgid "Click to open/close" +msgstr "Zum öffnen/schließen klicken" + +#: include/text.php:1595 +msgid "View on separate page" +msgstr "Auf separater Seite ansehen" + +#: include/text.php:1596 +msgid "view on separate page" +msgstr "auf separater Seite ansehen" + +#: include/text.php:1875 +msgid "activity" +msgstr "Aktivität" + +#: include/text.php:1877 mod/content.php:624 object/Item.php:416 +#: object/Item.php:428 +msgid "comment" +msgid_plural "comments" +msgstr[0] "Kommentar" +msgstr[1] "Kommentare" + +#: include/text.php:1878 +msgid "post" +msgstr "Beitrag" + +#: include/text.php:2046 +msgid "Item filed" +msgstr "Beitrag abgelegt" + #: mod/allfriends.php:48 msgid "No friends to display." msgstr "Keine Kontakte zum Anzeigen." @@ -3152,9 +3153,9 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?" -#: mod/api.php:108 mod/follow.php:115 mod/register.php:248 -#: mod/dfrn_request.php:880 mod/profiles.php:643 mod/profiles.php:647 -#: mod/profiles.php:673 mod/settings.php:1172 mod/settings.php:1178 +#: mod/api.php:108 mod/profiles.php:643 mod/profiles.php:647 +#: mod/profiles.php:673 mod/dfrn_request.php:880 mod/follow.php:115 +#: mod/register.php:248 mod/settings.php:1172 mod/settings.php:1178 #: mod/settings.php:1185 mod/settings.php:1189 mod/settings.php:1194 #: mod/settings.php:1199 mod/settings.php:1204 mod/settings.php:1209 #: mod/settings.php:1235 mod/settings.php:1236 mod/settings.php:1237 @@ -3234,7 +3235,7 @@ msgstr "diaspora2bb: " msgid "The post was created" msgstr "Der Beitrag wurde angelegt" -#: mod/cal.php:145 mod/display.php:329 mod/profile.php:156 +#: mod/cal.php:145 mod/profile.php:156 mod/display.php:348 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." @@ -3246,7 +3247,7 @@ msgstr "Ansehen" msgid "Previous" msgstr "Vorherige" -#: mod/cal.php:275 mod/events.php:381 mod/install.php:203 +#: mod/cal.php:275 mod/install.php:203 mod/events.php:381 msgid "Next" msgstr "Nächste" @@ -3278,21 +3279,6 @@ msgstr "Keine gemeinsamen Kontakte." msgid "Common Friends" msgstr "Gemeinsame Kontakte" -#: mod/community.php:18 mod/directory.php:33 mod/display.php:201 -#: mod/photos.php:981 mod/search.php:96 mod/search.php:102 mod/videos.php:200 -#: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/dfrn_request.php:804 -#: mod/probe.php:9 -msgid "Public access denied." -msgstr "Öffentlicher Zugriff verweigert." - -#: mod/community.php:23 -msgid "Not available." -msgstr "Nicht verfügbar." - -#: mod/community.php:50 mod/search.php:222 -msgid "No results." -msgstr "Keine Ergebnisse." - #: mod/content.php:120 mod/network.php:478 msgid "No such group" msgstr "Es gibt keine solche Gruppe" @@ -3356,13 +3342,13 @@ msgstr "Das bist Du" msgid "Comment" msgstr "Kommentar" -#: mod/content.php:729 mod/crepair.php:159 mod/events.php:508 -#: mod/fsuggest.php:109 mod/install.php:244 mod/install.php:284 -#: mod/invite.php:144 mod/localtime.php:46 mod/manage.php:156 -#: mod/message.php:340 mod/message.php:523 mod/mood.php:139 -#: mod/photos.php:1143 mod/photos.php:1273 mod/photos.php:1599 -#: mod/photos.php:1648 mod/photos.php:1690 mod/photos.php:1770 -#: mod/poke.php:204 mod/contacts.php:588 mod/profiles.php:684 +#: mod/content.php:729 mod/crepair.php:159 mod/fsuggest.php:109 +#: mod/install.php:244 mod/install.php:284 mod/invite.php:144 +#: mod/localtime.php:46 mod/manage.php:156 mod/message.php:340 +#: mod/message.php:523 mod/mood.php:139 mod/photos.php:1143 +#: mod/photos.php:1273 mod/photos.php:1599 mod/photos.php:1648 +#: mod/photos.php:1690 mod/photos.php:1770 mod/poke.php:204 +#: mod/profiles.php:684 mod/contacts.php:588 mod/events.php:508 #: object/Item.php:702 view/theme/duepuntozero/config.php:64 #: view/theme/frio/config.php:67 view/theme/quattro/config.php:70 #: view/theme/vier/config.php:113 @@ -3540,9 +3526,8 @@ msgid "" "entries from this contact." msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden." -#: mod/crepair.php:170 mod/admin.php:1496 mod/admin.php:1509 -#: mod/admin.php:1522 mod/admin.php:1538 mod/settings.php:684 -#: mod/settings.php:710 +#: mod/crepair.php:170 mod/settings.php:684 mod/settings.php:710 +#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1538 msgid "Name" msgstr "Name" @@ -3698,6 +3683,13 @@ msgstr "%1$s ist %2$s beigetreten" msgid "%1$s welcomes %2$s" msgstr "%1$s heißt %2$s herzlich willkommen" +#: mod/directory.php:33 mod/photos.php:981 mod/probe.php:9 mod/videos.php:200 +#: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/community.php:18 +#: mod/dfrn_request.php:804 mod/display.php:213 mod/search.php:96 +#: mod/search.php:102 +msgid "Public access denied." +msgstr "Öffentlicher Zugriff verweigert." + #: mod/directory.php:195 view/theme/vier/theme.php:193 msgid "Global Directory" msgstr "Weltweites Verzeichnis" @@ -3718,24 +3710,6 @@ msgstr "Verzeichnis" msgid "No entries (some entries may be hidden)." msgstr "Keine Einträge (einige Einträge könnten versteckt sein)." -#: mod/dirfind.php:39 -#, php-format -msgid "People Search - %s" -msgstr "Personensuche - %s" - -#: mod/dirfind.php:50 -#, php-format -msgid "Forum Search - %s" -msgstr "Forensuche - %s" - -#: mod/dirfind.php:247 mod/match.php:112 -msgid "No matches" -msgstr "Keine Übereinstimmungen" - -#: mod/display.php:480 -msgid "Item has been removed." -msgstr "Eintrag wurde entfernt." - #: mod/editpost.php:19 mod/editpost.php:29 msgid "Item not found" msgstr "Beitrag nicht gefunden" @@ -3744,124 +3718,14 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: mod/events.php:96 mod/events.php:98 -msgid "Event can not end before it has started." -msgstr "Die Veranstaltung kann nicht enden bevor sie beginnt." - -#: mod/events.php:105 mod/events.php:107 -msgid "Event title and start time are required." -msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden." - -#: mod/events.php:379 -msgid "Create New Event" -msgstr "Neue Veranstaltung erstellen" - -#: mod/events.php:484 -msgid "Event details" -msgstr "Veranstaltungsdetails" - -#: mod/events.php:485 -msgid "Starting date and Title are required." -msgstr "Anfangszeitpunkt und Titel werden benötigt" - -#: mod/events.php:486 mod/events.php:487 -msgid "Event Starts:" -msgstr "Veranstaltungsbeginn:" - -#: mod/events.php:486 mod/events.php:498 mod/profiles.php:712 -msgid "Required" -msgstr "Benötigt" - -#: mod/events.php:488 mod/events.php:504 -msgid "Finish date/time is not known or not relevant" -msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" - -#: mod/events.php:490 mod/events.php:491 -msgid "Event Finishes:" -msgstr "Veranstaltungsende:" - -#: mod/events.php:492 mod/events.php:505 -msgid "Adjust for viewer timezone" -msgstr "An Zeitzone des Betrachters anpassen" - -#: mod/events.php:494 -msgid "Description:" -msgstr "Beschreibung" - -#: mod/events.php:498 mod/events.php:500 -msgid "Title:" -msgstr "Titel:" - -#: mod/events.php:501 mod/events.php:502 -msgid "Share this event" -msgstr "Veranstaltung teilen" - -#: mod/events.php:531 -msgid "Failed to remove event" -msgstr "Entfernen der Veranstaltung fehlgeschlagen" - -#: mod/events.php:533 -msgid "Event removed" -msgstr "Veranstaltung enfternt" - #: mod/fbrowser.php:134 msgid "Files" msgstr "Dateien" -#: mod/fetch.php:15 mod/fetch.php:42 mod/fetch.php:51 mod/help.php:56 -#: mod/p.php:19 mod/p.php:46 mod/p.php:55 index.php:301 -msgid "Not Found" -msgstr "Nicht gefunden" - #: mod/filer.php:31 msgid "- select -" msgstr "- auswählen -" -#: mod/follow.php:21 mod/dfrn_request.php:893 -msgid "Submit Request" -msgstr "Anfrage abschicken" - -#: mod/follow.php:32 -msgid "You already added this contact." -msgstr "Du hast den Kontakt bereits hinzugefügt." - -#: mod/follow.php:41 -msgid "Diaspora support isn't enabled. Contact can't be added." -msgstr "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden." - -#: mod/follow.php:48 -msgid "OStatus support is disabled. Contact can't be added." -msgstr "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden." - -#: mod/follow.php:55 -msgid "The network type couldn't be detected. Contact can't be added." -msgstr "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden." - -#: mod/follow.php:114 mod/dfrn_request.php:879 -msgid "Please answer the following:" -msgstr "Bitte beantworte folgendes:" - -#: mod/follow.php:115 mod/dfrn_request.php:880 -#, php-format -msgid "Does %s know you?" -msgstr "Kennt %s Dich?" - -#: mod/follow.php:116 mod/dfrn_request.php:884 -msgid "Add a personal note:" -msgstr "Eine persönliche Notiz beifügen:" - -#: mod/follow.php:122 mod/dfrn_request.php:890 -msgid "Your Identity Address:" -msgstr "Adresse Deines Profils:" - -#: mod/follow.php:131 mod/notifications.php:257 mod/contacts.php:635 -msgid "Profile URL" -msgstr "Profil URL" - -#: mod/follow.php:188 -msgid "Contact added" -msgstr "Kontakt hinzugefügt" - #: mod/friendica.php:69 msgid "This is Friendica, version" msgstr "Dies ist Friendica, Version" @@ -3995,6 +3859,11 @@ msgstr "Kein Profil" msgid "Help:" msgstr "Hilfe:" +#: mod/help.php:56 mod/p.php:19 mod/p.php:46 mod/p.php:55 mod/fetch.php:15 +#: mod/fetch.php:42 mod/fetch.php:51 index.php:301 +msgid "Not Found" +msgstr "Nicht gefunden" + #: mod/help.php:59 index.php:304 msgid "Page not found." msgstr "Seite nicht gefunden." @@ -4531,7 +4400,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: mod/lostpass.php:112 boot.php:884 +#: mod/lostpass.php:112 boot.php:886 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -4597,7 +4466,7 @@ msgid "" "your email for further instructions." msgstr "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet." -#: mod/lostpass.php:163 boot.php:872 +#: mod/lostpass.php:163 boot.php:874 msgid "Nickname or Email: " msgstr "Spitzname oder E-Mail:" @@ -4635,6 +4504,10 @@ msgstr "ist interessiert an:" msgid "Profile Match" msgstr "Profilübereinstimmungen" +#: mod/match.php:112 mod/dirfind.php:247 +msgid "No matches" +msgstr "Keine Übereinstimmungen" + #: mod/message.php:62 mod/wallmessage.php:52 msgid "No recipient selected." msgstr "Kein Empfänger gewählt." @@ -4739,82 +4612,6 @@ msgstr "Stimmung" msgid "Set your current mood and tell your friends" msgstr "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten" -#: mod/network.php:154 mod/search.php:230 mod/contacts.php:808 -#, php-format -msgid "Results for: %s" -msgstr "Ergebnisse für: %s" - -#: mod/network.php:200 mod/search.php:28 -msgid "Remove term" -msgstr "Begriff entfernen" - -#: mod/network.php:407 -#, php-format -msgid "" -"Warning: This group contains %s member from a network that doesn't allow non" -" public messages." -msgid_plural "" -"Warning: This group contains %s members from a network that doesn't allow " -"non public messages." -msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann." -msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können." - -#: mod/network.php:410 -msgid "Messages in this group won't be send to these receivers." -msgstr "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden." - -#: mod/network.php:538 -msgid "Private messages to this person are at risk of public disclosure." -msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." - -#: mod/network.php:543 -msgid "Invalid contact." -msgstr "Ungültiger Kontakt." - -#: mod/network.php:816 -msgid "Commented Order" -msgstr "Neueste Kommentare" - -#: mod/network.php:819 -msgid "Sort by Comment Date" -msgstr "Nach Kommentardatum sortieren" - -#: mod/network.php:824 -msgid "Posted Order" -msgstr "Neueste Beiträge" - -#: mod/network.php:827 -msgid "Sort by Post Date" -msgstr "Nach Beitragsdatum sortieren" - -#: mod/network.php:838 -msgid "Posts that mention or involve you" -msgstr "Beiträge, in denen es um Dich geht" - -#: mod/network.php:846 -msgid "New" -msgstr "Neue" - -#: mod/network.php:849 -msgid "Activity Stream - by date" -msgstr "Aktivitäten-Stream - nach Datum" - -#: mod/network.php:857 -msgid "Shared Links" -msgstr "Geteilte Links" - -#: mod/network.php:860 -msgid "Interesting Links" -msgstr "Interessante Links" - -#: mod/network.php:868 -msgid "Starred" -msgstr "Markierte" - -#: mod/network.php:871 -msgid "Favourite Posts" -msgstr "Favorisierte Beiträge" - #: mod/newmember.php:7 msgid "Welcome to Friendica" msgstr "Willkommen bei Friendica" @@ -5111,6 +4908,10 @@ msgstr "Teilenden" msgid "Subscriber" msgstr "Abonnent" +#: mod/notifications.php:257 mod/contacts.php:635 mod/follow.php:131 +msgid "Profile URL" +msgstr "Profil URL" + #: mod/notifications.php:274 msgid "No introductions." msgstr "Keine Kontaktanfragen." @@ -5226,7 +5027,7 @@ msgstr "%1$s wurde von %3$s in %2$s getaggt" msgid "a photo" msgstr "einem Foto" -#: mod/photos.php:815 mod/wall_upload.php:181 mod/profile_photo.php:155 +#: mod/photos.php:815 mod/profile_photo.php:155 mod/wall_upload.php:181 #, php-format msgid "Image exceeds size limit of %s" msgstr "Bildgröße überschreitet das Limit von %s" @@ -5235,11 +5036,11 @@ msgstr "Bildgröße überschreitet das Limit von %s" msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: mod/photos.php:856 mod/wall_upload.php:218 mod/profile_photo.php:164 +#: mod/photos.php:856 mod/profile_photo.php:164 mod/wall_upload.php:218 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: mod/photos.php:885 mod/wall_upload.php:257 mod/profile_photo.php:314 +#: mod/photos.php:885 mod/profile_photo.php:314 mod/wall_upload.php:257 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." @@ -5401,10 +5202,378 @@ msgstr "Was willst Du mit dem Empfänger machen:" msgid "Make this post private" msgstr "Diesen Beitrag privat machen" +#: mod/probe.php:10 mod/webfinger.php:11 +msgid "Only logged in users are permitted to perform a probing." +msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet." + #: mod/profile.php:176 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" +#: mod/profile_photo.php:44 +msgid "Image uploaded but image cropping failed." +msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl." + +#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: mod/profile_photo.php:322 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "Verkleinern der Bildgröße von [%s] scheiterte." + +#: mod/profile_photo.php:127 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." + +#: mod/profile_photo.php:136 +msgid "Unable to process image" +msgstr "Bild konnte nicht verarbeitet werden" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "Datei hochladen:" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "Profil auswählen:" + +#: mod/profile_photo.php:256 +#: view/smarty3/compiled/04b5adc938a37b0a51a14fb26634819e90d47ba4.file.filebrowser.tpl.php:119 +msgid "Upload" +msgstr "Hochladen" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "oder" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "diesen Schritt überspringen" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "wähle ein Foto aus deinen Fotoalben" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "Bild zurechtschneiden" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "Bearbeitung abgeschlossen" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "Bild erfolgreich hochgeladen." + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "Profil gelöscht." + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "Profil-" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "Neues Profil angelegt." + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "Profil nicht zum Duplizieren verfügbar." + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "Profilname ist erforderlich." + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "Familienstand" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "Romanze" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "Arbeit / Beschäftigung" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "Religion" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "Politische Ansichten" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "Geschlecht" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "Sexuelle Vorlieben" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "XMPP" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "Webseite" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "Interessen" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "Adresse" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "Wohnort" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "Profil aktualisiert." + +#: mod/profiles.php:567 +msgid " and " +msgstr " und " + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "öffentliches Profil" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s hat %2$s geändert auf “%3$s”" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " – %1$ss %2$s besuchen" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "Kontakte und Freunde verbergen" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "Zeige mehr Profil-Felder:" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "Profilaktionen" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "Profil bearbeiten" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "Profilbild ändern" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "Dieses Profil anzeigen" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "Neues Profil anlegen und diese Einstellungen verwenden" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "Dieses Profil duplizieren" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "Dieses Profil löschen" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "Grundinformationen" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "Profilbild" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "Vorlieben" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "Status Informationen" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "Zusätzliche Informationen" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "Beziehung" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "Dein Geschlecht:" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "Beispiel: Fischen Fotografie Software" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "Profilname:" + +#: mod/profiles.php:712 mod/events.php:486 mod/events.php:498 +msgid "Required" +msgstr "Benötigt" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "Dein kompletter Name:" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "Titel/Beschreibung:" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "Adresse:" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "Wohnort:" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "Region/Bundesstaat:" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "Postleitzahl:" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "Land:" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "Wer: (falls anwendbar)" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "Seit [Datum]:" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "Erzähle uns ein bisschen von Dir …" + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "XMPP (Jabber) Adresse" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow" +" you." +msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können." + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "Adresse der Homepage:" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "Religiöse Ansichten:" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "Öffentliche Schlüsselwörter:" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "Private Schlüsselwörter:" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "Musikalische Interessen" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "Bücher, Literatur" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "Fernsehen" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "Filme/Tänze/Kultur/Unterhaltung" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "Hobbies/Interessen" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "Liebe/Romantik" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "Arbeit/Anstellung" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "Schule/Ausbildung" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "Kontaktinformationen und Soziale Netzwerke" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "Bearbeite/Verwalte Profile" + #: mod/profperm.php:28 mod/profperm.php:59 msgid "Invalid profile identifier." msgstr "Ungültiger Profil-Bezeichner." @@ -5421,114 +5590,18 @@ msgstr "Sichtbar für" msgid "All Contacts (with secure profile access)" msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" -#: mod/register.php:95 -msgid "" -"Registration successful. Please check your email for further instructions." -msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet." +#: mod/regmod.php:60 +msgid "Account approved." +msgstr "Konto freigegeben." -#: mod/register.php:100 +#: mod/regmod.php:88 #, php-format -msgid "" -"Failed to send email message. Here your accout details:<br> login: %s<br> " -"password: %s<br><br>You can change your password after login." -msgstr "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern." +msgid "Registration revoked for %s" +msgstr "Registrierung für %s wurde zurückgezogen" -#: mod/register.php:107 -msgid "Registration successful." -msgstr "Registrierung erfolgreich." - -#: mod/register.php:113 -msgid "Your registration can not be processed." -msgstr "Deine Registrierung konnte nicht verarbeitet werden." - -#: mod/register.php:162 -msgid "Your registration is pending approval by the site owner." -msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." - -#: mod/register.php:200 mod/uimport.php:53 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal." - -#: mod/register.php:228 -msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." -msgstr "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst." - -#: mod/register.php:229 -msgid "" -"If you are not familiar with OpenID, please leave that field blank and fill " -"in the rest of the items." -msgstr "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus." - -#: mod/register.php:230 -msgid "Your OpenID (optional): " -msgstr "Deine OpenID (optional): " - -#: mod/register.php:244 -msgid "Include your profile in member directory?" -msgstr "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?" - -#: mod/register.php:269 -msgid "Note for the admin" -msgstr "Hinweis für den Admin" - -#: mod/register.php:269 -msgid "Leave a message for the admin, why you want to join this node" -msgstr "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest." - -#: mod/register.php:270 -msgid "Membership on this site is by invitation only." -msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." - -#: mod/register.php:271 -msgid "Your invitation ID: " -msgstr "ID Deiner Einladung: " - -#: mod/register.php:274 mod/admin.php:1062 -msgid "Registration" -msgstr "Registrierung" - -#: mod/register.php:282 -msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " -msgstr "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):" - -#: mod/register.php:283 -msgid "Your Email Address: " -msgstr "Deine E-Mail-Adresse: " - -#: mod/register.php:285 mod/settings.php:1279 -msgid "New Password:" -msgstr "Neues Passwort:" - -#: mod/register.php:285 -msgid "Leave empty for an auto generated password." -msgstr "Leer lassen um das Passwort automatisch zu generieren." - -#: mod/register.php:286 mod/settings.php:1280 -msgid "Confirm:" -msgstr "Bestätigen:" - -#: mod/register.php:287 -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be " -"'<strong>nickname@$sitename</strong>'." -msgstr "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein." - -#: mod/register.php:288 -msgid "Choose a nickname: " -msgstr "Spitznamen wählen: " - -#: mod/register.php:297 mod/uimport.php:68 -msgid "Import" -msgstr "Import" - -#: mod/register.php:298 -msgid "Import your profile to this friendica instance" -msgstr "Importiere Dein Profil auf diese Friendica Instanz" +#: mod/regmod.php:100 +msgid "Please login." +msgstr "Bitte melde Dich an." #: mod/removeme.php:54 mod/removeme.php:57 msgid "Remove My Account" @@ -5552,23 +5625,6 @@ msgstr "Erneuern der OStatus Abonements" msgid "Error" msgstr "Fehler" -#: mod/search.php:103 -msgid "Only logged in users are permitted to perform a search." -msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet." - -#: mod/search.php:127 -msgid "Too Many Requests" -msgstr "Zu viele Abfragen" - -#: mod/search.php:128 -msgid "Only one search per minute is permitted for not logged in users." -msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet." - -#: mod/search.php:228 -#, php-format -msgid "Items tagged with: %s" -msgstr "Beiträge die mit %s getaggt sind" - #: mod/subthread.php:105 #, php-format msgid "%1$s is following %2$s's %3$s" @@ -5625,8 +5681,49 @@ msgstr "Exportiere Deine Account Informationen, Kontakte und alle Einträge als msgid "Export personal data" msgstr "Persönliche Daten exportieren" +#: mod/uimport.php:53 mod/register.php:200 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal." + +#: mod/uimport.php:68 mod/register.php:297 +msgid "Import" +msgstr "Import" + +#: mod/uimport.php:70 +msgid "Move account" +msgstr "Account umziehen" + +#: mod/uimport.php:71 +msgid "You can import an account from another Friendica server." +msgstr "Du kannst einen Account von einem anderen Friendica Server importieren." + +#: mod/uimport.php:72 +msgid "" +"You need to export your account from the old server and upload it here. We " +"will recreate your old account here with all your contacts. We will try also" +" to inform your friends that you moved here." +msgstr "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist." + +#: mod/uimport.php:73 +msgid "" +"This feature is experimental. We can't import contacts from the OStatus " +"network (GNU Social/Statusnet) or from Diaspora" +msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren" + +#: mod/uimport.php:74 +msgid "Account file" +msgstr "Account Datei" + +#: mod/uimport.php:74 +msgid "" +"To export your account, go to \"Settings->Export your personal data\" and " +"select \"Export account\"" +msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"" + #: mod/update_community.php:21 mod/update_display.php:25 -#: mod/update_network.php:29 mod/update_notes.php:38 mod/update_profile.php:37 +#: mod/update_notes.php:38 mod/update_profile.php:37 mod/update_network.php:29 msgid "[Embedded content - reload page to view]" msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]" @@ -5701,238 +5798,13 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." -#: mod/webfinger.php:11 mod/probe.php:10 -msgid "Only logged in users are permitted to perform a probing." -msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet." +#: mod/community.php:23 +msgid "Not available." +msgstr "Nicht verfügbar." -#: mod/dfrn_request.php:103 -msgid "This introduction has already been accepted." -msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." - -#: mod/dfrn_request.php:126 mod/dfrn_request.php:528 -msgid "Profile location is not valid or does not contain profile information." -msgstr "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung." - -#: mod/dfrn_request.php:131 mod/dfrn_request.php:533 -msgid "Warning: profile location has no identifiable owner name." -msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden." - -#: mod/dfrn_request.php:134 mod/dfrn_request.php:536 -msgid "Warning: profile location has no profile photo." -msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse." - -#: mod/dfrn_request.php:138 mod/dfrn_request.php:540 -#, php-format -msgid "%d required parameter was not found at the given location" -msgid_plural "%d required parameters were not found at the given location" -msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden" -msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden" - -#: mod/dfrn_request.php:182 -msgid "Introduction complete." -msgstr "Kontaktanfrage abgeschlossen." - -#: mod/dfrn_request.php:227 -msgid "Unrecoverable protocol error." -msgstr "Nicht behebbarer Protokollfehler." - -#: mod/dfrn_request.php:255 -msgid "Profile unavailable." -msgstr "Profil nicht verfügbar." - -#: mod/dfrn_request.php:282 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "%s hat heute zu viele Kontaktanfragen erhalten." - -#: mod/dfrn_request.php:283 -msgid "Spam protection measures have been invoked." -msgstr "Maßnahmen zum Spamschutz wurden ergriffen." - -#: mod/dfrn_request.php:284 -msgid "Friends are advised to please try again in 24 hours." -msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen." - -#: mod/dfrn_request.php:346 -msgid "Invalid locator" -msgstr "Ungültiger Locator" - -#: mod/dfrn_request.php:355 -msgid "Invalid email address." -msgstr "Ungültige E-Mail-Adresse." - -#: mod/dfrn_request.php:380 -msgid "This account has not been configured for email. Request failed." -msgstr "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen." - -#: mod/dfrn_request.php:483 -msgid "You have already introduced yourself here." -msgstr "Du hast Dich hier bereits vorgestellt." - -#: mod/dfrn_request.php:487 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst." - -#: mod/dfrn_request.php:508 -msgid "Invalid profile URL." -msgstr "Ungültige Profil-URL." - -#: mod/dfrn_request.php:593 mod/contacts.php:221 -msgid "Failed to update contact record." -msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." - -#: mod/dfrn_request.php:614 -msgid "Your introduction has been sent." -msgstr "Deine Kontaktanfrage wurde gesendet." - -#: mod/dfrn_request.php:656 -msgid "" -"Remote subscription can't be done for your network. Please subscribe " -"directly on your system." -msgstr "Entferntes abonnieren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. " - -#: mod/dfrn_request.php:677 -msgid "Please login to confirm introduction." -msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen." - -#: mod/dfrn_request.php:687 -msgid "" -"Incorrect identity currently logged in. Please login to " -"<strong>this</strong> profile." -msgstr "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an." - -#: mod/dfrn_request.php:701 mod/dfrn_request.php:718 -msgid "Confirm" -msgstr "Bestätigen" - -#: mod/dfrn_request.php:713 -msgid "Hide this contact" -msgstr "Verberge diesen Kontakt" - -#: mod/dfrn_request.php:716 -#, php-format -msgid "Welcome home %s." -msgstr "Willkommen zurück %s." - -#: mod/dfrn_request.php:717 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "Bitte bestätige Deine Kontaktanfrage bei %s." - -#: mod/dfrn_request.php:848 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"communications networks:" -msgstr "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:" - -#: mod/dfrn_request.php:872 -#, php-format -msgid "" -"If you are not yet a member of the free social web, <a " -"href=\"%s/siteinfo\">follow this link to find a public Friendica site and " -"join us today</a>." -msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten." - -#: mod/dfrn_request.php:877 -msgid "Friend/Connection Request" -msgstr "Kontaktanfrage" - -#: mod/dfrn_request.php:878 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" -msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" - -#: mod/dfrn_request.php:887 -msgid "StatusNet/Federated Social Web" -msgstr "StatusNet/Federated Social Web" - -#: mod/dfrn_request.php:889 -#, php-format -msgid "" -" - please do not use this form. Instead, enter %s into your Diaspora search" -" bar." -msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste." - -#: mod/item.php:118 -msgid "Unable to locate original post." -msgstr "Konnte den Originalbeitrag nicht finden." - -#: mod/item.php:345 -msgid "Empty post discarded." -msgstr "Leerer Beitrag wurde verworfen." - -#: mod/item.php:904 -msgid "System error. Post not saved." -msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." - -#: mod/item.php:995 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social " -"network." -msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica." - -#: mod/item.php:997 -#, php-format -msgid "You may visit them online at %s" -msgstr "Du kannst sie online unter %s besuchen" - -#: mod/item.php:998 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." -msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest." - -#: mod/item.php:1002 -#, php-format -msgid "%s posted an update." -msgstr "%s hat ein Update veröffentlicht." - -#: mod/regmod.php:60 -msgid "Account approved." -msgstr "Konto freigegeben." - -#: mod/regmod.php:88 -#, php-format -msgid "Registration revoked for %s" -msgstr "Registrierung für %s wurde zurückgezogen" - -#: mod/regmod.php:100 -msgid "Please login." -msgstr "Bitte melde Dich an." - -#: mod/uimport.php:70 -msgid "Move account" -msgstr "Account umziehen" - -#: mod/uimport.php:71 -msgid "You can import an account from another Friendica server." -msgstr "Du kannst einen Account von einem anderen Friendica Server importieren." - -#: mod/uimport.php:72 -msgid "" -"You need to export your account from the old server and upload it here. We " -"will recreate your old account here with all your contacts. We will try also" -" to inform your friends that you moved here." -msgstr "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist." - -#: mod/uimport.php:73 -msgid "" -"This feature is experimental. We can't import contacts from the OStatus " -"network (GNU Social/Statusnet) or from Diaspora" -msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren" - -#: mod/uimport.php:74 -msgid "Account file" -msgstr "Account Datei" - -#: mod/uimport.php:74 -msgid "" -"To export your account, go to \"Settings->Export your personal data\" and " -"select \"Export account\"" -msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"" +#: mod/community.php:50 mod/search.php:222 +msgid "No results." +msgstr "Keine Ergebnisse." #: mod/contacts.php:137 #, php-format @@ -5953,6 +5825,10 @@ msgstr "Konnte das ausgewählte Profil nicht finden." msgid "Contact updated." msgstr "Kontakt aktualisiert." +#: mod/contacts.php:221 mod/dfrn_request.php:593 +msgid "Failed to update contact record." +msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." + #: mod/contacts.php:402 msgid "Contact has been blocked" msgstr "Kontakt wurde blockiert" @@ -6213,6 +6089,11 @@ msgstr "Nur verborgene Kontakte anzeigen" msgid "Search your contacts" msgstr "Suche in deinen Kontakten" +#: mod/contacts.php:808 mod/network.php:154 mod/search.php:230 +#, php-format +msgid "Results for: %s" +msgstr "Ergebnisse für: %s" + #: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 msgid "Update" msgstr "Aktualisierungen" @@ -6269,6 +6150,369 @@ msgstr "Archiviert-Status ein-/ausschalten" msgid "Delete contact" msgstr "Lösche den Kontakt" +#: mod/dfrn_request.php:103 +msgid "This introduction has already been accepted." +msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." + +#: mod/dfrn_request.php:126 mod/dfrn_request.php:528 +msgid "Profile location is not valid or does not contain profile information." +msgstr "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung." + +#: mod/dfrn_request.php:131 mod/dfrn_request.php:533 +msgid "Warning: profile location has no identifiable owner name." +msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden." + +#: mod/dfrn_request.php:134 mod/dfrn_request.php:536 +msgid "Warning: profile location has no profile photo." +msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse." + +#: mod/dfrn_request.php:138 mod/dfrn_request.php:540 +#, php-format +msgid "%d required parameter was not found at the given location" +msgid_plural "%d required parameters were not found at the given location" +msgstr[0] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden" +msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden" + +#: mod/dfrn_request.php:182 +msgid "Introduction complete." +msgstr "Kontaktanfrage abgeschlossen." + +#: mod/dfrn_request.php:227 +msgid "Unrecoverable protocol error." +msgstr "Nicht behebbarer Protokollfehler." + +#: mod/dfrn_request.php:255 +msgid "Profile unavailable." +msgstr "Profil nicht verfügbar." + +#: mod/dfrn_request.php:282 +#, php-format +msgid "%s has received too many connection requests today." +msgstr "%s hat heute zu viele Kontaktanfragen erhalten." + +#: mod/dfrn_request.php:283 +msgid "Spam protection measures have been invoked." +msgstr "Maßnahmen zum Spamschutz wurden ergriffen." + +#: mod/dfrn_request.php:284 +msgid "Friends are advised to please try again in 24 hours." +msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen." + +#: mod/dfrn_request.php:346 +msgid "Invalid locator" +msgstr "Ungültiger Locator" + +#: mod/dfrn_request.php:355 +msgid "Invalid email address." +msgstr "Ungültige E-Mail-Adresse." + +#: mod/dfrn_request.php:380 +msgid "This account has not been configured for email. Request failed." +msgstr "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen." + +#: mod/dfrn_request.php:483 +msgid "You have already introduced yourself here." +msgstr "Du hast Dich hier bereits vorgestellt." + +#: mod/dfrn_request.php:487 +#, php-format +msgid "Apparently you are already friends with %s." +msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst." + +#: mod/dfrn_request.php:508 +msgid "Invalid profile URL." +msgstr "Ungültige Profil-URL." + +#: mod/dfrn_request.php:614 +msgid "Your introduction has been sent." +msgstr "Deine Kontaktanfrage wurde gesendet." + +#: mod/dfrn_request.php:656 +msgid "" +"Remote subscription can't be done for your network. Please subscribe " +"directly on your system." +msgstr "Entferntes abonnieren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. " + +#: mod/dfrn_request.php:677 +msgid "Please login to confirm introduction." +msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen." + +#: mod/dfrn_request.php:687 +msgid "" +"Incorrect identity currently logged in. Please login to " +"<strong>this</strong> profile." +msgstr "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an." + +#: mod/dfrn_request.php:701 mod/dfrn_request.php:718 +msgid "Confirm" +msgstr "Bestätigen" + +#: mod/dfrn_request.php:713 +msgid "Hide this contact" +msgstr "Verberge diesen Kontakt" + +#: mod/dfrn_request.php:716 +#, php-format +msgid "Welcome home %s." +msgstr "Willkommen zurück %s." + +#: mod/dfrn_request.php:717 +#, php-format +msgid "Please confirm your introduction/connection request to %s." +msgstr "Bitte bestätige Deine Kontaktanfrage bei %s." + +#: mod/dfrn_request.php:848 +msgid "" +"Please enter your 'Identity Address' from one of the following supported " +"communications networks:" +msgstr "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:" + +#: mod/dfrn_request.php:872 +#, php-format +msgid "" +"If you are not yet a member of the free social web, <a " +"href=\"%s/siteinfo\">follow this link to find a public Friendica site and " +"join us today</a>." +msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten." + +#: mod/dfrn_request.php:877 +msgid "Friend/Connection Request" +msgstr "Kontaktanfrage" + +#: mod/dfrn_request.php:878 +msgid "" +"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " +"testuser@identi.ca" +msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" + +#: mod/dfrn_request.php:879 mod/follow.php:114 +msgid "Please answer the following:" +msgstr "Bitte beantworte folgendes:" + +#: mod/dfrn_request.php:880 mod/follow.php:115 +#, php-format +msgid "Does %s know you?" +msgstr "Kennt %s Dich?" + +#: mod/dfrn_request.php:884 mod/follow.php:116 +msgid "Add a personal note:" +msgstr "Eine persönliche Notiz beifügen:" + +#: mod/dfrn_request.php:887 +msgid "StatusNet/Federated Social Web" +msgstr "StatusNet/Federated Social Web" + +#: mod/dfrn_request.php:889 +#, php-format +msgid "" +" - please do not use this form. Instead, enter %s into your Diaspora search" +" bar." +msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste." + +#: mod/dfrn_request.php:890 mod/follow.php:122 +msgid "Your Identity Address:" +msgstr "Adresse Deines Profils:" + +#: mod/dfrn_request.php:893 mod/follow.php:21 +msgid "Submit Request" +msgstr "Anfrage abschicken" + +#: mod/dirfind.php:39 +#, php-format +msgid "People Search - %s" +msgstr "Personensuche - %s" + +#: mod/dirfind.php:50 +#, php-format +msgid "Forum Search - %s" +msgstr "Forensuche - %s" + +#: mod/display.php:499 +msgid "Item has been removed." +msgstr "Eintrag wurde entfernt." + +#: mod/events.php:96 mod/events.php:98 +msgid "Event can not end before it has started." +msgstr "Die Veranstaltung kann nicht enden bevor sie beginnt." + +#: mod/events.php:105 mod/events.php:107 +msgid "Event title and start time are required." +msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden." + +#: mod/events.php:379 +msgid "Create New Event" +msgstr "Neue Veranstaltung erstellen" + +#: mod/events.php:484 +msgid "Event details" +msgstr "Veranstaltungsdetails" + +#: mod/events.php:485 +msgid "Starting date and Title are required." +msgstr "Anfangszeitpunkt und Titel werden benötigt" + +#: mod/events.php:486 mod/events.php:487 +msgid "Event Starts:" +msgstr "Veranstaltungsbeginn:" + +#: mod/events.php:488 mod/events.php:504 +msgid "Finish date/time is not known or not relevant" +msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" + +#: mod/events.php:490 mod/events.php:491 +msgid "Event Finishes:" +msgstr "Veranstaltungsende:" + +#: mod/events.php:492 mod/events.php:505 +msgid "Adjust for viewer timezone" +msgstr "An Zeitzone des Betrachters anpassen" + +#: mod/events.php:494 +msgid "Description:" +msgstr "Beschreibung" + +#: mod/events.php:498 mod/events.php:500 +msgid "Title:" +msgstr "Titel:" + +#: mod/events.php:501 mod/events.php:502 +msgid "Share this event" +msgstr "Veranstaltung teilen" + +#: mod/events.php:531 +msgid "Failed to remove event" +msgstr "Entfernen der Veranstaltung fehlgeschlagen" + +#: mod/events.php:533 +msgid "Event removed" +msgstr "Veranstaltung enfternt" + +#: mod/follow.php:32 +msgid "You already added this contact." +msgstr "Du hast den Kontakt bereits hinzugefügt." + +#: mod/follow.php:41 +msgid "Diaspora support isn't enabled. Contact can't be added." +msgstr "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden." + +#: mod/follow.php:48 +msgid "OStatus support is disabled. Contact can't be added." +msgstr "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden." + +#: mod/follow.php:55 +msgid "The network type couldn't be detected. Contact can't be added." +msgstr "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden." + +#: mod/follow.php:188 +msgid "Contact added" +msgstr "Kontakt hinzugefügt" + +#: mod/item.php:118 +msgid "Unable to locate original post." +msgstr "Konnte den Originalbeitrag nicht finden." + +#: mod/item.php:345 +msgid "Empty post discarded." +msgstr "Leerer Beitrag wurde verworfen." + +#: mod/item.php:904 +msgid "System error. Post not saved." +msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." + +#: mod/item.php:995 +#, php-format +msgid "" +"This message was sent to you by %s, a member of the Friendica social " +"network." +msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica." + +#: mod/item.php:997 +#, php-format +msgid "You may visit them online at %s" +msgstr "Du kannst sie online unter %s besuchen" + +#: mod/item.php:998 +msgid "" +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." +msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest." + +#: mod/item.php:1002 +#, php-format +msgid "%s posted an update." +msgstr "%s hat ein Update veröffentlicht." + +#: mod/network.php:200 mod/search.php:28 +msgid "Remove term" +msgstr "Begriff entfernen" + +#: mod/network.php:407 +#, php-format +msgid "" +"Warning: This group contains %s member from a network that doesn't allow non" +" public messages." +msgid_plural "" +"Warning: This group contains %s members from a network that doesn't allow " +"non public messages." +msgstr[0] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann." +msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können." + +#: mod/network.php:410 +msgid "Messages in this group won't be send to these receivers." +msgstr "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden." + +#: mod/network.php:538 +msgid "Private messages to this person are at risk of public disclosure." +msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen." + +#: mod/network.php:543 +msgid "Invalid contact." +msgstr "Ungültiger Kontakt." + +#: mod/network.php:816 +msgid "Commented Order" +msgstr "Neueste Kommentare" + +#: mod/network.php:819 +msgid "Sort by Comment Date" +msgstr "Nach Kommentardatum sortieren" + +#: mod/network.php:824 +msgid "Posted Order" +msgstr "Neueste Beiträge" + +#: mod/network.php:827 +msgid "Sort by Post Date" +msgstr "Nach Beitragsdatum sortieren" + +#: mod/network.php:838 +msgid "Posts that mention or involve you" +msgstr "Beiträge, in denen es um Dich geht" + +#: mod/network.php:846 +msgid "New" +msgstr "Neue" + +#: mod/network.php:849 +msgid "Activity Stream - by date" +msgstr "Aktivitäten-Stream - nach Datum" + +#: mod/network.php:857 +msgid "Shared Links" +msgstr "Geteilte Links" + +#: mod/network.php:860 +msgid "Interesting Links" +msgstr "Interessante Links" + +#: mod/network.php:868 +msgid "Starred" +msgstr "Markierte" + +#: mod/network.php:871 +msgid "Favourite Posts" +msgstr "Favorisierte Beiträge" + #: mod/ping.php:274 msgid "{0} wants to be your friend" msgstr "{0} möchte mit Dir in Kontakt treten" @@ -6281,364 +6525,875 @@ msgstr "{0} schickte Dir eine Nachricht" msgid "{0} requested registration" msgstr "{0} möchte sich registrieren" -#: mod/profile_photo.php:44 -msgid "Image uploaded but image cropping failed." -msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl." - -#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 -#: mod/profile_photo.php:322 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "Verkleinern der Bildgröße von [%s] scheiterte." - -#: mod/profile_photo.php:127 +#: mod/register.php:95 msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." +"Registration successful. Please check your email for further instructions." +msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet." -#: mod/profile_photo.php:136 -msgid "Unable to process image" -msgstr "Bild konnte nicht verarbeitet werden" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "Datei hochladen:" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "Profil auswählen:" - -#: mod/profile_photo.php:256 -msgid "Upload" -msgstr "Hochladen" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "oder" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "diesen Schritt überspringen" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "wähle ein Foto aus deinen Fotoalben" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "Bild zurechtschneiden" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "Bearbeitung abgeschlossen" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "Bild erfolgreich hochgeladen." - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "Profil gelöscht." - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "Profil-" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "Neues Profil angelegt." - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "Profil nicht zum Duplizieren verfügbar." - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "Profilname ist erforderlich." - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "Familienstand" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "Romanze" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "Arbeit / Beschäftigung" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "Religion" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "Politische Ansichten" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "Geschlecht" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "Sexuelle Vorlieben" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "XMPP" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "Webseite" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "Interessen" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "Adresse" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "Wohnort" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "Profil aktualisiert." - -#: mod/profiles.php:567 -msgid " and " -msgstr " und " - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "öffentliches Profil" - -#: mod/profiles.php:579 +#: mod/register.php:100 #, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s hat %2$s geändert auf “%3$s”" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " – %1$ss %2$s besuchen" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "Kontakte und Freunde verbergen" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "Zeige mehr Profil-Felder:" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "Profilaktionen" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "Profil bearbeiten" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "Profilbild ändern" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "Dieses Profil anzeigen" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "Neues Profil anlegen und diese Einstellungen verwenden" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "Dieses Profil duplizieren" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "Dieses Profil löschen" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "Grundinformationen" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "Profilbild" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "Vorlieben" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "Status Informationen" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "Zusätzliche Informationen" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "Beziehung" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "Dein Geschlecht:" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "Beispiel: Fischen Fotografie Software" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "Profilname:" - -#: mod/profiles.php:714 msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." +"Failed to send email message. Here your accout details:<br> login: %s<br> " +"password: %s<br><br>You can change your password after login." +msgstr "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern." -#: mod/profiles.php:715 -msgid "Your Full Name:" -msgstr "Dein kompletter Name:" +#: mod/register.php:107 +msgid "Registration successful." +msgstr "Registrierung erfolgreich." -#: mod/profiles.php:716 -msgid "Title/Description:" -msgstr "Titel/Beschreibung:" +#: mod/register.php:113 +msgid "Your registration can not be processed." +msgstr "Deine Registrierung konnte nicht verarbeitet werden." -#: mod/profiles.php:719 -msgid "Street Address:" -msgstr "Adresse:" +#: mod/register.php:162 +msgid "Your registration is pending approval by the site owner." +msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "Wohnort:" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "Region/Bundesstaat:" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "Postleitzahl:" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "Land:" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "Wer: (falls anwendbar)" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "Seit [Datum]:" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "Erzähle uns ein bisschen von Dir …" - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "XMPP (Jabber) Adresse" - -#: mod/profiles.php:731 +#: mod/register.php:228 msgid "" -"The XMPP address will be propagated to your contacts so that they can follow" -" you." -msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können." +"You may (optionally) fill in this form via OpenID by supplying your OpenID " +"and clicking 'Register'." +msgstr "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst." -#: mod/profiles.php:732 -msgid "Homepage URL:" -msgstr "Adresse der Homepage:" +#: mod/register.php:229 +msgid "" +"If you are not familiar with OpenID, please leave that field blank and fill " +"in the rest of the items." +msgstr "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus." -#: mod/profiles.php:735 -msgid "Religious Views:" -msgstr "Religiöse Ansichten:" +#: mod/register.php:230 +msgid "Your OpenID (optional): " +msgstr "Deine OpenID (optional): " -#: mod/profiles.php:736 -msgid "Public Keywords:" -msgstr "Öffentliche Schlüsselwörter:" +#: mod/register.php:244 +msgid "Include your profile in member directory?" +msgstr "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?" -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" +#: mod/register.php:269 +msgid "Note for the admin" +msgstr "Hinweis für den Admin" -#: mod/profiles.php:737 -msgid "Private Keywords:" -msgstr "Private Schlüsselwörter:" +#: mod/register.php:269 +msgid "Leave a message for the admin, why you want to join this node" +msgstr "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest." -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" -msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" +#: mod/register.php:270 +msgid "Membership on this site is by invitation only." +msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: mod/profiles.php:740 -msgid "Musical interests" -msgstr "Musikalische Interessen" +#: mod/register.php:271 +msgid "Your invitation ID: " +msgstr "ID Deiner Einladung: " -#: mod/profiles.php:741 -msgid "Books, literature" -msgstr "Bücher, Literatur" +#: mod/register.php:274 mod/admin.php:1062 +msgid "Registration" +msgstr "Registrierung" -#: mod/profiles.php:742 -msgid "Television" -msgstr "Fernsehen" +#: mod/register.php:282 +msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " +msgstr "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):" -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" -msgstr "Filme/Tänze/Kultur/Unterhaltung" +#: mod/register.php:283 +msgid "Your Email Address: " +msgstr "Deine E-Mail-Adresse: " -#: mod/profiles.php:744 -msgid "Hobbies/Interests" -msgstr "Hobbies/Interessen" +#: mod/register.php:285 mod/settings.php:1279 +msgid "New Password:" +msgstr "Neues Passwort:" -#: mod/profiles.php:745 -msgid "Love/romance" -msgstr "Liebe/Romantik" +#: mod/register.php:285 +msgid "Leave empty for an auto generated password." +msgstr "Leer lassen um das Passwort automatisch zu generieren." -#: mod/profiles.php:746 -msgid "Work/employment" -msgstr "Arbeit/Anstellung" +#: mod/register.php:286 mod/settings.php:1280 +msgid "Confirm:" +msgstr "Bestätigen:" -#: mod/profiles.php:747 -msgid "School/education" -msgstr "Schule/Ausbildung" +#: mod/register.php:287 +msgid "" +"Choose a profile nickname. This must begin with a text character. Your " +"profile address on this site will then be " +"'<strong>nickname@$sitename</strong>'." +msgstr "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein." -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" -msgstr "Kontaktinformationen und Soziale Netzwerke" +#: mod/register.php:288 +msgid "Choose a nickname: " +msgstr "Spitznamen wählen: " -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" -msgstr "Bearbeite/Verwalte Profile" +#: mod/register.php:298 +msgid "Import your profile to this friendica instance" +msgstr "Importiere Dein Profil auf diese Friendica Instanz" + +#: mod/search.php:103 +msgid "Only logged in users are permitted to perform a search." +msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet." + +#: mod/search.php:127 +msgid "Too Many Requests" +msgstr "Zu viele Abfragen" + +#: mod/search.php:128 +msgid "Only one search per minute is permitted for not logged in users." +msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet." + +#: mod/search.php:228 +#, php-format +msgid "Items tagged with: %s" +msgstr "Beiträge die mit %s getaggt sind" + +#: mod/settings.php:45 mod/admin.php:1496 +msgid "Account" +msgstr "Nutzerkonto" + +#: mod/settings.php:54 mod/admin.php:170 +msgid "Additional features" +msgstr "Zusätzliche Features" + +#: mod/settings.php:62 +msgid "Display" +msgstr "Anzeige" + +#: mod/settings.php:69 mod/settings.php:891 +msgid "Social Networks" +msgstr "Soziale Netzwerke" + +#: mod/settings.php:76 mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 +msgid "Plugins" +msgstr "Plugins" + +#: mod/settings.php:90 +msgid "Connected apps" +msgstr "Verbundene Programme" + +#: mod/settings.php:104 +msgid "Remove account" +msgstr "Konto löschen" + +#: mod/settings.php:159 +msgid "Missing some important data!" +msgstr "Wichtige Daten fehlen!" + +#: mod/settings.php:273 +msgid "Failed to connect with email account using the settings provided." +msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." + +#: mod/settings.php:278 +msgid "Email settings updated." +msgstr "E-Mail Einstellungen bearbeitet." + +#: mod/settings.php:293 +msgid "Features updated" +msgstr "Features aktualisiert" + +#: mod/settings.php:363 +msgid "Relocate message has been send to your contacts" +msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet." + +#: mod/settings.php:382 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." + +#: mod/settings.php:390 +msgid "Wrong password." +msgstr "Falsches Passwort." + +#: mod/settings.php:401 +msgid "Password changed." +msgstr "Passwort geändert." + +#: mod/settings.php:403 +msgid "Password update failed. Please try again." +msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." + +#: mod/settings.php:483 +msgid " Please use a shorter name." +msgstr " Bitte verwende einen kürzeren Namen." + +#: mod/settings.php:485 +msgid " Name too short." +msgstr " Name ist zu kurz." + +#: mod/settings.php:494 +msgid "Wrong Password" +msgstr "Falsches Passwort" + +#: mod/settings.php:499 +msgid " Not valid email." +msgstr " Keine gültige E-Mail." + +#: mod/settings.php:505 +msgid " Cannot change to that email." +msgstr "Ändern der E-Mail nicht möglich. " + +#: mod/settings.php:561 +msgid "Private forum has no privacy permissions. Using default privacy group." +msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt." + +#: mod/settings.php:565 +msgid "Private forum has no privacy permissions and no default privacy group." +msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte." + +#: mod/settings.php:605 +msgid "Settings updated." +msgstr "Einstellungen aktualisiert." + +#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 +msgid "Add application" +msgstr "Programm hinzufügen" + +#: mod/settings.php:682 mod/settings.php:793 mod/settings.php:842 +#: mod/settings.php:909 mod/settings.php:1006 mod/settings.php:1272 +#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 +#: mod/admin.php:2176 +msgid "Save Settings" +msgstr "Einstellungen speichern" + +#: mod/settings.php:685 mod/settings.php:711 +msgid "Consumer Key" +msgstr "Consumer Key" + +#: mod/settings.php:686 mod/settings.php:712 +msgid "Consumer Secret" +msgstr "Consumer Secret" + +#: mod/settings.php:687 mod/settings.php:713 +msgid "Redirect" +msgstr "Umleiten" + +#: mod/settings.php:688 mod/settings.php:714 +msgid "Icon url" +msgstr "Icon URL" + +#: mod/settings.php:699 +msgid "You can't edit this application." +msgstr "Du kannst dieses Programm nicht bearbeiten." + +#: mod/settings.php:742 +msgid "Connected Apps" +msgstr "Verbundene Programme" + +#: mod/settings.php:746 +msgid "Client key starts with" +msgstr "Anwenderschlüssel beginnt mit" + +#: mod/settings.php:747 +msgid "No name" +msgstr "Kein Name" + +#: mod/settings.php:748 +msgid "Remove authorization" +msgstr "Autorisierung entziehen" + +#: mod/settings.php:760 +msgid "No Plugin settings configured" +msgstr "Keine Plugin-Einstellungen konfiguriert" + +#: mod/settings.php:769 +msgid "Plugin Settings" +msgstr "Plugin-Einstellungen" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "Off" +msgstr "Aus" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "On" +msgstr "An" + +#: mod/settings.php:791 +msgid "Additional Features" +msgstr "Zusätzliche Features" + +#: mod/settings.php:801 mod/settings.php:805 +msgid "General Social Media Settings" +msgstr "Allgemeine Einstellungen zu Sozialen Medien" + +#: mod/settings.php:811 +msgid "Disable intelligent shortening" +msgstr "Intelligentes Link kürzen ausschalten" + +#: mod/settings.php:813 +msgid "" +"Normally the system tries to find the best link to add to shortened posts. " +"If this option is enabled then every shortened post will always point to the" +" original friendica post." +msgstr "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt." + +#: mod/settings.php:819 +msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" +msgstr "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen" + +#: mod/settings.php:821 +msgid "" +"If you receive a message from an unknown OStatus user, this option decides " +"what to do. If it is checked, a new contact will be created for every " +"unknown user." +msgstr "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,." + +#: mod/settings.php:827 +msgid "Default group for OStatus contacts" +msgstr "Voreingestellte Gruppe für OStatus Kontakte" + +#: mod/settings.php:835 +msgid "Your legacy GNU Social account" +msgstr "Dein alter GNU Social Account" + +#: mod/settings.php:837 +msgid "" +"If you enter your old GNU Social/Statusnet account name here (in the format " +"user@domain.tld), your contacts will be added automatically. The field will " +"be emptied when done." +msgstr "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden." + +#: mod/settings.php:840 +msgid "Repair OStatus subscriptions" +msgstr "OStatus Abonnements reparieren" + +#: mod/settings.php:849 mod/settings.php:850 +#, php-format +msgid "Built-in support for %s connectivity is %s" +msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "enabled" +msgstr "eingeschaltet" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "disabled" +msgstr "ausgeschaltet" + +#: mod/settings.php:850 +msgid "GNU Social (OStatus)" +msgstr "GNU Social (OStatus)" + +#: mod/settings.php:884 +msgid "Email access is disabled on this site." +msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." + +#: mod/settings.php:896 +msgid "Email/Mailbox Setup" +msgstr "E-Mail/Postfach-Einstellungen" + +#: mod/settings.php:897 +msgid "" +"If you wish to communicate with email contacts using this service " +"(optional), please specify how to connect to your mailbox." +msgstr "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an." + +#: mod/settings.php:898 +msgid "Last successful email check:" +msgstr "Letzter erfolgreicher E-Mail Check" + +#: mod/settings.php:900 +msgid "IMAP server name:" +msgstr "IMAP-Server-Name:" + +#: mod/settings.php:901 +msgid "IMAP port:" +msgstr "IMAP-Port:" + +#: mod/settings.php:902 +msgid "Security:" +msgstr "Sicherheit:" + +#: mod/settings.php:902 mod/settings.php:907 +msgid "None" +msgstr "Keine" + +#: mod/settings.php:903 +msgid "Email login name:" +msgstr "E-Mail-Login-Name:" + +#: mod/settings.php:904 +msgid "Email password:" +msgstr "E-Mail-Passwort:" + +#: mod/settings.php:905 +msgid "Reply-to address:" +msgstr "Reply-to Adresse:" + +#: mod/settings.php:906 +msgid "Send public posts to all email contacts:" +msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" + +#: mod/settings.php:907 +msgid "Action after import:" +msgstr "Aktion nach Import:" + +#: mod/settings.php:907 +msgid "Move to folder" +msgstr "In einen Ordner verschieben" + +#: mod/settings.php:908 +msgid "Move to folder:" +msgstr "In diesen Ordner verschieben:" + +#: mod/settings.php:944 mod/admin.php:948 +msgid "No special theme for mobile devices" +msgstr "Kein spezielles Theme für mobile Geräte verwenden." + +#: mod/settings.php:1004 +msgid "Display Settings" +msgstr "Anzeige-Einstellungen" + +#: mod/settings.php:1010 mod/settings.php:1033 +msgid "Display Theme:" +msgstr "Theme:" + +#: mod/settings.php:1011 +msgid "Mobile Theme:" +msgstr "Mobiles Theme" + +#: mod/settings.php:1012 +msgid "Suppress warning of insecure networks" +msgstr "Warnung wegen unsicheren Netzwerken unterdrücken" + +#: mod/settings.php:1012 +msgid "" +"Should the system suppress the warning that the current group contains " +"members of networks that can't receive non public postings." +msgstr "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können." + +#: mod/settings.php:1013 +msgid "Update browser every xx seconds" +msgstr "Browser alle xx Sekunden aktualisieren" + +#: mod/settings.php:1013 +msgid "Minimum of 10 seconds. Enter -1 to disable it." +msgstr "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten." + +#: mod/settings.php:1014 +msgid "Number of items to display per page:" +msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: " + +#: mod/settings.php:1014 mod/settings.php:1015 +msgid "Maximum of 100 items" +msgstr "Maximal 100 Beiträge" + +#: mod/settings.php:1015 +msgid "Number of items to display per page when viewed from mobile device:" +msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:" + +#: mod/settings.php:1016 +msgid "Don't show emoticons" +msgstr "Keine Smilies anzeigen" + +#: mod/settings.php:1017 +msgid "Calendar" +msgstr "Kalender" + +#: mod/settings.php:1018 +msgid "Beginning of week:" +msgstr "Wochenbeginn:" + +#: mod/settings.php:1019 +msgid "Don't show notices" +msgstr "Info-Popups nicht anzeigen" + +#: mod/settings.php:1020 +msgid "Infinite scroll" +msgstr "Endloses Scrollen" + +#: mod/settings.php:1021 +msgid "Automatic updates only at the top of the network page" +msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist." + +#: mod/settings.php:1022 +msgid "Bandwith Saver Mode" +msgstr "Bandbreiten-Spar-Modus" + +#: mod/settings.php:1022 +msgid "" +"When enabled, embedded content is not displayed on automatic updates, they " +"only show on page reload." +msgstr "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden." + +#: mod/settings.php:1024 +msgid "General Theme Settings" +msgstr "Allgemeine Themeneinstellungen" + +#: mod/settings.php:1025 +msgid "Custom Theme Settings" +msgstr "Benutzerdefinierte Theme Einstellungen" + +#: mod/settings.php:1026 +msgid "Content Settings" +msgstr "Einstellungen zum Inhalt" + +#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 +#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 +#: view/theme/vier/config.php:115 +msgid "Theme settings" +msgstr "Themeneinstellungen" + +#: mod/settings.php:1111 +msgid "Account Types" +msgstr "Kontenarten" + +#: mod/settings.php:1112 +msgid "Personal Page Subtypes" +msgstr "Unterarten der persönlichen Seite" + +#: mod/settings.php:1113 +msgid "Community Forum Subtypes" +msgstr "Unterarten des Gemeinschaftsforums" + +#: mod/settings.php:1120 +msgid "Personal Page" +msgstr "Persönliche Seite" + +#: mod/settings.php:1121 +msgid "Account for a personal profile." +msgstr "Konto für ein persönliches Profil." + +#: mod/settings.php:1124 +msgid "Organisation Page" +msgstr "Organisationsseite" + +#: mod/settings.php:1125 +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt." + +#: mod/settings.php:1128 +msgid "News Page" +msgstr "Nachrichtenseite" + +#: mod/settings.php:1129 +msgid "" +"Account for a news reflector that automatically approves contact requests as" +" \"Followers\"." +msgstr "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt." + +#: mod/settings.php:1132 +msgid "Community Forum" +msgstr "Gemeinschaftsforum" + +#: mod/settings.php:1133 +msgid "Account for community discussions." +msgstr "Konto für Diskussionsforen. " + +#: mod/settings.php:1136 +msgid "Normal Account Page" +msgstr "Normales Konto" + +#: mod/settings.php:1137 +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden." + +#: mod/settings.php:1140 +msgid "Soapbox Page" +msgstr "Marktschreier-Konto" + +#: mod/settings.php:1141 +msgid "" +"Account for a public profile that automatically approves contact requests as" +" \"Followers\"." +msgstr "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt." + +#: mod/settings.php:1144 +msgid "Public Forum" +msgstr "Öffentliches Forum" + +#: mod/settings.php:1145 +msgid "Automatically approves all contact requests." +msgstr "Bestätigt alle Kontaktanfragen automatisch." + +#: mod/settings.php:1148 +msgid "Automatic Friend Page" +msgstr "Automatische Freunde Seite" + +#: mod/settings.php:1149 +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt." + +#: mod/settings.php:1152 +msgid "Private Forum [Experimental]" +msgstr "Privates Forum [Versuchsstadium]" + +#: mod/settings.php:1153 +msgid "Requires manual approval of contact requests." +msgstr "Kontaktanfragen müssen manuell bestätigt werden." + +#: mod/settings.php:1164 +msgid "OpenID:" +msgstr "OpenID:" + +#: mod/settings.php:1164 +msgid "(Optional) Allow this OpenID to login to this account." +msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID." + +#: mod/settings.php:1172 +msgid "Publish your default profile in your local site directory?" +msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?" + +#: mod/settings.php:1172 +msgid "Your profile may be visible in public." +msgstr "Dein Profil könnte öffentlich abrufbar sein." + +#: mod/settings.php:1178 +msgid "Publish your default profile in the global social directory?" +msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?" + +#: mod/settings.php:1185 +msgid "Hide your contact/friend list from viewers of your default profile?" +msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" + +#: mod/settings.php:1189 +msgid "" +"If enabled, posting public messages to Diaspora and other networks isn't " +"possible." +msgstr "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich" + +#: mod/settings.php:1194 +msgid "Allow friends to post to your profile page?" +msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?" + +#: mod/settings.php:1199 +msgid "Allow friends to tag your posts?" +msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?" + +#: mod/settings.php:1204 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" + +#: mod/settings.php:1209 +msgid "Permit unknown people to send you private mail?" +msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?" + +#: mod/settings.php:1217 +msgid "Profile is <strong>not published</strong>." +msgstr "Profil ist <strong>nicht veröffentlicht</strong>." + +#: mod/settings.php:1225 +#, php-format +msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." +msgstr "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'." + +#: mod/settings.php:1232 +msgid "Automatically expire posts after this many days:" +msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:" + +#: mod/settings.php:1232 +msgid "If empty, posts will not expire. Expired posts will be deleted" +msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." + +#: mod/settings.php:1233 +msgid "Advanced expiration settings" +msgstr "Erweiterte Verfallseinstellungen" + +#: mod/settings.php:1234 +msgid "Advanced Expiration" +msgstr "Erweitertes Verfallen" + +#: mod/settings.php:1235 +msgid "Expire posts:" +msgstr "Beiträge verfallen lassen:" + +#: mod/settings.php:1236 +msgid "Expire personal notes:" +msgstr "Persönliche Notizen verfallen lassen:" + +#: mod/settings.php:1237 +msgid "Expire starred posts:" +msgstr "Markierte Beiträge verfallen lassen:" + +#: mod/settings.php:1238 +msgid "Expire photos:" +msgstr "Fotos verfallen lassen:" + +#: mod/settings.php:1239 +msgid "Only expire posts by others:" +msgstr "Nur Beiträge anderer verfallen:" + +#: mod/settings.php:1270 +msgid "Account Settings" +msgstr "Kontoeinstellungen" + +#: mod/settings.php:1278 +msgid "Password Settings" +msgstr "Passwort-Einstellungen" + +#: mod/settings.php:1280 +msgid "Leave password fields blank unless changing" +msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern" + +#: mod/settings.php:1281 +msgid "Current Password:" +msgstr "Aktuelles Passwort:" + +#: mod/settings.php:1281 mod/settings.php:1282 +msgid "Your current password to confirm the changes" +msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen" + +#: mod/settings.php:1282 +msgid "Password:" +msgstr "Passwort:" + +#: mod/settings.php:1286 +msgid "Basic Settings" +msgstr "Grundeinstellungen" + +#: mod/settings.php:1288 +msgid "Email Address:" +msgstr "E-Mail-Adresse:" + +#: mod/settings.php:1289 +msgid "Your Timezone:" +msgstr "Deine Zeitzone:" + +#: mod/settings.php:1290 +msgid "Your Language:" +msgstr "Deine Sprache:" + +#: mod/settings.php:1290 +msgid "" +"Set the language we use to show you friendica interface and to send you " +"emails" +msgstr "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken" + +#: mod/settings.php:1291 +msgid "Default Post Location:" +msgstr "Standardstandort:" + +#: mod/settings.php:1292 +msgid "Use Browser Location:" +msgstr "Standort des Browsers verwenden:" + +#: mod/settings.php:1295 +msgid "Security and Privacy Settings" +msgstr "Sicherheits- und Privatsphäre-Einstellungen" + +#: mod/settings.php:1297 +msgid "Maximum Friend Requests/Day:" +msgstr "Maximale Anzahl vonKontaktanfragen/Tag:" + +#: mod/settings.php:1297 mod/settings.php:1327 +msgid "(to prevent spam abuse)" +msgstr "(um SPAM zu vermeiden)" + +#: mod/settings.php:1298 +msgid "Default Post Permissions" +msgstr "Standard-Zugriffsrechte für Beiträge" + +#: mod/settings.php:1299 +msgid "(click to open/close)" +msgstr "(klicke zum öffnen/schließen)" + +#: mod/settings.php:1310 +msgid "Default Private Post" +msgstr "Privater Standardbeitrag" + +#: mod/settings.php:1311 +msgid "Default Public Post" +msgstr "Öffentlicher Standardbeitrag" + +#: mod/settings.php:1315 +msgid "Default Permissions for New Posts" +msgstr "Standardberechtigungen für neue Beiträge" + +#: mod/settings.php:1327 +msgid "Maximum private messages per day from unknown people:" +msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:" + +#: mod/settings.php:1330 +msgid "Notification Settings" +msgstr "Benachrichtigungseinstellungen" + +#: mod/settings.php:1331 +msgid "By default post a status message when:" +msgstr "Standardmäßig eine Statusnachricht posten, wenn:" + +#: mod/settings.php:1332 +msgid "accepting a friend request" +msgstr "– Du eine Kontaktanfrage akzeptierst" + +#: mod/settings.php:1333 +msgid "joining a forum/community" +msgstr "– Du einem Forum/einer Gemeinschaftsseite beitrittst" + +#: mod/settings.php:1334 +msgid "making an <em>interesting</em> profile change" +msgstr "– Du eine <em>interessante</em> Änderung an Deinem Profil durchführst" + +#: mod/settings.php:1335 +msgid "Send a notification email when:" +msgstr "Benachrichtigungs-E-Mail senden wenn:" + +#: mod/settings.php:1336 +msgid "You receive an introduction" +msgstr "– Du eine Kontaktanfrage erhältst" + +#: mod/settings.php:1337 +msgid "Your introductions are confirmed" +msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde" + +#: mod/settings.php:1338 +msgid "Someone writes on your profile wall" +msgstr "– jemand etwas auf Deine Pinnwand schreibt" + +#: mod/settings.php:1339 +msgid "Someone writes a followup comment" +msgstr "– jemand auch einen Kommentar verfasst" + +#: mod/settings.php:1340 +msgid "You receive a private message" +msgstr "– Du eine private Nachricht erhältst" + +#: mod/settings.php:1341 +msgid "You receive a friend suggestion" +msgstr "– Du eine Empfehlung erhältst" + +#: mod/settings.php:1342 +msgid "You are tagged in a post" +msgstr "– Du in einem Beitrag erwähnt wirst" + +#: mod/settings.php:1343 +msgid "You are poked/prodded/etc. in a post" +msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst" + +#: mod/settings.php:1345 +msgid "Activate desktop notifications" +msgstr "Desktop Benachrichtigungen einschalten" + +#: mod/settings.php:1345 +msgid "Show desktop popup on new notifications" +msgstr "Desktop Benachrichtigungen einschalten" + +#: mod/settings.php:1347 +msgid "Text-only notification emails" +msgstr "Benachrichtigungs E-Mail als Rein-Text." + +#: mod/settings.php:1349 +msgid "Send text only notification emails, without the html part" +msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil" + +#: mod/settings.php:1351 +msgid "Advanced Account/Page Type Settings" +msgstr "Erweiterte Konto-/Seitentyp-Einstellungen" + +#: mod/settings.php:1352 +msgid "Change the behaviour of this account for special situations" +msgstr "Verhalten dieses Kontos in bestimmten Situationen:" + +#: mod/settings.php:1355 +msgid "Relocate" +msgstr "Umziehen" + +#: mod/settings.php:1356 +msgid "" +"If you have moved this profile from another server, and some of your " +"contacts don't receive your updates, try pushing this button." +msgstr "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button." + +#: mod/settings.php:1357 +msgid "Resend relocate message to contacts" +msgstr "Umzugsbenachrichtigung erneut an Kontakte senden" #: mod/admin.php:97 msgid "Theme settings updated." @@ -6652,18 +7407,10 @@ msgstr "Seite" msgid "Users" msgstr "Nutzer" -#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76 -msgid "Plugins" -msgstr "Plugins" - #: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 msgid "Themes" msgstr "Themen" -#: mod/admin.php:170 mod/settings.php:54 -msgid "Additional features" -msgstr "Zusätzliche Features" - #: mod/admin.php:171 msgid "DB updates" msgstr "DB Updates" @@ -6863,12 +7610,12 @@ msgid "Normal Account" msgstr "Normales Konto" #: mod/admin.php:561 mod/admin.php:1454 -msgid "Soapbox Account" -msgstr "Marktschreier-Konto" +msgid "Automatic Follower Account" +msgstr "Automatisc Folgender Account" #: mod/admin.php:562 mod/admin.php:1455 -msgid "Community/Celebrity Account" -msgstr "Forum/Promi-Konto" +msgid "Public Forum Account" +msgstr "Öffentliche Gemeinschaftsforen Accoun" #: mod/admin.php:563 mod/admin.php:1456 msgid "Automatic Friend Account" @@ -6879,8 +7626,8 @@ msgid "Blog Account" msgstr "Blog-Konto" #: mod/admin.php:565 -msgid "Private Forum" -msgstr "Privates Forum" +msgid "Private Forum Account" +msgstr "Private Gemeinschaftsforen Accoun" #: mod/admin.php:587 msgid "Message queues" @@ -6914,10 +7661,6 @@ msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <p msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: mod/admin.php:948 mod/settings.php:944 -msgid "No special theme for mobile devices" -msgstr "Kein spezielles Theme für mobile Geräte verwenden." - #: mod/admin.php:977 msgid "No community page" msgstr "Keine Gemeinschaftsseite" @@ -6986,13 +7729,6 @@ msgstr "SSL für alle Links erzwingen" msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)" -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793 -#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006 -#: mod/settings.php:1272 -msgid "Save Settings" -msgstr "Einstellungen speichern" - #: mod/admin.php:1063 msgid "File upload" msgstr "Datei hochladen" @@ -7817,10 +8553,6 @@ msgstr "Letzte Anmeldung" msgid "Last item" msgstr "Letzter Beitrag" -#: mod/admin.php:1496 mod/settings.php:45 -msgid "Account" -msgstr "Nutzerkonto" - #: mod/admin.php:1505 msgid "Add User" msgstr "Nutzer hinzufügen" @@ -8011,14 +8743,6 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest, Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie." -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "Off" -msgstr "Aus" - -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "On" -msgstr "An" - #: mod/admin.php:2166 #, php-format msgid "Lock feature %s" @@ -8028,733 +8752,18 @@ msgstr "Feature festlegen: %s" msgid "Manage Additional Features" msgstr "Zusätzliche Features Verwalten" -#: mod/settings.php:62 -msgid "Display" -msgstr "Anzeige" - -#: mod/settings.php:69 mod/settings.php:891 -msgid "Social Networks" -msgstr "Soziale Netzwerke" - -#: mod/settings.php:90 -msgid "Connected apps" -msgstr "Verbundene Programme" - -#: mod/settings.php:104 -msgid "Remove account" -msgstr "Konto löschen" - -#: mod/settings.php:159 -msgid "Missing some important data!" -msgstr "Wichtige Daten fehlen!" - -#: mod/settings.php:273 -msgid "Failed to connect with email account using the settings provided." -msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." - -#: mod/settings.php:278 -msgid "Email settings updated." -msgstr "E-Mail Einstellungen bearbeitet." - -#: mod/settings.php:293 -msgid "Features updated" -msgstr "Features aktualisiert" - -#: mod/settings.php:363 -msgid "Relocate message has been send to your contacts" -msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet." - -#: mod/settings.php:382 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." - -#: mod/settings.php:390 -msgid "Wrong password." -msgstr "Falsches Passwort." - -#: mod/settings.php:401 -msgid "Password changed." -msgstr "Passwort geändert." - -#: mod/settings.php:403 -msgid "Password update failed. Please try again." -msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." - -#: mod/settings.php:483 -msgid " Please use a shorter name." -msgstr " Bitte verwende einen kürzeren Namen." - -#: mod/settings.php:485 -msgid " Name too short." -msgstr " Name ist zu kurz." - -#: mod/settings.php:494 -msgid "Wrong Password" -msgstr "Falsches Passwort" - -#: mod/settings.php:499 -msgid " Not valid email." -msgstr " Keine gültige E-Mail." - -#: mod/settings.php:505 -msgid " Cannot change to that email." -msgstr "Ändern der E-Mail nicht möglich. " - -#: mod/settings.php:561 -msgid "Private forum has no privacy permissions. Using default privacy group." -msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt." - -#: mod/settings.php:565 -msgid "Private forum has no privacy permissions and no default privacy group." -msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte." - -#: mod/settings.php:605 -msgid "Settings updated." -msgstr "Einstellungen aktualisiert." - -#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 -msgid "Add application" -msgstr "Programm hinzufügen" - -#: mod/settings.php:685 mod/settings.php:711 -msgid "Consumer Key" -msgstr "Consumer Key" - -#: mod/settings.php:686 mod/settings.php:712 -msgid "Consumer Secret" -msgstr "Consumer Secret" - -#: mod/settings.php:687 mod/settings.php:713 -msgid "Redirect" -msgstr "Umleiten" - -#: mod/settings.php:688 mod/settings.php:714 -msgid "Icon url" -msgstr "Icon URL" - -#: mod/settings.php:699 -msgid "You can't edit this application." -msgstr "Du kannst dieses Programm nicht bearbeiten." - -#: mod/settings.php:742 -msgid "Connected Apps" -msgstr "Verbundene Programme" - -#: mod/settings.php:746 -msgid "Client key starts with" -msgstr "Anwenderschlüssel beginnt mit" - -#: mod/settings.php:747 -msgid "No name" -msgstr "Kein Name" - -#: mod/settings.php:748 -msgid "Remove authorization" -msgstr "Autorisierung entziehen" - -#: mod/settings.php:760 -msgid "No Plugin settings configured" -msgstr "Keine Plugin-Einstellungen konfiguriert" - -#: mod/settings.php:769 -msgid "Plugin Settings" -msgstr "Plugin-Einstellungen" - -#: mod/settings.php:791 -msgid "Additional Features" -msgstr "Zusätzliche Features" - -#: mod/settings.php:801 mod/settings.php:805 -msgid "General Social Media Settings" -msgstr "Allgemeine Einstellungen zu Sozialen Medien" - -#: mod/settings.php:811 -msgid "Disable intelligent shortening" -msgstr "Intelligentes Link kürzen ausschalten" - -#: mod/settings.php:813 -msgid "" -"Normally the system tries to find the best link to add to shortened posts. " -"If this option is enabled then every shortened post will always point to the" -" original friendica post." -msgstr "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt." - -#: mod/settings.php:819 -msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" -msgstr "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen" - -#: mod/settings.php:821 -msgid "" -"If you receive a message from an unknown OStatus user, this option decides " -"what to do. If it is checked, a new contact will be created for every " -"unknown user." -msgstr "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,." - -#: mod/settings.php:827 -msgid "Default group for OStatus contacts" -msgstr "Voreingestellte Gruppe für OStatus Kontakte" - -#: mod/settings.php:835 -msgid "Your legacy GNU Social account" -msgstr "Dein alter GNU Social Account" - -#: mod/settings.php:837 -msgid "" -"If you enter your old GNU Social/Statusnet account name here (in the format " -"user@domain.tld), your contacts will be added automatically. The field will " -"be emptied when done." -msgstr "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden." - -#: mod/settings.php:840 -msgid "Repair OStatus subscriptions" -msgstr "OStatus Abonnements reparieren" - -#: mod/settings.php:849 mod/settings.php:850 -#, php-format -msgid "Built-in support for %s connectivity is %s" -msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "enabled" -msgstr "eingeschaltet" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "disabled" -msgstr "ausgeschaltet" - -#: mod/settings.php:850 -msgid "GNU Social (OStatus)" -msgstr "GNU Social (OStatus)" - -#: mod/settings.php:884 -msgid "Email access is disabled on this site." -msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." - -#: mod/settings.php:896 -msgid "Email/Mailbox Setup" -msgstr "E-Mail/Postfach-Einstellungen" - -#: mod/settings.php:897 -msgid "" -"If you wish to communicate with email contacts using this service " -"(optional), please specify how to connect to your mailbox." -msgstr "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an." - -#: mod/settings.php:898 -msgid "Last successful email check:" -msgstr "Letzter erfolgreicher E-Mail Check" - -#: mod/settings.php:900 -msgid "IMAP server name:" -msgstr "IMAP-Server-Name:" - -#: mod/settings.php:901 -msgid "IMAP port:" -msgstr "IMAP-Port:" - -#: mod/settings.php:902 -msgid "Security:" -msgstr "Sicherheit:" - -#: mod/settings.php:902 mod/settings.php:907 -msgid "None" -msgstr "Keine" - -#: mod/settings.php:903 -msgid "Email login name:" -msgstr "E-Mail-Login-Name:" - -#: mod/settings.php:904 -msgid "Email password:" -msgstr "E-Mail-Passwort:" - -#: mod/settings.php:905 -msgid "Reply-to address:" -msgstr "Reply-to Adresse:" - -#: mod/settings.php:906 -msgid "Send public posts to all email contacts:" -msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" - -#: mod/settings.php:907 -msgid "Action after import:" -msgstr "Aktion nach Import:" - -#: mod/settings.php:907 -msgid "Move to folder" -msgstr "In einen Ordner verschieben" - -#: mod/settings.php:908 -msgid "Move to folder:" -msgstr "In diesen Ordner verschieben:" - -#: mod/settings.php:1004 -msgid "Display Settings" -msgstr "Anzeige-Einstellungen" - -#: mod/settings.php:1010 mod/settings.php:1033 -msgid "Display Theme:" -msgstr "Theme:" - -#: mod/settings.php:1011 -msgid "Mobile Theme:" -msgstr "Mobiles Theme" - -#: mod/settings.php:1012 -msgid "Suppress warning of insecure networks" -msgstr "Warnung wegen unsicheren Netzwerken unterdrücken" - -#: mod/settings.php:1012 -msgid "" -"Should the system suppress the warning that the current group contains " -"members of networks that can't receive non public postings." -msgstr "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können." - -#: mod/settings.php:1013 -msgid "Update browser every xx seconds" -msgstr "Browser alle xx Sekunden aktualisieren" - -#: mod/settings.php:1013 -msgid "Minimum of 10 seconds. Enter -1 to disable it." -msgstr "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten." - -#: mod/settings.php:1014 -msgid "Number of items to display per page:" -msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: " - -#: mod/settings.php:1014 mod/settings.php:1015 -msgid "Maximum of 100 items" -msgstr "Maximal 100 Beiträge" - -#: mod/settings.php:1015 -msgid "Number of items to display per page when viewed from mobile device:" -msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:" - -#: mod/settings.php:1016 -msgid "Don't show emoticons" -msgstr "Keine Smilies anzeigen" - -#: mod/settings.php:1017 -msgid "Calendar" -msgstr "Kalender" - -#: mod/settings.php:1018 -msgid "Beginning of week:" -msgstr "Wochenbeginn:" - -#: mod/settings.php:1019 -msgid "Don't show notices" -msgstr "Info-Popups nicht anzeigen" - -#: mod/settings.php:1020 -msgid "Infinite scroll" -msgstr "Endloses Scrollen" - -#: mod/settings.php:1021 -msgid "Automatic updates only at the top of the network page" -msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist." - -#: mod/settings.php:1022 -msgid "Bandwith Saver Mode" -msgstr "Bandbreiten-Spar-Modus" - -#: mod/settings.php:1022 -msgid "" -"When enabled, embedded content is not displayed on automatic updates, they " -"only show on page reload." -msgstr "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden." - -#: mod/settings.php:1024 -msgid "General Theme Settings" -msgstr "Allgemeine Themeneinstellungen" - -#: mod/settings.php:1025 -msgid "Custom Theme Settings" -msgstr "Benutzerdefinierte Theme Einstellungen" - -#: mod/settings.php:1026 -msgid "Content Settings" -msgstr "Einstellungen zum Inhalt" - -#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 -#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 -#: view/theme/vier/config.php:115 -msgid "Theme settings" -msgstr "Themeneinstellungen" - -#: mod/settings.php:1111 -msgid "Account Types" -msgstr "Kontenarten" - -#: mod/settings.php:1112 -msgid "Personal Page Subtypes" -msgstr "Unterarten der persönlichen Seite" - -#: mod/settings.php:1113 -msgid "Community Forum Subtypes" -msgstr "Unterarten des Gemeinschaftsforums" - -#: mod/settings.php:1120 -msgid "Personal Page" -msgstr "Persönliche Seite" - -#: mod/settings.php:1121 -msgid "Account for a personal profile." -msgstr "Konto für ein persönliches Profil." - -#: mod/settings.php:1124 -msgid "Organisation Page" -msgstr "Organisationsseite" - -#: mod/settings.php:1125 -msgid "" -"Account for an organisation that automatically approves contact requests as " -"\"Followers\"." -msgstr "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt." - -#: mod/settings.php:1128 -msgid "News Page" -msgstr "Nachrichtenseite" - -#: mod/settings.php:1129 -msgid "" -"Account for a news reflector that automatically approves contact requests as" -" \"Followers\"." -msgstr "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt." - -#: mod/settings.php:1132 -msgid "Community Forum" -msgstr "Gemeinschaftsforum" - -#: mod/settings.php:1133 -msgid "Account for community discussions." -msgstr "Konto für Diskussionsforen. " - -#: mod/settings.php:1136 -msgid "Normal Account Page" -msgstr "Normales Konto" - -#: mod/settings.php:1137 -msgid "" -"Account for a regular personal profile that requires manual approval of " -"\"Friends\" and \"Followers\"." -msgstr "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden." - -#: mod/settings.php:1140 -msgid "Soapbox Page" -msgstr "Marktschreier-Konto" - -#: mod/settings.php:1141 -msgid "" -"Account for a public profile that automatically approves contact requests as" -" \"Followers\"." -msgstr "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt." - -#: mod/settings.php:1144 -msgid "Public Forum" -msgstr "Öffentliches Forum" - -#: mod/settings.php:1145 -msgid "Automatically approves all contact requests." -msgstr "Bestätigt alle Kontaktanfragen automatisch." - -#: mod/settings.php:1148 -msgid "Automatic Friend Page" -msgstr "Automatische Freunde Seite" - -#: mod/settings.php:1149 -msgid "" -"Account for a popular profile that automatically approves contact requests " -"as \"Friends\"." -msgstr "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt." - -#: mod/settings.php:1152 -msgid "Private Forum [Experimental]" -msgstr "Privates Forum [Versuchsstadium]" - -#: mod/settings.php:1153 -msgid "Requires manual approval of contact requests." -msgstr "Kontaktanfragen müssen manuell bestätigt werden." - -#: mod/settings.php:1164 -msgid "OpenID:" -msgstr "OpenID:" - -#: mod/settings.php:1164 -msgid "(Optional) Allow this OpenID to login to this account." -msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID." - -#: mod/settings.php:1172 -msgid "Publish your default profile in your local site directory?" -msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?" - -#: mod/settings.php:1172 -msgid "Your profile may be visible in public." -msgstr "Dein Profil könnte öffentlich abrufbar sein." - -#: mod/settings.php:1178 -msgid "Publish your default profile in the global social directory?" -msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?" - -#: mod/settings.php:1185 -msgid "Hide your contact/friend list from viewers of your default profile?" -msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" - -#: mod/settings.php:1189 -msgid "" -"If enabled, posting public messages to Diaspora and other networks isn't " -"possible." -msgstr "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich" - -#: mod/settings.php:1194 -msgid "Allow friends to post to your profile page?" -msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?" - -#: mod/settings.php:1199 -msgid "Allow friends to tag your posts?" -msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?" - -#: mod/settings.php:1204 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" - -#: mod/settings.php:1209 -msgid "Permit unknown people to send you private mail?" -msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?" - -#: mod/settings.php:1217 -msgid "Profile is <strong>not published</strong>." -msgstr "Profil ist <strong>nicht veröffentlicht</strong>." - -#: mod/settings.php:1225 -#, php-format -msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." -msgstr "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'." - -#: mod/settings.php:1232 -msgid "Automatically expire posts after this many days:" -msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:" - -#: mod/settings.php:1232 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." - -#: mod/settings.php:1233 -msgid "Advanced expiration settings" -msgstr "Erweiterte Verfallseinstellungen" - -#: mod/settings.php:1234 -msgid "Advanced Expiration" -msgstr "Erweitertes Verfallen" - -#: mod/settings.php:1235 -msgid "Expire posts:" -msgstr "Beiträge verfallen lassen:" - -#: mod/settings.php:1236 -msgid "Expire personal notes:" -msgstr "Persönliche Notizen verfallen lassen:" - -#: mod/settings.php:1237 -msgid "Expire starred posts:" -msgstr "Markierte Beiträge verfallen lassen:" - -#: mod/settings.php:1238 -msgid "Expire photos:" -msgstr "Fotos verfallen lassen:" - -#: mod/settings.php:1239 -msgid "Only expire posts by others:" -msgstr "Nur Beiträge anderer verfallen:" - -#: mod/settings.php:1270 -msgid "Account Settings" -msgstr "Kontoeinstellungen" - -#: mod/settings.php:1278 -msgid "Password Settings" -msgstr "Passwort-Einstellungen" - -#: mod/settings.php:1280 -msgid "Leave password fields blank unless changing" -msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern" - -#: mod/settings.php:1281 -msgid "Current Password:" -msgstr "Aktuelles Passwort:" - -#: mod/settings.php:1281 mod/settings.php:1282 -msgid "Your current password to confirm the changes" -msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen" - -#: mod/settings.php:1282 -msgid "Password:" -msgstr "Passwort:" - -#: mod/settings.php:1286 -msgid "Basic Settings" -msgstr "Grundeinstellungen" - -#: mod/settings.php:1288 -msgid "Email Address:" -msgstr "E-Mail-Adresse:" - -#: mod/settings.php:1289 -msgid "Your Timezone:" -msgstr "Deine Zeitzone:" - -#: mod/settings.php:1290 -msgid "Your Language:" -msgstr "Deine Sprache:" - -#: mod/settings.php:1290 -msgid "" -"Set the language we use to show you friendica interface and to send you " -"emails" -msgstr "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken" - -#: mod/settings.php:1291 -msgid "Default Post Location:" -msgstr "Standardstandort:" - -#: mod/settings.php:1292 -msgid "Use Browser Location:" -msgstr "Standort des Browsers verwenden:" - -#: mod/settings.php:1295 -msgid "Security and Privacy Settings" -msgstr "Sicherheits- und Privatsphäre-Einstellungen" - -#: mod/settings.php:1297 -msgid "Maximum Friend Requests/Day:" -msgstr "Maximale Anzahl vonKontaktanfragen/Tag:" - -#: mod/settings.php:1297 mod/settings.php:1327 -msgid "(to prevent spam abuse)" -msgstr "(um SPAM zu vermeiden)" - -#: mod/settings.php:1298 -msgid "Default Post Permissions" -msgstr "Standard-Zugriffsrechte für Beiträge" - -#: mod/settings.php:1299 -msgid "(click to open/close)" -msgstr "(klicke zum öffnen/schließen)" - -#: mod/settings.php:1310 -msgid "Default Private Post" -msgstr "Privater Standardbeitrag" - -#: mod/settings.php:1311 -msgid "Default Public Post" -msgstr "Öffentlicher Standardbeitrag" - -#: mod/settings.php:1315 -msgid "Default Permissions for New Posts" -msgstr "Standardberechtigungen für neue Beiträge" - -#: mod/settings.php:1327 -msgid "Maximum private messages per day from unknown people:" -msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:" - -#: mod/settings.php:1330 -msgid "Notification Settings" -msgstr "Benachrichtigungseinstellungen" - -#: mod/settings.php:1331 -msgid "By default post a status message when:" -msgstr "Standardmäßig eine Statusnachricht posten, wenn:" - -#: mod/settings.php:1332 -msgid "accepting a friend request" -msgstr "– Du eine Kontaktanfrage akzeptierst" - -#: mod/settings.php:1333 -msgid "joining a forum/community" -msgstr "– Du einem Forum/einer Gemeinschaftsseite beitrittst" - -#: mod/settings.php:1334 -msgid "making an <em>interesting</em> profile change" -msgstr "– Du eine <em>interessante</em> Änderung an Deinem Profil durchführst" - -#: mod/settings.php:1335 -msgid "Send a notification email when:" -msgstr "Benachrichtigungs-E-Mail senden wenn:" - -#: mod/settings.php:1336 -msgid "You receive an introduction" -msgstr "– Du eine Kontaktanfrage erhältst" - -#: mod/settings.php:1337 -msgid "Your introductions are confirmed" -msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde" - -#: mod/settings.php:1338 -msgid "Someone writes on your profile wall" -msgstr "– jemand etwas auf Deine Pinnwand schreibt" - -#: mod/settings.php:1339 -msgid "Someone writes a followup comment" -msgstr "– jemand auch einen Kommentar verfasst" - -#: mod/settings.php:1340 -msgid "You receive a private message" -msgstr "– Du eine private Nachricht erhältst" - -#: mod/settings.php:1341 -msgid "You receive a friend suggestion" -msgstr "– Du eine Empfehlung erhältst" - -#: mod/settings.php:1342 -msgid "You are tagged in a post" -msgstr "– Du in einem Beitrag erwähnt wirst" - -#: mod/settings.php:1343 -msgid "You are poked/prodded/etc. in a post" -msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst" - -#: mod/settings.php:1345 -msgid "Activate desktop notifications" -msgstr "Desktop Benachrichtigungen einschalten" - -#: mod/settings.php:1345 -msgid "Show desktop popup on new notifications" -msgstr "Desktop Benachrichtigungen einschalten" - -#: mod/settings.php:1347 -msgid "Text-only notification emails" -msgstr "Benachrichtigungs E-Mail als Rein-Text." - -#: mod/settings.php:1349 -msgid "Send text only notification emails, without the html part" -msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil" - -#: mod/settings.php:1351 -msgid "Advanced Account/Page Type Settings" -msgstr "Erweiterte Konto-/Seitentyp-Einstellungen" - -#: mod/settings.php:1352 -msgid "Change the behaviour of this account for special situations" -msgstr "Verhalten dieses Kontos in bestimmten Situationen:" - -#: mod/settings.php:1355 -msgid "Relocate" -msgstr "Umziehen" - -#: mod/settings.php:1356 -msgid "" -"If you have moved this profile from another server, and some of your " -"contacts don't receive your updates, try pushing this button." -msgstr "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button." - -#: mod/settings.php:1357 -msgid "Resend relocate message to contacts" -msgstr "Umzugsbenachrichtigung erneut an Kontakte senden" - #: object/Item.php:356 msgid "via" msgstr "via" +#: src/App.php:506 +msgid "Delete this item?" +msgstr "Diesen Beitrag löschen?" + +#: src/App.php:508 +msgid "show fewer" +msgstr "weniger anzeigen" + #: view/theme/duepuntozero/config.php:47 msgid "greenzero" msgstr "greenzero" @@ -8783,38 +8792,6 @@ msgstr "slackr" msgid "Variations" msgstr "Variationen" -#: view/theme/frio/php/Image.php:23 -msgid "Repeat the image" -msgstr "Bild wiederholen" - -#: view/theme/frio/php/Image.php:23 -msgid "Will repeat your image to fill the background." -msgstr "Wiederholt das Bild um den Hintergrund auszufüllen." - -#: view/theme/frio/php/Image.php:25 -msgid "Stretch" -msgstr "Strecken" - -#: view/theme/frio/php/Image.php:25 -msgid "Will stretch to width/height of the image." -msgstr "Streckt Breite/Höhe des Bildes." - -#: view/theme/frio/php/Image.php:27 -msgid "Resize fill and-clip" -msgstr "Größe anpassen - Ausfüllen und abschneiden" - -#: view/theme/frio/php/Image.php:27 -msgid "Resize to fill and retain aspect ratio." -msgstr "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten" - -#: view/theme/frio/php/Image.php:29 -msgid "Resize best fit" -msgstr "Größe anpassen - Optimale Größe" - -#: view/theme/frio/php/Image.php:29 -msgid "Resize to best fit and retain aspect ratio." -msgstr "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten" - #: view/theme/frio/config.php:50 msgid "Default" msgstr "Standard" @@ -8855,6 +8832,38 @@ msgstr "Transparanz des Hintergrunds von Beiträgem" msgid "Set the background image" msgstr "Hintergrundbild festlegen" +#: view/theme/frio/php/Image.php:23 +msgid "Repeat the image" +msgstr "Bild wiederholen" + +#: view/theme/frio/php/Image.php:23 +msgid "Will repeat your image to fill the background." +msgstr "Wiederholt das Bild um den Hintergrund auszufüllen." + +#: view/theme/frio/php/Image.php:25 +msgid "Stretch" +msgstr "Strecken" + +#: view/theme/frio/php/Image.php:25 +msgid "Will stretch to width/height of the image." +msgstr "Streckt Breite/Höhe des Bildes." + +#: view/theme/frio/php/Image.php:27 +msgid "Resize fill and-clip" +msgstr "Größe anpassen - Ausfüllen und abschneiden" + +#: view/theme/frio/php/Image.php:27 +msgid "Resize to fill and retain aspect ratio." +msgstr "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize best fit" +msgstr "Größe anpassen - Optimale Größe" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize to best fit and retain aspect ratio." +msgstr "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten" + #: view/theme/frio/theme.php:228 msgid "Guest" msgstr "Gast" @@ -8927,55 +8936,47 @@ msgstr "Lokales Verzeichnis" msgid "Quick Start" msgstr "Schnell-Start" -#: src/App.php:505 -msgid "Delete this item?" -msgstr "Diesen Beitrag löschen?" - -#: src/App.php:507 -msgid "show fewer" -msgstr "weniger anzeigen" - -#: index.php:436 -msgid "toggle mobile" -msgstr "auf/von Mobile Ansicht wechseln" - -#: boot.php:733 +#: boot.php:735 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: boot.php:845 +#: boot.php:847 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: boot.php:873 +#: boot.php:875 msgid "Password: " msgstr "Passwort: " -#: boot.php:874 +#: boot.php:876 msgid "Remember me" msgstr "Anmeldedaten merken" -#: boot.php:877 +#: boot.php:879 msgid "Or login using OpenID: " msgstr "Oder melde Dich mit Deiner OpenID an: " -#: boot.php:883 +#: boot.php:885 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: boot.php:886 +#: boot.php:888 msgid "Website Terms of Service" msgstr "Website Nutzungsbedingungen" -#: boot.php:887 +#: boot.php:889 msgid "terms of service" msgstr "Nutzungsbedingungen" -#: boot.php:889 +#: boot.php:891 msgid "Website Privacy Policy" msgstr "Website Datenschutzerklärung" -#: boot.php:890 +#: boot.php:892 msgid "privacy policy" msgstr "Datenschutzerklärung" + +#: index.php:436 +msgid "toggle mobile" +msgstr "auf/von Mobile Ansicht wechseln" diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index 64428b8592..58d84f30cb 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -5,35 +5,83 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; -$a->strings["Block immediately"] = "Sofort blockieren"; -$a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; -$a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung"; -$a->strings["OK, probably harmless"] = "OK, wahrscheinlich harmlos"; -$a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen"; -$a->strings["Frequently"] = "immer wieder"; -$a->strings["Hourly"] = "Stündlich"; -$a->strings["Twice daily"] = "Zweimal täglich"; -$a->strings["Daily"] = "Täglich"; -$a->strings["Weekly"] = "Wöchentlich"; -$a->strings["Monthly"] = "Monatlich"; -$a->strings["Friendica"] = "Friendica"; -$a->strings["OStatus"] = "OStatus"; -$a->strings["RSS/Atom"] = "RSS/Atom"; -$a->strings["Email"] = "E-Mail"; -$a->strings["Diaspora"] = "Diaspora"; -$a->strings["Facebook"] = "Facebook"; -$a->strings["Zot!"] = "Zott"; -$a->strings["LinkedIn"] = "LinkedIn"; -$a->strings["XMPP/IM"] = "XMPP/Chat"; -$a->strings["MySpace"] = "MySpace"; -$a->strings["Google+"] = "Google+"; -$a->strings["pump.io"] = "pump.io"; -$a->strings["Twitter"] = "Twitter"; -$a->strings["Diaspora Connector"] = "Diaspora"; -$a->strings["GNU Social Connector"] = "GNU social Connector"; -$a->strings["pnut"] = "pnut"; -$a->strings["App.net"] = "App.net"; +$a->strings["Forums"] = "Foren"; +$a->strings["External link to forum"] = "Externer Link zum Forum"; +$a->strings["show more"] = "mehr anzeigen"; +$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i"; +$a->strings["Starts:"] = "Beginnt:"; +$a->strings["Finishes:"] = "Endet:"; +$a->strings["Location:"] = "Ort:"; +$a->strings["Miscellaneous"] = "Verschiedenes"; +$a->strings["Birthday:"] = "Geburtstag:"; +$a->strings["Age: "] = "Alter: "; +$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD oder MM-DD"; +$a->strings["never"] = "nie"; +$a->strings["less than a second ago"] = "vor weniger als einer Sekunde"; +$a->strings["year"] = "Jahr"; +$a->strings["years"] = "Jahre"; +$a->strings["month"] = "Monat"; +$a->strings["months"] = "Monate"; +$a->strings["week"] = "Woche"; +$a->strings["weeks"] = "Wochen"; +$a->strings["day"] = "Tag"; +$a->strings["days"] = "Tage"; +$a->strings["hour"] = "Stunde"; +$a->strings["hours"] = "Stunden"; +$a->strings["minute"] = "Minute"; +$a->strings["minutes"] = "Minuten"; +$a->strings["second"] = "Sekunde"; +$a->strings["seconds"] = "Sekunden"; +$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her"; +$a->strings["%s's birthday"] = "%ss Geburtstag"; +$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; +$a->strings["all-day"] = "ganztägig"; +$a->strings["Sun"] = "So"; +$a->strings["Mon"] = "Mo"; +$a->strings["Tue"] = "Di"; +$a->strings["Wed"] = "Mi"; +$a->strings["Thu"] = "Do"; +$a->strings["Fri"] = "Fr"; +$a->strings["Sat"] = "Sa"; +$a->strings["Sunday"] = "Sonntag"; +$a->strings["Monday"] = "Montag"; +$a->strings["Tuesday"] = "Dienstag"; +$a->strings["Wednesday"] = "Mittwoch"; +$a->strings["Thursday"] = "Donnerstag"; +$a->strings["Friday"] = "Freitag"; +$a->strings["Saturday"] = "Samstag"; +$a->strings["Jan"] = "Jan"; +$a->strings["Feb"] = "Feb"; +$a->strings["Mar"] = "März"; +$a->strings["Apr"] = "Apr"; +$a->strings["May"] = "Mai"; +$a->strings["Jun"] = "Jun"; +$a->strings["Jul"] = "Juli"; +$a->strings["Aug"] = "Aug"; +$a->strings["Sept"] = "Sep"; +$a->strings["Oct"] = "Okt"; +$a->strings["Nov"] = "Nov"; +$a->strings["Dec"] = "Dez"; +$a->strings["January"] = "Januar"; +$a->strings["February"] = "Februar"; +$a->strings["March"] = "März"; +$a->strings["April"] = "April"; +$a->strings["June"] = "Juni"; +$a->strings["July"] = "Juli"; +$a->strings["August"] = "August"; +$a->strings["September"] = "September"; +$a->strings["October"] = "Oktober"; +$a->strings["November"] = "November"; +$a->strings["December"] = "Dezember"; +$a->strings["today"] = "Heute"; +$a->strings["No events to display"] = "Keine Veranstaltung zum Anzeigen"; +$a->strings["l, F j"] = "l, F j"; +$a->strings["Edit event"] = "Veranstaltung bearbeiten"; +$a->strings["Delete event"] = "Veranstaltung löschen"; +$a->strings["link to source"] = "Link zum Originalbeitrag"; +$a->strings["Export"] = "Exportieren"; +$a->strings["Export calendar as ical"] = "Kalender als ical exportieren"; +$a->strings["Export calendar as csv"] = "Kalender als csv exportieren"; $a->strings["General Features"] = "Allgemeine Features"; $a->strings["Multiple Profiles"] = "Mehrere Profile"; $a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen"; @@ -83,20 +131,145 @@ $a->strings["Mute Post Notifications"] = "Benachrichtigungen für Beiträge Stum $a->strings["Ability to mute notifications for a thread"] = "Möglichkeit Benachrichtigungen für einen Thread abbestellen zu können"; $a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen"; $a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite"; -$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."; -$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte"; -$a->strings["Everybody"] = "Alle Kontakte"; -$a->strings["edit"] = "bearbeiten"; -$a->strings["Groups"] = "Gruppen"; -$a->strings["Edit groups"] = "Gruppen bearbeiten"; -$a->strings["Edit group"] = "Gruppe bearbeiten"; -$a->strings["Create a new group"] = "Neue Gruppe erstellen"; -$a->strings["Group Name: "] = "Gruppenname:"; -$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe"; -$a->strings["add"] = "hinzufügen"; -$a->strings["Forums"] = "Foren"; -$a->strings["External link to forum"] = "Externer Link zum Forum"; -$a->strings["show more"] = "mehr anzeigen"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; +$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; +$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; +$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; +$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; +$a->strings["photo"] = "Foto"; +$a->strings["status"] = "Status"; +$a->strings["event"] = "Event"; +$a->strings["Male"] = "Männlich"; +$a->strings["Female"] = "Weiblich"; +$a->strings["Currently Male"] = "Momentan männlich"; +$a->strings["Currently Female"] = "Momentan weiblich"; +$a->strings["Mostly Male"] = "Hauptsächlich männlich"; +$a->strings["Mostly Female"] = "Hauptsächlich weiblich"; +$a->strings["Transgender"] = "Transgender"; +$a->strings["Intersex"] = "Intersex"; +$a->strings["Transsexual"] = "Transsexuell"; +$a->strings["Hermaphrodite"] = "Hermaphrodit"; +$a->strings["Neuter"] = "Neuter"; +$a->strings["Non-specific"] = "Nicht spezifiziert"; +$a->strings["Other"] = "Andere"; +$a->strings["Undecided"] = array( + 0 => "Unentschieden", + 1 => "Unentschieden", +); +$a->strings["Males"] = "Männer"; +$a->strings["Females"] = "Frauen"; +$a->strings["Gay"] = "Schwul"; +$a->strings["Lesbian"] = "Lesbisch"; +$a->strings["No Preference"] = "Keine Vorlieben"; +$a->strings["Bisexual"] = "Bisexuell"; +$a->strings["Autosexual"] = "Autosexual"; +$a->strings["Abstinent"] = "Abstinent"; +$a->strings["Virgin"] = "Jungfrauen"; +$a->strings["Deviant"] = "Deviant"; +$a->strings["Fetish"] = "Fetish"; +$a->strings["Oodles"] = "Oodles"; +$a->strings["Nonsexual"] = "Nonsexual"; +$a->strings["Single"] = "Single"; +$a->strings["Lonely"] = "Einsam"; +$a->strings["Available"] = "Verfügbar"; +$a->strings["Unavailable"] = "Nicht verfügbar"; +$a->strings["Has crush"] = "verknallt"; +$a->strings["Infatuated"] = "verliebt"; +$a->strings["Dating"] = "Dating"; +$a->strings["Unfaithful"] = "Untreu"; +$a->strings["Sex Addict"] = "Sexbesessen"; +$a->strings["Friends"] = "Kontakte"; +$a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; +$a->strings["Casual"] = "Casual"; +$a->strings["Engaged"] = "Verlobt"; +$a->strings["Married"] = "Verheiratet"; +$a->strings["Imaginarily married"] = "imaginär verheiratet"; +$a->strings["Partners"] = "Partner"; +$a->strings["Cohabiting"] = "zusammenlebend"; +$a->strings["Common law"] = "wilde Ehe"; +$a->strings["Happy"] = "Glücklich"; +$a->strings["Not looking"] = "Nicht auf der Suche"; +$a->strings["Swinger"] = "Swinger"; +$a->strings["Betrayed"] = "Betrogen"; +$a->strings["Separated"] = "Getrennt"; +$a->strings["Unstable"] = "Unstabil"; +$a->strings["Divorced"] = "Geschieden"; +$a->strings["Imaginarily divorced"] = "imaginär geschieden"; +$a->strings["Widowed"] = "Verwitwet"; +$a->strings["Uncertain"] = "Unsicher"; +$a->strings["It's complicated"] = "Ist kompliziert"; +$a->strings["Don't care"] = "Ist mir nicht wichtig"; +$a->strings["Ask me"] = "Frag mich"; +$a->strings["Welcome "] = "Willkommen "; +$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; +$a->strings["Welcome back "] = "Willkommen zurück "; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; +$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei"; +$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"; +$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen."; +$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!"; +$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten"; +$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos"; +$a->strings["%d contact not imported"] = array( + 0 => "%d Kontakt nicht importiert", + 1 => "%d Kontakte nicht importiert", +); +$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"; +$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; +$a->strings["An invitation is required."] = "Du benötigst eine Einladung."; +$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; +$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."; +$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; +$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein."; +$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen."; +$a->strings["Name too short."] = "Der Name ist zu kurz."; +$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."; +$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."; +$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; +$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; +$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."; +$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; +$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["default"] = "Standard"; +$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["Profile Photos"] = "Profilbilder"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden."; +$a->strings["Registration at %s"] = "Registrierung als %s"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; +$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; +$a->strings["Registration details for %s"] = "Details der Registration von %s"; +$a->strings["View Profile"] = "Profil anschauen"; +$a->strings["Connect/Follow"] = "Verbinden/Folgen"; +$a->strings["View Status"] = "Pinnwand anschauen"; +$a->strings["View Photos"] = "Bilder anschauen"; +$a->strings["Network Posts"] = "Netzwerkbeiträge"; +$a->strings["View Contact"] = "Kontakt anzeigen"; +$a->strings["Drop Contact"] = "Kontakt löschen"; +$a->strings["Send PM"] = "Private Nachricht senden"; +$a->strings["Poke"] = "Anstupsen"; +$a->strings["Organisation"] = "Organisation"; +$a->strings["News"] = "Nachrichten"; +$a->strings["Forum"] = "Forum"; +$a->strings["System"] = "System"; +$a->strings["Network"] = "Netzwerk"; +$a->strings["Personal"] = "Persönlich"; +$a->strings["Home"] = "Pinnwand"; +$a->strings["Introductions"] = "Kontaktanfragen"; +$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; +$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; +$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; +$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; +$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil"; +$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil"; +$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil"; +$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; +$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; +$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; +$a->strings["New Follower"] = "Neuer Bewunderer"; +$a->strings["Wall Photos"] = "Pinnwand-Bilder"; $a->strings["Post to Email"] = "An E-Mail senden"; $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."; $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?"; @@ -107,14 +280,46 @@ $a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen"; $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; $a->strings["Permissions"] = "Berechtigungen"; $a->strings["Close"] = "Schließen"; +$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; +$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; +$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Logged out."] = "Abgemeldet."; $a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."; -$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; -$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i"; -$a->strings["Starts:"] = "Beginnt:"; -$a->strings["Finishes:"] = "Endet:"; -$a->strings["Location:"] = "Ort:"; +$a->strings["Image/photo"] = "Bild/Foto"; +$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"; +$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; +$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; +$a->strings["Invalid source protocol"] = "Ungültiges Quell-Protokoll"; +$a->strings["Invalid link protocol"] = "Ungültiges Link-Protokoll"; +$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; +$a->strings["Block immediately"] = "Sofort blockieren"; +$a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller"; +$a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung"; +$a->strings["OK, probably harmless"] = "OK, wahrscheinlich harmlos"; +$a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen"; +$a->strings["Frequently"] = "immer wieder"; +$a->strings["Hourly"] = "Stündlich"; +$a->strings["Twice daily"] = "Zweimal täglich"; +$a->strings["Daily"] = "Täglich"; +$a->strings["Weekly"] = "Wöchentlich"; +$a->strings["Monthly"] = "Monatlich"; +$a->strings["Friendica"] = "Friendica"; +$a->strings["OStatus"] = "OStatus"; +$a->strings["RSS/Atom"] = "RSS/Atom"; +$a->strings["Email"] = "E-Mail"; +$a->strings["Diaspora"] = "Diaspora"; +$a->strings["Facebook"] = "Facebook"; +$a->strings["Zot!"] = "Zott"; +$a->strings["LinkedIn"] = "LinkedIn"; +$a->strings["XMPP/IM"] = "XMPP/Chat"; +$a->strings["MySpace"] = "MySpace"; +$a->strings["Google+"] = "Google+"; +$a->strings["pump.io"] = "pump.io"; +$a->strings["Twitter"] = "Twitter"; +$a->strings["Diaspora Connector"] = "Diaspora"; +$a->strings["GNU Social Connector"] = "GNU social Connector"; +$a->strings["pnut"] = "pnut"; +$a->strings["App.net"] = "App.net"; $a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen"; $a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben"; $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara"; @@ -125,7 +330,6 @@ $a->strings["%d invitation available"] = array( ); $a->strings["Find People"] = "Leute finden"; $a->strings["Enter name or interest"] = "Name oder Interessen eingeben"; -$a->strings["Connect/Follow"] = "Verbinden/Folgen"; $a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln"; $a->strings["Find"] = "Finde"; $a->strings["Friend Suggestions"] = "Kontaktvorschläge"; @@ -140,11 +344,6 @@ $a->strings["%d contact in common"] = array( 0 => "%d gemeinsamer Kontakt", 1 => "%d gemeinsame Kontakte", ); -$a->strings["event"] = "Event"; -$a->strings["status"] = "Status"; -$a->strings["photo"] = "Foto"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; -$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; @@ -173,13 +372,6 @@ $a->strings["Please wait"] = "Bitte warten"; $a->strings["remove"] = "löschen"; $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge"; $a->strings["Follow Thread"] = "Folge der Unterhaltung"; -$a->strings["View Status"] = "Pinnwand anschauen"; -$a->strings["View Profile"] = "Profil anschauen"; -$a->strings["View Photos"] = "Bilder anschauen"; -$a->strings["Network Posts"] = "Netzwerkbeiträge"; -$a->strings["View Contact"] = "Kontakt anzeigen"; -$a->strings["Send PM"] = "Private Nachricht senden"; -$a->strings["Poke"] = "Anstupsen"; $a->strings["%s likes this."] = "%s mag das."; $a->strings["%s doesn't like this."] = "%s mag das nicht."; $a->strings["%s attends."] = "%s nimmt teil."; @@ -245,178 +437,19 @@ $a->strings["Not Attending"] = array( 0 => "Nicht teilnehmend ", 1 => "Nicht teilnehmend", ); -$a->strings["Undecided"] = array( - 0 => "Unentschieden", - 1 => "Unentschieden", -); -$a->strings["Miscellaneous"] = "Verschiedenes"; -$a->strings["Birthday:"] = "Geburtstag:"; -$a->strings["Age: "] = "Alter: "; -$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD oder MM-DD"; -$a->strings["never"] = "nie"; -$a->strings["less than a second ago"] = "vor weniger als einer Sekunde"; -$a->strings["year"] = "Jahr"; -$a->strings["years"] = "Jahre"; -$a->strings["month"] = "Monat"; -$a->strings["months"] = "Monate"; -$a->strings["week"] = "Woche"; -$a->strings["weeks"] = "Wochen"; -$a->strings["day"] = "Tag"; -$a->strings["days"] = "Tage"; -$a->strings["hour"] = "Stunde"; -$a->strings["hours"] = "Stunden"; -$a->strings["minute"] = "Minute"; -$a->strings["minutes"] = "Minuten"; -$a->strings["second"] = "Sekunde"; -$a->strings["seconds"] = "Sekunden"; -$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her"; -$a->strings["%s's birthday"] = "%ss Geburtstag"; -$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; +$a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM Tabellen."; +$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."; +$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]"; +$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n"; +$a->strings["Errors encountered performing database changes: "] = "Fehler beim Ändern der Datenbank aufgetreten"; +$a->strings[": Database update"] = ": Datenbank Update"; +$a->strings["%s: updating %s table."] = "%s: aktualisiere Tabelle %s"; $a->strings["(no subject)"] = "(kein Betreff)"; $a->strings["noreply"] = "noreply"; $a->strings["%s\\'s birthday"] = "%ss Geburtstag"; -$a->strings["all-day"] = "ganztägig"; -$a->strings["Sun"] = "So"; -$a->strings["Mon"] = "Mo"; -$a->strings["Tue"] = "Di"; -$a->strings["Wed"] = "Mi"; -$a->strings["Thu"] = "Do"; -$a->strings["Fri"] = "Fr"; -$a->strings["Sat"] = "Sa"; -$a->strings["Sunday"] = "Sonntag"; -$a->strings["Monday"] = "Montag"; -$a->strings["Tuesday"] = "Dienstag"; -$a->strings["Wednesday"] = "Mittwoch"; -$a->strings["Thursday"] = "Donnerstag"; -$a->strings["Friday"] = "Freitag"; -$a->strings["Saturday"] = "Samstag"; -$a->strings["Jan"] = "Jan"; -$a->strings["Feb"] = "Feb"; -$a->strings["Mar"] = "März"; -$a->strings["Apr"] = "Apr"; -$a->strings["May"] = "Mai"; -$a->strings["Jun"] = "Jun"; -$a->strings["Jul"] = "Juli"; -$a->strings["Aug"] = "Aug"; -$a->strings["Sept"] = "Sep"; -$a->strings["Oct"] = "Okt"; -$a->strings["Nov"] = "Nov"; -$a->strings["Dec"] = "Dez"; -$a->strings["January"] = "Januar"; -$a->strings["February"] = "Februar"; -$a->strings["March"] = "März"; -$a->strings["April"] = "April"; -$a->strings["June"] = "Juni"; -$a->strings["July"] = "Juli"; -$a->strings["August"] = "August"; -$a->strings["September"] = "September"; -$a->strings["October"] = "Oktober"; -$a->strings["November"] = "November"; -$a->strings["December"] = "Dezember"; -$a->strings["today"] = "Heute"; -$a->strings["No events to display"] = "Keine Veranstaltung zum Anzeigen"; -$a->strings["l, F j"] = "l, F j"; -$a->strings["Edit event"] = "Veranstaltung bearbeiten"; -$a->strings["Delete event"] = "Veranstaltung löschen"; -$a->strings["link to source"] = "Link zum Originalbeitrag"; -$a->strings["Export"] = "Exportieren"; -$a->strings["Export calendar as ical"] = "Kalender als ical exportieren"; -$a->strings["Export calendar as csv"] = "Kalender als csv exportieren"; -$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; -$a->strings["Blocked domain"] = "Blockierte Daimain"; -$a->strings["Connect URL missing."] = "Connect-URL fehlt"; -$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; -$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; -$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; -$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; -$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; -$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; -$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; -$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; -$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; -$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; -$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; -$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; -$a->strings["Contact Photos"] = "Kontaktbilder"; -$a->strings["Welcome "] = "Willkommen "; -$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; -$a->strings["Welcome back "] = "Willkommen zurück "; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; -$a->strings["newer"] = "neuer"; -$a->strings["older"] = "älter"; -$a->strings["first"] = "erste"; -$a->strings["prev"] = "vorige"; -$a->strings["next"] = "nächste"; -$a->strings["last"] = "letzte"; -$a->strings["Loading more entries..."] = "lade weitere Einträge..."; -$a->strings["The end"] = "Das Ende"; -$a->strings["No contacts"] = "Keine Kontakte"; -$a->strings["%d Contact"] = array( - 0 => "%d Kontakt", - 1 => "%d Kontakte", -); -$a->strings["View Contacts"] = "Kontakte anzeigen"; -$a->strings["Search"] = "Suche"; -$a->strings["Save"] = "Speichern"; -$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content"; -$a->strings["Full Text"] = "Volltext"; -$a->strings["Tags"] = "Tags"; -$a->strings["Contacts"] = "Kontakte"; -$a->strings["poke"] = "anstupsen"; -$a->strings["poked"] = "stupste"; -$a->strings["ping"] = "anpingen"; -$a->strings["pinged"] = "pingte"; -$a->strings["prod"] = "knuffen"; -$a->strings["prodded"] = "knuffte"; -$a->strings["slap"] = "ohrfeigen"; -$a->strings["slapped"] = "ohrfeigte"; -$a->strings["finger"] = "befummeln"; -$a->strings["fingered"] = "befummelte"; -$a->strings["rebuff"] = "eine Abfuhr erteilen"; -$a->strings["rebuffed"] = "abfuhrerteilte"; -$a->strings["happy"] = "glücklich"; -$a->strings["sad"] = "traurig"; -$a->strings["mellow"] = "sanft"; -$a->strings["tired"] = "müde"; -$a->strings["perky"] = "frech"; -$a->strings["angry"] = "sauer"; -$a->strings["stupified"] = "verblüfft"; -$a->strings["puzzled"] = "verwirrt"; -$a->strings["interested"] = "interessiert"; -$a->strings["bitter"] = "verbittert"; -$a->strings["cheerful"] = "fröhlich"; -$a->strings["alive"] = "lebendig"; -$a->strings["annoyed"] = "verärgert"; -$a->strings["anxious"] = "unruhig"; -$a->strings["cranky"] = "schrullig"; -$a->strings["disturbed"] = "verstört"; -$a->strings["frustrated"] = "frustriert"; -$a->strings["motivated"] = "motiviert"; -$a->strings["relaxed"] = "entspannt"; -$a->strings["surprised"] = "überrascht"; -$a->strings["View Video"] = "Video ansehen"; -$a->strings["bytes"] = "Byte"; -$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; -$a->strings["View on separate page"] = "Auf separater Seite ansehen"; -$a->strings["view on separate page"] = "auf separater Seite ansehen"; -$a->strings["activity"] = "Aktivität"; -$a->strings["comment"] = array( - 0 => "Kommentar", - 1 => "Kommentare", -); -$a->strings["post"] = "Beitrag"; -$a->strings["Item filed"] = "Beitrag abgelegt"; -$a->strings["Image/photo"] = "Bild/Foto"; -$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"; -$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; -$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; -$a->strings["Invalid source protocol"] = "Ungültiges Quell-Protokoll"; -$a->strings["Invalid link protocol"] = "Ungültiges Link-Protokoll"; -$a->strings["Drop Contact"] = "Kontakt löschen"; -$a->strings["Organisation"] = "Organisation"; -$a->strings["News"] = "Nachrichten"; -$a->strings["Forum"] = "Forum"; +$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; +$a->strings["Attachments:"] = "Anhänge:"; $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung"; $a->strings["Thank You,"] = "Danke,"; $a->strings["%s Administrator"] = "der Administrator von %s"; @@ -476,199 +509,35 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "D $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Registrierungsanfrage[/url] von %2\$s erhalten."; $a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Kompletter Name:\t%1\$s\\nURL der Seite:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"; $a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten."; -$a->strings["[no subject]"] = "[kein Betreff]"; -$a->strings["Wall Photos"] = "Pinnwand-Bilder"; -$a->strings["Nothing new here"] = "Keine Neuigkeiten"; -$a->strings["Clear notifications"] = "Bereinige Benachrichtigungen"; -$a->strings["Logout"] = "Abmelden"; -$a->strings["End this session"] = "Diese Sitzung beenden"; -$a->strings["Status"] = "Status"; -$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; -$a->strings["Profile"] = "Profil"; -$a->strings["Your profile page"] = "Deine Profilseite"; -$a->strings["Photos"] = "Bilder"; -$a->strings["Your photos"] = "Deine Fotos"; -$a->strings["Videos"] = "Videos"; -$a->strings["Your videos"] = "Deine Videos"; -$a->strings["Events"] = "Veranstaltungen"; -$a->strings["Your events"] = "Deine Ereignisse"; -$a->strings["Personal notes"] = "Persönliche Notizen"; -$a->strings["Your personal notes"] = "Deine persönlichen Notizen"; -$a->strings["Login"] = "Anmeldung"; -$a->strings["Sign in"] = "Anmelden"; -$a->strings["Home"] = "Pinnwand"; -$a->strings["Home Page"] = "Homepage"; -$a->strings["Register"] = "Registrieren"; -$a->strings["Create an account"] = "Nutzerkonto erstellen"; -$a->strings["Help"] = "Hilfe"; -$a->strings["Help and documentation"] = "Hilfe und Dokumentation"; -$a->strings["Apps"] = "Apps"; -$a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele"; -$a->strings["Search site content"] = "Inhalt der Seite durchsuchen"; -$a->strings["Community"] = "Gemeinschaft"; -$a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite"; -$a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk"; -$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; -$a->strings["Directory"] = "Verzeichnis"; -$a->strings["People directory"] = "Nutzerverzeichnis"; -$a->strings["Information"] = "Information"; -$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz"; -$a->strings["Network"] = "Netzwerk"; -$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte"; -$a->strings["Network Reset"] = "Netzwerk zurücksetzen"; -$a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden"; -$a->strings["Introductions"] = "Kontaktanfragen"; -$a->strings["Friend Requests"] = "Kontaktanfragen"; -$a->strings["Notifications"] = "Benachrichtigungen"; -$a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; -$a->strings["Mark as seen"] = "Als gelesen markieren"; -$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen"; -$a->strings["Messages"] = "Nachrichten"; -$a->strings["Private mail"] = "Private E-Mail"; -$a->strings["Inbox"] = "Eingang"; -$a->strings["Outbox"] = "Ausgang"; -$a->strings["New Message"] = "Neue Nachricht"; -$a->strings["Manage"] = "Verwalten"; -$a->strings["Manage other pages"] = "Andere Seiten verwalten"; -$a->strings["Delegations"] = "Delegationen"; -$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; -$a->strings["Settings"] = "Einstellungen"; -$a->strings["Account settings"] = "Kontoeinstellungen"; -$a->strings["Profiles"] = "Profile"; -$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; -$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren"; -$a->strings["Admin"] = "Administration"; -$a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; -$a->strings["Navigation"] = "Navigation"; -$a->strings["Site map"] = "Sitemap"; -$a->strings["view full size"] = "Volle Größe anzeigen"; -$a->strings["Embedded content"] = "Eingebetteter Inhalt"; -$a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; -$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei"; -$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"; -$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen."; -$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!"; -$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten"; -$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos"; -$a->strings["%d contact not imported"] = array( - 0 => "%d Kontakt nicht importiert", - 1 => "%d Kontakte nicht importiert", -); -$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"; -$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; -$a->strings["An invitation is required."] = "Du benötigst eine Einladung."; -$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; -$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; -$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein."; -$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen."; -$a->strings["Name too short."] = "Der Name ist zu kurz."; -$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."; -$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."; -$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; -$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; -$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."; -$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; -$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; -$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; -$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; -$a->strings["default"] = "Standard"; -$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; -$a->strings["Friends"] = "Kontakte"; -$a->strings["Profile Photos"] = "Profilbilder"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden."; -$a->strings["Registration at %s"] = "Registrierung als %s"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; -$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; -$a->strings["Registration details for %s"] = "Details der Registration von %s"; -$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; -$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; -$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; -$a->strings["Male"] = "Männlich"; -$a->strings["Female"] = "Weiblich"; -$a->strings["Currently Male"] = "Momentan männlich"; -$a->strings["Currently Female"] = "Momentan weiblich"; -$a->strings["Mostly Male"] = "Hauptsächlich männlich"; -$a->strings["Mostly Female"] = "Hauptsächlich weiblich"; -$a->strings["Transgender"] = "Transgender"; -$a->strings["Intersex"] = "Intersex"; -$a->strings["Transsexual"] = "Transsexuell"; -$a->strings["Hermaphrodite"] = "Hermaphrodit"; -$a->strings["Neuter"] = "Neuter"; -$a->strings["Non-specific"] = "Nicht spezifiziert"; -$a->strings["Other"] = "Andere"; -$a->strings["Males"] = "Männer"; -$a->strings["Females"] = "Frauen"; -$a->strings["Gay"] = "Schwul"; -$a->strings["Lesbian"] = "Lesbisch"; -$a->strings["No Preference"] = "Keine Vorlieben"; -$a->strings["Bisexual"] = "Bisexuell"; -$a->strings["Autosexual"] = "Autosexual"; -$a->strings["Abstinent"] = "Abstinent"; -$a->strings["Virgin"] = "Jungfrauen"; -$a->strings["Deviant"] = "Deviant"; -$a->strings["Fetish"] = "Fetish"; -$a->strings["Oodles"] = "Oodles"; -$a->strings["Nonsexual"] = "Nonsexual"; -$a->strings["Single"] = "Single"; -$a->strings["Lonely"] = "Einsam"; -$a->strings["Available"] = "Verfügbar"; -$a->strings["Unavailable"] = "Nicht verfügbar"; -$a->strings["Has crush"] = "verknallt"; -$a->strings["Infatuated"] = "verliebt"; -$a->strings["Dating"] = "Dating"; -$a->strings["Unfaithful"] = "Untreu"; -$a->strings["Sex Addict"] = "Sexbesessen"; -$a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; -$a->strings["Casual"] = "Casual"; -$a->strings["Engaged"] = "Verlobt"; -$a->strings["Married"] = "Verheiratet"; -$a->strings["Imaginarily married"] = "imaginär verheiratet"; -$a->strings["Partners"] = "Partner"; -$a->strings["Cohabiting"] = "zusammenlebend"; -$a->strings["Common law"] = "wilde Ehe"; -$a->strings["Happy"] = "Glücklich"; -$a->strings["Not looking"] = "Nicht auf der Suche"; -$a->strings["Swinger"] = "Swinger"; -$a->strings["Betrayed"] = "Betrogen"; -$a->strings["Separated"] = "Getrennt"; -$a->strings["Unstable"] = "Unstabil"; -$a->strings["Divorced"] = "Geschieden"; -$a->strings["Imaginarily divorced"] = "imaginär geschieden"; -$a->strings["Widowed"] = "Verwitwet"; -$a->strings["Uncertain"] = "Unsicher"; -$a->strings["It's complicated"] = "Ist kompliziert"; -$a->strings["Don't care"] = "Ist mir nicht wichtig"; -$a->strings["Ask me"] = "Frag mich"; -$a->strings["System"] = "System"; -$a->strings["Personal"] = "Persönlich"; -$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; -$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; -$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag"; -$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht"; -$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil"; -$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil"; -$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil"; -$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet"; -$a->strings["Friend Suggestion"] = "Kontaktvorschlag"; -$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage"; -$a->strings["New Follower"] = "Neuer Bewunderer"; -$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; -$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; -$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; -$a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM Tabellen."; -$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."; -$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]"; -$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n"; -$a->strings["Errors encountered performing database changes: "] = "Fehler beim Ändern der Datenbank aufgetreten"; -$a->strings[": Database update"] = ": Datenbank Update"; -$a->strings["%s: updating %s table."] = "%s: aktualisiere Tabelle %s"; -$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; -$a->strings["Attachments:"] = "Anhänge:"; +$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; +$a->strings["Blocked domain"] = "Blockierte Daimain"; +$a->strings["Connect URL missing."] = "Connect-URL fehlt"; +$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; +$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; +$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; +$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; +$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; +$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; +$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; +$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."; +$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; +$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."; +$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte"; +$a->strings["Everybody"] = "Alle Kontakte"; +$a->strings["edit"] = "bearbeiten"; +$a->strings["Groups"] = "Gruppen"; +$a->strings["Edit groups"] = "Gruppen bearbeiten"; +$a->strings["Edit group"] = "Gruppe bearbeiten"; +$a->strings["Create a new group"] = "Neue Gruppe erstellen"; +$a->strings["Group Name: "] = "Gruppenname:"; +$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe"; +$a->strings["add"] = "hinzufügen"; $a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; $a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; $a->strings["Edit profile"] = "Profil bearbeiten"; $a->strings["Atom feed"] = "Atom-Feed"; +$a->strings["Profiles"] = "Profile"; $a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; $a->strings["Change profile photo"] = "Profilbild ändern"; $a->strings["Create New Profile"] = "Neues Profil anlegen"; @@ -689,6 +558,7 @@ $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; $a->strings["[No description]"] = "[keine Beschreibung]"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; $a->strings["Events this week:"] = "Veranstaltungen diese Woche"; +$a->strings["Profile"] = "Profil"; $a->strings["Full Name:"] = "Kompletter Name:"; $a->strings["j F, Y"] = "j F, Y"; $a->strings["j F"] = "j F"; @@ -713,21 +583,151 @@ $a->strings["School/education:"] = "Schule/Ausbildung:"; $a->strings["Forums:"] = "Foren:"; $a->strings["Basic"] = "Allgemein"; $a->strings["Advanced"] = "Erweitert"; +$a->strings["Status"] = "Status"; $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; $a->strings["Profile Details"] = "Profildetails"; +$a->strings["Photos"] = "Bilder"; $a->strings["Photo Albums"] = "Fotoalben"; +$a->strings["Videos"] = "Videos"; +$a->strings["Events"] = "Veranstaltungen"; +$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; $a->strings["Personal Notes"] = "Persönliche Notizen"; $a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; +$a->strings["Contacts"] = "Kontakte"; $a->strings["[Name Withheld]"] = "[Name unterdrückt]"; $a->strings["Item not found."] = "Beitrag nicht gefunden."; $a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; $a->strings["Yes"] = "Ja"; $a->strings["Permission denied."] = "Zugriff verweigert."; $a->strings["Archives"] = "Archiv"; +$a->strings["[no subject]"] = "[kein Betreff]"; +$a->strings["Nothing new here"] = "Keine Neuigkeiten"; +$a->strings["Clear notifications"] = "Bereinige Benachrichtigungen"; +$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content"; +$a->strings["Logout"] = "Abmelden"; +$a->strings["End this session"] = "Diese Sitzung beenden"; +$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; +$a->strings["Your profile page"] = "Deine Profilseite"; +$a->strings["Your photos"] = "Deine Fotos"; +$a->strings["Your videos"] = "Deine Videos"; +$a->strings["Your events"] = "Deine Ereignisse"; +$a->strings["Personal notes"] = "Persönliche Notizen"; +$a->strings["Your personal notes"] = "Deine persönlichen Notizen"; +$a->strings["Login"] = "Anmeldung"; +$a->strings["Sign in"] = "Anmelden"; +$a->strings["Home Page"] = "Homepage"; +$a->strings["Register"] = "Registrieren"; +$a->strings["Create an account"] = "Nutzerkonto erstellen"; +$a->strings["Help"] = "Hilfe"; +$a->strings["Help and documentation"] = "Hilfe und Dokumentation"; +$a->strings["Apps"] = "Apps"; +$a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele"; +$a->strings["Search"] = "Suche"; +$a->strings["Search site content"] = "Inhalt der Seite durchsuchen"; +$a->strings["Full Text"] = "Volltext"; +$a->strings["Tags"] = "Tags"; +$a->strings["Community"] = "Gemeinschaft"; +$a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite"; +$a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk"; +$a->strings["Directory"] = "Verzeichnis"; +$a->strings["People directory"] = "Nutzerverzeichnis"; +$a->strings["Information"] = "Information"; +$a->strings["Information about this friendica instance"] = "Informationen zu dieser Friendica Instanz"; +$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte"; +$a->strings["Network Reset"] = "Netzwerk zurücksetzen"; +$a->strings["Load Network page with no filters"] = "Netzwerk-Seite ohne Filter laden"; +$a->strings["Friend Requests"] = "Kontaktanfragen"; +$a->strings["Notifications"] = "Benachrichtigungen"; +$a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; +$a->strings["Mark as seen"] = "Als gelesen markieren"; +$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen"; +$a->strings["Messages"] = "Nachrichten"; +$a->strings["Private mail"] = "Private E-Mail"; +$a->strings["Inbox"] = "Eingang"; +$a->strings["Outbox"] = "Ausgang"; +$a->strings["New Message"] = "Neue Nachricht"; +$a->strings["Manage"] = "Verwalten"; +$a->strings["Manage other pages"] = "Andere Seiten verwalten"; +$a->strings["Delegations"] = "Delegationen"; +$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; +$a->strings["Settings"] = "Einstellungen"; +$a->strings["Account settings"] = "Kontoeinstellungen"; +$a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; +$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren"; +$a->strings["Admin"] = "Administration"; +$a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; +$a->strings["Navigation"] = "Navigation"; +$a->strings["Site map"] = "Sitemap"; +$a->strings["view full size"] = "Volle Größe anzeigen"; +$a->strings["Embedded content"] = "Eingebetteter Inhalt"; +$a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; $a->strings["%s is now following %s."] = "%s folgt nun %s"; $a->strings["following"] = "folgen"; $a->strings["%s stopped following %s."] = "%s hat aufgehört %s zu folgen"; $a->strings["stopped following"] = "wird nicht mehr gefolgt"; +$a->strings["Contact Photos"] = "Kontaktbilder"; +$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; +$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; +$a->strings["newer"] = "neuer"; +$a->strings["older"] = "älter"; +$a->strings["first"] = "erste"; +$a->strings["prev"] = "vorige"; +$a->strings["next"] = "nächste"; +$a->strings["last"] = "letzte"; +$a->strings["Loading more entries..."] = "lade weitere Einträge..."; +$a->strings["The end"] = "Das Ende"; +$a->strings["No contacts"] = "Keine Kontakte"; +$a->strings["%d Contact"] = array( + 0 => "%d Kontakt", + 1 => "%d Kontakte", +); +$a->strings["View Contacts"] = "Kontakte anzeigen"; +$a->strings["Save"] = "Speichern"; +$a->strings["poke"] = "anstupsen"; +$a->strings["poked"] = "stupste"; +$a->strings["ping"] = "anpingen"; +$a->strings["pinged"] = "pingte"; +$a->strings["prod"] = "knuffen"; +$a->strings["prodded"] = "knuffte"; +$a->strings["slap"] = "ohrfeigen"; +$a->strings["slapped"] = "ohrfeigte"; +$a->strings["finger"] = "befummeln"; +$a->strings["fingered"] = "befummelte"; +$a->strings["rebuff"] = "eine Abfuhr erteilen"; +$a->strings["rebuffed"] = "abfuhrerteilte"; +$a->strings["happy"] = "glücklich"; +$a->strings["sad"] = "traurig"; +$a->strings["mellow"] = "sanft"; +$a->strings["tired"] = "müde"; +$a->strings["perky"] = "frech"; +$a->strings["angry"] = "sauer"; +$a->strings["stupified"] = "verblüfft"; +$a->strings["puzzled"] = "verwirrt"; +$a->strings["interested"] = "interessiert"; +$a->strings["bitter"] = "verbittert"; +$a->strings["cheerful"] = "fröhlich"; +$a->strings["alive"] = "lebendig"; +$a->strings["annoyed"] = "verärgert"; +$a->strings["anxious"] = "unruhig"; +$a->strings["cranky"] = "schrullig"; +$a->strings["disturbed"] = "verstört"; +$a->strings["frustrated"] = "frustriert"; +$a->strings["motivated"] = "motiviert"; +$a->strings["relaxed"] = "entspannt"; +$a->strings["surprised"] = "überrascht"; +$a->strings["View Video"] = "Video ansehen"; +$a->strings["bytes"] = "Byte"; +$a->strings["Click to open/close"] = "Zum öffnen/schließen klicken"; +$a->strings["View on separate page"] = "Auf separater Seite ansehen"; +$a->strings["view on separate page"] = "auf separater Seite ansehen"; +$a->strings["activity"] = "Aktivität"; +$a->strings["comment"] = array( + 0 => "Kommentar", + 1 => "Kommentare", +); +$a->strings["post"] = "Beitrag"; +$a->strings["Item filed"] = "Beitrag abgelegt"; $a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen."; $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; @@ -763,9 +763,6 @@ $a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden"; $a->strings["calendar"] = "Kalender"; $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; $a->strings["Common Friends"] = "Gemeinsame Kontakte"; -$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert."; -$a->strings["Not available."] = "Nicht verfügbar."; -$a->strings["No results."] = "Keine Ergebnisse."; $a->strings["No such group"] = "Es gibt keine solche Gruppe"; $a->strings["Group is empty"] = "Gruppe ist leer"; $a->strings["Group: %s"] = "Gruppe: %s"; @@ -860,46 +857,16 @@ $a->strings["Unable to set your contact credentials on our system."] = "Deine Ko $a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden"; $a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten"; $a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen"; +$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert."; $a->strings["Global Directory"] = "Weltweites Verzeichnis"; $a->strings["Find on this site"] = "Auf diesem Server suchen"; $a->strings["Results for:"] = "Ergebnisse für:"; $a->strings["Site Directory"] = "Verzeichnis"; $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein)."; -$a->strings["People Search - %s"] = "Personensuche - %s"; -$a->strings["Forum Search - %s"] = "Forensuche - %s"; -$a->strings["No matches"] = "Keine Übereinstimmungen"; -$a->strings["Item has been removed."] = "Eintrag wurde entfernt."; $a->strings["Item not found"] = "Beitrag nicht gefunden"; $a->strings["Edit post"] = "Beitrag bearbeiten"; -$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt."; -$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."; -$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; -$a->strings["Event details"] = "Veranstaltungsdetails"; -$a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt"; -$a->strings["Event Starts:"] = "Veranstaltungsbeginn:"; -$a->strings["Required"] = "Benötigt"; -$a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant"; -$a->strings["Event Finishes:"] = "Veranstaltungsende:"; -$a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen"; -$a->strings["Description:"] = "Beschreibung"; -$a->strings["Title:"] = "Titel:"; -$a->strings["Share this event"] = "Veranstaltung teilen"; -$a->strings["Failed to remove event"] = "Entfernen der Veranstaltung fehlgeschlagen"; -$a->strings["Event removed"] = "Veranstaltung enfternt"; $a->strings["Files"] = "Dateien"; -$a->strings["Not Found"] = "Nicht gefunden"; $a->strings["- select -"] = "- auswählen -"; -$a->strings["Submit Request"] = "Anfrage abschicken"; -$a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt."; -$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; -$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; -$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."; -$a->strings["Please answer the following:"] = "Bitte beantworte folgendes:"; -$a->strings["Does %s know you?"] = "Kennt %s Dich?"; -$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; -$a->strings["Your Identity Address:"] = "Adresse Deines Profils:"; -$a->strings["Profile URL"] = "Profil URL"; -$a->strings["Contact added"] = "Kontakt hinzugefügt"; $a->strings["This is Friendica, version"] = "Dies ist Friendica, Version"; $a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist"; $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"http://friendica.com\">Friendica.com</a>, um mehr über das Friendica Projekt zu erfahren."; @@ -932,6 +899,7 @@ $a->strings["Add Contact"] = "Kontakt hinzufügen"; $a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"; $a->strings["No profile"] = "Kein Profil"; $a->strings["Help:"] = "Hilfe:"; +$a->strings["Not Found"] = "Nicht gefunden"; $a->strings["Page not found."] = "Seite nicht gefunden."; $a->strings["Welcome to %s"] = "Willkommen zu %s"; $a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; @@ -1062,6 +1030,7 @@ $a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verw $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."; $a->strings["is interested in:"] = "ist interessiert an:"; $a->strings["Profile Match"] = "Profilübereinstimmungen"; +$a->strings["No matches"] = "Keine Übereinstimmungen"; $a->strings["No recipient selected."] = "Kein Empfänger gewählt."; $a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; $a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden."; @@ -1089,26 +1058,6 @@ $a->strings["%d message"] = array( ); $a->strings["Mood"] = "Stimmung"; $a->strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und erzähle sie Deinen Kontakten"; -$a->strings["Results for: %s"] = "Ergebnisse für: %s"; -$a->strings["Remove term"] = "Begriff entfernen"; -$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array( - 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann.", - 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können.", -); -$a->strings["Messages in this group won't be send to these receivers."] = "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden."; -$a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."; -$a->strings["Invalid contact."] = "Ungültiger Kontakt."; -$a->strings["Commented Order"] = "Neueste Kommentare"; -$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren"; -$a->strings["Posted Order"] = "Neueste Beiträge"; -$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren"; -$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht"; -$a->strings["New"] = "Neue"; -$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; -$a->strings["Shared Links"] = "Geteilte Links"; -$a->strings["Interesting Links"] = "Interessante Links"; -$a->strings["Starred"] = "Markierte"; -$a->strings["Favourite Posts"] = "Favorisierte Beiträge"; $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica"; $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder"; $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden."; @@ -1168,6 +1117,7 @@ $a->strings["Accepting %s as a sharer allows them to subscribe to your posts, bu $a->strings["Friend"] = "Kontakt"; $a->strings["Sharer"] = "Teilenden"; $a->strings["Subscriber"] = "Abonnent"; +$a->strings["Profile URL"] = "Profil URL"; $a->strings["No introductions."] = "Keine Kontaktanfragen."; $a->strings["Show unread"] = "Ungelesene anzeigen"; $a->strings["Show all"] = "Alle anzeigen"; @@ -1239,44 +1189,108 @@ $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder $a->strings["Recipient"] = "Empfänger"; $a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:"; $a->strings["Make this post private"] = "Diesen Beitrag privat machen"; +$a->strings["Only logged in users are permitted to perform a probing."] = "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet."; $a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; +$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; +$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; +$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden"; +$a->strings["Upload File:"] = "Datei hochladen:"; +$a->strings["Select a profile:"] = "Profil auswählen:"; +$a->strings["Upload"] = "Hochladen"; +$a->strings["or"] = "oder"; +$a->strings["skip this step"] = "diesen Schritt überspringen"; +$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben"; +$a->strings["Crop Image"] = "Bild zurechtschneiden"; +$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."; +$a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; +$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; +$a->strings["Profile deleted."] = "Profil gelöscht."; +$a->strings["Profile-"] = "Profil-"; +$a->strings["New profile created."] = "Neues Profil angelegt."; +$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; +$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; +$a->strings["Marital Status"] = "Familienstand"; +$a->strings["Romantic Partner"] = "Romanze"; +$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; +$a->strings["Religion"] = "Religion"; +$a->strings["Political Views"] = "Politische Ansichten"; +$a->strings["Gender"] = "Geschlecht"; +$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; +$a->strings["XMPP"] = "XMPP"; +$a->strings["Homepage"] = "Webseite"; +$a->strings["Interests"] = "Interessen"; +$a->strings["Address"] = "Adresse"; +$a->strings["Location"] = "Wohnort"; +$a->strings["Profile updated."] = "Profil aktualisiert."; +$a->strings[" and "] = " und "; +$a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; +$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; +$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; +$a->strings["Profile Actions"] = "Profilaktionen"; +$a->strings["Edit Profile Details"] = "Profil bearbeiten"; +$a->strings["Change Profile Photo"] = "Profilbild ändern"; +$a->strings["View this profile"] = "Dieses Profil anzeigen"; +$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; +$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; +$a->strings["Delete this profile"] = "Dieses Profil löschen"; +$a->strings["Basic information"] = "Grundinformationen"; +$a->strings["Profile picture"] = "Profilbild"; +$a->strings["Preferences"] = "Vorlieben"; +$a->strings["Status information"] = "Status Informationen"; +$a->strings["Additional information"] = "Zusätzliche Informationen"; +$a->strings["Relation"] = "Beziehung"; +$a->strings["Your Gender:"] = "Dein Geschlecht:"; +$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:"; +$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; +$a->strings["Profile Name:"] = "Profilname:"; +$a->strings["Required"] = "Benötigt"; +$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."; +$a->strings["Your Full Name:"] = "Dein kompletter Name:"; +$a->strings["Title/Description:"] = "Titel/Beschreibung:"; +$a->strings["Street Address:"] = "Adresse:"; +$a->strings["Locality/City:"] = "Wohnort:"; +$a->strings["Region/State:"] = "Region/Bundesstaat:"; +$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; +$a->strings["Country:"] = "Land:"; +$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Seit [Datum]:"; +$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; +$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse"; +$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können."; +$a->strings["Homepage URL:"] = "Adresse der Homepage:"; +$a->strings["Religious Views:"] = "Religiöse Ansichten:"; +$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; +$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; +$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; +$a->strings["Musical interests"] = "Musikalische Interessen"; +$a->strings["Books, literature"] = "Bücher, Literatur"; +$a->strings["Television"] = "Fernsehen"; +$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; +$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; +$a->strings["Love/romance"] = "Liebe/Romantik"; +$a->strings["Work/employment"] = "Arbeit/Anstellung"; +$a->strings["School/education"] = "Schule/Ausbildung"; +$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; +$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner."; $a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit"; $a->strings["Visible To"] = "Sichtbar für"; $a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)"; -$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; -$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."; -$a->strings["Registration successful."] = "Registrierung erfolgreich."; -$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden."; -$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."; -$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst."; -$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."; -$a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): "; -$a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"; -$a->strings["Note for the admin"] = "Hinweis für den Admin"; -$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."; -$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."; -$a->strings["Your invitation ID: "] = "ID Deiner Einladung: "; -$a->strings["Registration"] = "Registrierung"; -$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"; -$a->strings["Your Email Address: "] = "Deine E-Mail-Adresse: "; -$a->strings["New Password:"] = "Neues Passwort:"; -$a->strings["Leave empty for an auto generated password."] = "Leer lassen um das Passwort automatisch zu generieren."; -$a->strings["Confirm:"] = "Bestätigen:"; -$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein."; -$a->strings["Choose a nickname: "] = "Spitznamen wählen: "; -$a->strings["Import"] = "Import"; -$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz"; +$a->strings["Account approved."] = "Konto freigegeben."; +$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; +$a->strings["Please login."] = "Bitte melde Dich an."; $a->strings["Remove My Account"] = "Konto löschen"; $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."; $a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:"; $a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements"; $a->strings["Error"] = "Fehler"; -$a->strings["Only logged in users are permitted to perform a search."] = "Nur eingeloggten Benutzern ist das Suchen gestattet."; -$a->strings["Too Many Requests"] = "Zu viele Abfragen"; -$a->strings["Only one search per minute is permitted for not logged in users."] = "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet."; -$a->strings["Items tagged with: %s"] = "Beiträge die mit %s getaggt sind"; $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s"; $a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?"; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."; @@ -1289,6 +1303,14 @@ $a->strings["Export your account info and contacts. Use this to make a backup of $a->strings["Export all"] = "Alles exportieren"; $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportiere Deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert)."; $a->strings["Export personal data"] = "Persönliche Daten exportieren"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."; +$a->strings["Import"] = "Import"; +$a->strings["Move account"] = "Account umziehen"; +$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren."; +$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist."; +$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"; +$a->strings["Account file"] = "Account Datei"; +$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""; $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; $a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?"; $a->strings["Delete Video"] = "Video Löschen"; @@ -1306,58 +1328,8 @@ $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = $a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen."; $a->strings["No recipient."] = "Kein Empfänger."; $a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."; -$a->strings["Only logged in users are permitted to perform a probing."] = "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet."; -$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; -$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."; -$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."; -$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."; -$a->strings["%d required parameter was not found at the given location"] = array( - 0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden", - 1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden", -); -$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen."; -$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler."; -$a->strings["Profile unavailable."] = "Profil nicht verfügbar."; -$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten."; -$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen."; -$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; -$a->strings["Invalid locator"] = "Ungültiger Locator"; -$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse."; -$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; -$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt."; -$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."; -$a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; -$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen."; -$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet."; -$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abonnieren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. "; -$a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen."; -$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."; -$a->strings["Confirm"] = "Bestätigen"; -$a->strings["Hide this contact"] = "Verberge diesen Kontakt"; -$a->strings["Welcome home %s."] = "Willkommen zurück %s."; -$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s."; -$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:"; -$a->strings["If you are not yet a member of the free social web, <a href=\"%s/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."; -$a->strings["Friend/Connection Request"] = "Kontaktanfrage"; -$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; -$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; -$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."; -$a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden."; -$a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen."; -$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag konnte nicht gespeichert werden."; -$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."; -$a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen"; -$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."; -$a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht."; -$a->strings["Account approved."] = "Konto freigegeben."; -$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; -$a->strings["Please login."] = "Bitte melde Dich an."; -$a->strings["Move account"] = "Account umziehen"; -$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren."; -$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist."; -$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"; -$a->strings["Account file"] = "Account Datei"; -$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""; +$a->strings["Not available."] = "Nicht verfügbar."; +$a->strings["No results."] = "Keine Ergebnisse."; $a->strings["%d contact edited."] = array( 0 => "%d Kontakt bearbeitet.", 1 => "%d Kontakte bearbeitet.", @@ -1365,6 +1337,7 @@ $a->strings["%d contact edited."] = array( $a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen."; $a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden."; $a->strings["Contact updated."] = "Kontakt aktualisiert."; +$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen."; $a->strings["Contact has been blocked"] = "Kontakt wurde blockiert"; $a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; $a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; @@ -1427,6 +1400,7 @@ $a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen" $a->strings["Hidden"] = "Verborgen"; $a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen"; $a->strings["Search your contacts"] = "Suche in deinen Kontakten"; +$a->strings["Results for: %s"] = "Ergebnisse für: %s"; $a->strings["Update"] = "Aktualisierungen"; $a->strings["Archive"] = "Archivieren"; $a->strings["Unarchive"] = "Aus Archiv zurückholen"; @@ -1441,102 +1415,305 @@ $a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; $a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; $a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; $a->strings["Delete contact"] = "Lösche den Kontakt"; +$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; +$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."; +$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."; +$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."; +$a->strings["%d required parameter was not found at the given location"] = array( + 0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden", + 1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden", +); +$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen."; +$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler."; +$a->strings["Profile unavailable."] = "Profil nicht verfügbar."; +$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten."; +$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen."; +$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; +$a->strings["Invalid locator"] = "Ungültiger Locator"; +$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse."; +$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; +$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt."; +$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."; +$a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; +$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet."; +$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abonnieren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. "; +$a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen."; +$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."; +$a->strings["Confirm"] = "Bestätigen"; +$a->strings["Hide this contact"] = "Verberge diesen Kontakt"; +$a->strings["Welcome home %s."] = "Willkommen zurück %s."; +$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s."; +$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:"; +$a->strings["If you are not yet a member of the free social web, <a href=\"%s/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s/siteinfo\">folge diesem Link</a> um einen öffentlichen Friendica-Server zu finden und beizutreten."; +$a->strings["Friend/Connection Request"] = "Kontaktanfrage"; +$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; +$a->strings["Please answer the following:"] = "Bitte beantworte folgendes:"; +$a->strings["Does %s know you?"] = "Kennt %s Dich?"; +$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:"; +$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web"; +$a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."; +$a->strings["Your Identity Address:"] = "Adresse Deines Profils:"; +$a->strings["Submit Request"] = "Anfrage abschicken"; +$a->strings["People Search - %s"] = "Personensuche - %s"; +$a->strings["Forum Search - %s"] = "Forensuche - %s"; +$a->strings["Item has been removed."] = "Eintrag wurde entfernt."; +$a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt."; +$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."; +$a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; +$a->strings["Event details"] = "Veranstaltungsdetails"; +$a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt"; +$a->strings["Event Starts:"] = "Veranstaltungsbeginn:"; +$a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant"; +$a->strings["Event Finishes:"] = "Veranstaltungsende:"; +$a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen"; +$a->strings["Description:"] = "Beschreibung"; +$a->strings["Title:"] = "Titel:"; +$a->strings["Share this event"] = "Veranstaltung teilen"; +$a->strings["Failed to remove event"] = "Entfernen der Veranstaltung fehlgeschlagen"; +$a->strings["Event removed"] = "Veranstaltung enfternt"; +$a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt."; +$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; +$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."; +$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."; +$a->strings["Contact added"] = "Kontakt hinzugefügt"; +$a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden."; +$a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen."; +$a->strings["System error. Post not saved."] = "Systemfehler. Beitrag konnte nicht gespeichert werden."; +$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."; +$a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen"; +$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."; +$a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht."; +$a->strings["Remove term"] = "Begriff entfernen"; +$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array( + 0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann.", + 1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können.", +); +$a->strings["Messages in this group won't be send to these receivers."] = "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden."; +$a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."; +$a->strings["Invalid contact."] = "Ungültiger Kontakt."; +$a->strings["Commented Order"] = "Neueste Kommentare"; +$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren"; +$a->strings["Posted Order"] = "Neueste Beiträge"; +$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren"; +$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht"; +$a->strings["New"] = "Neue"; +$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum"; +$a->strings["Shared Links"] = "Geteilte Links"; +$a->strings["Interesting Links"] = "Interessante Links"; +$a->strings["Starred"] = "Markierte"; +$a->strings["Favourite Posts"] = "Favorisierte Beiträge"; $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; $a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; -$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; -$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; -$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; -$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden"; -$a->strings["Upload File:"] = "Datei hochladen:"; -$a->strings["Select a profile:"] = "Profil auswählen:"; -$a->strings["Upload"] = "Hochladen"; -$a->strings["or"] = "oder"; -$a->strings["skip this step"] = "diesen Schritt überspringen"; -$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben"; -$a->strings["Crop Image"] = "Bild zurechtschneiden"; -$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."; -$a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; -$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; -$a->strings["Profile deleted."] = "Profil gelöscht."; -$a->strings["Profile-"] = "Profil-"; -$a->strings["New profile created."] = "Neues Profil angelegt."; -$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; -$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; -$a->strings["Marital Status"] = "Familienstand"; -$a->strings["Romantic Partner"] = "Romanze"; -$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; -$a->strings["Religion"] = "Religion"; -$a->strings["Political Views"] = "Politische Ansichten"; -$a->strings["Gender"] = "Geschlecht"; -$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; -$a->strings["XMPP"] = "XMPP"; -$a->strings["Homepage"] = "Webseite"; -$a->strings["Interests"] = "Interessen"; -$a->strings["Address"] = "Adresse"; -$a->strings["Location"] = "Wohnort"; -$a->strings["Profile updated."] = "Profil aktualisiert."; -$a->strings[" and "] = " und "; -$a->strings["public profile"] = "öffentliches Profil"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; -$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; -$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; -$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; -$a->strings["Profile Actions"] = "Profilaktionen"; -$a->strings["Edit Profile Details"] = "Profil bearbeiten"; -$a->strings["Change Profile Photo"] = "Profilbild ändern"; -$a->strings["View this profile"] = "Dieses Profil anzeigen"; -$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; -$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; -$a->strings["Delete this profile"] = "Dieses Profil löschen"; -$a->strings["Basic information"] = "Grundinformationen"; -$a->strings["Profile picture"] = "Profilbild"; -$a->strings["Preferences"] = "Vorlieben"; -$a->strings["Status information"] = "Status Informationen"; -$a->strings["Additional information"] = "Zusätzliche Informationen"; -$a->strings["Relation"] = "Beziehung"; -$a->strings["Your Gender:"] = "Dein Geschlecht:"; -$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:"; -$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; -$a->strings["Profile Name:"] = "Profilname:"; -$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."; -$a->strings["Your Full Name:"] = "Dein kompletter Name:"; -$a->strings["Title/Description:"] = "Titel/Beschreibung:"; -$a->strings["Street Address:"] = "Adresse:"; -$a->strings["Locality/City:"] = "Wohnort:"; -$a->strings["Region/State:"] = "Region/Bundesstaat:"; -$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; -$a->strings["Country:"] = "Land:"; -$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Seit [Datum]:"; -$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; -$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse"; -$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können."; -$a->strings["Homepage URL:"] = "Adresse der Homepage:"; -$a->strings["Religious Views:"] = "Religiöse Ansichten:"; -$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; -$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; -$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; -$a->strings["Musical interests"] = "Musikalische Interessen"; -$a->strings["Books, literature"] = "Bücher, Literatur"; -$a->strings["Television"] = "Fernsehen"; -$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; -$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; -$a->strings["Love/romance"] = "Liebe/Romantik"; -$a->strings["Work/employment"] = "Arbeit/Anstellung"; -$a->strings["School/education"] = "Schule/Ausbildung"; -$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; -$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; +$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; +$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."; +$a->strings["Registration successful."] = "Registrierung erfolgreich."; +$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden."; +$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."; +$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst."; +$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."; +$a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): "; +$a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"; +$a->strings["Note for the admin"] = "Hinweis für den Admin"; +$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."; +$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."; +$a->strings["Your invitation ID: "] = "ID Deiner Einladung: "; +$a->strings["Registration"] = "Registrierung"; +$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"; +$a->strings["Your Email Address: "] = "Deine E-Mail-Adresse: "; +$a->strings["New Password:"] = "Neues Passwort:"; +$a->strings["Leave empty for an auto generated password."] = "Leer lassen um das Passwort automatisch zu generieren."; +$a->strings["Confirm:"] = "Bestätigen:"; +$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein."; +$a->strings["Choose a nickname: "] = "Spitznamen wählen: "; +$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz"; +$a->strings["Only logged in users are permitted to perform a search."] = "Nur eingeloggten Benutzern ist das Suchen gestattet."; +$a->strings["Too Many Requests"] = "Zu viele Abfragen"; +$a->strings["Only one search per minute is permitted for not logged in users."] = "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet."; +$a->strings["Items tagged with: %s"] = "Beiträge die mit %s getaggt sind"; +$a->strings["Account"] = "Nutzerkonto"; +$a->strings["Additional features"] = "Zusätzliche Features"; +$a->strings["Display"] = "Anzeige"; +$a->strings["Social Networks"] = "Soziale Netzwerke"; +$a->strings["Plugins"] = "Plugins"; +$a->strings["Connected apps"] = "Verbundene Programme"; +$a->strings["Remove account"] = "Konto löschen"; +$a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; +$a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; +$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet."; +$a->strings["Features updated"] = "Features aktualisiert"; +$a->strings["Relocate message has been send to your contacts"] = "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."; +$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."; +$a->strings["Wrong password."] = "Falsches Passwort."; +$a->strings["Password changed."] = "Passwort geändert."; +$a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."; +$a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen."; +$a->strings[" Name too short."] = " Name ist zu kurz."; +$a->strings["Wrong Password"] = "Falsches Passwort"; +$a->strings[" Not valid email."] = " Keine gültige E-Mail."; +$a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. "; +$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."; +$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."; +$a->strings["Settings updated."] = "Einstellungen aktualisiert."; +$a->strings["Add application"] = "Programm hinzufügen"; +$a->strings["Save Settings"] = "Einstellungen speichern"; +$a->strings["Consumer Key"] = "Consumer Key"; +$a->strings["Consumer Secret"] = "Consumer Secret"; +$a->strings["Redirect"] = "Umleiten"; +$a->strings["Icon url"] = "Icon URL"; +$a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten."; +$a->strings["Connected Apps"] = "Verbundene Programme"; +$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit"; +$a->strings["No name"] = "Kein Name"; +$a->strings["Remove authorization"] = "Autorisierung entziehen"; +$a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert"; +$a->strings["Plugin Settings"] = "Plugin-Einstellungen"; +$a->strings["Off"] = "Aus"; +$a->strings["On"] = "An"; +$a->strings["Additional Features"] = "Zusätzliche Features"; +$a->strings["General Social Media Settings"] = "Allgemeine Einstellungen zu Sozialen Medien"; +$a->strings["Disable intelligent shortening"] = "Intelligentes Link kürzen ausschalten"; +$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt."; +$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen"; +$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,."; +$a->strings["Default group for OStatus contacts"] = "Voreingestellte Gruppe für OStatus Kontakte"; +$a->strings["Your legacy GNU Social account"] = "Dein alter GNU Social Account"; +$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."; +$a->strings["Repair OStatus subscriptions"] = "OStatus Abonnements reparieren"; +$a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s"; +$a->strings["enabled"] = "eingeschaltet"; +$a->strings["disabled"] = "ausgeschaltet"; +$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)"; +$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert."; +$a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen"; +$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an."; +$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Check"; +$a->strings["IMAP server name:"] = "IMAP-Server-Name:"; +$a->strings["IMAP port:"] = "IMAP-Port:"; +$a->strings["Security:"] = "Sicherheit:"; +$a->strings["None"] = "Keine"; +$a->strings["Email login name:"] = "E-Mail-Login-Name:"; +$a->strings["Email password:"] = "E-Mail-Passwort:"; +$a->strings["Reply-to address:"] = "Reply-to Adresse:"; +$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"; +$a->strings["Action after import:"] = "Aktion nach Import:"; +$a->strings["Move to folder"] = "In einen Ordner verschieben"; +$a->strings["Move to folder:"] = "In diesen Ordner verschieben:"; +$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden."; +$a->strings["Display Settings"] = "Anzeige-Einstellungen"; +$a->strings["Display Theme:"] = "Theme:"; +$a->strings["Mobile Theme:"] = "Mobiles Theme"; +$a->strings["Suppress warning of insecure networks"] = "Warnung wegen unsicheren Netzwerken unterdrücken"; +$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."; +$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; +$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten."; +$a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "; +$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge"; +$a->strings["Number of items to display per page when viewed from mobile device:"] = "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"; +$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen"; +$a->strings["Calendar"] = "Kalender"; +$a->strings["Beginning of week:"] = "Wochenbeginn:"; +$a->strings["Don't show notices"] = "Info-Popups nicht anzeigen"; +$a->strings["Infinite scroll"] = "Endloses Scrollen"; +$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."; +$a->strings["Bandwith Saver Mode"] = "Bandbreiten-Spar-Modus"; +$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden."; +$a->strings["General Theme Settings"] = "Allgemeine Themeneinstellungen"; +$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen"; +$a->strings["Content Settings"] = "Einstellungen zum Inhalt"; +$a->strings["Theme settings"] = "Themeneinstellungen"; +$a->strings["Account Types"] = "Kontenarten"; +$a->strings["Personal Page Subtypes"] = "Unterarten der persönlichen Seite"; +$a->strings["Community Forum Subtypes"] = "Unterarten des Gemeinschaftsforums"; +$a->strings["Personal Page"] = "Persönliche Seite"; +$a->strings["Account for a personal profile."] = "Konto für ein persönliches Profil."; +$a->strings["Organisation Page"] = "Organisationsseite"; +$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt."; +$a->strings["News Page"] = "Nachrichtenseite"; +$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt."; +$a->strings["Community Forum"] = "Gemeinschaftsforum"; +$a->strings["Account for community discussions."] = "Konto für Diskussionsforen. "; +$a->strings["Normal Account Page"] = "Normales Konto"; +$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."; +$a->strings["Soapbox Page"] = "Marktschreier-Konto"; +$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt."; +$a->strings["Public Forum"] = "Öffentliches Forum"; +$a->strings["Automatically approves all contact requests."] = "Bestätigt alle Kontaktanfragen automatisch."; +$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite"; +$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt."; +$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]"; +$a->strings["Requires manual approval of contact requests."] = "Kontaktanfragen müssen manuell bestätigt werden."; +$a->strings["OpenID:"] = "OpenID:"; +$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."; +$a->strings["Publish your default profile in your local site directory?"] = "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"; +$a->strings["Your profile may be visible in public."] = "Dein Profil könnte öffentlich abrufbar sein."; +$a->strings["Publish your default profile in the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"; +$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"; +$a->strings["If enabled, posting public messages to Diaspora and other networks isn't possible."] = "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich"; +$a->strings["Allow friends to post to your profile page?"] = "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"; +$a->strings["Allow friends to tag your posts?"] = "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"; +$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"; +$a->strings["Permit unknown people to send you private mail?"] = "Dürfen Dir Unbekannte private Nachrichten schicken?"; +$a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>."; +$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'."; +$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"; +$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."; +$a->strings["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen"; +$a->strings["Advanced Expiration"] = "Erweitertes Verfallen"; +$a->strings["Expire posts:"] = "Beiträge verfallen lassen:"; +$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:"; +$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:"; +$a->strings["Expire photos:"] = "Fotos verfallen lassen:"; +$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen:"; +$a->strings["Account Settings"] = "Kontoeinstellungen"; +$a->strings["Password Settings"] = "Passwort-Einstellungen"; +$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"; +$a->strings["Current Password:"] = "Aktuelles Passwort:"; +$a->strings["Your current password to confirm the changes"] = "Dein aktuelles Passwort um die Änderungen zu bestätigen"; +$a->strings["Password:"] = "Passwort:"; +$a->strings["Basic Settings"] = "Grundeinstellungen"; +$a->strings["Email Address:"] = "E-Mail-Adresse:"; +$a->strings["Your Timezone:"] = "Deine Zeitzone:"; +$a->strings["Your Language:"] = "Deine Sprache:"; +$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken"; +$a->strings["Default Post Location:"] = "Standardstandort:"; +$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:"; +$a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen"; +$a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfragen/Tag:"; +$a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)"; +$a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge"; +$a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; +$a->strings["Default Private Post"] = "Privater Standardbeitrag"; +$a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag"; +$a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge"; +$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"; +$a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; +$a->strings["By default post a status message when:"] = "Standardmäßig eine Statusnachricht posten, wenn:"; +$a->strings["accepting a friend request"] = "– Du eine Kontaktanfrage akzeptierst"; +$a->strings["joining a forum/community"] = "– Du einem Forum/einer Gemeinschaftsseite beitrittst"; +$a->strings["making an <em>interesting</em> profile change"] = "– Du eine <em>interessante</em> Änderung an Deinem Profil durchführst"; +$a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:"; +$a->strings["You receive an introduction"] = "– Du eine Kontaktanfrage erhältst"; +$a->strings["Your introductions are confirmed"] = "– eine Deiner Kontaktanfragen akzeptiert wurde"; +$a->strings["Someone writes on your profile wall"] = "– jemand etwas auf Deine Pinnwand schreibt"; +$a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommentar verfasst"; +$a->strings["You receive a private message"] = "– Du eine private Nachricht erhältst"; +$a->strings["You receive a friend suggestion"] = "– Du eine Empfehlung erhältst"; +$a->strings["You are tagged in a post"] = "– Du in einem Beitrag erwähnt wirst"; +$a->strings["You are poked/prodded/etc. in a post"] = "– Du von jemandem angestupst oder sonstwie behandelt wirst"; +$a->strings["Activate desktop notifications"] = "Desktop Benachrichtigungen einschalten"; +$a->strings["Show desktop popup on new notifications"] = "Desktop Benachrichtigungen einschalten"; +$a->strings["Text-only notification emails"] = "Benachrichtigungs E-Mail als Rein-Text."; +$a->strings["Send text only notification emails, without the html part"] = "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"; +$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen"; +$a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:"; +$a->strings["Relocate"] = "Umziehen"; +$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."; +$a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden"; $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert."; $a->strings["Site"] = "Seite"; $a->strings["Users"] = "Nutzer"; -$a->strings["Plugins"] = "Plugins"; $a->strings["Themes"] = "Themen"; -$a->strings["Additional features"] = "Zusätzliche Features"; $a->strings["DB updates"] = "DB Updates"; $a->strings["Inspect Queue"] = "Warteschlange Inspizieren"; $a->strings["Server Blocklist"] = "Server Blockliste"; @@ -1579,11 +1756,11 @@ $a->strings["This page lists the content of the queue for outgoing postings. The $a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du <a href=\"%s\">hier</a> finden. Du kannst außerdem mit dem Befehl <tt>php include/dbstructure.php toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen."; $a->strings["The database update failed. Please run \"php include/dbstructure.php update\" from the command line and have a look at the errors that might appear."] = "Das Update der Datenbank ist fehlgeschlagen. Bitte führe 'php include/dbstructure.php update' in der Kommandozeile aus und achte auf eventuell auftretende Fehlermeldungen."; $a->strings["Normal Account"] = "Normales Konto"; -$a->strings["Soapbox Account"] = "Marktschreier-Konto"; -$a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto"; +$a->strings["Automatic Follower Account"] = "Automatisc Folgender Account"; +$a->strings["Public Forum Account"] = "Öffentliche Gemeinschaftsforen Accoun"; $a->strings["Automatic Friend Account"] = "Automatisches Freundekonto"; $a->strings["Blog Account"] = "Blog-Konto"; -$a->strings["Private Forum"] = "Privates Forum"; +$a->strings["Private Forum Account"] = "Private Gemeinschaftsforen Accoun"; $a->strings["Message queues"] = "Nachrichten-Warteschlangen"; $a->strings["Summary"] = "Zusammenfassung"; $a->strings["Registered users"] = "Registrierte Nutzer"; @@ -1592,7 +1769,6 @@ $a->strings["Version"] = "Version"; $a->strings["Active plugins"] = "Aktive Plugins"; $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <protokoll>://<domain> bestehen"; $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert."; -$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden."; $a->strings["No community page"] = "Keine Gemeinschaftsseite"; $a->strings["Public postings from users of this site"] = "Öffentliche Beiträge von Nutzer_innen dieser Seite"; $a->strings["Global community page"] = "Globale Gemeinschaftsseite"; @@ -1610,7 +1786,6 @@ $a->strings["Open"] = "Offen"; $a->strings["No SSL policy, links will track page SSL state"] = "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"; $a->strings["Force all links to use SSL"] = "SSL für alle Links erzwingen"; $a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"; -$a->strings["Save Settings"] = "Einstellungen speichern"; $a->strings["File upload"] = "Datei hochladen"; $a->strings["Policies"] = "Regeln"; $a->strings["Auto Discovered Contact Directory"] = "Automatisch ein Kontaktverzeichnis erstellen"; @@ -1783,7 +1958,6 @@ $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt"; $a->strings["Register date"] = "Anmeldedatum"; $a->strings["Last login"] = "Letzte Anmeldung"; $a->strings["Last item"] = "Letzter Beitrag"; -$a->strings["Account"] = "Nutzerkonto"; $a->strings["Add User"] = "Nutzer hinzufügen"; $a->strings["select all"] = "Alle auswählen"; $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf Deine Bestätigung warten"; @@ -1827,183 +2001,11 @@ $a->strings["Must be writable by web server. Relative to your Friendica top-leve $a->strings["Log level"] = "Protokoll-Level"; $a->strings["PHP logging"] = "PHP Protokollieren"; $a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest, Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie."; -$a->strings["Off"] = "Aus"; -$a->strings["On"] = "An"; $a->strings["Lock feature %s"] = "Feature festlegen: %s"; $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten"; -$a->strings["Display"] = "Anzeige"; -$a->strings["Social Networks"] = "Soziale Netzwerke"; -$a->strings["Connected apps"] = "Verbundene Programme"; -$a->strings["Remove account"] = "Konto löschen"; -$a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; -$a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; -$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet."; -$a->strings["Features updated"] = "Features aktualisiert"; -$a->strings["Relocate message has been send to your contacts"] = "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."; -$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."; -$a->strings["Wrong password."] = "Falsches Passwort."; -$a->strings["Password changed."] = "Passwort geändert."; -$a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."; -$a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen."; -$a->strings[" Name too short."] = " Name ist zu kurz."; -$a->strings["Wrong Password"] = "Falsches Passwort"; -$a->strings[" Not valid email."] = " Keine gültige E-Mail."; -$a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. "; -$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."; -$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."; -$a->strings["Settings updated."] = "Einstellungen aktualisiert."; -$a->strings["Add application"] = "Programm hinzufügen"; -$a->strings["Consumer Key"] = "Consumer Key"; -$a->strings["Consumer Secret"] = "Consumer Secret"; -$a->strings["Redirect"] = "Umleiten"; -$a->strings["Icon url"] = "Icon URL"; -$a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten."; -$a->strings["Connected Apps"] = "Verbundene Programme"; -$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit"; -$a->strings["No name"] = "Kein Name"; -$a->strings["Remove authorization"] = "Autorisierung entziehen"; -$a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert"; -$a->strings["Plugin Settings"] = "Plugin-Einstellungen"; -$a->strings["Additional Features"] = "Zusätzliche Features"; -$a->strings["General Social Media Settings"] = "Allgemeine Einstellungen zu Sozialen Medien"; -$a->strings["Disable intelligent shortening"] = "Intelligentes Link kürzen ausschalten"; -$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt."; -$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen"; -$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,."; -$a->strings["Default group for OStatus contacts"] = "Voreingestellte Gruppe für OStatus Kontakte"; -$a->strings["Your legacy GNU Social account"] = "Dein alter GNU Social Account"; -$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."; -$a->strings["Repair OStatus subscriptions"] = "OStatus Abonnements reparieren"; -$a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s"; -$a->strings["enabled"] = "eingeschaltet"; -$a->strings["disabled"] = "ausgeschaltet"; -$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)"; -$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert."; -$a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen"; -$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an."; -$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Check"; -$a->strings["IMAP server name:"] = "IMAP-Server-Name:"; -$a->strings["IMAP port:"] = "IMAP-Port:"; -$a->strings["Security:"] = "Sicherheit:"; -$a->strings["None"] = "Keine"; -$a->strings["Email login name:"] = "E-Mail-Login-Name:"; -$a->strings["Email password:"] = "E-Mail-Passwort:"; -$a->strings["Reply-to address:"] = "Reply-to Adresse:"; -$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"; -$a->strings["Action after import:"] = "Aktion nach Import:"; -$a->strings["Move to folder"] = "In einen Ordner verschieben"; -$a->strings["Move to folder:"] = "In diesen Ordner verschieben:"; -$a->strings["Display Settings"] = "Anzeige-Einstellungen"; -$a->strings["Display Theme:"] = "Theme:"; -$a->strings["Mobile Theme:"] = "Mobiles Theme"; -$a->strings["Suppress warning of insecure networks"] = "Warnung wegen unsicheren Netzwerken unterdrücken"; -$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."; -$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; -$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten."; -$a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "; -$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge"; -$a->strings["Number of items to display per page when viewed from mobile device:"] = "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"; -$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen"; -$a->strings["Calendar"] = "Kalender"; -$a->strings["Beginning of week:"] = "Wochenbeginn:"; -$a->strings["Don't show notices"] = "Info-Popups nicht anzeigen"; -$a->strings["Infinite scroll"] = "Endloses Scrollen"; -$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."; -$a->strings["Bandwith Saver Mode"] = "Bandbreiten-Spar-Modus"; -$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden."; -$a->strings["General Theme Settings"] = "Allgemeine Themeneinstellungen"; -$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen"; -$a->strings["Content Settings"] = "Einstellungen zum Inhalt"; -$a->strings["Theme settings"] = "Themeneinstellungen"; -$a->strings["Account Types"] = "Kontenarten"; -$a->strings["Personal Page Subtypes"] = "Unterarten der persönlichen Seite"; -$a->strings["Community Forum Subtypes"] = "Unterarten des Gemeinschaftsforums"; -$a->strings["Personal Page"] = "Persönliche Seite"; -$a->strings["Account for a personal profile."] = "Konto für ein persönliches Profil."; -$a->strings["Organisation Page"] = "Organisationsseite"; -$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt."; -$a->strings["News Page"] = "Nachrichtenseite"; -$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt."; -$a->strings["Community Forum"] = "Gemeinschaftsforum"; -$a->strings["Account for community discussions."] = "Konto für Diskussionsforen. "; -$a->strings["Normal Account Page"] = "Normales Konto"; -$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."; -$a->strings["Soapbox Page"] = "Marktschreier-Konto"; -$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt."; -$a->strings["Public Forum"] = "Öffentliches Forum"; -$a->strings["Automatically approves all contact requests."] = "Bestätigt alle Kontaktanfragen automatisch."; -$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite"; -$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt."; -$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]"; -$a->strings["Requires manual approval of contact requests."] = "Kontaktanfragen müssen manuell bestätigt werden."; -$a->strings["OpenID:"] = "OpenID:"; -$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."; -$a->strings["Publish your default profile in your local site directory?"] = "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"; -$a->strings["Your profile may be visible in public."] = "Dein Profil könnte öffentlich abrufbar sein."; -$a->strings["Publish your default profile in the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"; -$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"; -$a->strings["If enabled, posting public messages to Diaspora and other networks isn't possible."] = "Wenn aktiviert, ist das senden öffentliche Nachrichten zu Diaspora und anderen Netzwerken nicht möglich"; -$a->strings["Allow friends to post to your profile page?"] = "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"; -$a->strings["Allow friends to tag your posts?"] = "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"; -$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"; -$a->strings["Permit unknown people to send you private mail?"] = "Dürfen Dir Unbekannte private Nachrichten schicken?"; -$a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>."; -$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'."; -$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"; -$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."; -$a->strings["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen"; -$a->strings["Advanced Expiration"] = "Erweitertes Verfallen"; -$a->strings["Expire posts:"] = "Beiträge verfallen lassen:"; -$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:"; -$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:"; -$a->strings["Expire photos:"] = "Fotos verfallen lassen:"; -$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen:"; -$a->strings["Account Settings"] = "Kontoeinstellungen"; -$a->strings["Password Settings"] = "Passwort-Einstellungen"; -$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"; -$a->strings["Current Password:"] = "Aktuelles Passwort:"; -$a->strings["Your current password to confirm the changes"] = "Dein aktuelles Passwort um die Änderungen zu bestätigen"; -$a->strings["Password:"] = "Passwort:"; -$a->strings["Basic Settings"] = "Grundeinstellungen"; -$a->strings["Email Address:"] = "E-Mail-Adresse:"; -$a->strings["Your Timezone:"] = "Deine Zeitzone:"; -$a->strings["Your Language:"] = "Deine Sprache:"; -$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken"; -$a->strings["Default Post Location:"] = "Standardstandort:"; -$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:"; -$a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen"; -$a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfragen/Tag:"; -$a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)"; -$a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge"; -$a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; -$a->strings["Default Private Post"] = "Privater Standardbeitrag"; -$a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag"; -$a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge"; -$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"; -$a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; -$a->strings["By default post a status message when:"] = "Standardmäßig eine Statusnachricht posten, wenn:"; -$a->strings["accepting a friend request"] = "– Du eine Kontaktanfrage akzeptierst"; -$a->strings["joining a forum/community"] = "– Du einem Forum/einer Gemeinschaftsseite beitrittst"; -$a->strings["making an <em>interesting</em> profile change"] = "– Du eine <em>interessante</em> Änderung an Deinem Profil durchführst"; -$a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:"; -$a->strings["You receive an introduction"] = "– Du eine Kontaktanfrage erhältst"; -$a->strings["Your introductions are confirmed"] = "– eine Deiner Kontaktanfragen akzeptiert wurde"; -$a->strings["Someone writes on your profile wall"] = "– jemand etwas auf Deine Pinnwand schreibt"; -$a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommentar verfasst"; -$a->strings["You receive a private message"] = "– Du eine private Nachricht erhältst"; -$a->strings["You receive a friend suggestion"] = "– Du eine Empfehlung erhältst"; -$a->strings["You are tagged in a post"] = "– Du in einem Beitrag erwähnt wirst"; -$a->strings["You are poked/prodded/etc. in a post"] = "– Du von jemandem angestupst oder sonstwie behandelt wirst"; -$a->strings["Activate desktop notifications"] = "Desktop Benachrichtigungen einschalten"; -$a->strings["Show desktop popup on new notifications"] = "Desktop Benachrichtigungen einschalten"; -$a->strings["Text-only notification emails"] = "Benachrichtigungs E-Mail als Rein-Text."; -$a->strings["Send text only notification emails, without the html part"] = "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"; -$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen"; -$a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:"; -$a->strings["Relocate"] = "Umziehen"; -$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."; -$a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden"; $a->strings["via"] = "via"; +$a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; +$a->strings["show fewer"] = "weniger anzeigen"; $a->strings["greenzero"] = "greenzero"; $a->strings["purplezero"] = "purplezero"; $a->strings["easterbunny"] = "easterbunny"; @@ -2011,14 +2013,6 @@ $a->strings["darkzero"] = "darkzero"; $a->strings["comix"] = "comix"; $a->strings["slackr"] = "slackr"; $a->strings["Variations"] = "Variationen"; -$a->strings["Repeat the image"] = "Bild wiederholen"; -$a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen."; -$a->strings["Stretch"] = "Strecken"; -$a->strings["Will stretch to width/height of the image."] = "Streckt Breite/Höhe des Bildes."; -$a->strings["Resize fill and-clip"] = "Größe anpassen - Ausfüllen und abschneiden"; -$a->strings["Resize to fill and retain aspect ratio."] = "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten"; -$a->strings["Resize best fit"] = "Größe anpassen - Optimale Größe"; -$a->strings["Resize to best fit and retain aspect ratio."] = "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten"; $a->strings["Default"] = "Standard"; $a->strings["Note: "] = "Hinweis:"; $a->strings["Check image permissions if all users are allowed to visit the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen"; @@ -2029,6 +2023,14 @@ $a->strings["Link color"] = "Linkfarbe"; $a->strings["Set the background color"] = "Hintergrundfarbe festlegen"; $a->strings["Content background transparency"] = "Transparanz des Hintergrunds von Beiträgem"; $a->strings["Set the background image"] = "Hintergrundbild festlegen"; +$a->strings["Repeat the image"] = "Bild wiederholen"; +$a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen."; +$a->strings["Stretch"] = "Strecken"; +$a->strings["Will stretch to width/height of the image."] = "Streckt Breite/Höhe des Bildes."; +$a->strings["Resize fill and-clip"] = "Größe anpassen - Ausfüllen und abschneiden"; +$a->strings["Resize to fill and retain aspect ratio."] = "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten"; +$a->strings["Resize best fit"] = "Größe anpassen - Optimale Größe"; +$a->strings["Resize to best fit and retain aspect ratio."] = "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten"; $a->strings["Guest"] = "Gast"; $a->strings["Visitor"] = "Besucher"; $a->strings["Alignment"] = "Ausrichtung"; @@ -2047,9 +2049,6 @@ $a->strings["Find Friends"] = "Kontakte finden"; $a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Local Directory"] = "Lokales Verzeichnis"; $a->strings["Quick Start"] = "Schnell-Start"; -$a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; -$a->strings["show fewer"] = "weniger anzeigen"; -$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."; $a->strings["Create a New Account"] = "Neues Konto erstellen"; $a->strings["Password: "] = "Passwort: "; @@ -2060,3 +2059,4 @@ $a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen"; $a->strings["terms of service"] = "Nutzungsbedingungen"; $a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung"; $a->strings["privacy policy"] = "Datenschutzerklärung"; +$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; From dd250174b89d6e906c65ac7ead595ef87b50a1b0 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 30 Jun 2017 10:38:11 +0200 Subject: [PATCH 118/160] Let there be... --- INSTALL.txt | 8 ++++---- doc/Install.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 1cab3412e2..0faa021756 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -140,11 +140,11 @@ $a->config['system']['addon'] = 'js_upload,poormancron'; and save your changes. -9. (Optional) Set up a backup plan +9. (Recommended) Set up a backup plan -Bad things will happen. Be them a hardware failure, a currupted database -or whatever you can think of. So once the installation of your Friendica -node is done, you should make yoursef a backup plan. +Bad things will happen. Let there be them a hardware failure, a currupted +database or whatever you can think of. So once the installation of your +Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. As it stores all your data, you should also have a recent dump of your diff --git a/doc/Install.md b/doc/Install.md index 257d627785..100ca411f6 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -147,7 +147,7 @@ The addon tree has to be updated separately like so: ###Set up a backup plan Bad things will happen. -Be them a hardware failure, a currupted database or whatever you can think of. +Let there be them a hardware failure, a currupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. From 4593f43254aae1bda40c8b348e16bc28fc11b4c6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 30 Jun 2017 13:15:47 +0200 Subject: [PATCH 119/160] Update INSTALL.txt --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index 0faa021756..eac8f39c81 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -142,7 +142,7 @@ and save your changes. 9. (Recommended) Set up a backup plan -Bad things will happen. Let there be them a hardware failure, a currupted +Bad things will happen. Let there be a hardware failure, a currupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. From 1a7dce6814daaa39d6b331a27a2177385b2e807d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 30 Jun 2017 13:16:29 +0200 Subject: [PATCH 120/160] Update Install.md --- doc/Install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Install.md b/doc/Install.md index 100ca411f6..22f68ce5a2 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -147,7 +147,7 @@ The addon tree has to be updated separately like so: ###Set up a backup plan Bad things will happen. -Let there be them a hardware failure, a currupted database or whatever you can think of. +Let there be a hardware failure, a currupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. From 7726353601547fd829f3f86dc8598cfe0378f367 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Fri, 30 Jun 2017 23:08:08 +0000 Subject: [PATCH 121/160] Prevent soon killings --- include/poller.php | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/include/poller.php b/include/poller.php index 4ad9553882..bcdad586eb 100644 --- a/include/poller.php +++ b/include/poller.php @@ -113,6 +113,7 @@ function poller_run($argv, $argc){ // To avoid the quitting of multiple pollers only one poller at a time will execute the check if (Lock::set('poller_worker', 0)) { + $stamp = (float)microtime(true); // Count active workers and compare them with a maximum value that depends on the load if (poller_too_much_workers()) { logger('Active worker limit reached, quitting.', LOGGER_DEBUG); @@ -125,6 +126,7 @@ function poller_run($argv, $argc){ return; } Lock::remove('poller_worker'); + $poller_db_duration += (microtime(true) - $stamp); } // Quit the poller once every 5 minutes @@ -185,7 +187,7 @@ function poller_process_with_priority_active($priority) { * @return boolean "true" if further processing should be stopped */ function poller_execute($queue) { - global $poller_db_duration; + global $poller_db_duration, $poller_last_update; $a = get_app(); @@ -225,6 +227,19 @@ function poller_execute($queue) { $funcname = str_replace(".php", "", basename($argv[0]))."_run"; if (function_exists($funcname)) { + + // We constantly update the "executed" date every minute to avoid being killed to soon + if (!isset($poller_last_update)) { + $poller_last_update = strtotime($queue["executed"]); + } + + $age = (time() - $poller_last_update) / 60; + $poller_last_update = time(); + + if ($age > 1) { + dba::update('workerqueue', array('executed' => datetime_convert()), array('pid' => $mypid, 'done' => false)); + } + poller_exec_function($queue, $funcname, $argv); $stamp = (float)microtime(true); @@ -650,18 +665,16 @@ function poller_passing_slow(&$highest_priority) { * * @return boolean Have we found something? */ -function find_worker_processes($mypid = 0) { +function find_worker_processes() { - if ($mypid == 0) { - $mypid = getmypid(); - } + $mypid = getmypid(); // Check if we should pass some low priority process $highest_priority = 0; $found = false; // The higher the number of parallel workers, the more we prefetch to prevent concurring access - $limit = Config::get("system", "worker_queues", 4) * 2; + $limit = Config::get("system", "worker_queues", 4); $limit = Config::get('system', 'worker_fetch_limit', $limit); if (poller_passing_slow($highest_priority)) { From 0cd9db9cb7f4c96f597e37590a536eaae123238d Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sat, 1 Jul 2017 18:55:12 +0000 Subject: [PATCH 122/160] Degrade priority step by step --- include/poller.php | 47 ++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/include/poller.php b/include/poller.php index bcdad586eb..934641c13c 100644 --- a/include/poller.php +++ b/include/poller.php @@ -237,7 +237,9 @@ function poller_execute($queue) { $poller_last_update = time(); if ($age > 1) { + $stamp = (float)microtime(true); dba::update('workerqueue', array('executed' => datetime_convert()), array('pid' => $mypid, 'done' => false)); + $poller_db_duration += (microtime(true) - $stamp); } poller_exec_function($queue, $funcname, $argv); @@ -468,46 +470,47 @@ function poller_max_connections_reached() { * */ function poller_kill_stale_workers() { - $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > '%s' AND NOT `done`", dbesc(NULL_DATE)); + $entries = dba::p("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0", NULL_DATE); - if (!dbm::is_result($r)) { - // No processing here needed - return; - } - - foreach ($r AS $pid) { - if (!posix_kill($pid["pid"], 0)) { + while ($entry = dba::fetch($entries)) { + if (!posix_kill($entry["pid"], 0)) { dba::update('workerqueue', array('executed' => NULL_DATE, 'pid' => 0), - array('pid' => $pid["pid"], 'done' => false)); + array('pid' => $entry["pid"], 'done' => false)); } else { // Kill long running processes - // Check if the priority is in a valid range - if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) { - $pid["priority"] = PRIORITY_MEDIUM; + if (!in_array($entry["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) { + $entry["priority"] = PRIORITY_MEDIUM; } // Define the maximum durations - $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360); - $max_duration = $max_duration_defaults[$pid["priority"]]; + $max_duration_defaults = array(PRIORITY_CRITICAL => 720, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 720); + $max_duration = $max_duration_defaults[$entry["priority"]]; - $argv = json_decode($pid["parameter"]); + $argv = json_decode($entry["parameter"]); $argv[0] = basename($argv[0]); // How long is the process already running? - $duration = (time() - strtotime($pid["executed"])) / 60; + $duration = (time() - strtotime($entry["executed"])) / 60; if ($duration > $max_duration) { - logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now."); - posix_kill($pid["pid"], SIGTERM); + logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now."); + posix_kill($entry["pid"], SIGTERM); // 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. + // Additionally we are lowering the priority. (But not PRIORITY_CRITICAL) + if ($entry["priority"] == PRIORITY_HIGH) { + $new_priority = PRIORITY_MEDIUM; + } elseif ($entry["priority"] == PRIORITY_MEDIUM) { + $new_priority = PRIORITY_LOW; + } elseif ($entry["priority"] != PRIORITY_CRITICAL) { + $new_priority = PRIORITY_NEGLIGIBLE; + } dba::update('workerqueue', - array('executed' => NULL_DATE, 'created' => datetime_convert(), 'priority' => PRIORITY_NEGLIGIBLE, 'pid' => 0), - array('pid' => $pid["pid"], 'done' => false)); + array('executed' => NULL_DATE, 'created' => datetime_convert(), 'priority' => $new_priority, 'pid' => 0), + array('pid' => $entry["pid"], 'done' => false)); } else { - logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG); + logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG); } } } From 089d58527ee099ff1320aca9593f391bc5412b8d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Sun, 2 Jul 2017 07:51:31 +0200 Subject: [PATCH 123/160] Update INSTALL.txt --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index eac8f39c81..b271a9929a 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -142,7 +142,7 @@ and save your changes. 9. (Recommended) Set up a backup plan -Bad things will happen. Let there be a hardware failure, a currupted +Bad things will happen. Let there be a hardware failure, a corupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. From 29e9705d2679b2afd88ea089d999de6a5b82b759 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Sun, 2 Jul 2017 07:52:07 +0200 Subject: [PATCH 124/160] Update Install.md --- doc/Install.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Install.md b/doc/Install.md index 22f68ce5a2..a57888f98b 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -147,7 +147,7 @@ The addon tree has to be updated separately like so: ###Set up a backup plan Bad things will happen. -Let there be a hardware failure, a currupted database or whatever you can think of. +Let there be a hardware failure, a corrupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. The most important file is the `.htconfig.php` file in the base directory. From 87bcc1db971d7d754918362a4e45c822b8d34ec2 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Sun, 2 Jul 2017 21:39:15 +0200 Subject: [PATCH 125/160] Update INSTALL.txt --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index b271a9929a..592d3f5557 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -142,7 +142,7 @@ and save your changes. 9. (Recommended) Set up a backup plan -Bad things will happen. Let there be a hardware failure, a corupted +Bad things will happen. Let there be a hardware failure, a corrupted database or whatever you can think of. So once the installation of your Friendica node is done, you should make yoursef a backup plan. From bae4569a0b5c59c26e25f25d71734fb27e31e64b Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 2 Jul 2017 19:43:36 +0000 Subject: [PATCH 126/160] Avoid the killing of the wrong process --- include/poller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/poller.php b/include/poller.php index 934641c13c..50d883644d 100644 --- a/include/poller.php +++ b/include/poller.php @@ -228,7 +228,7 @@ function poller_execute($queue) { if (function_exists($funcname)) { - // We constantly update the "executed" date every minute to avoid being killed to soon + // We constantly update the "executed" date every minute to avoid being killed too soon if (!isset($poller_last_update)) { $poller_last_update = strtotime($queue["executed"]); } @@ -470,7 +470,7 @@ function poller_max_connections_reached() { * */ function poller_kill_stale_workers() { - $entries = dba::p("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0", NULL_DATE); + $entries = dba::p("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0 ORDER BY `priority`, `created`", NULL_DATE); while ($entry = dba::fetch($entries)) { if (!posix_kill($entry["pid"], 0)) { From e26991ba2609739278c71bea1511e5c86f9f3b18 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 3 Jul 2017 20:48:44 +0000 Subject: [PATCH 127/160] Guests should be able to use the search as well --- mod/search.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/search.php b/mod/search.php index 3397c813bf..1975a05bf6 100644 --- a/mod/search.php +++ b/mod/search.php @@ -92,12 +92,12 @@ function search_post(App $a) { function search_content(App $a) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - notice( t('Public access denied.') . EOL); + if (get_config('system','block_public') && !local_user() && !remote_user()) { + notice(t('Public access denied.') . EOL); return; } - if(get_config('system','local_search') && !local_user()) { + if (get_config('system','local_search') && !local_user() && !remote_user()) { http_status_exit(403, array("title" => t("Public access denied."), "description" => t("Only logged in users are permitted to perform a search."))); @@ -106,7 +106,7 @@ function search_content(App $a) { //return; } - if (get_config('system','permit_crawling') && !local_user()) { + if (get_config('system','permit_crawling') && !local_user() && !remote_user()) { // Default values: // 10 requests are "free", after the 11th only a call per minute is allowed From 0ab791581014cde0b1c887a663de82f8f7c3410a Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 4 Jul 2017 05:01:06 +0000 Subject: [PATCH 128/160] Only kill the first stale process --- include/poller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/poller.php b/include/poller.php index 50d883644d..4c0f665963 100644 --- a/include/poller.php +++ b/include/poller.php @@ -470,12 +470,12 @@ function poller_max_connections_reached() { * */ function poller_kill_stale_workers() { - $entries = dba::p("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0 ORDER BY `priority`, `created`", NULL_DATE); + $entries = dba::p("SELECT `id`, `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0 ORDER BY `priority`, `created`", NULL_DATE); while ($entry = dba::fetch($entries)) { if (!posix_kill($entry["pid"], 0)) { dba::update('workerqueue', array('executed' => NULL_DATE, 'pid' => 0), - array('pid' => $entry["pid"], 'done' => false)); + array('id' => $entry["id"])); } else { // Kill long running processes // Check if the priority is in a valid range @@ -508,7 +508,7 @@ function poller_kill_stale_workers() { } dba::update('workerqueue', array('executed' => NULL_DATE, 'created' => datetime_convert(), 'priority' => $new_priority, 'pid' => 0), - array('pid' => $entry["pid"], 'done' => false)); + array('id' => $entry["id"])); } else { logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG); } From c8b1b5180995abd0d913b8b087d1a7fad001e6ab Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 4 Jul 2017 05:31:42 +0000 Subject: [PATCH 129/160] Improved logging --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 31a709fcbf..5eb254b1e2 100644 --- a/include/items.php +++ b/include/items.php @@ -2051,7 +2051,7 @@ function item_expire($uid, $days, $network = "", $force = false) { $expire_photos = get_pconfig($uid, 'expire', 'photos'); $expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0 - logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); + logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); foreach ($r as $item) { From 30b0a035f984e0ba7241e4902b90f2bdee10a189 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 6 Jul 2017 05:48:02 +0000 Subject: [PATCH 130/160] Split expire.php in several processes / small worker changes --- include/cron.php | 2 +- include/discover_poco.php | 13 +++++----- include/expire.php | 52 +++++++++++++++++++++++++++++---------- include/gprobe.php | 2 +- include/identity.php | 2 +- include/poller.php | 32 ++++++++++++++++++------ include/queue.php | 2 +- include/socgraph.php | 12 ++++----- 8 files changed, 79 insertions(+), 38 deletions(-) diff --git a/include/cron.php b/include/cron.php index 0e58778440..eda88dbcd3 100644 --- a/include/cron.php +++ b/include/cron.php @@ -253,7 +253,7 @@ function cron_poll_contacts($argc, $argv) { } else { $priority = PRIORITY_LOW; } - proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/onepoll.php', intval($contact['id'])); + proc_run(array('priority' => $priority, 'dont_fork' => true), 'include/onepoll.php', (int)$contact['id']); } } } diff --git a/include/discover_poco.php b/include/discover_poco.php index 6bb296c9c1..dd208d492f 100644 --- a/include/discover_poco.php +++ b/include/discover_poco.php @@ -47,13 +47,12 @@ function discover_poco_run(&$argv, &$argc) { logger('start '.$search); if ($mode == 8) { - $profile_url = base64_decode($argv[2]); - if ($profile_url != "") { - poco_last_updated($profile_url, true); + if ($argv[2] != "") { + poco_last_updated($argv[2], true); } } elseif ($mode == 7) { if ($argc == 6) { - $url = base64_decode($argv[5]); + $url = $argv[5]; } else { $url = ''; } @@ -63,7 +62,7 @@ function discover_poco_run(&$argv, &$argc) { } elseif ($mode == 5) { update_server(); } elseif ($mode == 4) { - $server_url = base64_decode($argv[2]); + $server_url = $argv[2]; if ($server_url == "") { return; } @@ -119,7 +118,7 @@ function update_server() { } logger('Update server status for server '.$server["url"], LOGGER_DEBUG); - proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server["url"])); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server["url"]); if (++$updated > 250) { return; @@ -178,7 +177,7 @@ function discover_users() { if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || poco_check_server($server_url, $user["network"])) { logger('Check profile '.$user["url"]); - proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", base64_encode($user["url"])); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "check_profile", $user["url"]); if (++$checked > 100) { return; diff --git a/include/expire.php b/include/expire.php index aa34cbaa5b..b8295c2ef0 100644 --- a/include/expire.php +++ b/include/expire.php @@ -9,14 +9,32 @@ function expire_run(&$argv, &$argc){ require_once('include/items.php'); require_once('include/Contact.php'); + load_hooks(); + + if (($argc == 2) && (intval($argv[1]) > 0)) { + $user = dba::select('user', array('uid', 'username', 'expire'), array('uid' => $argv[1]), array('limit' => 1)); + if (dbm::is_result($user)) { + logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], LOGGER_DEBUG); + item_expire($user['uid'], $user['expire']); + logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG); + } + return; + } elseif (($argc == 3) && ($argv[1] == 'hook') && is_array($a->hooks) && array_key_exists("expire", $a->hooks)) { + foreach ($a->hooks["expire"] as $hook) { + if ($hook[1] == $argv[2]) { + logger("Calling expire hook '" . $hook[1] . "'", LOGGER_DEBUG); + call_single_hook($a, $name, $hook, $data); + } + } + return; + } + // physically remove anything that has been deleted for more than two months $r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); - if (dbm::is_result($r)) { - while ($row = dba::fetch($r)) { - dba::delete('item', array('id' => $row['id'])); - } - dba::close($r); + while ($row = dba::fetch($r)) { + dba::delete('item', array('id' => $row['id'])); } + dba::close($r); // make this optional as it could have a performance impact on large sites if (intval(get_config('system', 'optimize_items'))) { @@ -25,17 +43,25 @@ function expire_run(&$argv, &$argc){ logger('expire: start'); - $r = q("SELECT `uid`, `username`, `expire` FROM `user` WHERE `expire` != 0"); - if (dbm::is_result($r)) { - foreach ($r as $rr) { - logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG); - item_expire($rr['uid'], $rr['expire']); + $r = dba::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0"); + while ($row = dba::fetch($r)) { + logger('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', LOGGER_DEBUG); + proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true), + 'include/expire.php', (int)$row['uid']); + } + dba::close($r); + + logger('expire: calling hooks'); + + if (is_array($a->hooks) && array_key_exists('expire', $a->hooks)) { + foreach ($a->hooks['expire'] as $hook) { + logger("Calling expire hook for '" . $hook[1] . "'", LOGGER_DEBUG); + proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true), + 'include/expire.php', 'hook', $hook[1]); } } - load_hooks(); - - call_hooks('expire'); + logger('expire: end'); return; } diff --git a/include/gprobe.php b/include/gprobe.php index 788a9eb044..9fb93e9596 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -10,7 +10,7 @@ function gprobe_run(&$argv, &$argc){ if ($argc != 2) { return; } - $url = hex2bin($argv[1]); + $url = $argv[1]; $r = q("SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1", dbesc(normalise_link($url)) diff --git a/include/identity.php b/include/identity.php index c733bea31b..a6db963ddf 100644 --- a/include/identity.php +++ b/include/identity.php @@ -888,7 +888,7 @@ function zrl_init(App $a) { return; } - proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($tmp_str)); + proc_run(PRIORITY_LOW, 'include/gprobe.php', $tmp_str); $arr = array('zrl' => $tmp_str, 'url' => $a->cmd); call_hooks('zrl_init', $arr); } diff --git a/include/poller.php b/include/poller.php index 4c0f665963..89a17fa0c7 100644 --- a/include/poller.php +++ b/include/poller.php @@ -88,9 +88,11 @@ function poller_run($argv, $argc){ $starttime = time(); // We fetch the next queue entry that is about to be executed - while ($r = poller_worker_process()) { + while ($r = poller_worker_process($passing_slow)) { - $refetched = false; + // When we are processing jobs with a lower priority, we don't refetch new jobs + // Otherwise fast jobs could wait behind slow ones and could be blocked. + $refetched = $passing_slow; foreach ($r AS $entry) { // Assure that the priority is an integer value @@ -105,7 +107,7 @@ function poller_run($argv, $argc){ // If possible we will fetch new jobs for this worker if (!$refetched && Lock::set('poller_worker_process', 0)) { $stamp = (float)microtime(true); - $refetched = find_worker_processes(); + $refetched = find_worker_processes($passing_slow); $poller_db_duration += (microtime(true) - $stamp); Lock::remove('poller_worker_process'); } @@ -666,19 +668,31 @@ function poller_passing_slow(&$highest_priority) { /** * @brief Find and claim the next worker process for us * + * @param boolean $passing_slow Returns if we had passed low priority processes * @return boolean Have we found something? */ -function find_worker_processes() { +function find_worker_processes(&$passing_slow) { $mypid = getmypid(); // Check if we should pass some low priority process $highest_priority = 0; $found = false; + $passing_slow = false; // The higher the number of parallel workers, the more we prefetch to prevent concurring access - $limit = Config::get("system", "worker_queues", 4); - $limit = Config::get('system', 'worker_fetch_limit', $limit); + // We decrease the limit with the number of entries left in the queue + $worker_queues = Config::get("system", "worker_queues", 4); + $queue_length = Config::get('system', 'worker_fetch_limit', $worker_queues); + $lower_job_limit = $worker_queues * $queue_length * 2; + $jobs = poller_total_entries(); + + // Now do some magic + $exponent = 2; + $slope = $queue_length / pow($lower_job_limit, $exponent); + $limit = min($queue_length, ceil($slope * pow($jobs, $exponent))); + + logger('Total: '.$jobs.' - Maximum: '.$queue_length.' - jobs per queue: '.$limit, LOGGER_DEBUG); if (poller_passing_slow($highest_priority)) { // Are there waiting processes with a higher priority than the currently highest? @@ -707,6 +721,7 @@ function find_worker_processes() { dba::close($result); $found = (count($ids) > 0); + $passing_slow = $found; } } @@ -734,9 +749,10 @@ function find_worker_processes() { /** * @brief Returns the next worker process * + * @param boolean $passing_slow Returns if we had passed low priority processes * @return string SQL statement */ -function poller_worker_process() { +function poller_worker_process(&$passing_slow) { global $poller_db_duration, $poller_lock_duration; $stamp = (float)microtime(true); @@ -755,7 +771,7 @@ function poller_worker_process() { $poller_lock_duration = (microtime(true) - $stamp); $stamp = (float)microtime(true); - $found = find_worker_processes(); + $found = find_worker_processes($passing_slow); $poller_db_duration += (microtime(true) - $stamp); Lock::remove('poller_worker_process'); diff --git a/include/queue.php b/include/queue.php index f721326f06..865d6903a2 100644 --- a/include/queue.php +++ b/include/queue.php @@ -52,7 +52,7 @@ function queue_run(&$argv, &$argc) { if (dbm::is_result($r)) { foreach ($r as $q_item) { logger('Call queue for id '.$q_item['id']); - proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", $q_item['id']); + proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", (int)$q_item['id']); } } return; diff --git a/include/socgraph.php b/include/socgraph.php index f055aebdf8..ce6cdcdef6 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -38,7 +38,7 @@ require_once 'include/Photo.php'; */ function poco_load($cid, $uid = 0, $zcid = 0, $url = null) { // Call the function "poco_load_worker" via the worker - proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", intval($cid), intval($uid), intval($zcid), base64_encode($url)); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "poco_load", (int)$cid, (int)$uid, (int)$zcid, $url); } /** @@ -1668,7 +1668,7 @@ function poco_fetch_serverlist($poco) { $r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url))); if (!dbm::is_result($r)) { logger("Call server check for server ".$server_url, LOGGER_DEBUG); - proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($server_url)); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $server_url); } } } @@ -1690,7 +1690,7 @@ function poco_discover_federation() { $servers = json_decode($serverdata); foreach ($servers->pods as $server) { - proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode("https://".$server->host)); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", "https://".$server->host); } } @@ -1703,7 +1703,7 @@ function poco_discover_federation() { foreach ($servers as $server) { $url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name; - proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", base64_encode($url)); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "server", $url); } } } @@ -1813,7 +1813,7 @@ function poco_discover($complete = false) { } logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG); - proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", intval($server['id'])); + proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server_directory", (int)$server['id']); if (!$complete && (--$no_of_queries == 0)) { break; @@ -2091,7 +2091,7 @@ function get_gcontact_id($contact) { if ($doprobing) { logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG); - proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"])); + proc_run(PRIORITY_LOW, 'include/gprobe.php', $contact["url"]); } return $gcontact_id; From 255f38710cc524e887e64ca649de8ace9a10e9e6 Mon Sep 17 00:00:00 2001 From: RJ Madsen <rjm6823@rit.edu> Date: Thu, 6 Jul 2017 14:19:58 -0400 Subject: [PATCH 131/160] Added global directory link to the find people side panel --- .gitignore | 3 +++ include/contact_widgets.php | 3 ++- view/templates/peoplefind.tpl | 1 + view/theme/smoothly/style.css | 12 ++++++++---- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cd299f2d85..374fbc532c 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ venv/ #ignore git projects in vendor vendor/**/.git + +#ignore config files from JetBrains +/.idea \ No newline at end of file diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 3cd18c7792..b40e5cc4ed 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -37,7 +37,8 @@ function findpeople_widget() { '$suggest' => t('Friend Suggestions'), '$similar' => t('Similar Interests'), '$random' => t('Random Profile'), - '$inv' => t('Invite Friends') + '$inv' => t('Invite Friends'), + 'directory' => t('View Global Directory') )); } diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 45c4c0b622..0d1c6c79ba 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -7,6 +7,7 @@ </form> <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div> + <div class="side-link" id="side-directory-link"><a href="directory" >{{$directory}}</a></div> <div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div> {{if $inv}} <div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div> diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index ec52277bdd..07fc3ed895 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -3057,7 +3057,8 @@ margin-left: 0px; #side-invite-link, #side-random-profile-link, #side-suggest-link, -#side-match-link { +#side-match-link, +#side-directory-link { width: 80%; padding: 10px; margin: auto; @@ -3079,7 +3080,8 @@ margin-left: 0px; #side-invite-link:hover, #side-random-profile-link:hover, #side-suggest-link:hover, -#side-match-link:hover { +#side-match-link:hover, +#side-directory-link:hover { color: #efefef; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) ); background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% ); @@ -3098,7 +3100,8 @@ margin-left: 0px; #side-invite-link:active, #side-random-profile-link:active, #side-suggest-link:active, -#side-match-link:active { +#side-match-link:active, +#side-directory-link:active { background-color: #1873a2; position: relative; top: 1px; @@ -3107,7 +3110,8 @@ margin-left: 0px; #side-invite-link a, #side-random-profile-link a, #side-suggest-link a, -#side-match-link a { +#side-match-link a, +#side-directory-link a { color: #efefef; } From b7b8c5477b496ff2787e7f30c9f1fd0d7b604425 Mon Sep 17 00:00:00 2001 From: RJ Madsen <rjm6823@rit.edu> Date: Thu, 6 Jul 2017 15:27:03 -0400 Subject: [PATCH 132/160] Converted from space to tab indentation --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index b40e5cc4ed..6a9f5ec1b7 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -38,7 +38,7 @@ function findpeople_widget() { '$similar' => t('Similar Interests'), '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), - 'directory' => t('View Global Directory') + 'directory' => t('View Global Directory') )); } From 7593152bcb79cf8f8eefd23a0db59b08eb3324cf Mon Sep 17 00:00:00 2001 From: RJ Madsen <rjm6823@rit.edu> Date: Thu, 6 Jul 2017 16:37:55 -0400 Subject: [PATCH 133/160] re-named variable to match scheme --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 6a9f5ec1b7..fc1f7191ba 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -38,7 +38,7 @@ function findpeople_widget() { '$similar' => t('Similar Interests'), '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), - 'directory' => t('View Global Directory') + '$directory' => t('View Global Directory') )); } From c4b40babb0ea22504fd3b5cbcdbb8efc02e9bce3 Mon Sep 17 00:00:00 2001 From: RJ Madsen <rjm6823@rit.edu> Date: Thu, 6 Jul 2017 17:31:36 -0400 Subject: [PATCH 134/160] Switched to proper global directory instead of local directory --- include/contact_widgets.php | 5 ++++- view/templates/peoplefind.tpl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index fc1f7191ba..14cb13cdee 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -1,6 +1,7 @@ <?php use Friendica\App; +use Friendica\Core\Config; function follow_widget($value = "") { @@ -18,6 +19,7 @@ function findpeople_widget() { require_once 'include/Contact.php'; $a = get_app(); + $global_dir = Config::get('system', 'directory'); if (get_config('system', 'invitation_only')) { $x = get_pconfig(local_user(), 'system', 'invites_remaining'); @@ -38,7 +40,8 @@ function findpeople_widget() { '$similar' => t('Similar Interests'), '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), - '$directory' => t('View Global Directory') + '$directory' => t('View Global Directory'), + '$global_dir' => $global_dir )); } diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 0d1c6c79ba..6cbe42e737 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -7,7 +7,7 @@ </form> <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div> - <div class="side-link" id="side-directory-link"><a href="directory" >{{$directory}}</a></div> + <div class="side-link" id="side-directory-link"><a href={{$global_dir}} target="extlink" >{{$directory}}</a></div> <div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div> {{if $inv}} <div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div> From d7de2e0750ba890df2c3672d3e520e562e8eda9e Mon Sep 17 00:00:00 2001 From: RJ Madsen <rjm6823@rit.edu> Date: Thu, 6 Jul 2017 17:33:30 -0400 Subject: [PATCH 135/160] Fixed minor spaces to tabs conversion --- include/contact_widgets.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 14cb13cdee..0b82fcb8f3 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -19,7 +19,7 @@ function findpeople_widget() { require_once 'include/Contact.php'; $a = get_app(); - $global_dir = Config::get('system', 'directory'); + $global_dir = Config::get('system', 'directory'); if (get_config('system', 'invitation_only')) { $x = get_pconfig(local_user(), 'system', 'invites_remaining'); @@ -41,7 +41,7 @@ function findpeople_widget() { '$random' => t('Random Profile'), '$inv' => t('Invite Friends'), '$directory' => t('View Global Directory'), - '$global_dir' => $global_dir + '$global_dir' => $global_dir )); } From fec2f8fd8259db66d5dcf700e8e855acad596d1b Mon Sep 17 00:00:00 2001 From: RJ Madsen <rjm6823@rit.edu> Date: Thu, 6 Jul 2017 17:56:18 -0400 Subject: [PATCH 136/160] Replacing quotes around new directory link --- view/templates/peoplefind.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 6cbe42e737..481bdd71e0 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -7,7 +7,7 @@ </form> <div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div> - <div class="side-link" id="side-directory-link"><a href={{$global_dir}} target="extlink" >{{$directory}}</a></div> + <div class="side-link" id="side-directory-link"><a href="{{$global_dir}}" target="extlink" >{{$directory}}</a></div> <div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div> {{if $inv}} <div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div> From 1e0f4c2f7023a1df5d41d72cf9e5ce977e5ef8a5 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 7 Jul 2017 08:43:10 +0200 Subject: [PATCH 137/160] DE and ES translations --- view/lang/de/messages.po | 4 +- view/lang/de/strings.php | 2 +- view/lang/es/messages.po | 7201 +++++++++++++++++++------------------- view/lang/es/strings.php | 1732 ++++----- 4 files changed, 4475 insertions(+), 4464 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index a72d3368bb..fb0982d590 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -37,7 +37,7 @@ msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-19 16:23+0700\n" -"PO-Revision-Date: 2017-06-30 06:22+0000\n" +"PO-Revision-Date: 2017-07-07 06:21+0000\n" "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -167,7 +167,7 @@ msgstr "Sekunden" #: include/datetime.php:394 #, php-format msgid "%1$d %2$s ago" -msgstr "%1$d %2$s her" +msgstr "vor %1$d %2$s" #: include/datetime.php:620 #, php-format diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index 58d84f30cb..5d30a91362 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -32,7 +32,7 @@ $a->strings["minute"] = "Minute"; $a->strings["minutes"] = "Minuten"; $a->strings["second"] = "Sekunde"; $a->strings["seconds"] = "Sekunden"; -$a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her"; +$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s"; $a->strings["%s's birthday"] = "%ss Geburtstag"; $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; $a->strings["all-day"] = "ganztägig"; diff --git a/view/lang/es/messages.po b/view/lang/es/messages.po index fcf6a139ef..d8b801706b 100644 --- a/view/lang/es/messages.po +++ b/view/lang/es/messages.po @@ -15,6 +15,7 @@ # greeneyedred <greeneyedred@googlemail.com>, 2012 # Hauke Zühl <hzuehl@phone-talk.de>, 2012 # Hauke Zühl <hzuehl@phone-talk.de>, 2011-2012 +# juanman <juanma@gnutn.org.ar>, 2017 # juanman <juanma@gnutn.org.ar>, 2011-2012 # leberwurscht <leberwurscht@hoegners.de>, 2012 # Manuel Pérez <mpmonis@gmail.com>, 2011-2012,2014 @@ -35,9 +36,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-28 11:09+0200\n" -"PO-Revision-Date: 2017-05-29 00:41+0000\n" -"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n" +"POT-Creation-Date: 2017-06-19 16:23+0700\n" +"PO-Revision-Date: 2017-07-04 16:29+0000\n" +"Last-Translator: juanman <juanma@gnutn.org.ar>\n" "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,123 +46,326 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: include/contact_selectors.php:32 -msgid "Unknown | Not categorised" -msgstr "Desconocido | No clasificado" +#: include/ForumManager.php:116 include/nav.php:133 include/text.php:1094 +#: view/theme/vier/theme.php:248 +msgid "Forums" +msgstr "Foros" -#: include/contact_selectors.php:33 -msgid "Block immediately" -msgstr "Bloquear inmediatamente" +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 +msgid "External link to forum" +msgstr "Enlace externo al foro" -#: include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" -msgstr "Sospechoso, spammer, auto-publicidad" +#: include/ForumManager.php:121 include/contact_widgets.php:271 +#: include/items.php:2432 mod/content.php:625 object/Item.php:417 +#: src/App.php:507 view/theme/vier/theme.php:253 +msgid "show more" +msgstr "ver más" -#: include/contact_selectors.php:35 -msgid "Known to me, but no opinion" -msgstr "Le conozco, sin opinión" +#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 +msgid "l F d, Y \\@ g:i A" +msgstr "l F d, Y \\@ g:i A" -#: include/contact_selectors.php:36 -msgid "OK, probably harmless" -msgstr "OK, probablemente inofensivo" +#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 +#: include/event.php:459 +msgid "Starts:" +msgstr "Inicio:" -#: include/contact_selectors.php:37 -msgid "Reputable, has my trust" -msgstr "Buena reputación, tiene mi confianza" +#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 +#: include/event.php:460 +msgid "Finishes:" +msgstr "Final:" -#: include/contact_selectors.php:56 mod/admin.php:986 -msgid "Frequently" -msgstr "Frequentemente" +#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 +#: include/event.php:461 include/identity.php:342 mod/directory.php:135 +#: mod/notifications.php:246 mod/contacts.php:639 mod/events.php:496 +msgid "Location:" +msgstr "Localización:" -#: include/contact_selectors.php:57 mod/admin.php:987 -msgid "Hourly" -msgstr "Cada hora" +#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 +msgid "Miscellaneous" +msgstr "Varios" -#: include/contact_selectors.php:58 mod/admin.php:988 -msgid "Twice daily" -msgstr "Dos veces al día" +#: include/datetime.php:196 include/identity.php:656 +msgid "Birthday:" +msgstr "Fecha de nacimiento:" -#: include/contact_selectors.php:59 mod/admin.php:989 -msgid "Daily" -msgstr "Diariamente" +#: include/datetime.php:198 mod/profiles.php:724 +msgid "Age: " +msgstr "Edad: " -#: include/contact_selectors.php:60 -msgid "Weekly" -msgstr "Semanalmente" +#: include/datetime.php:200 +msgid "YYYY-MM-DD or MM-DD" +msgstr "YYYY-MM-DD o MM-DD" -#: include/contact_selectors.php:61 -msgid "Monthly" -msgstr "Mensualmente" +#: include/datetime.php:370 +msgid "never" +msgstr "nunca" -#: include/contact_selectors.php:76 mod/dfrn_request.php:886 -msgid "Friendica" -msgstr "Friendica" +#: include/datetime.php:376 +msgid "less than a second ago" +msgstr "hace menos de un segundo" -#: include/contact_selectors.php:77 -msgid "OStatus" -msgstr "OStatus" +#: include/datetime.php:379 +msgid "year" +msgstr "año" -#: include/contact_selectors.php:78 -msgid "RSS/Atom" -msgstr "RSS/Atom" +#: include/datetime.php:379 +msgid "years" +msgstr "años" -#: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 -msgid "Email" -msgstr "Correo electrónico" +#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 +#: mod/events.php:387 +msgid "month" +msgstr "mes" -#: include/contact_selectors.php:80 mod/dfrn_request.php:888 -#: mod/settings.php:849 -msgid "Diaspora" -msgstr "Diaspora*" +#: include/datetime.php:380 +msgid "months" +msgstr "meses" -#: include/contact_selectors.php:81 -msgid "Facebook" -msgstr "Facebook" +#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 +#: mod/events.php:388 +msgid "week" +msgstr "semana" -#: include/contact_selectors.php:82 -msgid "Zot!" -msgstr "Zot!" +#: include/datetime.php:381 +msgid "weeks" +msgstr "semanas" -#: include/contact_selectors.php:83 -msgid "LinkedIn" -msgstr "LinkedIn" +#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 +#: mod/events.php:389 +msgid "day" +msgstr "día" -#: include/contact_selectors.php:84 -msgid "XMPP/IM" -msgstr "XMPP/IM" +#: include/datetime.php:382 +msgid "days" +msgstr "días" -#: include/contact_selectors.php:85 -msgid "MySpace" -msgstr "MySpace" +#: include/datetime.php:383 +msgid "hour" +msgstr "hora" -#: include/contact_selectors.php:87 -msgid "Google+" -msgstr "Google+" +#: include/datetime.php:383 +msgid "hours" +msgstr "horas" -#: include/contact_selectors.php:88 -msgid "pump.io" -msgstr "pump.io" +#: include/datetime.php:384 +msgid "minute" +msgstr "minuto" -#: include/contact_selectors.php:89 -msgid "Twitter" -msgstr "Twitter" +#: include/datetime.php:384 +msgid "minutes" +msgstr "minutos" -#: include/contact_selectors.php:90 -msgid "Diaspora Connector" -msgstr "Conector Diaspora" +#: include/datetime.php:385 +msgid "second" +msgstr "segundo" -#: include/contact_selectors.php:91 -msgid "GNU Social Connector" -msgstr "" +#: include/datetime.php:385 +msgid "seconds" +msgstr "segundos" -#: include/contact_selectors.php:92 -msgid "pnut" -msgstr "pnut" +#: include/datetime.php:394 +#, php-format +msgid "%1$d %2$s ago" +msgstr "hace %1$d %2$s" -#: include/contact_selectors.php:93 -msgid "App.net" -msgstr "App.net" +#: include/datetime.php:620 +#, php-format +msgid "%s's birthday" +msgstr "Cumpleaños de %s" + +#: include/datetime.php:621 include/dfrn.php:1310 +#, php-format +msgid "Happy Birthday %s" +msgstr "Feliz cumpleaños %s" + +#: include/event.php:408 +msgid "all-day" +msgstr "todo el día" + +#: include/event.php:410 +msgid "Sun" +msgstr "Dom" + +#: include/event.php:411 +msgid "Mon" +msgstr "Lun" + +#: include/event.php:412 +msgid "Tue" +msgstr "Mar" + +#: include/event.php:413 +msgid "Wed" +msgstr "Mie" + +#: include/event.php:414 +msgid "Thu" +msgstr "Jue" + +#: include/event.php:415 +msgid "Fri" +msgstr "Vie" + +#: include/event.php:416 +msgid "Sat" +msgstr "Sab" + +#: include/event.php:418 include/text.php:1199 mod/settings.php:982 +msgid "Sunday" +msgstr "Domingo" + +#: include/event.php:419 include/text.php:1199 mod/settings.php:982 +msgid "Monday" +msgstr "Lunes" + +#: include/event.php:420 include/text.php:1199 +msgid "Tuesday" +msgstr "Martes" + +#: include/event.php:421 include/text.php:1199 +msgid "Wednesday" +msgstr "Miércoles" + +#: include/event.php:422 include/text.php:1199 +msgid "Thursday" +msgstr "Jueves" + +#: include/event.php:423 include/text.php:1199 +msgid "Friday" +msgstr "Viernes" + +#: include/event.php:424 include/text.php:1199 +msgid "Saturday" +msgstr "Sábado" + +#: include/event.php:426 +msgid "Jan" +msgstr "Ene" + +#: include/event.php:427 +msgid "Feb" +msgstr "Feb" + +#: include/event.php:428 +msgid "Mar" +msgstr "Mar" + +#: include/event.php:429 +msgid "Apr" +msgstr "Abr" + +#: include/event.php:430 include/event.php:443 include/text.php:1203 +msgid "May" +msgstr "Mayo" + +#: include/event.php:431 +msgid "Jun" +msgstr "Jun" + +#: include/event.php:432 +msgid "Jul" +msgstr "Jul" + +#: include/event.php:433 +msgid "Aug" +msgstr "Ago" + +#: include/event.php:434 +msgid "Sept" +msgstr "Sept" + +#: include/event.php:435 +msgid "Oct" +msgstr "Oct" + +#: include/event.php:436 +msgid "Nov" +msgstr "Nov" + +#: include/event.php:437 +msgid "Dec" +msgstr "Dec" + +#: include/event.php:439 include/text.php:1203 +msgid "January" +msgstr "Enero" + +#: include/event.php:440 include/text.php:1203 +msgid "February" +msgstr "Febrero" + +#: include/event.php:441 include/text.php:1203 +msgid "March" +msgstr "Marzo" + +#: include/event.php:442 include/text.php:1203 +msgid "April" +msgstr "Abril" + +#: include/event.php:444 include/text.php:1203 +msgid "June" +msgstr "Junio" + +#: include/event.php:445 include/text.php:1203 +msgid "July" +msgstr "Julio" + +#: include/event.php:446 include/text.php:1203 +msgid "August" +msgstr "Agosto" + +#: include/event.php:447 include/text.php:1203 +msgid "September" +msgstr "Septiembre" + +#: include/event.php:448 include/text.php:1203 +msgid "October" +msgstr "Octubre" + +#: include/event.php:449 include/text.php:1203 +msgid "November" +msgstr "Noviembre" + +#: include/event.php:450 include/text.php:1203 +msgid "December" +msgstr "Diciembre" + +#: include/event.php:452 mod/cal.php:280 mod/events.php:386 +msgid "today" +msgstr "hoy" + +#: include/event.php:457 +msgid "No events to display" +msgstr "No hay eventos a mostrar" + +#: include/event.php:570 +msgid "l, F j" +msgstr "l, F j" + +#: include/event.php:592 +msgid "Edit event" +msgstr "Editar evento" + +#: include/event.php:593 +msgid "Delete event" +msgstr "Borrar evento" + +#: include/event.php:619 include/text.php:1601 include/text.php:1608 +msgid "link to source" +msgstr "Enlace al original" + +#: include/event.php:873 +msgid "Export" +msgstr "Exportar" + +#: include/event.php:874 +msgid "Export calendar as ical" +msgstr "Exportar calendario como ical" + +#: include/event.php:875 +msgid "Export calendar as csv" +msgstr "Exportar calendario como csv" #: include/features.php:65 msgid "General Features" @@ -362,132 +566,606 @@ msgstr "Ajustes avanzados del perfil" msgid "Show visitors public community forums at the Advanced Profile Page" msgstr "Mostrar a los visitantes foros públicos en las que se esta participando en el pagina avanzada de perfiles." -#: include/group.php:25 +#: include/like.php:30 include/conversation.php:154 include/diaspora.php:1649 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "A %1$s le gusta %3$s de %2$s" + +#: include/like.php:34 include/like.php:39 include/conversation.php:157 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "A %1$s no le gusta %3$s de %2$s" + +#: include/like.php:44 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "%1$s atenderá %2$s's %3$s" + +#: include/like.php:49 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "%1$s no atenderá %2$s's %3$s" + +#: include/like.php:54 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "%1$s puede que atienda %2$s's %3$s" + +#: include/like.php:181 include/conversation.php:142 +#: include/conversation.php:294 include/text.php:1873 mod/subthread.php:89 +#: mod/tagger.php:63 +msgid "photo" +msgstr "foto" + +#: include/like.php:181 include/conversation.php:137 +#: include/conversation.php:147 include/conversation.php:289 +#: include/conversation.php:298 include/diaspora.php:1653 mod/subthread.php:89 +#: mod/tagger.php:63 +msgid "status" +msgstr "estado" + +#: include/like.php:183 include/conversation.php:134 +#: include/conversation.php:286 include/text.php:1871 +msgid "event" +msgstr "evento" + +#: include/profile_selectors.php:6 +msgid "Male" +msgstr "Hombre" + +#: include/profile_selectors.php:6 +msgid "Female" +msgstr "Mujer" + +#: include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Actualmente Hombre" + +#: include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Actualmente Mujer" + +#: include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Mayormente Hombre" + +#: include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Mayormente Mujer" + +#: include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transgenérico" + +#: include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Bisexual" + +#: include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transexual" + +#: include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Hermafrodita" + +#: include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Neutro" + +#: include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "Sin especificar" + +#: include/profile_selectors.php:6 +msgid "Other" +msgstr "Otro" + +#: include/profile_selectors.php:6 include/conversation.php:1548 +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "Indeciso" +msgstr[1] "Indeciso" + +#: include/profile_selectors.php:23 +msgid "Males" +msgstr "Hombres" + +#: include/profile_selectors.php:23 +msgid "Females" +msgstr "Mujeres" + +#: include/profile_selectors.php:23 +msgid "Gay" +msgstr "Gay" + +#: include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "Lesbiana" + +#: include/profile_selectors.php:23 +msgid "No Preference" +msgstr "Sin preferencias" + +#: include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "Bisexual" + +#: include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "Autosexual" + +#: include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "Célibe" + +#: include/profile_selectors.php:23 +msgid "Virgin" +msgstr "Virgen" + +#: include/profile_selectors.php:23 +msgid "Deviant" +msgstr "Desviado" + +#: include/profile_selectors.php:23 +msgid "Fetish" +msgstr "Fetichista" + +#: include/profile_selectors.php:23 +msgid "Oodles" +msgstr "Orgiástico" + +#: include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "Asexual" + +#: include/profile_selectors.php:42 +msgid "Single" +msgstr "Soltero" + +#: include/profile_selectors.php:42 +msgid "Lonely" +msgstr "Solitario" + +#: include/profile_selectors.php:42 +msgid "Available" +msgstr "Disponible" + +#: include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "No disponible" + +#: include/profile_selectors.php:42 +msgid "Has crush" +msgstr "Enamorado" + +#: include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "Loco/a por alguien" + +#: include/profile_selectors.php:42 +msgid "Dating" +msgstr "De citas" + +#: include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "Infiel" + +#: include/profile_selectors.php:42 +msgid "Sex Addict" +msgstr "Adicto al sexo" + +#: include/profile_selectors.php:42 include/user.php:260 include/user.php:264 +msgid "Friends" +msgstr "Amigos" + +#: include/profile_selectors.php:42 +msgid "Friends/Benefits" +msgstr "Amigos con beneficios" + +#: include/profile_selectors.php:42 +msgid "Casual" +msgstr "Casual" + +#: include/profile_selectors.php:42 +msgid "Engaged" +msgstr "Comprometido/a" + +#: include/profile_selectors.php:42 +msgid "Married" +msgstr "Casado/a" + +#: include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "Casado imaginario" + +#: include/profile_selectors.php:42 +msgid "Partners" +msgstr "Socios" + +#: include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "Cohabitando" + +#: include/profile_selectors.php:42 +msgid "Common law" +msgstr "Pareja de hecho" + +#: include/profile_selectors.php:42 +msgid "Happy" +msgstr "Feliz" + +#: include/profile_selectors.php:42 +msgid "Not looking" +msgstr "No busca relación" + +#: include/profile_selectors.php:42 +msgid "Swinger" +msgstr "Swinger" + +#: include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "Traicionado/a" + +#: include/profile_selectors.php:42 +msgid "Separated" +msgstr "Separado/a" + +#: include/profile_selectors.php:42 +msgid "Unstable" +msgstr "Inestable" + +#: include/profile_selectors.php:42 +msgid "Divorced" +msgstr "Divorciado/a" + +#: include/profile_selectors.php:42 +msgid "Imaginarily divorced" +msgstr "Divorciado imaginario" + +#: include/profile_selectors.php:42 +msgid "Widowed" +msgstr "Viudo/a" + +#: include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "Incierto" + +#: include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "Es complicado" + +#: include/profile_selectors.php:42 +msgid "Don't care" +msgstr "No te importa" + +#: include/profile_selectors.php:42 +msgid "Ask me" +msgstr "Pregúntame" + +#: include/security.php:63 +msgid "Welcome " +msgstr "Bienvenido " + +#: include/security.php:64 +msgid "Please upload a profile photo." +msgstr "Por favor sube una foto para tu perfil." + +#: include/security.php:67 +msgid "Welcome back " +msgstr "Bienvenido de nuevo " + +#: include/security.php:431 msgid "" -"A deleted group with this name was revived. Existing item permissions " -"<strong>may</strong> apply to this group and any future members. If this is " -"not what you intended, please create another group with a different name." -msgstr "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente." +"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 "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo." -#: include/group.php:210 -msgid "Default privacy group for new contacts" -msgstr "Grupo por defecto para nuevos contactos" +#: include/uimport.php:85 +msgid "Error decoding account file" +msgstr "Error decodificando el archivo de cuenta" -#: include/group.php:243 -msgid "Everybody" -msgstr "Todo el mundo" +#: include/uimport.php:91 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? " -#: include/group.php:266 -msgid "edit" -msgstr "editar" +#: include/uimport.php:108 include/uimport.php:119 +msgid "Error! Cannot check nickname" +msgstr "Error! No puedo consultar el apodo" -#: include/group.php:287 mod/newmember.php:39 -msgid "Groups" -msgstr "Grupos" +#: include/uimport.php:112 include/uimport.php:123 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "La cuenta '%s' ya existe en este servidor!" -#: include/group.php:289 -msgid "Edit groups" -msgstr "Editar grupo" +#: include/uimport.php:145 +msgid "User creation error" +msgstr "Error al crear la cuenta" -#: include/group.php:291 -msgid "Edit group" -msgstr "Editar grupo" +#: include/uimport.php:166 +msgid "User profile creation error" +msgstr "Error de creación del perfil de la cuenta" -#: include/group.php:292 -msgid "Create a new group" -msgstr "Crear un nuevo grupo" +#: include/uimport.php:215 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "%d contactos no encontrado" +msgstr[1] "%d contactos no importado" -#: include/group.php:293 mod/group.php:100 mod/group.php:197 -msgid "Group Name: " -msgstr "Nombre del grupo: " +#: include/uimport.php:281 +msgid "Done. You can now login with your username and password" +msgstr "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña." -#: include/group.php:295 -msgid "Contacts not in any group" -msgstr "Contactos sin grupo" +#: include/user.php:39 mod/settings.php:377 +msgid "Passwords do not match. Password unchanged." +msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada." -#: include/group.php:297 mod/network.php:210 -msgid "add" -msgstr "añadir" +#: include/user.php:48 +msgid "An invitation is required." +msgstr "Se necesita invitación." -#: include/ForumManager.php:116 include/text.php:1094 include/nav.php:133 -#: view/theme/vier/theme.php:256 -msgid "Forums" -msgstr "Foros" +#: include/user.php:53 +msgid "Invitation could not be verified." +msgstr "No se puede verificar la invitación." -#: include/ForumManager.php:118 view/theme/vier/theme.php:258 -msgid "External link to forum" -msgstr "Enlace externo al foro" +#: include/user.php:61 +msgid "Invalid OpenID url" +msgstr "Dirección OpenID no válida" -#: include/ForumManager.php:121 include/contact_widgets.php:271 -#: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: view/theme/vier/theme.php:261 src/App.php:506 -msgid "show more" -msgstr "ver más" +#: include/user.php:75 include/auth.php:139 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "Se ha encontrado un problema para acceder con el OpenID que has escrito. Verifica que lo hayas escrito correctamente." -#: include/NotificationsManager.php:153 +#: include/user.php:75 include/auth.php:139 +msgid "The error message was:" +msgstr "El mensaje del error fue:" + +#: include/user.php:82 +msgid "Please enter the required information." +msgstr "Por favor, introduce la información necesaria." + +#: include/user.php:96 +msgid "Please use a shorter name." +msgstr "Por favor, usa un nombre más corto." + +#: include/user.php:98 +msgid "Name too short." +msgstr "El nombre es demasiado corto." + +#: include/user.php:106 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "No parece que ese sea tu nombre completo." + +#: include/user.php:111 +msgid "Your email domain is not among those allowed on this site." +msgstr "Tu dominio de correo no se encuentra entre los permitidos en este sitio." + +#: include/user.php:114 +msgid "Not a valid email address." +msgstr "No es una dirección de correo electrónico válida." + +#: include/user.php:127 +msgid "Cannot use that email." +msgstr "No se puede utilizar este correo electrónico." + +#: include/user.php:133 +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." +msgstr "El apodo solo puede contener \"a-z\", \"0-9\" y \"_\"." + +#: include/user.php:140 include/user.php:228 +msgid "Nickname is already registered. Please choose another." +msgstr "Apodo ya registrado. Por favor, elije otro." + +#: include/user.php:150 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro." + +#: include/user.php:166 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado." + +#: include/user.php:214 +msgid "An error occurred during registration. Please try again." +msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo." + +#: include/user.php:237 view/theme/duepuntozero/config.php:46 +msgid "default" +msgstr "predeterminado" + +#: include/user.php:247 +msgid "An error occurred creating your default profile. Please try again." +msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo." + +#: include/user.php:306 include/user.php:314 include/user.php:322 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 +#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 +#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 +#: mod/profile_photo.php:90 mod/profile_photo.php:214 +#: mod/profile_photo.php:309 mod/profile_photo.php:319 +msgid "Profile Photos" +msgstr "Foto del perfil" + +#: include/user.php:397 +#, 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 "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrarse en %2$s. Su cuenta está pendiente de aprobación por el administrador.\n\t" + +#: include/user.php:407 +#, php-format +msgid "Registration at %s" +msgstr "Registro en %s" + +#: include/user.php:417 +#, php-format +msgid "" +"\n" +"\t\tDear %1$s,\n" +"\t\t\tThank you for registering at %2$s. Your account has been created.\n" +"\t" +msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrar en %2$s. Su cuenta ha sido creada.\n\t" + +#: include/user.php:421 +#, 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 "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3$s\n\t\t\tNombre de la cuenta:\t\t%1$s\n\t\t\tContraseña:\t\t%5$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a %2$s." + +#: include/user.php:453 mod/admin.php:1314 +#, php-format +msgid "Registration details for %s" +msgstr "Detalles de registro para %s" + +#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 +#: include/conversation.php:1005 include/conversation.php:1021 +#: mod/allfriends.php:70 mod/directory.php:153 mod/match.php:76 +#: mod/suggest.php:84 mod/dirfind.php:211 +msgid "View Profile" +msgstr "Ver perfil" + +#: include/Contact.php:389 include/contact_widgets.php:34 +#: include/conversation.php:1018 mod/allfriends.php:71 mod/match.php:77 +#: mod/suggest.php:85 mod/contacts.php:613 mod/dirfind.php:212 +#: mod/follow.php:108 +msgid "Connect/Follow" +msgstr "Conectar/Seguir" + +#: include/Contact.php:432 include/conversation.php:1004 +msgid "View Status" +msgstr "Ver estado" + +#: include/Contact.php:434 include/conversation.php:1006 +msgid "View Photos" +msgstr "Ver fotos" + +#: include/Contact.php:435 include/conversation.php:1007 +msgid "Network Posts" +msgstr "Publicaciones en la red" + +#: include/Contact.php:436 include/conversation.php:1008 +msgid "View Contact" +msgstr "Ver contacto" + +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "Eliminar contacto" + +#: include/Contact.php:438 include/conversation.php:1009 +msgid "Send PM" +msgstr "Enviar mensaje privado" + +#: include/Contact.php:439 include/conversation.php:1013 +msgid "Poke" +msgstr "Toque" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "Organización" + +#: include/Contact.php:822 +msgid "News" +msgstr "Noticias" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "Foro" + +#: include/NotificationsManager.php:155 msgid "System" msgstr "Sistema" -#: include/NotificationsManager.php:160 include/nav.php:160 mod/admin.php:518 +#: include/NotificationsManager.php:162 include/nav.php:160 mod/admin.php:518 #: view/theme/frio/theme.php:255 msgid "Network" msgstr "Red" -#: include/NotificationsManager.php:167 mod/network.php:835 -#: mod/profiles.php:699 +#: include/NotificationsManager.php:169 mod/profiles.php:699 +#: mod/network.php:835 msgid "Personal" msgstr "Personal" -#: include/NotificationsManager.php:174 include/nav.php:107 +#: include/NotificationsManager.php:176 include/nav.php:107 #: include/nav.php:163 msgid "Home" msgstr "Inicio" -#: include/NotificationsManager.php:181 include/nav.php:168 +#: include/NotificationsManager.php:183 include/nav.php:168 msgid "Introductions" msgstr "Presentaciones" -#: include/NotificationsManager.php:239 include/NotificationsManager.php:251 +#: include/NotificationsManager.php:241 include/NotificationsManager.php:253 #, php-format msgid "%s commented on %s's post" msgstr "%s comentó la publicación de %s" -#: include/NotificationsManager.php:250 +#: include/NotificationsManager.php:252 #, php-format msgid "%s created a new post" msgstr "%s creó una nueva publicación" -#: include/NotificationsManager.php:265 +#: include/NotificationsManager.php:267 #, php-format msgid "%s liked %s's post" msgstr "A %s le gusta la publicación de %s" -#: include/NotificationsManager.php:278 +#: include/NotificationsManager.php:280 #, php-format msgid "%s disliked %s's post" msgstr "A %s no le gusta la publicación de %s" -#: include/NotificationsManager.php:291 +#: include/NotificationsManager.php:293 #, php-format msgid "%s is attending %s's event" msgstr "%s está asistiendo al evento %s's" -#: include/NotificationsManager.php:304 +#: include/NotificationsManager.php:306 #, php-format msgid "%s is not attending %s's event" msgstr "%s no está asistiendo al evento %s's" -#: include/NotificationsManager.php:317 +#: include/NotificationsManager.php:319 #, php-format msgid "%s may attend %s's event" msgstr "%s podría asistir al evento %s's" -#: include/NotificationsManager.php:334 +#: include/NotificationsManager.php:336 #, php-format msgid "%s is now friends with %s" msgstr "%s es ahora es amigo de %s" -#: include/NotificationsManager.php:770 +#: include/NotificationsManager.php:774 msgid "Friend Suggestion" msgstr "Propuestas de amistad" @@ -499,6 +1177,12 @@ msgstr "Solicitud de Amistad/Conexión" msgid "New Follower" msgstr "Nuevo seguidor" +#: include/Photo.php:1075 include/Photo.php:1091 include/Photo.php:1099 +#: include/Photo.php:1124 include/message.php:145 mod/wall_upload.php:249 +#: mod/item.php:468 +msgid "Wall Photos" +msgstr "Foto del Muro" + #: include/acl_selectors.php:355 msgid "Post to Email" msgstr "Publicar mediante correo electrónico" @@ -532,8 +1216,8 @@ msgstr "CC: dirección de correo electrónico" msgid "Example: bob@example.com, mary@example.com" msgstr "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com" -#: include/acl_selectors.php:378 mod/events.php:511 mod/photos.php:1198 -#: mod/photos.php:1595 +#: include/acl_selectors.php:378 mod/photos.php:1198 mod/photos.php:1595 +#: mod/events.php:511 msgid "Permissions" msgstr "Permisos" @@ -541,6 +1225,21 @@ msgstr "Permisos" msgid "Close" msgstr "Cerrado" +#: include/api.php:1102 +#, php-format +msgid "Daily posting limit of %d posts reached. The post was rejected." +msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada." + +#: include/api.php:1123 +#, php-format +msgid "Weekly posting limit of %d posts reached. The post was rejected." +msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada." + +#: include/api.php:1144 +#, php-format +msgid "Monthly posting limit of %d posts reached. The post was rejected." +msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada." + #: include/auth.php:52 msgid "Logged out." msgstr "Sesión finalizada" @@ -549,35 +1248,148 @@ msgstr "Sesión finalizada" msgid "Login failed." msgstr "Accesso fallido." -#: include/auth.php:139 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 "Se ha encontrado un problema para acceder con el OpenID que has escrito. Verifica que lo hayas escrito correctamente." +#: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 +msgid "Image/photo" +msgstr "Imagen/Foto" -#: include/auth.php:139 include/user.php:75 -msgid "The error message was:" -msgstr "El mensaje del error fue:" +#: include/bbcode.php:536 +#, php-format +msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" +msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" -#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 -msgid "l F d, Y \\@ g:i A" -msgstr "l F d, Y \\@ g:i A" +#: include/bbcode.php:1135 include/bbcode.php:1157 +msgid "$1 wrote:" +msgstr "$1 escribió:" -#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 -#: include/event.php:459 -msgid "Starts:" -msgstr "Inicio:" +#: include/bbcode.php:1187 include/bbcode.php:1188 +msgid "Encrypted content" +msgstr "Contenido cifrado" -#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 -#: include/event.php:460 -msgid "Finishes:" -msgstr "Final:" +#: include/bbcode.php:1303 +msgid "Invalid source protocol" +msgstr "Protocolo de fuente inválido" -#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 -#: include/event.php:461 include/identity.php:342 mod/directory.php:135 -#: mod/events.php:496 mod/notifications.php:246 mod/contacts.php:639 -msgid "Location:" -msgstr "Localización:" +#: include/bbcode.php:1313 +msgid "Invalid link protocol" +msgstr "Protocolo de enlace inválido" + +#: include/contact_selectors.php:32 +msgid "Unknown | Not categorised" +msgstr "Desconocido | No clasificado" + +#: include/contact_selectors.php:33 +msgid "Block immediately" +msgstr "Bloquear inmediatamente" + +#: include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" +msgstr "Sospechoso, spammer, auto-publicidad" + +#: include/contact_selectors.php:35 +msgid "Known to me, but no opinion" +msgstr "Le conozco, sin opinión" + +#: include/contact_selectors.php:36 +msgid "OK, probably harmless" +msgstr "OK, probablemente inofensivo" + +#: include/contact_selectors.php:37 +msgid "Reputable, has my trust" +msgstr "Buena reputación, tiene mi confianza" + +#: include/contact_selectors.php:56 mod/admin.php:986 +msgid "Frequently" +msgstr "Frequentemente" + +#: include/contact_selectors.php:57 mod/admin.php:987 +msgid "Hourly" +msgstr "Cada hora" + +#: include/contact_selectors.php:58 mod/admin.php:988 +msgid "Twice daily" +msgstr "Dos veces al día" + +#: include/contact_selectors.php:59 mod/admin.php:989 +msgid "Daily" +msgstr "Diariamente" + +#: include/contact_selectors.php:60 +msgid "Weekly" +msgstr "Semanalmente" + +#: include/contact_selectors.php:61 +msgid "Monthly" +msgstr "Mensualmente" + +#: include/contact_selectors.php:76 mod/dfrn_request.php:886 +msgid "Friendica" +msgstr "Friendica" + +#: include/contact_selectors.php:77 +msgid "OStatus" +msgstr "OStatus" + +#: include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "RSS/Atom" + +#: include/contact_selectors.php:79 include/contact_selectors.php:86 +#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 +msgid "Email" +msgstr "Correo electrónico" + +#: include/contact_selectors.php:80 mod/dfrn_request.php:888 +#: mod/settings.php:849 +msgid "Diaspora" +msgstr "Diaspora*" + +#: include/contact_selectors.php:81 +msgid "Facebook" +msgstr "Facebook" + +#: include/contact_selectors.php:82 +msgid "Zot!" +msgstr "Zot!" + +#: include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "LinkedIn" + +#: include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "XMPP/IM" + +#: include/contact_selectors.php:85 +msgid "MySpace" +msgstr "MySpace" + +#: include/contact_selectors.php:87 +msgid "Google+" +msgstr "Google+" + +#: include/contact_selectors.php:88 +msgid "pump.io" +msgstr "pump.io" + +#: include/contact_selectors.php:89 +msgid "Twitter" +msgstr "Twitter" + +#: include/contact_selectors.php:90 +msgid "Diaspora Connector" +msgstr "Conector Diaspora" + +#: include/contact_selectors.php:91 +msgid "GNU Social Connector" +msgstr "Conector a GNU Social" + +#: include/contact_selectors.php:92 +msgid "pnut" +msgstr "pnut" + +#: include/contact_selectors.php:93 +msgid "App.net" +msgstr "App.net" #: include/contact_widgets.php:8 msgid "Add New Contact" @@ -592,8 +1404,8 @@ msgid "Example: bob@example.com, http://example.com/barbara" msgstr "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel" #: include/contact_widgets.php:12 include/identity.php:230 -#: mod/allfriends.php:87 mod/dirfind.php:209 mod/match.php:92 -#: mod/suggest.php:103 +#: mod/allfriends.php:87 mod/match.php:92 mod/suggest.php:103 +#: mod/dirfind.php:209 msgid "Connect" msgstr "Conectar" @@ -612,12 +1424,6 @@ msgstr "Buscar personas" msgid "Enter name or interest" msgstr "Introduzce nombre o intereses" -#: include/contact_widgets.php:34 include/conversation.php:1018 -#: include/Contact.php:389 mod/allfriends.php:71 mod/dirfind.php:212 -#: mod/follow.php:108 mod/match.php:77 mod/suggest.php:85 mod/contacts.php:613 -msgid "Connect/Follow" -msgstr "Conectar/Seguir" - #: include/contact_widgets.php:35 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Ejemplos: Robert Morgenstein, Pesca" @@ -627,11 +1433,11 @@ msgid "Find" msgstr "Buscar" #: include/contact_widgets.php:37 mod/suggest.php:116 -#: view/theme/vier/theme.php:203 +#: view/theme/vier/theme.php:195 msgid "Friend Suggestions" msgstr "Sugerencias de amigos" -#: include/contact_widgets.php:38 view/theme/vier/theme.php:202 +#: include/contact_widgets.php:38 view/theme/vier/theme.php:194 msgid "Similar Interests" msgstr "Intereses similares" @@ -639,7 +1445,7 @@ msgstr "Intereses similares" msgid "Random Profile" msgstr "Perfil aleatorio" -#: include/contact_widgets.php:40 view/theme/vier/theme.php:204 +#: include/contact_widgets.php:40 view/theme/vier/theme.php:196 msgid "Invite Friends" msgstr "Invitar amigos" @@ -666,34 +1472,6 @@ msgid_plural "%d contacts in common" msgstr[0] "%d contacto en común" msgstr[1] "%d contactos en común" -#: include/conversation.php:134 include/conversation.php:286 -#: include/like.php:183 include/text.php:1871 -msgid "event" -msgstr "evento" - -#: include/conversation.php:137 include/conversation.php:147 -#: include/conversation.php:289 include/conversation.php:298 -#: include/like.php:181 include/diaspora.php:1653 mod/subthread.php:89 -#: mod/tagger.php:63 -msgid "status" -msgstr "estado" - -#: include/conversation.php:142 include/conversation.php:294 -#: include/like.php:181 include/text.php:1873 mod/subthread.php:89 -#: mod/tagger.php:63 -msgid "photo" -msgstr "foto" - -#: include/conversation.php:154 include/like.php:30 include/diaspora.php:1649 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "A %1$s le gusta %3$s de %2$s" - -#: include/conversation.php:157 include/like.php:34 include/like.php:39 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "A %1$s no le gusta %3$s de %2$s" - #: include/conversation.php:160 #, php-format msgid "%1$s attends %2$s's %3$s" @@ -769,8 +1547,8 @@ msgid "Select" msgstr "Seleccionar" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 -#: mod/photos.php:1731 mod/admin.php:1514 mod/contacts.php:819 -#: mod/contacts.php:1018 mod/settings.php:745 object/Item.php:138 +#: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 +#: mod/settings.php:745 mod/admin.php:1514 object/Item.php:138 msgid "Delete" msgstr "Eliminar" @@ -817,37 +1595,6 @@ msgstr "Eliminar el elemento seleccionado" msgid "Follow Thread" msgstr "Seguir publicacion" -#: include/conversation.php:1004 include/Contact.php:432 -msgid "View Status" -msgstr "Ver estado" - -#: include/conversation.php:1005 include/conversation.php:1021 -#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 -#: mod/allfriends.php:70 mod/directory.php:153 mod/dirfind.php:211 -#: mod/match.php:76 mod/suggest.php:84 -msgid "View Profile" -msgstr "Ver perfil" - -#: include/conversation.php:1006 include/Contact.php:434 -msgid "View Photos" -msgstr "Ver fotos" - -#: include/conversation.php:1007 include/Contact.php:435 -msgid "Network Posts" -msgstr "Publicaciones en la red" - -#: include/conversation.php:1008 include/Contact.php:436 -msgid "View Contact" -msgstr "Ver contacto" - -#: include/conversation.php:1009 include/Contact.php:438 -msgid "Send PM" -msgstr "Enviar mensaje privado" - -#: include/conversation.php:1013 include/Contact.php:439 -msgid "Poke" -msgstr "Toque" - #: include/conversation.php:1140 #, php-format msgid "%s likes this." @@ -1050,16 +1797,16 @@ msgid "Public post" msgstr "Publicación pública" #: include/conversation.php:1314 mod/content.php:738 mod/editpost.php:137 -#: mod/events.php:506 mod/photos.php:1649 mod/photos.php:1691 -#: mod/photos.php:1771 object/Item.php:711 +#: mod/photos.php:1649 mod/photos.php:1691 mod/photos.php:1771 +#: mod/events.php:506 object/Item.php:711 msgid "Preview" msgstr "Vista previa" #: include/conversation.php:1318 include/items.php:2165 mod/editpost.php:140 -#: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/follow.php:126 -#: mod/message.php:211 mod/photos.php:247 mod/photos.php:339 -#: mod/suggest.php:34 mod/tagrm.php:13 mod/tagrm.php:98 mod/videos.php:134 -#: mod/dfrn_request.php:894 mod/contacts.php:458 mod/settings.php:683 +#: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/message.php:211 +#: mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34 mod/tagrm.php:13 +#: mod/tagrm.php:98 mod/videos.php:134 mod/contacts.php:458 +#: mod/dfrn_request.php:894 mod/follow.php:126 mod/settings.php:683 #: mod/settings.php:709 msgid "Cancel" msgstr "Cancelar" @@ -1106,109 +1853,52 @@ msgid_plural "Not Attending" msgstr[0] "No atendiendo" msgstr[1] "No atendiendo" -#: include/conversation.php:1548 include/profile_selectors.php:6 -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "Indeciso" -msgstr[1] "Indeciso" - -#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 -msgid "Miscellaneous" -msgstr "Varios" - -#: include/datetime.php:196 include/identity.php:656 -msgid "Birthday:" -msgstr "Fecha de nacimiento:" - -#: include/datetime.php:198 mod/profiles.php:724 -msgid "Age: " -msgstr "Edad: " - -#: include/datetime.php:200 -msgid "YYYY-MM-DD or MM-DD" -msgstr "YYYY-MM-DD o MM-DD" - -#: include/datetime.php:370 -msgid "never" -msgstr "nunca" - -#: include/datetime.php:376 -msgid "less than a second ago" -msgstr "hace menos de un segundo" - -#: include/datetime.php:379 -msgid "year" -msgstr "año" - -#: include/datetime.php:379 -msgid "years" -msgstr "años" - -#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 -#: mod/events.php:387 -msgid "month" -msgstr "mes" - -#: include/datetime.php:380 -msgid "months" -msgstr "meses" - -#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 -#: mod/events.php:388 -msgid "week" -msgstr "semana" - -#: include/datetime.php:381 -msgid "weeks" -msgstr "semanas" - -#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 -#: mod/events.php:389 -msgid "day" -msgstr "día" - -#: include/datetime.php:382 -msgid "days" -msgstr "días" - -#: include/datetime.php:383 -msgid "hour" -msgstr "hora" - -#: include/datetime.php:383 -msgid "hours" -msgstr "horas" - -#: include/datetime.php:384 -msgid "minute" -msgstr "minuto" - -#: include/datetime.php:384 -msgid "minutes" -msgstr "minutos" - -#: include/datetime.php:385 -msgid "second" -msgstr "segundo" - -#: include/datetime.php:385 -msgid "seconds" -msgstr "segundos" - -#: include/datetime.php:394 +#: include/dba.php:59 include/dba_pdo.php:76 #, php-format -msgid "%1$d %2$s ago" -msgstr "hace %1$d %2$s" +msgid "Cannot locate DNS info for database server '%s'" +msgstr "No se puede encontrar información DNS para la base de datos del servidor '%s'" -#: include/datetime.php:620 -#, php-format -msgid "%s's birthday" -msgstr "Cumpleaños de %s" +#: include/dbstructure.php:25 +msgid "There are no tables on MyISAM." +msgstr "No hay tablas en MyISAM" -#: include/datetime.php:621 include/dfrn.php:1254 +#: include/dbstructure.php:66 #, php-format -msgid "Happy Birthday %s" -msgstr "Feliz cumpleaños %s" +msgid "" +"\n" +"\t\t\tThe friendica developers released update %s recently,\n" +"\t\t\tbut when I tried to install it, something went terribly wrong.\n" +"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" +"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid." +msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido." + +#: include/dbstructure.php:71 +#, php-format +msgid "" +"The error message is\n" +"[pre]%s[/pre]" +msgstr "El mensaje de error es\n[pre]%s[/pre]" + +#: include/dbstructure.php:195 +#, php-format +msgid "" +"\n" +"Error %d occurred during database update:\n" +"%s\n" +msgstr "" + +#: include/dbstructure.php:198 +msgid "Errors encountered performing database changes: " +msgstr "" + +#: include/dbstructure.php:206 +msgid ": Database update" +msgstr "" + +#: include/dbstructure.php:438 +#, php-format +msgid "%s: updating %s table." +msgstr "" #: include/delivery.php:428 msgid "(no subject)" @@ -1218,580 +1908,18 @@ msgstr "(sin asunto)" msgid "noreply" msgstr "no responder" -#: include/dfrn.php:1253 +#: include/dfrn.php:1309 #, php-format msgid "%s\\'s birthday" msgstr "%s\\'s cumpleaños" -#: include/event.php:408 -msgid "all-day" -msgstr "todo el día" +#: include/diaspora.php:2214 +msgid "Sharing notification from Diaspora network" +msgstr "Compartir notificaciones con la red Diaspora*" -#: include/event.php:410 -msgid "Sun" -msgstr "Dom" - -#: include/event.php:411 -msgid "Mon" -msgstr "Lun" - -#: include/event.php:412 -msgid "Tue" -msgstr "Mar" - -#: include/event.php:413 -msgid "Wed" -msgstr "Mie" - -#: include/event.php:414 -msgid "Thu" -msgstr "Jue" - -#: include/event.php:415 -msgid "Fri" -msgstr "Vie" - -#: include/event.php:416 -msgid "Sat" -msgstr "Sab" - -#: include/event.php:418 include/text.php:1199 mod/settings.php:982 -msgid "Sunday" -msgstr "Domingo" - -#: include/event.php:419 include/text.php:1199 mod/settings.php:982 -msgid "Monday" -msgstr "Lunes" - -#: include/event.php:420 include/text.php:1199 -msgid "Tuesday" -msgstr "Martes" - -#: include/event.php:421 include/text.php:1199 -msgid "Wednesday" -msgstr "Miércoles" - -#: include/event.php:422 include/text.php:1199 -msgid "Thursday" -msgstr "Jueves" - -#: include/event.php:423 include/text.php:1199 -msgid "Friday" -msgstr "Viernes" - -#: include/event.php:424 include/text.php:1199 -msgid "Saturday" -msgstr "Sábado" - -#: include/event.php:426 -msgid "Jan" -msgstr "Ene" - -#: include/event.php:427 -msgid "Feb" -msgstr "Feb" - -#: include/event.php:428 -msgid "Mar" -msgstr "Mar" - -#: include/event.php:429 -msgid "Apr" -msgstr "Abr" - -#: include/event.php:430 include/event.php:443 include/text.php:1203 -msgid "May" -msgstr "Mayo" - -#: include/event.php:431 -msgid "Jun" -msgstr "Jun" - -#: include/event.php:432 -msgid "Jul" -msgstr "Jul" - -#: include/event.php:433 -msgid "Aug" -msgstr "Ago" - -#: include/event.php:434 -msgid "Sept" -msgstr "Sept" - -#: include/event.php:435 -msgid "Oct" -msgstr "Oct" - -#: include/event.php:436 -msgid "Nov" -msgstr "Nov" - -#: include/event.php:437 -msgid "Dec" -msgstr "Dec" - -#: include/event.php:439 include/text.php:1203 -msgid "January" -msgstr "Enero" - -#: include/event.php:440 include/text.php:1203 -msgid "February" -msgstr "Febrero" - -#: include/event.php:441 include/text.php:1203 -msgid "March" -msgstr "Marzo" - -#: include/event.php:442 include/text.php:1203 -msgid "April" -msgstr "Abril" - -#: include/event.php:444 include/text.php:1203 -msgid "June" -msgstr "Junio" - -#: include/event.php:445 include/text.php:1203 -msgid "July" -msgstr "Julio" - -#: include/event.php:446 include/text.php:1203 -msgid "August" -msgstr "Agosto" - -#: include/event.php:447 include/text.php:1203 -msgid "September" -msgstr "Septiembre" - -#: include/event.php:448 include/text.php:1203 -msgid "October" -msgstr "Octubre" - -#: include/event.php:449 include/text.php:1203 -msgid "November" -msgstr "Noviembre" - -#: include/event.php:450 include/text.php:1203 -msgid "December" -msgstr "Diciembre" - -#: include/event.php:452 mod/cal.php:280 mod/events.php:386 -msgid "today" -msgstr "hoy" - -#: include/event.php:457 -msgid "No events to display" -msgstr "No hay eventos a mostrar" - -#: include/event.php:570 -msgid "l, F j" -msgstr "l, F j" - -#: include/event.php:592 -msgid "Edit event" -msgstr "Editar evento" - -#: include/event.php:593 -msgid "Delete event" -msgstr "" - -#: include/event.php:619 include/text.php:1601 include/text.php:1608 -msgid "link to source" -msgstr "Enlace al original" - -#: include/event.php:873 -msgid "Export" -msgstr "Exportar" - -#: include/event.php:874 -msgid "Export calendar as ical" -msgstr "Exportar calendario como ical" - -#: include/event.php:875 -msgid "Export calendar as csv" -msgstr "Exportar calendario como csv" - -#: include/follow.php:84 mod/dfrn_request.php:514 -msgid "Disallowed profile URL." -msgstr "Dirección de perfil no permitida." - -#: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 -#: mod/admin.php:280 mod/admin.php:298 -msgid "Blocked domain" -msgstr "" - -#: include/follow.php:94 -msgid "Connect URL missing." -msgstr "Falta el conector URL." - -#: include/follow.php:122 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "Este sitio no está configurado para permitir la comunicación con otras redes." - -#: include/follow.php:123 include/follow.php:137 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "No se ha descubierto protocolos de comunicación o fuentes compatibles." - -#: include/follow.php:135 -msgid "The profile address specified does not provide adequate information." -msgstr "La dirección del perfil especificado no proporciona información adecuada." - -#: include/follow.php:140 -msgid "An author or name was not found." -msgstr "No se ha encontrado un autor o nombre." - -#: include/follow.php:143 -msgid "No browser URL could be matched to this address." -msgstr "Ninguna dirección concuerda con la suministrada." - -#: include/follow.php:146 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto." - -#: include/follow.php:147 -msgid "Use mailto: in front of address to force email check." -msgstr "Escribe mailto: al principio de la dirección para forzar el envío." - -#: include/follow.php:153 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio." - -#: include/follow.php:158 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas." - -#: include/follow.php:259 -msgid "Unable to retrieve contact information." -msgstr "No ha sido posible recibir la información del contacto." - -#: include/like.php:44 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "%1$s atenderá %2$s's %3$s" - -#: include/like.php:49 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "%1$s no atenderá %2$s's %3$s" - -#: include/like.php:54 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "%1$s puede que atienda %2$s's %3$s" - -#: include/photos.php:57 include/photos.php:66 mod/fbrowser.php:42 -#: mod/fbrowser.php:63 mod/photos.php:189 mod/photos.php:1125 -#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1841 -#: mod/photos.php:1855 -msgid "Contact Photos" -msgstr "Foto del contacto" - -#: include/security.php:63 -msgid "Welcome " -msgstr "Bienvenido " - -#: include/security.php:64 -msgid "Please upload a profile photo." -msgstr "Por favor sube una foto para tu perfil." - -#: include/security.php:67 -msgid "Welcome back " -msgstr "Bienvenido de nuevo " - -#: include/security.php:431 -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 "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo." - -#: include/text.php:308 -msgid "newer" -msgstr "más nuevo" - -#: include/text.php:309 -msgid "older" -msgstr "más antiguo" - -#: include/text.php:314 -msgid "first" -msgstr "primera" - -#: include/text.php:315 -msgid "prev" -msgstr "ant." - -#: include/text.php:349 -msgid "next" -msgstr "sig." - -#: include/text.php:350 -msgid "last" -msgstr "última" - -#: include/text.php:404 -msgid "Loading more entries..." -msgstr "Cargar mas entradas .." - -#: include/text.php:405 -msgid "The end" -msgstr "El fin" - -#: include/text.php:956 -msgid "No contacts" -msgstr "Sin contactos" - -#: include/text.php:981 -#, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" -msgstr[0] "%d Contacto" -msgstr[1] "%d Contactos" - -#: include/text.php:994 -msgid "View Contacts" -msgstr "Ver contactos" - -#: include/text.php:1081 include/nav.php:125 mod/search.php:152 -msgid "Search" -msgstr "Buscar" - -#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 -#: mod/notes.php:64 -msgid "Save" -msgstr "Guardar" - -#: include/text.php:1084 include/nav.php:42 -msgid "@name, !forum, #tags, content" -msgstr "@name, !forum, #tags, contenido" - -#: include/text.php:1089 include/nav.php:128 -msgid "Full Text" -msgstr "Texto completo" - -#: include/text.php:1090 include/nav.php:129 -msgid "Tags" -msgstr "Tags" - -#: include/text.php:1091 include/nav.php:130 include/nav.php:194 -#: include/identity.php:853 include/identity.php:856 mod/viewcontacts.php:124 -#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 -msgid "Contacts" -msgstr "Contactos" - -#: include/text.php:1145 -msgid "poke" -msgstr "tocar" - -#: include/text.php:1145 -msgid "poked" -msgstr "tocó a" - -#: include/text.php:1146 -msgid "ping" -msgstr "hacer \"ping\"" - -#: include/text.php:1146 -msgid "pinged" -msgstr "hizo \"ping\" a" - -#: include/text.php:1147 -msgid "prod" -msgstr "empujar" - -#: include/text.php:1147 -msgid "prodded" -msgstr "empujó a" - -#: include/text.php:1148 -msgid "slap" -msgstr "abofetear" - -#: include/text.php:1148 -msgid "slapped" -msgstr "abofeteó a" - -#: include/text.php:1149 -msgid "finger" -msgstr "meter dedo" - -#: include/text.php:1149 -msgid "fingered" -msgstr "le metió un dedo a" - -#: include/text.php:1150 -msgid "rebuff" -msgstr "desairar" - -#: include/text.php:1150 -msgid "rebuffed" -msgstr "desairó a" - -#: include/text.php:1164 -msgid "happy" -msgstr "feliz" - -#: include/text.php:1165 -msgid "sad" -msgstr "triste" - -#: include/text.php:1166 -msgid "mellow" -msgstr "sentimental" - -#: include/text.php:1167 -msgid "tired" -msgstr "cansado" - -#: include/text.php:1168 -msgid "perky" -msgstr "alegre" - -#: include/text.php:1169 -msgid "angry" -msgstr "furioso" - -#: include/text.php:1170 -msgid "stupified" -msgstr "estupefacto" - -#: include/text.php:1171 -msgid "puzzled" -msgstr "extrañado" - -#: include/text.php:1172 -msgid "interested" -msgstr "interesado" - -#: include/text.php:1173 -msgid "bitter" -msgstr "rencoroso" - -#: include/text.php:1174 -msgid "cheerful" -msgstr "jovial" - -#: include/text.php:1175 -msgid "alive" -msgstr "vivo" - -#: include/text.php:1176 -msgid "annoyed" -msgstr "enojado" - -#: include/text.php:1177 -msgid "anxious" -msgstr "ansioso" - -#: include/text.php:1178 -msgid "cranky" -msgstr "irritable" - -#: include/text.php:1179 -msgid "disturbed" -msgstr "perturbado" - -#: include/text.php:1180 -msgid "frustrated" -msgstr "frustrado" - -#: include/text.php:1181 -msgid "motivated" -msgstr "motivado" - -#: include/text.php:1182 -msgid "relaxed" -msgstr "relajado" - -#: include/text.php:1183 -msgid "surprised" -msgstr "sorprendido" - -#: include/text.php:1393 mod/videos.php:388 -msgid "View Video" -msgstr "Ver vídeo" - -#: include/text.php:1425 -msgid "bytes" -msgstr "bytes" - -#: include/text.php:1457 include/text.php:1469 -msgid "Click to open/close" -msgstr "Pulsa para abrir/cerrar" - -#: include/text.php:1595 -msgid "View on separate page" -msgstr "Ver en pagina aparte" - -#: include/text.php:1596 -msgid "view on separate page" -msgstr "ver en pagina aparte" - -#: include/text.php:1875 -msgid "activity" -msgstr "Actividad" - -#: include/text.php:1877 mod/content.php:624 object/Item.php:416 -#: object/Item.php:428 -msgid "comment" -msgid_plural "comments" -msgstr[0] "" -msgstr[1] "Comentario" - -#: include/text.php:1878 -msgid "post" -msgstr "Publicación" - -#: include/text.php:2046 -msgid "Item filed" -msgstr "Elemento archivado" - -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "Eliminar contacto" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "Organización" - -#: include/Contact.php:822 -msgid "News" -msgstr "Noticias" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "Foro" - -#: include/bbcode.php:419 include/bbcode.php:1178 include/bbcode.php:1179 -msgid "Image/photo" -msgstr "Imagen/Foto" - -#: include/bbcode.php:536 -#, php-format -msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" -msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s" - -#: include/bbcode.php:1135 include/bbcode.php:1157 -msgid "$1 wrote:" -msgstr "$1 escribió:" - -#: include/bbcode.php:1187 include/bbcode.php:1188 -msgid "Encrypted content" -msgstr "Contenido cifrado" - -#: include/bbcode.php:1303 -msgid "Invalid source protocol" -msgstr "Protocolo de fuente inválido" - -#: include/bbcode.php:1313 -msgid "Invalid link protocol" -msgstr "Protocolo de enlace inválido" +#: include/diaspora.php:3234 +msgid "Attachments:" +msgstr "Archivos adjuntos:" #: include/enotify.php:27 msgid "Friendica Notification" @@ -2086,16 +2214,426 @@ msgstr "Nombre completo:\t%1$s\\nUbicación del sitio:\t%2$s\\nLogin Nombre:\t%3 msgid "Please visit %s to approve or reject the request." msgstr "Por favor visita %s para aprobar o negar la solicitud." +#: include/follow.php:84 mod/dfrn_request.php:514 +msgid "Disallowed profile URL." +msgstr "Dirección de perfil no permitida." + +#: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 +#: mod/admin.php:280 mod/admin.php:298 +msgid "Blocked domain" +msgstr "Dominio bloqueado" + +#: include/follow.php:94 +msgid "Connect URL missing." +msgstr "Falta el conector URL." + +#: include/follow.php:122 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "Este sitio no está configurado para permitir la comunicación con otras redes." + +#: include/follow.php:123 include/follow.php:137 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "No se ha descubierto protocolos de comunicación o fuentes compatibles." + +#: include/follow.php:135 +msgid "The profile address specified does not provide adequate information." +msgstr "La dirección del perfil especificado no proporciona información adecuada." + +#: include/follow.php:140 +msgid "An author or name was not found." +msgstr "No se ha encontrado un autor o nombre." + +#: include/follow.php:143 +msgid "No browser URL could be matched to this address." +msgstr "Ninguna dirección concuerda con la suministrada." + +#: include/follow.php:146 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto." + +#: include/follow.php:147 +msgid "Use mailto: in front of address to force email check." +msgstr "Escribe mailto: al principio de la dirección para forzar el envío." + +#: include/follow.php:153 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio." + +#: include/follow.php:158 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas." + +#: include/follow.php:259 +msgid "Unable to retrieve contact information." +msgstr "No ha sido posible recibir la información del contacto." + +#: include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"<strong>may</strong> apply to this group and any future members. If this is " +"not what you intended, please create another group with a different name." +msgstr "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente." + +#: include/group.php:210 +msgid "Default privacy group for new contacts" +msgstr "Grupo por defecto para nuevos contactos" + +#: include/group.php:243 +msgid "Everybody" +msgstr "Todo el mundo" + +#: include/group.php:266 +msgid "edit" +msgstr "editar" + +#: include/group.php:287 mod/newmember.php:39 +msgid "Groups" +msgstr "Grupos" + +#: include/group.php:289 +msgid "Edit groups" +msgstr "Editar grupo" + +#: include/group.php:291 +msgid "Edit group" +msgstr "Editar grupo" + +#: include/group.php:292 +msgid "Create a new group" +msgstr "Crear un nuevo grupo" + +#: include/group.php:293 mod/group.php:100 mod/group.php:197 +msgid "Group Name: " +msgstr "Nombre del grupo: " + +#: include/group.php:295 +msgid "Contacts not in any group" +msgstr "Contactos sin grupo" + +#: include/group.php:297 mod/network.php:210 +msgid "add" +msgstr "añadir" + +#: include/identity.php:45 +msgid "Requested account is not available." +msgstr "La cuenta solicitada no está disponible." + +#: include/identity.php:54 mod/profile.php:22 +msgid "Requested profile is not available." +msgstr "El perfil solicitado no está disponible." + +#: include/identity.php:98 include/identity.php:325 include/identity.php:755 +msgid "Edit profile" +msgstr "Editar perfil" + +#: include/identity.php:265 +msgid "Atom feed" +msgstr "Atom feed" + +#: include/identity.php:296 include/nav.php:191 +msgid "Profiles" +msgstr "Perfiles" + +#: include/identity.php:296 +msgid "Manage/edit profiles" +msgstr "Administrar/editar perfiles" + +#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790 +msgid "Change profile photo" +msgstr "Cambiar foto del perfil" + +#: include/identity.php:302 mod/profiles.php:791 +msgid "Create New Profile" +msgstr "Crear nuevo perfil" + +#: include/identity.php:312 mod/profiles.php:780 +msgid "Profile Image" +msgstr "Imagen del Perfil" + +#: include/identity.php:315 mod/profiles.php:782 +msgid "visible to everybody" +msgstr "Visible para todos" + +#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783 +msgid "Edit visibility" +msgstr "Editar visibilidad" + +#: include/identity.php:344 include/identity.php:644 mod/directory.php:137 +#: mod/notifications.php:252 +msgid "Gender:" +msgstr "Género:" + +#: include/identity.php:347 include/identity.php:665 mod/directory.php:139 +msgid "Status:" +msgstr "Estado:" + +#: include/identity.php:349 include/identity.php:682 mod/directory.php:141 +msgid "Homepage:" +msgstr "Página de inicio:" + +#: include/identity.php:351 include/identity.php:702 mod/directory.php:143 +#: mod/notifications.php:248 mod/contacts.php:643 +msgid "About:" +msgstr "Acerca de:" + +#: include/identity.php:353 mod/contacts.php:641 +msgid "XMPP:" +msgstr "XMPP:" + +#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58 +msgid "Network:" +msgstr "Red:" + +#: include/identity.php:468 include/identity.php:558 +msgid "g A l F d" +msgstr "g A l F d" + +#: include/identity.php:469 include/identity.php:559 +msgid "F d" +msgstr "F d" + +#: include/identity.php:520 include/identity.php:609 +msgid "[today]" +msgstr "[hoy]" + +#: include/identity.php:532 +msgid "Birthday Reminders" +msgstr "Recordatorios de cumpleaños" + +#: include/identity.php:533 +msgid "Birthdays this week:" +msgstr "Cumpleaños esta semana:" + +#: include/identity.php:595 +msgid "[No description]" +msgstr "[Sin descripción]" + +#: include/identity.php:620 +msgid "Event Reminders" +msgstr "Recordatorios de eventos" + +#: include/identity.php:621 +msgid "Events this week:" +msgstr "Eventos de esta semana:" + +#: include/identity.php:632 include/identity.php:759 include/identity.php:792 +#: include/nav.php:84 mod/newmember.php:20 mod/profperm.php:107 +#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 +msgid "Profile" +msgstr "Perfil" + +#: include/identity.php:641 mod/settings.php:1287 +msgid "Full Name:" +msgstr "Nombre completo:" + +#: include/identity.php:648 +msgid "j F, Y" +msgstr "j F, Y" + +#: include/identity.php:649 +msgid "j F" +msgstr "j F" + +#: include/identity.php:661 +msgid "Age:" +msgstr "Edad:" + +#: include/identity.php:674 +#, php-format +msgid "for %1$d %2$s" +msgstr "por %1$d %2$s" + +#: include/identity.php:678 mod/profiles.php:706 +msgid "Sexual Preference:" +msgstr "Preferencia sexual:" + +#: include/identity.php:686 mod/profiles.php:733 +msgid "Hometown:" +msgstr "Ciudad de origen:" + +#: include/identity.php:690 mod/notifications.php:250 mod/contacts.php:645 +#: mod/follow.php:139 +msgid "Tags:" +msgstr "Etiquetas:" + +#: include/identity.php:694 mod/profiles.php:734 +msgid "Political Views:" +msgstr "Ideas políticas:" + +#: include/identity.php:698 +msgid "Religion:" +msgstr "Religión:" + +#: include/identity.php:706 +msgid "Hobbies/Interests:" +msgstr "Aficiones/Intereses:" + +#: include/identity.php:710 mod/profiles.php:738 +msgid "Likes:" +msgstr "Me gusta:" + +#: include/identity.php:714 mod/profiles.php:739 +msgid "Dislikes:" +msgstr "No me gusta:" + +#: include/identity.php:718 +msgid "Contact information and Social Networks:" +msgstr "Información de contacto y Redes sociales:" + +#: include/identity.php:722 +msgid "Musical interests:" +msgstr "Intereses musicales:" + +#: include/identity.php:726 +msgid "Books, literature:" +msgstr "Libros, literatura:" + +#: include/identity.php:730 +msgid "Television:" +msgstr "Televisión:" + +#: include/identity.php:734 +msgid "Film/dance/culture/entertainment:" +msgstr "Películas/baile/cultura/entretenimiento:" + +#: include/identity.php:738 +msgid "Love/Romance:" +msgstr "Amor/Romance:" + +#: include/identity.php:742 +msgid "Work/employment:" +msgstr "Trabajo/ocupación:" + +#: include/identity.php:746 +msgid "School/education:" +msgstr "Escuela/estudios:" + +#: include/identity.php:751 +msgid "Forums:" +msgstr "Foros:" + +#: include/identity.php:760 mod/events.php:509 +msgid "Basic" +msgstr "Basic" + +#: include/identity.php:761 mod/contacts.php:881 mod/events.php:510 +#: mod/admin.php:1065 +msgid "Advanced" +msgstr "Avanzado" + +#: include/identity.php:784 include/nav.php:83 mod/contacts.php:648 +#: mod/contacts.php:844 view/theme/frio/theme.php:248 +msgid "Status" +msgstr "Estado" + +#: include/identity.php:787 mod/contacts.php:847 mod/follow.php:147 +msgid "Status Messages and Posts" +msgstr "Mensajes de Estado y Publicaciones" + +#: include/identity.php:795 mod/contacts.php:855 +msgid "Profile Details" +msgstr "Detalles del Perfil" + +#: include/identity.php:800 include/nav.php:85 mod/fbrowser.php:33 +#: view/theme/frio/theme.php:250 +msgid "Photos" +msgstr "Fotografías" + +#: include/identity.php:803 mod/photos.php:95 +msgid "Photo Albums" +msgstr "Álbum de Fotos" + +#: include/identity.php:808 include/identity.php:811 include/nav.php:86 +#: view/theme/frio/theme.php:251 +msgid "Videos" +msgstr "Videos" + +#: include/identity.php:820 include/identity.php:831 include/nav.php:87 +#: include/nav.php:151 mod/cal.php:272 mod/events.php:377 +#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 +msgid "Events" +msgstr "Eventos" + +#: include/identity.php:823 include/identity.php:834 include/nav.php:151 +#: view/theme/frio/theme.php:256 +msgid "Events and Calendar" +msgstr "Eventos y Calendario" + +#: include/identity.php:842 mod/notes.php:49 +msgid "Personal Notes" +msgstr "Notas personales" + +#: include/identity.php:845 +msgid "Only You Can See This" +msgstr "Únicamente tú puedes ver esto" + +#: include/identity.php:853 include/identity.php:856 include/nav.php:130 +#: include/nav.php:194 include/text.php:1091 mod/viewcontacts.php:124 +#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 +msgid "Contacts" +msgstr "Contactos" + +#: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759 +msgid "[Name Withheld]" +msgstr "[Nombre oculto]" + +#: include/items.php:2121 mod/notice.php:17 mod/viewsrc.php:16 +#: mod/display.php:117 mod/display.php:289 mod/display.php:504 +#: mod/admin.php:248 mod/admin.php:1571 mod/admin.php:1822 +msgid "Item not found." +msgstr "Elemento no encontrado." + +#: include/items.php:2160 +msgid "Do you really want to delete this item?" +msgstr "¿Realmente quieres borrar este objeto?" + +#: include/items.php:2162 mod/api.php:107 mod/message.php:208 +#: mod/profiles.php:643 mod/profiles.php:646 mod/profiles.php:673 +#: mod/suggest.php:31 mod/contacts.php:455 mod/dfrn_request.php:880 +#: mod/follow.php:115 mod/register.php:247 mod/settings.php:1172 +#: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189 +#: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204 +#: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236 +#: mod/settings.php:1237 mod/settings.php:1238 mod/settings.php:1239 +msgid "Yes" +msgstr "Sí" + +#: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 +#: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105 +#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/editpost.php:12 +#: mod/fsuggest.php:80 mod/group.php:20 mod/invite.php:17 mod/invite.php:105 +#: mod/manage.php:103 mod/message.php:48 mod/message.php:173 mod/mood.php:116 +#: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73 +#: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111 +#: mod/poke.php:155 mod/profile_photo.php:19 mod/profile_photo.php:179 +#: mod/profile_photo.php:190 mod/profile_photo.php:203 mod/profiles.php:172 +#: mod/profiles.php:610 mod/regmod.php:106 mod/repair_ostatus.php:11 +#: mod/suggest.php:60 mod/uimport.php:26 mod/viewcontacts.php:49 +#: mod/wall_attach.php:69 mod/wall_attach.php:72 mod/wall_upload.php:101 +#: mod/wall_upload.php:104 mod/wallmessage.php:11 mod/wallmessage.php:35 +#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/contacts.php:363 +#: mod/dirfind.php:15 mod/display.php:501 mod/events.php:188 mod/follow.php:13 +#: mod/follow.php:76 mod/follow.php:160 mod/item.php:197 mod/item.php:209 +#: mod/network.php:7 mod/register.php:44 mod/settings.php:24 +#: mod/settings.php:132 mod/settings.php:669 index.php:410 +msgid "Permission denied." +msgstr "Permiso denegado." + +#: include/items.php:2426 +msgid "Archives" +msgstr "Archivos" + #: include/message.php:14 include/message.php:168 msgid "[no subject]" msgstr "[sin asunto]" -#: include/message.php:145 include/Photo.php:1075 include/Photo.php:1091 -#: include/Photo.php:1099 include/Photo.php:1124 mod/wall_upload.php:249 -#: mod/item.php:468 -msgid "Wall Photos" -msgstr "Foto del Muro" - #: include/nav.php:37 mod/navigation.php:21 msgid "Nothing new here" msgstr "Nada nuevo por aquí" @@ -2104,7 +2642,11 @@ msgstr "Nada nuevo por aquí" msgid "Clear notifications" msgstr "Limpiar notificaciones" -#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:862 +#: include/nav.php:42 include/text.php:1084 +msgid "@name, !forum, #tags, content" +msgstr "@name, !forum, #tags, contenido" + +#: include/nav.php:80 view/theme/frio/theme.php:245 boot.php:871 msgid "Logout" msgstr "Salir" @@ -2112,49 +2654,22 @@ msgstr "Salir" msgid "End this session" msgstr "Cerrar la sesión" -#: include/nav.php:83 include/identity.php:784 mod/contacts.php:648 -#: mod/contacts.php:844 view/theme/frio/theme.php:248 -msgid "Status" -msgstr "Estado" - #: include/nav.php:83 include/nav.php:163 view/theme/frio/theme.php:248 msgid "Your posts and conversations" msgstr "Tus publicaciones y conversaciones" -#: include/nav.php:84 include/identity.php:632 include/identity.php:759 -#: include/identity.php:792 mod/newmember.php:20 mod/profperm.php:107 -#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 -msgid "Profile" -msgstr "Perfil" - #: include/nav.php:84 view/theme/frio/theme.php:249 msgid "Your profile page" msgstr "Tu página de perfil" -#: include/nav.php:85 include/identity.php:800 mod/fbrowser.php:33 -#: view/theme/frio/theme.php:250 -msgid "Photos" -msgstr "Fotografías" - #: include/nav.php:85 view/theme/frio/theme.php:250 msgid "Your photos" msgstr "Tus fotos" -#: include/nav.php:86 include/identity.php:808 include/identity.php:811 -#: view/theme/frio/theme.php:251 -msgid "Videos" -msgstr "Videos" - #: include/nav.php:86 view/theme/frio/theme.php:251 msgid "Your videos" msgstr "Tus videos" -#: include/nav.php:87 include/nav.php:151 include/identity.php:820 -#: include/identity.php:831 mod/cal.php:272 mod/events.php:377 -#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 -msgid "Events" -msgstr "Eventos" - #: include/nav.php:87 view/theme/frio/theme.php:252 msgid "Your events" msgstr "Tus eventos" @@ -2167,7 +2682,7 @@ msgstr "Notas personales" msgid "Your personal notes" msgstr "Tus notas personales" -#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:863 +#: include/nav.php:97 mod/bookmarklet.php:14 boot.php:872 msgid "Login" msgstr "Acceder" @@ -2179,7 +2694,7 @@ msgstr "Date de alta" msgid "Home Page" msgstr "Página de inicio" -#: include/nav.php:111 mod/register.php:291 boot.php:839 +#: include/nav.php:111 mod/register.php:291 boot.php:848 msgid "Register" msgstr "Registrarse" @@ -2187,7 +2702,7 @@ msgstr "Registrarse" msgid "Create an account" msgstr "Crea una cuenta" -#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:299 +#: include/nav.php:117 mod/help.php:50 view/theme/vier/theme.php:291 msgid "Help" msgstr "Ayuda" @@ -2203,10 +2718,22 @@ msgstr "Aplicaciones" msgid "Addon applications, utilities, games" msgstr "Aplicaciones, utilidades, juegos" +#: include/nav.php:125 include/text.php:1081 mod/search.php:152 +msgid "Search" +msgstr "Buscar" + #: include/nav.php:125 msgid "Search site content" msgstr " Busca contenido en la página" +#: include/nav.php:128 include/text.php:1089 +msgid "Full Text" +msgstr "Texto completo" + +#: include/nav.php:129 include/text.php:1090 +msgid "Tags" +msgstr "Tags" + #: include/nav.php:145 include/nav.php:147 mod/community.php:32 msgid "Community" msgstr "Comunidad" @@ -2219,11 +2746,6 @@ msgstr "Conversaciones en este sitio" msgid "Conversations on the network" msgstr "Conversaciones en la red" -#: include/nav.php:151 include/identity.php:823 include/identity.php:834 -#: view/theme/frio/theme.php:256 -msgid "Events and Calendar" -msgstr "Eventos y Calendario" - #: include/nav.php:154 msgid "Directory" msgstr "Directorio" @@ -2308,8 +2830,8 @@ msgstr "Delegaciones" msgid "Delegate Page Management" msgstr "Delegar la administración de la página" -#: include/nav.php:188 mod/newmember.php:15 mod/admin.php:1624 -#: mod/admin.php:1900 mod/settings.php:113 view/theme/frio/theme.php:258 +#: include/nav.php:188 mod/newmember.php:15 mod/settings.php:113 +#: mod/admin.php:1624 mod/admin.php:1900 view/theme/frio/theme.php:258 msgid "Settings" msgstr "Configuración" @@ -2317,10 +2839,6 @@ msgstr "Configuración" msgid "Account settings" msgstr "Configuración de tu cuenta" -#: include/nav.php:191 include/identity.php:296 -msgid "Profiles" -msgstr "Perfiles" - #: include/nav.php:191 msgid "Manage/Edit Profiles" msgstr "Manejar/editar Perfiles" @@ -2357,524 +2875,6 @@ msgstr "Contenido integrado" msgid "Embedding disabled" msgstr "Contenido incrustrado desabilitado" -#: include/uimport.php:85 -msgid "Error decoding account file" -msgstr "Error decodificando el archivo de cuenta" - -#: include/uimport.php:91 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? " - -#: include/uimport.php:108 include/uimport.php:119 -msgid "Error! Cannot check nickname" -msgstr "Error! No puedo consultar el apodo" - -#: include/uimport.php:112 include/uimport.php:123 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "La cuenta '%s' ya existe en este servidor!" - -#: include/uimport.php:145 -msgid "User creation error" -msgstr "Error al crear la cuenta" - -#: include/uimport.php:166 -msgid "User profile creation error" -msgstr "Error de creación del perfil de la cuenta" - -#: include/uimport.php:215 -#, php-format -msgid "%d contact not imported" -msgid_plural "%d contacts not imported" -msgstr[0] "%d contactos no encontrado" -msgstr[1] "%d contactos no importado" - -#: include/uimport.php:281 -msgid "Done. You can now login with your username and password" -msgstr "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña." - -#: include/user.php:39 mod/settings.php:377 -msgid "Passwords do not match. Password unchanged." -msgstr "Las contraseñas no coinciden. La contraseña no ha sido modificada." - -#: include/user.php:48 -msgid "An invitation is required." -msgstr "Se necesita invitación." - -#: include/user.php:53 -msgid "Invitation could not be verified." -msgstr "No se puede verificar la invitación." - -#: include/user.php:61 -msgid "Invalid OpenID url" -msgstr "Dirección OpenID no válida" - -#: include/user.php:82 -msgid "Please enter the required information." -msgstr "Por favor, introduce la información necesaria." - -#: include/user.php:96 -msgid "Please use a shorter name." -msgstr "Por favor, usa un nombre más corto." - -#: include/user.php:98 -msgid "Name too short." -msgstr "El nombre es demasiado corto." - -#: include/user.php:106 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "No parece que ese sea tu nombre completo." - -#: include/user.php:111 -msgid "Your email domain is not among those allowed on this site." -msgstr "Tu dominio de correo no se encuentra entre los permitidos en este sitio." - -#: include/user.php:114 -msgid "Not a valid email address." -msgstr "No es una dirección de correo electrónico válida." - -#: include/user.php:127 -msgid "Cannot use that email." -msgstr "No se puede utilizar este correo electrónico." - -#: include/user.php:133 -msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." -msgstr "El apodo solo puede contener \"a-z\", \"0-9\" y \"_\"." - -#: include/user.php:140 include/user.php:228 -msgid "Nickname is already registered. Please choose another." -msgstr "Apodo ya registrado. Por favor, elije otro." - -#: include/user.php:150 -msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." -msgstr "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro." - -#: include/user.php:166 -msgid "SERIOUS ERROR: Generation of security keys failed." -msgstr "ERROR GRAVE: La generación de claves de seguridad ha fallado." - -#: include/user.php:214 -msgid "An error occurred during registration. Please try again." -msgstr "Se produjo un error durante el registro. Por favor, inténtalo de nuevo." - -#: include/user.php:237 view/theme/duepuntozero/config.php:46 -msgid "default" -msgstr "predeterminado" - -#: include/user.php:247 -msgid "An error occurred creating your default profile. Please try again." -msgstr "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo." - -#: include/user.php:260 include/user.php:264 include/profile_selectors.php:42 -msgid "Friends" -msgstr "Amigos" - -#: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3697 mod/photos.php:73 mod/photos.php:189 -#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 -#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 -#: mod/profile_photo.php:90 mod/profile_photo.php:214 -#: mod/profile_photo.php:309 mod/profile_photo.php:319 -msgid "Profile Photos" -msgstr "Foto del perfil" - -#: include/user.php:397 -#, 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 "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrarse en %2$s. Su cuenta está pendiente de aprobación por el administrador.\n\t" - -#: include/user.php:407 -#, php-format -msgid "Registration at %s" -msgstr "Registro en %s" - -#: include/user.php:417 -#, php-format -msgid "" -"\n" -"\t\tDear %1$s,\n" -"\t\t\tThank you for registering at %2$s. Your account has been created.\n" -"\t" -msgstr "\n\t\tEstimado %1$s,\n\t\t\tGracias por registrar en %2$s. Su cuenta ha sido creada.\n\t" - -#: include/user.php:421 -#, 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 "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3$s\n\t\t\tNombre de la cuenta:\t\t%1$s\n\t\t\tContraseña:\t\t%5$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a %2$s." - -#: include/user.php:453 mod/admin.php:1314 -#, php-format -msgid "Registration details for %s" -msgstr "Detalles de registro para %s" - -#: include/api.php:1102 -#, php-format -msgid "Daily posting limit of %d posts reached. The post was rejected." -msgstr "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada." - -#: include/api.php:1123 -#, php-format -msgid "Weekly posting limit of %d posts reached. The post was rejected." -msgstr "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada." - -#: include/api.php:1144 -#, php-format -msgid "Monthly posting limit of %d posts reached. The post was rejected." -msgstr "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada." - -#: include/dba.php:57 include/dba_pdo.php:75 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "No se puede encontrar información DNS para la base de datos del servidor '%s'" - -#: include/dbstructure.php:25 -msgid "There are no tables on MyISAM." -msgstr "" - -#: include/dbstructure.php:66 -#, php-format -msgid "" -"\n" -"\t\t\tThe friendica developers released update %s recently,\n" -"\t\t\tbut when I tried to install it, something went terribly wrong.\n" -"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n" -"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid." -msgstr "\n\t\t\tLos desarolladores de friendica publicaron una actualización %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido." - -#: include/dbstructure.php:71 -#, php-format -msgid "" -"The error message is\n" -"[pre]%s[/pre]" -msgstr "El mensaje de error es\n[pre]%s[/pre]" - -#: include/dbstructure.php:195 -#, php-format -msgid "" -"\n" -"Error %d occurred during database update:\n" -"%s\n" -msgstr "" - -#: include/dbstructure.php:198 -msgid "Errors encountered performing database changes: " -msgstr "" - -#: include/dbstructure.php:206 -msgid ": Database update" -msgstr "" - -#: include/dbstructure.php:438 -#, php-format -msgid "%s: updating %s table." -msgstr "" - -#: include/diaspora.php:2214 -msgid "Sharing notification from Diaspora network" -msgstr "Compartir notificaciones con la red Diaspora*" - -#: include/diaspora.php:3234 -msgid "Attachments:" -msgstr "Archivos adjuntos:" - -#: include/identity.php:45 -msgid "Requested account is not available." -msgstr "La cuenta solicitada no está disponible." - -#: include/identity.php:54 mod/profile.php:22 -msgid "Requested profile is not available." -msgstr "El perfil solicitado no está disponible." - -#: include/identity.php:98 include/identity.php:325 include/identity.php:755 -msgid "Edit profile" -msgstr "Editar perfil" - -#: include/identity.php:265 -msgid "Atom feed" -msgstr "Atom feed" - -#: include/identity.php:296 -msgid "Manage/edit profiles" -msgstr "Administrar/editar perfiles" - -#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790 -msgid "Change profile photo" -msgstr "Cambiar foto del perfil" - -#: include/identity.php:302 mod/profiles.php:791 -msgid "Create New Profile" -msgstr "Crear nuevo perfil" - -#: include/identity.php:312 mod/profiles.php:780 -msgid "Profile Image" -msgstr "Imagen del Perfil" - -#: include/identity.php:315 mod/profiles.php:782 -msgid "visible to everybody" -msgstr "Visible para todos" - -#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783 -msgid "Edit visibility" -msgstr "Editar visibilidad" - -#: include/identity.php:344 include/identity.php:644 mod/directory.php:137 -#: mod/notifications.php:252 -msgid "Gender:" -msgstr "Género:" - -#: include/identity.php:347 include/identity.php:665 mod/directory.php:139 -msgid "Status:" -msgstr "Estado:" - -#: include/identity.php:349 include/identity.php:682 mod/directory.php:141 -msgid "Homepage:" -msgstr "Página de inicio:" - -#: include/identity.php:351 include/identity.php:702 mod/directory.php:143 -#: mod/notifications.php:248 mod/contacts.php:643 -msgid "About:" -msgstr "Acerca de:" - -#: include/identity.php:353 mod/contacts.php:641 -msgid "XMPP:" -msgstr "XMPP:" - -#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58 -msgid "Network:" -msgstr "Red:" - -#: include/identity.php:468 include/identity.php:558 -msgid "g A l F d" -msgstr "g A l F d" - -#: include/identity.php:469 include/identity.php:559 -msgid "F d" -msgstr "F d" - -#: include/identity.php:520 include/identity.php:609 -msgid "[today]" -msgstr "[hoy]" - -#: include/identity.php:532 -msgid "Birthday Reminders" -msgstr "Recordatorios de cumpleaños" - -#: include/identity.php:533 -msgid "Birthdays this week:" -msgstr "Cumpleaños esta semana:" - -#: include/identity.php:595 -msgid "[No description]" -msgstr "[Sin descripción]" - -#: include/identity.php:620 -msgid "Event Reminders" -msgstr "Recordatorios de eventos" - -#: include/identity.php:621 -msgid "Events this week:" -msgstr "Eventos de esta semana:" - -#: include/identity.php:641 mod/settings.php:1287 -msgid "Full Name:" -msgstr "Nombre completo:" - -#: include/identity.php:648 -msgid "j F, Y" -msgstr "j F, Y" - -#: include/identity.php:649 -msgid "j F" -msgstr "j F" - -#: include/identity.php:661 -msgid "Age:" -msgstr "Edad:" - -#: include/identity.php:674 -#, php-format -msgid "for %1$d %2$s" -msgstr "por %1$d %2$s" - -#: include/identity.php:678 mod/profiles.php:706 -msgid "Sexual Preference:" -msgstr "Preferencia sexual:" - -#: include/identity.php:686 mod/profiles.php:733 -msgid "Hometown:" -msgstr "Ciudad de origen:" - -#: include/identity.php:690 mod/follow.php:139 mod/notifications.php:250 -#: mod/contacts.php:645 -msgid "Tags:" -msgstr "Etiquetas:" - -#: include/identity.php:694 mod/profiles.php:734 -msgid "Political Views:" -msgstr "Ideas políticas:" - -#: include/identity.php:698 -msgid "Religion:" -msgstr "Religión:" - -#: include/identity.php:706 -msgid "Hobbies/Interests:" -msgstr "Aficiones/Intereses:" - -#: include/identity.php:710 mod/profiles.php:738 -msgid "Likes:" -msgstr "Me gusta:" - -#: include/identity.php:714 mod/profiles.php:739 -msgid "Dislikes:" -msgstr "No me gusta:" - -#: include/identity.php:718 -msgid "Contact information and Social Networks:" -msgstr "Información de contacto y Redes sociales:" - -#: include/identity.php:722 -msgid "Musical interests:" -msgstr "Intereses musicales:" - -#: include/identity.php:726 -msgid "Books, literature:" -msgstr "Libros, literatura:" - -#: include/identity.php:730 -msgid "Television:" -msgstr "Televisión:" - -#: include/identity.php:734 -msgid "Film/dance/culture/entertainment:" -msgstr "Películas/baile/cultura/entretenimiento:" - -#: include/identity.php:738 -msgid "Love/Romance:" -msgstr "Amor/Romance:" - -#: include/identity.php:742 -msgid "Work/employment:" -msgstr "Trabajo/ocupación:" - -#: include/identity.php:746 -msgid "School/education:" -msgstr "Escuela/estudios:" - -#: include/identity.php:751 -msgid "Forums:" -msgstr "Foros:" - -#: include/identity.php:760 mod/events.php:509 -msgid "Basic" -msgstr "Basic" - -#: include/identity.php:761 mod/events.php:510 mod/admin.php:1065 -#: mod/contacts.php:881 -msgid "Advanced" -msgstr "Avanzado" - -#: include/identity.php:787 mod/follow.php:147 mod/contacts.php:847 -msgid "Status Messages and Posts" -msgstr "Mensajes de Estado y Publicaciones" - -#: include/identity.php:795 mod/contacts.php:855 -msgid "Profile Details" -msgstr "Detalles del Perfil" - -#: include/identity.php:803 mod/photos.php:95 -msgid "Photo Albums" -msgstr "Álbum de Fotos" - -#: include/identity.php:842 mod/notes.php:49 -msgid "Personal Notes" -msgstr "Notas personales" - -#: include/identity.php:845 -msgid "Only You Can See This" -msgstr "Únicamente tú puedes ver esto" - -#: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759 -msgid "[Name Withheld]" -msgstr "[Nombre oculto]" - -#: include/items.php:2121 mod/display.php:105 mod/display.php:280 -#: mod/display.php:485 mod/notice.php:17 mod/viewsrc.php:16 mod/admin.php:248 -#: mod/admin.php:1571 mod/admin.php:1822 -msgid "Item not found." -msgstr "Elemento no encontrado." - -#: include/items.php:2160 -msgid "Do you really want to delete this item?" -msgstr "¿Realmente quieres borrar este objeto?" - -#: include/items.php:2162 mod/api.php:107 mod/follow.php:115 -#: mod/message.php:208 mod/register.php:247 mod/suggest.php:31 -#: mod/dfrn_request.php:880 mod/contacts.php:455 mod/profiles.php:643 -#: mod/profiles.php:646 mod/profiles.php:673 mod/settings.php:1172 -#: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189 -#: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204 -#: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236 -#: mod/settings.php:1237 mod/settings.php:1238 mod/settings.php:1239 -msgid "Yes" -msgstr "Sí" - -#: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 -#: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105 -#: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/dirfind.php:15 -#: mod/display.php:482 mod/editpost.php:12 mod/events.php:188 -#: mod/follow.php:13 mod/follow.php:76 mod/follow.php:160 mod/fsuggest.php:80 -#: mod/group.php:20 mod/invite.php:17 mod/invite.php:105 mod/manage.php:103 -#: mod/message.php:48 mod/message.php:173 mod/mood.php:116 mod/network.php:7 -#: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73 -#: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111 -#: mod/poke.php:155 mod/register.php:44 mod/repair_ostatus.php:11 -#: mod/suggest.php:60 mod/viewcontacts.php:49 mod/wall_attach.php:69 -#: mod/wall_attach.php:72 mod/wall_upload.php:101 mod/wall_upload.php:104 -#: mod/wallmessage.php:11 mod/wallmessage.php:35 mod/wallmessage.php:75 -#: mod/wallmessage.php:99 mod/item.php:197 mod/item.php:209 mod/regmod.php:106 -#: mod/uimport.php:26 mod/contacts.php:363 mod/profile_photo.php:19 -#: mod/profile_photo.php:179 mod/profile_photo.php:190 -#: mod/profile_photo.php:203 mod/profiles.php:172 mod/profiles.php:610 -#: mod/settings.php:24 mod/settings.php:132 mod/settings.php:669 index.php:410 -msgid "Permission denied." -msgstr "Permiso denegado." - -#: include/items.php:2426 -msgid "Archives" -msgstr "Archivos" - #: include/ostatus.php:1962 #, php-format msgid "%s is now following %s." @@ -2893,241 +2893,243 @@ msgstr "%s dejó de seguir a %s." msgid "stopped following" msgstr "dejó de seguir" -#: include/plugin.php:531 include/plugin.php:533 +#: include/photos.php:57 include/photos.php:66 mod/fbrowser.php:42 +#: mod/fbrowser.php:63 mod/photos.php:189 mod/photos.php:1125 +#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1841 +#: mod/photos.php:1855 +msgid "Contact Photos" +msgstr "Foto del contacto" + +#: include/plugin.php:532 include/plugin.php:534 msgid "Click here to upgrade." msgstr "Pulsa aquí para actualizar." -#: include/plugin.php:539 +#: include/plugin.php:541 msgid "This action exceeds the limits set by your subscription plan." msgstr "Esta acción excede los límites permitidos por tu subscripción." -#: include/plugin.php:544 +#: include/plugin.php:546 msgid "This action is not available under your subscription plan." msgstr "Esta acción no está permitida para tu subscripción." -#: include/profile_selectors.php:6 -msgid "Male" -msgstr "Hombre" +#: include/text.php:308 +msgid "newer" +msgstr "más nuevo" -#: include/profile_selectors.php:6 -msgid "Female" -msgstr "Mujer" +#: include/text.php:309 +msgid "older" +msgstr "más antiguo" -#: include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Actualmente Hombre" +#: include/text.php:314 +msgid "first" +msgstr "primera" -#: include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Actualmente Mujer" +#: include/text.php:315 +msgid "prev" +msgstr "ant." -#: include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Mayormente Hombre" +#: include/text.php:349 +msgid "next" +msgstr "sig." -#: include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Mayormente Mujer" +#: include/text.php:350 +msgid "last" +msgstr "última" -#: include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transgenérico" +#: include/text.php:404 +msgid "Loading more entries..." +msgstr "Cargar mas entradas .." -#: include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Bisexual" +#: include/text.php:405 +msgid "The end" +msgstr "El fin" -#: include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transexual" +#: include/text.php:956 +msgid "No contacts" +msgstr "Sin contactos" -#: include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Hermafrodita" +#: include/text.php:981 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "%d Contacto" +msgstr[1] "%d Contactos" -#: include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Neutro" +#: include/text.php:994 +msgid "View Contacts" +msgstr "Ver contactos" -#: include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Sin especificar" +#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 +#: mod/notes.php:64 +msgid "Save" +msgstr "Guardar" -#: include/profile_selectors.php:6 -msgid "Other" -msgstr "Otro" +#: include/text.php:1145 +msgid "poke" +msgstr "tocar" -#: include/profile_selectors.php:23 -msgid "Males" -msgstr "Hombres" +#: include/text.php:1145 +msgid "poked" +msgstr "tocó a" -#: include/profile_selectors.php:23 -msgid "Females" -msgstr "Mujeres" +#: include/text.php:1146 +msgid "ping" +msgstr "hacer \"ping\"" -#: include/profile_selectors.php:23 -msgid "Gay" -msgstr "Gay" +#: include/text.php:1146 +msgid "pinged" +msgstr "hizo \"ping\" a" -#: include/profile_selectors.php:23 -msgid "Lesbian" -msgstr "Lesbiana" +#: include/text.php:1147 +msgid "prod" +msgstr "empujar" -#: include/profile_selectors.php:23 -msgid "No Preference" -msgstr "Sin preferencias" +#: include/text.php:1147 +msgid "prodded" +msgstr "empujó a" -#: include/profile_selectors.php:23 -msgid "Bisexual" -msgstr "Bisexual" +#: include/text.php:1148 +msgid "slap" +msgstr "abofetear" -#: include/profile_selectors.php:23 -msgid "Autosexual" -msgstr "Autosexual" +#: include/text.php:1148 +msgid "slapped" +msgstr "abofeteó a" -#: include/profile_selectors.php:23 -msgid "Abstinent" -msgstr "Célibe" +#: include/text.php:1149 +msgid "finger" +msgstr "meter dedo" -#: include/profile_selectors.php:23 -msgid "Virgin" -msgstr "Virgen" +#: include/text.php:1149 +msgid "fingered" +msgstr "le metió un dedo a" -#: include/profile_selectors.php:23 -msgid "Deviant" -msgstr "Desviado" +#: include/text.php:1150 +msgid "rebuff" +msgstr "desairar" -#: include/profile_selectors.php:23 -msgid "Fetish" -msgstr "Fetichista" +#: include/text.php:1150 +msgid "rebuffed" +msgstr "desairó a" -#: include/profile_selectors.php:23 -msgid "Oodles" -msgstr "Orgiástico" +#: include/text.php:1164 +msgid "happy" +msgstr "feliz" -#: include/profile_selectors.php:23 -msgid "Nonsexual" -msgstr "Asexual" +#: include/text.php:1165 +msgid "sad" +msgstr "triste" -#: include/profile_selectors.php:42 -msgid "Single" -msgstr "Soltero" +#: include/text.php:1166 +msgid "mellow" +msgstr "sentimental" -#: include/profile_selectors.php:42 -msgid "Lonely" -msgstr "Solitario" +#: include/text.php:1167 +msgid "tired" +msgstr "cansado" -#: include/profile_selectors.php:42 -msgid "Available" -msgstr "Disponible" +#: include/text.php:1168 +msgid "perky" +msgstr "alegre" -#: include/profile_selectors.php:42 -msgid "Unavailable" -msgstr "No disponible" +#: include/text.php:1169 +msgid "angry" +msgstr "furioso" -#: include/profile_selectors.php:42 -msgid "Has crush" -msgstr "Enamorado" +#: include/text.php:1170 +msgid "stupified" +msgstr "estupefacto" -#: include/profile_selectors.php:42 -msgid "Infatuated" -msgstr "Loco/a por alguien" +#: include/text.php:1171 +msgid "puzzled" +msgstr "extrañado" -#: include/profile_selectors.php:42 -msgid "Dating" -msgstr "De citas" +#: include/text.php:1172 +msgid "interested" +msgstr "interesado" -#: include/profile_selectors.php:42 -msgid "Unfaithful" -msgstr "Infiel" +#: include/text.php:1173 +msgid "bitter" +msgstr "rencoroso" -#: include/profile_selectors.php:42 -msgid "Sex Addict" -msgstr "Adicto al sexo" +#: include/text.php:1174 +msgid "cheerful" +msgstr "jovial" -#: include/profile_selectors.php:42 -msgid "Friends/Benefits" -msgstr "Amigos con beneficios" +#: include/text.php:1175 +msgid "alive" +msgstr "vivo" -#: include/profile_selectors.php:42 -msgid "Casual" -msgstr "Casual" +#: include/text.php:1176 +msgid "annoyed" +msgstr "enojado" -#: include/profile_selectors.php:42 -msgid "Engaged" -msgstr "Comprometido/a" +#: include/text.php:1177 +msgid "anxious" +msgstr "ansioso" -#: include/profile_selectors.php:42 -msgid "Married" -msgstr "Casado/a" +#: include/text.php:1178 +msgid "cranky" +msgstr "irritable" -#: include/profile_selectors.php:42 -msgid "Imaginarily married" -msgstr "Casado imaginario" +#: include/text.php:1179 +msgid "disturbed" +msgstr "perturbado" -#: include/profile_selectors.php:42 -msgid "Partners" -msgstr "Socios" +#: include/text.php:1180 +msgid "frustrated" +msgstr "frustrado" -#: include/profile_selectors.php:42 -msgid "Cohabiting" -msgstr "Cohabitando" +#: include/text.php:1181 +msgid "motivated" +msgstr "motivado" -#: include/profile_selectors.php:42 -msgid "Common law" -msgstr "Pareja de hecho" +#: include/text.php:1182 +msgid "relaxed" +msgstr "relajado" -#: include/profile_selectors.php:42 -msgid "Happy" -msgstr "Feliz" +#: include/text.php:1183 +msgid "surprised" +msgstr "sorprendido" -#: include/profile_selectors.php:42 -msgid "Not looking" -msgstr "No busca relación" +#: include/text.php:1393 mod/videos.php:388 +msgid "View Video" +msgstr "Ver vídeo" -#: include/profile_selectors.php:42 -msgid "Swinger" -msgstr "Swinger" +#: include/text.php:1425 +msgid "bytes" +msgstr "bytes" -#: include/profile_selectors.php:42 -msgid "Betrayed" -msgstr "Traicionado/a" +#: include/text.php:1457 include/text.php:1469 +msgid "Click to open/close" +msgstr "Pulsa para abrir/cerrar" -#: include/profile_selectors.php:42 -msgid "Separated" -msgstr "Separado/a" +#: include/text.php:1595 +msgid "View on separate page" +msgstr "Ver en pagina aparte" -#: include/profile_selectors.php:42 -msgid "Unstable" -msgstr "Inestable" +#: include/text.php:1596 +msgid "view on separate page" +msgstr "ver en pagina aparte" -#: include/profile_selectors.php:42 -msgid "Divorced" -msgstr "Divorciado/a" +#: include/text.php:1875 +msgid "activity" +msgstr "Actividad" -#: include/profile_selectors.php:42 -msgid "Imaginarily divorced" -msgstr "Divorciado imaginario" +#: include/text.php:1877 mod/content.php:624 object/Item.php:416 +#: object/Item.php:428 +msgid "comment" +msgid_plural "comments" +msgstr[0] "" +msgstr[1] "Comentario" -#: include/profile_selectors.php:42 -msgid "Widowed" -msgstr "Viudo/a" +#: include/text.php:1878 +msgid "post" +msgstr "Publicación" -#: include/profile_selectors.php:42 -msgid "Uncertain" -msgstr "Incierto" - -#: include/profile_selectors.php:42 -msgid "It's complicated" -msgstr "Es complicado" - -#: include/profile_selectors.php:42 -msgid "Don't care" -msgstr "No te importa" - -#: include/profile_selectors.php:42 -msgid "Ask me" -msgstr "Pregúntame" +#: include/text.php:2046 +msgid "Item filed" +msgstr "Elemento archivado" #: mod/allfriends.php:48 msgid "No friends to display." @@ -3151,9 +3153,9 @@ msgid "" " and/or create new posts for you?" msgstr "¿Quieres autorizar a esta aplicación el acceso a tus mensajes y contactos, y/o crear nuevas publicaciones para ti?" -#: mod/api.php:108 mod/follow.php:115 mod/register.php:248 -#: mod/dfrn_request.php:880 mod/profiles.php:643 mod/profiles.php:647 -#: mod/profiles.php:673 mod/settings.php:1172 mod/settings.php:1178 +#: mod/api.php:108 mod/profiles.php:643 mod/profiles.php:647 +#: mod/profiles.php:673 mod/dfrn_request.php:880 mod/follow.php:115 +#: mod/register.php:248 mod/settings.php:1172 mod/settings.php:1178 #: mod/settings.php:1185 mod/settings.php:1189 mod/settings.php:1194 #: mod/settings.php:1199 mod/settings.php:1204 mod/settings.php:1209 #: mod/settings.php:1235 mod/settings.php:1236 mod/settings.php:1237 @@ -3233,7 +3235,7 @@ msgstr "diaspora2bb: " msgid "The post was created" msgstr "La publicación fue creada" -#: mod/cal.php:145 mod/display.php:329 mod/profile.php:156 +#: mod/cal.php:145 mod/profile.php:156 mod/display.php:348 msgid "Access to this profile has been restricted." msgstr "El acceso a este perfil ha sido restringido." @@ -3245,7 +3247,7 @@ msgstr "Vista" msgid "Previous" msgstr "Previo" -#: mod/cal.php:275 mod/events.php:381 mod/install.php:203 +#: mod/cal.php:275 mod/install.php:203 mod/events.php:381 msgid "Next" msgstr "Siguiente" @@ -3277,21 +3279,6 @@ msgstr "Sin contactos en común." msgid "Common Friends" msgstr "Amigos comunes" -#: mod/community.php:18 mod/directory.php:33 mod/display.php:201 -#: mod/photos.php:981 mod/search.php:96 mod/search.php:102 mod/videos.php:200 -#: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/dfrn_request.php:804 -#: mod/probe.php:9 -msgid "Public access denied." -msgstr "Acceso público denegado." - -#: mod/community.php:23 -msgid "Not available." -msgstr "No disponible" - -#: mod/community.php:50 mod/search.php:222 -msgid "No results." -msgstr "Sin resultados." - #: mod/content.php:120 mod/network.php:478 msgid "No such group" msgstr "Ningún grupo" @@ -3355,13 +3342,13 @@ msgstr "Este eres tú" msgid "Comment" msgstr "Comentar" -#: mod/content.php:729 mod/crepair.php:159 mod/events.php:508 -#: mod/fsuggest.php:109 mod/install.php:244 mod/install.php:284 -#: mod/invite.php:144 mod/localtime.php:46 mod/manage.php:156 -#: mod/message.php:340 mod/message.php:523 mod/mood.php:139 -#: mod/photos.php:1143 mod/photos.php:1273 mod/photos.php:1599 -#: mod/photos.php:1648 mod/photos.php:1690 mod/photos.php:1770 -#: mod/poke.php:204 mod/contacts.php:588 mod/profiles.php:684 +#: mod/content.php:729 mod/crepair.php:159 mod/fsuggest.php:109 +#: mod/install.php:244 mod/install.php:284 mod/invite.php:144 +#: mod/localtime.php:46 mod/manage.php:156 mod/message.php:340 +#: mod/message.php:523 mod/mood.php:139 mod/photos.php:1143 +#: mod/photos.php:1273 mod/photos.php:1599 mod/photos.php:1648 +#: mod/photos.php:1690 mod/photos.php:1770 mod/poke.php:204 +#: mod/profiles.php:684 mod/contacts.php:588 mod/events.php:508 #: object/Item.php:702 view/theme/duepuntozero/config.php:64 #: view/theme/frio/config.php:67 view/theme/quattro/config.php:70 #: view/theme/vier/config.php:113 @@ -3539,9 +3526,8 @@ msgid "" "entries from this contact." msgstr "Marcar este contacto como perfil_remoto, esto generara que friendica reenvía nuevas publicaciones desde esta cuenta." -#: mod/crepair.php:170 mod/admin.php:1496 mod/admin.php:1509 -#: mod/admin.php:1522 mod/admin.php:1538 mod/settings.php:684 -#: mod/settings.php:710 +#: mod/crepair.php:170 mod/settings.php:684 mod/settings.php:710 +#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1538 msgid "Name" msgstr "Nombre" @@ -3697,7 +3683,14 @@ msgstr "%1$s se ha unido a %2$s" msgid "%1$s welcomes %2$s" msgstr "%1$s te da la bienvenida a %2$s" -#: mod/directory.php:195 view/theme/vier/theme.php:201 +#: mod/directory.php:33 mod/photos.php:981 mod/probe.php:9 mod/videos.php:200 +#: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/community.php:18 +#: mod/dfrn_request.php:804 mod/display.php:213 mod/search.php:96 +#: mod/search.php:102 +msgid "Public access denied." +msgstr "Acceso público denegado." + +#: mod/directory.php:195 view/theme/vier/theme.php:193 msgid "Global Directory" msgstr "Directorio global" @@ -3717,24 +3710,6 @@ msgstr "Directorio del sitio" msgid "No entries (some entries may be hidden)." msgstr "Sin entradas (algunas pueden que estén ocultas)." -#: mod/dirfind.php:39 -#, php-format -msgid "People Search - %s" -msgstr "Buscar perfiles - %s" - -#: mod/dirfind.php:50 -#, php-format -msgid "Forum Search - %s" -msgstr "Búsqueda de foro - %s" - -#: mod/dirfind.php:247 mod/match.php:112 -msgid "No matches" -msgstr "Sin conincidencias" - -#: mod/display.php:480 -msgid "Item has been removed." -msgstr "El elemento ha sido eliminado." - #: mod/editpost.php:19 mod/editpost.php:29 msgid "Item not found" msgstr "Elemento no encontrado" @@ -3743,124 +3718,14 @@ msgstr "Elemento no encontrado" msgid "Edit post" msgstr "Editar publicación" -#: mod/events.php:96 mod/events.php:98 -msgid "Event can not end before it has started." -msgstr "Un evento no puede terminar antes de su comienzo." - -#: mod/events.php:105 mod/events.php:107 -msgid "Event title and start time are required." -msgstr "Título del evento y hora de inicio requeridas." - -#: mod/events.php:379 -msgid "Create New Event" -msgstr "Crea un evento nuevo" - -#: mod/events.php:484 -msgid "Event details" -msgstr "Detalles del evento" - -#: mod/events.php:485 -msgid "Starting date and Title are required." -msgstr "Se requiere fecha de comienzo y titulo" - -#: mod/events.php:486 mod/events.php:487 -msgid "Event Starts:" -msgstr "Inicio del evento:" - -#: mod/events.php:486 mod/events.php:498 mod/profiles.php:712 -msgid "Required" -msgstr "Obligatorio" - -#: mod/events.php:488 mod/events.php:504 -msgid "Finish date/time is not known or not relevant" -msgstr "La fecha/hora de finalización no es conocida o es irrelevante." - -#: mod/events.php:490 mod/events.php:491 -msgid "Event Finishes:" -msgstr "Finalización del evento:" - -#: mod/events.php:492 mod/events.php:505 -msgid "Adjust for viewer timezone" -msgstr "Ajuste de zona horaria" - -#: mod/events.php:494 -msgid "Description:" -msgstr "Descripción:" - -#: mod/events.php:498 mod/events.php:500 -msgid "Title:" -msgstr "Título:" - -#: mod/events.php:501 mod/events.php:502 -msgid "Share this event" -msgstr "Comparte este evento" - -#: mod/events.php:531 -msgid "Failed to remove event" -msgstr "" - -#: mod/events.php:533 -msgid "Event removed" -msgstr "" - #: mod/fbrowser.php:134 msgid "Files" msgstr "Archivos" -#: mod/fetch.php:15 mod/fetch.php:42 mod/fetch.php:51 mod/help.php:56 -#: mod/p.php:19 mod/p.php:46 mod/p.php:55 index.php:301 -msgid "Not Found" -msgstr "No se ha encontrado" - #: mod/filer.php:31 msgid "- select -" msgstr "- seleccionar -" -#: mod/follow.php:21 mod/dfrn_request.php:893 -msgid "Submit Request" -msgstr "Enviar solicitud" - -#: mod/follow.php:32 -msgid "You already added this contact." -msgstr "Ya has añadido este contacto." - -#: mod/follow.php:41 -msgid "Diaspora support isn't enabled. Contact can't be added." -msgstr "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado." - -#: mod/follow.php:48 -msgid "OStatus support is disabled. Contact can't be added." -msgstr "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado." - -#: mod/follow.php:55 -msgid "The network type couldn't be detected. Contact can't be added." -msgstr "No se pudo detectar el tipo de red. Contacto no puede ser agregado." - -#: mod/follow.php:114 mod/dfrn_request.php:879 -msgid "Please answer the following:" -msgstr "Por favor responde lo siguiente:" - -#: mod/follow.php:115 mod/dfrn_request.php:880 -#, php-format -msgid "Does %s know you?" -msgstr "¿%s te conoce?" - -#: mod/follow.php:116 mod/dfrn_request.php:884 -msgid "Add a personal note:" -msgstr "Añade una nota personal:" - -#: mod/follow.php:122 mod/dfrn_request.php:890 -msgid "Your Identity Address:" -msgstr "Dirección de tu perfil:" - -#: mod/follow.php:131 mod/notifications.php:257 mod/contacts.php:635 -msgid "Profile URL" -msgstr "URL Perfil" - -#: mod/follow.php:188 -msgid "Contact added" -msgstr "Contacto añadido" - #: mod/friendica.php:69 msgid "This is Friendica, version" msgstr "Esto es Friendica, versión" @@ -3899,11 +3764,11 @@ msgstr "Módulos/extensiones/aplicaciones no instalados" #: mod/friendica.php:114 msgid "On this server the following remote servers are blocked." -msgstr "" +msgstr "En este servidor los siguientes servidores remotos están bloqueados." #: mod/friendica.php:115 mod/admin.php:281 mod/admin.php:299 msgid "Reason for the block" -msgstr "" +msgstr "Razón para el bloqueo" #: mod/fsuggest.php:65 msgid "Friend suggestion sent." @@ -3956,7 +3821,7 @@ msgstr "No se puede eliminar el grupo." #: mod/group.php:190 msgid "Delete Group" -msgstr "" +msgstr "Borrar grupo" #: mod/group.php:196 msgid "Group Editor" @@ -3964,7 +3829,7 @@ msgstr "Editor de grupos" #: mod/group.php:201 msgid "Edit Group Name" -msgstr "" +msgstr "Editar nombre de grupo" #: mod/group.php:211 msgid "Members" @@ -3976,11 +3841,11 @@ msgstr "Todos los contactos" #: mod/group.php:227 msgid "Remove Contact" -msgstr "" +msgstr "Borrar contacto" #: mod/group.php:251 msgid "Add Contact" -msgstr "" +msgstr "Agregar contacto" #: mod/group.php:263 mod/profperm.php:109 msgid "Click on a contact to add or remove." @@ -3994,6 +3859,11 @@ msgstr "Nigún perfil" msgid "Help:" msgstr "Ayuda:" +#: mod/help.php:56 mod/p.php:19 mod/p.php:46 mod/p.php:55 mod/fetch.php:15 +#: mod/fetch.php:42 mod/fetch.php:51 index.php:301 +msgid "Not Found" +msgstr "No se ha encontrado" + #: mod/help.php:59 index.php:304 msgid "Page not found." msgstr "Página no encontrada." @@ -4530,7 +4400,7 @@ msgid "" "Password reset failed." msgstr "La solicitud no puede ser verificada (deberías haberla proporcionado antes). Falló el restablecimiento de la contraseña." -#: mod/lostpass.php:112 boot.php:877 +#: mod/lostpass.php:112 boot.php:886 msgid "Password Reset" msgstr "Restablecer la contraseña" @@ -4596,7 +4466,7 @@ msgid "" "your email for further instructions." msgstr "Introduce tu correo para restablecer tu contraseña. Luego comprueba tu correo para las instrucciones adicionales." -#: mod/lostpass.php:163 boot.php:865 +#: mod/lostpass.php:163 boot.php:874 msgid "Nickname or Email: " msgstr "Apodo o Correo electrónico: " @@ -4634,6 +4504,10 @@ msgstr "estás interesado en:" msgid "Profile Match" msgstr "Coincidencias de Perfil" +#: mod/match.php:112 mod/dirfind.php:247 +msgid "No matches" +msgstr "Sin conincidencias" + #: mod/message.php:62 mod/wallmessage.php:52 msgid "No recipient selected." msgstr "Ningún destinatario seleccionado" @@ -4738,82 +4612,6 @@ msgstr "Ánimo" msgid "Set your current mood and tell your friends" msgstr "Coloca tu ánimo actual y cuéntaselo a tus amigos" -#: mod/network.php:154 mod/search.php:230 mod/contacts.php:808 -#, php-format -msgid "Results for: %s" -msgstr "Resultados para: %s" - -#: mod/network.php:200 mod/search.php:28 -msgid "Remove term" -msgstr "Eliminar término" - -#: mod/network.php:407 -#, 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] "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos." -msgstr[1] "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos." - -#: mod/network.php:410 -msgid "Messages in this group won't be send to these receivers." -msgstr "Los mensajes de este grupo no se enviarán a estos receptores." - -#: mod/network.php:538 -msgid "Private messages to this person are at risk of public disclosure." -msgstr "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente." - -#: mod/network.php:543 -msgid "Invalid contact." -msgstr "Contacto erróneo." - -#: mod/network.php:816 -msgid "Commented Order" -msgstr "Orden de comentarios" - -#: mod/network.php:819 -msgid "Sort by Comment Date" -msgstr "Ordenar por fecha de comentarios" - -#: mod/network.php:824 -msgid "Posted Order" -msgstr "Orden de publicación" - -#: mod/network.php:827 -msgid "Sort by Post Date" -msgstr "Ordenar por fecha de publicación" - -#: mod/network.php:838 -msgid "Posts that mention or involve you" -msgstr "Publicaciones que te mencionan o involucran" - -#: mod/network.php:846 -msgid "New" -msgstr "Nuevo" - -#: mod/network.php:849 -msgid "Activity Stream - by date" -msgstr "Corriente de actividad por fecha" - -#: mod/network.php:857 -msgid "Shared Links" -msgstr "Enlaces compartidos" - -#: mod/network.php:860 -msgid "Interesting Links" -msgstr "Enlaces interesantes" - -#: mod/network.php:868 -msgid "Starred" -msgstr "Favoritos" - -#: mod/network.php:871 -msgid "Favourite Posts" -msgstr "Publicaciones favoritas" - #: mod/newmember.php:7 msgid "Welcome to Friendica" msgstr "Bienvenido a Friendica " @@ -5110,6 +4908,10 @@ msgstr "Lector" msgid "Subscriber" msgstr "Suscriptor" +#: mod/notifications.php:257 mod/contacts.php:635 mod/follow.php:131 +msgid "Profile URL" +msgstr "URL Perfil" + #: mod/notifications.php:274 msgid "No introductions." msgstr "Sin presentaciones." @@ -5225,7 +5027,7 @@ msgstr "%1$s fue etiquetado en %2$s por %3$s" msgid "a photo" msgstr "una foto" -#: mod/photos.php:815 mod/wall_upload.php:181 mod/profile_photo.php:155 +#: mod/photos.php:815 mod/profile_photo.php:155 mod/wall_upload.php:181 #, php-format msgid "Image exceeds size limit of %s" msgstr "La imagen excede el limite de %s" @@ -5234,11 +5036,11 @@ msgstr "La imagen excede el limite de %s" msgid "Image file is empty." msgstr "El archivo de imagen está vacío." -#: mod/photos.php:856 mod/wall_upload.php:218 mod/profile_photo.php:164 +#: mod/photos.php:856 mod/profile_photo.php:164 mod/wall_upload.php:218 msgid "Unable to process image." msgstr "Imposible procesar la imagen." -#: mod/photos.php:885 mod/wall_upload.php:257 mod/profile_photo.php:314 +#: mod/photos.php:885 mod/profile_photo.php:314 mod/wall_upload.php:257 msgid "Image upload failed." msgstr "Error al subir la imagen." @@ -5380,18 +5182,6 @@ msgstr "Mapa" msgid "View Album" msgstr "Ver Álbum" -#: mod/ping.php:273 -msgid "{0} wants to be your friend" -msgstr "{0} quiere ser tu amigo" - -#: mod/ping.php:288 -msgid "{0} sent you a message" -msgstr "{0} te ha enviado un mensaje" - -#: mod/ping.php:303 -msgid "{0} requested registration" -msgstr "{0} solicitudes de registro" - #: mod/poke.php:197 msgid "Poke/Prod" msgstr "Toque/Empujón" @@ -5412,10 +5202,378 @@ msgstr "Elige qué desea hacer con el receptor" msgid "Make this post private" msgstr "Hacer esta publicación privada" +#: mod/probe.php:10 mod/webfinger.php:11 +msgid "Only logged in users are permitted to perform a probing." +msgstr "" + #: mod/profile.php:176 msgid "Tips for New Members" msgstr "Consejos para nuevos miembros" +#: mod/profile_photo.php:44 +msgid "Image uploaded but image cropping failed." +msgstr "Imagen recibida, pero ha fallado al recortarla." + +#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: mod/profile_photo.php:322 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "Ha fallado la reducción de las dimensiones de la imagen [%s]." + +#: mod/profile_photo.php:127 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente." + +#: mod/profile_photo.php:136 +msgid "Unable to process image" +msgstr "Imposible procesar la imagen" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "Subir archivo:" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "Elige un perfil:" + +#: mod/profile_photo.php:256 +#: view/smarty3/compiled/04b5adc938a37b0a51a14fb26634819e90d47ba4.file.filebrowser.tpl.php:119 +msgid "Upload" +msgstr "Subir" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "o" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "saltar este paso" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "elige una foto de tus álbumes" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "Recortar imagen" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Por favor, ajusta el recorte de la imagen para optimizarla." + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "Editado" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "Imagen subida con éxito." + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "Perfil eliminado." + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "Perfil-" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "Nuevo perfil creado." + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "Imposible duplicar el perfil." + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "Se necesita un nombre de perfil." + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "Estado civil" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "Pareja sentimental" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "Trabajo/estudios" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "Religión" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "Preferencias políticas" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "Género" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "Orientación sexual" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "XMPP" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "Página de inicio" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "Intereses" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "Dirección" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "Ubicación" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "Perfil actualizado." + +#: mod/profiles.php:567 +msgid " and " +msgstr " y " + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "perfil público" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s cambió su %2$s a “%3$s”" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " - Visita %1$s's %2$s" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s tiene una actualización %2$s, cambiando %3$s." + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "Ocultar contactos y amigos" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "¿Ocultar tu lista de contactos/amigos en este perfil?" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "Mostrar mas campos del perfil:" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "Acciones de perfil" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "Editar detalles de tu perfil" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "Cambiar imagen del Perfil" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "Ver este perfil" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "¿Crear un nuevo perfil con esta configuración?" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "Clonar este perfil" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "Eliminar este perfil" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "Información básica" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "Imagen del perfil" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "Preferencias" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "Información del estatus" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "Información addicional" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "Relación" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "Género:" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "<span class=\"heart\"♥</span> Estado civil:" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "Ejemplo: pesca fotografía software" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "Nombres del perfil:" + +#: mod/profiles.php:712 mod/events.php:486 mod/events.php:498 +msgid "Required" +msgstr "Obligatorio" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser visto por cualquier usuario de internet." + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "Tu nombre completo:" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "Título/Descrición:" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "Dirección" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "Localidad/Ciudad:" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "Región/Estado:" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "Código postal:" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "País" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "¿Quién? (si es aplicable)" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Ejemplos: cathy123, Cathy Williams, cathy@example.com" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "Desde [fecha]:" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "Háblanos sobre ti..." + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "Dirección XMPP (Jabber):" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow" +" you." +msgstr "La dirección XMPP será propagada entre sus contactos para que puedan seguirle." + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "Dirección de tu página:" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "Creencias religiosas:" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "Palabras clave públicas:" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "(Utilizadas para sugerir amigos potenciales, otros pueden verlo)" + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "Palabras clave privadas:" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "(Utilizadas para buscar perfiles, nunca se muestra a otros)" + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "Gustos musicales" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "Libros, literatura" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "Televisión" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "Películas/baile/cultura/entretenimiento" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "Aficiones/Intereses" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "Amor/Romance" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "Trabajo/ocupación" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "Escuela/estudios" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "Informacioń de contacto y Redes sociales" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "Editar/Administrar perfiles" + #: mod/profperm.php:28 mod/profperm.php:59 msgid "Invalid profile identifier." msgstr "Identificador de perfil no válido." @@ -5432,114 +5590,18 @@ msgstr "Visible para" msgid "All Contacts (with secure profile access)" msgstr "Todos los contactos (con perfil de acceso seguro)" -#: mod/register.php:95 -msgid "" -"Registration successful. Please check your email for further instructions." -msgstr "Te has registrado con éxito. Por favor, consulta tu correo para más información." +#: mod/regmod.php:60 +msgid "Account approved." +msgstr "Cuenta aprobada." -#: mod/register.php:100 +#: mod/regmod.php:88 #, php-format -msgid "" -"Failed to send email message. Here your accout details:<br> login: %s<br> " -"password: %s<br><br>You can change your password after login." -msgstr "Error al intentar de enviar mensaje de correo. Aquí los detalles de su cuenta: <br> login: %s<br> contraseña: %s<br><br>Puede cambiar su contraseña después de ingresar al sitio." +msgid "Registration revoked for %s" +msgstr "Registro anulado para %s" -#: mod/register.php:107 -msgid "Registration successful." -msgstr "Registro exitoso." - -#: mod/register.php:113 -msgid "Your registration can not be processed." -msgstr "Tu registro no se puede procesar." - -#: mod/register.php:162 -msgid "Your registration is pending approval by the site owner." -msgstr "Tu registro está pendiente de aprobación por el propietario del sitio." - -#: mod/register.php:200 mod/uimport.php:53 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor." - -#: mod/register.php:228 -msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." -msgstr "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\"." - -#: mod/register.php:229 -msgid "" -"If you are not familiar with OpenID, please leave that field blank and fill " -"in the rest of the items." -msgstr "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos." - -#: mod/register.php:230 -msgid "Your OpenID (optional): " -msgstr "Tu OpenID (opcional):" - -#: mod/register.php:244 -msgid "Include your profile in member directory?" -msgstr "¿Incluir tu perfil en el directorio de miembros?" - -#: mod/register.php:269 -msgid "Note for the admin" -msgstr "Nota para el administrador" - -#: mod/register.php:269 -msgid "Leave a message for the admin, why you want to join this node" -msgstr "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo" - -#: mod/register.php:270 -msgid "Membership on this site is by invitation only." -msgstr "Sitio solo accesible mediante invitación." - -#: mod/register.php:271 -msgid "Your invitation ID: " -msgstr "ID de tu invitación: " - -#: mod/register.php:274 mod/admin.php:1062 -msgid "Registration" -msgstr "Registro" - -#: mod/register.php:282 -msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " -msgstr "Nombre completo (ej. Joe Smith, real o real aparente):" - -#: mod/register.php:283 -msgid "Your Email Address: " -msgstr "Tu dirección de correo: " - -#: mod/register.php:285 mod/settings.php:1279 -msgid "New Password:" -msgstr "Contraseña nueva:" - -#: mod/register.php:285 -msgid "Leave empty for an auto generated password." -msgstr "Dejar vacío para autogenerar una contraseña" - -#: mod/register.php:286 mod/settings.php:1280 -msgid "Confirm:" -msgstr "Confirmar:" - -#: mod/register.php:287 -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be " -"'<strong>nickname@$sitename</strong>'." -msgstr "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@$nombredelsitio</strong>\"." - -#: mod/register.php:288 -msgid "Choose a nickname: " -msgstr "Escoge un apodo: " - -#: mod/register.php:297 mod/uimport.php:68 -msgid "Import" -msgstr "Importar" - -#: mod/register.php:298 -msgid "Import your profile to this friendica instance" -msgstr "Importar tu perfil a esta instancia de friendica" +#: mod/regmod.php:100 +msgid "Please login." +msgstr "Por favor accede." #: mod/removeme.php:54 mod/removeme.php:57 msgid "Remove My Account" @@ -5563,23 +5625,6 @@ msgstr "Resubscribir a contactos de OStatus" msgid "Error" msgstr "error" -#: mod/search.php:103 -msgid "Only logged in users are permitted to perform a search." -msgstr "Solo usuarios activos tienen permiso para ejecutar búsquedas." - -#: mod/search.php:127 -msgid "Too Many Requests" -msgstr "Demasiadas consultas" - -#: mod/search.php:128 -msgid "Only one search per minute is permitted for not logged in users." -msgstr "Se permite solo una búsqueda por minuto para usuarios no identificados." - -#: mod/search.php:228 -#, php-format -msgid "Items tagged with: %s" -msgstr "Objetos taggeado con: %s" - #: mod/subthread.php:105 #, php-format msgid "%1$s is following %2$s's %3$s" @@ -5636,8 +5681,49 @@ msgstr "Exporta la información de tu cuenta, contactos y lo demás en JSON. Pue msgid "Export personal data" msgstr "Exportación de datos personales" +#: mod/uimport.php:53 mod/register.php:200 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor." + +#: mod/uimport.php:68 mod/register.php:297 +msgid "Import" +msgstr "Importar" + +#: mod/uimport.php:70 +msgid "Move account" +msgstr "Mover cuenta" + +#: mod/uimport.php:71 +msgid "You can import an account from another Friendica server." +msgstr "Puedes importar una cuenta desde otro servidor de Friendica." + +#: mod/uimport.php:72 +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 "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado." + +#: mod/uimport.php:73 +msgid "" +"This feature is experimental. We can't import contacts from the OStatus " +"network (GNU Social/Statusnet) or from Diaspora" +msgstr "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*" + +#: mod/uimport.php:74 +msgid "Account file" +msgstr "Archivo de la cuenta" + +#: mod/uimport.php:74 +msgid "" +"To export your account, go to \"Settings->Export your personal data\" and " +"select \"Export account\"" +msgstr "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\"" + #: mod/update_community.php:21 mod/update_display.php:25 -#: mod/update_network.php:29 mod/update_notes.php:38 mod/update_profile.php:37 +#: mod/update_notes.php:38 mod/update_profile.php:37 mod/update_network.php:29 msgid "[Embedded content - reload page to view]" msgstr "[Contenido incrustado - recarga la página para verlo]" @@ -5712,9 +5798,357 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Si quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos." -#: mod/webfinger.php:11 mod/probe.php:10 -msgid "Only logged in users are permitted to perform a probing." -msgstr "" +#: mod/community.php:23 +msgid "Not available." +msgstr "No disponible" + +#: mod/community.php:50 mod/search.php:222 +msgid "No results." +msgstr "Sin resultados." + +#: mod/contacts.php:137 +#, php-format +msgid "%d contact edited." +msgid_plural "%d contacts edited." +msgstr[0] "%d contacto editado." +msgstr[1] "%d contacts edited." + +#: mod/contacts.php:172 mod/contacts.php:381 +msgid "Could not access contact record." +msgstr "No se pudo acceder a los datos del contacto." + +#: mod/contacts.php:186 +msgid "Could not locate selected profile." +msgstr "No se pudo encontrar el perfil seleccionado." + +#: mod/contacts.php:219 +msgid "Contact updated." +msgstr "Contacto actualizado." + +#: mod/contacts.php:221 mod/dfrn_request.php:593 +msgid "Failed to update contact record." +msgstr "Error al actualizar el contacto." + +#: mod/contacts.php:402 +msgid "Contact has been blocked" +msgstr "El contacto ha sido bloqueado" + +#: mod/contacts.php:402 +msgid "Contact has been unblocked" +msgstr "El contacto ha sido desbloqueado" + +#: mod/contacts.php:413 +msgid "Contact has been ignored" +msgstr "El contacto ha sido ignorado" + +#: mod/contacts.php:413 +msgid "Contact has been unignored" +msgstr "El contacto ya no está ignorado" + +#: mod/contacts.php:425 +msgid "Contact has been archived" +msgstr "El contacto ha sido archivado" + +#: mod/contacts.php:425 +msgid "Contact has been unarchived" +msgstr "El contacto ya no está archivado" + +#: mod/contacts.php:450 +msgid "Drop contact" +msgstr "Eliminar contacto" + +#: mod/contacts.php:453 mod/contacts.php:812 +msgid "Do you really want to delete this contact?" +msgstr "¿Estás seguro de que quieres eliminar este contacto?" + +#: mod/contacts.php:472 +msgid "Contact has been removed." +msgstr "El contacto ha sido eliminado" + +#: mod/contacts.php:509 +#, php-format +msgid "You are mutual friends with %s" +msgstr "Ahora tienes una amistad mutua con %s" + +#: mod/contacts.php:513 +#, php-format +msgid "You are sharing with %s" +msgstr "Estás compartiendo con %s" + +#: mod/contacts.php:518 +#, php-format +msgid "%s is sharing with you" +msgstr "%s está compartiendo contigo" + +#: mod/contacts.php:538 +msgid "Private communications are not available for this contact." +msgstr "Las comunicaciones privadas no está disponibles para este contacto." + +#: mod/contacts.php:541 mod/admin.php:984 +msgid "Never" +msgstr "Nunca" + +#: mod/contacts.php:545 +msgid "(Update was successful)" +msgstr "(La actualización se ha completado)" + +#: mod/contacts.php:545 +msgid "(Update was not successful)" +msgstr "(La actualización no se ha completado)" + +#: mod/contacts.php:547 mod/contacts.php:975 +msgid "Suggest friends" +msgstr "Sugerir amigos" + +#: mod/contacts.php:551 +#, php-format +msgid "Network type: %s" +msgstr "Tipo de red: %s" + +#: mod/contacts.php:564 +msgid "Communications lost with this contact!" +msgstr "¡Se ha perdido la comunicación con este contacto!" + +#: mod/contacts.php:567 +msgid "Fetch further information for feeds" +msgstr "Recaudar informacion complementaria de los feeds" + +#: mod/contacts.php:568 mod/admin.php:993 +msgid "Disabled" +msgstr "Deshabilitado" + +#: mod/contacts.php:568 +msgid "Fetch information" +msgstr "Recaudar informacion" + +#: mod/contacts.php:568 +msgid "Fetch information and keywords" +msgstr "Recaudar informacion y palabras claves" + +#: mod/contacts.php:586 +msgid "Contact" +msgstr "Contacto" + +#: mod/contacts.php:589 +msgid "Profile Visibility" +msgstr "Visibilidad del Perfil" + +#: mod/contacts.php:590 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura." + +#: mod/contacts.php:591 +msgid "Contact Information / Notes" +msgstr "Información del Contacto / Notas" + +#: mod/contacts.php:592 +msgid "Edit contact notes" +msgstr "Editar notas del contacto" + +#: mod/contacts.php:598 +msgid "Block/Unblock contact" +msgstr "Boquear/Desbloquear contacto" + +#: mod/contacts.php:599 +msgid "Ignore contact" +msgstr "Ignorar contacto" + +#: mod/contacts.php:600 +msgid "Repair URL settings" +msgstr "Configuración de reparación de la dirección" + +#: mod/contacts.php:601 +msgid "View conversations" +msgstr "Ver conversaciones" + +#: mod/contacts.php:607 +msgid "Last update:" +msgstr "Última actualización:" + +#: mod/contacts.php:609 +msgid "Update public posts" +msgstr "Actualizar publicaciones públicas" + +#: mod/contacts.php:611 mod/contacts.php:985 +msgid "Update now" +msgstr "Actualizar ahora" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1516 +msgid "Unblock" +msgstr "Desbloquear" + +#: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 +#: mod/admin.php:1515 +msgid "Block" +msgstr "Bloquear" + +#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 +msgid "Unignore" +msgstr "Quitar de Ignorados" + +#: mod/contacts.php:621 +msgid "Currently blocked" +msgstr "Bloqueados" + +#: mod/contacts.php:622 +msgid "Currently ignored" +msgstr "Ignorados" + +#: mod/contacts.php:623 +msgid "Currently archived" +msgstr "Archivados" + +#: mod/contacts.php:624 +msgid "" +"Replies/likes to your public posts <strong>may</strong> still be visible" +msgstr "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles." + +#: mod/contacts.php:625 +msgid "Notification for new posts" +msgstr "Notificacion de nuevos temas." + +#: mod/contacts.php:625 +msgid "Send a notification of every new post of this contact" +msgstr "Enviar una notificacion por nuevos temas de este contacto." + +#: mod/contacts.php:628 +msgid "Blacklisted keywords" +msgstr "Lista negra de palabras" + +#: mod/contacts.php:628 +msgid "" +"Comma separated list of keywords that should not be converted to hashtags, " +"when \"Fetch information and keywords\" is selected" +msgstr "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado" + +#: mod/contacts.php:646 +msgid "Actions" +msgstr "Acciones" + +#: mod/contacts.php:649 +msgid "Contact Settings" +msgstr "Ajustes del contacto" + +#: mod/contacts.php:695 +msgid "Suggestions" +msgstr "Sugerencias" + +#: mod/contacts.php:698 +msgid "Suggest potential friends" +msgstr "Amistades potenciales sugeridas" + +#: mod/contacts.php:706 +msgid "Show all contacts" +msgstr "Mostrar todos los contactos" + +#: mod/contacts.php:711 +msgid "Unblocked" +msgstr "Desbloqueados" + +#: mod/contacts.php:714 +msgid "Only show unblocked contacts" +msgstr "Mostrar solo contactos sin bloquear" + +#: mod/contacts.php:720 +msgid "Blocked" +msgstr "Bloqueados" + +#: mod/contacts.php:723 +msgid "Only show blocked contacts" +msgstr "Mostrar solo contactos bloqueados" + +#: mod/contacts.php:729 +msgid "Ignored" +msgstr "Ignorados" + +#: mod/contacts.php:732 +msgid "Only show ignored contacts" +msgstr "Mostrar solo contactos ignorados" + +#: mod/contacts.php:738 +msgid "Archived" +msgstr "Archivados" + +#: mod/contacts.php:741 +msgid "Only show archived contacts" +msgstr "Mostrar solo contactos archivados" + +#: mod/contacts.php:747 +msgid "Hidden" +msgstr "Ocultos" + +#: mod/contacts.php:750 +msgid "Only show hidden contacts" +msgstr "Mostrar solo contactos ocultos" + +#: mod/contacts.php:807 +msgid "Search your contacts" +msgstr "Buscar en tus contactos" + +#: mod/contacts.php:808 mod/network.php:154 mod/search.php:230 +#, php-format +msgid "Results for: %s" +msgstr "Resultados para: %s" + +#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 +msgid "Update" +msgstr "Actualizar" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Archive" +msgstr "Archivo" + +#: mod/contacts.php:818 mod/contacts.php:1010 +msgid "Unarchive" +msgstr "Sin archivar" + +#: mod/contacts.php:821 +msgid "Batch Actions" +msgstr "Accones en lote" + +#: mod/contacts.php:867 +msgid "View all contacts" +msgstr "Ver todos los contactos" + +#: mod/contacts.php:877 +msgid "View all common friends" +msgstr "Ver todos los conocidos en común " + +#: mod/contacts.php:884 +msgid "Advanced Contact Settings" +msgstr "Configuración avanzada" + +#: mod/contacts.php:918 +msgid "Mutual Friendship" +msgstr "Amistad recíproca" + +#: mod/contacts.php:922 +msgid "is a fan of yours" +msgstr "es tu fan" + +#: mod/contacts.php:926 +msgid "you are a fan of" +msgstr "eres fan de" + +#: mod/contacts.php:996 +msgid "Toggle Blocked status" +msgstr "Cambiar bloqueados" + +#: mod/contacts.php:1004 +msgid "Toggle Ignored status" +msgstr "Cambiar ignorados" + +#: mod/contacts.php:1012 +msgid "Toggle Archive status" +msgstr "Cambiar archivados" + +#: mod/contacts.php:1020 +msgid "Delete contact" +msgstr "Eliminar contacto" #: mod/dfrn_request.php:103 msgid "This introduction has already been accepted." @@ -5789,10 +6223,6 @@ msgstr "Al parecer, ya eres amigo de %s." msgid "Invalid profile URL." msgstr "Dirección de perfil no válida." -#: mod/dfrn_request.php:593 mod/contacts.php:221 -msgid "Failed to update contact record." -msgstr "Error al actualizar el contacto." - #: mod/dfrn_request.php:614 msgid "Your introduction has been sent." msgstr "Tu presentación ha sido enviada." @@ -5855,6 +6285,19 @@ msgid "" "testuser@identi.ca" msgstr "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" +#: mod/dfrn_request.php:879 mod/follow.php:114 +msgid "Please answer the following:" +msgstr "Por favor responde lo siguiente:" + +#: mod/dfrn_request.php:880 mod/follow.php:115 +#, php-format +msgid "Does %s know you?" +msgstr "¿%s te conoce?" + +#: mod/dfrn_request.php:884 mod/follow.php:116 +msgid "Add a personal note:" +msgstr "Añade una nota personal:" + #: mod/dfrn_request.php:887 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Web Social Federada" @@ -5866,6 +6309,104 @@ msgid "" " bar." msgstr "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora." +#: mod/dfrn_request.php:890 mod/follow.php:122 +msgid "Your Identity Address:" +msgstr "Dirección de tu perfil:" + +#: mod/dfrn_request.php:893 mod/follow.php:21 +msgid "Submit Request" +msgstr "Enviar solicitud" + +#: mod/dirfind.php:39 +#, php-format +msgid "People Search - %s" +msgstr "Buscar perfiles - %s" + +#: mod/dirfind.php:50 +#, php-format +msgid "Forum Search - %s" +msgstr "Búsqueda de foro - %s" + +#: mod/display.php:499 +msgid "Item has been removed." +msgstr "El elemento ha sido eliminado." + +#: mod/events.php:96 mod/events.php:98 +msgid "Event can not end before it has started." +msgstr "Un evento no puede terminar antes de su comienzo." + +#: mod/events.php:105 mod/events.php:107 +msgid "Event title and start time are required." +msgstr "Título del evento y hora de inicio requeridas." + +#: mod/events.php:379 +msgid "Create New Event" +msgstr "Crea un evento nuevo" + +#: mod/events.php:484 +msgid "Event details" +msgstr "Detalles del evento" + +#: mod/events.php:485 +msgid "Starting date and Title are required." +msgstr "Se requiere fecha de comienzo y titulo" + +#: mod/events.php:486 mod/events.php:487 +msgid "Event Starts:" +msgstr "Inicio del evento:" + +#: mod/events.php:488 mod/events.php:504 +msgid "Finish date/time is not known or not relevant" +msgstr "La fecha/hora de finalización no es conocida o es irrelevante." + +#: mod/events.php:490 mod/events.php:491 +msgid "Event Finishes:" +msgstr "Finalización del evento:" + +#: mod/events.php:492 mod/events.php:505 +msgid "Adjust for viewer timezone" +msgstr "Ajuste de zona horaria" + +#: mod/events.php:494 +msgid "Description:" +msgstr "Descripción:" + +#: mod/events.php:498 mod/events.php:500 +msgid "Title:" +msgstr "Título:" + +#: mod/events.php:501 mod/events.php:502 +msgid "Share this event" +msgstr "Comparte este evento" + +#: mod/events.php:531 +msgid "Failed to remove event" +msgstr "" + +#: mod/events.php:533 +msgid "Event removed" +msgstr "" + +#: mod/follow.php:32 +msgid "You already added this contact." +msgstr "Ya has añadido este contacto." + +#: mod/follow.php:41 +msgid "Diaspora support isn't enabled. Contact can't be added." +msgstr "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado." + +#: mod/follow.php:48 +msgid "OStatus support is disabled. Contact can't be added." +msgstr "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado." + +#: mod/follow.php:55 +msgid "The network type couldn't be detected. Contact can't be added." +msgstr "No se pudo detectar el tipo de red. Contacto no puede ser agregado." + +#: mod/follow.php:188 +msgid "Contact added" +msgstr "Contacto añadido" + #: mod/item.php:118 msgid "Unable to locate original post." msgstr "No se puede encontrar la publicación original." @@ -5901,49 +6442,958 @@ msgstr "Por favor contacta con el remitente respondiendo a este mensaje si no de msgid "%s posted an update." msgstr "%s ha publicado una actualización." -#: mod/regmod.php:60 -msgid "Account approved." -msgstr "Cuenta aprobada." +#: mod/network.php:200 mod/search.php:28 +msgid "Remove term" +msgstr "Eliminar término" -#: mod/regmod.php:88 +#: mod/network.php:407 #, php-format -msgid "Registration revoked for %s" -msgstr "Registro anulado para %s" - -#: mod/regmod.php:100 -msgid "Please login." -msgstr "Por favor accede." - -#: mod/uimport.php:70 -msgid "Move account" -msgstr "Mover cuenta" - -#: mod/uimport.php:71 -msgid "You can import an account from another Friendica server." -msgstr "Puedes importar una cuenta desde otro servidor de Friendica." - -#: mod/uimport.php:72 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 "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado." +"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] "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos." +msgstr[1] "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos." -#: mod/uimport.php:73 +#: mod/network.php:410 +msgid "Messages in this group won't be send to these receivers." +msgstr "Los mensajes de este grupo no se enviarán a estos receptores." + +#: mod/network.php:538 +msgid "Private messages to this person are at risk of public disclosure." +msgstr "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente." + +#: mod/network.php:543 +msgid "Invalid contact." +msgstr "Contacto erróneo." + +#: mod/network.php:816 +msgid "Commented Order" +msgstr "Orden de comentarios" + +#: mod/network.php:819 +msgid "Sort by Comment Date" +msgstr "Ordenar por fecha de comentarios" + +#: mod/network.php:824 +msgid "Posted Order" +msgstr "Orden de publicación" + +#: mod/network.php:827 +msgid "Sort by Post Date" +msgstr "Ordenar por fecha de publicación" + +#: mod/network.php:838 +msgid "Posts that mention or involve you" +msgstr "Publicaciones que te mencionan o involucran" + +#: mod/network.php:846 +msgid "New" +msgstr "Nuevo" + +#: mod/network.php:849 +msgid "Activity Stream - by date" +msgstr "Corriente de actividad por fecha" + +#: mod/network.php:857 +msgid "Shared Links" +msgstr "Enlaces compartidos" + +#: mod/network.php:860 +msgid "Interesting Links" +msgstr "Enlaces interesantes" + +#: mod/network.php:868 +msgid "Starred" +msgstr "Favoritos" + +#: mod/network.php:871 +msgid "Favourite Posts" +msgstr "Publicaciones favoritas" + +#: mod/ping.php:274 +msgid "{0} wants to be your friend" +msgstr "{0} quiere ser tu amigo" + +#: mod/ping.php:289 +msgid "{0} sent you a message" +msgstr "{0} te ha enviado un mensaje" + +#: mod/ping.php:304 +msgid "{0} requested registration" +msgstr "{0} solicitudes de registro" + +#: mod/register.php:95 msgid "" -"This feature is experimental. We can't import contacts from the OStatus " -"network (GNU Social/Statusnet) or from Diaspora" -msgstr "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*" +"Registration successful. Please check your email for further instructions." +msgstr "Te has registrado con éxito. Por favor, consulta tu correo para más información." -#: mod/uimport.php:74 -msgid "Account file" -msgstr "Archivo de la cuenta" - -#: mod/uimport.php:74 +#: mod/register.php:100 +#, php-format msgid "" -"To export your account, go to \"Settings->Export your personal data\" and " -"select \"Export account\"" -msgstr "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\"" +"Failed to send email message. Here your accout details:<br> login: %s<br> " +"password: %s<br><br>You can change your password after login." +msgstr "Error al intentar de enviar mensaje de correo. Aquí los detalles de su cuenta: <br> login: %s<br> contraseña: %s<br><br>Puede cambiar su contraseña después de ingresar al sitio." + +#: mod/register.php:107 +msgid "Registration successful." +msgstr "Registro exitoso." + +#: mod/register.php:113 +msgid "Your registration can not be processed." +msgstr "Tu registro no se puede procesar." + +#: mod/register.php:162 +msgid "Your registration is pending approval by the site owner." +msgstr "Tu registro está pendiente de aprobación por el propietario del sitio." + +#: mod/register.php:228 +msgid "" +"You may (optionally) fill in this form via OpenID by supplying your OpenID " +"and clicking 'Register'." +msgstr "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\"." + +#: mod/register.php:229 +msgid "" +"If you are not familiar with OpenID, please leave that field blank and fill " +"in the rest of the items." +msgstr "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos." + +#: mod/register.php:230 +msgid "Your OpenID (optional): " +msgstr "Tu OpenID (opcional):" + +#: mod/register.php:244 +msgid "Include your profile in member directory?" +msgstr "¿Incluir tu perfil en el directorio de miembros?" + +#: mod/register.php:269 +msgid "Note for the admin" +msgstr "Nota para el administrador" + +#: mod/register.php:269 +msgid "Leave a message for the admin, why you want to join this node" +msgstr "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo" + +#: mod/register.php:270 +msgid "Membership on this site is by invitation only." +msgstr "Sitio solo accesible mediante invitación." + +#: mod/register.php:271 +msgid "Your invitation ID: " +msgstr "ID de tu invitación: " + +#: mod/register.php:274 mod/admin.php:1062 +msgid "Registration" +msgstr "Registro" + +#: mod/register.php:282 +msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " +msgstr "Nombre completo (ej. Joe Smith, real o real aparente):" + +#: mod/register.php:283 +msgid "Your Email Address: " +msgstr "Tu dirección de correo: " + +#: mod/register.php:285 mod/settings.php:1279 +msgid "New Password:" +msgstr "Contraseña nueva:" + +#: mod/register.php:285 +msgid "Leave empty for an auto generated password." +msgstr "Dejar vacío para autogenerar una contraseña" + +#: mod/register.php:286 mod/settings.php:1280 +msgid "Confirm:" +msgstr "Confirmar:" + +#: mod/register.php:287 +msgid "" +"Choose a profile nickname. This must begin with a text character. Your " +"profile address on this site will then be " +"'<strong>nickname@$sitename</strong>'." +msgstr "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@$nombredelsitio</strong>\"." + +#: mod/register.php:288 +msgid "Choose a nickname: " +msgstr "Escoge un apodo: " + +#: mod/register.php:298 +msgid "Import your profile to this friendica instance" +msgstr "Importar tu perfil a esta instancia de friendica" + +#: mod/search.php:103 +msgid "Only logged in users are permitted to perform a search." +msgstr "Solo usuarios activos tienen permiso para ejecutar búsquedas." + +#: mod/search.php:127 +msgid "Too Many Requests" +msgstr "Demasiadas consultas" + +#: mod/search.php:128 +msgid "Only one search per minute is permitted for not logged in users." +msgstr "Se permite solo una búsqueda por minuto para usuarios no identificados." + +#: mod/search.php:228 +#, php-format +msgid "Items tagged with: %s" +msgstr "Objetos taggeado con: %s" + +#: mod/settings.php:45 mod/admin.php:1496 +msgid "Account" +msgstr "Cuenta" + +#: mod/settings.php:54 mod/admin.php:170 +msgid "Additional features" +msgstr "Características adicionales" + +#: mod/settings.php:62 +msgid "Display" +msgstr "Interfaz del usuario" + +#: mod/settings.php:69 mod/settings.php:891 +msgid "Social Networks" +msgstr "Redes sociales" + +#: mod/settings.php:76 mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 +msgid "Plugins" +msgstr "Módulos" + +#: mod/settings.php:90 +msgid "Connected apps" +msgstr "Aplicaciones conectadas" + +#: mod/settings.php:104 +msgid "Remove account" +msgstr "Eliminar cuenta" + +#: mod/settings.php:159 +msgid "Missing some important data!" +msgstr "¡Faltan algunos datos importantes!" + +#: mod/settings.php:273 +msgid "Failed to connect with email account using the settings provided." +msgstr "Error al conectar con la cuenta de correo mediante la configuración suministrada." + +#: mod/settings.php:278 +msgid "Email settings updated." +msgstr "Configuración de correo actualizada." + +#: mod/settings.php:293 +msgid "Features updated" +msgstr "Actualizaciones" + +#: mod/settings.php:363 +msgid "Relocate message has been send to your contacts" +msgstr "Mensaje de reubicación ha sido enviado a sus contactos." + +#: mod/settings.php:382 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "No se permiten contraseñas vacías. La contraseña no ha sido modificada." + +#: mod/settings.php:390 +msgid "Wrong password." +msgstr "Contraseña incorrecta" + +#: mod/settings.php:401 +msgid "Password changed." +msgstr "Contraseña modificada." + +#: mod/settings.php:403 +msgid "Password update failed. Please try again." +msgstr "La actualización de la contraseña ha fallado. Por favor, prueba otra vez." + +#: mod/settings.php:483 +msgid " Please use a shorter name." +msgstr " Usa un nombre más corto." + +#: mod/settings.php:485 +msgid " Name too short." +msgstr " Nombre demasiado corto." + +#: mod/settings.php:494 +msgid "Wrong Password" +msgstr "Contraseña incorrecta" + +#: mod/settings.php:499 +msgid " Not valid email." +msgstr " Correo no válido." + +#: mod/settings.php:505 +msgid " Cannot change to that email." +msgstr " No se puede usar ese correo." + +#: mod/settings.php:561 +msgid "Private forum has no privacy permissions. Using default privacy group." +msgstr "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto." + +#: mod/settings.php:565 +msgid "Private forum has no privacy permissions and no default privacy group." +msgstr "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad." + +#: mod/settings.php:605 +msgid "Settings updated." +msgstr "Configuración actualizada." + +#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 +msgid "Add application" +msgstr "Agregar aplicación" + +#: mod/settings.php:682 mod/settings.php:793 mod/settings.php:842 +#: mod/settings.php:909 mod/settings.php:1006 mod/settings.php:1272 +#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 +#: mod/admin.php:2176 +msgid "Save Settings" +msgstr "Guardar configuración" + +#: mod/settings.php:685 mod/settings.php:711 +msgid "Consumer Key" +msgstr "Clave del consumidor" + +#: mod/settings.php:686 mod/settings.php:712 +msgid "Consumer Secret" +msgstr "Secreto del consumidor" + +#: mod/settings.php:687 mod/settings.php:713 +msgid "Redirect" +msgstr "Redirigir" + +#: mod/settings.php:688 mod/settings.php:714 +msgid "Icon url" +msgstr "Dirección del ícono" + +#: mod/settings.php:699 +msgid "You can't edit this application." +msgstr "No puedes editar esta aplicación." + +#: mod/settings.php:742 +msgid "Connected Apps" +msgstr "Aplicaciones conectadas" + +#: mod/settings.php:746 +msgid "Client key starts with" +msgstr "Clave de cliente comienza por" + +#: mod/settings.php:747 +msgid "No name" +msgstr "Sin nombre" + +#: mod/settings.php:748 +msgid "Remove authorization" +msgstr "Suprimir la autorización" + +#: mod/settings.php:760 +msgid "No Plugin settings configured" +msgstr "No se ha configurado ningún módulo" + +#: mod/settings.php:769 +msgid "Plugin Settings" +msgstr "Configuración de los módulos" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "Off" +msgstr "Apagado" + +#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +msgid "On" +msgstr "Encendido" + +#: mod/settings.php:791 +msgid "Additional Features" +msgstr "Características adicionales" + +#: mod/settings.php:801 mod/settings.php:805 +msgid "General Social Media Settings" +msgstr "Configuración general de social media " + +#: mod/settings.php:811 +msgid "Disable intelligent shortening" +msgstr "Deshabilitar recorte inteligente de URL" + +#: mod/settings.php:813 +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 "Normalemente el sistema intenta de encontrara el mejor enlace para agregar a envíos recortados (twitter, OStatus). Si esta opción se encuentra habilitado, todo envío recortado apuntara siempre al tema original en friendica." + +#: mod/settings.php:819 +msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" +msgstr "Automáticamente seguir cualquier GNUsocial (OStatus) seguidores o menciones " + +#: mod/settings.php:821 +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 "Cuando se recibe un mensaje de un perfil desconocido de OStatus, esta opción define que hacer.\nSi es habilitado, un nuevo contacto sera creado para cada usuario." + +#: mod/settings.php:827 +msgid "Default group for OStatus contacts" +msgstr "Grupo por defecto para contactos OStatus" + +#: mod/settings.php:835 +msgid "Your legacy GNU Social account" +msgstr "Tu cuenta GNU social conectada" + +#: mod/settings.php:837 +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 "Si agrega su viejo nombre de perfil GNUsocial/Statusnet aqui (en el formato de usuario@dominio.tld), sus contactos serán añadidos automáticamente.\nEl campo sera vaciado cuando termine el proceso. " + +#: mod/settings.php:840 +msgid "Repair OStatus subscriptions" +msgstr "Reparar subscripciones de OStatus" + +#: mod/settings.php:849 mod/settings.php:850 +#, php-format +msgid "Built-in support for %s connectivity is %s" +msgstr "El soporte integrado de conexión con %s está %s" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "enabled" +msgstr "habilitado" + +#: mod/settings.php:849 mod/settings.php:850 +msgid "disabled" +msgstr "deshabilitado" + +#: mod/settings.php:850 +msgid "GNU Social (OStatus)" +msgstr "GNUsocial (OStatus)" + +#: mod/settings.php:884 +msgid "Email access is disabled on this site." +msgstr "El acceso por correo está deshabilitado en esta web." + +#: mod/settings.php:896 +msgid "Email/Mailbox Setup" +msgstr "Configuración del correo/buzón" + +#: mod/settings.php:897 +msgid "" +"If you wish to communicate with email contacts using this service " +"(optional), please specify how to connect to your mailbox." +msgstr "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón." + +#: mod/settings.php:898 +msgid "Last successful email check:" +msgstr "Última comprobación del correo con éxito:" + +#: mod/settings.php:900 +msgid "IMAP server name:" +msgstr "Nombre del servidor IMAP:" + +#: mod/settings.php:901 +msgid "IMAP port:" +msgstr "Puerto IMAP:" + +#: mod/settings.php:902 +msgid "Security:" +msgstr "Seguridad:" + +#: mod/settings.php:902 mod/settings.php:907 +msgid "None" +msgstr "Ninguna" + +#: mod/settings.php:903 +msgid "Email login name:" +msgstr "Nombre de usuario:" + +#: mod/settings.php:904 +msgid "Email password:" +msgstr "Contraseña:" + +#: mod/settings.php:905 +msgid "Reply-to address:" +msgstr "Dirección de respuesta:" + +#: mod/settings.php:906 +msgid "Send public posts to all email contacts:" +msgstr "Enviar publicaciones públicas a todos los contactos de correo:" + +#: mod/settings.php:907 +msgid "Action after import:" +msgstr "Acción después de importar:" + +#: mod/settings.php:907 +msgid "Move to folder" +msgstr "Mover a un directorio" + +#: mod/settings.php:908 +msgid "Move to folder:" +msgstr "Mover al directorio:" + +#: mod/settings.php:944 mod/admin.php:948 +msgid "No special theme for mobile devices" +msgstr "No hay tema especial para dispositivos móviles" + +#: mod/settings.php:1004 +msgid "Display Settings" +msgstr "Configuración Tema/Visualización" + +#: mod/settings.php:1010 mod/settings.php:1033 +msgid "Display Theme:" +msgstr "Utilizar tema:" + +#: mod/settings.php:1011 +msgid "Mobile Theme:" +msgstr "Tema móvil:" + +#: mod/settings.php:1012 +msgid "Suppress warning of insecure networks" +msgstr "Suprimir el aviso de redes inseguras" + +#: mod/settings.php:1012 +msgid "" +"Should the system suppress the warning that the current group contains " +"members of networks that can't receive non public postings." +msgstr "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas." + +#: mod/settings.php:1013 +msgid "Update browser every xx seconds" +msgstr "Actualizar navegador cada xx segundos" + +#: mod/settings.php:1013 +msgid "Minimum of 10 seconds. Enter -1 to disable it." +msgstr "Minimo 10 segundos. Ingrese -1 para deshabilitar." + +#: mod/settings.php:1014 +msgid "Number of items to display per page:" +msgstr "Número de elementos a mostrar por página:" + +#: mod/settings.php:1014 mod/settings.php:1015 +msgid "Maximum of 100 items" +msgstr "Máximo 100 elementos" + +#: mod/settings.php:1015 +msgid "Number of items to display per page when viewed from mobile device:" +msgstr "Cantidad de objetos a visualizar cuando se usa un movil" + +#: mod/settings.php:1016 +msgid "Don't show emoticons" +msgstr "No mostrar emoticones" + +#: mod/settings.php:1017 +msgid "Calendar" +msgstr "Calendario" + +#: mod/settings.php:1018 +msgid "Beginning of week:" +msgstr "Principio de la semana:" + +#: mod/settings.php:1019 +msgid "Don't show notices" +msgstr "No mostrara avisos" + +#: mod/settings.php:1020 +msgid "Infinite scroll" +msgstr "pagina infinita (sroll)" + +#: mod/settings.php:1021 +msgid "Automatic updates only at the top of the network page" +msgstr "Actualizaciones automaticas solo estando al principio de la pagina" + +#: mod/settings.php:1022 +msgid "Bandwith Saver Mode" +msgstr "Modo de guardado de ancho de banda" + +#: mod/settings.php:1022 +msgid "" +"When enabled, embedded content is not displayed on automatic updates, they " +"only show on page reload." +msgstr "Cuando está habilitado, el contenido incrustado no se muestra en las actualizaciones automáticas, sólo en las páginas recargadas." + +#: mod/settings.php:1024 +msgid "General Theme Settings" +msgstr "Ajustes generales de tema" + +#: mod/settings.php:1025 +msgid "Custom Theme Settings" +msgstr "Ajustes personalizados de tema" + +#: mod/settings.php:1026 +msgid "Content Settings" +msgstr "Ajustes de contenido" + +#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 +#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 +#: view/theme/vier/config.php:115 +msgid "Theme settings" +msgstr "Configuración del Tema" + +#: mod/settings.php:1111 +msgid "Account Types" +msgstr "Tipos de cuenta" + +#: mod/settings.php:1112 +msgid "Personal Page Subtypes" +msgstr "Subtipos de página personal" + +#: mod/settings.php:1113 +msgid "Community Forum Subtypes" +msgstr "Subtipos de foro de comunidad" + +#: mod/settings.php:1120 +msgid "Personal Page" +msgstr "Página personal" + +#: mod/settings.php:1121 +msgid "Account for a personal profile." +msgstr "" + +#: mod/settings.php:1124 +msgid "Organisation Page" +msgstr "Página de organización" + +#: mod/settings.php:1125 +msgid "" +"Account for an organisation that automatically approves contact requests as " +"\"Followers\"." +msgstr "" + +#: mod/settings.php:1128 +msgid "News Page" +msgstr "Página de noticias" + +#: mod/settings.php:1129 +msgid "" +"Account for a news reflector that automatically approves contact requests as" +" \"Followers\"." +msgstr "" + +#: mod/settings.php:1132 +msgid "Community Forum" +msgstr "Foro de la comunidad" + +#: mod/settings.php:1133 +msgid "Account for community discussions." +msgstr "" + +#: mod/settings.php:1136 +msgid "Normal Account Page" +msgstr "Página de cuenta normal" + +#: mod/settings.php:1137 +msgid "" +"Account for a regular personal profile that requires manual approval of " +"\"Friends\" and \"Followers\"." +msgstr "" + +#: mod/settings.php:1140 +msgid "Soapbox Page" +msgstr "Página de tribuna" + +#: mod/settings.php:1141 +msgid "" +"Account for a public profile that automatically approves contact requests as" +" \"Followers\"." +msgstr "" + +#: mod/settings.php:1144 +msgid "Public Forum" +msgstr "Foro público" + +#: mod/settings.php:1145 +msgid "Automatically approves all contact requests." +msgstr "" + +#: mod/settings.php:1148 +msgid "Automatic Friend Page" +msgstr "Página de Amistad autómatica" + +#: mod/settings.php:1149 +msgid "" +"Account for a popular profile that automatically approves contact requests " +"as \"Friends\"." +msgstr "" + +#: mod/settings.php:1152 +msgid "Private Forum [Experimental]" +msgstr "Foro privado [Experimental]" + +#: mod/settings.php:1153 +msgid "Requires manual approval of contact requests." +msgstr "" + +#: mod/settings.php:1164 +msgid "OpenID:" +msgstr "OpenID:" + +#: mod/settings.php:1164 +msgid "(Optional) Allow this OpenID to login to this account." +msgstr "(Opcional) Permitir a este OpenID acceder a esta cuenta." + +#: mod/settings.php:1172 +msgid "Publish your default profile in your local site directory?" +msgstr "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?" + +#: mod/settings.php:1172 +msgid "Your profile may be visible in public." +msgstr "" + +#: mod/settings.php:1178 +msgid "Publish your default profile in the global social directory?" +msgstr "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?" + +#: mod/settings.php:1185 +msgid "Hide your contact/friend list from viewers of your default profile?" +msgstr "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?" + +#: mod/settings.php:1189 +msgid "" +"If enabled, posting public messages to Diaspora and other networks isn't " +"possible." +msgstr "Si habilitado, enviar temas públicos a a Diaspora* y otras redes no es posible. " + +#: mod/settings.php:1194 +msgid "Allow friends to post to your profile page?" +msgstr "¿Permites que tus amigos publiquen en tu página de perfil?" + +#: mod/settings.php:1199 +msgid "Allow friends to tag your posts?" +msgstr "¿Permites a los amigos etiquetar tus publicaciones?" + +#: mod/settings.php:1204 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?" + +#: mod/settings.php:1209 +msgid "Permit unknown people to send you private mail?" +msgstr "¿Permites que desconocidos te manden correos privados?" + +#: mod/settings.php:1217 +msgid "Profile is <strong>not published</strong>." +msgstr "El perfil <strong>no está publicado</strong>." + +#: mod/settings.php:1225 +#, php-format +msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." +msgstr "Su dirección de identidad es <strong>'%s'</strong> o '%s'." + +#: mod/settings.php:1232 +msgid "Automatically expire posts after this many days:" +msgstr "Las publicaciones expirarán automáticamente después de estos días:" + +#: mod/settings.php:1232 +msgid "If empty, posts will not expire. Expired posts will be deleted" +msgstr "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán" + +#: mod/settings.php:1233 +msgid "Advanced expiration settings" +msgstr "Configuración avanzada de expiración" + +#: mod/settings.php:1234 +msgid "Advanced Expiration" +msgstr "Expiración avanzada" + +#: mod/settings.php:1235 +msgid "Expire posts:" +msgstr "¿Expiran las publicaciones?" + +#: mod/settings.php:1236 +msgid "Expire personal notes:" +msgstr "¿Expiran las notas personales?" + +#: mod/settings.php:1237 +msgid "Expire starred posts:" +msgstr "¿Expiran los favoritos?" + +#: mod/settings.php:1238 +msgid "Expire photos:" +msgstr "¿Expiran las fotografías?" + +#: mod/settings.php:1239 +msgid "Only expire posts by others:" +msgstr "Solo expiran los mensajes de los demás:" + +#: mod/settings.php:1270 +msgid "Account Settings" +msgstr "Configuración de la cuenta" + +#: mod/settings.php:1278 +msgid "Password Settings" +msgstr "Configuración de la contraseña" + +#: mod/settings.php:1280 +msgid "Leave password fields blank unless changing" +msgstr "Deja la contraseña en blanco si no quieres cambiarla" + +#: mod/settings.php:1281 +msgid "Current Password:" +msgstr "Contraseña actual:" + +#: mod/settings.php:1281 mod/settings.php:1282 +msgid "Your current password to confirm the changes" +msgstr "Su contraseña actual para confirmar los cambios." + +#: mod/settings.php:1282 +msgid "Password:" +msgstr "Contraseña:" + +#: mod/settings.php:1286 +msgid "Basic Settings" +msgstr "Configuración básica" + +#: mod/settings.php:1288 +msgid "Email Address:" +msgstr "Dirección de correo:" + +#: mod/settings.php:1289 +msgid "Your Timezone:" +msgstr "Zona horaria:" + +#: mod/settings.php:1290 +msgid "Your Language:" +msgstr "Tu idioma:" + +#: mod/settings.php:1290 +msgid "" +"Set the language we use to show you friendica interface and to send you " +"emails" +msgstr "Selecciona el idioma que se usara para la interfaz del usuario y para el envío de correo." + +#: mod/settings.php:1291 +msgid "Default Post Location:" +msgstr "Localización predeterminada:" + +#: mod/settings.php:1292 +msgid "Use Browser Location:" +msgstr "Usar localización del navegador:" + +#: mod/settings.php:1295 +msgid "Security and Privacy Settings" +msgstr "Configuración de seguridad y privacidad" + +#: mod/settings.php:1297 +msgid "Maximum Friend Requests/Day:" +msgstr "Máximo número de peticiones de amistad por día:" + +#: mod/settings.php:1297 mod/settings.php:1327 +msgid "(to prevent spam abuse)" +msgstr "(para prevenir el abuso de spam)" + +#: mod/settings.php:1298 +msgid "Default Post Permissions" +msgstr "Permisos por defecto para las publicaciones" + +#: mod/settings.php:1299 +msgid "(click to open/close)" +msgstr "(pulsa para abrir/cerrar)" + +#: mod/settings.php:1310 +msgid "Default Private Post" +msgstr "Publicación Privada por defecto" + +#: mod/settings.php:1311 +msgid "Default Public Post" +msgstr "Publicación Pública por defecto" + +#: mod/settings.php:1315 +msgid "Default Permissions for New Posts" +msgstr "Permisos por defecto para nuevas publicaciones" + +#: mod/settings.php:1327 +msgid "Maximum private messages per day from unknown people:" +msgstr "Número máximo de mensajes diarios para desconocidos:" + +#: mod/settings.php:1330 +msgid "Notification Settings" +msgstr "Configuración de notificaciones" + +#: mod/settings.php:1331 +msgid "By default post a status message when:" +msgstr "Publicar en tu estado cuando:" + +#: mod/settings.php:1332 +msgid "accepting a friend request" +msgstr "aceptes una solicitud de amistad" + +#: mod/settings.php:1333 +msgid "joining a forum/community" +msgstr "te unas a un foro/comunidad" + +#: mod/settings.php:1334 +msgid "making an <em>interesting</em> profile change" +msgstr "hagas un cambio <em>interesante</em> en tu perfil" + +#: mod/settings.php:1335 +msgid "Send a notification email when:" +msgstr "Enviar notificación por correo cuando:" + +#: mod/settings.php:1336 +msgid "You receive an introduction" +msgstr "Recibas una presentación" + +#: mod/settings.php:1337 +msgid "Your introductions are confirmed" +msgstr "Tu presentación sea confirmada" + +#: mod/settings.php:1338 +msgid "Someone writes on your profile wall" +msgstr "Alguien escriba en el muro de mi perfil" + +#: mod/settings.php:1339 +msgid "Someone writes a followup comment" +msgstr "Algien escriba en un comentario que sigo" + +#: mod/settings.php:1340 +msgid "You receive a private message" +msgstr "Recibas un mensaje privado" + +#: mod/settings.php:1341 +msgid "You receive a friend suggestion" +msgstr "Recibas una sugerencia de amistad" + +#: mod/settings.php:1342 +msgid "You are tagged in a post" +msgstr "Seas etiquetado en una publicación" + +#: mod/settings.php:1343 +msgid "You are poked/prodded/etc. in a post" +msgstr "Te han tocado/empujado/etc. en una publicación" + +#: mod/settings.php:1345 +msgid "Activate desktop notifications" +msgstr "Activar notificaciones en pantalla." + +#: mod/settings.php:1345 +msgid "Show desktop popup on new notifications" +msgstr "Mostrar notificaciones emergentes en caso de nuevos eventos." + +#: mod/settings.php:1347 +msgid "Text-only notification emails" +msgstr "Notificaciones e-mail de solo texto" + +#: mod/settings.php:1349 +msgid "Send text only notification emails, without the html part" +msgstr "Enviar las notificaciones por correo con formato de solo texto sin html." + +#: mod/settings.php:1351 +msgid "Advanced Account/Page Type Settings" +msgstr "Configuración avanzada de tipo de Cuenta/Página" + +#: mod/settings.php:1352 +msgid "Change the behaviour of this account for special situations" +msgstr "Cambiar el comportamiento de esta cuenta para situaciones especiales" + +#: mod/settings.php:1355 +msgid "Relocate" +msgstr "Relocalizar" + +#: mod/settings.php:1356 +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 "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)" + +#: mod/settings.php:1357 +msgid "Resend relocate message to contacts" +msgstr "Reenviar mensaje de relocalización a los contactos" #: mod/admin.php:97 msgid "Theme settings updated." @@ -5957,18 +7407,10 @@ msgstr "Sitio" msgid "Users" msgstr "Usuarios" -#: mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 mod/settings.php:76 -msgid "Plugins" -msgstr "Módulos" - #: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 msgid "Themes" msgstr "Temas" -#: mod/admin.php:170 mod/settings.php:54 -msgid "Additional features" -msgstr "Características adicionales" - #: mod/admin.php:171 msgid "DB updates" msgstr "Actualizaciones de la Base de Datos" @@ -6168,12 +7610,12 @@ msgid "Normal Account" msgstr "Cuenta normal" #: mod/admin.php:561 mod/admin.php:1454 -msgid "Soapbox Account" -msgstr "Cuenta tribuna" +msgid "Automatic Follower Account" +msgstr "" #: mod/admin.php:562 mod/admin.php:1455 -msgid "Community/Celebrity Account" -msgstr "Cuenta de Comunidad/Celebridad" +msgid "Public Forum Account" +msgstr "" #: mod/admin.php:563 mod/admin.php:1456 msgid "Automatic Friend Account" @@ -6184,8 +7626,8 @@ msgid "Blog Account" msgstr "Cuenta de blog" #: mod/admin.php:565 -msgid "Private Forum" -msgstr "Foro privado" +msgid "Private Forum Account" +msgstr "" #: mod/admin.php:587 msgid "Message queues" @@ -6219,10 +7661,6 @@ msgstr "No se puede resolver la direccion URL base.\nDeberá tener al menos <sch msgid "Site settings updated." msgstr "Configuración de actualización." -#: mod/admin.php:948 mod/settings.php:944 -msgid "No special theme for mobile devices" -msgstr "No hay tema especial para dispositivos móviles" - #: mod/admin.php:977 msgid "No community page" msgstr "No hay pagina de comunidad" @@ -6235,18 +7673,10 @@ msgstr "Temas públicos de perfiles de este sitio." msgid "Global community page" msgstr "Pagina global de comunidad" -#: mod/admin.php:984 mod/contacts.php:541 -msgid "Never" -msgstr "Nunca" - #: mod/admin.php:985 msgid "At post arrival" msgstr "A la llegada de una publicación" -#: mod/admin.php:993 mod/contacts.php:568 -msgid "Disabled" -msgstr "Deshabilitado" - #: mod/admin.php:995 msgid "Users, Global Contacts" msgstr "Perfiles, contactos globales" @@ -6299,13 +7729,6 @@ msgstr "Forzar todos los enlaces a utilizar SSL" msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Certificación personal, usa SSL solo para enlaces locales (no recomendado)" -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 mod/settings.php:682 mod/settings.php:793 -#: mod/settings.php:842 mod/settings.php:909 mod/settings.php:1006 -#: mod/settings.php:1272 -msgid "Save Settings" -msgstr "Guardar configuración" - #: mod/admin.php:1063 msgid "File upload" msgstr "Subida de archivo" @@ -7130,10 +8553,6 @@ msgstr "Último acceso" msgid "Last item" msgstr "Último elemento" -#: mod/admin.php:1496 mod/settings.php:45 -msgid "Account" -msgstr "Cuenta" - #: mod/admin.php:1505 msgid "Add User" msgstr "Agregar usuario" @@ -7166,16 +8585,6 @@ msgstr "Nota para el usuario" msgid "Deny" msgstr "Denegado" -#: mod/admin.php:1515 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Block" -msgstr "Bloquear" - -#: mod/admin.php:1516 mod/contacts.php:616 mod/contacts.php:816 -#: mod/contacts.php:994 -msgid "Unblock" -msgstr "Desbloquear" - #: mod/admin.php:1517 msgid "Site admin" msgstr "Administrador de la web" @@ -7334,14 +8743,6 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo." -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "Off" -msgstr "Apagado" - -#: mod/admin.php:2165 mod/admin.php:2166 mod/settings.php:783 -msgid "On" -msgstr "Encendido" - #: mod/admin.php:2166 #, php-format msgid "Lock feature %s" @@ -7351,1400 +8752,18 @@ msgstr "Trancar opción %s " msgid "Manage Additional Features" msgstr "Administrar opciones adicionales" -#: mod/contacts.php:137 -#, php-format -msgid "%d contact edited." -msgid_plural "%d contacts edited." -msgstr[0] "%d contacto editado." -msgstr[1] "%d contacts edited." - -#: mod/contacts.php:172 mod/contacts.php:381 -msgid "Could not access contact record." -msgstr "No se pudo acceder a los datos del contacto." - -#: mod/contacts.php:186 -msgid "Could not locate selected profile." -msgstr "No se pudo encontrar el perfil seleccionado." - -#: mod/contacts.php:219 -msgid "Contact updated." -msgstr "Contacto actualizado." - -#: mod/contacts.php:402 -msgid "Contact has been blocked" -msgstr "El contacto ha sido bloqueado" - -#: mod/contacts.php:402 -msgid "Contact has been unblocked" -msgstr "El contacto ha sido desbloqueado" - -#: mod/contacts.php:413 -msgid "Contact has been ignored" -msgstr "El contacto ha sido ignorado" - -#: mod/contacts.php:413 -msgid "Contact has been unignored" -msgstr "El contacto ya no está ignorado" - -#: mod/contacts.php:425 -msgid "Contact has been archived" -msgstr "El contacto ha sido archivado" - -#: mod/contacts.php:425 -msgid "Contact has been unarchived" -msgstr "El contacto ya no está archivado" - -#: mod/contacts.php:450 -msgid "Drop contact" -msgstr "Eliminar contacto" - -#: mod/contacts.php:453 mod/contacts.php:812 -msgid "Do you really want to delete this contact?" -msgstr "¿Estás seguro de que quieres eliminar este contacto?" - -#: mod/contacts.php:472 -msgid "Contact has been removed." -msgstr "El contacto ha sido eliminado" - -#: mod/contacts.php:509 -#, php-format -msgid "You are mutual friends with %s" -msgstr "Ahora tienes una amistad mutua con %s" - -#: mod/contacts.php:513 -#, php-format -msgid "You are sharing with %s" -msgstr "Estás compartiendo con %s" - -#: mod/contacts.php:518 -#, php-format -msgid "%s is sharing with you" -msgstr "%s está compartiendo contigo" - -#: mod/contacts.php:538 -msgid "Private communications are not available for this contact." -msgstr "Las comunicaciones privadas no está disponibles para este contacto." - -#: mod/contacts.php:545 -msgid "(Update was successful)" -msgstr "(La actualización se ha completado)" - -#: mod/contacts.php:545 -msgid "(Update was not successful)" -msgstr "(La actualización no se ha completado)" - -#: mod/contacts.php:547 mod/contacts.php:975 -msgid "Suggest friends" -msgstr "Sugerir amigos" - -#: mod/contacts.php:551 -#, php-format -msgid "Network type: %s" -msgstr "Tipo de red: %s" - -#: mod/contacts.php:564 -msgid "Communications lost with this contact!" -msgstr "¡Se ha perdido la comunicación con este contacto!" - -#: mod/contacts.php:567 -msgid "Fetch further information for feeds" -msgstr "Recaudar informacion complementaria de los feeds" - -#: mod/contacts.php:568 -msgid "Fetch information" -msgstr "Recaudar informacion" - -#: mod/contacts.php:568 -msgid "Fetch information and keywords" -msgstr "Recaudar informacion y palabras claves" - -#: mod/contacts.php:586 -msgid "Contact" -msgstr "Contacto" - -#: mod/contacts.php:589 -msgid "Profile Visibility" -msgstr "Visibilidad del Perfil" - -#: mod/contacts.php:590 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura." - -#: mod/contacts.php:591 -msgid "Contact Information / Notes" -msgstr "Información del Contacto / Notas" - -#: mod/contacts.php:592 -msgid "Edit contact notes" -msgstr "Editar notas del contacto" - -#: mod/contacts.php:598 -msgid "Block/Unblock contact" -msgstr "Boquear/Desbloquear contacto" - -#: mod/contacts.php:599 -msgid "Ignore contact" -msgstr "Ignorar contacto" - -#: mod/contacts.php:600 -msgid "Repair URL settings" -msgstr "Configuración de reparación de la dirección" - -#: mod/contacts.php:601 -msgid "View conversations" -msgstr "Ver conversaciones" - -#: mod/contacts.php:607 -msgid "Last update:" -msgstr "Última actualización:" - -#: mod/contacts.php:609 -msgid "Update public posts" -msgstr "Actualizar publicaciones públicas" - -#: mod/contacts.php:611 mod/contacts.php:985 -msgid "Update now" -msgstr "Actualizar ahora" - -#: mod/contacts.php:617 mod/contacts.php:817 mod/contacts.php:1002 -msgid "Unignore" -msgstr "Quitar de Ignorados" - -#: mod/contacts.php:621 -msgid "Currently blocked" -msgstr "Bloqueados" - -#: mod/contacts.php:622 -msgid "Currently ignored" -msgstr "Ignorados" - -#: mod/contacts.php:623 -msgid "Currently archived" -msgstr "Archivados" - -#: mod/contacts.php:624 -msgid "" -"Replies/likes to your public posts <strong>may</strong> still be visible" -msgstr "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles." - -#: mod/contacts.php:625 -msgid "Notification for new posts" -msgstr "Notificacion de nuevos temas." - -#: mod/contacts.php:625 -msgid "Send a notification of every new post of this contact" -msgstr "Enviar una notificacion por nuevos temas de este contacto." - -#: mod/contacts.php:628 -msgid "Blacklisted keywords" -msgstr "Lista negra de palabras" - -#: mod/contacts.php:628 -msgid "" -"Comma separated list of keywords that should not be converted to hashtags, " -"when \"Fetch information and keywords\" is selected" -msgstr "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado" - -#: mod/contacts.php:646 -msgid "Actions" -msgstr "Acciones" - -#: mod/contacts.php:649 -msgid "Contact Settings" -msgstr "Ajustes del contacto" - -#: mod/contacts.php:695 -msgid "Suggestions" -msgstr "Sugerencias" - -#: mod/contacts.php:698 -msgid "Suggest potential friends" -msgstr "Amistades potenciales sugeridas" - -#: mod/contacts.php:706 -msgid "Show all contacts" -msgstr "Mostrar todos los contactos" - -#: mod/contacts.php:711 -msgid "Unblocked" -msgstr "Desbloqueados" - -#: mod/contacts.php:714 -msgid "Only show unblocked contacts" -msgstr "Mostrar solo contactos sin bloquear" - -#: mod/contacts.php:720 -msgid "Blocked" -msgstr "Bloqueados" - -#: mod/contacts.php:723 -msgid "Only show blocked contacts" -msgstr "Mostrar solo contactos bloqueados" - -#: mod/contacts.php:729 -msgid "Ignored" -msgstr "Ignorados" - -#: mod/contacts.php:732 -msgid "Only show ignored contacts" -msgstr "Mostrar solo contactos ignorados" - -#: mod/contacts.php:738 -msgid "Archived" -msgstr "Archivados" - -#: mod/contacts.php:741 -msgid "Only show archived contacts" -msgstr "Mostrar solo contactos archivados" - -#: mod/contacts.php:747 -msgid "Hidden" -msgstr "Ocultos" - -#: mod/contacts.php:750 -msgid "Only show hidden contacts" -msgstr "Mostrar solo contactos ocultos" - -#: mod/contacts.php:807 -msgid "Search your contacts" -msgstr "Buscar en tus contactos" - -#: mod/contacts.php:815 mod/settings.php:162 mod/settings.php:708 -msgid "Update" -msgstr "Actualizar" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Archive" -msgstr "Archivo" - -#: mod/contacts.php:818 mod/contacts.php:1010 -msgid "Unarchive" -msgstr "Sin archivar" - -#: mod/contacts.php:821 -msgid "Batch Actions" -msgstr "Accones en lote" - -#: mod/contacts.php:867 -msgid "View all contacts" -msgstr "Ver todos los contactos" - -#: mod/contacts.php:877 -msgid "View all common friends" -msgstr "Ver todos los conocidos en común " - -#: mod/contacts.php:884 -msgid "Advanced Contact Settings" -msgstr "Configuración avanzada" - -#: mod/contacts.php:918 -msgid "Mutual Friendship" -msgstr "Amistad recíproca" - -#: mod/contacts.php:922 -msgid "is a fan of yours" -msgstr "es tu fan" - -#: mod/contacts.php:926 -msgid "you are a fan of" -msgstr "eres fan de" - -#: mod/contacts.php:996 -msgid "Toggle Blocked status" -msgstr "Cambiar bloqueados" - -#: mod/contacts.php:1004 -msgid "Toggle Ignored status" -msgstr "Cambiar ignorados" - -#: mod/contacts.php:1012 -msgid "Toggle Archive status" -msgstr "Cambiar archivados" - -#: mod/contacts.php:1020 -msgid "Delete contact" -msgstr "Eliminar contacto" - -#: mod/profile_photo.php:44 -msgid "Image uploaded but image cropping failed." -msgstr "Imagen recibida, pero ha fallado al recortarla." - -#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 -#: mod/profile_photo.php:322 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "Ha fallado la reducción de las dimensiones de la imagen [%s]." - -#: mod/profile_photo.php:127 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente." - -#: mod/profile_photo.php:136 -msgid "Unable to process image" -msgstr "Imposible procesar la imagen" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "Subir archivo:" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "Elige un perfil:" - -#: mod/profile_photo.php:256 -msgid "Upload" -msgstr "Subir" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "o" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "saltar este paso" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "elige una foto de tus álbumes" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "Recortar imagen" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Por favor, ajusta el recorte de la imagen para optimizarla." - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "Editado" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "Imagen subida con éxito." - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "Perfil eliminado." - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "Perfil-" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "Nuevo perfil creado." - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "Imposible duplicar el perfil." - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "Se necesita un nombre de perfil." - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "Estado civil" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "Pareja sentimental" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "Trabajo/estudios" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "Religión" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "Preferencias políticas" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "Género" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "Orientación sexual" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "XMPP" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "Página de inicio" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "Intereses" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "Dirección" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "Ubicación" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "Perfil actualizado." - -#: mod/profiles.php:567 -msgid " and " -msgstr " y " - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "perfil público" - -#: mod/profiles.php:579 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s cambió su %2$s a “%3$s”" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " - Visita %1$s's %2$s" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s tiene una actualización %2$s, cambiando %3$s." - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "Ocultar contactos y amigos" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "¿Ocultar tu lista de contactos/amigos en este perfil?" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "Mostrar mas campos del perfil:" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "Acciones de perfil" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "Editar detalles de tu perfil" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "Cambiar imagen del Perfil" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "Ver este perfil" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "¿Crear un nuevo perfil con esta configuración?" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "Clonar este perfil" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "Eliminar este perfil" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "Información básica" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "Imagen del perfil" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "Preferencias" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "Información del estatus" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "Información addicional" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "Relación" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "Género:" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "<span class=\"heart\"♥</span> Estado civil:" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "Ejemplo: pesca fotografía software" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "Nombres del perfil:" - -#: mod/profiles.php:714 -msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser visto por cualquier usuario de internet." - -#: mod/profiles.php:715 -msgid "Your Full Name:" -msgstr "Tu nombre completo:" - -#: mod/profiles.php:716 -msgid "Title/Description:" -msgstr "Título/Descrición:" - -#: mod/profiles.php:719 -msgid "Street Address:" -msgstr "Dirección" - -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "Localidad/Ciudad:" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "Región/Estado:" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "Código postal:" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "País" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "¿Quién? (si es aplicable)" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Ejemplos: cathy123, Cathy Williams, cathy@example.com" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "Desde [fecha]:" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "Háblanos sobre ti..." - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "Dirección XMPP (Jabber):" - -#: mod/profiles.php:731 -msgid "" -"The XMPP address will be propagated to your contacts so that they can follow" -" you." -msgstr "La dirección XMPP será propagada entre sus contactos para que puedan seguirle." - -#: mod/profiles.php:732 -msgid "Homepage URL:" -msgstr "Dirección de tu página:" - -#: mod/profiles.php:735 -msgid "Religious Views:" -msgstr "Creencias religiosas:" - -#: mod/profiles.php:736 -msgid "Public Keywords:" -msgstr "Palabras clave públicas:" - -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "(Utilizadas para sugerir amigos potenciales, otros pueden verlo)" - -#: mod/profiles.php:737 -msgid "Private Keywords:" -msgstr "Palabras clave privadas:" - -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" -msgstr "(Utilizadas para buscar perfiles, nunca se muestra a otros)" - -#: mod/profiles.php:740 -msgid "Musical interests" -msgstr "Gustos musicales" - -#: mod/profiles.php:741 -msgid "Books, literature" -msgstr "Libros, literatura" - -#: mod/profiles.php:742 -msgid "Television" -msgstr "Televisión" - -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" -msgstr "Películas/baile/cultura/entretenimiento" - -#: mod/profiles.php:744 -msgid "Hobbies/Interests" -msgstr "Aficiones/Intereses" - -#: mod/profiles.php:745 -msgid "Love/romance" -msgstr "Amor/Romance" - -#: mod/profiles.php:746 -msgid "Work/employment" -msgstr "Trabajo/ocupación" - -#: mod/profiles.php:747 -msgid "School/education" -msgstr "Escuela/estudios" - -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" -msgstr "Informacioń de contacto y Redes sociales" - -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" -msgstr "Editar/Administrar perfiles" - -#: mod/settings.php:62 -msgid "Display" -msgstr "Interfaz del usuario" - -#: mod/settings.php:69 mod/settings.php:891 -msgid "Social Networks" -msgstr "Redes sociales" - -#: mod/settings.php:90 -msgid "Connected apps" -msgstr "Aplicaciones conectadas" - -#: mod/settings.php:104 -msgid "Remove account" -msgstr "Eliminar cuenta" - -#: mod/settings.php:159 -msgid "Missing some important data!" -msgstr "¡Faltan algunos datos importantes!" - -#: mod/settings.php:273 -msgid "Failed to connect with email account using the settings provided." -msgstr "Error al conectar con la cuenta de correo mediante la configuración suministrada." - -#: mod/settings.php:278 -msgid "Email settings updated." -msgstr "Configuración de correo actualizada." - -#: mod/settings.php:293 -msgid "Features updated" -msgstr "Actualizaciones" - -#: mod/settings.php:363 -msgid "Relocate message has been send to your contacts" -msgstr "Mensaje de reubicación ha sido enviado a sus contactos." - -#: mod/settings.php:382 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "No se permiten contraseñas vacías. La contraseña no ha sido modificada." - -#: mod/settings.php:390 -msgid "Wrong password." -msgstr "Contraseña incorrecta" - -#: mod/settings.php:401 -msgid "Password changed." -msgstr "Contraseña modificada." - -#: mod/settings.php:403 -msgid "Password update failed. Please try again." -msgstr "La actualización de la contraseña ha fallado. Por favor, prueba otra vez." - -#: mod/settings.php:483 -msgid " Please use a shorter name." -msgstr " Usa un nombre más corto." - -#: mod/settings.php:485 -msgid " Name too short." -msgstr " Nombre demasiado corto." - -#: mod/settings.php:494 -msgid "Wrong Password" -msgstr "Contraseña incorrecta" - -#: mod/settings.php:499 -msgid " Not valid email." -msgstr " Correo no válido." - -#: mod/settings.php:505 -msgid " Cannot change to that email." -msgstr " No se puede usar ese correo." - -#: mod/settings.php:561 -msgid "Private forum has no privacy permissions. Using default privacy group." -msgstr "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto." - -#: mod/settings.php:565 -msgid "Private forum has no privacy permissions and no default privacy group." -msgstr "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad." - -#: mod/settings.php:605 -msgid "Settings updated." -msgstr "Configuración actualizada." - -#: mod/settings.php:681 mod/settings.php:707 mod/settings.php:743 -msgid "Add application" -msgstr "Agregar aplicación" - -#: mod/settings.php:685 mod/settings.php:711 -msgid "Consumer Key" -msgstr "Clave del consumidor" - -#: mod/settings.php:686 mod/settings.php:712 -msgid "Consumer Secret" -msgstr "Secreto del consumidor" - -#: mod/settings.php:687 mod/settings.php:713 -msgid "Redirect" -msgstr "Redirigir" - -#: mod/settings.php:688 mod/settings.php:714 -msgid "Icon url" -msgstr "Dirección del ícono" - -#: mod/settings.php:699 -msgid "You can't edit this application." -msgstr "No puedes editar esta aplicación." - -#: mod/settings.php:742 -msgid "Connected Apps" -msgstr "Aplicaciones conectadas" - -#: mod/settings.php:746 -msgid "Client key starts with" -msgstr "Clave de cliente comienza por" - -#: mod/settings.php:747 -msgid "No name" -msgstr "Sin nombre" - -#: mod/settings.php:748 -msgid "Remove authorization" -msgstr "Suprimir la autorización" - -#: mod/settings.php:760 -msgid "No Plugin settings configured" -msgstr "No se ha configurado ningún módulo" - -#: mod/settings.php:769 -msgid "Plugin Settings" -msgstr "Configuración de los módulos" - -#: mod/settings.php:791 -msgid "Additional Features" -msgstr "Características adicionales" - -#: mod/settings.php:801 mod/settings.php:805 -msgid "General Social Media Settings" -msgstr "Configuración general de social media " - -#: mod/settings.php:811 -msgid "Disable intelligent shortening" -msgstr "Deshabilitar recorte inteligente de URL" - -#: mod/settings.php:813 -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 "Normalemente el sistema intenta de encontrara el mejor enlace para agregar a envíos recortados (twitter, OStatus). Si esta opción se encuentra habilitado, todo envío recortado apuntara siempre al tema original en friendica." - -#: mod/settings.php:819 -msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" -msgstr "Automáticamente seguir cualquier GNUsocial (OStatus) seguidores o menciones " - -#: mod/settings.php:821 -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 "Cuando se recibe un mensaje de un perfil desconocido de OStatus, esta opción define que hacer.\nSi es habilitado, un nuevo contacto sera creado para cada usuario." - -#: mod/settings.php:827 -msgid "Default group for OStatus contacts" -msgstr "Grupo por defecto para contactos OStatus" - -#: mod/settings.php:835 -msgid "Your legacy GNU Social account" -msgstr "Tu cuenta GNU social conectada" - -#: mod/settings.php:837 -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 "Si agrega su viejo nombre de perfil GNUsocial/Statusnet aqui (en el formato de usuario@dominio.tld), sus contactos serán añadidos automáticamente.\nEl campo sera vaciado cuando termine el proceso. " - -#: mod/settings.php:840 -msgid "Repair OStatus subscriptions" -msgstr "Reparar subscripciones de OStatus" - -#: mod/settings.php:849 mod/settings.php:850 -#, php-format -msgid "Built-in support for %s connectivity is %s" -msgstr "El soporte integrado de conexión con %s está %s" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "enabled" -msgstr "habilitado" - -#: mod/settings.php:849 mod/settings.php:850 -msgid "disabled" -msgstr "deshabilitado" - -#: mod/settings.php:850 -msgid "GNU Social (OStatus)" -msgstr "GNUsocial (OStatus)" - -#: mod/settings.php:884 -msgid "Email access is disabled on this site." -msgstr "El acceso por correo está deshabilitado en esta web." - -#: mod/settings.php:896 -msgid "Email/Mailbox Setup" -msgstr "Configuración del correo/buzón" - -#: mod/settings.php:897 -msgid "" -"If you wish to communicate with email contacts using this service " -"(optional), please specify how to connect to your mailbox." -msgstr "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón." - -#: mod/settings.php:898 -msgid "Last successful email check:" -msgstr "Última comprobación del correo con éxito:" - -#: mod/settings.php:900 -msgid "IMAP server name:" -msgstr "Nombre del servidor IMAP:" - -#: mod/settings.php:901 -msgid "IMAP port:" -msgstr "Puerto IMAP:" - -#: mod/settings.php:902 -msgid "Security:" -msgstr "Seguridad:" - -#: mod/settings.php:902 mod/settings.php:907 -msgid "None" -msgstr "Ninguna" - -#: mod/settings.php:903 -msgid "Email login name:" -msgstr "Nombre de usuario:" - -#: mod/settings.php:904 -msgid "Email password:" -msgstr "Contraseña:" - -#: mod/settings.php:905 -msgid "Reply-to address:" -msgstr "Dirección de respuesta:" - -#: mod/settings.php:906 -msgid "Send public posts to all email contacts:" -msgstr "Enviar publicaciones públicas a todos los contactos de correo:" - -#: mod/settings.php:907 -msgid "Action after import:" -msgstr "Acción después de importar:" - -#: mod/settings.php:907 -msgid "Move to folder" -msgstr "Mover a un directorio" - -#: mod/settings.php:908 -msgid "Move to folder:" -msgstr "Mover al directorio:" - -#: mod/settings.php:1004 -msgid "Display Settings" -msgstr "Configuración Tema/Visualización" - -#: mod/settings.php:1010 mod/settings.php:1033 -msgid "Display Theme:" -msgstr "Utilizar tema:" - -#: mod/settings.php:1011 -msgid "Mobile Theme:" -msgstr "Tema móvil:" - -#: mod/settings.php:1012 -msgid "Suppress warning of insecure networks" -msgstr "Suprimir el aviso de redes inseguras" - -#: mod/settings.php:1012 -msgid "" -"Should the system suppress the warning that the current group contains " -"members of networks that can't receive non public postings." -msgstr "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas." - -#: mod/settings.php:1013 -msgid "Update browser every xx seconds" -msgstr "Actualizar navegador cada xx segundos" - -#: mod/settings.php:1013 -msgid "Minimum of 10 seconds. Enter -1 to disable it." -msgstr "Minimo 10 segundos. Ingrese -1 para deshabilitar." - -#: mod/settings.php:1014 -msgid "Number of items to display per page:" -msgstr "Número de elementos a mostrar por página:" - -#: mod/settings.php:1014 mod/settings.php:1015 -msgid "Maximum of 100 items" -msgstr "Máximo 100 elementos" - -#: mod/settings.php:1015 -msgid "Number of items to display per page when viewed from mobile device:" -msgstr "Cantidad de objetos a visualizar cuando se usa un movil" - -#: mod/settings.php:1016 -msgid "Don't show emoticons" -msgstr "No mostrar emoticones" - -#: mod/settings.php:1017 -msgid "Calendar" -msgstr "Calendario" - -#: mod/settings.php:1018 -msgid "Beginning of week:" -msgstr "Principio de la semana:" - -#: mod/settings.php:1019 -msgid "Don't show notices" -msgstr "No mostrara avisos" - -#: mod/settings.php:1020 -msgid "Infinite scroll" -msgstr "pagina infinita (sroll)" - -#: mod/settings.php:1021 -msgid "Automatic updates only at the top of the network page" -msgstr "Actualizaciones automaticas solo estando al principio de la pagina" - -#: mod/settings.php:1022 -msgid "Bandwith Saver Mode" -msgstr "Modo de guardado de ancho de banda" - -#: mod/settings.php:1022 -msgid "" -"When enabled, embedded content is not displayed on automatic updates, they " -"only show on page reload." -msgstr "Cuando está habilitado, el contenido incrustado no se muestra en las actualizaciones automáticas, sólo en las páginas recargadas." - -#: mod/settings.php:1024 -msgid "General Theme Settings" -msgstr "Ajustes generales de tema" - -#: mod/settings.php:1025 -msgid "Custom Theme Settings" -msgstr "Ajustes personalizados de tema" - -#: mod/settings.php:1026 -msgid "Content Settings" -msgstr "Ajustes de contenido" - -#: mod/settings.php:1027 view/theme/duepuntozero/config.php:66 -#: view/theme/frio/config.php:69 view/theme/quattro/config.php:72 -#: view/theme/vier/config.php:115 -msgid "Theme settings" -msgstr "Configuración del Tema" - -#: mod/settings.php:1111 -msgid "Account Types" -msgstr "Tipos de cuenta" - -#: mod/settings.php:1112 -msgid "Personal Page Subtypes" -msgstr "Subtipos de página personal" - -#: mod/settings.php:1113 -msgid "Community Forum Subtypes" -msgstr "Subtipos de foro de comunidad" - -#: mod/settings.php:1120 -msgid "Personal Page" -msgstr "Página personal" - -#: mod/settings.php:1121 -msgid "This account is a regular personal profile" -msgstr "Esta cuenta es un perfil personal corriente" - -#: mod/settings.php:1124 -msgid "Organisation Page" -msgstr "Página de organización" - -#: mod/settings.php:1125 -msgid "This account is a profile for an organisation" -msgstr "Esta cuenta es un perfil de una organización" - -#: mod/settings.php:1128 -msgid "News Page" -msgstr "Página de noticias" - -#: mod/settings.php:1129 -msgid "This account is a news account/reflector" -msgstr "Esta cuenta es una cuenta de noticias/reflectora" - -#: mod/settings.php:1132 -msgid "Community Forum" -msgstr "Foro de la comunidad" - -#: mod/settings.php:1133 -msgid "" -"This account is a community forum where people can discuss with each other" -msgstr "Esta cuenta es un foro de comunidad donde la gente puede debatir con otros" - -#: mod/settings.php:1136 -msgid "Normal Account Page" -msgstr "Página de cuenta normal" - -#: mod/settings.php:1137 -msgid "This account is a normal personal profile" -msgstr "Esta cuenta es el perfil personal normal" - -#: mod/settings.php:1140 -msgid "Soapbox Page" -msgstr "Página de tribuna" - -#: mod/settings.php:1141 -msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de solo-lectura" - -#: mod/settings.php:1144 -msgid "Public Forum" -msgstr "Foro público" - -#: mod/settings.php:1145 -msgid "Automatically approve all contact requests" -msgstr "Aprovar autimáticamente todas las solicitudes de contacto" - -#: mod/settings.php:1148 -msgid "Automatic Friend Page" -msgstr "Página de Amistad autómatica" - -#: mod/settings.php:1149 -msgid "Automatically approve all connection/friend requests as friends" -msgstr "Aceptar automáticamente todas las solicitudes de conexión/amistad como amigos" - -#: mod/settings.php:1152 -msgid "Private Forum [Experimental]" -msgstr "Foro privado [Experimental]" - -#: mod/settings.php:1153 -msgid "Private forum - approved members only" -msgstr "Foro privado - solo miembros" - -#: mod/settings.php:1164 -msgid "OpenID:" -msgstr "OpenID:" - -#: mod/settings.php:1164 -msgid "(Optional) Allow this OpenID to login to this account." -msgstr "(Opcional) Permitir a este OpenID acceder a esta cuenta." - -#: mod/settings.php:1172 -msgid "Publish your default profile in your local site directory?" -msgstr "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?" - -#: mod/settings.php:1172 -msgid "Your profile may be visible in public." -msgstr "" - -#: mod/settings.php:1178 -msgid "Publish your default profile in the global social directory?" -msgstr "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?" - -#: mod/settings.php:1185 -msgid "Hide your contact/friend list from viewers of your default profile?" -msgstr "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?" - -#: mod/settings.php:1189 -msgid "" -"If enabled, posting public messages to Diaspora and other networks isn't " -"possible." -msgstr "Si habilitado, enviar temas públicos a a Diaspora* y otras redes no es posible. " - -#: mod/settings.php:1194 -msgid "Allow friends to post to your profile page?" -msgstr "¿Permites que tus amigos publiquen en tu página de perfil?" - -#: mod/settings.php:1199 -msgid "Allow friends to tag your posts?" -msgstr "¿Permites a los amigos etiquetar tus publicaciones?" - -#: mod/settings.php:1204 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?" - -#: mod/settings.php:1209 -msgid "Permit unknown people to send you private mail?" -msgstr "¿Permites que desconocidos te manden correos privados?" - -#: mod/settings.php:1217 -msgid "Profile is <strong>not published</strong>." -msgstr "El perfil <strong>no está publicado</strong>." - -#: mod/settings.php:1225 -#, php-format -msgid "Your Identity Address is <strong>'%s'</strong> or '%s'." -msgstr "Su dirección de identidad es <strong>'%s'</strong> o '%s'." - -#: mod/settings.php:1232 -msgid "Automatically expire posts after this many days:" -msgstr "Las publicaciones expirarán automáticamente después de estos días:" - -#: mod/settings.php:1232 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán" - -#: mod/settings.php:1233 -msgid "Advanced expiration settings" -msgstr "Configuración avanzada de expiración" - -#: mod/settings.php:1234 -msgid "Advanced Expiration" -msgstr "Expiración avanzada" - -#: mod/settings.php:1235 -msgid "Expire posts:" -msgstr "¿Expiran las publicaciones?" - -#: mod/settings.php:1236 -msgid "Expire personal notes:" -msgstr "¿Expiran las notas personales?" - -#: mod/settings.php:1237 -msgid "Expire starred posts:" -msgstr "¿Expiran los favoritos?" - -#: mod/settings.php:1238 -msgid "Expire photos:" -msgstr "¿Expiran las fotografías?" - -#: mod/settings.php:1239 -msgid "Only expire posts by others:" -msgstr "Solo expiran los mensajes de los demás:" - -#: mod/settings.php:1270 -msgid "Account Settings" -msgstr "Configuración de la cuenta" - -#: mod/settings.php:1278 -msgid "Password Settings" -msgstr "Configuración de la contraseña" - -#: mod/settings.php:1280 -msgid "Leave password fields blank unless changing" -msgstr "Deja la contraseña en blanco si no quieres cambiarla" - -#: mod/settings.php:1281 -msgid "Current Password:" -msgstr "Contraseña actual:" - -#: mod/settings.php:1281 mod/settings.php:1282 -msgid "Your current password to confirm the changes" -msgstr "Su contraseña actual para confirmar los cambios." - -#: mod/settings.php:1282 -msgid "Password:" -msgstr "Contraseña:" - -#: mod/settings.php:1286 -msgid "Basic Settings" -msgstr "Configuración básica" - -#: mod/settings.php:1288 -msgid "Email Address:" -msgstr "Dirección de correo:" - -#: mod/settings.php:1289 -msgid "Your Timezone:" -msgstr "Zona horaria:" - -#: mod/settings.php:1290 -msgid "Your Language:" -msgstr "Tu idioma:" - -#: mod/settings.php:1290 -msgid "" -"Set the language we use to show you friendica interface and to send you " -"emails" -msgstr "Selecciona el idioma que se usara para la interfaz del usuario y para el envío de correo." - -#: mod/settings.php:1291 -msgid "Default Post Location:" -msgstr "Localización predeterminada:" - -#: mod/settings.php:1292 -msgid "Use Browser Location:" -msgstr "Usar localización del navegador:" - -#: mod/settings.php:1295 -msgid "Security and Privacy Settings" -msgstr "Configuración de seguridad y privacidad" - -#: mod/settings.php:1297 -msgid "Maximum Friend Requests/Day:" -msgstr "Máximo número de peticiones de amistad por día:" - -#: mod/settings.php:1297 mod/settings.php:1327 -msgid "(to prevent spam abuse)" -msgstr "(para prevenir el abuso de spam)" - -#: mod/settings.php:1298 -msgid "Default Post Permissions" -msgstr "Permisos por defecto para las publicaciones" - -#: mod/settings.php:1299 -msgid "(click to open/close)" -msgstr "(pulsa para abrir/cerrar)" - -#: mod/settings.php:1310 -msgid "Default Private Post" -msgstr "Publicación Privada por defecto" - -#: mod/settings.php:1311 -msgid "Default Public Post" -msgstr "Publicación Pública por defecto" - -#: mod/settings.php:1315 -msgid "Default Permissions for New Posts" -msgstr "Permisos por defecto para nuevas publicaciones" - -#: mod/settings.php:1327 -msgid "Maximum private messages per day from unknown people:" -msgstr "Número máximo de mensajes diarios para desconocidos:" - -#: mod/settings.php:1330 -msgid "Notification Settings" -msgstr "Configuración de notificaciones" - -#: mod/settings.php:1331 -msgid "By default post a status message when:" -msgstr "Publicar en tu estado cuando:" - -#: mod/settings.php:1332 -msgid "accepting a friend request" -msgstr "aceptes una solicitud de amistad" - -#: mod/settings.php:1333 -msgid "joining a forum/community" -msgstr "te unas a un foro/comunidad" - -#: mod/settings.php:1334 -msgid "making an <em>interesting</em> profile change" -msgstr "hagas un cambio <em>interesante</em> en tu perfil" - -#: mod/settings.php:1335 -msgid "Send a notification email when:" -msgstr "Enviar notificación por correo cuando:" - -#: mod/settings.php:1336 -msgid "You receive an introduction" -msgstr "Recibas una presentación" - -#: mod/settings.php:1337 -msgid "Your introductions are confirmed" -msgstr "Tu presentación sea confirmada" - -#: mod/settings.php:1338 -msgid "Someone writes on your profile wall" -msgstr "Alguien escriba en el muro de mi perfil" - -#: mod/settings.php:1339 -msgid "Someone writes a followup comment" -msgstr "Algien escriba en un comentario que sigo" - -#: mod/settings.php:1340 -msgid "You receive a private message" -msgstr "Recibas un mensaje privado" - -#: mod/settings.php:1341 -msgid "You receive a friend suggestion" -msgstr "Recibas una sugerencia de amistad" - -#: mod/settings.php:1342 -msgid "You are tagged in a post" -msgstr "Seas etiquetado en una publicación" - -#: mod/settings.php:1343 -msgid "You are poked/prodded/etc. in a post" -msgstr "Te han tocado/empujado/etc. en una publicación" - -#: mod/settings.php:1345 -msgid "Activate desktop notifications" -msgstr "Activar notificaciones en pantalla." - -#: mod/settings.php:1345 -msgid "Show desktop popup on new notifications" -msgstr "Mostrar notificaciones emergentes en caso de nuevos eventos." - -#: mod/settings.php:1347 -msgid "Text-only notification emails" -msgstr "Notificaciones e-mail de solo texto" - -#: mod/settings.php:1349 -msgid "Send text only notification emails, without the html part" -msgstr "Enviar las notificaciones por correo con formato de solo texto sin html." - -#: mod/settings.php:1351 -msgid "Advanced Account/Page Type Settings" -msgstr "Configuración avanzada de tipo de Cuenta/Página" - -#: mod/settings.php:1352 -msgid "Change the behaviour of this account for special situations" -msgstr "Cambiar el comportamiento de esta cuenta para situaciones especiales" - -#: mod/settings.php:1355 -msgid "Relocate" -msgstr "Relocalizar" - -#: mod/settings.php:1356 -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 "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)" - -#: mod/settings.php:1357 -msgid "Resend relocate message to contacts" -msgstr "Reenviar mensaje de relocalización a los contactos" - #: object/Item.php:356 msgid "via" msgstr "vía" +#: src/App.php:506 +msgid "Delete this item?" +msgstr "¿Eliminar este elemento?" + +#: src/App.php:508 +msgid "show fewer" +msgstr "ver menos" + #: view/theme/duepuntozero/config.php:47 msgid "greenzero" msgstr "greenzero" @@ -8773,38 +8792,6 @@ msgstr "slackr" msgid "Variations" msgstr "Variaciones" -#: view/theme/frio/php/Image.php:23 -msgid "Repeat the image" -msgstr "Repetir la imagen" - -#: view/theme/frio/php/Image.php:23 -msgid "Will repeat your image to fill the background." -msgstr "Repetirá su imagen para llenar el fondo" - -#: view/theme/frio/php/Image.php:25 -msgid "Stretch" -msgstr "Estirar" - -#: view/theme/frio/php/Image.php:25 -msgid "Will stretch to width/height of the image." -msgstr "Estirará la anchura/altura de la imagen." - -#: view/theme/frio/php/Image.php:27 -msgid "Resize fill and-clip" -msgstr "Reajustar llenado y clip" - -#: view/theme/frio/php/Image.php:27 -msgid "Resize to fill and retain aspect ratio." -msgstr "Reajustar para llenar y conservar proporción" - -#: view/theme/frio/php/Image.php:29 -msgid "Resize best fit" -msgstr "Reajustar al mejor tamaño" - -#: view/theme/frio/php/Image.php:29 -msgid "Resize to best fit and retain aspect ratio." -msgstr "Reajustar al mejor tamaño y conservar proporción" - #: view/theme/frio/config.php:50 msgid "Default" msgstr "Por defecto" @@ -8845,6 +8832,38 @@ msgstr "Transparencia de contenido de fondo" msgid "Set the background image" msgstr "Seleccionar la imagen de fondo" +#: view/theme/frio/php/Image.php:23 +msgid "Repeat the image" +msgstr "Repetir la imagen" + +#: view/theme/frio/php/Image.php:23 +msgid "Will repeat your image to fill the background." +msgstr "Repetirá su imagen para llenar el fondo" + +#: view/theme/frio/php/Image.php:25 +msgid "Stretch" +msgstr "Estirar" + +#: view/theme/frio/php/Image.php:25 +msgid "Will stretch to width/height of the image." +msgstr "Estirará la anchura/altura de la imagen." + +#: view/theme/frio/php/Image.php:27 +msgid "Resize fill and-clip" +msgstr "Reajustar llenado y clip" + +#: view/theme/frio/php/Image.php:27 +msgid "Resize to fill and retain aspect ratio." +msgstr "Reajustar para llenar y conservar proporción" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize best fit" +msgstr "Reajustar al mejor tamaño" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize to best fit and retain aspect ratio." +msgstr "Reajustar al mejor tamaño y conservar proporción" + #: view/theme/frio/theme.php:228 msgid "Guest" msgstr "Invitado" @@ -8889,7 +8908,7 @@ msgstr "Definir estilo" msgid "Community Pages" msgstr "Páginas de Comunidad" -#: view/theme/vier/config.php:118 view/theme/vier/theme.php:151 +#: view/theme/vier/config.php:118 view/theme/vier/theme.php:143 msgid "Community Profiles" msgstr "Perfiles de la Comunidad" @@ -8897,75 +8916,67 @@ msgstr "Perfiles de la Comunidad" msgid "Help or @NewHere ?" msgstr "¿Ayuda o @NuevoAquí?" -#: view/theme/vier/config.php:120 view/theme/vier/theme.php:392 +#: view/theme/vier/config.php:120 view/theme/vier/theme.php:384 msgid "Connect Services" msgstr "Servicios conectados" -#: view/theme/vier/config.php:121 view/theme/vier/theme.php:199 +#: view/theme/vier/config.php:121 view/theme/vier/theme.php:191 msgid "Find Friends" msgstr "Buscar amigos" -#: view/theme/vier/config.php:122 view/theme/vier/theme.php:181 +#: view/theme/vier/config.php:122 view/theme/vier/theme.php:173 msgid "Last users" msgstr "Últimos usuarios" -#: view/theme/vier/theme.php:200 +#: view/theme/vier/theme.php:192 msgid "Local Directory" msgstr "Directorio local" -#: view/theme/vier/theme.php:292 +#: view/theme/vier/theme.php:284 msgid "Quick Start" msgstr "Inicio rápido" -#: src/App.php:505 -msgid "Delete this item?" -msgstr "¿Eliminar este elemento?" - -#: src/App.php:507 -msgid "show fewer" -msgstr "ver menos" - -#: index.php:436 -msgid "toggle mobile" -msgstr "Cambiar a versión móvil" - -#: boot.php:726 +#: boot.php:735 #, php-format msgid "Update %s failed. See error logs." msgstr "Falló la actualización de %s. Mira los registros de errores." -#: boot.php:838 +#: boot.php:847 msgid "Create a New Account" msgstr "Crear una nueva cuenta" -#: boot.php:866 +#: boot.php:875 msgid "Password: " msgstr "Contraseña: " -#: boot.php:867 +#: boot.php:876 msgid "Remember me" msgstr "Recordarme" -#: boot.php:870 +#: boot.php:879 msgid "Or login using OpenID: " msgstr "O inicia sesión usando OpenID: " -#: boot.php:876 +#: boot.php:885 msgid "Forgot your password?" msgstr "¿Olvidaste la contraseña?" -#: boot.php:879 +#: boot.php:888 msgid "Website Terms of Service" msgstr "Términos de uso del sitio" -#: boot.php:880 +#: boot.php:889 msgid "terms of service" msgstr "Términos de uso" -#: boot.php:882 +#: boot.php:891 msgid "Website Privacy Policy" msgstr "Política de privacidad del sitio" -#: boot.php:883 +#: boot.php:892 msgid "privacy policy" msgstr "Política de privacidad" + +#: index.php:436 +msgid "toggle mobile" +msgstr "Cambiar a versión móvil" diff --git a/view/lang/es/strings.php b/view/lang/es/strings.php index 97dbf7b36f..a08b460211 100644 --- a/view/lang/es/strings.php +++ b/view/lang/es/strings.php @@ -5,35 +5,83 @@ function string_plural_select_es($n){ return ($n != 1);; }} ; -$a->strings["Unknown | Not categorised"] = "Desconocido | No clasificado"; -$a->strings["Block immediately"] = "Bloquear inmediatamente"; -$a->strings["Shady, spammer, self-marketer"] = "Sospechoso, spammer, auto-publicidad"; -$a->strings["Known to me, but no opinion"] = "Le conozco, sin opinión"; -$a->strings["OK, probably harmless"] = "OK, probablemente inofensivo"; -$a->strings["Reputable, has my trust"] = "Buena reputación, tiene mi confianza"; -$a->strings["Frequently"] = "Frequentemente"; -$a->strings["Hourly"] = "Cada hora"; -$a->strings["Twice daily"] = "Dos veces al día"; -$a->strings["Daily"] = "Diariamente"; -$a->strings["Weekly"] = "Semanalmente"; -$a->strings["Monthly"] = "Mensualmente"; -$a->strings["Friendica"] = "Friendica"; -$a->strings["OStatus"] = "OStatus"; -$a->strings["RSS/Atom"] = "RSS/Atom"; -$a->strings["Email"] = "Correo electrónico"; -$a->strings["Diaspora"] = "Diaspora*"; -$a->strings["Facebook"] = "Facebook"; -$a->strings["Zot!"] = "Zot!"; -$a->strings["LinkedIn"] = "LinkedIn"; -$a->strings["XMPP/IM"] = "XMPP/IM"; -$a->strings["MySpace"] = "MySpace"; -$a->strings["Google+"] = "Google+"; -$a->strings["pump.io"] = "pump.io"; -$a->strings["Twitter"] = "Twitter"; -$a->strings["Diaspora Connector"] = "Conector Diaspora"; -$a->strings["GNU Social Connector"] = ""; -$a->strings["pnut"] = "pnut"; -$a->strings["App.net"] = "App.net"; +$a->strings["Forums"] = "Foros"; +$a->strings["External link to forum"] = "Enlace externo al foro"; +$a->strings["show more"] = "ver más"; +$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; +$a->strings["Starts:"] = "Inicio:"; +$a->strings["Finishes:"] = "Final:"; +$a->strings["Location:"] = "Localización:"; +$a->strings["Miscellaneous"] = "Varios"; +$a->strings["Birthday:"] = "Fecha de nacimiento:"; +$a->strings["Age: "] = "Edad: "; +$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD o MM-DD"; +$a->strings["never"] = "nunca"; +$a->strings["less than a second ago"] = "hace menos de un segundo"; +$a->strings["year"] = "año"; +$a->strings["years"] = "años"; +$a->strings["month"] = "mes"; +$a->strings["months"] = "meses"; +$a->strings["week"] = "semana"; +$a->strings["weeks"] = "semanas"; +$a->strings["day"] = "día"; +$a->strings["days"] = "días"; +$a->strings["hour"] = "hora"; +$a->strings["hours"] = "horas"; +$a->strings["minute"] = "minuto"; +$a->strings["minutes"] = "minutos"; +$a->strings["second"] = "segundo"; +$a->strings["seconds"] = "segundos"; +$a->strings["%1\$d %2\$s ago"] = "hace %1\$d %2\$s"; +$a->strings["%s's birthday"] = "Cumpleaños de %s"; +$a->strings["Happy Birthday %s"] = "Feliz cumpleaños %s"; +$a->strings["all-day"] = "todo el día"; +$a->strings["Sun"] = "Dom"; +$a->strings["Mon"] = "Lun"; +$a->strings["Tue"] = "Mar"; +$a->strings["Wed"] = "Mie"; +$a->strings["Thu"] = "Jue"; +$a->strings["Fri"] = "Vie"; +$a->strings["Sat"] = "Sab"; +$a->strings["Sunday"] = "Domingo"; +$a->strings["Monday"] = "Lunes"; +$a->strings["Tuesday"] = "Martes"; +$a->strings["Wednesday"] = "Miércoles"; +$a->strings["Thursday"] = "Jueves"; +$a->strings["Friday"] = "Viernes"; +$a->strings["Saturday"] = "Sábado"; +$a->strings["Jan"] = "Ene"; +$a->strings["Feb"] = "Feb"; +$a->strings["Mar"] = "Mar"; +$a->strings["Apr"] = "Abr"; +$a->strings["May"] = "Mayo"; +$a->strings["Jun"] = "Jun"; +$a->strings["Jul"] = "Jul"; +$a->strings["Aug"] = "Ago"; +$a->strings["Sept"] = "Sept"; +$a->strings["Oct"] = "Oct"; +$a->strings["Nov"] = "Nov"; +$a->strings["Dec"] = "Dec"; +$a->strings["January"] = "Enero"; +$a->strings["February"] = "Febrero"; +$a->strings["March"] = "Marzo"; +$a->strings["April"] = "Abril"; +$a->strings["June"] = "Junio"; +$a->strings["July"] = "Julio"; +$a->strings["August"] = "Agosto"; +$a->strings["September"] = "Septiembre"; +$a->strings["October"] = "Octubre"; +$a->strings["November"] = "Noviembre"; +$a->strings["December"] = "Diciembre"; +$a->strings["today"] = "hoy"; +$a->strings["No events to display"] = "No hay eventos a mostrar"; +$a->strings["l, F j"] = "l, F j"; +$a->strings["Edit event"] = "Editar evento"; +$a->strings["Delete event"] = "Borrar evento"; +$a->strings["link to source"] = "Enlace al original"; +$a->strings["Export"] = "Exportar"; +$a->strings["Export calendar as ical"] = "Exportar calendario como ical"; +$a->strings["Export calendar as csv"] = "Exportar calendario como csv"; $a->strings["General Features"] = "Opciones generales"; $a->strings["Multiple Profiles"] = "Perfiles multiples"; $a->strings["Ability to create multiple profiles"] = "Capacidad de crear perfiles multiples. Cada pagina/perfil/usuario puede tener diferentes perfiles/apariencias. Las mismas pueden ser visibles para determinados contactos seleccionados dentro de la red friendica."; @@ -83,20 +131,128 @@ $a->strings["Mute Post Notifications"] = "Silenciar notificaciones de una public $a->strings["Ability to mute notifications for a thread"] = "Habilidad de silenciar notificaciones sobre nuevos comentarios en una publicación."; $a->strings["Advanced Profile Settings"] = "Ajustes avanzados del perfil"; $a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Mostrar a los visitantes foros públicos en las que se esta participando en el pagina avanzada de perfiles."; -$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente."; -$a->strings["Default privacy group for new contacts"] = "Grupo por defecto para nuevos contactos"; -$a->strings["Everybody"] = "Todo el mundo"; -$a->strings["edit"] = "editar"; -$a->strings["Groups"] = "Grupos"; -$a->strings["Edit groups"] = "Editar grupo"; -$a->strings["Edit group"] = "Editar grupo"; -$a->strings["Create a new group"] = "Crear un nuevo grupo"; -$a->strings["Group Name: "] = "Nombre del grupo: "; -$a->strings["Contacts not in any group"] = "Contactos sin grupo"; -$a->strings["add"] = "añadir"; -$a->strings["Forums"] = "Foros"; -$a->strings["External link to forum"] = "Enlace externo al foro"; -$a->strings["show more"] = "ver más"; +$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s"; +$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s"; +$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s"; +$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s"; +$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s puede que atienda %2\$s's %3\$s"; +$a->strings["photo"] = "foto"; +$a->strings["status"] = "estado"; +$a->strings["event"] = "evento"; +$a->strings["Male"] = "Hombre"; +$a->strings["Female"] = "Mujer"; +$a->strings["Currently Male"] = "Actualmente Hombre"; +$a->strings["Currently Female"] = "Actualmente Mujer"; +$a->strings["Mostly Male"] = "Mayormente Hombre"; +$a->strings["Mostly Female"] = "Mayormente Mujer"; +$a->strings["Transgender"] = "Transgenérico"; +$a->strings["Intersex"] = "Bisexual"; +$a->strings["Transsexual"] = "Transexual"; +$a->strings["Hermaphrodite"] = "Hermafrodita"; +$a->strings["Neuter"] = "Neutro"; +$a->strings["Non-specific"] = "Sin especificar"; +$a->strings["Other"] = "Otro"; +$a->strings["Undecided"] = array( + 0 => "Indeciso", + 1 => "Indeciso", +); +$a->strings["Males"] = "Hombres"; +$a->strings["Females"] = "Mujeres"; +$a->strings["Gay"] = "Gay"; +$a->strings["Lesbian"] = "Lesbiana"; +$a->strings["No Preference"] = "Sin preferencias"; +$a->strings["Bisexual"] = "Bisexual"; +$a->strings["Autosexual"] = "Autosexual"; +$a->strings["Abstinent"] = "Célibe"; +$a->strings["Virgin"] = "Virgen"; +$a->strings["Deviant"] = "Desviado"; +$a->strings["Fetish"] = "Fetichista"; +$a->strings["Oodles"] = "Orgiástico"; +$a->strings["Nonsexual"] = "Asexual"; +$a->strings["Single"] = "Soltero"; +$a->strings["Lonely"] = "Solitario"; +$a->strings["Available"] = "Disponible"; +$a->strings["Unavailable"] = "No disponible"; +$a->strings["Has crush"] = "Enamorado"; +$a->strings["Infatuated"] = "Loco/a por alguien"; +$a->strings["Dating"] = "De citas"; +$a->strings["Unfaithful"] = "Infiel"; +$a->strings["Sex Addict"] = "Adicto al sexo"; +$a->strings["Friends"] = "Amigos"; +$a->strings["Friends/Benefits"] = "Amigos con beneficios"; +$a->strings["Casual"] = "Casual"; +$a->strings["Engaged"] = "Comprometido/a"; +$a->strings["Married"] = "Casado/a"; +$a->strings["Imaginarily married"] = "Casado imaginario"; +$a->strings["Partners"] = "Socios"; +$a->strings["Cohabiting"] = "Cohabitando"; +$a->strings["Common law"] = "Pareja de hecho"; +$a->strings["Happy"] = "Feliz"; +$a->strings["Not looking"] = "No busca relación"; +$a->strings["Swinger"] = "Swinger"; +$a->strings["Betrayed"] = "Traicionado/a"; +$a->strings["Separated"] = "Separado/a"; +$a->strings["Unstable"] = "Inestable"; +$a->strings["Divorced"] = "Divorciado/a"; +$a->strings["Imaginarily divorced"] = "Divorciado imaginario"; +$a->strings["Widowed"] = "Viudo/a"; +$a->strings["Uncertain"] = "Incierto"; +$a->strings["It's complicated"] = "Es complicado"; +$a->strings["Don't care"] = "No te importa"; +$a->strings["Ask me"] = "Pregúntame"; +$a->strings["Welcome "] = "Bienvenido "; +$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil."; +$a->strings["Welcome back "] = "Bienvenido de nuevo "; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo."; +$a->strings["Error decoding account file"] = "Error decodificando el archivo de cuenta"; +$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? "; +$a->strings["Error! Cannot check nickname"] = "Error! No puedo consultar el apodo"; +$a->strings["User '%s' already exists on this server!"] = "La cuenta '%s' ya existe en este servidor!"; +$a->strings["User creation error"] = "Error al crear la cuenta"; +$a->strings["User profile creation error"] = "Error de creación del perfil de la cuenta"; +$a->strings["%d contact not imported"] = array( + 0 => "%d contactos no encontrado", + 1 => "%d contactos no importado", +); +$a->strings["Done. You can now login with your username and password"] = "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña."; +$a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no ha sido modificada."; +$a->strings["An invitation is required."] = "Se necesita invitación."; +$a->strings["Invitation could not be verified."] = "No se puede verificar la invitación."; +$a->strings["Invalid OpenID url"] = "Dirección OpenID no válida"; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Se ha encontrado un problema para acceder con el OpenID que has escrito. Verifica que lo hayas escrito correctamente."; +$a->strings["The error message was:"] = "El mensaje del error fue:"; +$a->strings["Please enter the required information."] = "Por favor, introduce la información necesaria."; +$a->strings["Please use a shorter name."] = "Por favor, usa un nombre más corto."; +$a->strings["Name too short."] = "El nombre es demasiado corto."; +$a->strings["That doesn't appear to be your full (First Last) name."] = "No parece que ese sea tu nombre completo."; +$a->strings["Your email domain is not among those allowed on this site."] = "Tu dominio de correo no se encuentra entre los permitidos en este sitio."; +$a->strings["Not a valid email address."] = "No es una dirección de correo electrónico válida."; +$a->strings["Cannot use that email."] = "No se puede utilizar este correo electrónico."; +$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "El apodo solo puede contener \"a-z\", \"0-9\" y \"_\"."; +$a->strings["Nickname is already registered. Please choose another."] = "Apodo ya registrado. Por favor, elije otro."; +$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro."; +$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR GRAVE: La generación de claves de seguridad ha fallado."; +$a->strings["An error occurred during registration. Please try again."] = "Se produjo un error durante el registro. Por favor, inténtalo de nuevo."; +$a->strings["default"] = "predeterminado"; +$a->strings["An error occurred creating your default profile. Please try again."] = "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo."; +$a->strings["Profile Photos"] = "Foto del perfil"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrarse en %2\$s. Su cuenta está pendiente de aprobación por el administrador.\n\t"; +$a->strings["Registration at %s"] = "Registro en %s"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrar en %2\$s. Su cuenta ha sido creada.\n\t"; +$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3\$s\n\t\t\tNombre de la cuenta:\t\t%1\$s\n\t\t\tContraseña:\t\t%5\$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a %2\$s."; +$a->strings["Registration details for %s"] = "Detalles de registro para %s"; +$a->strings["View Profile"] = "Ver perfil"; +$a->strings["Connect/Follow"] = "Conectar/Seguir"; +$a->strings["View Status"] = "Ver estado"; +$a->strings["View Photos"] = "Ver fotos"; +$a->strings["Network Posts"] = "Publicaciones en la red"; +$a->strings["View Contact"] = "Ver contacto"; +$a->strings["Drop Contact"] = "Eliminar contacto"; +$a->strings["Send PM"] = "Enviar mensaje privado"; +$a->strings["Poke"] = "Toque"; +$a->strings["Organisation"] = "Organización"; +$a->strings["News"] = "Noticias"; +$a->strings["Forum"] = "Foro"; $a->strings["System"] = "Sistema"; $a->strings["Network"] = "Red"; $a->strings["Personal"] = "Personal"; @@ -113,6 +269,7 @@ $a->strings["%s is now friends with %s"] = "%s es ahora es amigo de %s"; $a->strings["Friend Suggestion"] = "Propuestas de amistad"; $a->strings["Friend/Connect Request"] = "Solicitud de Amistad/Conexión"; $a->strings["New Follower"] = "Nuevo seguidor"; +$a->strings["Wall Photos"] = "Foto del Muro"; $a->strings["Post to Email"] = "Publicar mediante correo electrónico"; $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Conectores deshabilitados, ya que \"%s\" es habilitado."; $a->strings["Hide your profile details from unknown viewers?"] = "¿Quieres que los detalles de tu perfil permanezcan ocultos a los desconocidos?"; @@ -123,14 +280,46 @@ $a->strings["CC: email addresses"] = "CC: dirección de correo electrónico"; $a->strings["Example: bob@example.com, mary@example.com"] = "Ejemplo: juan@ejemplo.com, sofia@ejemplo.com"; $a->strings["Permissions"] = "Permisos"; $a->strings["Close"] = "Cerrado"; +$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada."; +$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada."; +$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada."; $a->strings["Logged out."] = "Sesión finalizada"; $a->strings["Login failed."] = "Accesso fallido."; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Se ha encontrado un problema para acceder con el OpenID que has escrito. Verifica que lo hayas escrito correctamente."; -$a->strings["The error message was:"] = "El mensaje del error fue:"; -$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; -$a->strings["Starts:"] = "Inicio:"; -$a->strings["Finishes:"] = "Final:"; -$a->strings["Location:"] = "Localización:"; +$a->strings["Image/photo"] = "Imagen/Foto"; +$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"; +$a->strings["$1 wrote:"] = "$1 escribió:"; +$a->strings["Encrypted content"] = "Contenido cifrado"; +$a->strings["Invalid source protocol"] = "Protocolo de fuente inválido"; +$a->strings["Invalid link protocol"] = "Protocolo de enlace inválido"; +$a->strings["Unknown | Not categorised"] = "Desconocido | No clasificado"; +$a->strings["Block immediately"] = "Bloquear inmediatamente"; +$a->strings["Shady, spammer, self-marketer"] = "Sospechoso, spammer, auto-publicidad"; +$a->strings["Known to me, but no opinion"] = "Le conozco, sin opinión"; +$a->strings["OK, probably harmless"] = "OK, probablemente inofensivo"; +$a->strings["Reputable, has my trust"] = "Buena reputación, tiene mi confianza"; +$a->strings["Frequently"] = "Frequentemente"; +$a->strings["Hourly"] = "Cada hora"; +$a->strings["Twice daily"] = "Dos veces al día"; +$a->strings["Daily"] = "Diariamente"; +$a->strings["Weekly"] = "Semanalmente"; +$a->strings["Monthly"] = "Mensualmente"; +$a->strings["Friendica"] = "Friendica"; +$a->strings["OStatus"] = "OStatus"; +$a->strings["RSS/Atom"] = "RSS/Atom"; +$a->strings["Email"] = "Correo electrónico"; +$a->strings["Diaspora"] = "Diaspora*"; +$a->strings["Facebook"] = "Facebook"; +$a->strings["Zot!"] = "Zot!"; +$a->strings["LinkedIn"] = "LinkedIn"; +$a->strings["XMPP/IM"] = "XMPP/IM"; +$a->strings["MySpace"] = "MySpace"; +$a->strings["Google+"] = "Google+"; +$a->strings["pump.io"] = "pump.io"; +$a->strings["Twitter"] = "Twitter"; +$a->strings["Diaspora Connector"] = "Conector Diaspora"; +$a->strings["GNU Social Connector"] = "Conector a GNU Social"; +$a->strings["pnut"] = "pnut"; +$a->strings["App.net"] = "App.net"; $a->strings["Add New Contact"] = "Añadir nuevo contacto"; $a->strings["Enter address or web location"] = "Escribe la dirección o página web"; $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: miguel@ejemplo.com, http://ejemplo.com/miguel"; @@ -141,7 +330,6 @@ $a->strings["%d invitation available"] = array( ); $a->strings["Find People"] = "Buscar personas"; $a->strings["Enter name or interest"] = "Introduzce nombre o intereses"; -$a->strings["Connect/Follow"] = "Conectar/Seguir"; $a->strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: Robert Morgenstein, Pesca"; $a->strings["Find"] = "Buscar"; $a->strings["Friend Suggestions"] = "Sugerencias de amigos"; @@ -156,11 +344,6 @@ $a->strings["%d contact in common"] = array( 0 => "%d contacto en común", 1 => "%d contactos en común", ); -$a->strings["event"] = "evento"; -$a->strings["status"] = "estado"; -$a->strings["photo"] = "foto"; -$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gusta %3\$s de %2\$s"; -$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s no le gusta %3\$s de %2\$s"; $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s"; $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s"; $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s atenderá quizás %2\$s's %3\$s"; @@ -189,13 +372,6 @@ $a->strings["Please wait"] = "Por favor, espera"; $a->strings["remove"] = "eliminar"; $a->strings["Delete Selected Items"] = "Eliminar el elemento seleccionado"; $a->strings["Follow Thread"] = "Seguir publicacion"; -$a->strings["View Status"] = "Ver estado"; -$a->strings["View Profile"] = "Ver perfil"; -$a->strings["View Photos"] = "Ver fotos"; -$a->strings["Network Posts"] = "Publicaciones en la red"; -$a->strings["View Contact"] = "Ver contacto"; -$a->strings["Send PM"] = "Enviar mensaje privado"; -$a->strings["Poke"] = "Toque"; $a->strings["%s likes this."] = "A %s le gusta esto."; $a->strings["%s doesn't like this."] = "A %s no le gusta esto."; $a->strings["%s attends."] = "%s atiende."; @@ -261,178 +437,19 @@ $a->strings["Not Attending"] = array( 0 => "No atendiendo", 1 => "No atendiendo", ); -$a->strings["Undecided"] = array( - 0 => "Indeciso", - 1 => "Indeciso", -); -$a->strings["Miscellaneous"] = "Varios"; -$a->strings["Birthday:"] = "Fecha de nacimiento:"; -$a->strings["Age: "] = "Edad: "; -$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD o MM-DD"; -$a->strings["never"] = "nunca"; -$a->strings["less than a second ago"] = "hace menos de un segundo"; -$a->strings["year"] = "año"; -$a->strings["years"] = "años"; -$a->strings["month"] = "mes"; -$a->strings["months"] = "meses"; -$a->strings["week"] = "semana"; -$a->strings["weeks"] = "semanas"; -$a->strings["day"] = "día"; -$a->strings["days"] = "días"; -$a->strings["hour"] = "hora"; -$a->strings["hours"] = "horas"; -$a->strings["minute"] = "minuto"; -$a->strings["minutes"] = "minutos"; -$a->strings["second"] = "segundo"; -$a->strings["seconds"] = "segundos"; -$a->strings["%1\$d %2\$s ago"] = "hace %1\$d %2\$s"; -$a->strings["%s's birthday"] = "Cumpleaños de %s"; -$a->strings["Happy Birthday %s"] = "Feliz cumpleaños %s"; +$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información DNS para la base de datos del servidor '%s'"; +$a->strings["There are no tables on MyISAM."] = "No hay tablas en MyISAM"; +$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tLos desarolladores de friendica publicaron una actualización %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido."; +$a->strings["The error message is\n[pre]%s[/pre]"] = "El mensaje de error es\n[pre]%s[/pre]"; +$a->strings["\nError %d occurred during database update:\n%s\n"] = ""; +$a->strings["Errors encountered performing database changes: "] = ""; +$a->strings[": Database update"] = ""; +$a->strings["%s: updating %s table."] = ""; $a->strings["(no subject)"] = "(sin asunto)"; $a->strings["noreply"] = "no responder"; $a->strings["%s\\'s birthday"] = "%s\\'s cumpleaños"; -$a->strings["all-day"] = "todo el día"; -$a->strings["Sun"] = "Dom"; -$a->strings["Mon"] = "Lun"; -$a->strings["Tue"] = "Mar"; -$a->strings["Wed"] = "Mie"; -$a->strings["Thu"] = "Jue"; -$a->strings["Fri"] = "Vie"; -$a->strings["Sat"] = "Sab"; -$a->strings["Sunday"] = "Domingo"; -$a->strings["Monday"] = "Lunes"; -$a->strings["Tuesday"] = "Martes"; -$a->strings["Wednesday"] = "Miércoles"; -$a->strings["Thursday"] = "Jueves"; -$a->strings["Friday"] = "Viernes"; -$a->strings["Saturday"] = "Sábado"; -$a->strings["Jan"] = "Ene"; -$a->strings["Feb"] = "Feb"; -$a->strings["Mar"] = "Mar"; -$a->strings["Apr"] = "Abr"; -$a->strings["May"] = "Mayo"; -$a->strings["Jun"] = "Jun"; -$a->strings["Jul"] = "Jul"; -$a->strings["Aug"] = "Ago"; -$a->strings["Sept"] = "Sept"; -$a->strings["Oct"] = "Oct"; -$a->strings["Nov"] = "Nov"; -$a->strings["Dec"] = "Dec"; -$a->strings["January"] = "Enero"; -$a->strings["February"] = "Febrero"; -$a->strings["March"] = "Marzo"; -$a->strings["April"] = "Abril"; -$a->strings["June"] = "Junio"; -$a->strings["July"] = "Julio"; -$a->strings["August"] = "Agosto"; -$a->strings["September"] = "Septiembre"; -$a->strings["October"] = "Octubre"; -$a->strings["November"] = "Noviembre"; -$a->strings["December"] = "Diciembre"; -$a->strings["today"] = "hoy"; -$a->strings["No events to display"] = "No hay eventos a mostrar"; -$a->strings["l, F j"] = "l, F j"; -$a->strings["Edit event"] = "Editar evento"; -$a->strings["Delete event"] = ""; -$a->strings["link to source"] = "Enlace al original"; -$a->strings["Export"] = "Exportar"; -$a->strings["Export calendar as ical"] = "Exportar calendario como ical"; -$a->strings["Export calendar as csv"] = "Exportar calendario como csv"; -$a->strings["Disallowed profile URL."] = "Dirección de perfil no permitida."; -$a->strings["Blocked domain"] = ""; -$a->strings["Connect URL missing."] = "Falta el conector URL."; -$a->strings["This site is not configured to allow communications with other networks."] = "Este sitio no está configurado para permitir la comunicación con otras redes."; -$a->strings["No compatible communication protocols or feeds were discovered."] = "No se ha descubierto protocolos de comunicación o fuentes compatibles."; -$a->strings["The profile address specified does not provide adequate information."] = "La dirección del perfil especificado no proporciona información adecuada."; -$a->strings["An author or name was not found."] = "No se ha encontrado un autor o nombre."; -$a->strings["No browser URL could be matched to this address."] = "Ninguna dirección concuerda con la suministrada."; -$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto."; -$a->strings["Use mailto: in front of address to force email check."] = "Escribe mailto: al principio de la dirección para forzar el envío."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio."; -$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas."; -$a->strings["Unable to retrieve contact information."] = "No ha sido posible recibir la información del contacto."; -$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s atenderá %2\$s's %3\$s"; -$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no atenderá %2\$s's %3\$s"; -$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s puede que atienda %2\$s's %3\$s"; -$a->strings["Contact Photos"] = "Foto del contacto"; -$a->strings["Welcome "] = "Bienvenido "; -$a->strings["Please upload a profile photo."] = "Por favor sube una foto para tu perfil."; -$a->strings["Welcome back "] = "Bienvenido de nuevo "; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La ficha de seguridad no es correcta. Seguramente haya ocurrido por haber dejado el formulario abierto demasiado tiempo (>3 horas) antes de enviarlo."; -$a->strings["newer"] = "más nuevo"; -$a->strings["older"] = "más antiguo"; -$a->strings["first"] = "primera"; -$a->strings["prev"] = "ant."; -$a->strings["next"] = "sig."; -$a->strings["last"] = "última"; -$a->strings["Loading more entries..."] = "Cargar mas entradas .."; -$a->strings["The end"] = "El fin"; -$a->strings["No contacts"] = "Sin contactos"; -$a->strings["%d Contact"] = array( - 0 => "%d Contacto", - 1 => "%d Contactos", -); -$a->strings["View Contacts"] = "Ver contactos"; -$a->strings["Search"] = "Buscar"; -$a->strings["Save"] = "Guardar"; -$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, contenido"; -$a->strings["Full Text"] = "Texto completo"; -$a->strings["Tags"] = "Tags"; -$a->strings["Contacts"] = "Contactos"; -$a->strings["poke"] = "tocar"; -$a->strings["poked"] = "tocó a"; -$a->strings["ping"] = "hacer \"ping\""; -$a->strings["pinged"] = "hizo \"ping\" a"; -$a->strings["prod"] = "empujar"; -$a->strings["prodded"] = "empujó a"; -$a->strings["slap"] = "abofetear"; -$a->strings["slapped"] = "abofeteó a"; -$a->strings["finger"] = "meter dedo"; -$a->strings["fingered"] = "le metió un dedo a"; -$a->strings["rebuff"] = "desairar"; -$a->strings["rebuffed"] = "desairó a"; -$a->strings["happy"] = "feliz"; -$a->strings["sad"] = "triste"; -$a->strings["mellow"] = "sentimental"; -$a->strings["tired"] = "cansado"; -$a->strings["perky"] = "alegre"; -$a->strings["angry"] = "furioso"; -$a->strings["stupified"] = "estupefacto"; -$a->strings["puzzled"] = "extrañado"; -$a->strings["interested"] = "interesado"; -$a->strings["bitter"] = "rencoroso"; -$a->strings["cheerful"] = "jovial"; -$a->strings["alive"] = "vivo"; -$a->strings["annoyed"] = "enojado"; -$a->strings["anxious"] = "ansioso"; -$a->strings["cranky"] = "irritable"; -$a->strings["disturbed"] = "perturbado"; -$a->strings["frustrated"] = "frustrado"; -$a->strings["motivated"] = "motivado"; -$a->strings["relaxed"] = "relajado"; -$a->strings["surprised"] = "sorprendido"; -$a->strings["View Video"] = "Ver vídeo"; -$a->strings["bytes"] = "bytes"; -$a->strings["Click to open/close"] = "Pulsa para abrir/cerrar"; -$a->strings["View on separate page"] = "Ver en pagina aparte"; -$a->strings["view on separate page"] = "ver en pagina aparte"; -$a->strings["activity"] = "Actividad"; -$a->strings["comment"] = array( - 0 => "", - 1 => "Comentario", -); -$a->strings["post"] = "Publicación"; -$a->strings["Item filed"] = "Elemento archivado"; -$a->strings["Drop Contact"] = "Eliminar contacto"; -$a->strings["Organisation"] = "Organización"; -$a->strings["News"] = "Noticias"; -$a->strings["Forum"] = "Foro"; -$a->strings["Image/photo"] = "Imagen/Foto"; -$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"; -$a->strings["$1 wrote:"] = "$1 escribió:"; -$a->strings["Encrypted content"] = "Contenido cifrado"; -$a->strings["Invalid source protocol"] = "Protocolo de fuente inválido"; -$a->strings["Invalid link protocol"] = "Protocolo de enlace inválido"; +$a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*"; +$a->strings["Attachments:"] = "Archivos adjuntos:"; $a->strings["Friendica Notification"] = "Notificación de Friendica"; $a->strings["Thank You,"] = "Gracias,"; $a->strings["%s Administrator"] = "%s Administrador"; @@ -492,124 +509,35 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "R $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Recibiste una [url=%1\$s]consulta de registro[/url] from %2\$s."; $a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Nombre completo:\t%1\$s\\nUbicación del sitio:\t%2\$s\\nLogin Nombre:\t%3\$s (%4\$s)"; $a->strings["Please visit %s to approve or reject the request."] = "Por favor visita %s para aprobar o negar la solicitud."; -$a->strings["[no subject]"] = "[sin asunto]"; -$a->strings["Wall Photos"] = "Foto del Muro"; -$a->strings["Nothing new here"] = "Nada nuevo por aquí"; -$a->strings["Clear notifications"] = "Limpiar notificaciones"; -$a->strings["Logout"] = "Salir"; -$a->strings["End this session"] = "Cerrar la sesión"; -$a->strings["Status"] = "Estado"; -$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones"; -$a->strings["Profile"] = "Perfil"; -$a->strings["Your profile page"] = "Tu página de perfil"; -$a->strings["Photos"] = "Fotografías"; -$a->strings["Your photos"] = "Tus fotos"; -$a->strings["Videos"] = "Videos"; -$a->strings["Your videos"] = "Tus videos"; -$a->strings["Events"] = "Eventos"; -$a->strings["Your events"] = "Tus eventos"; -$a->strings["Personal notes"] = "Notas personales"; -$a->strings["Your personal notes"] = "Tus notas personales"; -$a->strings["Login"] = "Acceder"; -$a->strings["Sign in"] = "Date de alta"; -$a->strings["Home Page"] = "Página de inicio"; -$a->strings["Register"] = "Registrarse"; -$a->strings["Create an account"] = "Crea una cuenta"; -$a->strings["Help"] = "Ayuda"; -$a->strings["Help and documentation"] = "Ayuda y documentación"; -$a->strings["Apps"] = "Aplicaciones"; -$a->strings["Addon applications, utilities, games"] = "Aplicaciones, utilidades, juegos"; -$a->strings["Search site content"] = " Busca contenido en la página"; -$a->strings["Community"] = "Comunidad"; -$a->strings["Conversations on this site"] = "Conversaciones en este sitio"; -$a->strings["Conversations on the network"] = "Conversaciones en la red"; -$a->strings["Events and Calendar"] = "Eventos y Calendario"; -$a->strings["Directory"] = "Directorio"; -$a->strings["People directory"] = "Directorio de usuarios"; -$a->strings["Information"] = "Información"; -$a->strings["Information about this friendica instance"] = "Información sobre esta instancia de friendica"; -$a->strings["Conversations from your friends"] = "Conversaciones de tus amigos"; -$a->strings["Network Reset"] = "Reseteo de la red"; -$a->strings["Load Network page with no filters"] = "Cargar pagina de redes sin filtros"; -$a->strings["Friend Requests"] = "Solicitudes de amistad"; -$a->strings["Notifications"] = "Notificaciones"; -$a->strings["See all notifications"] = "Ver todas las notificaciones"; -$a->strings["Mark as seen"] = "Marcar como leído"; -$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas"; -$a->strings["Messages"] = "Mensajes"; -$a->strings["Private mail"] = "Correo privado"; -$a->strings["Inbox"] = "Entrada"; -$a->strings["Outbox"] = "Enviados"; -$a->strings["New Message"] = "Nuevo mensaje"; -$a->strings["Manage"] = "Administrar"; -$a->strings["Manage other pages"] = "Administrar otras páginas"; -$a->strings["Delegations"] = "Delegaciones"; -$a->strings["Delegate Page Management"] = "Delegar la administración de la página"; -$a->strings["Settings"] = "Configuración"; -$a->strings["Account settings"] = "Configuración de tu cuenta"; -$a->strings["Profiles"] = "Perfiles"; -$a->strings["Manage/Edit Profiles"] = "Manejar/editar Perfiles"; -$a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos"; -$a->strings["Admin"] = "Admin"; -$a->strings["Site setup and configuration"] = "Opciones y configuración del sitio"; -$a->strings["Navigation"] = "Navegación"; -$a->strings["Site map"] = "Mapa del sitio"; -$a->strings["view full size"] = "Ver a tamaño completo"; -$a->strings["Embedded content"] = "Contenido integrado"; -$a->strings["Embedding disabled"] = "Contenido incrustrado desabilitado"; -$a->strings["Error decoding account file"] = "Error decodificando el archivo de cuenta"; -$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Error! No hay datos de versión en el archivo! ¿Es esto de una cuenta friendica? "; -$a->strings["Error! Cannot check nickname"] = "Error! No puedo consultar el apodo"; -$a->strings["User '%s' already exists on this server!"] = "La cuenta '%s' ya existe en este servidor!"; -$a->strings["User creation error"] = "Error al crear la cuenta"; -$a->strings["User profile creation error"] = "Error de creación del perfil de la cuenta"; -$a->strings["%d contact not imported"] = array( - 0 => "%d contactos no encontrado", - 1 => "%d contactos no importado", -); -$a->strings["Done. You can now login with your username and password"] = "Hecho. Ahora podes ingresar con tu nombre de cuenta y la contraseña."; -$a->strings["Passwords do not match. Password unchanged."] = "Las contraseñas no coinciden. La contraseña no ha sido modificada."; -$a->strings["An invitation is required."] = "Se necesita invitación."; -$a->strings["Invitation could not be verified."] = "No se puede verificar la invitación."; -$a->strings["Invalid OpenID url"] = "Dirección OpenID no válida"; -$a->strings["Please enter the required information."] = "Por favor, introduce la información necesaria."; -$a->strings["Please use a shorter name."] = "Por favor, usa un nombre más corto."; -$a->strings["Name too short."] = "El nombre es demasiado corto."; -$a->strings["That doesn't appear to be your full (First Last) name."] = "No parece que ese sea tu nombre completo."; -$a->strings["Your email domain is not among those allowed on this site."] = "Tu dominio de correo no se encuentra entre los permitidos en este sitio."; -$a->strings["Not a valid email address."] = "No es una dirección de correo electrónico válida."; -$a->strings["Cannot use that email."] = "No se puede utilizar este correo electrónico."; -$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "El apodo solo puede contener \"a-z\", \"0-9\" y \"_\"."; -$a->strings["Nickname is already registered. Please choose another."] = "Apodo ya registrado. Por favor, elije otro."; -$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "El apodo ya ha sido registrado alguna vez y no puede volver a usarse. Por favor, utiliza otro."; -$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERROR GRAVE: La generación de claves de seguridad ha fallado."; -$a->strings["An error occurred during registration. Please try again."] = "Se produjo un error durante el registro. Por favor, inténtalo de nuevo."; -$a->strings["default"] = "predeterminado"; -$a->strings["An error occurred creating your default profile. Please try again."] = "Error al crear tu perfil predeterminado. Por favor, inténtalo de nuevo."; -$a->strings["Friends"] = "Amigos"; -$a->strings["Profile Photos"] = "Foto del perfil"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrarse en %2\$s. Su cuenta está pendiente de aprobación por el administrador.\n\t"; -$a->strings["Registration at %s"] = "Registro en %s"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tEstimado %1\$s,\n\t\t\tGracias por registrar en %2\$s. Su cuenta ha sido creada.\n\t"; -$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\t\tLos detalles de acceso son las siguientes:\n\n\t\t\tDirección del sitio:\t%3\$s\n\t\t\tNombre de la cuenta:\t\t%1\$s\n\t\t\tContraseña:\t\t%5\$s\n\n\t\t\tPodrá cambiar la contraseña desde la pagina de configuración de su cuenta después de acceder a la misma\n\t\t\ten.\n\n\t\t\tPor favor tome unos minutos para revisar las opciones demás de la cuenta en dicha pagina de configuración.\n\n\t\t\tTambién podrá agregar informaciones adicionales a su pagina de perfil predeterminado. \n\t\t\t(en la pagina \"Perfiles\") para que otras personas pueden encontrarlo fácilmente.\n\n\t\t\tRecomendamos que elija un nombre apropiado, agregando una imagen de perfil,\n\t\t\tagregando algunas palabras claves de la cuenta (muy útil para hacer nuevos amigos) - y \n\t\t\tquizás el país en donde vive; si no quiere ser mas especifico\n\t\t\tque eso.\n\n\t\t\tRespetamos absolutamente su derecho a la privacidad y ninguno de estos detalles es necesario.\n\t\t\tSi eres nuevo aquí y no conoces a nadie, estos detalles pueden ayudarte\n\t\t\tpara hacer nuevas e interesantes amistades.\n\n\t\t\tGracias y bienvenido a %2\$s."; -$a->strings["Registration details for %s"] = "Detalles de registro para %s"; -$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Limite diario de publicaciones %d alcanzado. La publicación fue rechazada."; -$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Limite semanal de publicaciones %d alcanzado. La publicación fue rechazada."; -$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Limite mensual de publicaciones %d alcanzado. La publicación fue rechazada."; -$a->strings["Cannot locate DNS info for database server '%s'"] = "No se puede encontrar información DNS para la base de datos del servidor '%s'"; -$a->strings["There are no tables on MyISAM."] = ""; -$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tLos desarolladores de friendica publicaron una actualización %s recientemente\n\t\t\tpero cuando intento de instalarla,algo salio terriblemente mal.\n\t\t\tEsto necesita ser arreglado pronto y no puedo hacerlo solo. Por favor contacta\n\t\t\tlos desarolladores de friendica si no me podes ayudar por ti solo. Mi base de datos puede estar invalido."; -$a->strings["The error message is\n[pre]%s[/pre]"] = "El mensaje de error es\n[pre]%s[/pre]"; -$a->strings["\nError %d occurred during database update:\n%s\n"] = ""; -$a->strings["Errors encountered performing database changes: "] = ""; -$a->strings[": Database update"] = ""; -$a->strings["%s: updating %s table."] = ""; -$a->strings["Sharing notification from Diaspora network"] = "Compartir notificaciones con la red Diaspora*"; -$a->strings["Attachments:"] = "Archivos adjuntos:"; +$a->strings["Disallowed profile URL."] = "Dirección de perfil no permitida."; +$a->strings["Blocked domain"] = "Dominio bloqueado"; +$a->strings["Connect URL missing."] = "Falta el conector URL."; +$a->strings["This site is not configured to allow communications with other networks."] = "Este sitio no está configurado para permitir la comunicación con otras redes."; +$a->strings["No compatible communication protocols or feeds were discovered."] = "No se ha descubierto protocolos de comunicación o fuentes compatibles."; +$a->strings["The profile address specified does not provide adequate information."] = "La dirección del perfil especificado no proporciona información adecuada."; +$a->strings["An author or name was not found."] = "No se ha encontrado un autor o nombre."; +$a->strings["No browser URL could be matched to this address."] = "Ninguna dirección concuerda con la suministrada."; +$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Imposible identificar la dirección @ con algún protocolo conocido o dirección de contacto."; +$a->strings["Use mailto: in front of address to force email check."] = "Escribe mailto: al principio de la dirección para forzar el envío."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "La dirección del perfil especificada pertenece a una red que ha sido deshabilitada en este sitio."; +$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Perfil limitado. Esta persona no podrá recibir notificaciones directas/personales tuyas."; +$a->strings["Unable to retrieve contact information."] = "No ha sido posible recibir la información del contacto."; +$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo eliminado con este nombre fue restablecido. Los permisos existentes <strong>pueden</strong> aplicarse a este grupo y a sus futuros miembros. Si esto no es lo que pretendes, por favor, crea otro grupo con un nombre diferente."; +$a->strings["Default privacy group for new contacts"] = "Grupo por defecto para nuevos contactos"; +$a->strings["Everybody"] = "Todo el mundo"; +$a->strings["edit"] = "editar"; +$a->strings["Groups"] = "Grupos"; +$a->strings["Edit groups"] = "Editar grupo"; +$a->strings["Edit group"] = "Editar grupo"; +$a->strings["Create a new group"] = "Crear un nuevo grupo"; +$a->strings["Group Name: "] = "Nombre del grupo: "; +$a->strings["Contacts not in any group"] = "Contactos sin grupo"; +$a->strings["add"] = "añadir"; $a->strings["Requested account is not available."] = "La cuenta solicitada no está disponible."; $a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible."; $a->strings["Edit profile"] = "Editar perfil"; $a->strings["Atom feed"] = "Atom feed"; +$a->strings["Profiles"] = "Perfiles"; $a->strings["Manage/edit profiles"] = "Administrar/editar perfiles"; $a->strings["Change profile photo"] = "Cambiar foto del perfil"; $a->strings["Create New Profile"] = "Crear nuevo perfil"; @@ -630,6 +558,7 @@ $a->strings["Birthdays this week:"] = "Cumpleaños esta semana:"; $a->strings["[No description]"] = "[Sin descripción]"; $a->strings["Event Reminders"] = "Recordatorios de eventos"; $a->strings["Events this week:"] = "Eventos de esta semana:"; +$a->strings["Profile"] = "Perfil"; $a->strings["Full Name:"] = "Nombre completo:"; $a->strings["j F, Y"] = "j F, Y"; $a->strings["j F"] = "j F"; @@ -654,80 +583,151 @@ $a->strings["School/education:"] = "Escuela/estudios:"; $a->strings["Forums:"] = "Foros:"; $a->strings["Basic"] = "Basic"; $a->strings["Advanced"] = "Avanzado"; +$a->strings["Status"] = "Estado"; $a->strings["Status Messages and Posts"] = "Mensajes de Estado y Publicaciones"; $a->strings["Profile Details"] = "Detalles del Perfil"; +$a->strings["Photos"] = "Fotografías"; $a->strings["Photo Albums"] = "Álbum de Fotos"; +$a->strings["Videos"] = "Videos"; +$a->strings["Events"] = "Eventos"; +$a->strings["Events and Calendar"] = "Eventos y Calendario"; $a->strings["Personal Notes"] = "Notas personales"; $a->strings["Only You Can See This"] = "Únicamente tú puedes ver esto"; +$a->strings["Contacts"] = "Contactos"; $a->strings["[Name Withheld]"] = "[Nombre oculto]"; $a->strings["Item not found."] = "Elemento no encontrado."; $a->strings["Do you really want to delete this item?"] = "¿Realmente quieres borrar este objeto?"; $a->strings["Yes"] = "Sí"; $a->strings["Permission denied."] = "Permiso denegado."; $a->strings["Archives"] = "Archivos"; +$a->strings["[no subject]"] = "[sin asunto]"; +$a->strings["Nothing new here"] = "Nada nuevo por aquí"; +$a->strings["Clear notifications"] = "Limpiar notificaciones"; +$a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, contenido"; +$a->strings["Logout"] = "Salir"; +$a->strings["End this session"] = "Cerrar la sesión"; +$a->strings["Your posts and conversations"] = "Tus publicaciones y conversaciones"; +$a->strings["Your profile page"] = "Tu página de perfil"; +$a->strings["Your photos"] = "Tus fotos"; +$a->strings["Your videos"] = "Tus videos"; +$a->strings["Your events"] = "Tus eventos"; +$a->strings["Personal notes"] = "Notas personales"; +$a->strings["Your personal notes"] = "Tus notas personales"; +$a->strings["Login"] = "Acceder"; +$a->strings["Sign in"] = "Date de alta"; +$a->strings["Home Page"] = "Página de inicio"; +$a->strings["Register"] = "Registrarse"; +$a->strings["Create an account"] = "Crea una cuenta"; +$a->strings["Help"] = "Ayuda"; +$a->strings["Help and documentation"] = "Ayuda y documentación"; +$a->strings["Apps"] = "Aplicaciones"; +$a->strings["Addon applications, utilities, games"] = "Aplicaciones, utilidades, juegos"; +$a->strings["Search"] = "Buscar"; +$a->strings["Search site content"] = " Busca contenido en la página"; +$a->strings["Full Text"] = "Texto completo"; +$a->strings["Tags"] = "Tags"; +$a->strings["Community"] = "Comunidad"; +$a->strings["Conversations on this site"] = "Conversaciones en este sitio"; +$a->strings["Conversations on the network"] = "Conversaciones en la red"; +$a->strings["Directory"] = "Directorio"; +$a->strings["People directory"] = "Directorio de usuarios"; +$a->strings["Information"] = "Información"; +$a->strings["Information about this friendica instance"] = "Información sobre esta instancia de friendica"; +$a->strings["Conversations from your friends"] = "Conversaciones de tus amigos"; +$a->strings["Network Reset"] = "Reseteo de la red"; +$a->strings["Load Network page with no filters"] = "Cargar pagina de redes sin filtros"; +$a->strings["Friend Requests"] = "Solicitudes de amistad"; +$a->strings["Notifications"] = "Notificaciones"; +$a->strings["See all notifications"] = "Ver todas las notificaciones"; +$a->strings["Mark as seen"] = "Marcar como leído"; +$a->strings["Mark all system notifications seen"] = "Marcar todas las notificaciones del sistema como leídas"; +$a->strings["Messages"] = "Mensajes"; +$a->strings["Private mail"] = "Correo privado"; +$a->strings["Inbox"] = "Entrada"; +$a->strings["Outbox"] = "Enviados"; +$a->strings["New Message"] = "Nuevo mensaje"; +$a->strings["Manage"] = "Administrar"; +$a->strings["Manage other pages"] = "Administrar otras páginas"; +$a->strings["Delegations"] = "Delegaciones"; +$a->strings["Delegate Page Management"] = "Delegar la administración de la página"; +$a->strings["Settings"] = "Configuración"; +$a->strings["Account settings"] = "Configuración de tu cuenta"; +$a->strings["Manage/Edit Profiles"] = "Manejar/editar Perfiles"; +$a->strings["Manage/edit friends and contacts"] = "Administrar/editar amigos y contactos"; +$a->strings["Admin"] = "Admin"; +$a->strings["Site setup and configuration"] = "Opciones y configuración del sitio"; +$a->strings["Navigation"] = "Navegación"; +$a->strings["Site map"] = "Mapa del sitio"; +$a->strings["view full size"] = "Ver a tamaño completo"; +$a->strings["Embedded content"] = "Contenido integrado"; +$a->strings["Embedding disabled"] = "Contenido incrustrado desabilitado"; $a->strings["%s is now following %s."] = "%s sigue ahora a %s."; $a->strings["following"] = "siguiendo"; $a->strings["%s stopped following %s."] = "%s dejó de seguir a %s."; $a->strings["stopped following"] = "dejó de seguir"; +$a->strings["Contact Photos"] = "Foto del contacto"; $a->strings["Click here to upgrade."] = "Pulsa aquí para actualizar."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción excede los límites permitidos por tu subscripción."; $a->strings["This action is not available under your subscription plan."] = "Esta acción no está permitida para tu subscripción."; -$a->strings["Male"] = "Hombre"; -$a->strings["Female"] = "Mujer"; -$a->strings["Currently Male"] = "Actualmente Hombre"; -$a->strings["Currently Female"] = "Actualmente Mujer"; -$a->strings["Mostly Male"] = "Mayormente Hombre"; -$a->strings["Mostly Female"] = "Mayormente Mujer"; -$a->strings["Transgender"] = "Transgenérico"; -$a->strings["Intersex"] = "Bisexual"; -$a->strings["Transsexual"] = "Transexual"; -$a->strings["Hermaphrodite"] = "Hermafrodita"; -$a->strings["Neuter"] = "Neutro"; -$a->strings["Non-specific"] = "Sin especificar"; -$a->strings["Other"] = "Otro"; -$a->strings["Males"] = "Hombres"; -$a->strings["Females"] = "Mujeres"; -$a->strings["Gay"] = "Gay"; -$a->strings["Lesbian"] = "Lesbiana"; -$a->strings["No Preference"] = "Sin preferencias"; -$a->strings["Bisexual"] = "Bisexual"; -$a->strings["Autosexual"] = "Autosexual"; -$a->strings["Abstinent"] = "Célibe"; -$a->strings["Virgin"] = "Virgen"; -$a->strings["Deviant"] = "Desviado"; -$a->strings["Fetish"] = "Fetichista"; -$a->strings["Oodles"] = "Orgiástico"; -$a->strings["Nonsexual"] = "Asexual"; -$a->strings["Single"] = "Soltero"; -$a->strings["Lonely"] = "Solitario"; -$a->strings["Available"] = "Disponible"; -$a->strings["Unavailable"] = "No disponible"; -$a->strings["Has crush"] = "Enamorado"; -$a->strings["Infatuated"] = "Loco/a por alguien"; -$a->strings["Dating"] = "De citas"; -$a->strings["Unfaithful"] = "Infiel"; -$a->strings["Sex Addict"] = "Adicto al sexo"; -$a->strings["Friends/Benefits"] = "Amigos con beneficios"; -$a->strings["Casual"] = "Casual"; -$a->strings["Engaged"] = "Comprometido/a"; -$a->strings["Married"] = "Casado/a"; -$a->strings["Imaginarily married"] = "Casado imaginario"; -$a->strings["Partners"] = "Socios"; -$a->strings["Cohabiting"] = "Cohabitando"; -$a->strings["Common law"] = "Pareja de hecho"; -$a->strings["Happy"] = "Feliz"; -$a->strings["Not looking"] = "No busca relación"; -$a->strings["Swinger"] = "Swinger"; -$a->strings["Betrayed"] = "Traicionado/a"; -$a->strings["Separated"] = "Separado/a"; -$a->strings["Unstable"] = "Inestable"; -$a->strings["Divorced"] = "Divorciado/a"; -$a->strings["Imaginarily divorced"] = "Divorciado imaginario"; -$a->strings["Widowed"] = "Viudo/a"; -$a->strings["Uncertain"] = "Incierto"; -$a->strings["It's complicated"] = "Es complicado"; -$a->strings["Don't care"] = "No te importa"; -$a->strings["Ask me"] = "Pregúntame"; +$a->strings["newer"] = "más nuevo"; +$a->strings["older"] = "más antiguo"; +$a->strings["first"] = "primera"; +$a->strings["prev"] = "ant."; +$a->strings["next"] = "sig."; +$a->strings["last"] = "última"; +$a->strings["Loading more entries..."] = "Cargar mas entradas .."; +$a->strings["The end"] = "El fin"; +$a->strings["No contacts"] = "Sin contactos"; +$a->strings["%d Contact"] = array( + 0 => "%d Contacto", + 1 => "%d Contactos", +); +$a->strings["View Contacts"] = "Ver contactos"; +$a->strings["Save"] = "Guardar"; +$a->strings["poke"] = "tocar"; +$a->strings["poked"] = "tocó a"; +$a->strings["ping"] = "hacer \"ping\""; +$a->strings["pinged"] = "hizo \"ping\" a"; +$a->strings["prod"] = "empujar"; +$a->strings["prodded"] = "empujó a"; +$a->strings["slap"] = "abofetear"; +$a->strings["slapped"] = "abofeteó a"; +$a->strings["finger"] = "meter dedo"; +$a->strings["fingered"] = "le metió un dedo a"; +$a->strings["rebuff"] = "desairar"; +$a->strings["rebuffed"] = "desairó a"; +$a->strings["happy"] = "feliz"; +$a->strings["sad"] = "triste"; +$a->strings["mellow"] = "sentimental"; +$a->strings["tired"] = "cansado"; +$a->strings["perky"] = "alegre"; +$a->strings["angry"] = "furioso"; +$a->strings["stupified"] = "estupefacto"; +$a->strings["puzzled"] = "extrañado"; +$a->strings["interested"] = "interesado"; +$a->strings["bitter"] = "rencoroso"; +$a->strings["cheerful"] = "jovial"; +$a->strings["alive"] = "vivo"; +$a->strings["annoyed"] = "enojado"; +$a->strings["anxious"] = "ansioso"; +$a->strings["cranky"] = "irritable"; +$a->strings["disturbed"] = "perturbado"; +$a->strings["frustrated"] = "frustrado"; +$a->strings["motivated"] = "motivado"; +$a->strings["relaxed"] = "relajado"; +$a->strings["surprised"] = "sorprendido"; +$a->strings["View Video"] = "Ver vídeo"; +$a->strings["bytes"] = "bytes"; +$a->strings["Click to open/close"] = "Pulsa para abrir/cerrar"; +$a->strings["View on separate page"] = "Ver en pagina aparte"; +$a->strings["view on separate page"] = "ver en pagina aparte"; +$a->strings["activity"] = "Actividad"; +$a->strings["comment"] = array( + 0 => "", + 1 => "Comentario", +); +$a->strings["post"] = "Publicación"; +$a->strings["Item filed"] = "Elemento archivado"; $a->strings["No friends to display."] = "No hay amigos para mostrar."; $a->strings["Authorize application connection"] = "Autorizar la conexión de la aplicación"; $a->strings["Return to your app and insert this Securty Code:"] = "Regresa a tu aplicación e introduce este código de seguridad:"; @@ -763,9 +763,6 @@ $a->strings["No exportable data found"] = "No se ha encontrado información expo $a->strings["calendar"] = "calendario"; $a->strings["No contacts in common."] = "Sin contactos en común."; $a->strings["Common Friends"] = "Amigos comunes"; -$a->strings["Public access denied."] = "Acceso público denegado."; -$a->strings["Not available."] = "No disponible"; -$a->strings["No results."] = "Sin resultados."; $a->strings["No such group"] = "Ningún grupo"; $a->strings["Group is empty"] = "El grupo está vacío"; $a->strings["Group: %s"] = "Grupo: %s"; @@ -860,46 +857,16 @@ $a->strings["Unable to set your contact credentials on our system."] = "No se pu $a->strings["Unable to update your contact profile details on our system"] = "No se puede actualizar los datos de tu perfil de contacto en nuestro sistema"; $a->strings["%1\$s has joined %2\$s"] = "%1\$s se ha unido a %2\$s"; $a->strings["%1\$s welcomes %2\$s"] = "%1\$s te da la bienvenida a %2\$s"; +$a->strings["Public access denied."] = "Acceso público denegado."; $a->strings["Global Directory"] = "Directorio global"; $a->strings["Find on this site"] = "Buscar en este sitio"; $a->strings["Results for:"] = "Resultados para:"; $a->strings["Site Directory"] = "Directorio del sitio"; $a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas pueden que estén ocultas)."; -$a->strings["People Search - %s"] = "Buscar perfiles - %s"; -$a->strings["Forum Search - %s"] = "Búsqueda de foro - %s"; -$a->strings["No matches"] = "Sin conincidencias"; -$a->strings["Item has been removed."] = "El elemento ha sido eliminado."; $a->strings["Item not found"] = "Elemento no encontrado"; $a->strings["Edit post"] = "Editar publicación"; -$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de su comienzo."; -$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas."; -$a->strings["Create New Event"] = "Crea un evento nuevo"; -$a->strings["Event details"] = "Detalles del evento"; -$a->strings["Starting date and Title are required."] = "Se requiere fecha de comienzo y titulo"; -$a->strings["Event Starts:"] = "Inicio del evento:"; -$a->strings["Required"] = "Obligatorio"; -$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante."; -$a->strings["Event Finishes:"] = "Finalización del evento:"; -$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria"; -$a->strings["Description:"] = "Descripción:"; -$a->strings["Title:"] = "Título:"; -$a->strings["Share this event"] = "Comparte este evento"; -$a->strings["Failed to remove event"] = ""; -$a->strings["Event removed"] = ""; $a->strings["Files"] = "Archivos"; -$a->strings["Not Found"] = "No se ha encontrado"; $a->strings["- select -"] = "- seleccionar -"; -$a->strings["Submit Request"] = "Enviar solicitud"; -$a->strings["You already added this contact."] = "Ya has añadido este contacto."; -$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado."; -$a->strings["OStatus support is disabled. Contact can't be added."] = "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado."; -$a->strings["The network type couldn't be detected. Contact can't be added."] = "No se pudo detectar el tipo de red. Contacto no puede ser agregado."; -$a->strings["Please answer the following:"] = "Por favor responde lo siguiente:"; -$a->strings["Does %s know you?"] = "¿%s te conoce?"; -$a->strings["Add a personal note:"] = "Añade una nota personal:"; -$a->strings["Your Identity Address:"] = "Dirección de tu perfil:"; -$a->strings["Profile URL"] = "URL Perfil"; -$a->strings["Contact added"] = "Contacto añadido"; $a->strings["This is Friendica, version"] = "Esto es Friendica, versión"; $a->strings["running at web location"] = "ejecutándose en la dirección web"; $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Por favor, visita <a href=\"http://friendica.com\">Friendica.com</a> para saber más sobre el proyecto Friendica."; @@ -908,8 +875,8 @@ $a->strings["the bugtracker at github"] = "aviso de fallas (bugs) en github"; $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Sugerencias, elogios, donaciones, etc. por favor manda un correo a Info arroba Friendica punto com"; $a->strings["Installed plugins/addons/apps:"] = "Módulos/extensiones/aplicaciones instalados:"; $a->strings["No installed plugins/addons/apps"] = "Módulos/extensiones/aplicaciones no instalados"; -$a->strings["On this server the following remote servers are blocked."] = ""; -$a->strings["Reason for the block"] = ""; +$a->strings["On this server the following remote servers are blocked."] = "En este servidor los siguientes servidores remotos están bloqueados."; +$a->strings["Reason for the block"] = "Razón para el bloqueo"; $a->strings["Friend suggestion sent."] = "Solicitud de amistad enviada."; $a->strings["Suggest Friends"] = "Sugerencias de amistad"; $a->strings["Suggest a friend for %s"] = "Recomienda un amigo a %s"; @@ -922,16 +889,17 @@ $a->strings["Save Group"] = "Guardar grupo"; $a->strings["Create a group of contacts/friends."] = "Crea un grupo de contactos/amigos."; $a->strings["Group removed."] = "Grupo eliminado."; $a->strings["Unable to remove group."] = "No se puede eliminar el grupo."; -$a->strings["Delete Group"] = ""; +$a->strings["Delete Group"] = "Borrar grupo"; $a->strings["Group Editor"] = "Editor de grupos"; -$a->strings["Edit Group Name"] = ""; +$a->strings["Edit Group Name"] = "Editar nombre de grupo"; $a->strings["Members"] = "Miembros"; $a->strings["All Contacts"] = "Todos los contactos"; -$a->strings["Remove Contact"] = ""; -$a->strings["Add Contact"] = ""; +$a->strings["Remove Contact"] = "Borrar contacto"; +$a->strings["Add Contact"] = "Agregar contacto"; $a->strings["Click on a contact to add or remove."] = "Pulsa en un contacto para añadirlo o eliminarlo."; $a->strings["No profile"] = "Nigún perfil"; $a->strings["Help:"] = "Ayuda:"; +$a->strings["Not Found"] = "No se ha encontrado"; $a->strings["Page not found."] = "Página no encontrada."; $a->strings["Welcome to %s"] = "Bienvenido a %s"; $a->strings["Friendica Communications Server - Setup"] = "Servidor de comunicación Friendica - Configuración"; @@ -1062,6 +1030,7 @@ $a->strings["Select an identity to manage: "] = "Selecciona una identidad a gest $a->strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave que coincidan. Por favor, agrega algunas palabras claves en tu perfil predeterminado."; $a->strings["is interested in:"] = "estás interesado en:"; $a->strings["Profile Match"] = "Coincidencias de Perfil"; +$a->strings["No matches"] = "Sin conincidencias"; $a->strings["No recipient selected."] = "Ningún destinatario seleccionado"; $a->strings["Unable to locate contact information."] = "No se puede encontrar información del contacto."; $a->strings["Message could not be sent."] = "El mensaje no ha podido ser enviado."; @@ -1089,26 +1058,6 @@ $a->strings["%d message"] = array( ); $a->strings["Mood"] = "Ánimo"; $a->strings["Set your current mood and tell your friends"] = "Coloca tu ánimo actual y cuéntaselo a tus amigos"; -$a->strings["Results for: %s"] = "Resultados para: %s"; -$a->strings["Remove term"] = "Eliminar término"; -$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array( - 0 => "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos.", - 1 => "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos.", -); -$a->strings["Messages in this group won't be send to these receivers."] = "Los mensajes de este grupo no se enviarán a estos receptores."; -$a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente."; -$a->strings["Invalid contact."] = "Contacto erróneo."; -$a->strings["Commented Order"] = "Orden de comentarios"; -$a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentarios"; -$a->strings["Posted Order"] = "Orden de publicación"; -$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación"; -$a->strings["Posts that mention or involve you"] = "Publicaciones que te mencionan o involucran"; -$a->strings["New"] = "Nuevo"; -$a->strings["Activity Stream - by date"] = "Corriente de actividad por fecha"; -$a->strings["Shared Links"] = "Enlaces compartidos"; -$a->strings["Interesting Links"] = "Enlaces interesantes"; -$a->strings["Starred"] = "Favoritos"; -$a->strings["Favourite Posts"] = "Publicaciones favoritas"; $a->strings["Welcome to Friendica"] = "Bienvenido a Friendica "; $a->strings["New Member Checklist"] = "Listado de nuevos miembros"; $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Nos gustaría ofrecerte algunos consejos y enlaces para ayudar a hacer tu experiencia más amena. Pulsa en cualquier elemento para visitar la página correspondiente. Un enlace a esta página será visible desde tu página de inicio durante las dos semanas siguientes a tu inscripción y luego desaparecerá."; @@ -1168,6 +1117,7 @@ $a->strings["Accepting %s as a sharer allows them to subscribe to your posts, bu $a->strings["Friend"] = "Amigo"; $a->strings["Sharer"] = "Lector"; $a->strings["Subscriber"] = "Suscriptor"; +$a->strings["Profile URL"] = "URL Perfil"; $a->strings["No introductions."] = "Sin presentaciones."; $a->strings["Show unread"] = "Mostrar no leído"; $a->strings["Show all"] = "Mostrar todo"; @@ -1234,52 +1184,113 @@ $a->strings["Private photo"] = "Foto privada"; $a->strings["Public photo"] = "Foto pública"; $a->strings["Map"] = "Mapa"; $a->strings["View Album"] = "Ver Álbum"; -$a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo"; -$a->strings["{0} sent you a message"] = "{0} te ha enviado un mensaje"; -$a->strings["{0} requested registration"] = "{0} solicitudes de registro"; $a->strings["Poke/Prod"] = "Toque/Empujón"; $a->strings["poke, prod or do other things to somebody"] = "da un toque, empujón o similar a alguien"; $a->strings["Recipient"] = "Receptor"; $a->strings["Choose what you wish to do to recipient"] = "Elige qué desea hacer con el receptor"; $a->strings["Make this post private"] = "Hacer esta publicación privada"; +$a->strings["Only logged in users are permitted to perform a probing."] = ""; $a->strings["Tips for New Members"] = "Consejos para nuevos miembros"; +$a->strings["Image uploaded but image cropping failed."] = "Imagen recibida, pero ha fallado al recortarla."; +$a->strings["Image size reduction [%s] failed."] = "Ha fallado la reducción de las dimensiones de la imagen [%s]."; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente."; +$a->strings["Unable to process image"] = "Imposible procesar la imagen"; +$a->strings["Upload File:"] = "Subir archivo:"; +$a->strings["Select a profile:"] = "Elige un perfil:"; +$a->strings["Upload"] = "Subir"; +$a->strings["or"] = "o"; +$a->strings["skip this step"] = "saltar este paso"; +$a->strings["select a photo from your photo albums"] = "elige una foto de tus álbumes"; +$a->strings["Crop Image"] = "Recortar imagen"; +$a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor, ajusta el recorte de la imagen para optimizarla."; +$a->strings["Done Editing"] = "Editado"; +$a->strings["Image uploaded successfully."] = "Imagen subida con éxito."; +$a->strings["Profile deleted."] = "Perfil eliminado."; +$a->strings["Profile-"] = "Perfil-"; +$a->strings["New profile created."] = "Nuevo perfil creado."; +$a->strings["Profile unavailable to clone."] = "Imposible duplicar el perfil."; +$a->strings["Profile Name is required."] = "Se necesita un nombre de perfil."; +$a->strings["Marital Status"] = "Estado civil"; +$a->strings["Romantic Partner"] = "Pareja sentimental"; +$a->strings["Work/Employment"] = "Trabajo/estudios"; +$a->strings["Religion"] = "Religión"; +$a->strings["Political Views"] = "Preferencias políticas"; +$a->strings["Gender"] = "Género"; +$a->strings["Sexual Preference"] = "Orientación sexual"; +$a->strings["XMPP"] = "XMPP"; +$a->strings["Homepage"] = "Página de inicio"; +$a->strings["Interests"] = "Intereses"; +$a->strings["Address"] = "Dirección"; +$a->strings["Location"] = "Ubicación"; +$a->strings["Profile updated."] = "Perfil actualizado."; +$a->strings[" and "] = " y "; +$a->strings["public profile"] = "perfil público"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s cambió su %2\$s a “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = " - Visita %1\$s's %2\$s"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s tiene una actualización %2\$s, cambiando %3\$s."; +$a->strings["Hide contacts and friends:"] = "Ocultar contactos y amigos"; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar tu lista de contactos/amigos en este perfil?"; +$a->strings["Show more profile fields:"] = "Mostrar mas campos del perfil:"; +$a->strings["Profile Actions"] = "Acciones de perfil"; +$a->strings["Edit Profile Details"] = "Editar detalles de tu perfil"; +$a->strings["Change Profile Photo"] = "Cambiar imagen del Perfil"; +$a->strings["View this profile"] = "Ver este perfil"; +$a->strings["Create a new profile using these settings"] = "¿Crear un nuevo perfil con esta configuración?"; +$a->strings["Clone this profile"] = "Clonar este perfil"; +$a->strings["Delete this profile"] = "Eliminar este perfil"; +$a->strings["Basic information"] = "Información básica"; +$a->strings["Profile picture"] = "Imagen del perfil"; +$a->strings["Preferences"] = "Preferencias"; +$a->strings["Status information"] = "Información del estatus"; +$a->strings["Additional information"] = "Información addicional"; +$a->strings["Relation"] = "Relación"; +$a->strings["Your Gender:"] = "Género:"; +$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\"♥</span> Estado civil:"; +$a->strings["Example: fishing photography software"] = "Ejemplo: pesca fotografía software"; +$a->strings["Profile Name:"] = "Nombres del perfil:"; +$a->strings["Required"] = "Obligatorio"; +$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser visto por cualquier usuario de internet."; +$a->strings["Your Full Name:"] = "Tu nombre completo:"; +$a->strings["Title/Description:"] = "Título/Descrición:"; +$a->strings["Street Address:"] = "Dirección"; +$a->strings["Locality/City:"] = "Localidad/Ciudad:"; +$a->strings["Region/State:"] = "Región/Estado:"; +$a->strings["Postal/Zip Code:"] = "Código postal:"; +$a->strings["Country:"] = "País"; +$a->strings["Who: (if applicable)"] = "¿Quién? (si es aplicable)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Ejemplos: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Desde [fecha]:"; +$a->strings["Tell us about yourself..."] = "Háblanos sobre ti..."; +$a->strings["XMPP (Jabber) address:"] = "Dirección XMPP (Jabber):"; +$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "La dirección XMPP será propagada entre sus contactos para que puedan seguirle."; +$a->strings["Homepage URL:"] = "Dirección de tu página:"; +$a->strings["Religious Views:"] = "Creencias religiosas:"; +$a->strings["Public Keywords:"] = "Palabras clave públicas:"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Utilizadas para sugerir amigos potenciales, otros pueden verlo)"; +$a->strings["Private Keywords:"] = "Palabras clave privadas:"; +$a->strings["(Used for searching profiles, never shown to others)"] = "(Utilizadas para buscar perfiles, nunca se muestra a otros)"; +$a->strings["Musical interests"] = "Gustos musicales"; +$a->strings["Books, literature"] = "Libros, literatura"; +$a->strings["Television"] = "Televisión"; +$a->strings["Film/dance/culture/entertainment"] = "Películas/baile/cultura/entretenimiento"; +$a->strings["Hobbies/Interests"] = "Aficiones/Intereses"; +$a->strings["Love/romance"] = "Amor/Romance"; +$a->strings["Work/employment"] = "Trabajo/ocupación"; +$a->strings["School/education"] = "Escuela/estudios"; +$a->strings["Contact information and Social Networks"] = "Informacioń de contacto y Redes sociales"; +$a->strings["Edit/Manage Profiles"] = "Editar/Administrar perfiles"; $a->strings["Invalid profile identifier."] = "Identificador de perfil no válido."; $a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil"; $a->strings["Visible To"] = "Visible para"; $a->strings["All Contacts (with secure profile access)"] = "Todos los contactos (con perfil de acceso seguro)"; -$a->strings["Registration successful. Please check your email for further instructions."] = "Te has registrado con éxito. Por favor, consulta tu correo para más información."; -$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Error al intentar de enviar mensaje de correo. Aquí los detalles de su cuenta: <br> login: %s<br> contraseña: %s<br><br>Puede cambiar su contraseña después de ingresar al sitio."; -$a->strings["Registration successful."] = "Registro exitoso."; -$a->strings["Your registration can not be processed."] = "Tu registro no se puede procesar."; -$a->strings["Your registration is pending approval by the site owner."] = "Tu registro está pendiente de aprobación por el propietario del sitio."; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor."; -$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\"."; -$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos."; -$a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):"; -$a->strings["Include your profile in member directory?"] = "¿Incluir tu perfil en el directorio de miembros?"; -$a->strings["Note for the admin"] = "Nota para el administrador"; -$a->strings["Leave a message for the admin, why you want to join this node"] = "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo"; -$a->strings["Membership on this site is by invitation only."] = "Sitio solo accesible mediante invitación."; -$a->strings["Your invitation ID: "] = "ID de tu invitación: "; -$a->strings["Registration"] = "Registro"; -$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Nombre completo (ej. Joe Smith, real o real aparente):"; -$a->strings["Your Email Address: "] = "Tu dirección de correo: "; -$a->strings["New Password:"] = "Contraseña nueva:"; -$a->strings["Leave empty for an auto generated password."] = "Dejar vacío para autogenerar una contraseña"; -$a->strings["Confirm:"] = "Confirmar:"; -$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@\$nombredelsitio</strong>\"."; -$a->strings["Choose a nickname: "] = "Escoge un apodo: "; -$a->strings["Import"] = "Importar"; -$a->strings["Import your profile to this friendica instance"] = "Importar tu perfil a esta instancia de friendica"; +$a->strings["Account approved."] = "Cuenta aprobada."; +$a->strings["Registration revoked for %s"] = "Registro anulado para %s"; +$a->strings["Please login."] = "Por favor accede."; $a->strings["Remove My Account"] = "Eliminar mi cuenta"; $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Esto eliminará por completo tu cuenta. Una vez hecho no se puede deshacer."; $a->strings["Please enter your password for verification:"] = "Por favor, introduce tu contraseña para la verificación:"; $a->strings["Resubscribing to OStatus contacts"] = "Resubscribir a contactos de OStatus"; $a->strings["Error"] = "error"; -$a->strings["Only logged in users are permitted to perform a search."] = "Solo usuarios activos tienen permiso para ejecutar búsquedas."; -$a->strings["Too Many Requests"] = "Demasiadas consultas"; -$a->strings["Only one search per minute is permitted for not logged in users."] = "Se permite solo una búsqueda por minuto para usuarios no identificados."; -$a->strings["Items tagged with: %s"] = "Objetos taggeado con: %s"; $a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s está siguiendo las %3\$s de %2\$s"; $a->strings["Do you really want to delete this suggestion?"] = "¿Estás seguro de que quieres borrar esta sugerencia?"; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No hay sugerencias disponibles. Si el sitio web es nuevo inténtalo de nuevo dentro de 24 horas."; @@ -1292,6 +1303,14 @@ $a->strings["Export your account info and contacts. Use this to make a backup of $a->strings["Export all"] = "Exportar todo"; $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exporta la información de tu cuenta, contactos y lo demás en JSON. Puede ser un archivo bastante grande, por lo que llevará tiempo. Úsalo para hacer una copia de seguridad completa de tu cuenta (las fotos no se exportarán)"; $a->strings["Export personal data"] = "Exportación de datos personales"; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Este sitio ha excedido el número de registros diarios permitidos. Inténtalo de nuevo mañana por favor."; +$a->strings["Import"] = "Importar"; +$a->strings["Move account"] = "Mover cuenta"; +$a->strings["You can import an account from another Friendica server."] = "Puedes importar una cuenta desde otro servidor de Friendica."; +$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado."; +$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*"; +$a->strings["Account file"] = "Archivo de la cuenta"; +$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\""; $a->strings["[Embedded content - reload page to view]"] = "[Contenido incrustado - recarga la página para verlo]"; $a->strings["Do you really want to delete this video?"] = "Realmente quieres eliminar este vídeo?"; $a->strings["Delete Video"] = "Borrar vídeo"; @@ -1309,7 +1328,93 @@ $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = $a->strings["Unable to check your home location."] = "Imposible comprobar tu servidor de inicio."; $a->strings["No recipient."] = "Sin receptor."; $a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Si quieres que %s te responda, asegúrate de que la configuración de privacidad permite enviar correo privado a desconocidos."; -$a->strings["Only logged in users are permitted to perform a probing."] = ""; +$a->strings["Not available."] = "No disponible"; +$a->strings["No results."] = "Sin resultados."; +$a->strings["%d contact edited."] = array( + 0 => "%d contacto editado.", + 1 => "%d contacts edited.", +); +$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto."; +$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado."; +$a->strings["Contact updated."] = "Contacto actualizado."; +$a->strings["Failed to update contact record."] = "Error al actualizar el contacto."; +$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado"; +$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado"; +$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado"; +$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado"; +$a->strings["Contact has been archived"] = "El contacto ha sido archivado"; +$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado"; +$a->strings["Drop contact"] = "Eliminar contacto"; +$a->strings["Do you really want to delete this contact?"] = "¿Estás seguro de que quieres eliminar este contacto?"; +$a->strings["Contact has been removed."] = "El contacto ha sido eliminado"; +$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s"; +$a->strings["You are sharing with %s"] = "Estás compartiendo con %s"; +$a->strings["%s is sharing with you"] = "%s está compartiendo contigo"; +$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto."; +$a->strings["Never"] = "Nunca"; +$a->strings["(Update was successful)"] = "(La actualización se ha completado)"; +$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)"; +$a->strings["Suggest friends"] = "Sugerir amigos"; +$a->strings["Network type: %s"] = "Tipo de red: %s"; +$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!"; +$a->strings["Fetch further information for feeds"] = "Recaudar informacion complementaria de los feeds"; +$a->strings["Disabled"] = "Deshabilitado"; +$a->strings["Fetch information"] = "Recaudar informacion"; +$a->strings["Fetch information and keywords"] = "Recaudar informacion y palabras claves"; +$a->strings["Contact"] = "Contacto"; +$a->strings["Profile Visibility"] = "Visibilidad del Perfil"; +$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura."; +$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas"; +$a->strings["Edit contact notes"] = "Editar notas del contacto"; +$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto"; +$a->strings["Ignore contact"] = "Ignorar contacto"; +$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección"; +$a->strings["View conversations"] = "Ver conversaciones"; +$a->strings["Last update:"] = "Última actualización:"; +$a->strings["Update public posts"] = "Actualizar publicaciones públicas"; +$a->strings["Update now"] = "Actualizar ahora"; +$a->strings["Unblock"] = "Desbloquear"; +$a->strings["Block"] = "Bloquear"; +$a->strings["Unignore"] = "Quitar de Ignorados"; +$a->strings["Currently blocked"] = "Bloqueados"; +$a->strings["Currently ignored"] = "Ignorados"; +$a->strings["Currently archived"] = "Archivados"; +$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles."; +$a->strings["Notification for new posts"] = "Notificacion de nuevos temas."; +$a->strings["Send a notification of every new post of this contact"] = "Enviar una notificacion por nuevos temas de este contacto."; +$a->strings["Blacklisted keywords"] = "Lista negra de palabras"; +$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado"; +$a->strings["Actions"] = "Acciones"; +$a->strings["Contact Settings"] = "Ajustes del contacto"; +$a->strings["Suggestions"] = "Sugerencias"; +$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas"; +$a->strings["Show all contacts"] = "Mostrar todos los contactos"; +$a->strings["Unblocked"] = "Desbloqueados"; +$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear"; +$a->strings["Blocked"] = "Bloqueados"; +$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados"; +$a->strings["Ignored"] = "Ignorados"; +$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados"; +$a->strings["Archived"] = "Archivados"; +$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados"; +$a->strings["Hidden"] = "Ocultos"; +$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos"; +$a->strings["Search your contacts"] = "Buscar en tus contactos"; +$a->strings["Results for: %s"] = "Resultados para: %s"; +$a->strings["Update"] = "Actualizar"; +$a->strings["Archive"] = "Archivo"; +$a->strings["Unarchive"] = "Sin archivar"; +$a->strings["Batch Actions"] = "Accones en lote"; +$a->strings["View all contacts"] = "Ver todos los contactos"; +$a->strings["View all common friends"] = "Ver todos los conocidos en común "; +$a->strings["Advanced Contact Settings"] = "Configuración avanzada"; +$a->strings["Mutual Friendship"] = "Amistad recíproca"; +$a->strings["is a fan of yours"] = "es tu fan"; +$a->strings["you are a fan of"] = "eres fan de"; +$a->strings["Toggle Blocked status"] = "Cambiar bloqueados"; +$a->strings["Toggle Ignored status"] = "Cambiar ignorados"; +$a->strings["Toggle Archive status"] = "Cambiar archivados"; +$a->strings["Delete contact"] = "Eliminar contacto"; $a->strings["This introduction has already been accepted."] = "Esta presentación ya ha sido aceptada."; $a->strings["Profile location is not valid or does not contain profile information."] = "La dirección del perfil no es válida o no contiene información del perfil."; $a->strings["Warning: profile location has no identifiable owner name."] = "Aviso: La dirección del perfil no tiene un nombre de propietario identificable."; @@ -1330,7 +1435,6 @@ $a->strings["This account has not been configured for email. Request failed."] = $a->strings["You have already introduced yourself here."] = "Ya te has presentado aquí."; $a->strings["Apparently you are already friends with %s."] = "Al parecer, ya eres amigo de %s."; $a->strings["Invalid profile URL."] = "Dirección de perfil no válida."; -$a->strings["Failed to update contact record."] = "Error al actualizar el contacto."; $a->strings["Your introduction has been sent."] = "Tu presentación ha sido enviada."; $a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "La subscripción remota no se podrá hacer para tu red. Por favor contacta directamente desde tu sistema."; $a->strings["Please login to confirm introduction."] = "Inicia sesión para confirmar la presentación."; @@ -1343,8 +1447,35 @@ $a->strings["Please enter your 'Identity Address' from one of the following supp $a->strings["If you are not yet a member of the free social web, <a href=\"%s/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "Si aun no eres miembro de la red social libre <a href=\"%s/siteinfo\">seguí este enlace para encontrara un sitio disponible de friendica y acompañanos hoy mismo</a>"; $a->strings["Friend/Connection Request"] = "Solicitud de Amistad/Conexión"; $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Ejemplos: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"; +$a->strings["Please answer the following:"] = "Por favor responde lo siguiente:"; +$a->strings["Does %s know you?"] = "¿%s te conoce?"; +$a->strings["Add a personal note:"] = "Añade una nota personal:"; $a->strings["StatusNet/Federated Social Web"] = "StatusNet/Web Social Federada"; $a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = "(En vez de usar este formulario, introduce %s en la barra de búsqueda de Diaspora."; +$a->strings["Your Identity Address:"] = "Dirección de tu perfil:"; +$a->strings["Submit Request"] = "Enviar solicitud"; +$a->strings["People Search - %s"] = "Buscar perfiles - %s"; +$a->strings["Forum Search - %s"] = "Búsqueda de foro - %s"; +$a->strings["Item has been removed."] = "El elemento ha sido eliminado."; +$a->strings["Event can not end before it has started."] = "Un evento no puede terminar antes de su comienzo."; +$a->strings["Event title and start time are required."] = "Título del evento y hora de inicio requeridas."; +$a->strings["Create New Event"] = "Crea un evento nuevo"; +$a->strings["Event details"] = "Detalles del evento"; +$a->strings["Starting date and Title are required."] = "Se requiere fecha de comienzo y titulo"; +$a->strings["Event Starts:"] = "Inicio del evento:"; +$a->strings["Finish date/time is not known or not relevant"] = "La fecha/hora de finalización no es conocida o es irrelevante."; +$a->strings["Event Finishes:"] = "Finalización del evento:"; +$a->strings["Adjust for viewer timezone"] = "Ajuste de zona horaria"; +$a->strings["Description:"] = "Descripción:"; +$a->strings["Title:"] = "Título:"; +$a->strings["Share this event"] = "Comparte este evento"; +$a->strings["Failed to remove event"] = ""; +$a->strings["Event removed"] = ""; +$a->strings["You already added this contact."] = "Ya has añadido este contacto."; +$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "El soporte de Diaspora* no esta habilitado, el contacto no puede ser agregado."; +$a->strings["OStatus support is disabled. Contact can't be added."] = "El soporte de OStatus no esta habilitado, el contacto no puede ser agregado."; +$a->strings["The network type couldn't be detected. Contact can't be added."] = "No se pudo detectar el tipo de red. Contacto no puede ser agregado."; +$a->strings["Contact added"] = "Contacto añadido"; $a->strings["Unable to locate original post."] = "No se puede encontrar la publicación original."; $a->strings["Empty post discarded."] = "Publicación vacía descartada."; $a->strings["System error. Post not saved."] = "Error del sistema. Mensaje no guardado."; @@ -1352,21 +1483,237 @@ $a->strings["This message was sent to you by %s, a member of the Friendica socia $a->strings["You may visit them online at %s"] = "Los puedes visitar en línea en %s"; $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Por favor contacta con el remitente respondiendo a este mensaje si no deseas recibir estos mensajes."; $a->strings["%s posted an update."] = "%s ha publicado una actualización."; -$a->strings["Account approved."] = "Cuenta aprobada."; -$a->strings["Registration revoked for %s"] = "Registro anulado para %s"; -$a->strings["Please login."] = "Por favor accede."; -$a->strings["Move account"] = "Mover cuenta"; -$a->strings["You can import an account from another Friendica server."] = "Puedes importar una cuenta desde otro servidor de Friendica."; -$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Necesitas exportar tu cuenta del antiguo servidor y subirla aquí. Volveremos a crear tu antigua cuenta con todos tus contactos aquí. También intentaremos de informar a tus amigos de que te has mudado."; -$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Esta característica es experimental. No podemos importar contactos desde la red OStatus (statusnet/identi.ca) o desde Diaspora*"; -$a->strings["Account file"] = "Archivo de la cuenta"; -$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Para exportar el perfil vaya a \"Configuracion -> Exportar sus datos personales\" y seleccione \"Exportar cuenta\""; +$a->strings["Remove term"] = "Eliminar término"; +$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = array( + 0 => "Aviso: Este grupo contiene %s miembro de una red que no permite mensajes públicos.", + 1 => "Aviso: Este grupo contiene %s miembros de una red que no permite mensajes públicos.", +); +$a->strings["Messages in this group won't be send to these receivers."] = "Los mensajes de este grupo no se enviarán a estos receptores."; +$a->strings["Private messages to this person are at risk of public disclosure."] = "Los mensajes privados a esta persona corren el riesgo de ser mostrados públicamente."; +$a->strings["Invalid contact."] = "Contacto erróneo."; +$a->strings["Commented Order"] = "Orden de comentarios"; +$a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentarios"; +$a->strings["Posted Order"] = "Orden de publicación"; +$a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación"; +$a->strings["Posts that mention or involve you"] = "Publicaciones que te mencionan o involucran"; +$a->strings["New"] = "Nuevo"; +$a->strings["Activity Stream - by date"] = "Corriente de actividad por fecha"; +$a->strings["Shared Links"] = "Enlaces compartidos"; +$a->strings["Interesting Links"] = "Enlaces interesantes"; +$a->strings["Starred"] = "Favoritos"; +$a->strings["Favourite Posts"] = "Publicaciones favoritas"; +$a->strings["{0} wants to be your friend"] = "{0} quiere ser tu amigo"; +$a->strings["{0} sent you a message"] = "{0} te ha enviado un mensaje"; +$a->strings["{0} requested registration"] = "{0} solicitudes de registro"; +$a->strings["Registration successful. Please check your email for further instructions."] = "Te has registrado con éxito. Por favor, consulta tu correo para más información."; +$a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Error al intentar de enviar mensaje de correo. Aquí los detalles de su cuenta: <br> login: %s<br> contraseña: %s<br><br>Puede cambiar su contraseña después de ingresar al sitio."; +$a->strings["Registration successful."] = "Registro exitoso."; +$a->strings["Your registration can not be processed."] = "Tu registro no se puede procesar."; +$a->strings["Your registration is pending approval by the site owner."] = "Tu registro está pendiente de aprobación por el propietario del sitio."; +$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Puedes (opcionalmente) rellenar este formulario a través de OpenID escribiendo tu OpenID y pulsando en \"Registrar\"."; +$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Si no estás familiarizado con OpenID, por favor deja ese campo en blanco y rellena el resto de los elementos."; +$a->strings["Your OpenID (optional): "] = "Tu OpenID (opcional):"; +$a->strings["Include your profile in member directory?"] = "¿Incluir tu perfil en el directorio de miembros?"; +$a->strings["Note for the admin"] = "Nota para el administrador"; +$a->strings["Leave a message for the admin, why you want to join this node"] = "Deje un mensaje para el administrador sobre por qué quiere unirse a este nodo"; +$a->strings["Membership on this site is by invitation only."] = "Sitio solo accesible mediante invitación."; +$a->strings["Your invitation ID: "] = "ID de tu invitación: "; +$a->strings["Registration"] = "Registro"; +$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Nombre completo (ej. Joe Smith, real o real aparente):"; +$a->strings["Your Email Address: "] = "Tu dirección de correo: "; +$a->strings["New Password:"] = "Contraseña nueva:"; +$a->strings["Leave empty for an auto generated password."] = "Dejar vacío para autogenerar una contraseña"; +$a->strings["Confirm:"] = "Confirmar:"; +$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Elije un apodo. Debe comenzar con una letra. Tu dirección de perfil en este sitio va a ser \"<strong>apodo@\$nombredelsitio</strong>\"."; +$a->strings["Choose a nickname: "] = "Escoge un apodo: "; +$a->strings["Import your profile to this friendica instance"] = "Importar tu perfil a esta instancia de friendica"; +$a->strings["Only logged in users are permitted to perform a search."] = "Solo usuarios activos tienen permiso para ejecutar búsquedas."; +$a->strings["Too Many Requests"] = "Demasiadas consultas"; +$a->strings["Only one search per minute is permitted for not logged in users."] = "Se permite solo una búsqueda por minuto para usuarios no identificados."; +$a->strings["Items tagged with: %s"] = "Objetos taggeado con: %s"; +$a->strings["Account"] = "Cuenta"; +$a->strings["Additional features"] = "Características adicionales"; +$a->strings["Display"] = "Interfaz del usuario"; +$a->strings["Social Networks"] = "Redes sociales"; +$a->strings["Plugins"] = "Módulos"; +$a->strings["Connected apps"] = "Aplicaciones conectadas"; +$a->strings["Remove account"] = "Eliminar cuenta"; +$a->strings["Missing some important data!"] = "¡Faltan algunos datos importantes!"; +$a->strings["Failed to connect with email account using the settings provided."] = "Error al conectar con la cuenta de correo mediante la configuración suministrada."; +$a->strings["Email settings updated."] = "Configuración de correo actualizada."; +$a->strings["Features updated"] = "Actualizaciones"; +$a->strings["Relocate message has been send to your contacts"] = "Mensaje de reubicación ha sido enviado a sus contactos."; +$a->strings["Empty passwords are not allowed. Password unchanged."] = "No se permiten contraseñas vacías. La contraseña no ha sido modificada."; +$a->strings["Wrong password."] = "Contraseña incorrecta"; +$a->strings["Password changed."] = "Contraseña modificada."; +$a->strings["Password update failed. Please try again."] = "La actualización de la contraseña ha fallado. Por favor, prueba otra vez."; +$a->strings[" Please use a shorter name."] = " Usa un nombre más corto."; +$a->strings[" Name too short."] = " Nombre demasiado corto."; +$a->strings["Wrong Password"] = "Contraseña incorrecta"; +$a->strings[" Not valid email."] = " Correo no válido."; +$a->strings[" Cannot change to that email."] = " No se puede usar ese correo."; +$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto."; +$a->strings["Private forum has no privacy permissions and no default privacy group."] = "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad."; +$a->strings["Settings updated."] = "Configuración actualizada."; +$a->strings["Add application"] = "Agregar aplicación"; +$a->strings["Save Settings"] = "Guardar configuración"; +$a->strings["Consumer Key"] = "Clave del consumidor"; +$a->strings["Consumer Secret"] = "Secreto del consumidor"; +$a->strings["Redirect"] = "Redirigir"; +$a->strings["Icon url"] = "Dirección del ícono"; +$a->strings["You can't edit this application."] = "No puedes editar esta aplicación."; +$a->strings["Connected Apps"] = "Aplicaciones conectadas"; +$a->strings["Client key starts with"] = "Clave de cliente comienza por"; +$a->strings["No name"] = "Sin nombre"; +$a->strings["Remove authorization"] = "Suprimir la autorización"; +$a->strings["No Plugin settings configured"] = "No se ha configurado ningún módulo"; +$a->strings["Plugin Settings"] = "Configuración de los módulos"; +$a->strings["Off"] = "Apagado"; +$a->strings["On"] = "Encendido"; +$a->strings["Additional Features"] = "Características adicionales"; +$a->strings["General Social Media Settings"] = "Configuración general de social media "; +$a->strings["Disable intelligent shortening"] = "Deshabilitar recorte inteligente de URL"; +$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normalemente el sistema intenta de encontrara el mejor enlace para agregar a envíos recortados (twitter, OStatus). Si esta opción se encuentra habilitado, todo envío recortado apuntara siempre al tema original en friendica."; +$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automáticamente seguir cualquier GNUsocial (OStatus) seguidores o menciones "; +$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "Cuando se recibe un mensaje de un perfil desconocido de OStatus, esta opción define que hacer.\nSi es habilitado, un nuevo contacto sera creado para cada usuario."; +$a->strings["Default group for OStatus contacts"] = "Grupo por defecto para contactos OStatus"; +$a->strings["Your legacy GNU Social account"] = "Tu cuenta GNU social conectada"; +$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Si agrega su viejo nombre de perfil GNUsocial/Statusnet aqui (en el formato de usuario@dominio.tld), sus contactos serán añadidos automáticamente.\nEl campo sera vaciado cuando termine el proceso. "; +$a->strings["Repair OStatus subscriptions"] = "Reparar subscripciones de OStatus"; +$a->strings["Built-in support for %s connectivity is %s"] = "El soporte integrado de conexión con %s está %s"; +$a->strings["enabled"] = "habilitado"; +$a->strings["disabled"] = "deshabilitado"; +$a->strings["GNU Social (OStatus)"] = "GNUsocial (OStatus)"; +$a->strings["Email access is disabled on this site."] = "El acceso por correo está deshabilitado en esta web."; +$a->strings["Email/Mailbox Setup"] = "Configuración del correo/buzón"; +$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón."; +$a->strings["Last successful email check:"] = "Última comprobación del correo con éxito:"; +$a->strings["IMAP server name:"] = "Nombre del servidor IMAP:"; +$a->strings["IMAP port:"] = "Puerto IMAP:"; +$a->strings["Security:"] = "Seguridad:"; +$a->strings["None"] = "Ninguna"; +$a->strings["Email login name:"] = "Nombre de usuario:"; +$a->strings["Email password:"] = "Contraseña:"; +$a->strings["Reply-to address:"] = "Dirección de respuesta:"; +$a->strings["Send public posts to all email contacts:"] = "Enviar publicaciones públicas a todos los contactos de correo:"; +$a->strings["Action after import:"] = "Acción después de importar:"; +$a->strings["Move to folder"] = "Mover a un directorio"; +$a->strings["Move to folder:"] = "Mover al directorio:"; +$a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles"; +$a->strings["Display Settings"] = "Configuración Tema/Visualización"; +$a->strings["Display Theme:"] = "Utilizar tema:"; +$a->strings["Mobile Theme:"] = "Tema móvil:"; +$a->strings["Suppress warning of insecure networks"] = "Suprimir el aviso de redes inseguras"; +$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas."; +$a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos"; +$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimo 10 segundos. Ingrese -1 para deshabilitar."; +$a->strings["Number of items to display per page:"] = "Número de elementos a mostrar por página:"; +$a->strings["Maximum of 100 items"] = "Máximo 100 elementos"; +$a->strings["Number of items to display per page when viewed from mobile device:"] = "Cantidad de objetos a visualizar cuando se usa un movil"; +$a->strings["Don't show emoticons"] = "No mostrar emoticones"; +$a->strings["Calendar"] = "Calendario"; +$a->strings["Beginning of week:"] = "Principio de la semana:"; +$a->strings["Don't show notices"] = "No mostrara avisos"; +$a->strings["Infinite scroll"] = "pagina infinita (sroll)"; +$a->strings["Automatic updates only at the top of the network page"] = "Actualizaciones automaticas solo estando al principio de la pagina"; +$a->strings["Bandwith Saver Mode"] = "Modo de guardado de ancho de banda"; +$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Cuando está habilitado, el contenido incrustado no se muestra en las actualizaciones automáticas, sólo en las páginas recargadas."; +$a->strings["General Theme Settings"] = "Ajustes generales de tema"; +$a->strings["Custom Theme Settings"] = "Ajustes personalizados de tema"; +$a->strings["Content Settings"] = "Ajustes de contenido"; +$a->strings["Theme settings"] = "Configuración del Tema"; +$a->strings["Account Types"] = "Tipos de cuenta"; +$a->strings["Personal Page Subtypes"] = "Subtipos de página personal"; +$a->strings["Community Forum Subtypes"] = "Subtipos de foro de comunidad"; +$a->strings["Personal Page"] = "Página personal"; +$a->strings["Account for a personal profile."] = ""; +$a->strings["Organisation Page"] = "Página de organización"; +$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = ""; +$a->strings["News Page"] = "Página de noticias"; +$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = ""; +$a->strings["Community Forum"] = "Foro de la comunidad"; +$a->strings["Account for community discussions."] = ""; +$a->strings["Normal Account Page"] = "Página de cuenta normal"; +$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = ""; +$a->strings["Soapbox Page"] = "Página de tribuna"; +$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = ""; +$a->strings["Public Forum"] = "Foro público"; +$a->strings["Automatically approves all contact requests."] = ""; +$a->strings["Automatic Friend Page"] = "Página de Amistad autómatica"; +$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = ""; +$a->strings["Private Forum [Experimental]"] = "Foro privado [Experimental]"; +$a->strings["Requires manual approval of contact requests."] = ""; +$a->strings["OpenID:"] = "OpenID:"; +$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permitir a este OpenID acceder a esta cuenta."; +$a->strings["Publish your default profile in your local site directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?"; +$a->strings["Your profile may be visible in public."] = ""; +$a->strings["Publish your default profile in the global social directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?"; +$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?"; +$a->strings["If enabled, posting public messages to Diaspora and other networks isn't possible."] = "Si habilitado, enviar temas públicos a a Diaspora* y otras redes no es posible. "; +$a->strings["Allow friends to post to your profile page?"] = "¿Permites que tus amigos publiquen en tu página de perfil?"; +$a->strings["Allow friends to tag your posts?"] = "¿Permites a los amigos etiquetar tus publicaciones?"; +$a->strings["Allow us to suggest you as a potential friend to new members?"] = "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?"; +$a->strings["Permit unknown people to send you private mail?"] = "¿Permites que desconocidos te manden correos privados?"; +$a->strings["Profile is <strong>not published</strong>."] = "El perfil <strong>no está publicado</strong>."; +$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Su dirección de identidad es <strong>'%s'</strong> o '%s'."; +$a->strings["Automatically expire posts after this many days:"] = "Las publicaciones expirarán automáticamente después de estos días:"; +$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán"; +$a->strings["Advanced expiration settings"] = "Configuración avanzada de expiración"; +$a->strings["Advanced Expiration"] = "Expiración avanzada"; +$a->strings["Expire posts:"] = "¿Expiran las publicaciones?"; +$a->strings["Expire personal notes:"] = "¿Expiran las notas personales?"; +$a->strings["Expire starred posts:"] = "¿Expiran los favoritos?"; +$a->strings["Expire photos:"] = "¿Expiran las fotografías?"; +$a->strings["Only expire posts by others:"] = "Solo expiran los mensajes de los demás:"; +$a->strings["Account Settings"] = "Configuración de la cuenta"; +$a->strings["Password Settings"] = "Configuración de la contraseña"; +$a->strings["Leave password fields blank unless changing"] = "Deja la contraseña en blanco si no quieres cambiarla"; +$a->strings["Current Password:"] = "Contraseña actual:"; +$a->strings["Your current password to confirm the changes"] = "Su contraseña actual para confirmar los cambios."; +$a->strings["Password:"] = "Contraseña:"; +$a->strings["Basic Settings"] = "Configuración básica"; +$a->strings["Email Address:"] = "Dirección de correo:"; +$a->strings["Your Timezone:"] = "Zona horaria:"; +$a->strings["Your Language:"] = "Tu idioma:"; +$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Selecciona el idioma que se usara para la interfaz del usuario y para el envío de correo."; +$a->strings["Default Post Location:"] = "Localización predeterminada:"; +$a->strings["Use Browser Location:"] = "Usar localización del navegador:"; +$a->strings["Security and Privacy Settings"] = "Configuración de seguridad y privacidad"; +$a->strings["Maximum Friend Requests/Day:"] = "Máximo número de peticiones de amistad por día:"; +$a->strings["(to prevent spam abuse)"] = "(para prevenir el abuso de spam)"; +$a->strings["Default Post Permissions"] = "Permisos por defecto para las publicaciones"; +$a->strings["(click to open/close)"] = "(pulsa para abrir/cerrar)"; +$a->strings["Default Private Post"] = "Publicación Privada por defecto"; +$a->strings["Default Public Post"] = "Publicación Pública por defecto"; +$a->strings["Default Permissions for New Posts"] = "Permisos por defecto para nuevas publicaciones"; +$a->strings["Maximum private messages per day from unknown people:"] = "Número máximo de mensajes diarios para desconocidos:"; +$a->strings["Notification Settings"] = "Configuración de notificaciones"; +$a->strings["By default post a status message when:"] = "Publicar en tu estado cuando:"; +$a->strings["accepting a friend request"] = "aceptes una solicitud de amistad"; +$a->strings["joining a forum/community"] = "te unas a un foro/comunidad"; +$a->strings["making an <em>interesting</em> profile change"] = "hagas un cambio <em>interesante</em> en tu perfil"; +$a->strings["Send a notification email when:"] = "Enviar notificación por correo cuando:"; +$a->strings["You receive an introduction"] = "Recibas una presentación"; +$a->strings["Your introductions are confirmed"] = "Tu presentación sea confirmada"; +$a->strings["Someone writes on your profile wall"] = "Alguien escriba en el muro de mi perfil"; +$a->strings["Someone writes a followup comment"] = "Algien escriba en un comentario que sigo"; +$a->strings["You receive a private message"] = "Recibas un mensaje privado"; +$a->strings["You receive a friend suggestion"] = "Recibas una sugerencia de amistad"; +$a->strings["You are tagged in a post"] = "Seas etiquetado en una publicación"; +$a->strings["You are poked/prodded/etc. in a post"] = "Te han tocado/empujado/etc. en una publicación"; +$a->strings["Activate desktop notifications"] = "Activar notificaciones en pantalla."; +$a->strings["Show desktop popup on new notifications"] = "Mostrar notificaciones emergentes en caso de nuevos eventos."; +$a->strings["Text-only notification emails"] = "Notificaciones e-mail de solo texto"; +$a->strings["Send text only notification emails, without the html part"] = "Enviar las notificaciones por correo con formato de solo texto sin html."; +$a->strings["Advanced Account/Page Type Settings"] = "Configuración avanzada de tipo de Cuenta/Página"; +$a->strings["Change the behaviour of this account for special situations"] = "Cambiar el comportamiento de esta cuenta para situaciones especiales"; +$a->strings["Relocate"] = "Relocalizar"; +$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)"; +$a->strings["Resend relocate message to contacts"] = "Reenviar mensaje de relocalización a los contactos"; $a->strings["Theme settings updated."] = "Configuración de la apariencia actualizada."; $a->strings["Site"] = "Sitio"; $a->strings["Users"] = "Usuarios"; -$a->strings["Plugins"] = "Módulos"; $a->strings["Themes"] = "Temas"; -$a->strings["Additional features"] = "Características adicionales"; $a->strings["DB updates"] = "Actualizaciones de la Base de Datos"; $a->strings["Inspect Queue"] = "Inspeccionar cola"; $a->strings["Server Blocklist"] = ""; @@ -1409,11 +1756,11 @@ $a->strings["This page lists the content of the queue for outgoing postings. The $a->strings["Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href=\"%s\">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />"] = ""; $a->strings["The database update failed. Please run \"php include/dbstructure.php update\" from the command line and have a look at the errors that might appear."] = ""; $a->strings["Normal Account"] = "Cuenta normal"; -$a->strings["Soapbox Account"] = "Cuenta tribuna"; -$a->strings["Community/Celebrity Account"] = "Cuenta de Comunidad/Celebridad"; +$a->strings["Automatic Follower Account"] = ""; +$a->strings["Public Forum Account"] = ""; $a->strings["Automatic Friend Account"] = "Cuenta de amistad automática"; $a->strings["Blog Account"] = "Cuenta de blog"; -$a->strings["Private Forum"] = "Foro privado"; +$a->strings["Private Forum Account"] = ""; $a->strings["Message queues"] = "Cola de mensajes"; $a->strings["Summary"] = "Resumen"; $a->strings["Registered users"] = "Usuarios registrados"; @@ -1422,13 +1769,10 @@ $a->strings["Version"] = "Versión"; $a->strings["Active plugins"] = "Módulos activos"; $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "No se puede resolver la direccion URL base.\nDeberá tener al menos <scheme>://<domain>"; $a->strings["Site settings updated."] = "Configuración de actualización."; -$a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles"; $a->strings["No community page"] = "No hay pagina de comunidad"; $a->strings["Public postings from users of this site"] = "Temas públicos de perfiles de este sitio."; $a->strings["Global community page"] = "Pagina global de comunidad"; -$a->strings["Never"] = "Nunca"; $a->strings["At post arrival"] = "A la llegada de una publicación"; -$a->strings["Disabled"] = "Deshabilitado"; $a->strings["Users, Global Contacts"] = "Perfiles, contactos globales"; $a->strings["Users, Global Contacts/fallback"] = "Perfiles, contactos globales/fallback"; $a->strings["One month"] = "Un mes"; @@ -1442,7 +1786,6 @@ $a->strings["Open"] = "Abierto"; $a->strings["No SSL policy, links will track page SSL state"] = "No existe una política de SSL, los vínculos harán un seguimiento del estado de SSL en la página"; $a->strings["Force all links to use SSL"] = "Forzar todos los enlaces a utilizar SSL"; $a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Certificación personal, usa SSL solo para enlaces locales (no recomendado)"; -$a->strings["Save Settings"] = "Guardar configuración"; $a->strings["File upload"] = "Subida de archivo"; $a->strings["Policies"] = "Políticas"; $a->strings["Auto Discovered Contact Directory"] = "Directorio de contactos descubierto automáticamente"; @@ -1615,7 +1958,6 @@ $a->strings["User '%s' blocked"] = "Usuario '%s' bloqueado'"; $a->strings["Register date"] = "Fecha de registro"; $a->strings["Last login"] = "Último acceso"; $a->strings["Last item"] = "Último elemento"; -$a->strings["Account"] = "Cuenta"; $a->strings["Add User"] = "Agregar usuario"; $a->strings["select all"] = "seleccionar todo"; $a->strings["User registrations waiting for confirm"] = "Registro de usuarios esperando confirmación"; @@ -1624,8 +1966,6 @@ $a->strings["Request date"] = "Solicitud de fecha"; $a->strings["No registrations."] = "Sin registros."; $a->strings["Note from the user"] = "Nota para el usuario"; $a->strings["Deny"] = "Denegado"; -$a->strings["Block"] = "Bloquear"; -$a->strings["Unblock"] = "Desbloquear"; $a->strings["Site admin"] = "Administrador de la web"; $a->strings["Account expired"] = "Cuenta caducada"; $a->strings["New User"] = "Nuevo usuario"; @@ -1661,349 +2001,11 @@ $a->strings["Must be writable by web server. Relative to your Friendica top-leve $a->strings["Log level"] = "Nivel de registro"; $a->strings["PHP logging"] = "PHP logging"; $a->strings["To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."] = "Para habilitar la documentación de los errores PHP y las advertencias se puede agregar lo siguiente al archivo .htconfig.php de la instalación (ftp). La dirección definido en el 'error_log' es relativo al directorio friendica principal (top-level directory) y debe de ser habilitado para la escritura por el servidor web. La opción '1' para 'log_errors' y 'display_errors' es para habilitar estas opciones, '0' para deshabilitarlo."; -$a->strings["Off"] = "Apagado"; -$a->strings["On"] = "Encendido"; $a->strings["Lock feature %s"] = "Trancar opción %s "; $a->strings["Manage Additional Features"] = "Administrar opciones adicionales"; -$a->strings["%d contact edited."] = array( - 0 => "%d contacto editado.", - 1 => "%d contacts edited.", -); -$a->strings["Could not access contact record."] = "No se pudo acceder a los datos del contacto."; -$a->strings["Could not locate selected profile."] = "No se pudo encontrar el perfil seleccionado."; -$a->strings["Contact updated."] = "Contacto actualizado."; -$a->strings["Contact has been blocked"] = "El contacto ha sido bloqueado"; -$a->strings["Contact has been unblocked"] = "El contacto ha sido desbloqueado"; -$a->strings["Contact has been ignored"] = "El contacto ha sido ignorado"; -$a->strings["Contact has been unignored"] = "El contacto ya no está ignorado"; -$a->strings["Contact has been archived"] = "El contacto ha sido archivado"; -$a->strings["Contact has been unarchived"] = "El contacto ya no está archivado"; -$a->strings["Drop contact"] = "Eliminar contacto"; -$a->strings["Do you really want to delete this contact?"] = "¿Estás seguro de que quieres eliminar este contacto?"; -$a->strings["Contact has been removed."] = "El contacto ha sido eliminado"; -$a->strings["You are mutual friends with %s"] = "Ahora tienes una amistad mutua con %s"; -$a->strings["You are sharing with %s"] = "Estás compartiendo con %s"; -$a->strings["%s is sharing with you"] = "%s está compartiendo contigo"; -$a->strings["Private communications are not available for this contact."] = "Las comunicaciones privadas no está disponibles para este contacto."; -$a->strings["(Update was successful)"] = "(La actualización se ha completado)"; -$a->strings["(Update was not successful)"] = "(La actualización no se ha completado)"; -$a->strings["Suggest friends"] = "Sugerir amigos"; -$a->strings["Network type: %s"] = "Tipo de red: %s"; -$a->strings["Communications lost with this contact!"] = "¡Se ha perdido la comunicación con este contacto!"; -$a->strings["Fetch further information for feeds"] = "Recaudar informacion complementaria de los feeds"; -$a->strings["Fetch information"] = "Recaudar informacion"; -$a->strings["Fetch information and keywords"] = "Recaudar informacion y palabras claves"; -$a->strings["Contact"] = "Contacto"; -$a->strings["Profile Visibility"] = "Visibilidad del Perfil"; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, selecciona el perfil que quieras mostrar a %s cuando esté viendo tu perfil de forma segura."; -$a->strings["Contact Information / Notes"] = "Información del Contacto / Notas"; -$a->strings["Edit contact notes"] = "Editar notas del contacto"; -$a->strings["Block/Unblock contact"] = "Boquear/Desbloquear contacto"; -$a->strings["Ignore contact"] = "Ignorar contacto"; -$a->strings["Repair URL settings"] = "Configuración de reparación de la dirección"; -$a->strings["View conversations"] = "Ver conversaciones"; -$a->strings["Last update:"] = "Última actualización:"; -$a->strings["Update public posts"] = "Actualizar publicaciones públicas"; -$a->strings["Update now"] = "Actualizar ahora"; -$a->strings["Unignore"] = "Quitar de Ignorados"; -$a->strings["Currently blocked"] = "Bloqueados"; -$a->strings["Currently ignored"] = "Ignorados"; -$a->strings["Currently archived"] = "Archivados"; -$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Los comentarios o \"me gusta\" en tus publicaciones públicas todavía <strong>pueden</strong> ser visibles."; -$a->strings["Notification for new posts"] = "Notificacion de nuevos temas."; -$a->strings["Send a notification of every new post of this contact"] = "Enviar una notificacion por nuevos temas de este contacto."; -$a->strings["Blacklisted keywords"] = "Lista negra de palabras"; -$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separada por comas de palabras claves que no deberian ser convertido en #hashtags cuando \"Recaudar informacion y palabras claves\" es seleccionado"; -$a->strings["Actions"] = "Acciones"; -$a->strings["Contact Settings"] = "Ajustes del contacto"; -$a->strings["Suggestions"] = "Sugerencias"; -$a->strings["Suggest potential friends"] = "Amistades potenciales sugeridas"; -$a->strings["Show all contacts"] = "Mostrar todos los contactos"; -$a->strings["Unblocked"] = "Desbloqueados"; -$a->strings["Only show unblocked contacts"] = "Mostrar solo contactos sin bloquear"; -$a->strings["Blocked"] = "Bloqueados"; -$a->strings["Only show blocked contacts"] = "Mostrar solo contactos bloqueados"; -$a->strings["Ignored"] = "Ignorados"; -$a->strings["Only show ignored contacts"] = "Mostrar solo contactos ignorados"; -$a->strings["Archived"] = "Archivados"; -$a->strings["Only show archived contacts"] = "Mostrar solo contactos archivados"; -$a->strings["Hidden"] = "Ocultos"; -$a->strings["Only show hidden contacts"] = "Mostrar solo contactos ocultos"; -$a->strings["Search your contacts"] = "Buscar en tus contactos"; -$a->strings["Update"] = "Actualizar"; -$a->strings["Archive"] = "Archivo"; -$a->strings["Unarchive"] = "Sin archivar"; -$a->strings["Batch Actions"] = "Accones en lote"; -$a->strings["View all contacts"] = "Ver todos los contactos"; -$a->strings["View all common friends"] = "Ver todos los conocidos en común "; -$a->strings["Advanced Contact Settings"] = "Configuración avanzada"; -$a->strings["Mutual Friendship"] = "Amistad recíproca"; -$a->strings["is a fan of yours"] = "es tu fan"; -$a->strings["you are a fan of"] = "eres fan de"; -$a->strings["Toggle Blocked status"] = "Cambiar bloqueados"; -$a->strings["Toggle Ignored status"] = "Cambiar ignorados"; -$a->strings["Toggle Archive status"] = "Cambiar archivados"; -$a->strings["Delete contact"] = "Eliminar contacto"; -$a->strings["Image uploaded but image cropping failed."] = "Imagen recibida, pero ha fallado al recortarla."; -$a->strings["Image size reduction [%s] failed."] = "Ha fallado la reducción de las dimensiones de la imagen [%s]."; -$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recarga la página o limpia la caché del navegador si la foto nueva no aparece inmediatamente."; -$a->strings["Unable to process image"] = "Imposible procesar la imagen"; -$a->strings["Upload File:"] = "Subir archivo:"; -$a->strings["Select a profile:"] = "Elige un perfil:"; -$a->strings["Upload"] = "Subir"; -$a->strings["or"] = "o"; -$a->strings["skip this step"] = "saltar este paso"; -$a->strings["select a photo from your photo albums"] = "elige una foto de tus álbumes"; -$a->strings["Crop Image"] = "Recortar imagen"; -$a->strings["Please adjust the image cropping for optimum viewing."] = "Por favor, ajusta el recorte de la imagen para optimizarla."; -$a->strings["Done Editing"] = "Editado"; -$a->strings["Image uploaded successfully."] = "Imagen subida con éxito."; -$a->strings["Profile deleted."] = "Perfil eliminado."; -$a->strings["Profile-"] = "Perfil-"; -$a->strings["New profile created."] = "Nuevo perfil creado."; -$a->strings["Profile unavailable to clone."] = "Imposible duplicar el perfil."; -$a->strings["Profile Name is required."] = "Se necesita un nombre de perfil."; -$a->strings["Marital Status"] = "Estado civil"; -$a->strings["Romantic Partner"] = "Pareja sentimental"; -$a->strings["Work/Employment"] = "Trabajo/estudios"; -$a->strings["Religion"] = "Religión"; -$a->strings["Political Views"] = "Preferencias políticas"; -$a->strings["Gender"] = "Género"; -$a->strings["Sexual Preference"] = "Orientación sexual"; -$a->strings["XMPP"] = "XMPP"; -$a->strings["Homepage"] = "Página de inicio"; -$a->strings["Interests"] = "Intereses"; -$a->strings["Address"] = "Dirección"; -$a->strings["Location"] = "Ubicación"; -$a->strings["Profile updated."] = "Perfil actualizado."; -$a->strings[" and "] = " y "; -$a->strings["public profile"] = "perfil público"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s cambió su %2\$s a “%3\$s”"; -$a->strings[" - Visit %1\$s's %2\$s"] = " - Visita %1\$s's %2\$s"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s tiene una actualización %2\$s, cambiando %3\$s."; -$a->strings["Hide contacts and friends:"] = "Ocultar contactos y amigos"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar tu lista de contactos/amigos en este perfil?"; -$a->strings["Show more profile fields:"] = "Mostrar mas campos del perfil:"; -$a->strings["Profile Actions"] = "Acciones de perfil"; -$a->strings["Edit Profile Details"] = "Editar detalles de tu perfil"; -$a->strings["Change Profile Photo"] = "Cambiar imagen del Perfil"; -$a->strings["View this profile"] = "Ver este perfil"; -$a->strings["Create a new profile using these settings"] = "¿Crear un nuevo perfil con esta configuración?"; -$a->strings["Clone this profile"] = "Clonar este perfil"; -$a->strings["Delete this profile"] = "Eliminar este perfil"; -$a->strings["Basic information"] = "Información básica"; -$a->strings["Profile picture"] = "Imagen del perfil"; -$a->strings["Preferences"] = "Preferencias"; -$a->strings["Status information"] = "Información del estatus"; -$a->strings["Additional information"] = "Información addicional"; -$a->strings["Relation"] = "Relación"; -$a->strings["Your Gender:"] = "Género:"; -$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\"♥</span> Estado civil:"; -$a->strings["Example: fishing photography software"] = "Ejemplo: pesca fotografía software"; -$a->strings["Profile Name:"] = "Nombres del perfil:"; -$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Éste es tu perfil <strong>público</strong>.<br /><strong>Puede</strong> ser visto por cualquier usuario de internet."; -$a->strings["Your Full Name:"] = "Tu nombre completo:"; -$a->strings["Title/Description:"] = "Título/Descrición:"; -$a->strings["Street Address:"] = "Dirección"; -$a->strings["Locality/City:"] = "Localidad/Ciudad:"; -$a->strings["Region/State:"] = "Región/Estado:"; -$a->strings["Postal/Zip Code:"] = "Código postal:"; -$a->strings["Country:"] = "País"; -$a->strings["Who: (if applicable)"] = "¿Quién? (si es aplicable)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Ejemplos: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Desde [fecha]:"; -$a->strings["Tell us about yourself..."] = "Háblanos sobre ti..."; -$a->strings["XMPP (Jabber) address:"] = "Dirección XMPP (Jabber):"; -$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "La dirección XMPP será propagada entre sus contactos para que puedan seguirle."; -$a->strings["Homepage URL:"] = "Dirección de tu página:"; -$a->strings["Religious Views:"] = "Creencias religiosas:"; -$a->strings["Public Keywords:"] = "Palabras clave públicas:"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Utilizadas para sugerir amigos potenciales, otros pueden verlo)"; -$a->strings["Private Keywords:"] = "Palabras clave privadas:"; -$a->strings["(Used for searching profiles, never shown to others)"] = "(Utilizadas para buscar perfiles, nunca se muestra a otros)"; -$a->strings["Musical interests"] = "Gustos musicales"; -$a->strings["Books, literature"] = "Libros, literatura"; -$a->strings["Television"] = "Televisión"; -$a->strings["Film/dance/culture/entertainment"] = "Películas/baile/cultura/entretenimiento"; -$a->strings["Hobbies/Interests"] = "Aficiones/Intereses"; -$a->strings["Love/romance"] = "Amor/Romance"; -$a->strings["Work/employment"] = "Trabajo/ocupación"; -$a->strings["School/education"] = "Escuela/estudios"; -$a->strings["Contact information and Social Networks"] = "Informacioń de contacto y Redes sociales"; -$a->strings["Edit/Manage Profiles"] = "Editar/Administrar perfiles"; -$a->strings["Display"] = "Interfaz del usuario"; -$a->strings["Social Networks"] = "Redes sociales"; -$a->strings["Connected apps"] = "Aplicaciones conectadas"; -$a->strings["Remove account"] = "Eliminar cuenta"; -$a->strings["Missing some important data!"] = "¡Faltan algunos datos importantes!"; -$a->strings["Failed to connect with email account using the settings provided."] = "Error al conectar con la cuenta de correo mediante la configuración suministrada."; -$a->strings["Email settings updated."] = "Configuración de correo actualizada."; -$a->strings["Features updated"] = "Actualizaciones"; -$a->strings["Relocate message has been send to your contacts"] = "Mensaje de reubicación ha sido enviado a sus contactos."; -$a->strings["Empty passwords are not allowed. Password unchanged."] = "No se permiten contraseñas vacías. La contraseña no ha sido modificada."; -$a->strings["Wrong password."] = "Contraseña incorrecta"; -$a->strings["Password changed."] = "Contraseña modificada."; -$a->strings["Password update failed. Please try again."] = "La actualización de la contraseña ha fallado. Por favor, prueba otra vez."; -$a->strings[" Please use a shorter name."] = " Usa un nombre más corto."; -$a->strings[" Name too short."] = " Nombre demasiado corto."; -$a->strings["Wrong Password"] = "Contraseña incorrecta"; -$a->strings[" Not valid email."] = " Correo no válido."; -$a->strings[" Cannot change to that email."] = " No se puede usar ese correo."; -$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "El foro privado no tiene permisos de privacidad. Usando el grupo de privacidad por defecto."; -$a->strings["Private forum has no privacy permissions and no default privacy group."] = "El foro privado no tiene permisos de privacidad ni grupo por defecto de privacidad."; -$a->strings["Settings updated."] = "Configuración actualizada."; -$a->strings["Add application"] = "Agregar aplicación"; -$a->strings["Consumer Key"] = "Clave del consumidor"; -$a->strings["Consumer Secret"] = "Secreto del consumidor"; -$a->strings["Redirect"] = "Redirigir"; -$a->strings["Icon url"] = "Dirección del ícono"; -$a->strings["You can't edit this application."] = "No puedes editar esta aplicación."; -$a->strings["Connected Apps"] = "Aplicaciones conectadas"; -$a->strings["Client key starts with"] = "Clave de cliente comienza por"; -$a->strings["No name"] = "Sin nombre"; -$a->strings["Remove authorization"] = "Suprimir la autorización"; -$a->strings["No Plugin settings configured"] = "No se ha configurado ningún módulo"; -$a->strings["Plugin Settings"] = "Configuración de los módulos"; -$a->strings["Additional Features"] = "Características adicionales"; -$a->strings["General Social Media Settings"] = "Configuración general de social media "; -$a->strings["Disable intelligent shortening"] = "Deshabilitar recorte inteligente de URL"; -$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normalemente el sistema intenta de encontrara el mejor enlace para agregar a envíos recortados (twitter, OStatus). Si esta opción se encuentra habilitado, todo envío recortado apuntara siempre al tema original en friendica."; -$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automáticamente seguir cualquier GNUsocial (OStatus) seguidores o menciones "; -$a->strings["If you receive a message from an unknown OStatus user, this option decides what to do. If it is checked, a new contact will be created for every unknown user."] = "Cuando se recibe un mensaje de un perfil desconocido de OStatus, esta opción define que hacer.\nSi es habilitado, un nuevo contacto sera creado para cada usuario."; -$a->strings["Default group for OStatus contacts"] = "Grupo por defecto para contactos OStatus"; -$a->strings["Your legacy GNU Social account"] = "Tu cuenta GNU social conectada"; -$a->strings["If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done."] = "Si agrega su viejo nombre de perfil GNUsocial/Statusnet aqui (en el formato de usuario@dominio.tld), sus contactos serán añadidos automáticamente.\nEl campo sera vaciado cuando termine el proceso. "; -$a->strings["Repair OStatus subscriptions"] = "Reparar subscripciones de OStatus"; -$a->strings["Built-in support for %s connectivity is %s"] = "El soporte integrado de conexión con %s está %s"; -$a->strings["enabled"] = "habilitado"; -$a->strings["disabled"] = "deshabilitado"; -$a->strings["GNU Social (OStatus)"] = "GNUsocial (OStatus)"; -$a->strings["Email access is disabled on this site."] = "El acceso por correo está deshabilitado en esta web."; -$a->strings["Email/Mailbox Setup"] = "Configuración del correo/buzón"; -$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Si quieres comunicarte con tus contactos de correo usando este servicio (opcional), por favor, especifica cómo conectar con tu buzón."; -$a->strings["Last successful email check:"] = "Última comprobación del correo con éxito:"; -$a->strings["IMAP server name:"] = "Nombre del servidor IMAP:"; -$a->strings["IMAP port:"] = "Puerto IMAP:"; -$a->strings["Security:"] = "Seguridad:"; -$a->strings["None"] = "Ninguna"; -$a->strings["Email login name:"] = "Nombre de usuario:"; -$a->strings["Email password:"] = "Contraseña:"; -$a->strings["Reply-to address:"] = "Dirección de respuesta:"; -$a->strings["Send public posts to all email contacts:"] = "Enviar publicaciones públicas a todos los contactos de correo:"; -$a->strings["Action after import:"] = "Acción después de importar:"; -$a->strings["Move to folder"] = "Mover a un directorio"; -$a->strings["Move to folder:"] = "Mover al directorio:"; -$a->strings["Display Settings"] = "Configuración Tema/Visualización"; -$a->strings["Display Theme:"] = "Utilizar tema:"; -$a->strings["Mobile Theme:"] = "Tema móvil:"; -$a->strings["Suppress warning of insecure networks"] = "Suprimir el aviso de redes inseguras"; -$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Debería el sistema suprimir el aviso de que el grupo actual contiene miembros de redes que no pueden recibir publicaciones públicas."; -$a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos"; -$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimo 10 segundos. Ingrese -1 para deshabilitar."; -$a->strings["Number of items to display per page:"] = "Número de elementos a mostrar por página:"; -$a->strings["Maximum of 100 items"] = "Máximo 100 elementos"; -$a->strings["Number of items to display per page when viewed from mobile device:"] = "Cantidad de objetos a visualizar cuando se usa un movil"; -$a->strings["Don't show emoticons"] = "No mostrar emoticones"; -$a->strings["Calendar"] = "Calendario"; -$a->strings["Beginning of week:"] = "Principio de la semana:"; -$a->strings["Don't show notices"] = "No mostrara avisos"; -$a->strings["Infinite scroll"] = "pagina infinita (sroll)"; -$a->strings["Automatic updates only at the top of the network page"] = "Actualizaciones automaticas solo estando al principio de la pagina"; -$a->strings["Bandwith Saver Mode"] = "Modo de guardado de ancho de banda"; -$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Cuando está habilitado, el contenido incrustado no se muestra en las actualizaciones automáticas, sólo en las páginas recargadas."; -$a->strings["General Theme Settings"] = "Ajustes generales de tema"; -$a->strings["Custom Theme Settings"] = "Ajustes personalizados de tema"; -$a->strings["Content Settings"] = "Ajustes de contenido"; -$a->strings["Theme settings"] = "Configuración del Tema"; -$a->strings["Account Types"] = "Tipos de cuenta"; -$a->strings["Personal Page Subtypes"] = "Subtipos de página personal"; -$a->strings["Community Forum Subtypes"] = "Subtipos de foro de comunidad"; -$a->strings["Personal Page"] = "Página personal"; -$a->strings["This account is a regular personal profile"] = "Esta cuenta es un perfil personal corriente"; -$a->strings["Organisation Page"] = "Página de organización"; -$a->strings["This account is a profile for an organisation"] = "Esta cuenta es un perfil de una organización"; -$a->strings["News Page"] = "Página de noticias"; -$a->strings["This account is a news account/reflector"] = "Esta cuenta es una cuenta de noticias/reflectora"; -$a->strings["Community Forum"] = "Foro de la comunidad"; -$a->strings["This account is a community forum where people can discuss with each other"] = "Esta cuenta es un foro de comunidad donde la gente puede debatir con otros"; -$a->strings["Normal Account Page"] = "Página de cuenta normal"; -$a->strings["This account is a normal personal profile"] = "Esta cuenta es el perfil personal normal"; -$a->strings["Soapbox Page"] = "Página de tribuna"; -$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Acepta automáticamente todas las peticiones de conexión/amistad como seguidores de solo-lectura"; -$a->strings["Public Forum"] = "Foro público"; -$a->strings["Automatically approve all contact requests"] = "Aprovar autimáticamente todas las solicitudes de contacto"; -$a->strings["Automatic Friend Page"] = "Página de Amistad autómatica"; -$a->strings["Automatically approve all connection/friend requests as friends"] = "Aceptar automáticamente todas las solicitudes de conexión/amistad como amigos"; -$a->strings["Private Forum [Experimental]"] = "Foro privado [Experimental]"; -$a->strings["Private forum - approved members only"] = "Foro privado - solo miembros"; -$a->strings["OpenID:"] = "OpenID:"; -$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcional) Permitir a este OpenID acceder a esta cuenta."; -$a->strings["Publish your default profile in your local site directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio local del sitio?"; -$a->strings["Your profile may be visible in public."] = ""; -$a->strings["Publish your default profile in the global social directory?"] = "¿Quieres publicar tu perfil predeterminado en el directorio social de forma global?"; -$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "¿Quieres ocultar tu lista de contactos/amigos en la vista de tu perfil predeterminado?"; -$a->strings["If enabled, posting public messages to Diaspora and other networks isn't possible."] = "Si habilitado, enviar temas públicos a a Diaspora* y otras redes no es posible. "; -$a->strings["Allow friends to post to your profile page?"] = "¿Permites que tus amigos publiquen en tu página de perfil?"; -$a->strings["Allow friends to tag your posts?"] = "¿Permites a los amigos etiquetar tus publicaciones?"; -$a->strings["Allow us to suggest you as a potential friend to new members?"] = "¿Nos permite recomendarte como amigo potencial a los nuevos miembros?"; -$a->strings["Permit unknown people to send you private mail?"] = "¿Permites que desconocidos te manden correos privados?"; -$a->strings["Profile is <strong>not published</strong>."] = "El perfil <strong>no está publicado</strong>."; -$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Su dirección de identidad es <strong>'%s'</strong> o '%s'."; -$a->strings["Automatically expire posts after this many days:"] = "Las publicaciones expirarán automáticamente después de estos días:"; -$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Si lo dejas vacío no expirarán nunca. Las publicaciones que hayan expirado se borrarán"; -$a->strings["Advanced expiration settings"] = "Configuración avanzada de expiración"; -$a->strings["Advanced Expiration"] = "Expiración avanzada"; -$a->strings["Expire posts:"] = "¿Expiran las publicaciones?"; -$a->strings["Expire personal notes:"] = "¿Expiran las notas personales?"; -$a->strings["Expire starred posts:"] = "¿Expiran los favoritos?"; -$a->strings["Expire photos:"] = "¿Expiran las fotografías?"; -$a->strings["Only expire posts by others:"] = "Solo expiran los mensajes de los demás:"; -$a->strings["Account Settings"] = "Configuración de la cuenta"; -$a->strings["Password Settings"] = "Configuración de la contraseña"; -$a->strings["Leave password fields blank unless changing"] = "Deja la contraseña en blanco si no quieres cambiarla"; -$a->strings["Current Password:"] = "Contraseña actual:"; -$a->strings["Your current password to confirm the changes"] = "Su contraseña actual para confirmar los cambios."; -$a->strings["Password:"] = "Contraseña:"; -$a->strings["Basic Settings"] = "Configuración básica"; -$a->strings["Email Address:"] = "Dirección de correo:"; -$a->strings["Your Timezone:"] = "Zona horaria:"; -$a->strings["Your Language:"] = "Tu idioma:"; -$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Selecciona el idioma que se usara para la interfaz del usuario y para el envío de correo."; -$a->strings["Default Post Location:"] = "Localización predeterminada:"; -$a->strings["Use Browser Location:"] = "Usar localización del navegador:"; -$a->strings["Security and Privacy Settings"] = "Configuración de seguridad y privacidad"; -$a->strings["Maximum Friend Requests/Day:"] = "Máximo número de peticiones de amistad por día:"; -$a->strings["(to prevent spam abuse)"] = "(para prevenir el abuso de spam)"; -$a->strings["Default Post Permissions"] = "Permisos por defecto para las publicaciones"; -$a->strings["(click to open/close)"] = "(pulsa para abrir/cerrar)"; -$a->strings["Default Private Post"] = "Publicación Privada por defecto"; -$a->strings["Default Public Post"] = "Publicación Pública por defecto"; -$a->strings["Default Permissions for New Posts"] = "Permisos por defecto para nuevas publicaciones"; -$a->strings["Maximum private messages per day from unknown people:"] = "Número máximo de mensajes diarios para desconocidos:"; -$a->strings["Notification Settings"] = "Configuración de notificaciones"; -$a->strings["By default post a status message when:"] = "Publicar en tu estado cuando:"; -$a->strings["accepting a friend request"] = "aceptes una solicitud de amistad"; -$a->strings["joining a forum/community"] = "te unas a un foro/comunidad"; -$a->strings["making an <em>interesting</em> profile change"] = "hagas un cambio <em>interesante</em> en tu perfil"; -$a->strings["Send a notification email when:"] = "Enviar notificación por correo cuando:"; -$a->strings["You receive an introduction"] = "Recibas una presentación"; -$a->strings["Your introductions are confirmed"] = "Tu presentación sea confirmada"; -$a->strings["Someone writes on your profile wall"] = "Alguien escriba en el muro de mi perfil"; -$a->strings["Someone writes a followup comment"] = "Algien escriba en un comentario que sigo"; -$a->strings["You receive a private message"] = "Recibas un mensaje privado"; -$a->strings["You receive a friend suggestion"] = "Recibas una sugerencia de amistad"; -$a->strings["You are tagged in a post"] = "Seas etiquetado en una publicación"; -$a->strings["You are poked/prodded/etc. in a post"] = "Te han tocado/empujado/etc. en una publicación"; -$a->strings["Activate desktop notifications"] = "Activar notificaciones en pantalla."; -$a->strings["Show desktop popup on new notifications"] = "Mostrar notificaciones emergentes en caso de nuevos eventos."; -$a->strings["Text-only notification emails"] = "Notificaciones e-mail de solo texto"; -$a->strings["Send text only notification emails, without the html part"] = "Enviar las notificaciones por correo con formato de solo texto sin html."; -$a->strings["Advanced Account/Page Type Settings"] = "Configuración avanzada de tipo de Cuenta/Página"; -$a->strings["Change the behaviour of this account for special situations"] = "Cambiar el comportamiento de esta cuenta para situaciones especiales"; -$a->strings["Relocate"] = "Relocalizar"; -$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Si ha migrado este perfil desde otro servidor aquí y algunos contactos no reciben sus publicaciones intente recomunicar su ubicación a traves este botón. (Como para decir el botón de los botones)"; -$a->strings["Resend relocate message to contacts"] = "Reenviar mensaje de relocalización a los contactos"; $a->strings["via"] = "vía"; +$a->strings["Delete this item?"] = "¿Eliminar este elemento?"; +$a->strings["show fewer"] = "ver menos"; $a->strings["greenzero"] = "greenzero"; $a->strings["purplezero"] = "purplezero"; $a->strings["easterbunny"] = "easterbunny"; @@ -2011,14 +2013,6 @@ $a->strings["darkzero"] = "darkzero"; $a->strings["comix"] = "comix"; $a->strings["slackr"] = "slackr"; $a->strings["Variations"] = "Variaciones"; -$a->strings["Repeat the image"] = "Repetir la imagen"; -$a->strings["Will repeat your image to fill the background."] = "Repetirá su imagen para llenar el fondo"; -$a->strings["Stretch"] = "Estirar"; -$a->strings["Will stretch to width/height of the image."] = "Estirará la anchura/altura de la imagen."; -$a->strings["Resize fill and-clip"] = "Reajustar llenado y clip"; -$a->strings["Resize to fill and retain aspect ratio."] = "Reajustar para llenar y conservar proporción"; -$a->strings["Resize best fit"] = "Reajustar al mejor tamaño"; -$a->strings["Resize to best fit and retain aspect ratio."] = "Reajustar al mejor tamaño y conservar proporción"; $a->strings["Default"] = "Por defecto"; $a->strings["Note: "] = "Nota:"; $a->strings["Check image permissions if all users are allowed to visit the image"] = "Compruebe los permisos de imagen si se les permite a todos los usuarios visitar la imagen"; @@ -2029,6 +2023,14 @@ $a->strings["Link color"] = "Color de enlace"; $a->strings["Set the background color"] = "Seleccionar el color de fondo"; $a->strings["Content background transparency"] = "Transparencia de contenido de fondo"; $a->strings["Set the background image"] = "Seleccionar la imagen de fondo"; +$a->strings["Repeat the image"] = "Repetir la imagen"; +$a->strings["Will repeat your image to fill the background."] = "Repetirá su imagen para llenar el fondo"; +$a->strings["Stretch"] = "Estirar"; +$a->strings["Will stretch to width/height of the image."] = "Estirará la anchura/altura de la imagen."; +$a->strings["Resize fill and-clip"] = "Reajustar llenado y clip"; +$a->strings["Resize to fill and retain aspect ratio."] = "Reajustar para llenar y conservar proporción"; +$a->strings["Resize best fit"] = "Reajustar al mejor tamaño"; +$a->strings["Resize to best fit and retain aspect ratio."] = "Reajustar al mejor tamaño y conservar proporción"; $a->strings["Guest"] = "Invitado"; $a->strings["Visitor"] = "Visitante"; $a->strings["Alignment"] = "Alineación"; @@ -2047,9 +2049,6 @@ $a->strings["Find Friends"] = "Buscar amigos"; $a->strings["Last users"] = "Últimos usuarios"; $a->strings["Local Directory"] = "Directorio local"; $a->strings["Quick Start"] = "Inicio rápido"; -$a->strings["Delete this item?"] = "¿Eliminar este elemento?"; -$a->strings["show fewer"] = "ver menos"; -$a->strings["toggle mobile"] = "Cambiar a versión móvil"; $a->strings["Update %s failed. See error logs."] = "Falló la actualización de %s. Mira los registros de errores."; $a->strings["Create a New Account"] = "Crear una nueva cuenta"; $a->strings["Password: "] = "Contraseña: "; @@ -2060,3 +2059,4 @@ $a->strings["Website Terms of Service"] = "Términos de uso del sitio"; $a->strings["terms of service"] = "Términos de uso"; $a->strings["Website Privacy Policy"] = "Política de privacidad del sitio"; $a->strings["privacy policy"] = "Política de privacidad"; +$a->strings["toggle mobile"] = "Cambiar a versión móvil"; From d535864d981bb7b1b0afaee86b55058b6e53fe87 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 7 Jul 2017 10:37:36 +0200 Subject: [PATCH 138/160] added template for delete item --- view/templates/admin_deleteitem.tpl | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 view/templates/admin_deleteitem.tpl diff --git a/view/templates/admin_deleteitem.tpl b/view/templates/admin_deleteitem.tpl new file mode 100644 index 0000000000..cf819dea67 --- /dev/null +++ b/view/templates/admin_deleteitem.tpl @@ -0,0 +1,11 @@ +<div id="adminpage"> + <h1>{{$title}} - {{$page}}</h1> + <p>{{$intro1}}</p> + <p>{{$intro2}}</p> +</div> + +<form action="{{$baseurl}}/admin/deleteitem" method="post"> + <input type="hidden" name="form_security_token" value="{{$form_security_token}}"> + {{include file="field_input.tpl" field=$deleteitemguid}} + <div class="submit"><input type="submit" name="page_deleteitem_submit" value="{{$submit}}" /></div> +</form> From aabde5422bc079a37bcd13d362f62656a66be02b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 7 Jul 2017 10:38:07 +0200 Subject: [PATCH 139/160] allow the admin to delete an item by GUID from the admin panel --- mod/admin.php | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/mod/admin.php b/mod/admin.php index a32accaf9a..b75c802cfb 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -113,6 +113,9 @@ function admin_post(App $a) { case 'blocklist': admin_page_blocklist_post($a); break; + case 'deleteitem': + admin_page_deleteitem_post($a); + break; } } @@ -172,6 +175,7 @@ function admin_content(App $a) { 'queue' => array("admin/queue/", t('Inspect Queue'), "queue"), 'blocklist' => array("admin/blocklist/", t('Server Blocklist'), "blocklist"), 'federation' => array("admin/federation/", t('Federation Statistics'), "federation"), + 'deleteitem' => array("admin/deleteitem/", t('Delete Item'), 'deleteitem'), ); /* get plugins admin page */ @@ -244,6 +248,9 @@ function admin_content(App $a) { case 'blocklist': $o = admin_page_blocklist($a); break; + case 'deleteitem': + $o = admin_page_deleteitem($a); + break; default: notice(t("Item not found.")); } @@ -348,6 +355,69 @@ function admin_page_blocklist_post(App $a) { return; // NOTREACHED } +/** + * @brief Subpage where the admin can delete a item from their node given the GUID + * + * This subpage of the admin panel offers the nodes admin to delete an item frim + * the node, given the GUID or the display URL such as http://example.com/display/123456. + * The idem will then be marked as deleted in the database and processed accordingly. + * + * @param App $a + * @return string + */ +function admin_page_deleteitem(App $a) { + $t = get_markup_template("admin_deleteitem.tpl"); + + return replace_macros($t, array( + '$title' => t('Administration'), + '$page' => t('Delete Item'), + '$submit' => t('Delete this Item'), + '$intro1' => t('On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'), + '$intro2' => t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'), + '$deleteitemguid' => array('deleteitemguid', t("GUID"), '', t("The GUID of the item you want to delete."), 'required', 'autofocus'), + '$baseurl' => App::get_baseurl(), + '$form_security_token' => get_form_security_token("admin_deleteitem") + )); +} +/** + * @brief Process send data from Admin Delete Item Page + * + * The GUID passed through the form should be only the GUID. But we also parse + * URLs like the full /display URL to make the process more easy for the admin. + * + * @param App $a + */ +function admin_page_deleteitem_post(App $a) { + if (!x($_POST['page_deleteitem_submit'])) { + return; + } + + check_form_security_token_redirectOnErr('/admin/deleteitem/', 'admin_deleteitem'); + if (x($_POST['page_deleteitem_submit'])) { + $guid = trim(notags($_POST['deleteitemguid'])); + // The GUID should not include a "/", so if there is one, we got an URL + // and the last part of it is most likely the GUID. + if (strpos($guid, '/')) { + $guid = substr($guid, strrpos($guid, '/')+1); + } + // Now that we have the GUID, get the ID and the PARENT ID of the posting + // to determine if it is a top level posting or a comment. If it is a top + // level posting, we also need to delete the corresponding thread. + dba::update('item', array('deleted' => true), array('guid' => (int)$guid)); + $r = qu("SELECT id, parent FROM item WHERE guid='%s'",$guid); + if (dbm::is_result($r)) { + $rr = $r[0]; + if ($rr['id'] == $rr['parent']) { + dba::update('thread', array('deleted' => true), array('iid' => (int)$rr['id'])); + } + } + } + + info(t('Item marked for deletion.').EOL); + goaway('admin/deleteitem'); + return; // NOTREACHED +} + /** * @brief Subpage with some stats about "the federation" network * From 84972623f766a280a5b2901f3bac9dc9b0334a0b Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk> Date: Fri, 7 Jul 2017 18:26:43 +0200 Subject: [PATCH 140/160] Order of semaphore processing --- src/Util/Lock.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index ca75b0d666..82d2fdda91 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -160,9 +160,9 @@ class Lock { if (empty(self::$semaphore[$fn_name])) { return false; } else { - $rid = self::$semaphore[$fn_name]; + $success = @sem_release(self::$semaphore[$fn_name]); self::$semaphore[$fn_name] = 0; - return @sem_release($rid); + return $success; } } From 9304bb64226c6dacc996a59901e22838c396771a Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Fri, 7 Jul 2017 20:54:26 +0200 Subject: [PATCH 141/160] Typos --- mod/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index b75c802cfb..58306374dd 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -356,11 +356,11 @@ function admin_page_blocklist_post(App $a) { } /** - * @brief Subpage where the admin can delete a item from their node given the GUID + * @brief Subpage where the admin can delete an item from their node given the GUID * - * This subpage of the admin panel offers the nodes admin to delete an item frim + * This subpage of the admin panel offers the nodes admin to delete an item from * the node, given the GUID or the display URL such as http://example.com/display/123456. - * The idem will then be marked as deleted in the database and processed accordingly. + * The item will then be marked as deleted in the database and processed accordingly. * * @param App $a * @return string From 080da4777d65f62a4f1a21fe7a23891454ee8e75 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite <alexandre.alapetite@alexandra.dk> Date: Sat, 8 Jul 2017 11:03:41 +0200 Subject: [PATCH 142/160] Use unset after unlock https://github.com/friendica/friendica/pull/3554#issuecomment-313741392 --- src/Util/Lock.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Util/Lock.php b/src/Util/Lock.php index 82d2fdda91..754a45ed9e 100644 --- a/src/Util/Lock.php +++ b/src/Util/Lock.php @@ -161,7 +161,7 @@ class Lock { return false; } else { $success = @sem_release(self::$semaphore[$fn_name]); - self::$semaphore[$fn_name] = 0; + unset(self::$semaphore[$fn_name]); return $success; } } From 11d271f3c5c43feffd6f858d5787e6e4ae0319d2 Mon Sep 17 00:00:00 2001 From: Dean Townsley <dean@townsley.com> Date: Sat, 8 Jul 2017 09:55:40 -0500 Subject: [PATCH 143/160] Only delete uid=0 entries when cleaning up extra public entries This delete can inadvertently remove contacts from normal users under some conditions. Since it appears to be intended to only operate on "public" (uid=0) contacts, this change constrains the delete query to only uid=0 records. --- include/Contact.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/Contact.php b/include/Contact.php index 0aeabc9725..f99b0d5d0f 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -637,7 +637,7 @@ function get_contact($url, $uid = 0, $no_update = false) { } if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $url != "") { - q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`", + q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 AND `id` != %d AND NOT `self`", dbesc(normalise_link($url)), intval($contact_id)); } From 11c5f471af57ad59e51db149eb98eb00654e9115 Mon Sep 17 00:00:00 2001 From: Thomas Willingham <beardyunixer@beardyunixer.com> Date: Sat, 8 Jul 2017 16:25:13 +0100 Subject: [PATCH 144/160] Fix/workaround weird load order issue. --- boot.php | 74 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/boot.php b/boot.php index 76646f7483..b69fd91c45 100644 --- a/boot.php +++ b/boot.php @@ -1392,6 +1392,43 @@ function get_server() { return($server); } +function get_temppath() { + $a = get_app(); + + $temppath = get_config("system", "temppath"); + + if (($temppath != "") && App::directory_usable($temppath)) { + // We have a temp path and it is usable + return $temppath; + } + + // We don't have a working preconfigured temp path, so we take the system path. + $temppath = sys_get_temp_dir(); + + // Check if it is usable + if (($temppath != "") && App::directory_usable($temppath)) { + // To avoid any interferences with other systems we create our own directory + $new_temppath = $temppath . "/" . $a->get_hostname(); + if (!is_dir($new_temppath)) { + /// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method? + mkdir($new_temppath); + } + + if (App::directory_usable($new_temppath)) { + // The new path is usable, we are happy + set_config("system", "temppath", $new_temppath); + return $new_temppath; + } else { + // We can't create a subdirectory, strange. + // But the directory seems to work, so we use it but don't store it. + return $temppath; + } + } + + // Reaching this point means that the operating system is configured badly. + return ''; +} + function get_cachefile($file, $writemode = true) { $cache = get_itemcachepath(); @@ -1514,43 +1551,6 @@ function get_spoolpath() { return ""; } -function get_temppath() { - $a = get_app(); - - $temppath = get_config("system", "temppath"); - - if (($temppath != "") && App::directory_usable($temppath)) { - // We have a temp path and it is usable - return $temppath; - } - - // We don't have a working preconfigured temp path, so we take the system path. - $temppath = sys_get_temp_dir(); - - // Check if it is usable - if (($temppath != "") && App::directory_usable($temppath)) { - // To avoid any interferences with other systems we create our own directory - $new_temppath = $temppath . "/" . $a->get_hostname(); - if (!is_dir($new_temppath)) { - /// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method? - mkdir($new_temppath); - } - - if (App::directory_usable($new_temppath)) { - // The new path is usable, we are happy - set_config("system", "temppath", $new_temppath); - return $new_temppath; - } else { - // We can't create a subdirectory, strange. - // But the directory seems to work, so we use it but don't store it. - return $temppath; - } - } - - // Reaching this point means that the operating system is configured badly. - return ''; -} - /// @deprecated function set_template_engine(App $a, $engine = 'internal') { /// @note This function is no longer necessary, but keep it as a wrapper to the class method From 534f79a5a5f869658bea7a7219b22ae06fcc951c Mon Sep 17 00:00:00 2001 From: irhen <irhen@users.noreply.github.com> Date: Sat, 8 Jul 2017 23:30:30 +0300 Subject: [PATCH 145/160] fix big age --- include/identity.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/identity.php b/include/identity.php index a6db963ddf..66f7f569f9 100644 --- a/include/identity.php +++ b/include/identity.php @@ -656,8 +656,10 @@ function advanced_profile(App $a) { $profile['birthday'] = array( t('Birthday:'), $val); } - - if ($age = age($a->profile['dob'],$a->profile['timezone'],'')) { + if ($a->profile['dob'] + && $a->profile['dob'] > '0001-01-01' + && $age = age($a->profile['dob'], $a->profile['timezone'], '') + ) { $profile['age'] = array( t('Age:'), $age ); } From af181941db2aafd20b66234faaa3342e6a6bae59 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 9 Jul 2017 03:37:20 +0000 Subject: [PATCH 146/160] Split the delete process into a separate expire process --- include/expire.php | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/include/expire.php b/include/expire.php index b8295c2ef0..bb0129aad6 100644 --- a/include/expire.php +++ b/include/expire.php @@ -11,7 +11,23 @@ function expire_run(&$argv, &$argc){ load_hooks(); - if (($argc == 2) && (intval($argv[1]) > 0)) { + if (($argc == 2) && ($argv[1] == 'delete')) { + logger('Delete expired items', LOGGER_DEBUG); + // physically remove anything that has been deleted for more than two months + $r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); + while ($row = dba::fetch($r)) { + dba::delete('item', array('id' => $row['id'])); + } + dba::close($r); + + logger('Delete expired items - done', LOGGER_DEBUG); + + // make this optional as it could have a performance impact on large sites + if (intval(get_config('system', 'optimize_items'))) { + q("OPTIMIZE TABLE `item`"); + } + return; + } elseif (($argc == 2) && (intval($argv[1]) > 0)) { $user = dba::select('user', array('uid', 'username', 'expire'), array('uid' => $argv[1]), array('limit' => 1)); if (dbm::is_result($user)) { logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], LOGGER_DEBUG); @@ -29,20 +45,11 @@ function expire_run(&$argv, &$argc){ return; } - // physically remove anything that has been deleted for more than two months - $r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"); - while ($row = dba::fetch($r)) { - dba::delete('item', array('id' => $row['id'])); - } - dba::close($r); - - // make this optional as it could have a performance impact on large sites - if (intval(get_config('system', 'optimize_items'))) { - q("OPTIMIZE TABLE `item`"); - } - logger('expire: start'); + proc_run(array('priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true), + 'include/expire.php', 'delete'); + $r = dba::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0"); while ($row = dba::fetch($r)) { logger('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', LOGGER_DEBUG); From 9f92fddb00fe3930e49d03981efda170b2e08d14 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Sun, 9 Jul 2017 04:29:35 +0000 Subject: [PATCH 147/160] DFRN: Update the public item copy as well --- include/dfrn.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/dfrn.php b/include/dfrn.php index bc62de6ed9..78802563a6 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1958,7 +1958,7 @@ class dfrn { return false; } - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)", dbesc($item["title"]), dbesc($item["body"]), dbesc($item["tag"]), @@ -1979,12 +1979,12 @@ class dfrn { // update last-child if it changes if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) { - $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", + $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", dbesc(datetime_convert()), dbesc($item["parent-uri"]), intval($importer["importer_uid"]) ); - $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", + $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)", intval($item["last-child"]), dbesc(datetime_convert()), dbesc($item["uri"]), @@ -2744,7 +2744,7 @@ class dfrn { if ($entrytype == DFRN_TOP_LEVEL) { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '', `title` = '' - WHERE `parent-uri` = '%s' AND `uid` = %d", + WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", dbesc($when), dbesc(datetime_convert()), dbesc($uri), @@ -2756,7 +2756,7 @@ class dfrn { } else { $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '', `title` = '' - WHERE `uri` = '%s' AND `uid` = %d", + WHERE `uri` = '%s' AND `uid` IN (0, %d)", dbesc($when), dbesc(datetime_convert()), dbesc($uri), @@ -2767,7 +2767,7 @@ class dfrn { update_thread_uri($uri, $importer["importer_uid"]); if ($item["last-child"]) { // ensure that last-child is set in case the comment that had it just got wiped. - q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", + q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)", dbesc(datetime_convert()), dbesc($item["parent-uri"]), intval($item["uid"]) From c6137ca0dfe3b132feb8bbee1624376011837e86 Mon Sep 17 00:00:00 2001 From: irhen <irhen@users.noreply.github.com> Date: Mon, 10 Jul 2017 14:17:06 +0300 Subject: [PATCH 148/160] is empty check --- include/identity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/identity.php b/include/identity.php index 66f7f569f9..5de5c919dc 100644 --- a/include/identity.php +++ b/include/identity.php @@ -656,7 +656,7 @@ function advanced_profile(App $a) { $profile['birthday'] = array( t('Birthday:'), $val); } - if ($a->profile['dob'] + if (!empty($a->profile['dob']) && $a->profile['dob'] > '0001-01-01' && $age = age($a->profile['dob'], $a->profile['timezone'], '') ) { From dc41ac0f61da0f4bd7c4a5a692a63d8a49310a33 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 10 Jul 2017 14:55:40 +0200 Subject: [PATCH 149/160] use drop_item and some magic --- mod/admin.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 58306374dd..6865b55383 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -11,6 +11,7 @@ use Friendica\Core\Config; require_once("include/enotify.php"); require_once("include/text.php"); +require_once('include/items.php'); /** * @brief Process send data from the admin panels subpages @@ -393,6 +394,7 @@ function admin_page_deleteitem_post(App $a) { } check_form_security_token_redirectOnErr('/admin/deleteitem/', 'admin_deleteitem'); + if (x($_POST['page_deleteitem_submit'])) { $guid = trim(notags($_POST['deleteitemguid'])); // The GUID should not include a "/", so if there is one, we got an URL @@ -400,17 +402,14 @@ function admin_page_deleteitem_post(App $a) { if (strpos($guid, '/')) { $guid = substr($guid, strrpos($guid, '/')+1); } - // Now that we have the GUID, get the ID and the PARENT ID of the posting - // to determine if it is a top level posting or a comment. If it is a top - // level posting, we also need to delete the corresponding thread. - dba::update('item', array('deleted' => true), array('guid' => (int)$guid)); - $r = qu("SELECT id, parent FROM item WHERE guid='%s'",$guid); - if (dbm::is_result($r)) { - $rr = $r[0]; - if ($rr['id'] == $rr['parent']) { - dba::update('thread', array('deleted' => true), array('iid' => (int)$rr['id'])); - } + // Now that we have the GUID get all IDs of the associated entries in the + // item table of the DB and drop those items, which will also delete the + // associated threads. + $r = dba::select('item', array('id'), array('guid'=>$guid)); + while ($row = dba::fetch($r)) { + drop_item($row['id'], false); } + dba::close($r); } info(t('Item marked for deletion.').EOL); From e88a999a72dd362a66d7ee38611c0fc452f0cca2 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 10 Jul 2017 18:59:59 +0200 Subject: [PATCH 150/160] regenerated master messages.po file --- util/messages.po | 3721 +++++++++++++++++++++++----------------------- 1 file changed, 1879 insertions(+), 1842 deletions(-) diff --git a/util/messages.po b/util/messages.po index 41ef1f3185..65c48bcca8 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-06-19 16:23+0700\n" +"POT-Creation-Date: 2017-07-10 18:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,327 +18,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: include/ForumManager.php:116 include/nav.php:133 include/text.php:1094 -#: view/theme/vier/theme.php:248 -msgid "Forums" -msgstr "" - -#: include/ForumManager.php:118 view/theme/vier/theme.php:250 -msgid "External link to forum" -msgstr "" - -#: include/ForumManager.php:121 include/contact_widgets.php:271 -#: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: src/App.php:507 view/theme/vier/theme.php:253 -msgid "show more" -msgstr "" - -#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 -#: include/event.php:459 -msgid "Starts:" -msgstr "" - -#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 -#: include/event.php:460 -msgid "Finishes:" -msgstr "" - -#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 -#: include/event.php:461 include/identity.php:342 mod/directory.php:135 -#: mod/notifications.php:246 mod/contacts.php:639 mod/events.php:496 -msgid "Location:" -msgstr "" - -#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 -msgid "Miscellaneous" -msgstr "" - -#: include/datetime.php:196 include/identity.php:656 -msgid "Birthday:" -msgstr "" - -#: include/datetime.php:198 mod/profiles.php:724 -msgid "Age: " -msgstr "" - -#: include/datetime.php:200 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: include/datetime.php:370 -msgid "never" -msgstr "" - -#: include/datetime.php:376 -msgid "less than a second ago" -msgstr "" - -#: include/datetime.php:379 -msgid "year" -msgstr "" - -#: include/datetime.php:379 -msgid "years" -msgstr "" - -#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 -#: mod/events.php:387 -msgid "month" -msgstr "" - -#: include/datetime.php:380 -msgid "months" -msgstr "" - -#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 -#: mod/events.php:388 -msgid "week" -msgstr "" - -#: include/datetime.php:381 -msgid "weeks" -msgstr "" - -#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 -#: mod/events.php:389 -msgid "day" -msgstr "" - -#: include/datetime.php:382 -msgid "days" -msgstr "" - -#: include/datetime.php:383 -msgid "hour" -msgstr "" - -#: include/datetime.php:383 -msgid "hours" -msgstr "" - -#: include/datetime.php:384 -msgid "minute" -msgstr "" - -#: include/datetime.php:384 -msgid "minutes" -msgstr "" - -#: include/datetime.php:385 -msgid "second" -msgstr "" - -#: include/datetime.php:385 -msgid "seconds" -msgstr "" - -#: include/datetime.php:394 -#, php-format -msgid "%1$d %2$s ago" -msgstr "" - -#: include/datetime.php:620 -#, php-format -msgid "%s's birthday" -msgstr "" - -#: include/datetime.php:621 include/dfrn.php:1310 -#, php-format -msgid "Happy Birthday %s" -msgstr "" - -#: include/event.php:408 -msgid "all-day" -msgstr "" - -#: include/event.php:410 -msgid "Sun" -msgstr "" - -#: include/event.php:411 -msgid "Mon" -msgstr "" - -#: include/event.php:412 -msgid "Tue" -msgstr "" - -#: include/event.php:413 -msgid "Wed" -msgstr "" - -#: include/event.php:414 -msgid "Thu" -msgstr "" - -#: include/event.php:415 -msgid "Fri" -msgstr "" - -#: include/event.php:416 -msgid "Sat" -msgstr "" - -#: include/event.php:418 include/text.php:1199 mod/settings.php:982 -msgid "Sunday" -msgstr "" - -#: include/event.php:419 include/text.php:1199 mod/settings.php:982 -msgid "Monday" -msgstr "" - -#: include/event.php:420 include/text.php:1199 -msgid "Tuesday" -msgstr "" - -#: include/event.php:421 include/text.php:1199 -msgid "Wednesday" -msgstr "" - -#: include/event.php:422 include/text.php:1199 -msgid "Thursday" -msgstr "" - -#: include/event.php:423 include/text.php:1199 -msgid "Friday" -msgstr "" - -#: include/event.php:424 include/text.php:1199 -msgid "Saturday" -msgstr "" - -#: include/event.php:426 -msgid "Jan" -msgstr "" - -#: include/event.php:427 -msgid "Feb" -msgstr "" - -#: include/event.php:428 -msgid "Mar" -msgstr "" - -#: include/event.php:429 -msgid "Apr" -msgstr "" - -#: include/event.php:430 include/event.php:443 include/text.php:1203 -msgid "May" -msgstr "" - -#: include/event.php:431 -msgid "Jun" -msgstr "" - -#: include/event.php:432 -msgid "Jul" -msgstr "" - -#: include/event.php:433 -msgid "Aug" -msgstr "" - -#: include/event.php:434 -msgid "Sept" -msgstr "" - -#: include/event.php:435 -msgid "Oct" -msgstr "" - -#: include/event.php:436 -msgid "Nov" -msgstr "" - -#: include/event.php:437 -msgid "Dec" -msgstr "" - -#: include/event.php:439 include/text.php:1203 -msgid "January" -msgstr "" - -#: include/event.php:440 include/text.php:1203 -msgid "February" -msgstr "" - -#: include/event.php:441 include/text.php:1203 -msgid "March" -msgstr "" - -#: include/event.php:442 include/text.php:1203 -msgid "April" -msgstr "" - -#: include/event.php:444 include/text.php:1203 -msgid "June" -msgstr "" - -#: include/event.php:445 include/text.php:1203 -msgid "July" -msgstr "" - -#: include/event.php:446 include/text.php:1203 -msgid "August" -msgstr "" - -#: include/event.php:447 include/text.php:1203 -msgid "September" -msgstr "" - -#: include/event.php:448 include/text.php:1203 -msgid "October" -msgstr "" - -#: include/event.php:449 include/text.php:1203 -msgid "November" -msgstr "" - -#: include/event.php:450 include/text.php:1203 -msgid "December" -msgstr "" - -#: include/event.php:452 mod/cal.php:280 mod/events.php:386 -msgid "today" -msgstr "" - -#: include/event.php:457 -msgid "No events to display" -msgstr "" - -#: include/event.php:570 -msgid "l, F j" -msgstr "" - -#: include/event.php:592 -msgid "Edit event" -msgstr "" - -#: include/event.php:593 -msgid "Delete event" -msgstr "" - -#: include/event.php:619 include/text.php:1601 include/text.php:1608 -msgid "link to source" -msgstr "" - -#: include/event.php:873 -msgid "Export" -msgstr "" - -#: include/event.php:874 -msgid "Export calendar as ical" -msgstr "" - -#: include/event.php:875 -msgid "Export calendar as csv" -msgstr "" - #: include/features.php:65 msgid "General Features" msgstr "" @@ -498,7 +177,7 @@ msgstr "" msgid "Add categories to your posts" msgstr "" -#: include/features.php:104 include/contact_widgets.php:162 +#: include/features.php:104 include/contact_widgets.php:166 msgid "Saved Folders" msgstr "" @@ -538,7 +217,140 @@ msgstr "" msgid "Show visitors public community forums at the Advanced Profile Page" msgstr "" -#: include/like.php:30 include/conversation.php:154 include/diaspora.php:1649 +#: include/ForumManager.php:116 include/nav.php:133 include/text.php:1109 +#: view/theme/vier/theme.php:248 +msgid "Forums" +msgstr "" + +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 +msgid "External link to forum" +msgstr "" + +#: include/ForumManager.php:121 include/items.php:2436 +#: include/contact_widgets.php:275 mod/content.php:625 object/Item.php:417 +#: view/theme/vier/theme.php:253 src/App.php:507 +msgid "show more" +msgstr "" + +#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 +#: include/event.php:459 +msgid "Starts:" +msgstr "" + +#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 +#: include/event.php:460 +msgid "Finishes:" +msgstr "" + +#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 +#: include/event.php:461 include/identity.php:342 mod/directory.php:135 +#: mod/notifications.php:246 mod/contacts.php:639 mod/events.php:496 +msgid "Location:" +msgstr "" + +#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 +msgid "Miscellaneous" +msgstr "" + +#: include/datetime.php:196 include/identity.php:656 +msgid "Birthday:" +msgstr "" + +#: include/datetime.php:198 mod/profiles.php:724 +msgid "Age: " +msgstr "" + +#: include/datetime.php:200 +msgid "YYYY-MM-DD or MM-DD" +msgstr "" + +#: include/datetime.php:370 +msgid "never" +msgstr "" + +#: include/datetime.php:376 +msgid "less than a second ago" +msgstr "" + +#: include/datetime.php:379 +msgid "year" +msgstr "" + +#: include/datetime.php:379 +msgid "years" +msgstr "" + +#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 +#: mod/events.php:387 +msgid "month" +msgstr "" + +#: include/datetime.php:380 +msgid "months" +msgstr "" + +#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 +#: mod/events.php:388 +msgid "week" +msgstr "" + +#: include/datetime.php:381 +msgid "weeks" +msgstr "" + +#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 +#: mod/events.php:389 +msgid "day" +msgstr "" + +#: include/datetime.php:382 +msgid "days" +msgstr "" + +#: include/datetime.php:383 +msgid "hour" +msgstr "" + +#: include/datetime.php:383 +msgid "hours" +msgstr "" + +#: include/datetime.php:384 +msgid "minute" +msgstr "" + +#: include/datetime.php:384 +msgid "minutes" +msgstr "" + +#: include/datetime.php:385 +msgid "second" +msgstr "" + +#: include/datetime.php:385 +msgid "seconds" +msgstr "" + +#: include/datetime.php:394 +#, php-format +msgid "%1$d %2$s ago" +msgstr "" + +#: include/datetime.php:620 +#, php-format +msgid "%s's birthday" +msgstr "" + +#: include/datetime.php:621 include/dfrn.php:1310 +#, php-format +msgid "Happy Birthday %s" +msgstr "" + +#: include/like.php:30 include/conversation.php:154 include/diaspora.php:1657 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" @@ -564,23 +376,220 @@ msgid "%1$s may attend %2$s's %3$s" msgstr "" #: include/like.php:181 include/conversation.php:142 -#: include/conversation.php:294 include/text.php:1873 mod/subthread.php:89 +#: include/conversation.php:294 include/text.php:1898 mod/subthread.php:89 #: mod/tagger.php:63 msgid "photo" msgstr "" #: include/like.php:181 include/conversation.php:137 #: include/conversation.php:147 include/conversation.php:289 -#: include/conversation.php:298 include/diaspora.php:1653 mod/subthread.php:89 +#: include/conversation.php:298 include/diaspora.php:1661 mod/subthread.php:89 #: mod/tagger.php:63 msgid "status" msgstr "" #: include/like.php:183 include/conversation.php:134 -#: include/conversation.php:286 include/text.php:1871 +#: include/conversation.php:286 include/text.php:1896 msgid "event" msgstr "" +#: include/uimport.php:85 +msgid "Error decoding account file" +msgstr "" + +#: include/uimport.php:91 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "" + +#: include/uimport.php:108 include/uimport.php:119 +msgid "Error! Cannot check nickname" +msgstr "" + +#: include/uimport.php:112 include/uimport.php:123 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "" + +#: include/uimport.php:145 +msgid "User creation error" +msgstr "" + +#: include/uimport.php:166 +msgid "User profile creation error" +msgstr "" + +#: include/uimport.php:215 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "" +msgstr[1] "" + +#: include/uimport.php:281 +msgid "Done. You can now login with your username and password" +msgstr "" + +#: include/user.php:39 mod/settings.php:377 +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:75 include/auth.php:139 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "" + +#: include/user.php:75 include/auth.php:139 +msgid "The error message was:" +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:106 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "" + +#: include/user.php:111 +msgid "Your email domain is not among those allowed on this site." +msgstr "" + +#: include/user.php:114 +msgid "Not a valid email address." +msgstr "" + +#: include/user.php:127 +msgid "Cannot use that email." +msgstr "" + +#: include/user.php:133 +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." +msgstr "" + +#: include/user.php:140 include/user.php:228 +msgid "Nickname is already registered. Please choose another." +msgstr "" + +#: include/user.php:150 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "" + +#: include/user.php:166 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "" + +#: include/user.php:214 +msgid "An error occurred during registration. Please try again." +msgstr "" + +#: include/user.php:237 view/theme/duepuntozero/config.php:46 +msgid "default" +msgstr "" + +#: include/user.php:247 +msgid "An error occurred creating your default profile. Please try again." +msgstr "" + +#: include/user.php:260 include/user.php:264 include/profile_selectors.php:42 +msgid "Friends" +msgstr "" + +#: include/user.php:306 include/user.php:314 include/user.php:322 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 mod/photos.php:776 +#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1865 +#: mod/profile_photo.php:74 mod/profile_photo.php:82 mod/profile_photo.php:90 +#: mod/profile_photo.php:214 mod/profile_photo.php:309 +#: mod/profile_photo.php:319 +msgid "Profile Photos" +msgstr "" + +#: include/user.php:397 +#, 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:407 +#, php-format +msgid "Registration at %s" +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 has been created.\n" +"\t" +msgstr "" + +#: include/user.php:421 +#, 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:453 mod/admin.php:1383 +#, php-format +msgid "Registration details for %s" +msgstr "" + #: include/profile_selectors.php:6 msgid "Male" msgstr "" @@ -727,10 +736,6 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: include/profile_selectors.php:42 include/user.php:260 include/user.php:264 -msgid "Friends" -msgstr "" - #: include/profile_selectors.php:42 msgid "Friends/Benefits" msgstr "" @@ -815,282 +820,17 @@ msgstr "" msgid "Ask me" msgstr "" -#: include/security.php:63 -msgid "Welcome " -msgstr "" - -#: include/security.php:64 -msgid "Please upload a profile photo." -msgstr "" - -#: include/security.php:67 -msgid "Welcome back " -msgstr "" - -#: include/security.php:431 -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:85 -msgid "Error decoding account file" -msgstr "" - -#: include/uimport.php:91 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "" - -#: include/uimport.php:108 include/uimport.php:119 -msgid "Error! Cannot check nickname" -msgstr "" - -#: include/uimport.php:112 include/uimport.php:123 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "" - -#: include/uimport.php:145 -msgid "User creation error" -msgstr "" - -#: include/uimport.php:166 -msgid "User profile creation error" -msgstr "" - -#: include/uimport.php:215 -#, php-format -msgid "%d contact not imported" -msgid_plural "%d contacts not imported" -msgstr[0] "" -msgstr[1] "" - -#: include/uimport.php:281 -msgid "Done. You can now login with your username and password" -msgstr "" - -#: include/user.php:39 mod/settings.php:377 -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:75 include/auth.php:139 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." -msgstr "" - -#: include/user.php:75 include/auth.php:139 -msgid "The error message was:" -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:106 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "" - -#: include/user.php:111 -msgid "Your email domain is not among those allowed on this site." -msgstr "" - -#: include/user.php:114 -msgid "Not a valid email address." -msgstr "" - -#: include/user.php:127 -msgid "Cannot use that email." -msgstr "" - -#: include/user.php:133 -msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." -msgstr "" - -#: include/user.php:140 include/user.php:228 -msgid "Nickname is already registered. Please choose another." -msgstr "" - -#: include/user.php:150 -msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." -msgstr "" - -#: include/user.php:166 -msgid "SERIOUS ERROR: Generation of security keys failed." -msgstr "" - -#: include/user.php:214 -msgid "An error occurred during registration. Please try again." -msgstr "" - -#: include/user.php:237 view/theme/duepuntozero/config.php:46 -msgid "default" -msgstr "" - -#: include/user.php:247 -msgid "An error occurred creating your default profile. Please try again." -msgstr "" - -#: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 mod/photos.php:776 -#: mod/photos.php:1258 mod/photos.php:1279 mod/photos.php:1865 -#: mod/profile_photo.php:74 mod/profile_photo.php:82 mod/profile_photo.php:90 -#: mod/profile_photo.php:214 mod/profile_photo.php:309 -#: mod/profile_photo.php:319 -msgid "Profile Photos" -msgstr "" - -#: include/user.php:397 -#, 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:407 -#, php-format -msgid "Registration at %s" -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 has been created.\n" -"\t" -msgstr "" - -#: include/user.php:421 -#, 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:453 mod/admin.php:1314 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 -#: include/conversation.php:1005 include/conversation.php:1021 -#: mod/allfriends.php:70 mod/directory.php:153 mod/match.php:76 -#: mod/suggest.php:84 mod/dirfind.php:211 -msgid "View Profile" -msgstr "" - -#: include/Contact.php:389 include/contact_widgets.php:34 -#: include/conversation.php:1018 mod/allfriends.php:71 mod/match.php:77 -#: mod/suggest.php:85 mod/contacts.php:613 mod/dirfind.php:212 -#: mod/follow.php:108 -msgid "Connect/Follow" -msgstr "" - -#: include/Contact.php:432 include/conversation.php:1004 -msgid "View Status" -msgstr "" - -#: include/Contact.php:434 include/conversation.php:1006 -msgid "View Photos" -msgstr "" - -#: include/Contact.php:435 include/conversation.php:1007 -msgid "Network Posts" -msgstr "" - -#: include/Contact.php:436 include/conversation.php:1008 -msgid "View Contact" -msgstr "" - -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "" - -#: include/Contact.php:438 include/conversation.php:1009 -msgid "Send PM" -msgstr "" - -#: include/Contact.php:439 include/conversation.php:1013 -msgid "Poke" -msgstr "" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "" - -#: include/Contact.php:822 -msgid "News" -msgstr "" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "" - #: include/NotificationsManager.php:155 msgid "System" msgstr "" -#: include/NotificationsManager.php:162 include/nav.php:160 mod/admin.php:518 +#: include/NotificationsManager.php:162 include/nav.php:160 mod/admin.php:587 #: view/theme/frio/theme.php:255 msgid "Network" msgstr "" -#: include/NotificationsManager.php:169 mod/profiles.php:699 -#: mod/network.php:835 +#: include/NotificationsManager.php:169 mod/network.php:835 +#: mod/profiles.php:699 msgid "Personal" msgstr "" @@ -1274,19 +1014,19 @@ msgstr "" msgid "Reputable, has my trust" msgstr "" -#: include/contact_selectors.php:56 mod/admin.php:986 +#: include/contact_selectors.php:56 mod/admin.php:1055 msgid "Frequently" msgstr "" -#: include/contact_selectors.php:57 mod/admin.php:987 +#: include/contact_selectors.php:57 mod/admin.php:1056 msgid "Hourly" msgstr "" -#: include/contact_selectors.php:58 mod/admin.php:988 +#: include/contact_selectors.php:58 mod/admin.php:1057 msgid "Twice daily" msgstr "" -#: include/contact_selectors.php:59 mod/admin.php:989 +#: include/contact_selectors.php:59 mod/admin.php:1058 msgid "Daily" msgstr "" @@ -1311,7 +1051,7 @@ msgid "RSS/Atom" msgstr "" #: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 +#: mod/admin.php:1565 mod/admin.php:1578 mod/admin.php:1591 mod/admin.php:1609 msgid "Email" msgstr "" @@ -1368,87 +1108,6 @@ msgstr "" msgid "App.net" msgstr "" -#: include/contact_widgets.php:8 -msgid "Add New Contact" -msgstr "" - -#: include/contact_widgets.php:9 -msgid "Enter address or web location" -msgstr "" - -#: include/contact_widgets.php:10 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: include/contact_widgets.php:12 include/identity.php:230 -#: mod/allfriends.php:87 mod/match.php:92 mod/suggest.php:103 -#: mod/dirfind.php:209 -msgid "Connect" -msgstr "" - -#: include/contact_widgets.php:26 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: include/contact_widgets.php:32 -msgid "Find People" -msgstr "" - -#: include/contact_widgets.php:33 -msgid "Enter name or interest" -msgstr "" - -#: include/contact_widgets.php:35 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: include/contact_widgets.php:36 mod/directory.php:202 mod/contacts.php:809 -msgid "Find" -msgstr "" - -#: include/contact_widgets.php:37 mod/suggest.php:116 -#: view/theme/vier/theme.php:195 -msgid "Friend Suggestions" -msgstr "" - -#: include/contact_widgets.php:38 view/theme/vier/theme.php:194 -msgid "Similar Interests" -msgstr "" - -#: include/contact_widgets.php:39 -msgid "Random Profile" -msgstr "" - -#: include/contact_widgets.php:40 view/theme/vier/theme.php:196 -msgid "Invite Friends" -msgstr "" - -#: include/contact_widgets.php:127 -msgid "Networks" -msgstr "" - -#: include/contact_widgets.php:130 -msgid "All Networks" -msgstr "" - -#: include/contact_widgets.php:165 include/contact_widgets.php:200 -msgid "Everything" -msgstr "" - -#: include/contact_widgets.php:197 -msgid "Categories" -msgstr "" - -#: include/contact_widgets.php:266 -#, php-format -msgid "%d contact in common" -msgid_plural "%d contacts in common" -msgstr[0] "" -msgstr[1] "" - #: include/conversation.php:160 #, php-format msgid "%1$s attends %2$s's %3$s" @@ -1525,7 +1184,7 @@ msgstr "" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 #: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 -#: mod/settings.php:745 mod/admin.php:1514 object/Item.php:138 +#: mod/settings.php:745 mod/admin.php:1583 object/Item.php:138 msgid "Delete" msgstr "" @@ -1572,6 +1231,44 @@ msgstr "" msgid "Follow Thread" msgstr "" +#: include/conversation.php:1004 include/Contact.php:432 +msgid "View Status" +msgstr "" + +#: include/conversation.php:1005 include/conversation.php:1021 +#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 +#: mod/allfriends.php:70 mod/directory.php:153 mod/match.php:76 +#: mod/suggest.php:84 mod/dirfind.php:211 +msgid "View Profile" +msgstr "" + +#: include/conversation.php:1006 include/Contact.php:434 +msgid "View Photos" +msgstr "" + +#: include/conversation.php:1007 include/Contact.php:435 +msgid "Network Posts" +msgstr "" + +#: include/conversation.php:1008 include/Contact.php:436 +msgid "View Contact" +msgstr "" + +#: include/conversation.php:1009 include/Contact.php:438 +msgid "Send PM" +msgstr "" + +#: include/conversation.php:1013 include/Contact.php:439 +msgid "Poke" +msgstr "" + +#: include/conversation.php:1018 include/Contact.php:389 +#: include/contact_widgets.php:36 mod/allfriends.php:71 mod/match.php:77 +#: mod/suggest.php:85 mod/contacts.php:613 mod/dirfind.php:212 +#: mod/follow.php:108 +msgid "Connect/Follow" +msgstr "" + #: include/conversation.php:1140 #, php-format msgid "%s likes this." @@ -1778,7 +1475,7 @@ msgstr "" msgid "Preview" msgstr "" -#: include/conversation.php:1318 include/items.php:2165 mod/editpost.php:140 +#: include/conversation.php:1318 include/items.php:2169 mod/editpost.php:140 #: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/message.php:211 #: mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34 mod/tagrm.php:13 #: mod/tagrm.php:98 mod/videos.php:134 mod/contacts.php:458 @@ -1829,7 +1526,7 @@ msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: include/dba.php:59 include/dba_pdo.php:76 +#: include/dba.php:59 include/dba_pdo.php:75 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "" @@ -1856,7 +1553,7 @@ msgid "" "[pre]%s[/pre]" msgstr "" -#: include/dbstructure.php:195 +#: include/dbstructure.php:196 #, php-format msgid "" "\n" @@ -1864,15 +1561,15 @@ msgid "" "%s\n" msgstr "" -#: include/dbstructure.php:198 +#: include/dbstructure.php:199 msgid "Errors encountered performing database changes: " msgstr "" -#: include/dbstructure.php:206 +#: include/dbstructure.php:207 msgid ": Database update" msgstr "" -#: include/dbstructure.php:438 +#: include/dbstructure.php:439 #, php-format msgid "%s: updating %s table." msgstr "" @@ -1885,16 +1582,11 @@ msgstr "" msgid "noreply" msgstr "" -#: include/dfrn.php:1309 -#, php-format -msgid "%s\\'s birthday" -msgstr "" - -#: include/diaspora.php:2214 +#: include/diaspora.php:2222 msgid "Sharing notification from Diaspora network" msgstr "" -#: include/diaspora.php:3234 +#: include/diaspora.php:3180 msgid "Attachments:" msgstr "" @@ -2190,12 +1882,200 @@ msgstr "" msgid "Please visit %s to approve or reject the request." msgstr "" +#: include/event.php:408 +msgid "all-day" +msgstr "" + +#: include/event.php:410 +msgid "Sun" +msgstr "" + +#: include/event.php:411 +msgid "Mon" +msgstr "" + +#: include/event.php:412 +msgid "Tue" +msgstr "" + +#: include/event.php:413 +msgid "Wed" +msgstr "" + +#: include/event.php:414 +msgid "Thu" +msgstr "" + +#: include/event.php:415 +msgid "Fri" +msgstr "" + +#: include/event.php:416 +msgid "Sat" +msgstr "" + +#: include/event.php:418 include/text.php:1212 mod/settings.php:982 +msgid "Sunday" +msgstr "" + +#: include/event.php:419 include/text.php:1212 mod/settings.php:982 +msgid "Monday" +msgstr "" + +#: include/event.php:420 include/text.php:1212 +msgid "Tuesday" +msgstr "" + +#: include/event.php:421 include/text.php:1212 +msgid "Wednesday" +msgstr "" + +#: include/event.php:422 include/text.php:1212 +msgid "Thursday" +msgstr "" + +#: include/event.php:423 include/text.php:1212 +msgid "Friday" +msgstr "" + +#: include/event.php:424 include/text.php:1212 +msgid "Saturday" +msgstr "" + +#: include/event.php:426 +msgid "Jan" +msgstr "" + +#: include/event.php:427 +msgid "Feb" +msgstr "" + +#: include/event.php:428 +msgid "Mar" +msgstr "" + +#: include/event.php:429 +msgid "Apr" +msgstr "" + +#: include/event.php:430 include/event.php:443 include/text.php:1216 +msgid "May" +msgstr "" + +#: include/event.php:431 +msgid "Jun" +msgstr "" + +#: include/event.php:432 +msgid "Jul" +msgstr "" + +#: include/event.php:433 +msgid "Aug" +msgstr "" + +#: include/event.php:434 +msgid "Sept" +msgstr "" + +#: include/event.php:435 +msgid "Oct" +msgstr "" + +#: include/event.php:436 +msgid "Nov" +msgstr "" + +#: include/event.php:437 +msgid "Dec" +msgstr "" + +#: include/event.php:439 include/text.php:1216 +msgid "January" +msgstr "" + +#: include/event.php:440 include/text.php:1216 +msgid "February" +msgstr "" + +#: include/event.php:441 include/text.php:1216 +msgid "March" +msgstr "" + +#: include/event.php:442 include/text.php:1216 +msgid "April" +msgstr "" + +#: include/event.php:444 include/text.php:1216 +msgid "June" +msgstr "" + +#: include/event.php:445 include/text.php:1216 +msgid "July" +msgstr "" + +#: include/event.php:446 include/text.php:1216 +msgid "August" +msgstr "" + +#: include/event.php:447 include/text.php:1216 +msgid "September" +msgstr "" + +#: include/event.php:448 include/text.php:1216 +msgid "October" +msgstr "" + +#: include/event.php:449 include/text.php:1216 +msgid "November" +msgstr "" + +#: include/event.php:450 include/text.php:1216 +msgid "December" +msgstr "" + +#: include/event.php:452 mod/cal.php:280 mod/events.php:386 +msgid "today" +msgstr "" + +#: include/event.php:457 +msgid "No events to display" +msgstr "" + +#: include/event.php:570 +msgid "l, F j" +msgstr "" + +#: include/event.php:592 +msgid "Edit event" +msgstr "" + +#: include/event.php:593 +msgid "Delete event" +msgstr "" + +#: include/event.php:619 include/text.php:1620 include/text.php:1627 +msgid "link to source" +msgstr "" + +#: include/event.php:877 +msgid "Export" +msgstr "" + +#: include/event.php:878 +msgid "Export calendar as ical" +msgstr "" + +#: include/event.php:879 +msgid "Export calendar as csv" +msgstr "" + #: include/follow.php:84 mod/dfrn_request.php:514 msgid "Disallowed profile URL." msgstr "" #: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 -#: mod/admin.php:280 mod/admin.php:298 +#: mod/admin.php:288 mod/admin.php:306 msgid "Blocked domain" msgstr "" @@ -2297,283 +2177,24 @@ msgstr "" msgid "add" msgstr "" -#: include/identity.php:45 -msgid "Requested account is not available." -msgstr "" - -#: include/identity.php:54 mod/profile.php:22 -msgid "Requested profile is not available." -msgstr "" - -#: include/identity.php:98 include/identity.php:325 include/identity.php:755 -msgid "Edit profile" -msgstr "" - -#: include/identity.php:265 -msgid "Atom feed" -msgstr "" - -#: include/identity.php:296 include/nav.php:191 -msgid "Profiles" -msgstr "" - -#: include/identity.php:296 -msgid "Manage/edit profiles" -msgstr "" - -#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790 -msgid "Change profile photo" -msgstr "" - -#: include/identity.php:302 mod/profiles.php:791 -msgid "Create New Profile" -msgstr "" - -#: include/identity.php:312 mod/profiles.php:780 -msgid "Profile Image" -msgstr "" - -#: include/identity.php:315 mod/profiles.php:782 -msgid "visible to everybody" -msgstr "" - -#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783 -msgid "Edit visibility" -msgstr "" - -#: include/identity.php:344 include/identity.php:644 mod/directory.php:137 -#: mod/notifications.php:252 -msgid "Gender:" -msgstr "" - -#: include/identity.php:347 include/identity.php:665 mod/directory.php:139 -msgid "Status:" -msgstr "" - -#: include/identity.php:349 include/identity.php:682 mod/directory.php:141 -msgid "Homepage:" -msgstr "" - -#: include/identity.php:351 include/identity.php:702 mod/directory.php:143 -#: mod/notifications.php:248 mod/contacts.php:643 -msgid "About:" -msgstr "" - -#: include/identity.php:353 mod/contacts.php:641 -msgid "XMPP:" -msgstr "" - -#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58 -msgid "Network:" -msgstr "" - -#: include/identity.php:468 include/identity.php:558 -msgid "g A l F d" -msgstr "" - -#: include/identity.php:469 include/identity.php:559 -msgid "F d" -msgstr "" - -#: include/identity.php:520 include/identity.php:609 -msgid "[today]" -msgstr "" - -#: include/identity.php:532 -msgid "Birthday Reminders" -msgstr "" - -#: include/identity.php:533 -msgid "Birthdays this week:" -msgstr "" - -#: include/identity.php:595 -msgid "[No description]" -msgstr "" - -#: include/identity.php:620 -msgid "Event Reminders" -msgstr "" - -#: include/identity.php:621 -msgid "Events this week:" -msgstr "" - -#: include/identity.php:632 include/identity.php:759 include/identity.php:792 -#: include/nav.php:84 mod/newmember.php:20 mod/profperm.php:107 -#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 -msgid "Profile" -msgstr "" - -#: include/identity.php:641 mod/settings.php:1287 -msgid "Full Name:" -msgstr "" - -#: include/identity.php:648 -msgid "j F, Y" -msgstr "" - -#: include/identity.php:649 -msgid "j F" -msgstr "" - -#: include/identity.php:661 -msgid "Age:" -msgstr "" - -#: include/identity.php:674 -#, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: include/identity.php:678 mod/profiles.php:706 -msgid "Sexual Preference:" -msgstr "" - -#: include/identity.php:686 mod/profiles.php:733 -msgid "Hometown:" -msgstr "" - -#: include/identity.php:690 mod/notifications.php:250 mod/contacts.php:645 -#: mod/follow.php:139 -msgid "Tags:" -msgstr "" - -#: include/identity.php:694 mod/profiles.php:734 -msgid "Political Views:" -msgstr "" - -#: include/identity.php:698 -msgid "Religion:" -msgstr "" - -#: include/identity.php:706 -msgid "Hobbies/Interests:" -msgstr "" - -#: include/identity.php:710 mod/profiles.php:738 -msgid "Likes:" -msgstr "" - -#: include/identity.php:714 mod/profiles.php:739 -msgid "Dislikes:" -msgstr "" - -#: include/identity.php:718 -msgid "Contact information and Social Networks:" -msgstr "" - -#: include/identity.php:722 -msgid "Musical interests:" -msgstr "" - -#: include/identity.php:726 -msgid "Books, literature:" -msgstr "" - -#: include/identity.php:730 -msgid "Television:" -msgstr "" - -#: include/identity.php:734 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: include/identity.php:738 -msgid "Love/Romance:" -msgstr "" - -#: include/identity.php:742 -msgid "Work/employment:" -msgstr "" - -#: include/identity.php:746 -msgid "School/education:" -msgstr "" - -#: include/identity.php:751 -msgid "Forums:" -msgstr "" - -#: include/identity.php:760 mod/events.php:509 -msgid "Basic" -msgstr "" - -#: include/identity.php:761 mod/contacts.php:881 mod/events.php:510 -#: mod/admin.php:1065 -msgid "Advanced" -msgstr "" - -#: include/identity.php:784 include/nav.php:83 mod/contacts.php:648 -#: mod/contacts.php:844 view/theme/frio/theme.php:248 -msgid "Status" -msgstr "" - -#: include/identity.php:787 mod/contacts.php:847 mod/follow.php:147 -msgid "Status Messages and Posts" -msgstr "" - -#: include/identity.php:795 mod/contacts.php:855 -msgid "Profile Details" -msgstr "" - -#: include/identity.php:800 include/nav.php:85 mod/fbrowser.php:33 -#: view/theme/frio/theme.php:250 -msgid "Photos" -msgstr "" - -#: include/identity.php:803 mod/photos.php:95 -msgid "Photo Albums" -msgstr "" - -#: include/identity.php:808 include/identity.php:811 include/nav.php:86 -#: view/theme/frio/theme.php:251 -msgid "Videos" -msgstr "" - -#: include/identity.php:820 include/identity.php:831 include/nav.php:87 -#: include/nav.php:151 mod/cal.php:272 mod/events.php:377 -#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 -msgid "Events" -msgstr "" - -#: include/identity.php:823 include/identity.php:834 include/nav.php:151 -#: view/theme/frio/theme.php:256 -msgid "Events and Calendar" -msgstr "" - -#: include/identity.php:842 mod/notes.php:49 -msgid "Personal Notes" -msgstr "" - -#: include/identity.php:845 -msgid "Only You Can See This" -msgstr "" - -#: include/identity.php:853 include/identity.php:856 include/nav.php:130 -#: include/nav.php:194 include/text.php:1091 mod/viewcontacts.php:124 -#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 -msgid "Contacts" -msgstr "" - #: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759 msgid "[Name Withheld]" msgstr "" #: include/items.php:2121 mod/notice.php:17 mod/viewsrc.php:16 -#: mod/display.php:117 mod/display.php:289 mod/display.php:504 -#: mod/admin.php:248 mod/admin.php:1571 mod/admin.php:1822 +#: mod/display.php:120 mod/display.php:292 mod/display.php:507 +#: mod/admin.php:256 mod/admin.php:1640 mod/admin.php:1891 msgid "Item not found." msgstr "" -#: include/items.php:2160 +#: include/items.php:2164 msgid "Do you really want to delete this item?" msgstr "" -#: include/items.php:2162 mod/api.php:107 mod/message.php:208 -#: mod/profiles.php:643 mod/profiles.php:646 mod/profiles.php:673 +#: include/items.php:2166 mod/api.php:107 mod/message.php:208 #: mod/suggest.php:31 mod/contacts.php:455 mod/dfrn_request.php:880 -#: mod/follow.php:115 mod/register.php:247 mod/settings.php:1172 +#: mod/follow.php:115 mod/profiles.php:643 mod/profiles.php:646 +#: mod/profiles.php:673 mod/register.php:248 mod/settings.php:1172 #: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189 #: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204 #: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236 @@ -2581,28 +2202,28 @@ msgstr "" msgid "Yes" msgstr "" -#: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 +#: include/items.php:2313 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 #: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105 #: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/editpost.php:12 #: mod/fsuggest.php:80 mod/group.php:20 mod/invite.php:17 mod/invite.php:105 #: mod/manage.php:103 mod/message.php:48 mod/message.php:173 mod/mood.php:116 #: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73 #: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111 -#: mod/poke.php:155 mod/profile_photo.php:19 mod/profile_photo.php:179 -#: mod/profile_photo.php:190 mod/profile_photo.php:203 mod/profiles.php:172 -#: mod/profiles.php:610 mod/regmod.php:106 mod/repair_ostatus.php:11 -#: mod/suggest.php:60 mod/uimport.php:26 mod/viewcontacts.php:49 -#: mod/wall_attach.php:69 mod/wall_attach.php:72 mod/wall_upload.php:101 -#: mod/wall_upload.php:104 mod/wallmessage.php:11 mod/wallmessage.php:35 -#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/contacts.php:363 -#: mod/dirfind.php:15 mod/display.php:501 mod/events.php:188 mod/follow.php:13 +#: mod/poke.php:155 mod/repair_ostatus.php:11 mod/suggest.php:60 +#: mod/viewcontacts.php:49 mod/wall_attach.php:69 mod/wall_attach.php:72 +#: mod/wall_upload.php:101 mod/wall_upload.php:104 mod/wallmessage.php:11 +#: mod/wallmessage.php:35 mod/wallmessage.php:75 mod/wallmessage.php:99 +#: mod/regmod.php:106 mod/uimport.php:26 mod/contacts.php:363 +#: mod/dirfind.php:15 mod/display.php:504 mod/events.php:188 mod/follow.php:13 #: mod/follow.php:76 mod/follow.php:160 mod/item.php:197 mod/item.php:209 -#: mod/network.php:7 mod/register.php:44 mod/settings.php:24 +#: mod/network.php:7 mod/profile_photo.php:19 mod/profile_photo.php:179 +#: mod/profile_photo.php:190 mod/profile_photo.php:203 mod/profiles.php:172 +#: mod/profiles.php:610 mod/register.php:45 mod/settings.php:24 #: mod/settings.php:132 mod/settings.php:669 index.php:410 msgid "Permission denied." msgstr "" -#: include/items.php:2426 +#: include/items.php:2430 msgid "Archives" msgstr "" @@ -2618,7 +2239,7 @@ msgstr "" msgid "Clear notifications" msgstr "" -#: include/nav.php:42 include/text.php:1084 +#: include/nav.php:42 include/text.php:1099 msgid "@name, !forum, #tags, content" msgstr "" @@ -2630,22 +2251,49 @@ msgstr "" msgid "End this session" msgstr "" +#: include/nav.php:83 include/identity.php:786 mod/contacts.php:648 +#: mod/contacts.php:844 view/theme/frio/theme.php:248 +msgid "Status" +msgstr "" + #: include/nav.php:83 include/nav.php:163 view/theme/frio/theme.php:248 msgid "Your posts and conversations" msgstr "" +#: include/nav.php:84 include/identity.php:632 include/identity.php:761 +#: include/identity.php:794 mod/newmember.php:20 mod/profperm.php:107 +#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 +msgid "Profile" +msgstr "" + #: include/nav.php:84 view/theme/frio/theme.php:249 msgid "Your profile page" msgstr "" +#: include/nav.php:85 include/identity.php:802 mod/fbrowser.php:33 +#: view/theme/frio/theme.php:250 +msgid "Photos" +msgstr "" + #: include/nav.php:85 view/theme/frio/theme.php:250 msgid "Your photos" msgstr "" +#: include/nav.php:86 include/identity.php:810 include/identity.php:813 +#: view/theme/frio/theme.php:251 +msgid "Videos" +msgstr "" + #: include/nav.php:86 view/theme/frio/theme.php:251 msgid "Your videos" msgstr "" +#: include/nav.php:87 include/nav.php:151 include/identity.php:822 +#: include/identity.php:833 mod/cal.php:272 mod/events.php:377 +#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 +msgid "Events" +msgstr "" + #: include/nav.php:87 view/theme/frio/theme.php:252 msgid "Your events" msgstr "" @@ -2670,7 +2318,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: include/nav.php:111 mod/register.php:291 boot.php:848 +#: include/nav.php:111 mod/register.php:292 boot.php:848 msgid "Register" msgstr "" @@ -2694,7 +2342,7 @@ msgstr "" msgid "Addon applications, utilities, games" msgstr "" -#: include/nav.php:125 include/text.php:1081 mod/search.php:152 +#: include/nav.php:125 include/text.php:1096 mod/search.php:152 msgid "Search" msgstr "" @@ -2702,14 +2350,20 @@ msgstr "" msgid "Search site content" msgstr "" -#: include/nav.php:128 include/text.php:1089 +#: include/nav.php:128 include/text.php:1104 msgid "Full Text" msgstr "" -#: include/nav.php:129 include/text.php:1090 +#: include/nav.php:129 include/text.php:1105 msgid "Tags" msgstr "" +#: include/nav.php:130 include/nav.php:194 include/text.php:1106 +#: include/identity.php:855 include/identity.php:858 mod/viewcontacts.php:124 +#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 +msgid "Contacts" +msgstr "" + #: include/nav.php:145 include/nav.php:147 mod/community.php:32 msgid "Community" msgstr "" @@ -2722,6 +2376,11 @@ msgstr "" msgid "Conversations on the network" msgstr "" +#: include/nav.php:151 include/identity.php:825 include/identity.php:836 +#: view/theme/frio/theme.php:256 +msgid "Events and Calendar" +msgstr "" + #: include/nav.php:154 msgid "Directory" msgstr "" @@ -2807,7 +2466,7 @@ msgid "Delegate Page Management" msgstr "" #: include/nav.php:188 mod/newmember.php:15 mod/settings.php:113 -#: mod/admin.php:1624 mod/admin.php:1900 view/theme/frio/theme.php:258 +#: mod/admin.php:1693 mod/admin.php:1969 view/theme/frio/theme.php:258 msgid "Settings" msgstr "" @@ -2815,6 +2474,10 @@ msgstr "" msgid "Account settings" msgstr "" +#: include/nav.php:191 include/identity.php:296 +msgid "Profiles" +msgstr "" + #: include/nav.php:191 msgid "Manage/Edit Profiles" msgstr "" @@ -2823,7 +2486,7 @@ msgstr "" msgid "Manage/edit friends and contacts" msgstr "" -#: include/nav.php:199 mod/admin.php:197 +#: include/nav.php:199 mod/admin.php:202 msgid "Admin" msgstr "" @@ -2888,224 +2551,565 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: include/text.php:308 -msgid "newer" +#: include/security.php:63 +msgid "Welcome " msgstr "" -#: include/text.php:309 -msgid "older" +#: include/security.php:64 +msgid "Please upload a profile photo." +msgstr "" + +#: include/security.php:66 +msgid "Welcome back " +msgstr "" + +#: include/security.php:438 +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:314 -msgid "first" +msgid "newer" msgstr "" #: include/text.php:315 +msgid "older" +msgstr "" + +#: include/text.php:320 +msgid "first" +msgstr "" + +#: include/text.php:321 msgid "prev" msgstr "" -#: include/text.php:349 +#: include/text.php:355 msgid "next" msgstr "" -#: include/text.php:350 +#: include/text.php:356 msgid "last" msgstr "" -#: include/text.php:404 +#: include/text.php:410 msgid "Loading more entries..." msgstr "" -#: include/text.php:405 +#: include/text.php:411 msgid "The end" msgstr "" -#: include/text.php:956 +#: include/text.php:970 msgid "No contacts" msgstr "" -#: include/text.php:981 +#: include/text.php:994 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: include/text.php:994 +#: include/text.php:1007 msgid "View Contacts" msgstr "" -#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 mod/notes.php:64 +#: include/text.php:1097 mod/editpost.php:101 mod/filer.php:32 mod/notes.php:64 msgid "Save" msgstr "" -#: include/text.php:1145 +#: include/text.php:1158 msgid "poke" msgstr "" -#: include/text.php:1145 +#: include/text.php:1158 msgid "poked" msgstr "" -#: include/text.php:1146 +#: include/text.php:1159 msgid "ping" msgstr "" -#: include/text.php:1146 +#: include/text.php:1159 msgid "pinged" msgstr "" -#: include/text.php:1147 +#: include/text.php:1160 msgid "prod" msgstr "" -#: include/text.php:1147 +#: include/text.php:1160 msgid "prodded" msgstr "" -#: include/text.php:1148 +#: include/text.php:1161 msgid "slap" msgstr "" -#: include/text.php:1148 +#: include/text.php:1161 msgid "slapped" msgstr "" -#: include/text.php:1149 +#: include/text.php:1162 msgid "finger" msgstr "" -#: include/text.php:1149 +#: include/text.php:1162 msgid "fingered" msgstr "" -#: include/text.php:1150 +#: include/text.php:1163 msgid "rebuff" msgstr "" -#: include/text.php:1150 +#: include/text.php:1163 msgid "rebuffed" msgstr "" -#: include/text.php:1164 +#: include/text.php:1177 msgid "happy" msgstr "" -#: include/text.php:1165 +#: include/text.php:1178 msgid "sad" msgstr "" -#: include/text.php:1166 +#: include/text.php:1179 msgid "mellow" msgstr "" -#: include/text.php:1167 +#: include/text.php:1180 msgid "tired" msgstr "" -#: include/text.php:1168 +#: include/text.php:1181 msgid "perky" msgstr "" -#: include/text.php:1169 +#: include/text.php:1182 msgid "angry" msgstr "" -#: include/text.php:1170 +#: include/text.php:1183 msgid "stupified" msgstr "" -#: include/text.php:1171 +#: include/text.php:1184 msgid "puzzled" msgstr "" -#: include/text.php:1172 +#: include/text.php:1185 msgid "interested" msgstr "" -#: include/text.php:1173 +#: include/text.php:1186 msgid "bitter" msgstr "" -#: include/text.php:1174 +#: include/text.php:1187 msgid "cheerful" msgstr "" -#: include/text.php:1175 +#: include/text.php:1188 msgid "alive" msgstr "" -#: include/text.php:1176 +#: include/text.php:1189 msgid "annoyed" msgstr "" -#: include/text.php:1177 +#: include/text.php:1190 msgid "anxious" msgstr "" -#: include/text.php:1178 +#: include/text.php:1191 msgid "cranky" msgstr "" -#: include/text.php:1179 +#: include/text.php:1192 msgid "disturbed" msgstr "" -#: include/text.php:1180 +#: include/text.php:1193 msgid "frustrated" msgstr "" -#: include/text.php:1181 +#: include/text.php:1194 msgid "motivated" msgstr "" -#: include/text.php:1182 +#: include/text.php:1195 msgid "relaxed" msgstr "" -#: include/text.php:1183 +#: include/text.php:1196 msgid "surprised" msgstr "" -#: include/text.php:1393 mod/videos.php:388 +#: include/text.php:1407 mod/videos.php:388 msgid "View Video" msgstr "" -#: include/text.php:1425 +#: include/text.php:1438 msgid "bytes" msgstr "" -#: include/text.php:1457 include/text.php:1469 +#: include/text.php:1471 include/text.php:1482 msgid "Click to open/close" msgstr "" -#: include/text.php:1595 +#: include/text.php:1614 msgid "View on separate page" msgstr "" -#: include/text.php:1596 +#: include/text.php:1615 msgid "view on separate page" msgstr "" -#: include/text.php:1875 +#: include/text.php:1900 msgid "activity" msgstr "" -#: include/text.php:1877 mod/content.php:624 object/Item.php:416 +#: include/text.php:1902 mod/content.php:624 object/Item.php:416 #: object/Item.php:428 msgid "comment" msgid_plural "comments" msgstr[0] "" msgstr[1] "" -#: include/text.php:1878 +#: include/text.php:1905 msgid "post" msgstr "" -#: include/text.php:2046 +#: include/text.php:2071 msgid "Item filed" msgstr "" +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "" + +#: include/Contact.php:822 +msgid "News" +msgstr "" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "" + +#: include/contact_widgets.php:9 +msgid "Add New Contact" +msgstr "" + +#: include/contact_widgets.php:10 +msgid "Enter address or web location" +msgstr "" + +#: include/contact_widgets.php:11 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: include/contact_widgets.php:13 include/identity.php:230 +#: mod/allfriends.php:87 mod/match.php:92 mod/suggest.php:103 +#: mod/dirfind.php:209 +msgid "Connect" +msgstr "" + +#: include/contact_widgets.php:28 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: include/contact_widgets.php:34 +msgid "Find People" +msgstr "" + +#: include/contact_widgets.php:35 +msgid "Enter name or interest" +msgstr "" + +#: include/contact_widgets.php:37 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "" + +#: include/contact_widgets.php:38 mod/directory.php:202 mod/contacts.php:809 +msgid "Find" +msgstr "" + +#: include/contact_widgets.php:39 mod/suggest.php:116 +#: view/theme/vier/theme.php:195 +msgid "Friend Suggestions" +msgstr "" + +#: include/contact_widgets.php:40 view/theme/vier/theme.php:194 +msgid "Similar Interests" +msgstr "" + +#: include/contact_widgets.php:41 +msgid "Random Profile" +msgstr "" + +#: include/contact_widgets.php:42 view/theme/vier/theme.php:196 +msgid "Invite Friends" +msgstr "" + +#: include/contact_widgets.php:43 +msgid "View Global Directory" +msgstr "" + +#: include/contact_widgets.php:131 +msgid "Networks" +msgstr "" + +#: include/contact_widgets.php:134 +msgid "All Networks" +msgstr "" + +#: include/contact_widgets.php:169 include/contact_widgets.php:204 +msgid "Everything" +msgstr "" + +#: include/contact_widgets.php:201 +msgid "Categories" +msgstr "" + +#: include/contact_widgets.php:270 +#, php-format +msgid "%d contact in common" +msgid_plural "%d contacts in common" +msgstr[0] "" +msgstr[1] "" + +#: include/dfrn.php:1309 +#, php-format +msgid "%s\\'s birthday" +msgstr "" + +#: include/identity.php:45 +msgid "Requested account is not available." +msgstr "" + +#: include/identity.php:54 mod/profile.php:22 +msgid "Requested profile is not available." +msgstr "" + +#: include/identity.php:98 include/identity.php:325 include/identity.php:757 +msgid "Edit profile" +msgstr "" + +#: include/identity.php:265 +msgid "Atom feed" +msgstr "" + +#: include/identity.php:296 +msgid "Manage/edit profiles" +msgstr "" + +#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790 +msgid "Change profile photo" +msgstr "" + +#: include/identity.php:302 mod/profiles.php:791 +msgid "Create New Profile" +msgstr "" + +#: include/identity.php:312 mod/profiles.php:780 +msgid "Profile Image" +msgstr "" + +#: include/identity.php:315 mod/profiles.php:782 +msgid "visible to everybody" +msgstr "" + +#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783 +msgid "Edit visibility" +msgstr "" + +#: include/identity.php:344 include/identity.php:644 mod/directory.php:137 +#: mod/notifications.php:252 +msgid "Gender:" +msgstr "" + +#: include/identity.php:347 include/identity.php:667 mod/directory.php:139 +msgid "Status:" +msgstr "" + +#: include/identity.php:349 include/identity.php:684 mod/directory.php:141 +msgid "Homepage:" +msgstr "" + +#: include/identity.php:351 include/identity.php:704 mod/directory.php:143 +#: mod/notifications.php:248 mod/contacts.php:643 +msgid "About:" +msgstr "" + +#: include/identity.php:353 mod/contacts.php:641 +msgid "XMPP:" +msgstr "" + +#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58 +msgid "Network:" +msgstr "" + +#: include/identity.php:468 include/identity.php:558 +msgid "g A l F d" +msgstr "" + +#: include/identity.php:469 include/identity.php:559 +msgid "F d" +msgstr "" + +#: include/identity.php:520 include/identity.php:609 +msgid "[today]" +msgstr "" + +#: include/identity.php:532 +msgid "Birthday Reminders" +msgstr "" + +#: include/identity.php:533 +msgid "Birthdays this week:" +msgstr "" + +#: include/identity.php:595 +msgid "[No description]" +msgstr "" + +#: include/identity.php:620 +msgid "Event Reminders" +msgstr "" + +#: include/identity.php:621 +msgid "Events this week:" +msgstr "" + +#: include/identity.php:641 mod/settings.php:1287 +msgid "Full Name:" +msgstr "" + +#: include/identity.php:648 +msgid "j F, Y" +msgstr "" + +#: include/identity.php:649 +msgid "j F" +msgstr "" + +#: include/identity.php:663 +msgid "Age:" +msgstr "" + +#: include/identity.php:676 +#, php-format +msgid "for %1$d %2$s" +msgstr "" + +#: include/identity.php:680 mod/profiles.php:706 +msgid "Sexual Preference:" +msgstr "" + +#: include/identity.php:688 mod/profiles.php:733 +msgid "Hometown:" +msgstr "" + +#: include/identity.php:692 mod/notifications.php:250 mod/contacts.php:645 +#: mod/follow.php:139 +msgid "Tags:" +msgstr "" + +#: include/identity.php:696 mod/profiles.php:734 +msgid "Political Views:" +msgstr "" + +#: include/identity.php:700 +msgid "Religion:" +msgstr "" + +#: include/identity.php:708 +msgid "Hobbies/Interests:" +msgstr "" + +#: include/identity.php:712 mod/profiles.php:738 +msgid "Likes:" +msgstr "" + +#: include/identity.php:716 mod/profiles.php:739 +msgid "Dislikes:" +msgstr "" + +#: include/identity.php:720 +msgid "Contact information and Social Networks:" +msgstr "" + +#: include/identity.php:724 +msgid "Musical interests:" +msgstr "" + +#: include/identity.php:728 +msgid "Books, literature:" +msgstr "" + +#: include/identity.php:732 +msgid "Television:" +msgstr "" + +#: include/identity.php:736 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: include/identity.php:740 +msgid "Love/Romance:" +msgstr "" + +#: include/identity.php:744 +msgid "Work/employment:" +msgstr "" + +#: include/identity.php:748 +msgid "School/education:" +msgstr "" + +#: include/identity.php:753 +msgid "Forums:" +msgstr "" + +#: include/identity.php:762 mod/events.php:509 +msgid "Basic" +msgstr "" + +#: include/identity.php:763 mod/contacts.php:881 mod/events.php:510 +#: mod/admin.php:1134 +msgid "Advanced" +msgstr "" + +#: include/identity.php:789 mod/contacts.php:847 mod/follow.php:147 +msgid "Status Messages and Posts" +msgstr "" + +#: include/identity.php:797 mod/contacts.php:855 +msgid "Profile Details" +msgstr "" + +#: include/identity.php:805 mod/photos.php:95 +msgid "Photo Albums" +msgstr "" + +#: include/identity.php:844 mod/notes.php:49 +msgid "Personal Notes" +msgstr "" + +#: include/identity.php:847 +msgid "Only You Can See This" +msgstr "" + #: mod/allfriends.php:48 msgid "No friends to display." msgstr "" @@ -3128,9 +3132,9 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: mod/api.php:108 mod/profiles.php:643 mod/profiles.php:647 -#: mod/profiles.php:673 mod/dfrn_request.php:880 mod/follow.php:115 -#: mod/register.php:248 mod/settings.php:1172 mod/settings.php:1178 +#: mod/api.php:108 mod/dfrn_request.php:880 mod/follow.php:115 +#: mod/profiles.php:643 mod/profiles.php:647 mod/profiles.php:673 +#: mod/register.php:249 mod/settings.php:1172 mod/settings.php:1178 #: mod/settings.php:1185 mod/settings.php:1189 mod/settings.php:1194 #: mod/settings.php:1199 mod/settings.php:1204 mod/settings.php:1209 #: mod/settings.php:1235 mod/settings.php:1236 mod/settings.php:1237 @@ -3210,7 +3214,7 @@ msgstr "" msgid "The post was created" msgstr "" -#: mod/cal.php:145 mod/profile.php:156 mod/display.php:348 +#: mod/cal.php:145 mod/profile.php:156 mod/display.php:351 msgid "Access to this profile has been restricted." msgstr "" @@ -3322,8 +3326,8 @@ msgstr "" #: mod/localtime.php:46 mod/manage.php:156 mod/message.php:340 #: mod/message.php:523 mod/mood.php:139 mod/photos.php:1143 mod/photos.php:1273 #: mod/photos.php:1599 mod/photos.php:1648 mod/photos.php:1690 -#: mod/photos.php:1770 mod/poke.php:204 mod/profiles.php:684 -#: mod/contacts.php:588 mod/events.php:508 object/Item.php:702 +#: mod/photos.php:1770 mod/poke.php:204 mod/contacts.php:588 mod/events.php:508 +#: mod/profiles.php:684 object/Item.php:702 #: view/theme/duepuntozero/config.php:64 view/theme/frio/config.php:67 #: view/theme/quattro/config.php:70 view/theme/vier/config.php:113 msgid "Submit" @@ -3501,7 +3505,7 @@ msgid "" msgstr "" #: mod/crepair.php:170 mod/settings.php:684 mod/settings.php:710 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1538 +#: mod/admin.php:1565 mod/admin.php:1578 mod/admin.php:1591 mod/admin.php:1607 msgid "Name" msgstr "" @@ -3657,10 +3661,10 @@ msgstr "" msgid "%1$s welcomes %2$s" msgstr "" -#: mod/directory.php:33 mod/photos.php:981 mod/probe.php:9 mod/videos.php:200 +#: mod/directory.php:33 mod/photos.php:981 mod/videos.php:200 #: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/community.php:18 -#: mod/dfrn_request.php:804 mod/display.php:213 mod/search.php:96 -#: mod/search.php:102 +#: mod/dfrn_request.php:804 mod/display.php:216 mod/probe.php:9 +#: mod/search.php:96 mod/search.php:102 msgid "Public access denied." msgstr "" @@ -3740,7 +3744,7 @@ msgstr "" msgid "On this server the following remote servers are blocked." msgstr "" -#: mod/friendica.php:115 mod/admin.php:281 mod/admin.php:299 +#: mod/friendica.php:115 mod/admin.php:289 mod/admin.php:307 msgid "Reason for the block" msgstr "" @@ -4830,7 +4834,7 @@ msgstr "" msgid "if applicable" msgstr "" -#: mod/notifications.php:178 mod/notifications.php:263 mod/admin.php:1512 +#: mod/notifications.php:178 mod/notifications.php:263 mod/admin.php:1581 msgid "Approve" msgstr "" @@ -5002,7 +5006,7 @@ msgstr "" msgid "a photo" msgstr "" -#: mod/photos.php:815 mod/profile_photo.php:155 mod/wall_upload.php:181 +#: mod/photos.php:815 mod/wall_upload.php:181 mod/profile_photo.php:155 #, php-format msgid "Image exceeds size limit of %s" msgstr "" @@ -5011,11 +5015,11 @@ msgstr "" msgid "Image file is empty." msgstr "" -#: mod/photos.php:856 mod/profile_photo.php:164 mod/wall_upload.php:218 +#: mod/photos.php:856 mod/wall_upload.php:218 mod/profile_photo.php:164 msgid "Unable to process image." msgstr "" -#: mod/photos.php:885 mod/profile_photo.php:314 mod/wall_upload.php:257 +#: mod/photos.php:885 mod/wall_upload.php:257 mod/profile_photo.php:314 msgid "Image upload failed." msgstr "" @@ -5176,378 +5180,10 @@ msgstr "" msgid "Make this post private" msgstr "" -#: mod/probe.php:10 mod/webfinger.php:11 -msgid "Only logged in users are permitted to perform a probing." -msgstr "" - #: mod/profile.php:176 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:322 -#, 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:136 -msgid "Unable to process image" -msgstr "" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "" - -#: mod/profile_photo.php:256 -#: view/smarty3/compiled/04b5adc938a37b0a51a14fb26634819e90d47ba4.file.filebrowser.tpl.php:119 -msgid "Upload" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "" - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "" - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "" - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "" - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "" - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "" - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "" - -#: mod/profiles.php:567 -msgid " and " -msgstr "" - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "" - -#: mod/profiles.php:579 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr "" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "" - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "" - -#: mod/profiles.php:712 mod/events.php:486 mod/events.php:498 -msgid "Required" -msgstr "" - -#: mod/profiles.php:714 -msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "" - -#: mod/profiles.php:715 -msgid "Your Full Name:" -msgstr "" - -#: mod/profiles.php:716 -msgid "Title/Description:" -msgstr "" - -#: mod/profiles.php:719 -msgid "Street Address:" -msgstr "" - -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "" - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "" - -#: mod/profiles.php:731 -msgid "" -"The XMPP address will be propagated to your contacts so that they can follow " -"you." -msgstr "" - -#: mod/profiles.php:732 -msgid "Homepage URL:" -msgstr "" - -#: mod/profiles.php:735 -msgid "Religious Views:" -msgstr "" - -#: mod/profiles.php:736 -msgid "Public Keywords:" -msgstr "" - -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "" - -#: mod/profiles.php:737 -msgid "Private Keywords:" -msgstr "" - -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" -msgstr "" - -#: mod/profiles.php:740 -msgid "Musical interests" -msgstr "" - -#: mod/profiles.php:741 -msgid "Books, literature" -msgstr "" - -#: mod/profiles.php:742 -msgid "Television" -msgstr "" - -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" -msgstr "" - -#: mod/profiles.php:744 -msgid "Hobbies/Interests" -msgstr "" - -#: mod/profiles.php:745 -msgid "Love/romance" -msgstr "" - -#: mod/profiles.php:746 -msgid "Work/employment" -msgstr "" - -#: mod/profiles.php:747 -msgid "School/education" -msgstr "" - -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" -msgstr "" - -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" -msgstr "" - #: mod/profperm.php:28 mod/profperm.php:59 msgid "Invalid profile identifier." msgstr "" @@ -5564,19 +5200,6 @@ msgstr "" msgid "All Contacts (with secure profile access)" msgstr "" -#: mod/regmod.php:60 -msgid "Account approved." -msgstr "" - -#: mod/regmod.php:88 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: mod/regmod.php:100 -msgid "Please login." -msgstr "" - #: mod/removeme.php:54 mod/removeme.php:57 msgid "Remove My Account" msgstr "" @@ -5655,47 +5278,6 @@ msgstr "" msgid "Export personal data" msgstr "" -#: mod/uimport.php:53 mod/register.php:200 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "" - -#: mod/uimport.php:68 mod/register.php:297 -msgid "Import" -msgstr "" - -#: mod/uimport.php:70 -msgid "Move account" -msgstr "" - -#: mod/uimport.php:71 -msgid "You can import an account from another Friendica server." -msgstr "" - -#: mod/uimport.php:72 -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:73 -msgid "" -"This feature is experimental. We can't import contacts from the OStatus " -"network (GNU Social/Statusnet) or from Diaspora" -msgstr "" - -#: mod/uimport.php:74 -msgid "Account file" -msgstr "" - -#: mod/uimport.php:74 -msgid "" -"To export your account, go to \"Settings->Export your personal data\" and " -"select \"Export account\"" -msgstr "" - #: mod/update_community.php:21 mod/update_display.php:25 #: mod/update_notes.php:38 mod/update_profile.php:37 mod/update_network.php:29 msgid "[Embedded content - reload page to view]" @@ -5772,6 +5354,64 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" +#: mod/webfinger.php:11 mod/probe.php:10 +msgid "Only logged in users are permitted to perform a probing." +msgstr "" + +#: mod/regmod.php:60 +msgid "Account approved." +msgstr "" + +#: mod/regmod.php:88 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: mod/regmod.php:100 +msgid "Please login." +msgstr "" + +#: mod/uimport.php:53 mod/register.php:201 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "" + +#: mod/uimport.php:68 mod/register.php:298 +msgid "Import" +msgstr "" + +#: mod/uimport.php:70 +msgid "Move account" +msgstr "" + +#: mod/uimport.php:71 +msgid "You can import an account from another Friendica server." +msgstr "" + +#: mod/uimport.php:72 +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:73 +msgid "" +"This feature is experimental. We can't import contacts from the OStatus " +"network (GNU Social/Statusnet) or from Diaspora" +msgstr "" + +#: mod/uimport.php:74 +msgid "Account file" +msgstr "" + +#: mod/uimport.php:74 +msgid "" +"To export your account, go to \"Settings->Export your personal data\" and " +"select \"Export account\"" +msgstr "" + #: mod/community.php:23 msgid "Not available." msgstr "" @@ -5858,7 +5498,7 @@ msgstr "" msgid "Private communications are not available for this contact." msgstr "" -#: mod/contacts.php:541 mod/admin.php:984 +#: mod/contacts.php:541 mod/admin.php:1053 msgid "Never" msgstr "" @@ -5887,7 +5527,7 @@ msgstr "" msgid "Fetch further information for feeds" msgstr "" -#: mod/contacts.php:568 mod/admin.php:993 +#: mod/contacts.php:568 mod/admin.php:1062 msgid "Disabled" msgstr "" @@ -5951,12 +5591,12 @@ msgid "Update now" msgstr "" #: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 -#: mod/admin.php:1516 +#: mod/admin.php:1585 msgid "Unblock" msgstr "" #: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 -#: mod/admin.php:1515 +#: mod/admin.php:1584 msgid "Block" msgstr "" @@ -6300,7 +5940,7 @@ msgstr "" msgid "Forum Search - %s" msgstr "" -#: mod/display.php:499 +#: mod/display.php:502 msgid "Item has been removed." msgstr "" @@ -6328,6 +5968,10 @@ msgstr "" msgid "Event Starts:" msgstr "" +#: mod/events.php:486 mod/events.php:498 mod/profiles.php:712 +msgid "Required" +msgstr "" + #: mod/events.php:488 mod/events.php:504 msgid "Finish date/time is not known or not relevant" msgstr "" @@ -6497,102 +6141,461 @@ msgstr "" msgid "{0} requested registration" msgstr "" -#: mod/register.php:95 +#: 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:322 +#, 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:136 +msgid "Unable to process image" +msgstr "" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "" + +#: mod/profile_photo.php:256 +msgid "Upload" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "" + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "" + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "" + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "" + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "" + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "" + +#: mod/profiles.php:567 +msgid " and " +msgstr "" + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "" + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "" + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow " +"you." +msgstr "" + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "" + +#: mod/register.php:96 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: mod/register.php:100 +#: mod/register.php:101 #, php-format msgid "" "Failed to send email message. Here your accout details:<br> login: %s<br> " "password: %s<br><br>You can change your password after login." msgstr "" -#: mod/register.php:107 +#: mod/register.php:108 msgid "Registration successful." msgstr "" -#: mod/register.php:113 +#: mod/register.php:114 msgid "Your registration can not be processed." msgstr "" -#: mod/register.php:162 +#: mod/register.php:163 msgid "Your registration is pending approval by the site owner." msgstr "" -#: mod/register.php:228 +#: mod/register.php:229 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "" -#: mod/register.php:229 +#: mod/register.php:230 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:230 +#: mod/register.php:231 msgid "Your OpenID (optional): " msgstr "" -#: mod/register.php:244 +#: mod/register.php:245 msgid "Include your profile in member directory?" msgstr "" -#: mod/register.php:269 +#: mod/register.php:270 msgid "Note for the admin" msgstr "" -#: mod/register.php:269 +#: mod/register.php:270 msgid "Leave a message for the admin, why you want to join this node" msgstr "" -#: mod/register.php:270 +#: mod/register.php:271 msgid "Membership on this site is by invitation only." msgstr "" -#: mod/register.php:271 +#: mod/register.php:272 msgid "Your invitation ID: " msgstr "" -#: mod/register.php:274 mod/admin.php:1062 +#: mod/register.php:275 mod/admin.php:1131 msgid "Registration" msgstr "" -#: mod/register.php:282 +#: mod/register.php:283 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " msgstr "" -#: mod/register.php:283 +#: mod/register.php:284 msgid "Your Email Address: " msgstr "" -#: mod/register.php:285 mod/settings.php:1279 +#: mod/register.php:286 mod/settings.php:1279 msgid "New Password:" msgstr "" -#: mod/register.php:285 +#: mod/register.php:286 msgid "Leave empty for an auto generated password." msgstr "" -#: mod/register.php:286 mod/settings.php:1280 +#: mod/register.php:287 mod/settings.php:1280 msgid "Confirm:" msgstr "" -#: mod/register.php:287 +#: mod/register.php:288 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be '<strong>nickname@$sitename</" "strong>'." msgstr "" -#: mod/register.php:288 +#: mod/register.php:289 msgid "Choose a nickname: " msgstr "" -#: mod/register.php:298 +#: mod/register.php:299 msgid "Import your profile to this friendica instance" msgstr "" @@ -6613,11 +6616,11 @@ msgstr "" msgid "Items tagged with: %s" msgstr "" -#: mod/settings.php:45 mod/admin.php:1496 +#: mod/settings.php:45 mod/admin.php:1565 msgid "Account" msgstr "" -#: mod/settings.php:54 mod/admin.php:170 +#: mod/settings.php:54 mod/admin.php:174 msgid "Additional features" msgstr "" @@ -6629,7 +6632,7 @@ msgstr "" msgid "Social Networks" msgstr "" -#: mod/settings.php:76 mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 +#: mod/settings.php:76 mod/admin.php:172 mod/admin.php:1691 mod/admin.php:1754 msgid "Plugins" msgstr "" @@ -6715,8 +6718,8 @@ msgstr "" #: mod/settings.php:682 mod/settings.php:793 mod/settings.php:842 #: mod/settings.php:909 mod/settings.php:1006 mod/settings.php:1272 -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 +#: mod/admin.php:1130 mod/admin.php:1755 mod/admin.php:2018 mod/admin.php:2092 +#: mod/admin.php:2245 msgid "Save Settings" msgstr "" @@ -6764,11 +6767,11 @@ msgstr "" msgid "Plugin Settings" msgstr "" -#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +#: mod/settings.php:783 mod/admin.php:2234 mod/admin.php:2235 msgid "Off" msgstr "" -#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +#: mod/settings.php:783 mod/admin.php:2234 mod/admin.php:2235 msgid "On" msgstr "" @@ -6900,7 +6903,7 @@ msgstr "" msgid "Move to folder:" msgstr "" -#: mod/settings.php:944 mod/admin.php:948 +#: mod/settings.php:944 mod/admin.php:1017 msgid "No special theme for mobile devices" msgstr "" @@ -7367,198 +7370,232 @@ msgstr "" msgid "Resend relocate message to contacts" msgstr "" -#: mod/admin.php:97 +#: mod/admin.php:98 msgid "Theme settings updated." msgstr "" -#: mod/admin.php:166 mod/admin.php:1060 +#: mod/admin.php:170 mod/admin.php:1129 msgid "Site" msgstr "" -#: mod/admin.php:167 mod/admin.php:994 mod/admin.php:1504 mod/admin.php:1520 +#: mod/admin.php:171 mod/admin.php:1063 mod/admin.php:1573 mod/admin.php:1589 msgid "Users" msgstr "" -#: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 +#: mod/admin.php:173 mod/admin.php:1967 mod/admin.php:2017 msgid "Themes" msgstr "" -#: mod/admin.php:171 +#: mod/admin.php:175 msgid "DB updates" msgstr "" -#: mod/admin.php:172 mod/admin.php:513 +#: mod/admin.php:176 mod/admin.php:582 msgid "Inspect Queue" msgstr "" -#: mod/admin.php:173 mod/admin.php:289 +#: mod/admin.php:177 mod/admin.php:297 msgid "Server Blocklist" msgstr "" -#: mod/admin.php:174 mod/admin.php:479 +#: mod/admin.php:178 mod/admin.php:548 msgid "Federation Statistics" msgstr "" -#: mod/admin.php:188 mod/admin.php:199 mod/admin.php:2022 +#: mod/admin.php:179 mod/admin.php:374 +msgid "Delete Item" +msgstr "" + +#: mod/admin.php:193 mod/admin.php:204 mod/admin.php:2091 msgid "Logs" msgstr "" -#: mod/admin.php:189 mod/admin.php:2090 +#: mod/admin.php:194 mod/admin.php:2159 msgid "View Logs" msgstr "" -#: mod/admin.php:190 +#: mod/admin.php:195 msgid "probe address" msgstr "" -#: mod/admin.php:191 +#: mod/admin.php:196 msgid "check webfinger" msgstr "" -#: mod/admin.php:198 +#: mod/admin.php:203 msgid "Plugin Features" msgstr "" -#: mod/admin.php:200 +#: mod/admin.php:205 msgid "diagnostics" msgstr "" -#: mod/admin.php:201 +#: mod/admin.php:206 msgid "User registrations waiting for confirmation" msgstr "" -#: mod/admin.php:280 +#: mod/admin.php:288 msgid "The blocked domain" msgstr "" -#: mod/admin.php:281 mod/admin.php:294 +#: mod/admin.php:289 mod/admin.php:302 msgid "The reason why you blocked this domain." msgstr "" -#: mod/admin.php:282 +#: mod/admin.php:290 msgid "Delete domain" msgstr "" -#: mod/admin.php:282 +#: mod/admin.php:290 msgid "Check to delete this entry from the blocklist" msgstr "" -#: mod/admin.php:288 mod/admin.php:478 mod/admin.php:512 mod/admin.php:592 -#: mod/admin.php:1059 mod/admin.php:1503 mod/admin.php:1621 mod/admin.php:1684 -#: mod/admin.php:1897 mod/admin.php:1947 mod/admin.php:2021 mod/admin.php:2089 +#: mod/admin.php:296 mod/admin.php:373 mod/admin.php:547 mod/admin.php:581 +#: mod/admin.php:661 mod/admin.php:1128 mod/admin.php:1572 mod/admin.php:1690 +#: mod/admin.php:1753 mod/admin.php:1966 mod/admin.php:2016 mod/admin.php:2090 +#: mod/admin.php:2158 msgid "Administration" msgstr "" -#: mod/admin.php:290 +#: mod/admin.php:298 msgid "" "This page can be used to define a black list of servers from the federated " "network that are not allowed to interact with your node. For all entered " "domains you should also give a reason why you have blocked the remote server." msgstr "" -#: mod/admin.php:291 +#: mod/admin.php:299 msgid "" "The list of blocked servers will be made publically available on the /" "friendica page so that your users and people investigating communication " "problems can find the reason easily." msgstr "" -#: mod/admin.php:292 +#: mod/admin.php:300 msgid "Add new entry to block list" msgstr "" -#: mod/admin.php:293 +#: mod/admin.php:301 msgid "Server Domain" msgstr "" -#: mod/admin.php:293 +#: mod/admin.php:301 msgid "" "The domain of the new server to add to the block list. Do not include the " "protocol." msgstr "" -#: mod/admin.php:294 +#: mod/admin.php:302 msgid "Block reason" msgstr "" -#: mod/admin.php:295 +#: mod/admin.php:303 msgid "Add Entry" msgstr "" -#: mod/admin.php:296 +#: mod/admin.php:304 msgid "Save changes to the blocklist" msgstr "" -#: mod/admin.php:297 +#: mod/admin.php:305 msgid "Current Entries in the Blocklist" msgstr "" -#: mod/admin.php:300 +#: mod/admin.php:308 msgid "Delete entry from blocklist" msgstr "" -#: mod/admin.php:303 +#: mod/admin.php:311 msgid "Delete entry from blocklist?" msgstr "" -#: mod/admin.php:328 +#: mod/admin.php:336 msgid "Server added to blocklist." msgstr "" -#: mod/admin.php:344 +#: mod/admin.php:352 msgid "Site blocklist updated." msgstr "" -#: mod/admin.php:409 +#: mod/admin.php:375 +msgid "Delete this Item" +msgstr "" + +#: mod/admin.php:376 +msgid "" +"On this page you can delete an item from your node. If the item is a top " +"level posting, the entire thread will be deleted." +msgstr "" + +#: mod/admin.php:377 +msgid "" +"You need to know the GUID of the item. You can find it e.g. by looking at " +"the display URL. The last part of http://example.com/display/123456 is the " +"GUID, here 123456." +msgstr "" + +#: mod/admin.php:378 +msgid "GUID" +msgstr "" + +#: mod/admin.php:378 +msgid "The GUID of the item you want to delete." +msgstr "" + +#: mod/admin.php:415 +msgid "Item marked for deletion." +msgstr "" + +#: mod/admin.php:478 msgid "unknown" msgstr "" -#: mod/admin.php:472 +#: mod/admin.php:541 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:473 +#: mod/admin.php:542 msgid "" "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it " "will improve the data displayed here." msgstr "" -#: mod/admin.php:485 +#: mod/admin.php:554 #, php-format msgid "Currently this node is aware of %d nodes from the following platforms:" msgstr "" -#: mod/admin.php:515 +#: mod/admin.php:584 msgid "ID" msgstr "" -#: mod/admin.php:516 +#: mod/admin.php:585 msgid "Recipient Name" msgstr "" -#: mod/admin.php:517 +#: mod/admin.php:586 msgid "Recipient Profile" msgstr "" -#: mod/admin.php:519 +#: mod/admin.php:588 msgid "Created" msgstr "" -#: mod/admin.php:520 +#: mod/admin.php:589 msgid "Last Tried" msgstr "" -#: mod/admin.php:521 +#: mod/admin.php:590 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:546 +#: mod/admin.php:615 #, php-format msgid "" "Your DB still runs with MyISAM tables. You should change the engine type to " @@ -7569,643 +7606,643 @@ msgid "" "automatic conversion.<br />" msgstr "" -#: mod/admin.php:555 +#: mod/admin.php:624 msgid "" "The database update failed. Please run \"php include/dbstructure.php update" "\" from the command line and have a look at the errors that might appear." msgstr "" -#: mod/admin.php:560 mod/admin.php:1453 +#: mod/admin.php:629 mod/admin.php:1522 msgid "Normal Account" msgstr "" -#: mod/admin.php:561 mod/admin.php:1454 +#: mod/admin.php:630 mod/admin.php:1523 msgid "Automatic Follower Account" msgstr "" -#: mod/admin.php:562 mod/admin.php:1455 +#: mod/admin.php:631 mod/admin.php:1524 msgid "Public Forum Account" msgstr "" -#: mod/admin.php:563 mod/admin.php:1456 +#: mod/admin.php:632 mod/admin.php:1525 msgid "Automatic Friend Account" msgstr "" -#: mod/admin.php:564 +#: mod/admin.php:633 msgid "Blog Account" msgstr "" -#: mod/admin.php:565 +#: mod/admin.php:634 msgid "Private Forum Account" msgstr "" -#: mod/admin.php:587 +#: mod/admin.php:656 msgid "Message queues" msgstr "" -#: mod/admin.php:593 +#: mod/admin.php:662 msgid "Summary" msgstr "" -#: mod/admin.php:595 +#: mod/admin.php:664 msgid "Registered users" msgstr "" -#: mod/admin.php:597 +#: mod/admin.php:666 msgid "Pending registrations" msgstr "" -#: mod/admin.php:598 +#: mod/admin.php:667 msgid "Version" msgstr "" -#: mod/admin.php:603 +#: mod/admin.php:672 msgid "Active plugins" msgstr "" -#: mod/admin.php:628 +#: mod/admin.php:697 msgid "Can not parse base url. Must have at least <scheme>://<domain>" msgstr "" -#: mod/admin.php:920 +#: mod/admin.php:989 msgid "Site settings updated." msgstr "" -#: mod/admin.php:977 +#: mod/admin.php:1046 msgid "No community page" msgstr "" -#: mod/admin.php:978 +#: mod/admin.php:1047 msgid "Public postings from users of this site" msgstr "" -#: mod/admin.php:979 +#: mod/admin.php:1048 msgid "Global community page" msgstr "" -#: mod/admin.php:985 +#: mod/admin.php:1054 msgid "At post arrival" msgstr "" -#: mod/admin.php:995 +#: mod/admin.php:1064 msgid "Users, Global Contacts" msgstr "" -#: mod/admin.php:996 +#: mod/admin.php:1065 msgid "Users, Global Contacts/fallback" msgstr "" -#: mod/admin.php:1000 +#: mod/admin.php:1069 msgid "One month" msgstr "" -#: mod/admin.php:1001 +#: mod/admin.php:1070 msgid "Three months" msgstr "" -#: mod/admin.php:1002 +#: mod/admin.php:1071 msgid "Half a year" msgstr "" -#: mod/admin.php:1003 +#: mod/admin.php:1072 msgid "One year" msgstr "" -#: mod/admin.php:1008 +#: mod/admin.php:1077 msgid "Multi user instance" msgstr "" -#: mod/admin.php:1031 +#: mod/admin.php:1100 msgid "Closed" msgstr "" -#: mod/admin.php:1032 +#: mod/admin.php:1101 msgid "Requires approval" msgstr "" -#: mod/admin.php:1033 +#: mod/admin.php:1102 msgid "Open" msgstr "" -#: mod/admin.php:1037 +#: mod/admin.php:1106 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: mod/admin.php:1038 +#: mod/admin.php:1107 msgid "Force all links to use SSL" msgstr "" -#: mod/admin.php:1039 +#: mod/admin.php:1108 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: mod/admin.php:1063 +#: mod/admin.php:1132 msgid "File upload" msgstr "" -#: mod/admin.php:1064 +#: mod/admin.php:1133 msgid "Policies" msgstr "" -#: mod/admin.php:1066 +#: mod/admin.php:1135 msgid "Auto Discovered Contact Directory" msgstr "" -#: mod/admin.php:1067 +#: mod/admin.php:1136 msgid "Performance" msgstr "" -#: mod/admin.php:1068 +#: mod/admin.php:1137 msgid "Worker" msgstr "" -#: mod/admin.php:1069 +#: mod/admin.php:1138 msgid "" "Relocate - WARNING: advanced function. Could make this server unreachable." msgstr "" -#: mod/admin.php:1072 +#: mod/admin.php:1141 msgid "Site name" msgstr "" -#: mod/admin.php:1073 +#: mod/admin.php:1142 msgid "Host name" msgstr "" -#: mod/admin.php:1074 +#: mod/admin.php:1143 msgid "Sender Email" msgstr "" -#: mod/admin.php:1074 +#: mod/admin.php:1143 msgid "" "The email address your server shall use to send notification emails from." msgstr "" -#: mod/admin.php:1075 +#: mod/admin.php:1144 msgid "Banner/Logo" msgstr "" -#: mod/admin.php:1076 +#: mod/admin.php:1145 msgid "Shortcut icon" msgstr "" -#: mod/admin.php:1076 +#: mod/admin.php:1145 msgid "Link to an icon that will be used for browsers." msgstr "" -#: mod/admin.php:1077 +#: mod/admin.php:1146 msgid "Touch icon" msgstr "" -#: mod/admin.php:1077 +#: mod/admin.php:1146 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "" -#: mod/admin.php:1078 +#: mod/admin.php:1147 msgid "Additional Info" msgstr "" -#: mod/admin.php:1078 +#: mod/admin.php:1147 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/siteinfo." msgstr "" -#: mod/admin.php:1079 +#: mod/admin.php:1148 msgid "System language" msgstr "" -#: mod/admin.php:1080 +#: mod/admin.php:1149 msgid "System theme" msgstr "" -#: mod/admin.php:1080 +#: mod/admin.php:1149 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: mod/admin.php:1081 +#: mod/admin.php:1150 msgid "Mobile system theme" msgstr "" -#: mod/admin.php:1081 +#: mod/admin.php:1150 msgid "Theme for mobile devices" msgstr "" -#: mod/admin.php:1082 +#: mod/admin.php:1151 msgid "SSL link policy" msgstr "" -#: mod/admin.php:1082 +#: mod/admin.php:1151 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: mod/admin.php:1083 +#: mod/admin.php:1152 msgid "Force SSL" msgstr "" -#: mod/admin.php:1083 +#: mod/admin.php:1152 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead " "to endless loops." msgstr "" -#: mod/admin.php:1084 +#: mod/admin.php:1153 msgid "Hide help entry from navigation menu" msgstr "" -#: mod/admin.php:1084 +#: mod/admin.php:1153 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:1085 +#: mod/admin.php:1154 msgid "Single user instance" msgstr "" -#: mod/admin.php:1085 +#: mod/admin.php:1154 msgid "Make this instance multi-user or single-user for the named user" msgstr "" -#: mod/admin.php:1086 +#: mod/admin.php:1155 msgid "Maximum image size" msgstr "" -#: mod/admin.php:1086 +#: mod/admin.php:1155 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: mod/admin.php:1087 +#: mod/admin.php:1156 msgid "Maximum image length" msgstr "" -#: mod/admin.php:1087 +#: mod/admin.php:1156 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "" -#: mod/admin.php:1088 +#: mod/admin.php:1157 msgid "JPEG image quality" msgstr "" -#: mod/admin.php:1088 +#: mod/admin.php:1157 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: mod/admin.php:1090 +#: mod/admin.php:1159 msgid "Register policy" msgstr "" -#: mod/admin.php:1091 +#: mod/admin.php:1160 msgid "Maximum Daily Registrations" msgstr "" -#: mod/admin.php:1091 +#: mod/admin.php:1160 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:1092 +#: mod/admin.php:1161 msgid "Register text" msgstr "" -#: mod/admin.php:1092 +#: mod/admin.php:1161 msgid "Will be displayed prominently on the registration page." msgstr "" -#: mod/admin.php:1093 +#: mod/admin.php:1162 msgid "Accounts abandoned after x days" msgstr "" -#: mod/admin.php:1093 +#: mod/admin.php:1162 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: mod/admin.php:1094 +#: mod/admin.php:1163 msgid "Allowed friend domains" msgstr "" -#: mod/admin.php:1094 +#: mod/admin.php:1163 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:1095 +#: mod/admin.php:1164 msgid "Allowed email domains" msgstr "" -#: mod/admin.php:1095 +#: mod/admin.php:1164 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:1096 +#: mod/admin.php:1165 msgid "Block public" msgstr "" -#: mod/admin.php:1096 +#: mod/admin.php:1165 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:1097 +#: mod/admin.php:1166 msgid "Force publish" msgstr "" -#: mod/admin.php:1097 +#: mod/admin.php:1166 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: mod/admin.php:1098 +#: mod/admin.php:1167 msgid "Global directory URL" msgstr "" -#: mod/admin.php:1098 +#: mod/admin.php:1167 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "" -#: mod/admin.php:1099 +#: mod/admin.php:1168 msgid "Allow threaded items" msgstr "" -#: mod/admin.php:1099 +#: mod/admin.php:1168 msgid "Allow infinite level threading for items on this site." msgstr "" -#: mod/admin.php:1100 +#: mod/admin.php:1169 msgid "Private posts by default for new users" msgstr "" -#: mod/admin.php:1100 +#: mod/admin.php:1169 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: mod/admin.php:1101 +#: mod/admin.php:1170 msgid "Don't include post content in email notifications" msgstr "" -#: mod/admin.php:1101 +#: mod/admin.php:1170 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:1102 +#: mod/admin.php:1171 msgid "Disallow public access to addons listed in the apps menu." msgstr "" -#: mod/admin.php:1102 +#: mod/admin.php:1171 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "" -#: mod/admin.php:1103 +#: mod/admin.php:1172 msgid "Don't embed private images in posts" msgstr "" -#: mod/admin.php:1103 +#: mod/admin.php:1172 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:1104 +#: mod/admin.php:1173 msgid "Allow Users to set remote_self" msgstr "" -#: mod/admin.php:1104 +#: mod/admin.php:1173 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:1105 +#: mod/admin.php:1174 msgid "Block multiple registrations" msgstr "" -#: mod/admin.php:1105 +#: mod/admin.php:1174 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: mod/admin.php:1106 +#: mod/admin.php:1175 msgid "OpenID support" msgstr "" -#: mod/admin.php:1106 +#: mod/admin.php:1175 msgid "OpenID support for registration and logins." msgstr "" -#: mod/admin.php:1107 +#: mod/admin.php:1176 msgid "Fullname check" msgstr "" -#: mod/admin.php:1107 +#: mod/admin.php:1176 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: mod/admin.php:1108 +#: mod/admin.php:1177 msgid "Community Page Style" msgstr "" -#: mod/admin.php:1108 +#: mod/admin.php:1177 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:1109 +#: mod/admin.php:1178 msgid "Posts per user on community page" msgstr "" -#: mod/admin.php:1109 +#: mod/admin.php:1178 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "'Global Community')" msgstr "" -#: mod/admin.php:1110 +#: mod/admin.php:1179 msgid "Enable OStatus support" msgstr "" -#: mod/admin.php:1110 +#: mod/admin.php:1179 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:1111 +#: mod/admin.php:1180 msgid "OStatus conversation completion interval" msgstr "" -#: mod/admin.php:1111 +#: mod/admin.php:1180 msgid "" "How often shall the poller check for new entries in OStatus conversations? " "This can be a very ressource task." msgstr "" -#: mod/admin.php:1112 +#: mod/admin.php:1181 msgid "Only import OStatus threads from our contacts" msgstr "" -#: mod/admin.php:1112 +#: mod/admin.php:1181 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:1113 +#: mod/admin.php:1182 msgid "OStatus support can only be enabled if threading is enabled." msgstr "" -#: mod/admin.php:1115 +#: mod/admin.php:1184 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub " "directory." msgstr "" -#: mod/admin.php:1116 +#: mod/admin.php:1185 msgid "Enable Diaspora support" msgstr "" -#: mod/admin.php:1116 +#: mod/admin.php:1185 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: mod/admin.php:1117 +#: mod/admin.php:1186 msgid "Only allow Friendica contacts" msgstr "" -#: mod/admin.php:1117 +#: mod/admin.php:1186 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: mod/admin.php:1118 +#: mod/admin.php:1187 msgid "Verify SSL" msgstr "" -#: mod/admin.php:1118 +#: mod/admin.php:1187 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:1119 +#: mod/admin.php:1188 msgid "Proxy user" msgstr "" -#: mod/admin.php:1120 +#: mod/admin.php:1189 msgid "Proxy URL" msgstr "" -#: mod/admin.php:1121 +#: mod/admin.php:1190 msgid "Network timeout" msgstr "" -#: mod/admin.php:1121 +#: mod/admin.php:1190 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: mod/admin.php:1122 +#: mod/admin.php:1191 msgid "Maximum Load Average" msgstr "" -#: mod/admin.php:1122 +#: mod/admin.php:1191 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: mod/admin.php:1123 +#: mod/admin.php:1192 msgid "Maximum Load Average (Frontend)" msgstr "" -#: mod/admin.php:1123 +#: mod/admin.php:1192 msgid "Maximum system load before the frontend quits service - default 50." msgstr "" -#: mod/admin.php:1124 +#: mod/admin.php:1193 msgid "Minimal Memory" msgstr "" -#: mod/admin.php:1124 +#: mod/admin.php:1193 msgid "" "Minimal free memory in MB for the poller. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "" -#: mod/admin.php:1125 +#: mod/admin.php:1194 msgid "Maximum table size for optimization" msgstr "" -#: mod/admin.php:1125 +#: mod/admin.php:1194 msgid "" "Maximum table size (in MB) for the automatic optimization - default 100 MB. " "Enter -1 to disable it." msgstr "" -#: mod/admin.php:1126 +#: mod/admin.php:1195 msgid "Minimum level of fragmentation" msgstr "" -#: mod/admin.php:1126 +#: mod/admin.php:1195 msgid "" "Minimum fragmenation level to start the automatic optimization - default " "value is 30%." msgstr "" -#: mod/admin.php:1128 +#: mod/admin.php:1197 msgid "Periodical check of global contacts" msgstr "" -#: mod/admin.php:1128 +#: mod/admin.php:1197 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:1129 +#: mod/admin.php:1198 msgid "Days between requery" msgstr "" -#: mod/admin.php:1129 +#: mod/admin.php:1198 msgid "Number of days after which a server is requeried for his contacts." msgstr "" -#: mod/admin.php:1130 +#: mod/admin.php:1199 msgid "Discover contacts from other servers" msgstr "" -#: mod/admin.php:1130 +#: mod/admin.php:1199 msgid "" "Periodically query other servers for contacts. You can choose between " "'users': the users on the remote system, 'Global Contacts': active contacts " @@ -8215,32 +8252,32 @@ msgid "" "Global Contacts'." msgstr "" -#: mod/admin.php:1131 +#: mod/admin.php:1200 msgid "Timeframe for fetching global contacts" msgstr "" -#: mod/admin.php:1131 +#: mod/admin.php:1200 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:1132 +#: mod/admin.php:1201 msgid "Search the local directory" msgstr "" -#: mod/admin.php:1132 +#: mod/admin.php:1201 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:1134 +#: mod/admin.php:1203 msgid "Publish server information" msgstr "" -#: mod/admin.php:1134 +#: mod/admin.php:1203 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 " @@ -8248,133 +8285,133 @@ msgid "" "href='http://the-federation.info/'>the-federation.info</a> for details." msgstr "" -#: mod/admin.php:1136 +#: mod/admin.php:1205 msgid "Suppress Tags" msgstr "" -#: mod/admin.php:1136 +#: mod/admin.php:1205 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "" -#: mod/admin.php:1137 +#: mod/admin.php:1206 msgid "Path to item cache" msgstr "" -#: mod/admin.php:1137 +#: mod/admin.php:1206 msgid "The item caches buffers generated bbcode and external images." msgstr "" -#: mod/admin.php:1138 +#: mod/admin.php:1207 msgid "Cache duration in seconds" msgstr "" -#: mod/admin.php:1138 +#: mod/admin.php:1207 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:1139 +#: mod/admin.php:1208 msgid "Maximum numbers of comments per post" msgstr "" -#: mod/admin.php:1139 +#: mod/admin.php:1208 msgid "How much comments should be shown for each post? Default value is 100." msgstr "" -#: mod/admin.php:1140 +#: mod/admin.php:1209 msgid "Temp path" msgstr "" -#: mod/admin.php:1140 +#: mod/admin.php:1209 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:1141 +#: mod/admin.php:1210 msgid "Base path to installation" msgstr "" -#: mod/admin.php:1141 +#: mod/admin.php:1210 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:1142 +#: mod/admin.php:1211 msgid "Disable picture proxy" msgstr "" -#: mod/admin.php:1142 +#: mod/admin.php:1211 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on " "systems with very low bandwith." msgstr "" -#: mod/admin.php:1143 +#: mod/admin.php:1212 msgid "Only search in tags" msgstr "" -#: mod/admin.php:1143 +#: mod/admin.php:1212 msgid "On large systems the text search can slow down the system extremely." msgstr "" -#: mod/admin.php:1145 +#: mod/admin.php:1214 msgid "New base url" msgstr "" -#: mod/admin.php:1145 +#: mod/admin.php:1214 msgid "" "Change base url for this server. Sends relocate message to all DFRN contacts " "of all users." msgstr "" -#: mod/admin.php:1147 +#: mod/admin.php:1216 msgid "RINO Encryption" msgstr "" -#: mod/admin.php:1147 +#: mod/admin.php:1216 msgid "Encryption layer between nodes." msgstr "" -#: mod/admin.php:1149 +#: mod/admin.php:1218 msgid "Maximum number of parallel workers" msgstr "" -#: mod/admin.php:1149 +#: mod/admin.php:1218 msgid "" "On shared hosters set this to 2. On larger systems, values of 10 are great. " "Default value is 4." msgstr "" -#: mod/admin.php:1150 +#: mod/admin.php:1219 msgid "Don't use 'proc_open' with the worker" msgstr "" -#: mod/admin.php:1150 +#: mod/admin.php:1219 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:1151 +#: mod/admin.php:1220 msgid "Enable fastlane" msgstr "" -#: mod/admin.php:1151 +#: mod/admin.php:1220 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:1152 +#: mod/admin.php:1221 msgid "Enable frontend worker" msgstr "" -#: mod/admin.php:1152 +#: mod/admin.php:1221 msgid "" "When enabled the Worker process is triggered when backend access is " "performed (e.g. messages being delivered). On smaller sites you might want " @@ -8383,66 +8420,66 @@ msgid "" "on your server. The worker background process needs to be activated for this." msgstr "" -#: mod/admin.php:1182 +#: mod/admin.php:1251 msgid "Update has been marked successful" msgstr "" -#: mod/admin.php:1190 +#: mod/admin.php:1259 #, php-format msgid "Database structure update %s was successfully applied." msgstr "" -#: mod/admin.php:1193 +#: mod/admin.php:1262 #, php-format msgid "Executing of database structure update %s failed with error: %s" msgstr "" -#: mod/admin.php:1207 +#: mod/admin.php:1276 #, php-format msgid "Executing %s failed with error: %s" msgstr "" -#: mod/admin.php:1210 +#: mod/admin.php:1279 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: mod/admin.php:1213 +#: mod/admin.php:1282 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: mod/admin.php:1216 +#: mod/admin.php:1285 #, php-format msgid "There was no additional update function %s that needed to be called." msgstr "" -#: mod/admin.php:1236 +#: mod/admin.php:1305 msgid "No failed updates." msgstr "" -#: mod/admin.php:1237 +#: mod/admin.php:1306 msgid "Check database structure" msgstr "" -#: mod/admin.php:1242 +#: mod/admin.php:1311 msgid "Failed Updates" msgstr "" -#: mod/admin.php:1243 +#: mod/admin.php:1312 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: mod/admin.php:1244 +#: mod/admin.php:1313 msgid "Mark success (if update was manually applied)" msgstr "" -#: mod/admin.php:1245 +#: mod/admin.php:1314 msgid "Attempt to execute this update step automatically" msgstr "" -#: mod/admin.php:1279 +#: mod/admin.php:1348 #, php-format msgid "" "\n" @@ -8450,7 +8487,7 @@ msgid "" "\t\t\t\tthe administrator of %2$s has set up an account for you." msgstr "" -#: mod/admin.php:1282 +#: mod/admin.php:1351 #, php-format msgid "" "\n" @@ -8486,158 +8523,158 @@ msgid "" "\t\t\tThank you and welcome to %4$s." msgstr "" -#: mod/admin.php:1326 +#: mod/admin.php:1395 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:1333 +#: mod/admin.php:1402 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: mod/admin.php:1380 +#: mod/admin.php:1449 #, php-format msgid "User '%s' deleted" msgstr "" -#: mod/admin.php:1388 +#: mod/admin.php:1457 #, php-format msgid "User '%s' unblocked" msgstr "" -#: mod/admin.php:1388 +#: mod/admin.php:1457 #, php-format msgid "User '%s' blocked" msgstr "" -#: mod/admin.php:1496 mod/admin.php:1522 +#: mod/admin.php:1565 mod/admin.php:1591 msgid "Register date" msgstr "" -#: mod/admin.php:1496 mod/admin.php:1522 +#: mod/admin.php:1565 mod/admin.php:1591 msgid "Last login" msgstr "" -#: mod/admin.php:1496 mod/admin.php:1522 +#: mod/admin.php:1565 mod/admin.php:1591 msgid "Last item" msgstr "" -#: mod/admin.php:1505 +#: mod/admin.php:1574 msgid "Add User" msgstr "" -#: mod/admin.php:1506 +#: mod/admin.php:1575 msgid "select all" msgstr "" -#: mod/admin.php:1507 +#: mod/admin.php:1576 msgid "User registrations waiting for confirm" msgstr "" -#: mod/admin.php:1508 +#: mod/admin.php:1577 msgid "User waiting for permanent deletion" msgstr "" -#: mod/admin.php:1509 +#: mod/admin.php:1578 msgid "Request date" msgstr "" -#: mod/admin.php:1510 +#: mod/admin.php:1579 msgid "No registrations." msgstr "" -#: mod/admin.php:1511 +#: mod/admin.php:1580 msgid "Note from the user" msgstr "" -#: mod/admin.php:1513 +#: mod/admin.php:1582 msgid "Deny" msgstr "" -#: mod/admin.php:1517 +#: mod/admin.php:1586 msgid "Site admin" msgstr "" -#: mod/admin.php:1518 +#: mod/admin.php:1587 msgid "Account expired" msgstr "" -#: mod/admin.php:1521 +#: mod/admin.php:1590 msgid "New User" msgstr "" -#: mod/admin.php:1522 +#: mod/admin.php:1591 msgid "Deleted since" msgstr "" -#: mod/admin.php:1527 +#: mod/admin.php:1596 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:1528 +#: mod/admin.php:1597 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:1538 +#: mod/admin.php:1607 msgid "Name of the new user." msgstr "" -#: mod/admin.php:1539 +#: mod/admin.php:1608 msgid "Nickname" msgstr "" -#: mod/admin.php:1539 +#: mod/admin.php:1608 msgid "Nickname of the new user." msgstr "" -#: mod/admin.php:1540 +#: mod/admin.php:1609 msgid "Email address of the new user." msgstr "" -#: mod/admin.php:1583 +#: mod/admin.php:1652 #, php-format msgid "Plugin %s disabled." msgstr "" -#: mod/admin.php:1587 +#: mod/admin.php:1656 #, php-format msgid "Plugin %s enabled." msgstr "" -#: mod/admin.php:1598 mod/admin.php:1850 +#: mod/admin.php:1667 mod/admin.php:1919 msgid "Disable" msgstr "" -#: mod/admin.php:1600 mod/admin.php:1852 +#: mod/admin.php:1669 mod/admin.php:1921 msgid "Enable" msgstr "" -#: mod/admin.php:1623 mod/admin.php:1899 +#: mod/admin.php:1692 mod/admin.php:1968 msgid "Toggle" msgstr "" -#: mod/admin.php:1631 mod/admin.php:1908 +#: mod/admin.php:1700 mod/admin.php:1977 msgid "Author: " msgstr "" -#: mod/admin.php:1632 mod/admin.php:1909 +#: mod/admin.php:1701 mod/admin.php:1978 msgid "Maintainer: " msgstr "" -#: mod/admin.php:1687 +#: mod/admin.php:1756 msgid "Reload active plugins" msgstr "" -#: mod/admin.php:1692 +#: mod/admin.php:1761 #, php-format msgid "" "There are currently no plugins available on your node. You can find the " @@ -8645,70 +8682,70 @@ msgid "" "in the open plugin registry at %2$s" msgstr "" -#: mod/admin.php:1811 +#: mod/admin.php:1880 msgid "No themes found." msgstr "" -#: mod/admin.php:1890 +#: mod/admin.php:1959 msgid "Screenshot" msgstr "" -#: mod/admin.php:1950 +#: mod/admin.php:2019 msgid "Reload active themes" msgstr "" -#: mod/admin.php:1955 +#: mod/admin.php:2024 #, php-format msgid "No themes found on the system. They should be paced in %1$s" msgstr "" -#: mod/admin.php:1956 +#: mod/admin.php:2025 msgid "[Experimental]" msgstr "" -#: mod/admin.php:1957 +#: mod/admin.php:2026 msgid "[Unsupported]" msgstr "" -#: mod/admin.php:1981 +#: mod/admin.php:2050 msgid "Log settings updated." msgstr "" -#: mod/admin.php:2013 +#: mod/admin.php:2082 msgid "PHP log currently enabled." msgstr "" -#: mod/admin.php:2015 +#: mod/admin.php:2084 msgid "PHP log currently disabled." msgstr "" -#: mod/admin.php:2024 +#: mod/admin.php:2093 msgid "Clear" msgstr "" -#: mod/admin.php:2029 +#: mod/admin.php:2098 msgid "Enable Debugging" msgstr "" -#: mod/admin.php:2030 +#: mod/admin.php:2099 msgid "Log file" msgstr "" -#: mod/admin.php:2030 +#: mod/admin.php:2099 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: mod/admin.php:2031 +#: mod/admin.php:2100 msgid "Log level" msgstr "" -#: mod/admin.php:2034 +#: mod/admin.php:2103 msgid "PHP logging" msgstr "" -#: mod/admin.php:2035 +#: mod/admin.php:2104 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 " @@ -8717,12 +8754,12 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "" -#: mod/admin.php:2166 +#: mod/admin.php:2235 #, php-format msgid "Lock feature %s" msgstr "" -#: mod/admin.php:2174 +#: mod/admin.php:2243 msgid "Manage Additional Features" msgstr "" @@ -8730,14 +8767,6 @@ msgstr "" msgid "via" msgstr "" -#: src/App.php:506 -msgid "Delete this item?" -msgstr "" - -#: src/App.php:508 -msgid "show fewer" -msgstr "" - #: view/theme/duepuntozero/config.php:47 msgid "greenzero" msgstr "" @@ -8766,6 +8795,38 @@ msgstr "" msgid "Variations" 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:50 msgid "Default" msgstr "" @@ -8806,38 +8867,6 @@ msgstr "" 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:228 msgid "Guest" msgstr "" @@ -8910,6 +8939,18 @@ msgstr "" msgid "Quick Start" msgstr "" +#: src/App.php:506 +msgid "Delete this item?" +msgstr "" + +#: src/App.php:508 +msgid "show fewer" +msgstr "" + +#: index.php:436 +msgid "toggle mobile" +msgstr "" + #: boot.php:735 #, php-format msgid "Update %s failed. See error logs." @@ -8950,7 +8991,3 @@ msgstr "" #: boot.php:892 msgid "privacy policy" msgstr "" - -#: index.php:436 -msgid "toggle mobile" -msgstr "" From 363322ba78f3bba4c651c12b6ea1704fcc3ae31a Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Mon, 10 Jul 2017 22:35:32 +0000 Subject: [PATCH 151/160] Issue 3571 and Diaspora mail bugfix --- include/diaspora.php | 16 ++++++++++++---- src/Network/Probe.php | 6 ++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 762018b170..58a77dca86 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1529,6 +1529,8 @@ class Diaspora { $person = self::person_by_handle($msg_author); + dba::lock('mail'); + $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1", dbesc($msg_guid), intval($importer["uid"]) @@ -1556,6 +1558,8 @@ class Diaspora { dbesc($msg_created_at) ); + dba::unlock(); + q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($conversation["id"]) @@ -1832,6 +1836,12 @@ class Diaspora { return false; } + $body = diaspora2bb($text); + + $body = self::replace_people_guid($body, $person["url"]); + + dba::lock('mail'); + $r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1", dbesc($guid), intval($importer["uid"]) @@ -1841,10 +1851,6 @@ class Diaspora { return false; } - $body = diaspora2bb($text); - - $body = self::replace_people_guid($body, $person["url"]); - q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`) VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')", intval($importer["uid"]), @@ -1863,6 +1869,8 @@ class Diaspora { dbesc($created_at) ); + dba::unlock(); + q("UPDATE `conv` SET `updated` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($conversation["id"]) diff --git a/src/Network/Probe.php b/src/Network/Probe.php index f0bb17dacd..9b559304d6 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -827,6 +827,12 @@ class Probe { } } + foreach ($webfinger["aliases"] as $alias) { + if (substr($alias, 0, 5) == 'acct:') { + $data["addr"] = substr($alias, 5); + } + } + if (!isset($data["network"]) || ($hcard_url == "")) { return false; } From 41ec057813a9259dca10e179dba8ee6dca2774ba Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 11 Jul 2017 17:34:38 +0000 Subject: [PATCH 152/160] Avoid "Invalid argument" warning in probing. --- src/Network/Probe.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 9b559304d6..9e5f1b8f89 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -827,9 +827,11 @@ class Probe { } } - foreach ($webfinger["aliases"] as $alias) { - if (substr($alias, 0, 5) == 'acct:') { - $data["addr"] = substr($alias, 5); + if (is_array($webfinger["aliases"])) { + foreach ($webfinger["aliases"] as $alias) { + if (substr($alias, 0, 5) == 'acct:') { + $data["addr"] = substr($alias, 5); + } } } From 8ec7f1de56205f0801914f3255831556bb450939 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 11 Jul 2017 18:32:35 +0000 Subject: [PATCH 153/160] Issue 3571: Reworked "get_contact" function --- include/Contact.php | 134 +++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index f99b0d5d0f..a1597cf304 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -517,7 +517,7 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) { * @return integer Contact ID */ function get_contact($url, $uid = 0, $no_update = false) { - logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);; + logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG); $data = array(); $contact_id = 0; @@ -527,39 +527,28 @@ function get_contact($url, $uid = 0, $no_update = false) { } // We first try the nurl (http://server.tld/nick), most common case - $contacts = q("SELECT `id`, `avatar-date` FROM `contact` - WHERE `nurl` = '%s' - AND `uid` = %d", - dbesc(normalise_link($url)), - intval($uid)); - + $contact = dba::select('contact', array('id', 'avatar-date'), array('nurl' => normalise_link($url), 'uid' => $uid), array('limit' => 1)); // Then the addr (nick@server.tld) - if (! dbm::is_result($contacts)) { - $contacts = q("SELECT `id`, `avatar-date` FROM `contact` - WHERE `addr` = '%s' - AND `uid` = %d", - dbesc($url), - intval($uid)); + if (!dbm::is_result($contact)) { + $contact = dba::select('contact', array('id', 'avatar-date'), array('addr' => $url, 'uid' => $uid), array('limit' => 1)); } // Then the alias (which could be anything) - if (! dbm::is_result($contacts)) { - $contacts = q("SELECT `id`, `avatar-date` FROM `contact` - WHERE `alias` IN ('%s', '%s') - AND `uid` = %d", - dbesc($url), - dbesc(normalise_link($url)), - intval($uid)); + if (!dbm::is_result($contact)) { + $r = dba::p("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN (?, ?) AND `uid` = ? LIMIT 1", + $url, normalise_link($url), $uid); + $contact = dba::fetch($r); + dba::close($r); } - if (dbm::is_result($contacts)) { - $contact_id = $contacts[0]["id"]; + if (dbm::is_result($contact)) { + $contact_id = $contact["id"]; // Update the contact every 7 days - $update_photo = ($contacts[0]['avatar-date'] < datetime_convert('','','now -7 days')); + $update_contact = ($contact['avatar-date'] < datetime_convert('','','now -7 days')); - if (!$update_photo || $no_update) { + if (!$update_contact || $no_update) { return $contact_id; } } elseif ($uid != 0) { @@ -576,45 +565,28 @@ function get_contact($url, $uid = 0, $no_update = false) { } // Get data from the gcontact table - $gcontacts = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'", - dbesc(normalise_link($url))); + $gcontacts = dba::select('gcontact', array('name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'), + array('nurl' => normalise_link($url)), array('limit' => 1)); if (!$gcontacts) { return 0; } - $data = $gcontacts[0]; + $data = $gcontacts; } $url = $data["url"]; if (!$contact_id) { - q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, - `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, - `batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`, - `writable`, `blocked`, `readonly`, `pending`) - VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', 1, 0, 0, 0)", - intval($uid), - dbesc(datetime_convert()), - dbesc($data["url"]), - dbesc(normalise_link($data["url"])), - dbesc($data["addr"]), - dbesc($data["alias"]), - dbesc($data["notify"]), - dbesc($data["poll"]), - dbesc($data["name"]), - dbesc($data["nick"]), - dbesc($data["photo"]), - dbesc($data["network"]), - dbesc($data["pubkey"]), - intval(CONTACT_IS_SHARING), - intval($data["priority"]), - dbesc($data["batch"]), - dbesc($data["request"]), - dbesc($data["confirm"]), - dbesc($data["poco"]), - dbesc(datetime_convert()), - dbesc(datetime_convert()) - ); + dba::insert('contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"], + 'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"], + 'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"], + 'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"], + 'network' => $data["network"], 'pubkey' => $data["pubkey"], + 'rel' => CONTACT_IS_SHARING, 'priority' => $data["priority"], + 'batch' => $data["batch"], 'request' => $data["request"], 'confirm' => $data["confirm"], + 'poco' => $data["poco"], 'name-date' => datetime_convert(), + 'uri-date' => datetime_convert(), 'avatar-date' => datetime_convert(), + 'writable' => 1, 'blocked' => 0, 'readonly' => 0, 'pending' => 0)); $contacts = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2", dbesc(normalise_link($data["url"])), @@ -626,49 +598,45 @@ function get_contact($url, $uid = 0, $no_update = false) { $contact_id = $contacts[0]["id"]; // Update the newly created contact from data in the gcontact table - $gcontacts = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'", - dbesc(normalise_link($data["url"]))); - if (dbm::is_result($gcontacts)) { - logger("Update contact " . $data["url"] . ' from gcontact'); - q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d", - dbesc($gcontacts[0]["location"]), dbesc($gcontacts[0]["about"]), dbesc($gcontacts[0]["keywords"]), - dbesc($gcontacts[0]["gender"]), intval($contact_id)); + $gcontact = dba::select('gcontact', array('location', 'about', 'keywords', 'gender'), + array('nurl' => normalise_link($data["url"])), array('limit' => 1)); + if (dbm::is_result($gcontact)) { + dba::update('contact', $gcontact, array('id' => $contact_id)); } - } - if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $url != "") { - q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 AND `id` != %d AND NOT `self`", - dbesc(normalise_link($url)), - intval($contact_id)); + if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") { + dba::e("DELETE FROM `contact` WHERE `nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`", + normalise_link($data["url"]), $contact_id); + } } require_once "Photo.php"; update_contact_avatar($data["photo"], $uid, $contact_id); - $contacts = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contact_id)); + $contact = dba::select('contact', array('addr', 'alias', 'name', 'nick', 'avatar-date'), + array('id' => $contact_id), array('limit' => 1)); // This condition should always be true - if (!dbm::is_result($contacts)) { + if (!dbm::is_result($contact)) { return $contact_id; } - // Only update if there had something been changed - if ($data["addr"] != $contacts[0]["addr"] || - $data["alias"] != $contacts[0]["alias"] || - $data["name"] != $contacts[0]["name"] || - $data["nick"] != $contacts[0]["nick"]) { - q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s', - `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d", - dbesc($data["addr"]), - dbesc($data["alias"]), - dbesc($data["name"]), - dbesc($data["nick"]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($contact_id) - ); + $updated = array('addr' => $data['addr'], + 'alias' => $data['alias'], + 'name' => $data['name'], + 'nick' => $data['nick']); + + if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) { + $updated['uri-date'] = datetime_convert(); } + if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) { + $updated['name-date'] = datetime_convert(); + } + + $updated['avatar-date'] = datetime_convert(); + + dba::update('contact', $updated, array('id' => $contact_id), $contact); return $contact_id; } From 35b3723c4aa1a24e8bcdbc49bd96b47e6d0fe532 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Tue, 11 Jul 2017 19:14:49 +0000 Subject: [PATCH 154/160] database logging now works for database errors --- include/Contact.php | 15 +++++++++++---- include/dba.php | 10 ++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index a1597cf304..fea4a2aaf1 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -577,16 +577,23 @@ function get_contact($url, $uid = 0, $no_update = false) { $url = $data["url"]; if (!$contact_id) { + if (!isset($data['priority'])) { + $data['priority'] = 0; + } + if (!isset($data['batch'])) { + $data['batch'] = ''; + } dba::insert('contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"], 'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"], 'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"], 'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"], 'network' => $data["network"], 'pubkey' => $data["pubkey"], 'rel' => CONTACT_IS_SHARING, 'priority' => $data["priority"], - 'batch' => $data["batch"], 'request' => $data["request"], 'confirm' => $data["confirm"], - 'poco' => $data["poco"], 'name-date' => datetime_convert(), - 'uri-date' => datetime_convert(), 'avatar-date' => datetime_convert(), - 'writable' => 1, 'blocked' => 0, 'readonly' => 0, 'pending' => 0)); + 'batch' => $data["batch"], 'request' => $data["request"], + 'confirm' => $data["confirm"], 'poco' => $data["poco"], + 'name-date' => datetime_convert(), 'uri-date' => datetime_convert(), + 'avatar-date' => datetime_convert(), 'writable' => 1, 'blocked' => 0, + 'readonly' => 0, 'pending' => 0)); $contacts = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2", dbesc(normalise_link($data["url"])), diff --git a/include/dba.php b/include/dba.php index e39e6f136e..49ec956453 100644 --- a/include/dba.php +++ b/include/dba.php @@ -647,8 +647,11 @@ class dba { $error = self::$dbo->error; $errorno = self::$dbo->errorno; + $sql = $args[0]; + array_shift($args); + logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n". - $a->callstack(8))."\n".self::replace_parameters($sql, $args); + $a->callstack(8)."\n".self::replace_parameters($sql, $args)); self::$dbo->error = $error; self::$dbo->errorno = $errorno; @@ -711,8 +714,11 @@ class dba { $error = self::$dbo->error; $errorno = self::$dbo->errorno; + $sql = $args[0]; + array_shift($args); + logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n". - $a->callstack(8))."\n".self::replace_parameters($sql, $args); + $a->callstack(8)."\n".self::replace_parameters($sql, $args)); self::$dbo->error = $error; self::$dbo->errorno = $errorno; From a47e1e13d72015d38dc6c45619aee8c0d13fd557 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 12 Jul 2017 05:56:35 +0000 Subject: [PATCH 155/160] Process all data that we can fetch via probing --- include/Contact.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index fea4a2aaf1..9307bfdded 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -567,26 +567,20 @@ function get_contact($url, $uid = 0, $no_update = false) { // Get data from the gcontact table $gcontacts = dba::select('gcontact', array('name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'), array('nurl' => normalise_link($url)), array('limit' => 1)); - if (!$gcontacts) { + if (!dbm::is_result($gcontacts)) { return 0; } - $data = $gcontacts; + $data = array_merge($data, $gcontacts); } $url = $data["url"]; - if (!$contact_id) { - if (!isset($data['priority'])) { - $data['priority'] = 0; - } - if (!isset($data['batch'])) { - $data['batch'] = ''; - } dba::insert('contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"], 'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"], 'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"], 'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"], + 'keywords' => $data["keywords"], 'location' => $data["location"], 'about' => $data["about"], 'network' => $data["network"], 'pubkey' => $data["pubkey"], 'rel' => CONTACT_IS_SHARING, 'priority' => $data["priority"], 'batch' => $data["batch"], 'request' => $data["request"], @@ -608,6 +602,16 @@ function get_contact($url, $uid = 0, $no_update = false) { $gcontact = dba::select('gcontact', array('location', 'about', 'keywords', 'gender'), array('nurl' => normalise_link($data["url"])), array('limit' => 1)); if (dbm::is_result($gcontact)) { + // Only use the information when the probing hadn't fetched these values + if ($data['keywords'] != '') { + unset($gcontact['keywords']); + } + if ($data['location'] != '') { + unset($gcontact['location']); + } + if ($data['about'] != '') { + unset($gcontact['about']); + } dba::update('contact', $gcontact, array('id' => $contact_id)); } From 69f20959ff330dd34ca2e01b3562b4f64c3d83dd Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 12 Jul 2017 06:07:22 +0000 Subject: [PATCH 156/160] Update existing contact records with data from probing --- include/Contact.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/Contact.php b/include/Contact.php index 9307bfdded..feeb040acc 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -625,7 +625,7 @@ function get_contact($url, $uid = 0, $no_update = false) { update_contact_avatar($data["photo"], $uid, $contact_id); - $contact = dba::select('contact', array('addr', 'alias', 'name', 'nick', 'avatar-date'), + $contact = dba::select('contact', array('addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date'), array('id' => $contact_id), array('limit' => 1)); // This condition should always be true @@ -638,6 +638,16 @@ function get_contact($url, $uid = 0, $no_update = false) { 'name' => $data['name'], 'nick' => $data['nick']); + if ($data['keywords'] != '') { + $updated['keywords'] = $data['keywords']; + } + if ($data['location'] != '') { + $updated['location'] = $data['location']; + } + if ($data['about'] != '') { + $updated['about'] = $data['about']; + } + if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) { $updated['uri-date'] = datetime_convert(); } From 8654b028ec8105880d1e71f25f0688eff0fbcaf3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Wed, 12 Jul 2017 08:26:26 +0200 Subject: [PATCH 157/160] DE translations --- view/lang/de/messages.po | 3707 +++++++++++++++++++------------------- view/lang/de/strings.php | 664 +++---- 2 files changed, 2208 insertions(+), 2163 deletions(-) diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po index fb0982d590..ac2426c7f4 100644 --- a/view/lang/de/messages.po +++ b/view/lang/de/messages.po @@ -36,8 +36,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-19 16:23+0700\n" -"PO-Revision-Date: 2017-07-07 06:21+0000\n" +"POT-Creation-Date: 2017-07-10 18:59+0200\n" +"PO-Revision-Date: 2017-07-12 06:12+0000\n" "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n" "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -46,327 +46,6 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: include/ForumManager.php:116 include/nav.php:133 include/text.php:1094 -#: view/theme/vier/theme.php:248 -msgid "Forums" -msgstr "Foren" - -#: include/ForumManager.php:118 view/theme/vier/theme.php:250 -msgid "External link to forum" -msgstr "Externer Link zum Forum" - -#: include/ForumManager.php:121 include/contact_widgets.php:271 -#: include/items.php:2432 mod/content.php:625 object/Item.php:417 -#: src/App.php:507 view/theme/vier/theme.php:253 -msgid "show more" -msgstr "mehr anzeigen" - -#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 -msgid "l F d, Y \\@ g:i A" -msgstr "l, d. F Y\\, H:i" - -#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 -#: include/event.php:459 -msgid "Starts:" -msgstr "Beginnt:" - -#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 -#: include/event.php:460 -msgid "Finishes:" -msgstr "Endet:" - -#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 -#: include/event.php:461 include/identity.php:342 mod/directory.php:135 -#: mod/notifications.php:246 mod/contacts.php:639 mod/events.php:496 -msgid "Location:" -msgstr "Ort:" - -#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 -msgid "Miscellaneous" -msgstr "Verschiedenes" - -#: include/datetime.php:196 include/identity.php:656 -msgid "Birthday:" -msgstr "Geburtstag:" - -#: include/datetime.php:198 mod/profiles.php:724 -msgid "Age: " -msgstr "Alter: " - -#: include/datetime.php:200 -msgid "YYYY-MM-DD or MM-DD" -msgstr "YYYY-MM-DD oder MM-DD" - -#: include/datetime.php:370 -msgid "never" -msgstr "nie" - -#: include/datetime.php:376 -msgid "less than a second ago" -msgstr "vor weniger als einer Sekunde" - -#: include/datetime.php:379 -msgid "year" -msgstr "Jahr" - -#: include/datetime.php:379 -msgid "years" -msgstr "Jahre" - -#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 -#: mod/events.php:387 -msgid "month" -msgstr "Monat" - -#: include/datetime.php:380 -msgid "months" -msgstr "Monate" - -#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 -#: mod/events.php:388 -msgid "week" -msgstr "Woche" - -#: include/datetime.php:381 -msgid "weeks" -msgstr "Wochen" - -#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 -#: mod/events.php:389 -msgid "day" -msgstr "Tag" - -#: include/datetime.php:382 -msgid "days" -msgstr "Tage" - -#: include/datetime.php:383 -msgid "hour" -msgstr "Stunde" - -#: include/datetime.php:383 -msgid "hours" -msgstr "Stunden" - -#: include/datetime.php:384 -msgid "minute" -msgstr "Minute" - -#: include/datetime.php:384 -msgid "minutes" -msgstr "Minuten" - -#: include/datetime.php:385 -msgid "second" -msgstr "Sekunde" - -#: include/datetime.php:385 -msgid "seconds" -msgstr "Sekunden" - -#: include/datetime.php:394 -#, php-format -msgid "%1$d %2$s ago" -msgstr "vor %1$d %2$s" - -#: include/datetime.php:620 -#, php-format -msgid "%s's birthday" -msgstr "%ss Geburtstag" - -#: include/datetime.php:621 include/dfrn.php:1310 -#, php-format -msgid "Happy Birthday %s" -msgstr "Herzlichen Glückwunsch %s" - -#: include/event.php:408 -msgid "all-day" -msgstr "ganztägig" - -#: include/event.php:410 -msgid "Sun" -msgstr "So" - -#: include/event.php:411 -msgid "Mon" -msgstr "Mo" - -#: include/event.php:412 -msgid "Tue" -msgstr "Di" - -#: include/event.php:413 -msgid "Wed" -msgstr "Mi" - -#: include/event.php:414 -msgid "Thu" -msgstr "Do" - -#: include/event.php:415 -msgid "Fri" -msgstr "Fr" - -#: include/event.php:416 -msgid "Sat" -msgstr "Sa" - -#: include/event.php:418 include/text.php:1199 mod/settings.php:982 -msgid "Sunday" -msgstr "Sonntag" - -#: include/event.php:419 include/text.php:1199 mod/settings.php:982 -msgid "Monday" -msgstr "Montag" - -#: include/event.php:420 include/text.php:1199 -msgid "Tuesday" -msgstr "Dienstag" - -#: include/event.php:421 include/text.php:1199 -msgid "Wednesday" -msgstr "Mittwoch" - -#: include/event.php:422 include/text.php:1199 -msgid "Thursday" -msgstr "Donnerstag" - -#: include/event.php:423 include/text.php:1199 -msgid "Friday" -msgstr "Freitag" - -#: include/event.php:424 include/text.php:1199 -msgid "Saturday" -msgstr "Samstag" - -#: include/event.php:426 -msgid "Jan" -msgstr "Jan" - -#: include/event.php:427 -msgid "Feb" -msgstr "Feb" - -#: include/event.php:428 -msgid "Mar" -msgstr "März" - -#: include/event.php:429 -msgid "Apr" -msgstr "Apr" - -#: include/event.php:430 include/event.php:443 include/text.php:1203 -msgid "May" -msgstr "Mai" - -#: include/event.php:431 -msgid "Jun" -msgstr "Jun" - -#: include/event.php:432 -msgid "Jul" -msgstr "Juli" - -#: include/event.php:433 -msgid "Aug" -msgstr "Aug" - -#: include/event.php:434 -msgid "Sept" -msgstr "Sep" - -#: include/event.php:435 -msgid "Oct" -msgstr "Okt" - -#: include/event.php:436 -msgid "Nov" -msgstr "Nov" - -#: include/event.php:437 -msgid "Dec" -msgstr "Dez" - -#: include/event.php:439 include/text.php:1203 -msgid "January" -msgstr "Januar" - -#: include/event.php:440 include/text.php:1203 -msgid "February" -msgstr "Februar" - -#: include/event.php:441 include/text.php:1203 -msgid "March" -msgstr "März" - -#: include/event.php:442 include/text.php:1203 -msgid "April" -msgstr "April" - -#: include/event.php:444 include/text.php:1203 -msgid "June" -msgstr "Juni" - -#: include/event.php:445 include/text.php:1203 -msgid "July" -msgstr "Juli" - -#: include/event.php:446 include/text.php:1203 -msgid "August" -msgstr "August" - -#: include/event.php:447 include/text.php:1203 -msgid "September" -msgstr "September" - -#: include/event.php:448 include/text.php:1203 -msgid "October" -msgstr "Oktober" - -#: include/event.php:449 include/text.php:1203 -msgid "November" -msgstr "November" - -#: include/event.php:450 include/text.php:1203 -msgid "December" -msgstr "Dezember" - -#: include/event.php:452 mod/cal.php:280 mod/events.php:386 -msgid "today" -msgstr "Heute" - -#: include/event.php:457 -msgid "No events to display" -msgstr "Keine Veranstaltung zum Anzeigen" - -#: include/event.php:570 -msgid "l, F j" -msgstr "l, F j" - -#: include/event.php:592 -msgid "Edit event" -msgstr "Veranstaltung bearbeiten" - -#: include/event.php:593 -msgid "Delete event" -msgstr "Veranstaltung löschen" - -#: include/event.php:619 include/text.php:1601 include/text.php:1608 -msgid "link to source" -msgstr "Link zum Originalbeitrag" - -#: include/event.php:873 -msgid "Export" -msgstr "Exportieren" - -#: include/event.php:874 -msgid "Export calendar as ical" -msgstr "Kalender als ical exportieren" - -#: include/event.php:875 -msgid "Export calendar as csv" -msgstr "Kalender als csv exportieren" - #: include/features.php:65 msgid "General Features" msgstr "Allgemeine Features" @@ -526,7 +205,7 @@ msgstr "Beitragskategorien" msgid "Add categories to your posts" msgstr "Eigene Beiträge mit Kategorien versehen" -#: include/features.php:104 include/contact_widgets.php:162 +#: include/features.php:104 include/contact_widgets.php:166 msgid "Saved Folders" msgstr "Gespeicherte Ordner" @@ -566,7 +245,140 @@ msgstr "Erweiterte Profil-Einstellungen" msgid "Show visitors public community forums at the Advanced Profile Page" msgstr "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite" -#: include/like.php:30 include/conversation.php:154 include/diaspora.php:1649 +#: include/ForumManager.php:116 include/nav.php:133 include/text.php:1109 +#: view/theme/vier/theme.php:248 +msgid "Forums" +msgstr "Foren" + +#: include/ForumManager.php:118 view/theme/vier/theme.php:250 +msgid "External link to forum" +msgstr "Externer Link zum Forum" + +#: include/ForumManager.php:121 include/items.php:2436 +#: include/contact_widgets.php:275 mod/content.php:625 object/Item.php:417 +#: view/theme/vier/theme.php:253 src/App.php:507 +msgid "show more" +msgstr "mehr anzeigen" + +#: include/bb2diaspora.php:233 include/event.php:19 mod/localtime.php:13 +msgid "l F d, Y \\@ g:i A" +msgstr "l, d. F Y\\, H:i" + +#: include/bb2diaspora.php:239 include/event.php:36 include/event.php:56 +#: include/event.php:459 +msgid "Starts:" +msgstr "Beginnt:" + +#: include/bb2diaspora.php:247 include/event.php:39 include/event.php:62 +#: include/event.php:460 +msgid "Finishes:" +msgstr "Endet:" + +#: include/bb2diaspora.php:256 include/event.php:43 include/event.php:69 +#: include/event.php:461 include/identity.php:342 mod/directory.php:135 +#: mod/notifications.php:246 mod/contacts.php:639 mod/events.php:496 +msgid "Location:" +msgstr "Ort:" + +#: include/datetime.php:66 include/datetime.php:68 mod/profiles.php:701 +msgid "Miscellaneous" +msgstr "Verschiedenes" + +#: include/datetime.php:196 include/identity.php:656 +msgid "Birthday:" +msgstr "Geburtstag:" + +#: include/datetime.php:198 mod/profiles.php:724 +msgid "Age: " +msgstr "Alter: " + +#: include/datetime.php:200 +msgid "YYYY-MM-DD or MM-DD" +msgstr "YYYY-MM-DD oder MM-DD" + +#: include/datetime.php:370 +msgid "never" +msgstr "nie" + +#: include/datetime.php:376 +msgid "less than a second ago" +msgstr "vor weniger als einer Sekunde" + +#: include/datetime.php:379 +msgid "year" +msgstr "Jahr" + +#: include/datetime.php:379 +msgid "years" +msgstr "Jahre" + +#: include/datetime.php:380 include/event.php:453 mod/cal.php:281 +#: mod/events.php:387 +msgid "month" +msgstr "Monat" + +#: include/datetime.php:380 +msgid "months" +msgstr "Monate" + +#: include/datetime.php:381 include/event.php:454 mod/cal.php:282 +#: mod/events.php:388 +msgid "week" +msgstr "Woche" + +#: include/datetime.php:381 +msgid "weeks" +msgstr "Wochen" + +#: include/datetime.php:382 include/event.php:455 mod/cal.php:283 +#: mod/events.php:389 +msgid "day" +msgstr "Tag" + +#: include/datetime.php:382 +msgid "days" +msgstr "Tage" + +#: include/datetime.php:383 +msgid "hour" +msgstr "Stunde" + +#: include/datetime.php:383 +msgid "hours" +msgstr "Stunden" + +#: include/datetime.php:384 +msgid "minute" +msgstr "Minute" + +#: include/datetime.php:384 +msgid "minutes" +msgstr "Minuten" + +#: include/datetime.php:385 +msgid "second" +msgstr "Sekunde" + +#: include/datetime.php:385 +msgid "seconds" +msgstr "Sekunden" + +#: include/datetime.php:394 +#, php-format +msgid "%1$d %2$s ago" +msgstr "vor %1$d %2$s" + +#: include/datetime.php:620 +#, php-format +msgid "%s's birthday" +msgstr "%ss Geburtstag" + +#: include/datetime.php:621 include/dfrn.php:1310 +#, php-format +msgid "Happy Birthday %s" +msgstr "Herzlichen Glückwunsch %s" + +#: include/like.php:30 include/conversation.php:154 include/diaspora.php:1657 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" @@ -592,23 +404,214 @@ msgid "%1$s may attend %2$s's %3$s" msgstr "%1$s nimmt eventuell an %2$ss %3$s teil." #: include/like.php:181 include/conversation.php:142 -#: include/conversation.php:294 include/text.php:1873 mod/subthread.php:89 +#: include/conversation.php:294 include/text.php:1898 mod/subthread.php:89 #: mod/tagger.php:63 msgid "photo" msgstr "Foto" #: include/like.php:181 include/conversation.php:137 #: include/conversation.php:147 include/conversation.php:289 -#: include/conversation.php:298 include/diaspora.php:1653 mod/subthread.php:89 +#: include/conversation.php:298 include/diaspora.php:1661 mod/subthread.php:89 #: mod/tagger.php:63 msgid "status" msgstr "Status" #: include/like.php:183 include/conversation.php:134 -#: include/conversation.php:286 include/text.php:1871 +#: include/conversation.php:286 include/text.php:1896 msgid "event" msgstr "Event" +#: include/uimport.php:85 +msgid "Error decoding account file" +msgstr "Fehler beim Verarbeiten der Account Datei" + +#: include/uimport.php:91 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?" + +#: include/uimport.php:108 include/uimport.php:119 +msgid "Error! Cannot check nickname" +msgstr "Fehler! Konnte den Nickname nicht überprüfen." + +#: include/uimport.php:112 include/uimport.php:123 +#, php-format +msgid "User '%s' already exists on this server!" +msgstr "Nutzer '%s' existiert bereits auf diesem Server!" + +#: include/uimport.php:145 +msgid "User creation error" +msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten" + +#: include/uimport.php:166 +msgid "User profile creation error" +msgstr "Fehler beim Anlegen des Nutzerkontos" + +#: include/uimport.php:215 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "%d Kontakt nicht importiert" +msgstr[1] "%d Kontakte nicht importiert" + +#: include/uimport.php:281 +msgid "Done. You can now login with your username and password" +msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden" + +#: include/user.php:39 mod/settings.php:377 +msgid "Passwords do not match. Password unchanged." +msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." + +#: include/user.php:48 +msgid "An invitation is required." +msgstr "Du benötigst eine Einladung." + +#: include/user.php:53 +msgid "Invitation could not be verified." +msgstr "Die Einladung konnte nicht überprüft werden." + +#: include/user.php:61 +msgid "Invalid OpenID url" +msgstr "Ungültige OpenID URL" + +#: include/user.php:75 include/auth.php:139 +msgid "" +"We encountered a problem while logging in with the OpenID you provided. " +"Please check the correct spelling of the ID." +msgstr "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast." + +#: include/user.php:75 include/auth.php:139 +msgid "The error message was:" +msgstr "Die Fehlermeldung lautete:" + +#: include/user.php:82 +msgid "Please enter the required information." +msgstr "Bitte trage die erforderlichen Informationen ein." + +#: include/user.php:96 +msgid "Please use a shorter name." +msgstr "Bitte verwende einen kürzeren Namen." + +#: include/user.php:98 +msgid "Name too short." +msgstr "Der Name ist zu kurz." + +#: include/user.php:106 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein." + +#: include/user.php:111 +msgid "Your email domain is not among those allowed on this site." +msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt." + +#: include/user.php:114 +msgid "Not a valid email address." +msgstr "Keine gültige E-Mail-Adresse." + +#: include/user.php:127 +msgid "Cannot use that email." +msgstr "Konnte diese E-Mail-Adresse nicht verwenden." + +#: include/user.php:133 +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." +msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen." + +#: include/user.php:140 include/user.php:228 +msgid "Nickname is already registered. Please choose another." +msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." + +#: include/user.php:150 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." + +#: include/user.php:166 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." + +#: include/user.php:214 +msgid "An error occurred during registration. Please try again." +msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." + +#: include/user.php:237 view/theme/duepuntozero/config.php:46 +msgid "default" +msgstr "Standard" + +#: include/user.php:247 +msgid "An error occurred creating your default profile. Please try again." +msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." + +#: include/user.php:260 include/user.php:264 include/profile_selectors.php:42 +msgid "Friends" +msgstr "Kontakte" + +#: include/user.php:306 include/user.php:314 include/user.php:322 +#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 +#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 +#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 +#: mod/profile_photo.php:90 mod/profile_photo.php:214 +#: mod/profile_photo.php:309 mod/profile_photo.php:319 +msgid "Profile Photos" +msgstr "Profilbilder" + +#: include/user.php:397 +#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden." + +#: include/user.php:407 +#, php-format +msgid "Registration at %s" +msgstr "Registrierung als %s" + +#: include/user.php:417 +#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet." + +#: include/user.php:421 +#, 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 "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s." + +#: include/user.php:453 mod/admin.php:1383 +#, php-format +msgid "Registration details for %s" +msgstr "Details der Registration von %s" + #: include/profile_selectors.php:6 msgid "Male" msgstr "Männlich" @@ -755,10 +758,6 @@ msgstr "Untreu" msgid "Sex Addict" msgstr "Sexbesessen" -#: include/profile_selectors.php:42 include/user.php:260 include/user.php:264 -msgid "Friends" -msgstr "Kontakte" - #: include/profile_selectors.php:42 msgid "Friends/Benefits" msgstr "Freunde/Zuwendungen" @@ -843,276 +842,17 @@ msgstr "Ist mir nicht wichtig" msgid "Ask me" msgstr "Frag mich" -#: include/security.php:63 -msgid "Welcome " -msgstr "Willkommen " - -#: include/security.php:64 -msgid "Please upload a profile photo." -msgstr "Bitte lade ein Profilbild hoch." - -#: include/security.php:67 -msgid "Welcome back " -msgstr "Willkommen zurück " - -#: include/security.php:431 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." - -#: include/uimport.php:85 -msgid "Error decoding account file" -msgstr "Fehler beim Verarbeiten der Account Datei" - -#: include/uimport.php:91 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?" - -#: include/uimport.php:108 include/uimport.php:119 -msgid "Error! Cannot check nickname" -msgstr "Fehler! Konnte den Nickname nicht überprüfen." - -#: include/uimport.php:112 include/uimport.php:123 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "Nutzer '%s' existiert bereits auf diesem Server!" - -#: include/uimport.php:145 -msgid "User creation error" -msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten" - -#: include/uimport.php:166 -msgid "User profile creation error" -msgstr "Fehler beim Anlegen des Nutzerkontos" - -#: include/uimport.php:215 -#, php-format -msgid "%d contact not imported" -msgid_plural "%d contacts not imported" -msgstr[0] "%d Kontakt nicht importiert" -msgstr[1] "%d Kontakte nicht importiert" - -#: include/uimport.php:281 -msgid "Done. You can now login with your username and password" -msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden" - -#: include/user.php:39 mod/settings.php:377 -msgid "Passwords do not match. Password unchanged." -msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." - -#: include/user.php:48 -msgid "An invitation is required." -msgstr "Du benötigst eine Einladung." - -#: include/user.php:53 -msgid "Invitation could not be verified." -msgstr "Die Einladung konnte nicht überprüft werden." - -#: include/user.php:61 -msgid "Invalid OpenID url" -msgstr "Ungültige OpenID URL" - -#: include/user.php:75 include/auth.php:139 -msgid "" -"We encountered a problem while logging in with the OpenID you provided. " -"Please check the correct spelling of the ID." -msgstr "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast." - -#: include/user.php:75 include/auth.php:139 -msgid "The error message was:" -msgstr "Die Fehlermeldung lautete:" - -#: include/user.php:82 -msgid "Please enter the required information." -msgstr "Bitte trage die erforderlichen Informationen ein." - -#: include/user.php:96 -msgid "Please use a shorter name." -msgstr "Bitte verwende einen kürzeren Namen." - -#: include/user.php:98 -msgid "Name too short." -msgstr "Der Name ist zu kurz." - -#: include/user.php:106 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein." - -#: include/user.php:111 -msgid "Your email domain is not among those allowed on this site." -msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt." - -#: include/user.php:114 -msgid "Not a valid email address." -msgstr "Keine gültige E-Mail-Adresse." - -#: include/user.php:127 -msgid "Cannot use that email." -msgstr "Konnte diese E-Mail-Adresse nicht verwenden." - -#: include/user.php:133 -msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." -msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen." - -#: include/user.php:140 include/user.php:228 -msgid "Nickname is already registered. Please choose another." -msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." - -#: include/user.php:150 -msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." -msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." - -#: include/user.php:166 -msgid "SERIOUS ERROR: Generation of security keys failed." -msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." - -#: include/user.php:214 -msgid "An error occurred during registration. Please try again." -msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." - -#: include/user.php:237 view/theme/duepuntozero/config.php:46 -msgid "default" -msgstr "Standard" - -#: include/user.php:247 -msgid "An error occurred creating your default profile. Please try again." -msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." - -#: include/user.php:306 include/user.php:314 include/user.php:322 -#: include/api.php:3702 mod/photos.php:73 mod/photos.php:189 -#: mod/photos.php:776 mod/photos.php:1258 mod/photos.php:1279 -#: mod/photos.php:1865 mod/profile_photo.php:74 mod/profile_photo.php:82 -#: mod/profile_photo.php:90 mod/profile_photo.php:214 -#: mod/profile_photo.php:309 mod/profile_photo.php:319 -msgid "Profile Photos" -msgstr "Profilbilder" - -#: include/user.php:397 -#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden." - -#: include/user.php:407 -#, php-format -msgid "Registration at %s" -msgstr "Registrierung als %s" - -#: include/user.php:417 -#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet." - -#: include/user.php:421 -#, 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 "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s." - -#: include/user.php:453 mod/admin.php:1314 -#, php-format -msgid "Registration details for %s" -msgstr "Details der Registration von %s" - -#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 -#: include/conversation.php:1005 include/conversation.php:1021 -#: mod/allfriends.php:70 mod/directory.php:153 mod/match.php:76 -#: mod/suggest.php:84 mod/dirfind.php:211 -msgid "View Profile" -msgstr "Profil anschauen" - -#: include/Contact.php:389 include/contact_widgets.php:34 -#: include/conversation.php:1018 mod/allfriends.php:71 mod/match.php:77 -#: mod/suggest.php:85 mod/contacts.php:613 mod/dirfind.php:212 -#: mod/follow.php:108 -msgid "Connect/Follow" -msgstr "Verbinden/Folgen" - -#: include/Contact.php:432 include/conversation.php:1004 -msgid "View Status" -msgstr "Pinnwand anschauen" - -#: include/Contact.php:434 include/conversation.php:1006 -msgid "View Photos" -msgstr "Bilder anschauen" - -#: include/Contact.php:435 include/conversation.php:1007 -msgid "Network Posts" -msgstr "Netzwerkbeiträge" - -#: include/Contact.php:436 include/conversation.php:1008 -msgid "View Contact" -msgstr "Kontakt anzeigen" - -#: include/Contact.php:437 -msgid "Drop Contact" -msgstr "Kontakt löschen" - -#: include/Contact.php:438 include/conversation.php:1009 -msgid "Send PM" -msgstr "Private Nachricht senden" - -#: include/Contact.php:439 include/conversation.php:1013 -msgid "Poke" -msgstr "Anstupsen" - -#: include/Contact.php:819 -msgid "Organisation" -msgstr "Organisation" - -#: include/Contact.php:822 -msgid "News" -msgstr "Nachrichten" - -#: include/Contact.php:825 -msgid "Forum" -msgstr "Forum" - #: include/NotificationsManager.php:155 msgid "System" msgstr "System" -#: include/NotificationsManager.php:162 include/nav.php:160 mod/admin.php:518 +#: include/NotificationsManager.php:162 include/nav.php:160 mod/admin.php:587 #: view/theme/frio/theme.php:255 msgid "Network" msgstr "Netzwerk" -#: include/NotificationsManager.php:169 mod/profiles.php:699 -#: mod/network.php:835 +#: include/NotificationsManager.php:169 mod/network.php:835 +#: mod/profiles.php:699 msgid "Personal" msgstr "Persönlich" @@ -1297,19 +1037,19 @@ msgstr "OK, wahrscheinlich harmlos" msgid "Reputable, has my trust" msgstr "Seriös, hat mein Vertrauen" -#: include/contact_selectors.php:56 mod/admin.php:986 +#: include/contact_selectors.php:56 mod/admin.php:1055 msgid "Frequently" msgstr "immer wieder" -#: include/contact_selectors.php:57 mod/admin.php:987 +#: include/contact_selectors.php:57 mod/admin.php:1056 msgid "Hourly" msgstr "Stündlich" -#: include/contact_selectors.php:58 mod/admin.php:988 +#: include/contact_selectors.php:58 mod/admin.php:1057 msgid "Twice daily" msgstr "Zweimal täglich" -#: include/contact_selectors.php:59 mod/admin.php:989 +#: include/contact_selectors.php:59 mod/admin.php:1058 msgid "Daily" msgstr "Täglich" @@ -1334,7 +1074,7 @@ msgid "RSS/Atom" msgstr "RSS/Atom" #: include/contact_selectors.php:79 include/contact_selectors.php:86 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1540 +#: mod/admin.php:1565 mod/admin.php:1578 mod/admin.php:1591 mod/admin.php:1609 msgid "Email" msgstr "E-Mail" @@ -1391,87 +1131,6 @@ msgstr "pnut" msgid "App.net" msgstr "App.net" -#: include/contact_widgets.php:8 -msgid "Add New Contact" -msgstr "Neuen Kontakt hinzufügen" - -#: include/contact_widgets.php:9 -msgid "Enter address or web location" -msgstr "Adresse oder Web-Link eingeben" - -#: include/contact_widgets.php:10 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Beispiel: bob@example.com, http://example.com/barbara" - -#: include/contact_widgets.php:12 include/identity.php:230 -#: mod/allfriends.php:87 mod/match.php:92 mod/suggest.php:103 -#: mod/dirfind.php:209 -msgid "Connect" -msgstr "Verbinden" - -#: include/contact_widgets.php:26 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "%d Einladung verfügbar" -msgstr[1] "%d Einladungen verfügbar" - -#: include/contact_widgets.php:32 -msgid "Find People" -msgstr "Leute finden" - -#: include/contact_widgets.php:33 -msgid "Enter name or interest" -msgstr "Name oder Interessen eingeben" - -#: include/contact_widgets.php:35 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Beispiel: Robert Morgenstein, Angeln" - -#: include/contact_widgets.php:36 mod/directory.php:202 mod/contacts.php:809 -msgid "Find" -msgstr "Finde" - -#: include/contact_widgets.php:37 mod/suggest.php:116 -#: view/theme/vier/theme.php:195 -msgid "Friend Suggestions" -msgstr "Kontaktvorschläge" - -#: include/contact_widgets.php:38 view/theme/vier/theme.php:194 -msgid "Similar Interests" -msgstr "Ähnliche Interessen" - -#: include/contact_widgets.php:39 -msgid "Random Profile" -msgstr "Zufälliges Profil" - -#: include/contact_widgets.php:40 view/theme/vier/theme.php:196 -msgid "Invite Friends" -msgstr "Freunde einladen" - -#: include/contact_widgets.php:127 -msgid "Networks" -msgstr "Netzwerke" - -#: include/contact_widgets.php:130 -msgid "All Networks" -msgstr "Alle Netzwerke" - -#: include/contact_widgets.php:165 include/contact_widgets.php:200 -msgid "Everything" -msgstr "Alles" - -#: include/contact_widgets.php:197 -msgid "Categories" -msgstr "Kategorien" - -#: include/contact_widgets.php:266 -#, php-format -msgid "%d contact in common" -msgid_plural "%d contacts in common" -msgstr[0] "%d gemeinsamer Kontakt" -msgstr[1] "%d gemeinsame Kontakte" - #: include/conversation.php:160 #, php-format msgid "%1$s attends %2$s's %3$s" @@ -1548,7 +1207,7 @@ msgstr "Auswählen" #: include/conversation.php:749 mod/content.php:455 mod/content.php:761 #: mod/photos.php:1731 mod/contacts.php:819 mod/contacts.php:1018 -#: mod/settings.php:745 mod/admin.php:1514 object/Item.php:138 +#: mod/settings.php:745 mod/admin.php:1583 object/Item.php:138 msgid "Delete" msgstr "Löschen" @@ -1595,6 +1254,44 @@ msgstr "Lösche die markierten Beiträge" msgid "Follow Thread" msgstr "Folge der Unterhaltung" +#: include/conversation.php:1004 include/Contact.php:432 +msgid "View Status" +msgstr "Pinnwand anschauen" + +#: include/conversation.php:1005 include/conversation.php:1021 +#: include/Contact.php:375 include/Contact.php:388 include/Contact.php:433 +#: mod/allfriends.php:70 mod/directory.php:153 mod/match.php:76 +#: mod/suggest.php:84 mod/dirfind.php:211 +msgid "View Profile" +msgstr "Profil anschauen" + +#: include/conversation.php:1006 include/Contact.php:434 +msgid "View Photos" +msgstr "Bilder anschauen" + +#: include/conversation.php:1007 include/Contact.php:435 +msgid "Network Posts" +msgstr "Netzwerkbeiträge" + +#: include/conversation.php:1008 include/Contact.php:436 +msgid "View Contact" +msgstr "Kontakt anzeigen" + +#: include/conversation.php:1009 include/Contact.php:438 +msgid "Send PM" +msgstr "Private Nachricht senden" + +#: include/conversation.php:1013 include/Contact.php:439 +msgid "Poke" +msgstr "Anstupsen" + +#: include/conversation.php:1018 include/Contact.php:389 +#: include/contact_widgets.php:36 mod/allfriends.php:71 mod/match.php:77 +#: mod/suggest.php:85 mod/contacts.php:613 mod/dirfind.php:212 +#: mod/follow.php:108 +msgid "Connect/Follow" +msgstr "Verbinden/Folgen" + #: include/conversation.php:1140 #, php-format msgid "%s likes this." @@ -1802,7 +1499,7 @@ msgstr "Öffentlicher Beitrag" msgid "Preview" msgstr "Vorschau" -#: include/conversation.php:1318 include/items.php:2165 mod/editpost.php:140 +#: include/conversation.php:1318 include/items.php:2169 mod/editpost.php:140 #: mod/fbrowser.php:102 mod/fbrowser.php:137 mod/message.php:211 #: mod/photos.php:247 mod/photos.php:339 mod/suggest.php:34 mod/tagrm.php:13 #: mod/tagrm.php:98 mod/videos.php:134 mod/contacts.php:458 @@ -1853,7 +1550,7 @@ msgid_plural "Not Attending" msgstr[0] "Nicht teilnehmend " msgstr[1] "Nicht teilnehmend" -#: include/dba.php:59 include/dba_pdo.php:76 +#: include/dba.php:59 include/dba_pdo.php:75 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln." @@ -1879,7 +1576,7 @@ msgid "" "[pre]%s[/pre]" msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]" -#: include/dbstructure.php:195 +#: include/dbstructure.php:196 #, php-format msgid "" "\n" @@ -1887,15 +1584,15 @@ msgid "" "%s\n" msgstr "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n" -#: include/dbstructure.php:198 +#: include/dbstructure.php:199 msgid "Errors encountered performing database changes: " msgstr "Fehler beim Ändern der Datenbank aufgetreten" -#: include/dbstructure.php:206 +#: include/dbstructure.php:207 msgid ": Database update" msgstr ": Datenbank Update" -#: include/dbstructure.php:438 +#: include/dbstructure.php:439 #, php-format msgid "%s: updating %s table." msgstr "%s: aktualisiere Tabelle %s" @@ -1908,16 +1605,11 @@ msgstr "(kein Betreff)" msgid "noreply" msgstr "noreply" -#: include/dfrn.php:1309 -#, php-format -msgid "%s\\'s birthday" -msgstr "%ss Geburtstag" - -#: include/diaspora.php:2214 +#: include/diaspora.php:2222 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: include/diaspora.php:3234 +#: include/diaspora.php:3180 msgid "Attachments:" msgstr "Anhänge:" @@ -2214,12 +1906,200 @@ msgstr "Kompletter Name:\t%1$s\\nURL der Seite:\t%2$s\\nLogin Name:\t%3$s (%4$s) msgid "Please visit %s to approve or reject the request." msgstr "Bitte besuche %s um die Anfrage zu bearbeiten." +#: include/event.php:408 +msgid "all-day" +msgstr "ganztägig" + +#: include/event.php:410 +msgid "Sun" +msgstr "So" + +#: include/event.php:411 +msgid "Mon" +msgstr "Mo" + +#: include/event.php:412 +msgid "Tue" +msgstr "Di" + +#: include/event.php:413 +msgid "Wed" +msgstr "Mi" + +#: include/event.php:414 +msgid "Thu" +msgstr "Do" + +#: include/event.php:415 +msgid "Fri" +msgstr "Fr" + +#: include/event.php:416 +msgid "Sat" +msgstr "Sa" + +#: include/event.php:418 include/text.php:1212 mod/settings.php:982 +msgid "Sunday" +msgstr "Sonntag" + +#: include/event.php:419 include/text.php:1212 mod/settings.php:982 +msgid "Monday" +msgstr "Montag" + +#: include/event.php:420 include/text.php:1212 +msgid "Tuesday" +msgstr "Dienstag" + +#: include/event.php:421 include/text.php:1212 +msgid "Wednesday" +msgstr "Mittwoch" + +#: include/event.php:422 include/text.php:1212 +msgid "Thursday" +msgstr "Donnerstag" + +#: include/event.php:423 include/text.php:1212 +msgid "Friday" +msgstr "Freitag" + +#: include/event.php:424 include/text.php:1212 +msgid "Saturday" +msgstr "Samstag" + +#: include/event.php:426 +msgid "Jan" +msgstr "Jan" + +#: include/event.php:427 +msgid "Feb" +msgstr "Feb" + +#: include/event.php:428 +msgid "Mar" +msgstr "März" + +#: include/event.php:429 +msgid "Apr" +msgstr "Apr" + +#: include/event.php:430 include/event.php:443 include/text.php:1216 +msgid "May" +msgstr "Mai" + +#: include/event.php:431 +msgid "Jun" +msgstr "Jun" + +#: include/event.php:432 +msgid "Jul" +msgstr "Juli" + +#: include/event.php:433 +msgid "Aug" +msgstr "Aug" + +#: include/event.php:434 +msgid "Sept" +msgstr "Sep" + +#: include/event.php:435 +msgid "Oct" +msgstr "Okt" + +#: include/event.php:436 +msgid "Nov" +msgstr "Nov" + +#: include/event.php:437 +msgid "Dec" +msgstr "Dez" + +#: include/event.php:439 include/text.php:1216 +msgid "January" +msgstr "Januar" + +#: include/event.php:440 include/text.php:1216 +msgid "February" +msgstr "Februar" + +#: include/event.php:441 include/text.php:1216 +msgid "March" +msgstr "März" + +#: include/event.php:442 include/text.php:1216 +msgid "April" +msgstr "April" + +#: include/event.php:444 include/text.php:1216 +msgid "June" +msgstr "Juni" + +#: include/event.php:445 include/text.php:1216 +msgid "July" +msgstr "Juli" + +#: include/event.php:446 include/text.php:1216 +msgid "August" +msgstr "August" + +#: include/event.php:447 include/text.php:1216 +msgid "September" +msgstr "September" + +#: include/event.php:448 include/text.php:1216 +msgid "October" +msgstr "Oktober" + +#: include/event.php:449 include/text.php:1216 +msgid "November" +msgstr "November" + +#: include/event.php:450 include/text.php:1216 +msgid "December" +msgstr "Dezember" + +#: include/event.php:452 mod/cal.php:280 mod/events.php:386 +msgid "today" +msgstr "Heute" + +#: include/event.php:457 +msgid "No events to display" +msgstr "Keine Veranstaltung zum Anzeigen" + +#: include/event.php:570 +msgid "l, F j" +msgstr "l, F j" + +#: include/event.php:592 +msgid "Edit event" +msgstr "Veranstaltung bearbeiten" + +#: include/event.php:593 +msgid "Delete event" +msgstr "Veranstaltung löschen" + +#: include/event.php:619 include/text.php:1620 include/text.php:1627 +msgid "link to source" +msgstr "Link zum Originalbeitrag" + +#: include/event.php:877 +msgid "Export" +msgstr "Exportieren" + +#: include/event.php:878 +msgid "Export calendar as ical" +msgstr "Kalender als ical exportieren" + +#: include/event.php:879 +msgid "Export calendar as csv" +msgstr "Kalender als csv exportieren" + #: include/follow.php:84 mod/dfrn_request.php:514 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." #: include/follow.php:89 mod/friendica.php:115 mod/dfrn_request.php:520 -#: mod/admin.php:280 mod/admin.php:298 +#: mod/admin.php:288 mod/admin.php:306 msgid "Blocked domain" msgstr "Blockierte Daimain" @@ -2321,283 +2201,24 @@ msgstr "Kontakte in keiner Gruppe" msgid "add" msgstr "hinzufügen" -#: include/identity.php:45 -msgid "Requested account is not available." -msgstr "Das angefragte Profil ist nicht vorhanden." - -#: include/identity.php:54 mod/profile.php:22 -msgid "Requested profile is not available." -msgstr "Das angefragte Profil ist nicht vorhanden." - -#: include/identity.php:98 include/identity.php:325 include/identity.php:755 -msgid "Edit profile" -msgstr "Profil bearbeiten" - -#: include/identity.php:265 -msgid "Atom feed" -msgstr "Atom-Feed" - -#: include/identity.php:296 include/nav.php:191 -msgid "Profiles" -msgstr "Profile" - -#: include/identity.php:296 -msgid "Manage/edit profiles" -msgstr "Profile verwalten/editieren" - -#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790 -msgid "Change profile photo" -msgstr "Profilbild ändern" - -#: include/identity.php:302 mod/profiles.php:791 -msgid "Create New Profile" -msgstr "Neues Profil anlegen" - -#: include/identity.php:312 mod/profiles.php:780 -msgid "Profile Image" -msgstr "Profilbild" - -#: include/identity.php:315 mod/profiles.php:782 -msgid "visible to everybody" -msgstr "sichtbar für jeden" - -#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783 -msgid "Edit visibility" -msgstr "Sichtbarkeit bearbeiten" - -#: include/identity.php:344 include/identity.php:644 mod/directory.php:137 -#: mod/notifications.php:252 -msgid "Gender:" -msgstr "Geschlecht:" - -#: include/identity.php:347 include/identity.php:665 mod/directory.php:139 -msgid "Status:" -msgstr "Status:" - -#: include/identity.php:349 include/identity.php:682 mod/directory.php:141 -msgid "Homepage:" -msgstr "Homepage:" - -#: include/identity.php:351 include/identity.php:702 mod/directory.php:143 -#: mod/notifications.php:248 mod/contacts.php:643 -msgid "About:" -msgstr "Über:" - -#: include/identity.php:353 mod/contacts.php:641 -msgid "XMPP:" -msgstr "XMPP:" - -#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58 -msgid "Network:" -msgstr "Netzwerk:" - -#: include/identity.php:468 include/identity.php:558 -msgid "g A l F d" -msgstr "l, d. F G \\U\\h\\r" - -#: include/identity.php:469 include/identity.php:559 -msgid "F d" -msgstr "d. F" - -#: include/identity.php:520 include/identity.php:609 -msgid "[today]" -msgstr "[heute]" - -#: include/identity.php:532 -msgid "Birthday Reminders" -msgstr "Geburtstagserinnerungen" - -#: include/identity.php:533 -msgid "Birthdays this week:" -msgstr "Geburtstage diese Woche:" - -#: include/identity.php:595 -msgid "[No description]" -msgstr "[keine Beschreibung]" - -#: include/identity.php:620 -msgid "Event Reminders" -msgstr "Veranstaltungserinnerungen" - -#: include/identity.php:621 -msgid "Events this week:" -msgstr "Veranstaltungen diese Woche" - -#: include/identity.php:632 include/identity.php:759 include/identity.php:792 -#: include/nav.php:84 mod/newmember.php:20 mod/profperm.php:107 -#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 -msgid "Profile" -msgstr "Profil" - -#: include/identity.php:641 mod/settings.php:1287 -msgid "Full Name:" -msgstr "Kompletter Name:" - -#: include/identity.php:648 -msgid "j F, Y" -msgstr "j F, Y" - -#: include/identity.php:649 -msgid "j F" -msgstr "j F" - -#: include/identity.php:661 -msgid "Age:" -msgstr "Alter:" - -#: include/identity.php:674 -#, php-format -msgid "for %1$d %2$s" -msgstr "für %1$d %2$s" - -#: include/identity.php:678 mod/profiles.php:706 -msgid "Sexual Preference:" -msgstr "Sexuelle Vorlieben:" - -#: include/identity.php:686 mod/profiles.php:733 -msgid "Hometown:" -msgstr "Heimatort:" - -#: include/identity.php:690 mod/notifications.php:250 mod/contacts.php:645 -#: mod/follow.php:139 -msgid "Tags:" -msgstr "Tags:" - -#: include/identity.php:694 mod/profiles.php:734 -msgid "Political Views:" -msgstr "Politische Ansichten:" - -#: include/identity.php:698 -msgid "Religion:" -msgstr "Religion:" - -#: include/identity.php:706 -msgid "Hobbies/Interests:" -msgstr "Hobbies/Interessen:" - -#: include/identity.php:710 mod/profiles.php:738 -msgid "Likes:" -msgstr "Likes:" - -#: include/identity.php:714 mod/profiles.php:739 -msgid "Dislikes:" -msgstr "Dislikes:" - -#: include/identity.php:718 -msgid "Contact information and Social Networks:" -msgstr "Kontaktinformationen und Soziale Netzwerke:" - -#: include/identity.php:722 -msgid "Musical interests:" -msgstr "Musikalische Interessen:" - -#: include/identity.php:726 -msgid "Books, literature:" -msgstr "Literatur/Bücher:" - -#: include/identity.php:730 -msgid "Television:" -msgstr "Fernsehen:" - -#: include/identity.php:734 -msgid "Film/dance/culture/entertainment:" -msgstr "Filme/Tänze/Kultur/Unterhaltung:" - -#: include/identity.php:738 -msgid "Love/Romance:" -msgstr "Liebesleben:" - -#: include/identity.php:742 -msgid "Work/employment:" -msgstr "Arbeit/Beschäftigung:" - -#: include/identity.php:746 -msgid "School/education:" -msgstr "Schule/Ausbildung:" - -#: include/identity.php:751 -msgid "Forums:" -msgstr "Foren:" - -#: include/identity.php:760 mod/events.php:509 -msgid "Basic" -msgstr "Allgemein" - -#: include/identity.php:761 mod/contacts.php:881 mod/events.php:510 -#: mod/admin.php:1065 -msgid "Advanced" -msgstr "Erweitert" - -#: include/identity.php:784 include/nav.php:83 mod/contacts.php:648 -#: mod/contacts.php:844 view/theme/frio/theme.php:248 -msgid "Status" -msgstr "Status" - -#: include/identity.php:787 mod/contacts.php:847 mod/follow.php:147 -msgid "Status Messages and Posts" -msgstr "Statusnachrichten und Beiträge" - -#: include/identity.php:795 mod/contacts.php:855 -msgid "Profile Details" -msgstr "Profildetails" - -#: include/identity.php:800 include/nav.php:85 mod/fbrowser.php:33 -#: view/theme/frio/theme.php:250 -msgid "Photos" -msgstr "Bilder" - -#: include/identity.php:803 mod/photos.php:95 -msgid "Photo Albums" -msgstr "Fotoalben" - -#: include/identity.php:808 include/identity.php:811 include/nav.php:86 -#: view/theme/frio/theme.php:251 -msgid "Videos" -msgstr "Videos" - -#: include/identity.php:820 include/identity.php:831 include/nav.php:87 -#: include/nav.php:151 mod/cal.php:272 mod/events.php:377 -#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 -msgid "Events" -msgstr "Veranstaltungen" - -#: include/identity.php:823 include/identity.php:834 include/nav.php:151 -#: view/theme/frio/theme.php:256 -msgid "Events and Calendar" -msgstr "Ereignisse und Kalender" - -#: include/identity.php:842 mod/notes.php:49 -msgid "Personal Notes" -msgstr "Persönliche Notizen" - -#: include/identity.php:845 -msgid "Only You Can See This" -msgstr "Nur Du kannst das sehen" - -#: include/identity.php:853 include/identity.php:856 include/nav.php:130 -#: include/nav.php:194 include/text.php:1091 mod/viewcontacts.php:124 -#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 -msgid "Contacts" -msgstr "Kontakte" - #: include/items.php:1736 mod/dfrn_confirm.php:738 mod/dfrn_request.php:759 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" #: include/items.php:2121 mod/notice.php:17 mod/viewsrc.php:16 -#: mod/display.php:117 mod/display.php:289 mod/display.php:504 -#: mod/admin.php:248 mod/admin.php:1571 mod/admin.php:1822 +#: mod/display.php:120 mod/display.php:292 mod/display.php:507 +#: mod/admin.php:256 mod/admin.php:1640 mod/admin.php:1891 msgid "Item not found." msgstr "Beitrag nicht gefunden." -#: include/items.php:2160 +#: include/items.php:2164 msgid "Do you really want to delete this item?" msgstr "Möchtest Du wirklich dieses Item löschen?" -#: include/items.php:2162 mod/api.php:107 mod/message.php:208 -#: mod/profiles.php:643 mod/profiles.php:646 mod/profiles.php:673 +#: include/items.php:2166 mod/api.php:107 mod/message.php:208 #: mod/suggest.php:31 mod/contacts.php:455 mod/dfrn_request.php:880 -#: mod/follow.php:115 mod/register.php:247 mod/settings.php:1172 +#: mod/follow.php:115 mod/profiles.php:643 mod/profiles.php:646 +#: mod/profiles.php:673 mod/register.php:248 mod/settings.php:1172 #: mod/settings.php:1178 mod/settings.php:1185 mod/settings.php:1189 #: mod/settings.php:1194 mod/settings.php:1199 mod/settings.php:1204 #: mod/settings.php:1209 mod/settings.php:1235 mod/settings.php:1236 @@ -2605,28 +2226,28 @@ msgstr "Möchtest Du wirklich dieses Item löschen?" msgid "Yes" msgstr "Ja" -#: include/items.php:2309 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 +#: include/items.php:2313 mod/allfriends.php:14 mod/api.php:28 mod/api.php:33 #: mod/attach.php:35 mod/cal.php:301 mod/common.php:20 mod/crepair.php:105 #: mod/delegate.php:14 mod/dfrn_confirm.php:63 mod/editpost.php:12 #: mod/fsuggest.php:80 mod/group.php:20 mod/invite.php:17 mod/invite.php:105 #: mod/manage.php:103 mod/message.php:48 mod/message.php:173 mod/mood.php:116 #: mod/nogroup.php:29 mod/notes.php:25 mod/notifications.php:73 #: mod/ostatus_subscribe.php:11 mod/photos.php:168 mod/photos.php:1111 -#: mod/poke.php:155 mod/profile_photo.php:19 mod/profile_photo.php:179 -#: mod/profile_photo.php:190 mod/profile_photo.php:203 mod/profiles.php:172 -#: mod/profiles.php:610 mod/regmod.php:106 mod/repair_ostatus.php:11 -#: mod/suggest.php:60 mod/uimport.php:26 mod/viewcontacts.php:49 -#: mod/wall_attach.php:69 mod/wall_attach.php:72 mod/wall_upload.php:101 -#: mod/wall_upload.php:104 mod/wallmessage.php:11 mod/wallmessage.php:35 -#: mod/wallmessage.php:75 mod/wallmessage.php:99 mod/contacts.php:363 -#: mod/dirfind.php:15 mod/display.php:501 mod/events.php:188 mod/follow.php:13 +#: mod/poke.php:155 mod/repair_ostatus.php:11 mod/suggest.php:60 +#: mod/viewcontacts.php:49 mod/wall_attach.php:69 mod/wall_attach.php:72 +#: mod/wall_upload.php:101 mod/wall_upload.php:104 mod/wallmessage.php:11 +#: mod/wallmessage.php:35 mod/wallmessage.php:75 mod/wallmessage.php:99 +#: mod/regmod.php:106 mod/uimport.php:26 mod/contacts.php:363 +#: mod/dirfind.php:15 mod/display.php:504 mod/events.php:188 mod/follow.php:13 #: mod/follow.php:76 mod/follow.php:160 mod/item.php:197 mod/item.php:209 -#: mod/network.php:7 mod/register.php:44 mod/settings.php:24 +#: mod/network.php:7 mod/profile_photo.php:19 mod/profile_photo.php:179 +#: mod/profile_photo.php:190 mod/profile_photo.php:203 mod/profiles.php:172 +#: mod/profiles.php:610 mod/register.php:45 mod/settings.php:24 #: mod/settings.php:132 mod/settings.php:669 index.php:410 msgid "Permission denied." msgstr "Zugriff verweigert." -#: include/items.php:2426 +#: include/items.php:2430 msgid "Archives" msgstr "Archiv" @@ -2642,7 +2263,7 @@ msgstr "Keine Neuigkeiten" msgid "Clear notifications" msgstr "Bereinige Benachrichtigungen" -#: include/nav.php:42 include/text.php:1084 +#: include/nav.php:42 include/text.php:1099 msgid "@name, !forum, #tags, content" msgstr "@name, !forum, #tags, content" @@ -2654,22 +2275,49 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" +#: include/nav.php:83 include/identity.php:786 mod/contacts.php:648 +#: mod/contacts.php:844 view/theme/frio/theme.php:248 +msgid "Status" +msgstr "Status" + #: include/nav.php:83 include/nav.php:163 view/theme/frio/theme.php:248 msgid "Your posts and conversations" msgstr "Deine Beiträge und Unterhaltungen" +#: include/nav.php:84 include/identity.php:632 include/identity.php:761 +#: include/identity.php:794 mod/newmember.php:20 mod/profperm.php:107 +#: mod/contacts.php:650 mod/contacts.php:852 view/theme/frio/theme.php:249 +msgid "Profile" +msgstr "Profil" + #: include/nav.php:84 view/theme/frio/theme.php:249 msgid "Your profile page" msgstr "Deine Profilseite" +#: include/nav.php:85 include/identity.php:802 mod/fbrowser.php:33 +#: view/theme/frio/theme.php:250 +msgid "Photos" +msgstr "Bilder" + #: include/nav.php:85 view/theme/frio/theme.php:250 msgid "Your photos" msgstr "Deine Fotos" +#: include/nav.php:86 include/identity.php:810 include/identity.php:813 +#: view/theme/frio/theme.php:251 +msgid "Videos" +msgstr "Videos" + #: include/nav.php:86 view/theme/frio/theme.php:251 msgid "Your videos" msgstr "Deine Videos" +#: include/nav.php:87 include/nav.php:151 include/identity.php:822 +#: include/identity.php:833 mod/cal.php:272 mod/events.php:377 +#: view/theme/frio/theme.php:252 view/theme/frio/theme.php:256 +msgid "Events" +msgstr "Veranstaltungen" + #: include/nav.php:87 view/theme/frio/theme.php:252 msgid "Your events" msgstr "Deine Ereignisse" @@ -2694,7 +2342,7 @@ msgstr "Anmelden" msgid "Home Page" msgstr "Homepage" -#: include/nav.php:111 mod/register.php:291 boot.php:848 +#: include/nav.php:111 mod/register.php:292 boot.php:848 msgid "Register" msgstr "Registrieren" @@ -2718,7 +2366,7 @@ msgstr "Apps" msgid "Addon applications, utilities, games" msgstr "Addon Anwendungen, Dienstprogramme, Spiele" -#: include/nav.php:125 include/text.php:1081 mod/search.php:152 +#: include/nav.php:125 include/text.php:1096 mod/search.php:152 msgid "Search" msgstr "Suche" @@ -2726,14 +2374,20 @@ msgstr "Suche" msgid "Search site content" msgstr "Inhalt der Seite durchsuchen" -#: include/nav.php:128 include/text.php:1089 +#: include/nav.php:128 include/text.php:1104 msgid "Full Text" msgstr "Volltext" -#: include/nav.php:129 include/text.php:1090 +#: include/nav.php:129 include/text.php:1105 msgid "Tags" msgstr "Tags" +#: include/nav.php:130 include/nav.php:194 include/text.php:1106 +#: include/identity.php:855 include/identity.php:858 mod/viewcontacts.php:124 +#: mod/contacts.php:803 mod/contacts.php:864 view/theme/frio/theme.php:259 +msgid "Contacts" +msgstr "Kontakte" + #: include/nav.php:145 include/nav.php:147 mod/community.php:32 msgid "Community" msgstr "Gemeinschaft" @@ -2746,6 +2400,11 @@ msgstr "Unterhaltungen auf dieser Seite" msgid "Conversations on the network" msgstr "Unterhaltungen im Netzwerk" +#: include/nav.php:151 include/identity.php:825 include/identity.php:836 +#: view/theme/frio/theme.php:256 +msgid "Events and Calendar" +msgstr "Ereignisse und Kalender" + #: include/nav.php:154 msgid "Directory" msgstr "Verzeichnis" @@ -2831,7 +2490,7 @@ msgid "Delegate Page Management" msgstr "Delegiere das Management für die Seite" #: include/nav.php:188 mod/newmember.php:15 mod/settings.php:113 -#: mod/admin.php:1624 mod/admin.php:1900 view/theme/frio/theme.php:258 +#: mod/admin.php:1693 mod/admin.php:1969 view/theme/frio/theme.php:258 msgid "Settings" msgstr "Einstellungen" @@ -2839,6 +2498,10 @@ msgstr "Einstellungen" msgid "Account settings" msgstr "Kontoeinstellungen" +#: include/nav.php:191 include/identity.php:296 +msgid "Profiles" +msgstr "Profile" + #: include/nav.php:191 msgid "Manage/Edit Profiles" msgstr "Profile Verwalten/Editieren" @@ -2847,7 +2510,7 @@ msgstr "Profile Verwalten/Editieren" msgid "Manage/edit friends and contacts" msgstr " Kontakte verwalten/editieren" -#: include/nav.php:199 mod/admin.php:197 +#: include/nav.php:199 mod/admin.php:202 msgid "Admin" msgstr "Administration" @@ -2912,225 +2575,566 @@ msgstr "Diese Aktion überschreitet die Obergrenze Deines Abonnements." msgid "This action is not available under your subscription plan." msgstr "Diese Aktion ist in Deinem Abonnement nicht verfügbar." -#: include/text.php:308 +#: include/security.php:63 +msgid "Welcome " +msgstr "Willkommen " + +#: include/security.php:64 +msgid "Please upload a profile photo." +msgstr "Bitte lade ein Profilbild hoch." + +#: include/security.php:66 +msgid "Welcome back " +msgstr "Willkommen zurück " + +#: include/security.php:438 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." +msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." + +#: include/text.php:314 msgid "newer" msgstr "neuer" -#: include/text.php:309 +#: include/text.php:315 msgid "older" msgstr "älter" -#: include/text.php:314 +#: include/text.php:320 msgid "first" msgstr "erste" -#: include/text.php:315 +#: include/text.php:321 msgid "prev" msgstr "vorige" -#: include/text.php:349 +#: include/text.php:355 msgid "next" msgstr "nächste" -#: include/text.php:350 +#: include/text.php:356 msgid "last" msgstr "letzte" -#: include/text.php:404 +#: include/text.php:410 msgid "Loading more entries..." msgstr "lade weitere Einträge..." -#: include/text.php:405 +#: include/text.php:411 msgid "The end" msgstr "Das Ende" -#: include/text.php:956 +#: include/text.php:970 msgid "No contacts" msgstr "Keine Kontakte" -#: include/text.php:981 +#: include/text.php:994 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: include/text.php:994 +#: include/text.php:1007 msgid "View Contacts" msgstr "Kontakte anzeigen" -#: include/text.php:1082 mod/editpost.php:101 mod/filer.php:32 +#: include/text.php:1097 mod/editpost.php:101 mod/filer.php:32 #: mod/notes.php:64 msgid "Save" msgstr "Speichern" -#: include/text.php:1145 +#: include/text.php:1158 msgid "poke" msgstr "anstupsen" -#: include/text.php:1145 +#: include/text.php:1158 msgid "poked" msgstr "stupste" -#: include/text.php:1146 +#: include/text.php:1159 msgid "ping" msgstr "anpingen" -#: include/text.php:1146 +#: include/text.php:1159 msgid "pinged" msgstr "pingte" -#: include/text.php:1147 +#: include/text.php:1160 msgid "prod" msgstr "knuffen" -#: include/text.php:1147 +#: include/text.php:1160 msgid "prodded" msgstr "knuffte" -#: include/text.php:1148 +#: include/text.php:1161 msgid "slap" msgstr "ohrfeigen" -#: include/text.php:1148 +#: include/text.php:1161 msgid "slapped" msgstr "ohrfeigte" -#: include/text.php:1149 +#: include/text.php:1162 msgid "finger" msgstr "befummeln" -#: include/text.php:1149 +#: include/text.php:1162 msgid "fingered" msgstr "befummelte" -#: include/text.php:1150 +#: include/text.php:1163 msgid "rebuff" msgstr "eine Abfuhr erteilen" -#: include/text.php:1150 +#: include/text.php:1163 msgid "rebuffed" msgstr "abfuhrerteilte" -#: include/text.php:1164 +#: include/text.php:1177 msgid "happy" msgstr "glücklich" -#: include/text.php:1165 +#: include/text.php:1178 msgid "sad" msgstr "traurig" -#: include/text.php:1166 +#: include/text.php:1179 msgid "mellow" msgstr "sanft" -#: include/text.php:1167 +#: include/text.php:1180 msgid "tired" msgstr "müde" -#: include/text.php:1168 +#: include/text.php:1181 msgid "perky" msgstr "frech" -#: include/text.php:1169 +#: include/text.php:1182 msgid "angry" msgstr "sauer" -#: include/text.php:1170 +#: include/text.php:1183 msgid "stupified" msgstr "verblüfft" -#: include/text.php:1171 +#: include/text.php:1184 msgid "puzzled" msgstr "verwirrt" -#: include/text.php:1172 +#: include/text.php:1185 msgid "interested" msgstr "interessiert" -#: include/text.php:1173 +#: include/text.php:1186 msgid "bitter" msgstr "verbittert" -#: include/text.php:1174 +#: include/text.php:1187 msgid "cheerful" msgstr "fröhlich" -#: include/text.php:1175 +#: include/text.php:1188 msgid "alive" msgstr "lebendig" -#: include/text.php:1176 +#: include/text.php:1189 msgid "annoyed" msgstr "verärgert" -#: include/text.php:1177 +#: include/text.php:1190 msgid "anxious" msgstr "unruhig" -#: include/text.php:1178 +#: include/text.php:1191 msgid "cranky" msgstr "schrullig" -#: include/text.php:1179 +#: include/text.php:1192 msgid "disturbed" msgstr "verstört" -#: include/text.php:1180 +#: include/text.php:1193 msgid "frustrated" msgstr "frustriert" -#: include/text.php:1181 +#: include/text.php:1194 msgid "motivated" msgstr "motiviert" -#: include/text.php:1182 +#: include/text.php:1195 msgid "relaxed" msgstr "entspannt" -#: include/text.php:1183 +#: include/text.php:1196 msgid "surprised" msgstr "überrascht" -#: include/text.php:1393 mod/videos.php:388 +#: include/text.php:1407 mod/videos.php:388 msgid "View Video" msgstr "Video ansehen" -#: include/text.php:1425 +#: include/text.php:1438 msgid "bytes" msgstr "Byte" -#: include/text.php:1457 include/text.php:1469 +#: include/text.php:1471 include/text.php:1482 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: include/text.php:1595 +#: include/text.php:1614 msgid "View on separate page" msgstr "Auf separater Seite ansehen" -#: include/text.php:1596 +#: include/text.php:1615 msgid "view on separate page" msgstr "auf separater Seite ansehen" -#: include/text.php:1875 +#: include/text.php:1900 msgid "activity" msgstr "Aktivität" -#: include/text.php:1877 mod/content.php:624 object/Item.php:416 +#: include/text.php:1902 mod/content.php:624 object/Item.php:416 #: object/Item.php:428 msgid "comment" msgid_plural "comments" msgstr[0] "Kommentar" msgstr[1] "Kommentare" -#: include/text.php:1878 +#: include/text.php:1905 msgid "post" msgstr "Beitrag" -#: include/text.php:2046 +#: include/text.php:2071 msgid "Item filed" msgstr "Beitrag abgelegt" +#: include/Contact.php:437 +msgid "Drop Contact" +msgstr "Kontakt löschen" + +#: include/Contact.php:819 +msgid "Organisation" +msgstr "Organisation" + +#: include/Contact.php:822 +msgid "News" +msgstr "Nachrichten" + +#: include/Contact.php:825 +msgid "Forum" +msgstr "Forum" + +#: include/contact_widgets.php:9 +msgid "Add New Contact" +msgstr "Neuen Kontakt hinzufügen" + +#: include/contact_widgets.php:10 +msgid "Enter address or web location" +msgstr "Adresse oder Web-Link eingeben" + +#: include/contact_widgets.php:11 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Beispiel: bob@example.com, http://example.com/barbara" + +#: include/contact_widgets.php:13 include/identity.php:230 +#: mod/allfriends.php:87 mod/match.php:92 mod/suggest.php:103 +#: mod/dirfind.php:209 +msgid "Connect" +msgstr "Verbinden" + +#: include/contact_widgets.php:28 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "%d Einladung verfügbar" +msgstr[1] "%d Einladungen verfügbar" + +#: include/contact_widgets.php:34 +msgid "Find People" +msgstr "Leute finden" + +#: include/contact_widgets.php:35 +msgid "Enter name or interest" +msgstr "Name oder Interessen eingeben" + +#: include/contact_widgets.php:37 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Beispiel: Robert Morgenstein, Angeln" + +#: include/contact_widgets.php:38 mod/directory.php:202 mod/contacts.php:809 +msgid "Find" +msgstr "Finde" + +#: include/contact_widgets.php:39 mod/suggest.php:116 +#: view/theme/vier/theme.php:195 +msgid "Friend Suggestions" +msgstr "Kontaktvorschläge" + +#: include/contact_widgets.php:40 view/theme/vier/theme.php:194 +msgid "Similar Interests" +msgstr "Ähnliche Interessen" + +#: include/contact_widgets.php:41 +msgid "Random Profile" +msgstr "Zufälliges Profil" + +#: include/contact_widgets.php:42 view/theme/vier/theme.php:196 +msgid "Invite Friends" +msgstr "Freunde einladen" + +#: include/contact_widgets.php:43 +msgid "View Global Directory" +msgstr "Globales Verzeichnis betrachten" + +#: include/contact_widgets.php:131 +msgid "Networks" +msgstr "Netzwerke" + +#: include/contact_widgets.php:134 +msgid "All Networks" +msgstr "Alle Netzwerke" + +#: include/contact_widgets.php:169 include/contact_widgets.php:204 +msgid "Everything" +msgstr "Alles" + +#: include/contact_widgets.php:201 +msgid "Categories" +msgstr "Kategorien" + +#: include/contact_widgets.php:270 +#, php-format +msgid "%d contact in common" +msgid_plural "%d contacts in common" +msgstr[0] "%d gemeinsamer Kontakt" +msgstr[1] "%d gemeinsame Kontakte" + +#: include/dfrn.php:1309 +#, php-format +msgid "%s\\'s birthday" +msgstr "%ss Geburtstag" + +#: include/identity.php:45 +msgid "Requested account is not available." +msgstr "Das angefragte Profil ist nicht vorhanden." + +#: include/identity.php:54 mod/profile.php:22 +msgid "Requested profile is not available." +msgstr "Das angefragte Profil ist nicht vorhanden." + +#: include/identity.php:98 include/identity.php:325 include/identity.php:757 +msgid "Edit profile" +msgstr "Profil bearbeiten" + +#: include/identity.php:265 +msgid "Atom feed" +msgstr "Atom-Feed" + +#: include/identity.php:296 +msgid "Manage/edit profiles" +msgstr "Profile verwalten/editieren" + +#: include/identity.php:301 include/identity.php:327 mod/profiles.php:790 +msgid "Change profile photo" +msgstr "Profilbild ändern" + +#: include/identity.php:302 mod/profiles.php:791 +msgid "Create New Profile" +msgstr "Neues Profil anlegen" + +#: include/identity.php:312 mod/profiles.php:780 +msgid "Profile Image" +msgstr "Profilbild" + +#: include/identity.php:315 mod/profiles.php:782 +msgid "visible to everybody" +msgstr "sichtbar für jeden" + +#: include/identity.php:316 mod/profiles.php:687 mod/profiles.php:783 +msgid "Edit visibility" +msgstr "Sichtbarkeit bearbeiten" + +#: include/identity.php:344 include/identity.php:644 mod/directory.php:137 +#: mod/notifications.php:252 +msgid "Gender:" +msgstr "Geschlecht:" + +#: include/identity.php:347 include/identity.php:667 mod/directory.php:139 +msgid "Status:" +msgstr "Status:" + +#: include/identity.php:349 include/identity.php:684 mod/directory.php:141 +msgid "Homepage:" +msgstr "Homepage:" + +#: include/identity.php:351 include/identity.php:704 mod/directory.php:143 +#: mod/notifications.php:248 mod/contacts.php:643 +msgid "About:" +msgstr "Über:" + +#: include/identity.php:353 mod/contacts.php:641 +msgid "XMPP:" +msgstr "XMPP:" + +#: include/identity.php:439 mod/notifications.php:260 mod/contacts.php:58 +msgid "Network:" +msgstr "Netzwerk:" + +#: include/identity.php:468 include/identity.php:558 +msgid "g A l F d" +msgstr "l, d. F G \\U\\h\\r" + +#: include/identity.php:469 include/identity.php:559 +msgid "F d" +msgstr "d. F" + +#: include/identity.php:520 include/identity.php:609 +msgid "[today]" +msgstr "[heute]" + +#: include/identity.php:532 +msgid "Birthday Reminders" +msgstr "Geburtstagserinnerungen" + +#: include/identity.php:533 +msgid "Birthdays this week:" +msgstr "Geburtstage diese Woche:" + +#: include/identity.php:595 +msgid "[No description]" +msgstr "[keine Beschreibung]" + +#: include/identity.php:620 +msgid "Event Reminders" +msgstr "Veranstaltungserinnerungen" + +#: include/identity.php:621 +msgid "Events this week:" +msgstr "Veranstaltungen diese Woche" + +#: include/identity.php:641 mod/settings.php:1287 +msgid "Full Name:" +msgstr "Kompletter Name:" + +#: include/identity.php:648 +msgid "j F, Y" +msgstr "j F, Y" + +#: include/identity.php:649 +msgid "j F" +msgstr "j F" + +#: include/identity.php:663 +msgid "Age:" +msgstr "Alter:" + +#: include/identity.php:676 +#, php-format +msgid "for %1$d %2$s" +msgstr "für %1$d %2$s" + +#: include/identity.php:680 mod/profiles.php:706 +msgid "Sexual Preference:" +msgstr "Sexuelle Vorlieben:" + +#: include/identity.php:688 mod/profiles.php:733 +msgid "Hometown:" +msgstr "Heimatort:" + +#: include/identity.php:692 mod/notifications.php:250 mod/contacts.php:645 +#: mod/follow.php:139 +msgid "Tags:" +msgstr "Tags:" + +#: include/identity.php:696 mod/profiles.php:734 +msgid "Political Views:" +msgstr "Politische Ansichten:" + +#: include/identity.php:700 +msgid "Religion:" +msgstr "Religion:" + +#: include/identity.php:708 +msgid "Hobbies/Interests:" +msgstr "Hobbies/Interessen:" + +#: include/identity.php:712 mod/profiles.php:738 +msgid "Likes:" +msgstr "Likes:" + +#: include/identity.php:716 mod/profiles.php:739 +msgid "Dislikes:" +msgstr "Dislikes:" + +#: include/identity.php:720 +msgid "Contact information and Social Networks:" +msgstr "Kontaktinformationen und Soziale Netzwerke:" + +#: include/identity.php:724 +msgid "Musical interests:" +msgstr "Musikalische Interessen:" + +#: include/identity.php:728 +msgid "Books, literature:" +msgstr "Literatur/Bücher:" + +#: include/identity.php:732 +msgid "Television:" +msgstr "Fernsehen:" + +#: include/identity.php:736 +msgid "Film/dance/culture/entertainment:" +msgstr "Filme/Tänze/Kultur/Unterhaltung:" + +#: include/identity.php:740 +msgid "Love/Romance:" +msgstr "Liebesleben:" + +#: include/identity.php:744 +msgid "Work/employment:" +msgstr "Arbeit/Beschäftigung:" + +#: include/identity.php:748 +msgid "School/education:" +msgstr "Schule/Ausbildung:" + +#: include/identity.php:753 +msgid "Forums:" +msgstr "Foren:" + +#: include/identity.php:762 mod/events.php:509 +msgid "Basic" +msgstr "Allgemein" + +#: include/identity.php:763 mod/contacts.php:881 mod/events.php:510 +#: mod/admin.php:1134 +msgid "Advanced" +msgstr "Erweitert" + +#: include/identity.php:789 mod/contacts.php:847 mod/follow.php:147 +msgid "Status Messages and Posts" +msgstr "Statusnachrichten und Beiträge" + +#: include/identity.php:797 mod/contacts.php:855 +msgid "Profile Details" +msgstr "Profildetails" + +#: include/identity.php:805 mod/photos.php:95 +msgid "Photo Albums" +msgstr "Fotoalben" + +#: include/identity.php:844 mod/notes.php:49 +msgid "Personal Notes" +msgstr "Persönliche Notizen" + +#: include/identity.php:847 +msgid "Only You Can See This" +msgstr "Nur Du kannst das sehen" + #: mod/allfriends.php:48 msgid "No friends to display." msgstr "Keine Kontakte zum Anzeigen." @@ -3153,9 +3157,9 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?" -#: mod/api.php:108 mod/profiles.php:643 mod/profiles.php:647 -#: mod/profiles.php:673 mod/dfrn_request.php:880 mod/follow.php:115 -#: mod/register.php:248 mod/settings.php:1172 mod/settings.php:1178 +#: mod/api.php:108 mod/dfrn_request.php:880 mod/follow.php:115 +#: mod/profiles.php:643 mod/profiles.php:647 mod/profiles.php:673 +#: mod/register.php:249 mod/settings.php:1172 mod/settings.php:1178 #: mod/settings.php:1185 mod/settings.php:1189 mod/settings.php:1194 #: mod/settings.php:1199 mod/settings.php:1204 mod/settings.php:1209 #: mod/settings.php:1235 mod/settings.php:1236 mod/settings.php:1237 @@ -3235,7 +3239,7 @@ msgstr "diaspora2bb: " msgid "The post was created" msgstr "Der Beitrag wurde angelegt" -#: mod/cal.php:145 mod/profile.php:156 mod/display.php:348 +#: mod/cal.php:145 mod/profile.php:156 mod/display.php:351 msgid "Access to this profile has been restricted." msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt." @@ -3348,7 +3352,7 @@ msgstr "Kommentar" #: mod/message.php:523 mod/mood.php:139 mod/photos.php:1143 #: mod/photos.php:1273 mod/photos.php:1599 mod/photos.php:1648 #: mod/photos.php:1690 mod/photos.php:1770 mod/poke.php:204 -#: mod/profiles.php:684 mod/contacts.php:588 mod/events.php:508 +#: mod/contacts.php:588 mod/events.php:508 mod/profiles.php:684 #: object/Item.php:702 view/theme/duepuntozero/config.php:64 #: view/theme/frio/config.php:67 view/theme/quattro/config.php:70 #: view/theme/vier/config.php:113 @@ -3527,7 +3531,7 @@ msgid "" msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden." #: mod/crepair.php:170 mod/settings.php:684 mod/settings.php:710 -#: mod/admin.php:1496 mod/admin.php:1509 mod/admin.php:1522 mod/admin.php:1538 +#: mod/admin.php:1565 mod/admin.php:1578 mod/admin.php:1591 mod/admin.php:1607 msgid "Name" msgstr "Name" @@ -3683,10 +3687,10 @@ msgstr "%1$s ist %2$s beigetreten" msgid "%1$s welcomes %2$s" msgstr "%1$s heißt %2$s herzlich willkommen" -#: mod/directory.php:33 mod/photos.php:981 mod/probe.php:9 mod/videos.php:200 +#: mod/directory.php:33 mod/photos.php:981 mod/videos.php:200 #: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/community.php:18 -#: mod/dfrn_request.php:804 mod/display.php:213 mod/search.php:96 -#: mod/search.php:102 +#: mod/dfrn_request.php:804 mod/display.php:216 mod/probe.php:9 +#: mod/search.php:96 mod/search.php:102 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -3766,7 +3770,7 @@ msgstr "Keine Plugins/Erweiterungen/Apps installiert" msgid "On this server the following remote servers are blocked." msgstr "Auf diesem Server werden die folgenden entfernten Server blockiert." -#: mod/friendica.php:115 mod/admin.php:281 mod/admin.php:299 +#: mod/friendica.php:115 mod/admin.php:289 mod/admin.php:307 msgid "Reason for the block" msgstr "Begründung für die Blockierung" @@ -4855,7 +4859,7 @@ msgstr "Neue-Kontakt Nachricht senden" msgid "if applicable" msgstr "falls anwendbar" -#: mod/notifications.php:178 mod/notifications.php:263 mod/admin.php:1512 +#: mod/notifications.php:178 mod/notifications.php:263 mod/admin.php:1581 msgid "Approve" msgstr "Genehmigen" @@ -5027,7 +5031,7 @@ msgstr "%1$s wurde von %3$s in %2$s getaggt" msgid "a photo" msgstr "einem Foto" -#: mod/photos.php:815 mod/profile_photo.php:155 mod/wall_upload.php:181 +#: mod/photos.php:815 mod/wall_upload.php:181 mod/profile_photo.php:155 #, php-format msgid "Image exceeds size limit of %s" msgstr "Bildgröße überschreitet das Limit von %s" @@ -5036,11 +5040,11 @@ msgstr "Bildgröße überschreitet das Limit von %s" msgid "Image file is empty." msgstr "Bilddatei ist leer." -#: mod/photos.php:856 mod/profile_photo.php:164 mod/wall_upload.php:218 +#: mod/photos.php:856 mod/wall_upload.php:218 mod/profile_photo.php:164 msgid "Unable to process image." msgstr "Konnte das Bild nicht bearbeiten." -#: mod/photos.php:885 mod/profile_photo.php:314 mod/wall_upload.php:257 +#: mod/photos.php:885 mod/wall_upload.php:257 mod/profile_photo.php:314 msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." @@ -5202,378 +5206,10 @@ msgstr "Was willst Du mit dem Empfänger machen:" msgid "Make this post private" msgstr "Diesen Beitrag privat machen" -#: mod/probe.php:10 mod/webfinger.php:11 -msgid "Only logged in users are permitted to perform a probing." -msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet." - #: mod/profile.php:176 msgid "Tips for New Members" msgstr "Tipps für neue Nutzer" -#: mod/profile_photo.php:44 -msgid "Image uploaded but image cropping failed." -msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl." - -#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 -#: mod/profile_photo.php:322 -#, php-format -msgid "Image size reduction [%s] failed." -msgstr "Verkleinern der Bildgröße von [%s] scheiterte." - -#: mod/profile_photo.php:127 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." - -#: mod/profile_photo.php:136 -msgid "Unable to process image" -msgstr "Bild konnte nicht verarbeitet werden" - -#: mod/profile_photo.php:253 -msgid "Upload File:" -msgstr "Datei hochladen:" - -#: mod/profile_photo.php:254 -msgid "Select a profile:" -msgstr "Profil auswählen:" - -#: mod/profile_photo.php:256 -#: view/smarty3/compiled/04b5adc938a37b0a51a14fb26634819e90d47ba4.file.filebrowser.tpl.php:119 -msgid "Upload" -msgstr "Hochladen" - -#: mod/profile_photo.php:259 -msgid "or" -msgstr "oder" - -#: mod/profile_photo.php:259 -msgid "skip this step" -msgstr "diesen Schritt überspringen" - -#: mod/profile_photo.php:259 -msgid "select a photo from your photo albums" -msgstr "wähle ein Foto aus deinen Fotoalben" - -#: mod/profile_photo.php:273 -msgid "Crop Image" -msgstr "Bild zurechtschneiden" - -#: mod/profile_photo.php:274 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." - -#: mod/profile_photo.php:276 -msgid "Done Editing" -msgstr "Bearbeitung abgeschlossen" - -#: mod/profile_photo.php:312 -msgid "Image uploaded successfully." -msgstr "Bild erfolgreich hochgeladen." - -#: mod/profiles.php:42 -msgid "Profile deleted." -msgstr "Profil gelöscht." - -#: mod/profiles.php:58 mod/profiles.php:94 -msgid "Profile-" -msgstr "Profil-" - -#: mod/profiles.php:77 mod/profiles.php:122 -msgid "New profile created." -msgstr "Neues Profil angelegt." - -#: mod/profiles.php:100 -msgid "Profile unavailable to clone." -msgstr "Profil nicht zum Duplizieren verfügbar." - -#: mod/profiles.php:196 -msgid "Profile Name is required." -msgstr "Profilname ist erforderlich." - -#: mod/profiles.php:336 -msgid "Marital Status" -msgstr "Familienstand" - -#: mod/profiles.php:340 -msgid "Romantic Partner" -msgstr "Romanze" - -#: mod/profiles.php:352 -msgid "Work/Employment" -msgstr "Arbeit / Beschäftigung" - -#: mod/profiles.php:355 -msgid "Religion" -msgstr "Religion" - -#: mod/profiles.php:359 -msgid "Political Views" -msgstr "Politische Ansichten" - -#: mod/profiles.php:363 -msgid "Gender" -msgstr "Geschlecht" - -#: mod/profiles.php:367 -msgid "Sexual Preference" -msgstr "Sexuelle Vorlieben" - -#: mod/profiles.php:371 -msgid "XMPP" -msgstr "XMPP" - -#: mod/profiles.php:375 -msgid "Homepage" -msgstr "Webseite" - -#: mod/profiles.php:379 mod/profiles.php:698 -msgid "Interests" -msgstr "Interessen" - -#: mod/profiles.php:383 -msgid "Address" -msgstr "Adresse" - -#: mod/profiles.php:390 mod/profiles.php:694 -msgid "Location" -msgstr "Wohnort" - -#: mod/profiles.php:475 -msgid "Profile updated." -msgstr "Profil aktualisiert." - -#: mod/profiles.php:567 -msgid " and " -msgstr " und " - -#: mod/profiles.php:576 -msgid "public profile" -msgstr "öffentliches Profil" - -#: mod/profiles.php:579 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "%1$s hat %2$s geändert auf “%3$s”" - -#: mod/profiles.php:580 -#, php-format -msgid " - Visit %1$s's %2$s" -msgstr " – %1$ss %2$s besuchen" - -#: mod/profiles.php:582 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." -msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." - -#: mod/profiles.php:640 -msgid "Hide contacts and friends:" -msgstr "Kontakte und Freunde verbergen" - -#: mod/profiles.php:645 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" - -#: mod/profiles.php:670 -msgid "Show more profile fields:" -msgstr "Zeige mehr Profil-Felder:" - -#: mod/profiles.php:682 -msgid "Profile Actions" -msgstr "Profilaktionen" - -#: mod/profiles.php:683 -msgid "Edit Profile Details" -msgstr "Profil bearbeiten" - -#: mod/profiles.php:685 -msgid "Change Profile Photo" -msgstr "Profilbild ändern" - -#: mod/profiles.php:686 -msgid "View this profile" -msgstr "Dieses Profil anzeigen" - -#: mod/profiles.php:688 -msgid "Create a new profile using these settings" -msgstr "Neues Profil anlegen und diese Einstellungen verwenden" - -#: mod/profiles.php:689 -msgid "Clone this profile" -msgstr "Dieses Profil duplizieren" - -#: mod/profiles.php:690 -msgid "Delete this profile" -msgstr "Dieses Profil löschen" - -#: mod/profiles.php:692 -msgid "Basic information" -msgstr "Grundinformationen" - -#: mod/profiles.php:693 -msgid "Profile picture" -msgstr "Profilbild" - -#: mod/profiles.php:695 -msgid "Preferences" -msgstr "Vorlieben" - -#: mod/profiles.php:696 -msgid "Status information" -msgstr "Status Informationen" - -#: mod/profiles.php:697 -msgid "Additional information" -msgstr "Zusätzliche Informationen" - -#: mod/profiles.php:700 -msgid "Relation" -msgstr "Beziehung" - -#: mod/profiles.php:704 -msgid "Your Gender:" -msgstr "Dein Geschlecht:" - -#: mod/profiles.php:705 -msgid "<span class=\"heart\">♥</span> Marital Status:" -msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" - -#: mod/profiles.php:707 -msgid "Example: fishing photography software" -msgstr "Beispiel: Fischen Fotografie Software" - -#: mod/profiles.php:712 -msgid "Profile Name:" -msgstr "Profilname:" - -#: mod/profiles.php:712 mod/events.php:486 mod/events.php:498 -msgid "Required" -msgstr "Benötigt" - -#: mod/profiles.php:714 -msgid "" -"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " -"be visible to anybody using the internet." -msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." - -#: mod/profiles.php:715 -msgid "Your Full Name:" -msgstr "Dein kompletter Name:" - -#: mod/profiles.php:716 -msgid "Title/Description:" -msgstr "Titel/Beschreibung:" - -#: mod/profiles.php:719 -msgid "Street Address:" -msgstr "Adresse:" - -#: mod/profiles.php:720 -msgid "Locality/City:" -msgstr "Wohnort:" - -#: mod/profiles.php:721 -msgid "Region/State:" -msgstr "Region/Bundesstaat:" - -#: mod/profiles.php:722 -msgid "Postal/Zip Code:" -msgstr "Postleitzahl:" - -#: mod/profiles.php:723 -msgid "Country:" -msgstr "Land:" - -#: mod/profiles.php:727 -msgid "Who: (if applicable)" -msgstr "Wer: (falls anwendbar)" - -#: mod/profiles.php:727 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" - -#: mod/profiles.php:728 -msgid "Since [date]:" -msgstr "Seit [Datum]:" - -#: mod/profiles.php:730 -msgid "Tell us about yourself..." -msgstr "Erzähle uns ein bisschen von Dir …" - -#: mod/profiles.php:731 -msgid "XMPP (Jabber) address:" -msgstr "XMPP (Jabber) Adresse" - -#: mod/profiles.php:731 -msgid "" -"The XMPP address will be propagated to your contacts so that they can follow" -" you." -msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können." - -#: mod/profiles.php:732 -msgid "Homepage URL:" -msgstr "Adresse der Homepage:" - -#: mod/profiles.php:735 -msgid "Religious Views:" -msgstr "Religiöse Ansichten:" - -#: mod/profiles.php:736 -msgid "Public Keywords:" -msgstr "Öffentliche Schlüsselwörter:" - -#: mod/profiles.php:736 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" - -#: mod/profiles.php:737 -msgid "Private Keywords:" -msgstr "Private Schlüsselwörter:" - -#: mod/profiles.php:737 -msgid "(Used for searching profiles, never shown to others)" -msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" - -#: mod/profiles.php:740 -msgid "Musical interests" -msgstr "Musikalische Interessen" - -#: mod/profiles.php:741 -msgid "Books, literature" -msgstr "Bücher, Literatur" - -#: mod/profiles.php:742 -msgid "Television" -msgstr "Fernsehen" - -#: mod/profiles.php:743 -msgid "Film/dance/culture/entertainment" -msgstr "Filme/Tänze/Kultur/Unterhaltung" - -#: mod/profiles.php:744 -msgid "Hobbies/Interests" -msgstr "Hobbies/Interessen" - -#: mod/profiles.php:745 -msgid "Love/romance" -msgstr "Liebe/Romantik" - -#: mod/profiles.php:746 -msgid "Work/employment" -msgstr "Arbeit/Anstellung" - -#: mod/profiles.php:747 -msgid "School/education" -msgstr "Schule/Ausbildung" - -#: mod/profiles.php:748 -msgid "Contact information and Social Networks" -msgstr "Kontaktinformationen und Soziale Netzwerke" - -#: mod/profiles.php:789 -msgid "Edit/Manage Profiles" -msgstr "Bearbeite/Verwalte Profile" - #: mod/profperm.php:28 mod/profperm.php:59 msgid "Invalid profile identifier." msgstr "Ungültiger Profil-Bezeichner." @@ -5590,19 +5226,6 @@ msgstr "Sichtbar für" msgid "All Contacts (with secure profile access)" msgstr "Alle Kontakte (mit gesichertem Profilzugriff)" -#: mod/regmod.php:60 -msgid "Account approved." -msgstr "Konto freigegeben." - -#: mod/regmod.php:88 -#, php-format -msgid "Registration revoked for %s" -msgstr "Registrierung für %s wurde zurückgezogen" - -#: mod/regmod.php:100 -msgid "Please login." -msgstr "Bitte melde Dich an." - #: mod/removeme.php:54 mod/removeme.php:57 msgid "Remove My Account" msgstr "Konto löschen" @@ -5681,47 +5304,6 @@ msgstr "Exportiere Deine Account Informationen, Kontakte und alle Einträge als msgid "Export personal data" msgstr "Persönliche Daten exportieren" -#: mod/uimport.php:53 mod/register.php:200 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal." - -#: mod/uimport.php:68 mod/register.php:297 -msgid "Import" -msgstr "Import" - -#: mod/uimport.php:70 -msgid "Move account" -msgstr "Account umziehen" - -#: mod/uimport.php:71 -msgid "You can import an account from another Friendica server." -msgstr "Du kannst einen Account von einem anderen Friendica Server importieren." - -#: mod/uimport.php:72 -msgid "" -"You need to export your account from the old server and upload it here. We " -"will recreate your old account here with all your contacts. We will try also" -" to inform your friends that you moved here." -msgstr "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist." - -#: mod/uimport.php:73 -msgid "" -"This feature is experimental. We can't import contacts from the OStatus " -"network (GNU Social/Statusnet) or from Diaspora" -msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren" - -#: mod/uimport.php:74 -msgid "Account file" -msgstr "Account Datei" - -#: mod/uimport.php:74 -msgid "" -"To export your account, go to \"Settings->Export your personal data\" and " -"select \"Export account\"" -msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"" - #: mod/update_community.php:21 mod/update_display.php:25 #: mod/update_notes.php:38 mod/update_profile.php:37 mod/update_network.php:29 msgid "[Embedded content - reload page to view]" @@ -5798,6 +5380,64 @@ msgid "" "your site allow private mail from unknown senders." msgstr "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." +#: mod/webfinger.php:11 mod/probe.php:10 +msgid "Only logged in users are permitted to perform a probing." +msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet." + +#: mod/regmod.php:60 +msgid "Account approved." +msgstr "Konto freigegeben." + +#: mod/regmod.php:88 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registrierung für %s wurde zurückgezogen" + +#: mod/regmod.php:100 +msgid "Please login." +msgstr "Bitte melde Dich an." + +#: mod/uimport.php:53 mod/register.php:201 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal." + +#: mod/uimport.php:68 mod/register.php:298 +msgid "Import" +msgstr "Import" + +#: mod/uimport.php:70 +msgid "Move account" +msgstr "Account umziehen" + +#: mod/uimport.php:71 +msgid "You can import an account from another Friendica server." +msgstr "Du kannst einen Account von einem anderen Friendica Server importieren." + +#: mod/uimport.php:72 +msgid "" +"You need to export your account from the old server and upload it here. We " +"will recreate your old account here with all your contacts. We will try also" +" to inform your friends that you moved here." +msgstr "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist." + +#: mod/uimport.php:73 +msgid "" +"This feature is experimental. We can't import contacts from the OStatus " +"network (GNU Social/Statusnet) or from Diaspora" +msgstr "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren" + +#: mod/uimport.php:74 +msgid "Account file" +msgstr "Account Datei" + +#: mod/uimport.php:74 +msgid "" +"To export your account, go to \"Settings->Export your personal data\" and " +"select \"Export account\"" +msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"" + #: mod/community.php:23 msgid "Not available." msgstr "Nicht verfügbar." @@ -5884,7 +5524,7 @@ msgstr "%s teilt mit Dir" msgid "Private communications are not available for this contact." msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." -#: mod/contacts.php:541 mod/admin.php:984 +#: mod/contacts.php:541 mod/admin.php:1053 msgid "Never" msgstr "Niemals" @@ -5913,7 +5553,7 @@ msgstr "Verbindungen mit diesem Kontakt verloren!" msgid "Fetch further information for feeds" msgstr "Weitere Informationen zu Feeds holen" -#: mod/contacts.php:568 mod/admin.php:993 +#: mod/contacts.php:568 mod/admin.php:1062 msgid "Disabled" msgstr "Deaktiviert" @@ -5977,12 +5617,12 @@ msgid "Update now" msgstr "Jetzt aktualisieren" #: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 -#: mod/admin.php:1516 +#: mod/admin.php:1585 msgid "Unblock" msgstr "Entsperren" #: mod/contacts.php:616 mod/contacts.php:816 mod/contacts.php:994 -#: mod/admin.php:1515 +#: mod/admin.php:1584 msgid "Block" msgstr "Sperren" @@ -6327,7 +5967,7 @@ msgstr "Personensuche - %s" msgid "Forum Search - %s" msgstr "Forensuche - %s" -#: mod/display.php:499 +#: mod/display.php:502 msgid "Item has been removed." msgstr "Eintrag wurde entfernt." @@ -6355,6 +5995,10 @@ msgstr "Anfangszeitpunkt und Titel werden benötigt" msgid "Event Starts:" msgstr "Veranstaltungsbeginn:" +#: mod/events.php:486 mod/events.php:498 mod/profiles.php:712 +msgid "Required" +msgstr "Benötigt" + #: mod/events.php:488 mod/events.php:504 msgid "Finish date/time is not known or not relevant" msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant" @@ -6525,102 +6169,461 @@ msgstr "{0} schickte Dir eine Nachricht" msgid "{0} requested registration" msgstr "{0} möchte sich registrieren" -#: mod/register.php:95 +#: mod/profile_photo.php:44 +msgid "Image uploaded but image cropping failed." +msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl." + +#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93 +#: mod/profile_photo.php:322 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "Verkleinern der Bildgröße von [%s] scheiterte." + +#: mod/profile_photo.php:127 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird." + +#: mod/profile_photo.php:136 +msgid "Unable to process image" +msgstr "Bild konnte nicht verarbeitet werden" + +#: mod/profile_photo.php:253 +msgid "Upload File:" +msgstr "Datei hochladen:" + +#: mod/profile_photo.php:254 +msgid "Select a profile:" +msgstr "Profil auswählen:" + +#: mod/profile_photo.php:256 +msgid "Upload" +msgstr "Hochladen" + +#: mod/profile_photo.php:259 +msgid "or" +msgstr "oder" + +#: mod/profile_photo.php:259 +msgid "skip this step" +msgstr "diesen Schritt überspringen" + +#: mod/profile_photo.php:259 +msgid "select a photo from your photo albums" +msgstr "wähle ein Foto aus deinen Fotoalben" + +#: mod/profile_photo.php:273 +msgid "Crop Image" +msgstr "Bild zurechtschneiden" + +#: mod/profile_photo.php:274 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann." + +#: mod/profile_photo.php:276 +msgid "Done Editing" +msgstr "Bearbeitung abgeschlossen" + +#: mod/profile_photo.php:312 +msgid "Image uploaded successfully." +msgstr "Bild erfolgreich hochgeladen." + +#: mod/profiles.php:42 +msgid "Profile deleted." +msgstr "Profil gelöscht." + +#: mod/profiles.php:58 mod/profiles.php:94 +msgid "Profile-" +msgstr "Profil-" + +#: mod/profiles.php:77 mod/profiles.php:122 +msgid "New profile created." +msgstr "Neues Profil angelegt." + +#: mod/profiles.php:100 +msgid "Profile unavailable to clone." +msgstr "Profil nicht zum Duplizieren verfügbar." + +#: mod/profiles.php:196 +msgid "Profile Name is required." +msgstr "Profilname ist erforderlich." + +#: mod/profiles.php:336 +msgid "Marital Status" +msgstr "Familienstand" + +#: mod/profiles.php:340 +msgid "Romantic Partner" +msgstr "Romanze" + +#: mod/profiles.php:352 +msgid "Work/Employment" +msgstr "Arbeit / Beschäftigung" + +#: mod/profiles.php:355 +msgid "Religion" +msgstr "Religion" + +#: mod/profiles.php:359 +msgid "Political Views" +msgstr "Politische Ansichten" + +#: mod/profiles.php:363 +msgid "Gender" +msgstr "Geschlecht" + +#: mod/profiles.php:367 +msgid "Sexual Preference" +msgstr "Sexuelle Vorlieben" + +#: mod/profiles.php:371 +msgid "XMPP" +msgstr "XMPP" + +#: mod/profiles.php:375 +msgid "Homepage" +msgstr "Webseite" + +#: mod/profiles.php:379 mod/profiles.php:698 +msgid "Interests" +msgstr "Interessen" + +#: mod/profiles.php:383 +msgid "Address" +msgstr "Adresse" + +#: mod/profiles.php:390 mod/profiles.php:694 +msgid "Location" +msgstr "Wohnort" + +#: mod/profiles.php:475 +msgid "Profile updated." +msgstr "Profil aktualisiert." + +#: mod/profiles.php:567 +msgid " and " +msgstr " und " + +#: mod/profiles.php:576 +msgid "public profile" +msgstr "öffentliches Profil" + +#: mod/profiles.php:579 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "%1$s hat %2$s geändert auf “%3$s”" + +#: mod/profiles.php:580 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr " – %1$ss %2$s besuchen" + +#: mod/profiles.php:582 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." + +#: mod/profiles.php:640 +msgid "Hide contacts and friends:" +msgstr "Kontakte und Freunde verbergen" + +#: mod/profiles.php:645 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" + +#: mod/profiles.php:670 +msgid "Show more profile fields:" +msgstr "Zeige mehr Profil-Felder:" + +#: mod/profiles.php:682 +msgid "Profile Actions" +msgstr "Profilaktionen" + +#: mod/profiles.php:683 +msgid "Edit Profile Details" +msgstr "Profil bearbeiten" + +#: mod/profiles.php:685 +msgid "Change Profile Photo" +msgstr "Profilbild ändern" + +#: mod/profiles.php:686 +msgid "View this profile" +msgstr "Dieses Profil anzeigen" + +#: mod/profiles.php:688 +msgid "Create a new profile using these settings" +msgstr "Neues Profil anlegen und diese Einstellungen verwenden" + +#: mod/profiles.php:689 +msgid "Clone this profile" +msgstr "Dieses Profil duplizieren" + +#: mod/profiles.php:690 +msgid "Delete this profile" +msgstr "Dieses Profil löschen" + +#: mod/profiles.php:692 +msgid "Basic information" +msgstr "Grundinformationen" + +#: mod/profiles.php:693 +msgid "Profile picture" +msgstr "Profilbild" + +#: mod/profiles.php:695 +msgid "Preferences" +msgstr "Vorlieben" + +#: mod/profiles.php:696 +msgid "Status information" +msgstr "Status Informationen" + +#: mod/profiles.php:697 +msgid "Additional information" +msgstr "Zusätzliche Informationen" + +#: mod/profiles.php:700 +msgid "Relation" +msgstr "Beziehung" + +#: mod/profiles.php:704 +msgid "Your Gender:" +msgstr "Dein Geschlecht:" + +#: mod/profiles.php:705 +msgid "<span class=\"heart\">♥</span> Marital Status:" +msgstr "<span class=\"heart\">♥</span> Beziehungsstatus:" + +#: mod/profiles.php:707 +msgid "Example: fishing photography software" +msgstr "Beispiel: Fischen Fotografie Software" + +#: mod/profiles.php:712 +msgid "Profile Name:" +msgstr "Profilname:" + +#: mod/profiles.php:714 +msgid "" +"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " +"be visible to anybody using the internet." +msgstr "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein." + +#: mod/profiles.php:715 +msgid "Your Full Name:" +msgstr "Dein kompletter Name:" + +#: mod/profiles.php:716 +msgid "Title/Description:" +msgstr "Titel/Beschreibung:" + +#: mod/profiles.php:719 +msgid "Street Address:" +msgstr "Adresse:" + +#: mod/profiles.php:720 +msgid "Locality/City:" +msgstr "Wohnort:" + +#: mod/profiles.php:721 +msgid "Region/State:" +msgstr "Region/Bundesstaat:" + +#: mod/profiles.php:722 +msgid "Postal/Zip Code:" +msgstr "Postleitzahl:" + +#: mod/profiles.php:723 +msgid "Country:" +msgstr "Land:" + +#: mod/profiles.php:727 +msgid "Who: (if applicable)" +msgstr "Wer: (falls anwendbar)" + +#: mod/profiles.php:727 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" + +#: mod/profiles.php:728 +msgid "Since [date]:" +msgstr "Seit [Datum]:" + +#: mod/profiles.php:730 +msgid "Tell us about yourself..." +msgstr "Erzähle uns ein bisschen von Dir …" + +#: mod/profiles.php:731 +msgid "XMPP (Jabber) address:" +msgstr "XMPP (Jabber) Adresse" + +#: mod/profiles.php:731 +msgid "" +"The XMPP address will be propagated to your contacts so that they can follow" +" you." +msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können." + +#: mod/profiles.php:732 +msgid "Homepage URL:" +msgstr "Adresse der Homepage:" + +#: mod/profiles.php:735 +msgid "Religious Views:" +msgstr "Religiöse Ansichten:" + +#: mod/profiles.php:736 +msgid "Public Keywords:" +msgstr "Öffentliche Schlüsselwörter:" + +#: mod/profiles.php:736 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)" + +#: mod/profiles.php:737 +msgid "Private Keywords:" +msgstr "Private Schlüsselwörter:" + +#: mod/profiles.php:737 +msgid "(Used for searching profiles, never shown to others)" +msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" + +#: mod/profiles.php:740 +msgid "Musical interests" +msgstr "Musikalische Interessen" + +#: mod/profiles.php:741 +msgid "Books, literature" +msgstr "Bücher, Literatur" + +#: mod/profiles.php:742 +msgid "Television" +msgstr "Fernsehen" + +#: mod/profiles.php:743 +msgid "Film/dance/culture/entertainment" +msgstr "Filme/Tänze/Kultur/Unterhaltung" + +#: mod/profiles.php:744 +msgid "Hobbies/Interests" +msgstr "Hobbies/Interessen" + +#: mod/profiles.php:745 +msgid "Love/romance" +msgstr "Liebe/Romantik" + +#: mod/profiles.php:746 +msgid "Work/employment" +msgstr "Arbeit/Anstellung" + +#: mod/profiles.php:747 +msgid "School/education" +msgstr "Schule/Ausbildung" + +#: mod/profiles.php:748 +msgid "Contact information and Social Networks" +msgstr "Kontaktinformationen und Soziale Netzwerke" + +#: mod/profiles.php:789 +msgid "Edit/Manage Profiles" +msgstr "Bearbeite/Verwalte Profile" + +#: mod/register.php:96 msgid "" "Registration successful. Please check your email for further instructions." msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet." -#: mod/register.php:100 +#: mod/register.php:101 #, php-format msgid "" "Failed to send email message. Here your accout details:<br> login: %s<br> " "password: %s<br><br>You can change your password after login." msgstr "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern." -#: mod/register.php:107 +#: mod/register.php:108 msgid "Registration successful." msgstr "Registrierung erfolgreich." -#: mod/register.php:113 +#: mod/register.php:114 msgid "Your registration can not be processed." msgstr "Deine Registrierung konnte nicht verarbeitet werden." -#: mod/register.php:162 +#: mod/register.php:163 msgid "Your registration is pending approval by the site owner." msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." -#: mod/register.php:228 +#: mod/register.php:229 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst." -#: mod/register.php:229 +#: mod/register.php:230 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus." -#: mod/register.php:230 +#: mod/register.php:231 msgid "Your OpenID (optional): " msgstr "Deine OpenID (optional): " -#: mod/register.php:244 +#: mod/register.php:245 msgid "Include your profile in member directory?" msgstr "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?" -#: mod/register.php:269 +#: mod/register.php:270 msgid "Note for the admin" msgstr "Hinweis für den Admin" -#: mod/register.php:269 +#: mod/register.php:270 msgid "Leave a message for the admin, why you want to join this node" msgstr "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest." -#: mod/register.php:270 +#: mod/register.php:271 msgid "Membership on this site is by invitation only." msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: mod/register.php:271 +#: mod/register.php:272 msgid "Your invitation ID: " msgstr "ID Deiner Einladung: " -#: mod/register.php:274 mod/admin.php:1062 +#: mod/register.php:275 mod/admin.php:1131 msgid "Registration" msgstr "Registrierung" -#: mod/register.php:282 +#: mod/register.php:283 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " msgstr "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):" -#: mod/register.php:283 +#: mod/register.php:284 msgid "Your Email Address: " msgstr "Deine E-Mail-Adresse: " -#: mod/register.php:285 mod/settings.php:1279 +#: mod/register.php:286 mod/settings.php:1279 msgid "New Password:" msgstr "Neues Passwort:" -#: mod/register.php:285 +#: mod/register.php:286 msgid "Leave empty for an auto generated password." msgstr "Leer lassen um das Passwort automatisch zu generieren." -#: mod/register.php:286 mod/settings.php:1280 +#: mod/register.php:287 mod/settings.php:1280 msgid "Confirm:" msgstr "Bestätigen:" -#: mod/register.php:287 +#: mod/register.php:288 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be " "'<strong>nickname@$sitename</strong>'." msgstr "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein." -#: mod/register.php:288 +#: mod/register.php:289 msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: mod/register.php:298 +#: mod/register.php:299 msgid "Import your profile to this friendica instance" msgstr "Importiere Dein Profil auf diese Friendica Instanz" @@ -6641,11 +6644,11 @@ msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer g msgid "Items tagged with: %s" msgstr "Beiträge die mit %s getaggt sind" -#: mod/settings.php:45 mod/admin.php:1496 +#: mod/settings.php:45 mod/admin.php:1565 msgid "Account" msgstr "Nutzerkonto" -#: mod/settings.php:54 mod/admin.php:170 +#: mod/settings.php:54 mod/admin.php:174 msgid "Additional features" msgstr "Zusätzliche Features" @@ -6657,7 +6660,7 @@ msgstr "Anzeige" msgid "Social Networks" msgstr "Soziale Netzwerke" -#: mod/settings.php:76 mod/admin.php:168 mod/admin.php:1622 mod/admin.php:1685 +#: mod/settings.php:76 mod/admin.php:172 mod/admin.php:1691 mod/admin.php:1754 msgid "Plugins" msgstr "Plugins" @@ -6743,8 +6746,8 @@ msgstr "Programm hinzufügen" #: mod/settings.php:682 mod/settings.php:793 mod/settings.php:842 #: mod/settings.php:909 mod/settings.php:1006 mod/settings.php:1272 -#: mod/admin.php:1061 mod/admin.php:1686 mod/admin.php:1949 mod/admin.php:2023 -#: mod/admin.php:2176 +#: mod/admin.php:1130 mod/admin.php:1755 mod/admin.php:2018 mod/admin.php:2092 +#: mod/admin.php:2245 msgid "Save Settings" msgstr "Einstellungen speichern" @@ -6792,11 +6795,11 @@ msgstr "Keine Plugin-Einstellungen konfiguriert" msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +#: mod/settings.php:783 mod/admin.php:2234 mod/admin.php:2235 msgid "Off" msgstr "Aus" -#: mod/settings.php:783 mod/admin.php:2165 mod/admin.php:2166 +#: mod/settings.php:783 mod/admin.php:2234 mod/admin.php:2235 msgid "On" msgstr "An" @@ -6928,7 +6931,7 @@ msgstr "In einen Ordner verschieben" msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: mod/settings.php:944 mod/admin.php:948 +#: mod/settings.php:944 mod/admin.php:1017 msgid "No special theme for mobile devices" msgstr "Kein spezielles Theme für mobile Geräte verwenden." @@ -7395,89 +7398,94 @@ msgstr "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige D msgid "Resend relocate message to contacts" msgstr "Umzugsbenachrichtigung erneut an Kontakte senden" -#: mod/admin.php:97 +#: mod/admin.php:98 msgid "Theme settings updated." msgstr "Themeneinstellungen aktualisiert." -#: mod/admin.php:166 mod/admin.php:1060 +#: mod/admin.php:170 mod/admin.php:1129 msgid "Site" msgstr "Seite" -#: mod/admin.php:167 mod/admin.php:994 mod/admin.php:1504 mod/admin.php:1520 +#: mod/admin.php:171 mod/admin.php:1063 mod/admin.php:1573 mod/admin.php:1589 msgid "Users" msgstr "Nutzer" -#: mod/admin.php:169 mod/admin.php:1898 mod/admin.php:1948 +#: mod/admin.php:173 mod/admin.php:1967 mod/admin.php:2017 msgid "Themes" msgstr "Themen" -#: mod/admin.php:171 +#: mod/admin.php:175 msgid "DB updates" msgstr "DB Updates" -#: mod/admin.php:172 mod/admin.php:513 +#: mod/admin.php:176 mod/admin.php:582 msgid "Inspect Queue" msgstr "Warteschlange Inspizieren" -#: mod/admin.php:173 mod/admin.php:289 +#: mod/admin.php:177 mod/admin.php:297 msgid "Server Blocklist" msgstr "Server Blockliste" -#: mod/admin.php:174 mod/admin.php:479 +#: mod/admin.php:178 mod/admin.php:548 msgid "Federation Statistics" msgstr "Federation Statistik" -#: mod/admin.php:188 mod/admin.php:199 mod/admin.php:2022 +#: mod/admin.php:179 mod/admin.php:374 +msgid "Delete Item" +msgstr "Eintrag löschen" + +#: mod/admin.php:193 mod/admin.php:204 mod/admin.php:2091 msgid "Logs" msgstr "Protokolle" -#: mod/admin.php:189 mod/admin.php:2090 +#: mod/admin.php:194 mod/admin.php:2159 msgid "View Logs" msgstr "Protokolle anzeigen" -#: mod/admin.php:190 +#: mod/admin.php:195 msgid "probe address" msgstr "Adresse untersuchen" -#: mod/admin.php:191 +#: mod/admin.php:196 msgid "check webfinger" msgstr "Webfinger überprüfen" -#: mod/admin.php:198 +#: mod/admin.php:203 msgid "Plugin Features" msgstr "Plugin Features" -#: mod/admin.php:200 +#: mod/admin.php:205 msgid "diagnostics" msgstr "Diagnose" -#: mod/admin.php:201 +#: mod/admin.php:206 msgid "User registrations waiting for confirmation" msgstr "Nutzeranmeldungen die auf Bestätigung warten" -#: mod/admin.php:280 +#: mod/admin.php:288 msgid "The blocked domain" msgstr "Die blockierte Domain" -#: mod/admin.php:281 mod/admin.php:294 +#: mod/admin.php:289 mod/admin.php:302 msgid "The reason why you blocked this domain." msgstr "Die Begründung warum du diese Domain blockiert hast." -#: mod/admin.php:282 +#: mod/admin.php:290 msgid "Delete domain" msgstr "Domain löschen" -#: mod/admin.php:282 +#: mod/admin.php:290 msgid "Check to delete this entry from the blocklist" msgstr "Markieren, um diesen Eintrag von der Blocklist zu entfernen" -#: mod/admin.php:288 mod/admin.php:478 mod/admin.php:512 mod/admin.php:592 -#: mod/admin.php:1059 mod/admin.php:1503 mod/admin.php:1621 mod/admin.php:1684 -#: mod/admin.php:1897 mod/admin.php:1947 mod/admin.php:2021 mod/admin.php:2089 +#: mod/admin.php:296 mod/admin.php:373 mod/admin.php:547 mod/admin.php:581 +#: mod/admin.php:661 mod/admin.php:1128 mod/admin.php:1572 mod/admin.php:1690 +#: mod/admin.php:1753 mod/admin.php:1966 mod/admin.php:2016 mod/admin.php:2090 +#: mod/admin.php:2158 msgid "Administration" msgstr "Administration" -#: mod/admin.php:290 +#: mod/admin.php:298 msgid "" "This page can be used to define a black list of servers from the federated " "network that are not allowed to interact with your node. For all entered " @@ -7485,109 +7493,138 @@ msgid "" "server." msgstr "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben." -#: mod/admin.php:291 +#: mod/admin.php:299 msgid "" "The list of blocked servers will be made publically available on the " "/friendica page so that your users and people investigating communication " "problems can find the reason easily." msgstr "Die Liste der blockierten Domains wird auf der /friendica Seite öffentlich einsehbar gemacht, damit deine Nutzer und Personen die Kommunikationsprobleme erkunden, die Ursachen einfach finden können." -#: mod/admin.php:292 +#: mod/admin.php:300 msgid "Add new entry to block list" msgstr "Neuen Eintrag in die Blockliste" -#: mod/admin.php:293 +#: mod/admin.php:301 msgid "Server Domain" msgstr "Domain des Servers" -#: mod/admin.php:293 +#: mod/admin.php:301 msgid "" "The domain of the new server to add to the block list. Do not include the " "protocol." msgstr "Der Domain-Name des Servers der geblockt werden soll. Gib das Protokoll nicht mit an!" -#: mod/admin.php:294 +#: mod/admin.php:302 msgid "Block reason" msgstr "Begründung der Blockierung" -#: mod/admin.php:295 +#: mod/admin.php:303 msgid "Add Entry" msgstr "Eintrag hinzufügen" -#: mod/admin.php:296 +#: mod/admin.php:304 msgid "Save changes to the blocklist" msgstr "Änderungen der Blockliste speichern" -#: mod/admin.php:297 +#: mod/admin.php:305 msgid "Current Entries in the Blocklist" msgstr "Aktuelle Einträge der Blockliste" -#: mod/admin.php:300 +#: mod/admin.php:308 msgid "Delete entry from blocklist" msgstr "Eintrag von der Blockliste entfernen" -#: mod/admin.php:303 +#: mod/admin.php:311 msgid "Delete entry from blocklist?" msgstr "Eintrag von der Blockliste entfernen?" -#: mod/admin.php:328 +#: mod/admin.php:336 msgid "Server added to blocklist." msgstr "Server zur Blockliste hinzugefügt." -#: mod/admin.php:344 +#: mod/admin.php:352 msgid "Site blocklist updated." msgstr "Blockliste aktualisiert." -#: mod/admin.php:409 +#: mod/admin.php:375 +msgid "Delete this Item" +msgstr "Diesen Eintrag löschen" + +#: mod/admin.php:376 +msgid "" +"On this page you can delete an item from your node. If the item is a top " +"level posting, the entire thread will be deleted." +msgstr "Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der beginn einer Diskussion ist, wird der gesamte Diskussions-Thread gelöscht." + +#: mod/admin.php:377 +msgid "" +"You need to know the GUID of the item. You can find it e.g. by looking at " +"the display URL. The last part of http://example.com/display/123456 is the " +"GUID, here 123456." +msgstr "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456 ist die GUID 123456." + +#: mod/admin.php:378 +msgid "GUID" +msgstr "GUID" + +#: mod/admin.php:378 +msgid "The GUID of the item you want to delete." +msgstr "Die GUID des zu löschenden Eintrags" + +#: mod/admin.php:415 +msgid "Item marked for deletion." +msgstr "Eintrag wurden zur Löschung markiert" + +#: mod/admin.php:478 msgid "unknown" msgstr "Unbekannt" -#: mod/admin.php:472 +#: mod/admin.php:541 msgid "" "This page offers you some numbers to the known part of the federated social " "network your Friendica node is part of. These numbers are not complete but " "only reflect the part of the network your node is aware of." msgstr "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt." -#: mod/admin.php:473 +#: mod/admin.php:542 msgid "" "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it " "will improve the data displayed here." msgstr "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern." -#: mod/admin.php:485 +#: mod/admin.php:554 #, php-format msgid "Currently this node is aware of %d nodes from the following platforms:" msgstr "Momentan kennt dieser Knoten %d andere Knoten der folgenden Plattformen:" -#: mod/admin.php:515 +#: mod/admin.php:584 msgid "ID" msgstr "ID" -#: mod/admin.php:516 +#: mod/admin.php:585 msgid "Recipient Name" msgstr "Empfänger Name" -#: mod/admin.php:517 +#: mod/admin.php:586 msgid "Recipient Profile" msgstr "Empfänger Profil" -#: mod/admin.php:519 +#: mod/admin.php:588 msgid "Created" msgstr "Erstellt" -#: mod/admin.php:520 +#: mod/admin.php:589 msgid "Last Tried" msgstr "Zuletzt versucht" -#: mod/admin.php:521 +#: mod/admin.php:590 msgid "" "This page lists the content of the queue for outgoing postings. These are " "postings the initial delivery failed for. They will be resend later and " "eventually deleted if the delivery fails permanently." msgstr "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden." -#: mod/admin.php:546 +#: mod/admin.php:615 #, php-format msgid "" "Your DB still runs with MyISAM tables. You should change the engine type to " @@ -7598,424 +7635,424 @@ msgid "" "automatic conversion.<br />" msgstr "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du <a href=\"%s\">hier</a> finden. Du kannst außerdem mit dem Befehl <tt>php include/dbstructure.php toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen." -#: mod/admin.php:555 +#: mod/admin.php:624 msgid "" "The database update failed. Please run \"php include/dbstructure.php " "update\" from the command line and have a look at the errors that might " "appear." msgstr "Das Update der Datenbank ist fehlgeschlagen. Bitte führe 'php include/dbstructure.php update' in der Kommandozeile aus und achte auf eventuell auftretende Fehlermeldungen." -#: mod/admin.php:560 mod/admin.php:1453 +#: mod/admin.php:629 mod/admin.php:1522 msgid "Normal Account" msgstr "Normales Konto" -#: mod/admin.php:561 mod/admin.php:1454 +#: mod/admin.php:630 mod/admin.php:1523 msgid "Automatic Follower Account" msgstr "Automatisc Folgender Account" -#: mod/admin.php:562 mod/admin.php:1455 +#: mod/admin.php:631 mod/admin.php:1524 msgid "Public Forum Account" msgstr "Öffentliche Gemeinschaftsforen Accoun" -#: mod/admin.php:563 mod/admin.php:1456 +#: mod/admin.php:632 mod/admin.php:1525 msgid "Automatic Friend Account" msgstr "Automatisches Freundekonto" -#: mod/admin.php:564 +#: mod/admin.php:633 msgid "Blog Account" msgstr "Blog-Konto" -#: mod/admin.php:565 +#: mod/admin.php:634 msgid "Private Forum Account" msgstr "Private Gemeinschaftsforen Accoun" -#: mod/admin.php:587 +#: mod/admin.php:656 msgid "Message queues" msgstr "Nachrichten-Warteschlangen" -#: mod/admin.php:593 +#: mod/admin.php:662 msgid "Summary" msgstr "Zusammenfassung" -#: mod/admin.php:595 +#: mod/admin.php:664 msgid "Registered users" msgstr "Registrierte Nutzer" -#: mod/admin.php:597 +#: mod/admin.php:666 msgid "Pending registrations" msgstr "Anstehende Anmeldungen" -#: mod/admin.php:598 +#: mod/admin.php:667 msgid "Version" msgstr "Version" -#: mod/admin.php:603 +#: mod/admin.php:672 msgid "Active plugins" msgstr "Aktive Plugins" -#: mod/admin.php:628 +#: mod/admin.php:697 msgid "Can not parse base url. Must have at least <scheme>://<domain>" msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <protokoll>://<domain> bestehen" -#: mod/admin.php:920 +#: mod/admin.php:989 msgid "Site settings updated." msgstr "Seiteneinstellungen aktualisiert." -#: mod/admin.php:977 +#: mod/admin.php:1046 msgid "No community page" msgstr "Keine Gemeinschaftsseite" -#: mod/admin.php:978 +#: mod/admin.php:1047 msgid "Public postings from users of this site" msgstr "Öffentliche Beiträge von Nutzer_innen dieser Seite" -#: mod/admin.php:979 +#: mod/admin.php:1048 msgid "Global community page" msgstr "Globale Gemeinschaftsseite" -#: mod/admin.php:985 +#: mod/admin.php:1054 msgid "At post arrival" msgstr "Beim Empfang von Nachrichten" -#: mod/admin.php:995 +#: mod/admin.php:1064 msgid "Users, Global Contacts" msgstr "Nutzer, globale Kontakte" -#: mod/admin.php:996 +#: mod/admin.php:1065 msgid "Users, Global Contacts/fallback" msgstr "Nutzer, globale Kontakte / Fallback" -#: mod/admin.php:1000 +#: mod/admin.php:1069 msgid "One month" msgstr "ein Monat" -#: mod/admin.php:1001 +#: mod/admin.php:1070 msgid "Three months" msgstr "drei Monate" -#: mod/admin.php:1002 +#: mod/admin.php:1071 msgid "Half a year" msgstr "ein halbes Jahr" -#: mod/admin.php:1003 +#: mod/admin.php:1072 msgid "One year" msgstr "ein Jahr" -#: mod/admin.php:1008 +#: mod/admin.php:1077 msgid "Multi user instance" msgstr "Mehrbenutzer Instanz" -#: mod/admin.php:1031 +#: mod/admin.php:1100 msgid "Closed" msgstr "Geschlossen" -#: mod/admin.php:1032 +#: mod/admin.php:1101 msgid "Requires approval" msgstr "Bedarf der Zustimmung" -#: mod/admin.php:1033 +#: mod/admin.php:1102 msgid "Open" msgstr "Offen" -#: mod/admin.php:1037 +#: mod/admin.php:1106 msgid "No SSL policy, links will track page SSL state" msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten" -#: mod/admin.php:1038 +#: mod/admin.php:1107 msgid "Force all links to use SSL" msgstr "SSL für alle Links erzwingen" -#: mod/admin.php:1039 +#: mod/admin.php:1108 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)" -#: mod/admin.php:1063 +#: mod/admin.php:1132 msgid "File upload" msgstr "Datei hochladen" -#: mod/admin.php:1064 +#: mod/admin.php:1133 msgid "Policies" msgstr "Regeln" -#: mod/admin.php:1066 +#: mod/admin.php:1135 msgid "Auto Discovered Contact Directory" msgstr "Automatisch ein Kontaktverzeichnis erstellen" -#: mod/admin.php:1067 +#: mod/admin.php:1136 msgid "Performance" msgstr "Performance" -#: mod/admin.php:1068 +#: mod/admin.php:1137 msgid "Worker" msgstr "Worker" -#: mod/admin.php:1069 +#: mod/admin.php:1138 msgid "" "Relocate - WARNING: advanced function. Could make this server unreachable." msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen." -#: mod/admin.php:1072 +#: mod/admin.php:1141 msgid "Site name" msgstr "Seitenname" -#: mod/admin.php:1073 +#: mod/admin.php:1142 msgid "Host name" msgstr "Host Name" -#: mod/admin.php:1074 +#: mod/admin.php:1143 msgid "Sender Email" msgstr "Absender für Emails" -#: mod/admin.php:1074 +#: mod/admin.php:1143 msgid "" "The email address your server shall use to send notification emails from." msgstr "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll." -#: mod/admin.php:1075 +#: mod/admin.php:1144 msgid "Banner/Logo" msgstr "Banner/Logo" -#: mod/admin.php:1076 +#: mod/admin.php:1145 msgid "Shortcut icon" msgstr "Shortcut Icon" -#: mod/admin.php:1076 +#: mod/admin.php:1145 msgid "Link to an icon that will be used for browsers." msgstr "Link zu einem Icon, das Browser verwenden werden." -#: mod/admin.php:1077 +#: mod/admin.php:1146 msgid "Touch icon" msgstr "Touch Icon" -#: mod/admin.php:1077 +#: mod/admin.php:1146 msgid "Link to an icon that will be used for tablets and mobiles." msgstr "Link zu einem Icon das Tablets und Handies verwenden sollen." -#: mod/admin.php:1078 +#: mod/admin.php:1147 msgid "Additional Info" msgstr "Zusätzliche Informationen" -#: mod/admin.php:1078 +#: mod/admin.php:1147 #, php-format msgid "" "For public servers: you can add additional information here that will be " "listed at %s/siteinfo." msgstr "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/siteinfo angezeigt werden." -#: mod/admin.php:1079 +#: mod/admin.php:1148 msgid "System language" msgstr "Systemsprache" -#: mod/admin.php:1080 +#: mod/admin.php:1149 msgid "System theme" msgstr "Systemweites Theme" -#: mod/admin.php:1080 +#: mod/admin.php:1149 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>" -#: mod/admin.php:1081 +#: mod/admin.php:1150 msgid "Mobile system theme" msgstr "Systemweites mobiles Theme" -#: mod/admin.php:1081 +#: mod/admin.php:1150 msgid "Theme for mobile devices" msgstr "Thema für mobile Geräte" -#: mod/admin.php:1082 +#: mod/admin.php:1151 msgid "SSL link policy" msgstr "Regeln für SSL Links" -#: mod/admin.php:1082 +#: mod/admin.php:1151 msgid "Determines whether generated links should be forced to use SSL" msgstr "Bestimmt, ob generierte Links SSL verwenden müssen" -#: mod/admin.php:1083 +#: mod/admin.php:1152 msgid "Force SSL" msgstr "Erzwinge SSL" -#: mod/admin.php:1083 +#: mod/admin.php:1152 msgid "" "Force all Non-SSL requests to SSL - Attention: on some systems it could lead" " to endless loops." msgstr "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife." -#: mod/admin.php:1084 +#: mod/admin.php:1153 msgid "Hide help entry from navigation menu" msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü" -#: mod/admin.php:1084 +#: mod/admin.php:1153 msgid "" "Hides the menu entry for the Help pages from the navigation menu. You can " "still access it calling /help directly." msgstr "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden." -#: mod/admin.php:1085 +#: mod/admin.php:1154 msgid "Single user instance" msgstr "Ein-Nutzer Instanz" -#: mod/admin.php:1085 +#: mod/admin.php:1154 msgid "Make this instance multi-user or single-user for the named user" msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt." -#: mod/admin.php:1086 +#: mod/admin.php:1155 msgid "Maximum image size" msgstr "Maximale Bildgröße" -#: mod/admin.php:1086 +#: mod/admin.php:1155 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit." -#: mod/admin.php:1087 +#: mod/admin.php:1156 msgid "Maximum image length" msgstr "Maximale Bildlänge" -#: mod/admin.php:1087 +#: mod/admin.php:1156 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is " "-1, which means no limits." msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet." -#: mod/admin.php:1088 +#: mod/admin.php:1157 msgid "JPEG image quality" msgstr "Qualität des JPEG Bildes" -#: mod/admin.php:1088 +#: mod/admin.php:1157 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust." -#: mod/admin.php:1090 +#: mod/admin.php:1159 msgid "Register policy" msgstr "Registrierungsmethode" -#: mod/admin.php:1091 +#: mod/admin.php:1160 msgid "Maximum Daily Registrations" msgstr "Maximum täglicher Registrierungen" -#: mod/admin.php:1091 +#: mod/admin.php:1160 msgid "" "If registration is permitted above, this sets the maximum number of new user" " registrations to accept per day. If register is set to closed, this " "setting has no effect." msgstr "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt." -#: mod/admin.php:1092 +#: mod/admin.php:1161 msgid "Register text" msgstr "Registrierungstext" -#: mod/admin.php:1092 +#: mod/admin.php:1161 msgid "Will be displayed prominently on the registration page." msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." -#: mod/admin.php:1093 +#: mod/admin.php:1162 msgid "Accounts abandoned after x days" msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" -#: mod/admin.php:1093 +#: mod/admin.php:1162 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit." -#: mod/admin.php:1094 +#: mod/admin.php:1163 msgid "Allowed friend domains" msgstr "Erlaubte Domains für Kontakte" -#: mod/admin.php:1094 +#: mod/admin.php:1163 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "Liste der Domains, die für Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: mod/admin.php:1095 +#: mod/admin.php:1164 msgid "Allowed email domains" msgstr "Erlaubte Domains für E-Mails" -#: mod/admin.php:1095 +#: mod/admin.php:1164 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben." -#: mod/admin.php:1096 +#: mod/admin.php:1165 msgid "Block public" msgstr "Öffentlichen Zugriff blockieren" -#: mod/admin.php:1096 +#: mod/admin.php:1165 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist." -#: mod/admin.php:1097 +#: mod/admin.php:1166 msgid "Force publish" msgstr "Erzwinge Veröffentlichung" -#: mod/admin.php:1097 +#: mod/admin.php:1166 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen." -#: mod/admin.php:1098 +#: mod/admin.php:1167 msgid "Global directory URL" msgstr "URL des weltweiten Verzeichnisses" -#: mod/admin.php:1098 +#: mod/admin.php:1167 msgid "" "URL to the global directory. If this is not set, the global directory is " "completely unavailable to the application." msgstr "URL des weltweiten Verzeichnisses. Wenn diese nicht gesetzt ist, ist das Verzeichnis für die Applikation nicht erreichbar." -#: mod/admin.php:1099 +#: mod/admin.php:1168 msgid "Allow threaded items" msgstr "Erlaube Threads in Diskussionen" -#: mod/admin.php:1099 +#: mod/admin.php:1168 msgid "Allow infinite level threading for items on this site." msgstr "Erlaube ein unendliches Level für Threads auf dieser Seite." -#: mod/admin.php:1100 +#: mod/admin.php:1169 msgid "Private posts by default for new users" msgstr "Private Beiträge als Standard für neue Nutzer" -#: mod/admin.php:1100 +#: mod/admin.php:1169 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen." -#: mod/admin.php:1101 +#: mod/admin.php:1170 msgid "Don't include post content in email notifications" msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden" -#: mod/admin.php:1101 +#: mod/admin.php:1170 msgid "" "Don't include the content of a post/comment/private message/etc. in the " "email notifications that are sent out from this site, as a privacy measure." msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden." -#: mod/admin.php:1102 +#: mod/admin.php:1171 msgid "Disallow public access to addons listed in the apps menu." msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten." -#: mod/admin.php:1102 +#: mod/admin.php:1171 msgid "" "Checking this box will restrict addons listed in the apps menu to members " "only." msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt." -#: mod/admin.php:1103 +#: mod/admin.php:1172 msgid "Don't embed private images in posts" msgstr "Private Bilder nicht in Beiträgen einbetten." -#: mod/admin.php:1103 +#: mod/admin.php:1172 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 " @@ -8023,220 +8060,220 @@ msgid "" "while." msgstr "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert." -#: mod/admin.php:1104 +#: mod/admin.php:1173 msgid "Allow Users to set remote_self" msgstr "Nutzern erlauben das remote_self Flag zu setzen" -#: mod/admin.php:1104 +#: mod/admin.php:1173 msgid "" "With checking this, every user is allowed to mark every contact as a " "remote_self in the repair contact dialog. Setting this flag on a contact " "causes mirroring every posting of that contact in the users stream." msgstr "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet." -#: mod/admin.php:1105 +#: mod/admin.php:1174 msgid "Block multiple registrations" msgstr "Unterbinde Mehrfachregistrierung" -#: mod/admin.php:1105 +#: mod/admin.php:1174 msgid "Disallow users to register additional accounts for use as pages." msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen." -#: mod/admin.php:1106 +#: mod/admin.php:1175 msgid "OpenID support" msgstr "OpenID Unterstützung" -#: mod/admin.php:1106 +#: mod/admin.php:1175 msgid "OpenID support for registration and logins." msgstr "OpenID-Unterstützung für Registrierung und Login." -#: mod/admin.php:1107 +#: mod/admin.php:1176 msgid "Fullname check" msgstr "Namen auf Vollständigkeit überprüfen" -#: mod/admin.php:1107 +#: mod/admin.php:1176 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden." -#: mod/admin.php:1108 +#: mod/admin.php:1177 msgid "Community Page Style" msgstr "Art der Gemeinschaftsseite" -#: mod/admin.php:1108 +#: mod/admin.php:1177 msgid "" "Type of community page to show. 'Global community' shows every public " "posting from an open distributed network that arrived on this server." msgstr "Welche Art der Gemeinschaftsseite soll verwendet werden? Globale Gemeinschaftsseite zeigt alle öffentlichen Beiträge eines offenen dezentralen Netzwerks an die auf diesem Server eintreffen." -#: mod/admin.php:1109 +#: mod/admin.php:1178 msgid "Posts per user on community page" msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite" -#: mod/admin.php:1109 +#: mod/admin.php:1178 msgid "" "The maximum number of posts per user on the community page. (Not valid for " "'Global Community')" msgstr "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt." -#: mod/admin.php:1110 +#: mod/admin.php:1179 msgid "Enable OStatus support" msgstr "OStatus Unterstützung aktivieren" -#: mod/admin.php:1110 +#: mod/admin.php:1179 msgid "" "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "Biete die eingebaute OStatus (iStatusNet, GNU Social, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt." -#: mod/admin.php:1111 +#: mod/admin.php:1180 msgid "OStatus conversation completion interval" msgstr "Intervall zum Vervollständigen von OStatus Unterhaltungen" -#: mod/admin.php:1111 +#: mod/admin.php:1180 msgid "" "How often shall the poller check for new entries in OStatus conversations? " "This can be a very ressource task." msgstr "Wie oft soll der Poller checken ob es neue Nachrichten in OStatus Unterhaltungen gibt die geladen werden müssen. Je nach Anzahl der OStatus Kontakte könnte dies ein sehr Ressourcen lastiger Job sein." -#: mod/admin.php:1112 +#: mod/admin.php:1181 msgid "Only import OStatus threads from our contacts" msgstr "Nur OStatus Konversationen unserer Kontakte importieren" -#: mod/admin.php:1112 +#: mod/admin.php:1181 msgid "" "Normally we import every content from our OStatus contacts. With this option" " we only store threads that are started by a contact that is known on our " "system." msgstr "Normalerweise werden alle Inhalte von OStatus Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden." -#: mod/admin.php:1113 +#: mod/admin.php:1182 msgid "OStatus support can only be enabled if threading is enabled." msgstr "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. " -#: mod/admin.php:1115 +#: mod/admin.php:1184 msgid "" "Diaspora support can't be enabled because Friendica was installed into a sub" " directory." msgstr "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist." -#: mod/admin.php:1116 +#: mod/admin.php:1185 msgid "Enable Diaspora support" msgstr "Diaspora Unterstützung aktivieren" -#: mod/admin.php:1116 +#: mod/admin.php:1185 msgid "Provide built-in Diaspora network compatibility." msgstr "Verwende die eingebaute Diaspora-Verknüpfung." -#: mod/admin.php:1117 +#: mod/admin.php:1186 msgid "Only allow Friendica contacts" msgstr "Nur Friendica-Kontakte erlauben" -#: mod/admin.php:1117 +#: mod/admin.php:1186 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert." -#: mod/admin.php:1118 +#: mod/admin.php:1187 msgid "Verify SSL" msgstr "SSL Überprüfen" -#: mod/admin.php:1118 +#: mod/admin.php:1187 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." -#: mod/admin.php:1119 +#: mod/admin.php:1188 msgid "Proxy user" msgstr "Proxy Nutzer" -#: mod/admin.php:1120 +#: mod/admin.php:1189 msgid "Proxy URL" msgstr "Proxy URL" -#: mod/admin.php:1121 +#: mod/admin.php:1190 msgid "Network timeout" msgstr "Netzwerk Wartezeit" -#: mod/admin.php:1121 +#: mod/admin.php:1190 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)." -#: mod/admin.php:1122 +#: mod/admin.php:1191 msgid "Maximum Load Average" msgstr "Maximum Load Average" -#: mod/admin.php:1122 +#: mod/admin.php:1191 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50" -#: mod/admin.php:1123 +#: mod/admin.php:1192 msgid "Maximum Load Average (Frontend)" msgstr "Maximum Load Average (Frontend)" -#: mod/admin.php:1123 +#: mod/admin.php:1192 msgid "Maximum system load before the frontend quits service - default 50." msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50." -#: mod/admin.php:1124 +#: mod/admin.php:1193 msgid "Minimal Memory" msgstr "Minimaler Speicher" -#: mod/admin.php:1124 +#: mod/admin.php:1193 msgid "" "Minimal free memory in MB for the poller. Needs access to /proc/meminfo - " "default 0 (deactivated)." msgstr "Minimal freier Speicher in MB für den Poller. Benötigt Zugriff auf /proc/meminfo - Standard 0 (Deaktiviert)." -#: mod/admin.php:1125 +#: mod/admin.php:1194 msgid "Maximum table size for optimization" msgstr "Maximale Tabellengröße zur Optimierung" -#: mod/admin.php:1125 +#: mod/admin.php:1194 msgid "" "Maximum table size (in MB) for the automatic optimization - default 100 MB. " "Enter -1 to disable it." msgstr "Maximale Tabellengröße (in MB) für die automatische Optimierung - Standard 100 MB. Gib -1 für Deaktivierung ein." -#: mod/admin.php:1126 +#: mod/admin.php:1195 msgid "Minimum level of fragmentation" msgstr "Minimaler Fragmentationsgrad" -#: mod/admin.php:1126 +#: mod/admin.php:1195 msgid "" "Minimum fragmenation level to start the automatic optimization - default " "value is 30%." msgstr "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%" -#: mod/admin.php:1128 +#: mod/admin.php:1197 msgid "Periodical check of global contacts" msgstr "Regelmäßig globale Kontakte überprüfen" -#: mod/admin.php:1128 +#: mod/admin.php:1197 msgid "" "If enabled, the global contacts are checked periodically for missing or " "outdated data and the vitality of the contacts and servers." msgstr "Wenn diese Option aktiviert ist, werden die globalen Kontakte regelmäßig auf fehlende oder veraltete Daten sowie auf Erreichbarkeit des Kontakts und des Servers überprüft." -#: mod/admin.php:1129 +#: mod/admin.php:1198 msgid "Days between requery" msgstr "Tage zwischen erneuten Abfragen" -#: mod/admin.php:1129 +#: mod/admin.php:1198 msgid "Number of days after which a server is requeried for his contacts." msgstr "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll." -#: mod/admin.php:1130 +#: mod/admin.php:1199 msgid "Discover contacts from other servers" msgstr "Neue Kontakte auf anderen Servern entdecken" -#: mod/admin.php:1130 +#: mod/admin.php:1199 msgid "" "Periodically query other servers for contacts. You can choose between " "'users': the users on the remote system, 'Global Contacts': active contacts " @@ -8246,32 +8283,32 @@ msgid "" "Global Contacts'." msgstr "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'." -#: mod/admin.php:1131 +#: mod/admin.php:1200 msgid "Timeframe for fetching global contacts" msgstr "Zeitfenster für globale Kontakte" -#: mod/admin.php:1131 +#: mod/admin.php:1200 msgid "" "When the discovery is activated, this value defines the timeframe for the " "activity of the global contacts that are fetched from other servers." msgstr "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden." -#: mod/admin.php:1132 +#: mod/admin.php:1201 msgid "Search the local directory" msgstr "Lokales Verzeichnis durchsuchen" -#: mod/admin.php:1132 +#: mod/admin.php:1201 msgid "" "Search the local directory instead of the global directory. When searching " "locally, every search will be executed on the global directory in the " "background. This improves the search results when the search is repeated." msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt umd die Suchresultate zu verbessern, wenn diese Suche wiederholt wird." -#: mod/admin.php:1134 +#: mod/admin.php:1203 msgid "Publish server information" msgstr "Server Informationen veröffentlichen" -#: mod/admin.php:1134 +#: mod/admin.php:1203 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 " @@ -8279,133 +8316,133 @@ msgid "" " href='http://the-federation.info/'>the-federation.info</a> for details." msgstr "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Nutzer_innen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen." -#: mod/admin.php:1136 +#: mod/admin.php:1205 msgid "Suppress Tags" msgstr "Tags Unterdrücken" -#: mod/admin.php:1136 +#: mod/admin.php:1205 msgid "Suppress showing a list of hashtags at the end of the posting." msgstr "Unterdrückt die Anzeige von Tags am Ende eines Beitrags." -#: mod/admin.php:1137 +#: mod/admin.php:1206 msgid "Path to item cache" msgstr "Pfad zum Eintrag Cache" -#: mod/admin.php:1137 +#: mod/admin.php:1206 msgid "The item caches buffers generated bbcode and external images." msgstr "Im Item-Cache werden externe Bilder und geparster BBCode zwischen gespeichert." -#: mod/admin.php:1138 +#: mod/admin.php:1207 msgid "Cache duration in seconds" msgstr "Cache-Dauer in Sekunden" -#: mod/admin.php:1138 +#: mod/admin.php:1207 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One" " day). To disable the item cache, set the value to -1." msgstr "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1." -#: mod/admin.php:1139 +#: mod/admin.php:1208 msgid "Maximum numbers of comments per post" msgstr "Maximale Anzahl von Kommentaren pro Beitrag" -#: mod/admin.php:1139 +#: mod/admin.php:1208 msgid "How much comments should be shown for each post? Default value is 100." msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100." -#: mod/admin.php:1140 +#: mod/admin.php:1209 msgid "Temp path" msgstr "Temp Pfad" -#: mod/admin.php:1140 +#: mod/admin.php:1209 msgid "" "If you have a restricted system where the webserver can't access the system " "temp path, enter another path here." msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad." -#: mod/admin.php:1141 +#: mod/admin.php:1210 msgid "Base path to installation" msgstr "Basis-Pfad zur Installation" -#: mod/admin.php:1141 +#: mod/admin.php:1210 msgid "" "If the system cannot detect the correct path to your installation, enter the" " correct path here. This setting should only be set if you are using a " "restricted system and symbolic links to your webroot." msgstr "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist." -#: mod/admin.php:1142 +#: mod/admin.php:1211 msgid "Disable picture proxy" msgstr "Bilder Proxy deaktivieren" -#: mod/admin.php:1142 +#: mod/admin.php:1211 msgid "" "The picture proxy increases performance and privacy. It shouldn't be used on" " systems with very low bandwith." msgstr "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen." -#: mod/admin.php:1143 +#: mod/admin.php:1212 msgid "Only search in tags" msgstr "Nur in Tags suchen" -#: mod/admin.php:1143 +#: mod/admin.php:1212 msgid "On large systems the text search can slow down the system extremely." msgstr "Auf großen Knoten kann die Volltext-Suche das System ausbremsen." -#: mod/admin.php:1145 +#: mod/admin.php:1214 msgid "New base url" msgstr "Neue Basis-URL" -#: mod/admin.php:1145 +#: mod/admin.php:1214 msgid "" "Change base url for this server. Sends relocate message to all DFRN contacts" " of all users." msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle DFRN Kontakte deiner Nutzer_innen." -#: mod/admin.php:1147 +#: mod/admin.php:1216 msgid "RINO Encryption" msgstr "RINO Verschlüsselung" -#: mod/admin.php:1147 +#: mod/admin.php:1216 msgid "Encryption layer between nodes." msgstr "Verschlüsselung zwischen Friendica Instanzen" -#: mod/admin.php:1149 +#: mod/admin.php:1218 msgid "Maximum number of parallel workers" msgstr "Maximale Anzahl parallel laufender Worker" -#: mod/admin.php:1149 +#: mod/admin.php:1218 msgid "" "On shared hosters set this to 2. On larger systems, values of 10 are great. " "Default value is 4." msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4." -#: mod/admin.php:1150 +#: mod/admin.php:1219 msgid "Don't use 'proc_open' with the worker" msgstr "'proc_open' nicht mit den Workern verwenden" -#: mod/admin.php:1150 +#: mod/admin.php:1219 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 "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen." -#: mod/admin.php:1151 +#: mod/admin.php:1220 msgid "Enable fastlane" msgstr "Aktiviere Fastlane" -#: mod/admin.php:1151 +#: mod/admin.php:1220 msgid "" "When enabed, the fastlane mechanism starts an additional worker if processes" " with higher priority are blocked by processes of lower priority." msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden." -#: mod/admin.php:1152 +#: mod/admin.php:1221 msgid "Enable frontend worker" msgstr "Aktiviere den Frontend Worker" -#: mod/admin.php:1152 +#: mod/admin.php:1221 msgid "" "When enabled the Worker process is triggered when backend access is " "performed (e.g. messages being delivered). On smaller sites you might want " @@ -8415,66 +8452,66 @@ msgid "" "this." msgstr "Ist diese Option aktiv, wird der Worker Prozess durch Aktionen am Frontend gestartet (z.B. wenn Nachrichten zugestellt werden). Auf kleineren Seiten sollte yourdomain.tld/worker regelmäßig, beispielsweise durch einen externen Cron Anbieter, aufgerufen werden. Du solltest dies Option nur dann aktivieren, wenn du keinen Cron Job auf deinem eigenen Server starten kannst. Damit diese Option einen Effekt hat, muss der Worker Prozess aktiviert sein." -#: mod/admin.php:1182 +#: mod/admin.php:1251 msgid "Update has been marked successful" msgstr "Update wurde als erfolgreich markiert" -#: mod/admin.php:1190 +#: mod/admin.php:1259 #, php-format msgid "Database structure update %s was successfully applied." msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt." -#: mod/admin.php:1193 +#: mod/admin.php:1262 #, php-format msgid "Executing of database structure update %s failed with error: %s" msgstr "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s" -#: mod/admin.php:1207 +#: mod/admin.php:1276 #, php-format msgid "Executing %s failed with error: %s" msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s" -#: mod/admin.php:1210 +#: mod/admin.php:1279 #, php-format msgid "Update %s was successfully applied." msgstr "Update %s war erfolgreich." -#: mod/admin.php:1213 +#: mod/admin.php:1282 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status." -#: mod/admin.php:1216 +#: mod/admin.php:1285 #, php-format msgid "There was no additional update function %s that needed to be called." msgstr "Es gab keine weitere Update-Funktion, die von %s ausgeführt werden musste." -#: mod/admin.php:1236 +#: mod/admin.php:1305 msgid "No failed updates." msgstr "Keine fehlgeschlagenen Updates." -#: mod/admin.php:1237 +#: mod/admin.php:1306 msgid "Check database structure" msgstr "Datenbank Struktur überprüfen" -#: mod/admin.php:1242 +#: mod/admin.php:1311 msgid "Failed Updates" msgstr "Fehlgeschlagene Updates" -#: mod/admin.php:1243 +#: mod/admin.php:1312 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben." -#: mod/admin.php:1244 +#: mod/admin.php:1313 msgid "Mark success (if update was manually applied)" msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)" -#: mod/admin.php:1245 +#: mod/admin.php:1314 msgid "Attempt to execute this update step automatically" msgstr "Versuchen, diesen Schritt automatisch auszuführen" -#: mod/admin.php:1279 +#: mod/admin.php:1348 #, php-format msgid "" "\n" @@ -8482,7 +8519,7 @@ msgid "" "\t\t\t\tthe administrator of %2$s has set up an account for you." msgstr "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt." -#: mod/admin.php:1282 +#: mod/admin.php:1351 #, php-format msgid "" "\n" @@ -8512,158 +8549,158 @@ msgid "" "\t\t\tThank you and welcome to %4$s." msgstr "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s." -#: mod/admin.php:1326 +#: mod/admin.php:1395 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s Benutzer geblockt/freigegeben" msgstr[1] "%s Benutzer geblockt/freigegeben" -#: mod/admin.php:1333 +#: mod/admin.php:1402 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s Nutzer gelöscht" msgstr[1] "%s Nutzer gelöscht" -#: mod/admin.php:1380 +#: mod/admin.php:1449 #, php-format msgid "User '%s' deleted" msgstr "Nutzer '%s' gelöscht" -#: mod/admin.php:1388 +#: mod/admin.php:1457 #, php-format msgid "User '%s' unblocked" msgstr "Nutzer '%s' entsperrt" -#: mod/admin.php:1388 +#: mod/admin.php:1457 #, php-format msgid "User '%s' blocked" msgstr "Nutzer '%s' gesperrt" -#: mod/admin.php:1496 mod/admin.php:1522 +#: mod/admin.php:1565 mod/admin.php:1591 msgid "Register date" msgstr "Anmeldedatum" -#: mod/admin.php:1496 mod/admin.php:1522 +#: mod/admin.php:1565 mod/admin.php:1591 msgid "Last login" msgstr "Letzte Anmeldung" -#: mod/admin.php:1496 mod/admin.php:1522 +#: mod/admin.php:1565 mod/admin.php:1591 msgid "Last item" msgstr "Letzter Beitrag" -#: mod/admin.php:1505 +#: mod/admin.php:1574 msgid "Add User" msgstr "Nutzer hinzufügen" -#: mod/admin.php:1506 +#: mod/admin.php:1575 msgid "select all" msgstr "Alle auswählen" -#: mod/admin.php:1507 +#: mod/admin.php:1576 msgid "User registrations waiting for confirm" msgstr "Neuanmeldungen, die auf Deine Bestätigung warten" -#: mod/admin.php:1508 +#: mod/admin.php:1577 msgid "User waiting for permanent deletion" msgstr "Nutzer wartet auf permanente Löschung" -#: mod/admin.php:1509 +#: mod/admin.php:1578 msgid "Request date" msgstr "Anfragedatum" -#: mod/admin.php:1510 +#: mod/admin.php:1579 msgid "No registrations." msgstr "Keine Neuanmeldungen." -#: mod/admin.php:1511 +#: mod/admin.php:1580 msgid "Note from the user" msgstr "Hinweis vom Nutzer" -#: mod/admin.php:1513 +#: mod/admin.php:1582 msgid "Deny" msgstr "Verwehren" -#: mod/admin.php:1517 +#: mod/admin.php:1586 msgid "Site admin" msgstr "Seitenadministrator" -#: mod/admin.php:1518 +#: mod/admin.php:1587 msgid "Account expired" msgstr "Account ist abgelaufen" -#: mod/admin.php:1521 +#: mod/admin.php:1590 msgid "New User" msgstr "Neuer Nutzer" -#: mod/admin.php:1522 +#: mod/admin.php:1591 msgid "Deleted since" msgstr "Gelöscht seit" -#: mod/admin.php:1527 +#: mod/admin.php:1596 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?" -#: mod/admin.php:1528 +#: mod/admin.php:1597 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?" -#: mod/admin.php:1538 +#: mod/admin.php:1607 msgid "Name of the new user." msgstr "Name des neuen Nutzers" -#: mod/admin.php:1539 +#: mod/admin.php:1608 msgid "Nickname" msgstr "Spitzname" -#: mod/admin.php:1539 +#: mod/admin.php:1608 msgid "Nickname of the new user." msgstr "Spitznamen für den neuen Nutzer" -#: mod/admin.php:1540 +#: mod/admin.php:1609 msgid "Email address of the new user." msgstr "Email Adresse des neuen Nutzers" -#: mod/admin.php:1583 +#: mod/admin.php:1652 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s deaktiviert." -#: mod/admin.php:1587 +#: mod/admin.php:1656 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s aktiviert." -#: mod/admin.php:1598 mod/admin.php:1850 +#: mod/admin.php:1667 mod/admin.php:1919 msgid "Disable" msgstr "Ausschalten" -#: mod/admin.php:1600 mod/admin.php:1852 +#: mod/admin.php:1669 mod/admin.php:1921 msgid "Enable" msgstr "Einschalten" -#: mod/admin.php:1623 mod/admin.php:1899 +#: mod/admin.php:1692 mod/admin.php:1968 msgid "Toggle" msgstr "Umschalten" -#: mod/admin.php:1631 mod/admin.php:1908 +#: mod/admin.php:1700 mod/admin.php:1977 msgid "Author: " msgstr "Autor:" -#: mod/admin.php:1632 mod/admin.php:1909 +#: mod/admin.php:1701 mod/admin.php:1978 msgid "Maintainer: " msgstr "Betreuer:" -#: mod/admin.php:1687 +#: mod/admin.php:1756 msgid "Reload active plugins" msgstr "Aktive Plugins neu laden" -#: mod/admin.php:1692 +#: mod/admin.php:1761 #, php-format msgid "" "There are currently no plugins available on your node. You can find the " @@ -8671,70 +8708,70 @@ msgid "" "in the open plugin registry at %2$s" msgstr "Es sind derzeit keine Plugins auf diesem Knoten verfügbar. Du findest das offizielle Plugin-Repository unter %1$s und weitere eventuell interessante Plugins im offenen Plugins-Verzeichnis auf %2$s." -#: mod/admin.php:1811 +#: mod/admin.php:1880 msgid "No themes found." msgstr "Keine Themen gefunden." -#: mod/admin.php:1890 +#: mod/admin.php:1959 msgid "Screenshot" msgstr "Bildschirmfoto" -#: mod/admin.php:1950 +#: mod/admin.php:2019 msgid "Reload active themes" msgstr "Aktives Theme neu laden" -#: mod/admin.php:1955 +#: mod/admin.php:2024 #, php-format msgid "No themes found on the system. They should be paced in %1$s" msgstr "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1$s patziert werden." -#: mod/admin.php:1956 +#: mod/admin.php:2025 msgid "[Experimental]" msgstr "[Experimentell]" -#: mod/admin.php:1957 +#: mod/admin.php:2026 msgid "[Unsupported]" msgstr "[Nicht unterstützt]" -#: mod/admin.php:1981 +#: mod/admin.php:2050 msgid "Log settings updated." msgstr "Protokolleinstellungen aktualisiert." -#: mod/admin.php:2013 +#: mod/admin.php:2082 msgid "PHP log currently enabled." msgstr "PHP Protokollierung ist derzeit aktiviert." -#: mod/admin.php:2015 +#: mod/admin.php:2084 msgid "PHP log currently disabled." msgstr "PHP Protokollierung ist derzeit nicht aktiviert." -#: mod/admin.php:2024 +#: mod/admin.php:2093 msgid "Clear" msgstr "löschen" -#: mod/admin.php:2029 +#: mod/admin.php:2098 msgid "Enable Debugging" msgstr "Protokoll führen" -#: mod/admin.php:2030 +#: mod/admin.php:2099 msgid "Log file" msgstr "Protokolldatei" -#: mod/admin.php:2030 +#: mod/admin.php:2099 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis." -#: mod/admin.php:2031 +#: mod/admin.php:2100 msgid "Log level" msgstr "Protokoll-Level" -#: mod/admin.php:2034 +#: mod/admin.php:2103 msgid "PHP logging" msgstr "PHP Protokollieren" -#: mod/admin.php:2035 +#: mod/admin.php:2104 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 " @@ -8743,12 +8780,12 @@ msgid "" "'display_errors' is to enable these options, set to '0' to disable them." msgstr "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest, Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie." -#: mod/admin.php:2166 +#: mod/admin.php:2235 #, php-format msgid "Lock feature %s" msgstr "Feature festlegen: %s" -#: mod/admin.php:2174 +#: mod/admin.php:2243 msgid "Manage Additional Features" msgstr "Zusätzliche Features Verwalten" @@ -8756,14 +8793,6 @@ msgstr "Zusätzliche Features Verwalten" msgid "via" msgstr "via" -#: src/App.php:506 -msgid "Delete this item?" -msgstr "Diesen Beitrag löschen?" - -#: src/App.php:508 -msgid "show fewer" -msgstr "weniger anzeigen" - #: view/theme/duepuntozero/config.php:47 msgid "greenzero" msgstr "greenzero" @@ -8792,6 +8821,38 @@ msgstr "slackr" msgid "Variations" msgstr "Variationen" +#: view/theme/frio/php/Image.php:23 +msgid "Repeat the image" +msgstr "Bild wiederholen" + +#: view/theme/frio/php/Image.php:23 +msgid "Will repeat your image to fill the background." +msgstr "Wiederholt das Bild um den Hintergrund auszufüllen." + +#: view/theme/frio/php/Image.php:25 +msgid "Stretch" +msgstr "Strecken" + +#: view/theme/frio/php/Image.php:25 +msgid "Will stretch to width/height of the image." +msgstr "Streckt Breite/Höhe des Bildes." + +#: view/theme/frio/php/Image.php:27 +msgid "Resize fill and-clip" +msgstr "Größe anpassen - Ausfüllen und abschneiden" + +#: view/theme/frio/php/Image.php:27 +msgid "Resize to fill and retain aspect ratio." +msgstr "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize best fit" +msgstr "Größe anpassen - Optimale Größe" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize to best fit and retain aspect ratio." +msgstr "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten" + #: view/theme/frio/config.php:50 msgid "Default" msgstr "Standard" @@ -8832,38 +8893,6 @@ msgstr "Transparanz des Hintergrunds von Beiträgem" msgid "Set the background image" msgstr "Hintergrundbild festlegen" -#: view/theme/frio/php/Image.php:23 -msgid "Repeat the image" -msgstr "Bild wiederholen" - -#: view/theme/frio/php/Image.php:23 -msgid "Will repeat your image to fill the background." -msgstr "Wiederholt das Bild um den Hintergrund auszufüllen." - -#: view/theme/frio/php/Image.php:25 -msgid "Stretch" -msgstr "Strecken" - -#: view/theme/frio/php/Image.php:25 -msgid "Will stretch to width/height of the image." -msgstr "Streckt Breite/Höhe des Bildes." - -#: view/theme/frio/php/Image.php:27 -msgid "Resize fill and-clip" -msgstr "Größe anpassen - Ausfüllen und abschneiden" - -#: view/theme/frio/php/Image.php:27 -msgid "Resize to fill and retain aspect ratio." -msgstr "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten" - -#: view/theme/frio/php/Image.php:29 -msgid "Resize best fit" -msgstr "Größe anpassen - Optimale Größe" - -#: view/theme/frio/php/Image.php:29 -msgid "Resize to best fit and retain aspect ratio." -msgstr "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten" - #: view/theme/frio/theme.php:228 msgid "Guest" msgstr "Gast" @@ -8936,6 +8965,18 @@ msgstr "Lokales Verzeichnis" msgid "Quick Start" msgstr "Schnell-Start" +#: src/App.php:506 +msgid "Delete this item?" +msgstr "Diesen Beitrag löschen?" + +#: src/App.php:508 +msgid "show fewer" +msgstr "weniger anzeigen" + +#: index.php:436 +msgid "toggle mobile" +msgstr "auf/von Mobile Ansicht wechseln" + #: boot.php:735 #, php-format msgid "Update %s failed. See error logs." @@ -8976,7 +9017,3 @@ msgstr "Website Datenschutzerklärung" #: boot.php:892 msgid "privacy policy" msgstr "Datenschutzerklärung" - -#: index.php:436 -msgid "toggle mobile" -msgstr "auf/von Mobile Ansicht wechseln" diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php index 5d30a91362..f30d4ac623 100644 --- a/view/lang/de/strings.php +++ b/view/lang/de/strings.php @@ -5,83 +5,6 @@ function string_plural_select_de($n){ return ($n != 1);; }} ; -$a->strings["Forums"] = "Foren"; -$a->strings["External link to forum"] = "Externer Link zum Forum"; -$a->strings["show more"] = "mehr anzeigen"; -$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i"; -$a->strings["Starts:"] = "Beginnt:"; -$a->strings["Finishes:"] = "Endet:"; -$a->strings["Location:"] = "Ort:"; -$a->strings["Miscellaneous"] = "Verschiedenes"; -$a->strings["Birthday:"] = "Geburtstag:"; -$a->strings["Age: "] = "Alter: "; -$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD oder MM-DD"; -$a->strings["never"] = "nie"; -$a->strings["less than a second ago"] = "vor weniger als einer Sekunde"; -$a->strings["year"] = "Jahr"; -$a->strings["years"] = "Jahre"; -$a->strings["month"] = "Monat"; -$a->strings["months"] = "Monate"; -$a->strings["week"] = "Woche"; -$a->strings["weeks"] = "Wochen"; -$a->strings["day"] = "Tag"; -$a->strings["days"] = "Tage"; -$a->strings["hour"] = "Stunde"; -$a->strings["hours"] = "Stunden"; -$a->strings["minute"] = "Minute"; -$a->strings["minutes"] = "Minuten"; -$a->strings["second"] = "Sekunde"; -$a->strings["seconds"] = "Sekunden"; -$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s"; -$a->strings["%s's birthday"] = "%ss Geburtstag"; -$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; -$a->strings["all-day"] = "ganztägig"; -$a->strings["Sun"] = "So"; -$a->strings["Mon"] = "Mo"; -$a->strings["Tue"] = "Di"; -$a->strings["Wed"] = "Mi"; -$a->strings["Thu"] = "Do"; -$a->strings["Fri"] = "Fr"; -$a->strings["Sat"] = "Sa"; -$a->strings["Sunday"] = "Sonntag"; -$a->strings["Monday"] = "Montag"; -$a->strings["Tuesday"] = "Dienstag"; -$a->strings["Wednesday"] = "Mittwoch"; -$a->strings["Thursday"] = "Donnerstag"; -$a->strings["Friday"] = "Freitag"; -$a->strings["Saturday"] = "Samstag"; -$a->strings["Jan"] = "Jan"; -$a->strings["Feb"] = "Feb"; -$a->strings["Mar"] = "März"; -$a->strings["Apr"] = "Apr"; -$a->strings["May"] = "Mai"; -$a->strings["Jun"] = "Jun"; -$a->strings["Jul"] = "Juli"; -$a->strings["Aug"] = "Aug"; -$a->strings["Sept"] = "Sep"; -$a->strings["Oct"] = "Okt"; -$a->strings["Nov"] = "Nov"; -$a->strings["Dec"] = "Dez"; -$a->strings["January"] = "Januar"; -$a->strings["February"] = "Februar"; -$a->strings["March"] = "März"; -$a->strings["April"] = "April"; -$a->strings["June"] = "Juni"; -$a->strings["July"] = "Juli"; -$a->strings["August"] = "August"; -$a->strings["September"] = "September"; -$a->strings["October"] = "Oktober"; -$a->strings["November"] = "November"; -$a->strings["December"] = "Dezember"; -$a->strings["today"] = "Heute"; -$a->strings["No events to display"] = "Keine Veranstaltung zum Anzeigen"; -$a->strings["l, F j"] = "l, F j"; -$a->strings["Edit event"] = "Veranstaltung bearbeiten"; -$a->strings["Delete event"] = "Veranstaltung löschen"; -$a->strings["link to source"] = "Link zum Originalbeitrag"; -$a->strings["Export"] = "Exportieren"; -$a->strings["Export calendar as ical"] = "Kalender als ical exportieren"; -$a->strings["Export calendar as csv"] = "Kalender als csv exportieren"; $a->strings["General Features"] = "Allgemeine Features"; $a->strings["Multiple Profiles"] = "Mehrere Profile"; $a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen"; @@ -131,6 +54,36 @@ $a->strings["Mute Post Notifications"] = "Benachrichtigungen für Beiträge Stum $a->strings["Ability to mute notifications for a thread"] = "Möglichkeit Benachrichtigungen für einen Thread abbestellen zu können"; $a->strings["Advanced Profile Settings"] = "Erweiterte Profil-Einstellungen"; $a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Zeige Besuchern öffentliche Gemeinschafts-Foren auf der Erweiterten Profil-Seite"; +$a->strings["Forums"] = "Foren"; +$a->strings["External link to forum"] = "Externer Link zum Forum"; +$a->strings["show more"] = "mehr anzeigen"; +$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i"; +$a->strings["Starts:"] = "Beginnt:"; +$a->strings["Finishes:"] = "Endet:"; +$a->strings["Location:"] = "Ort:"; +$a->strings["Miscellaneous"] = "Verschiedenes"; +$a->strings["Birthday:"] = "Geburtstag:"; +$a->strings["Age: "] = "Alter: "; +$a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD oder MM-DD"; +$a->strings["never"] = "nie"; +$a->strings["less than a second ago"] = "vor weniger als einer Sekunde"; +$a->strings["year"] = "Jahr"; +$a->strings["years"] = "Jahre"; +$a->strings["month"] = "Monat"; +$a->strings["months"] = "Monate"; +$a->strings["week"] = "Woche"; +$a->strings["weeks"] = "Wochen"; +$a->strings["day"] = "Tag"; +$a->strings["days"] = "Tage"; +$a->strings["hour"] = "Stunde"; +$a->strings["hours"] = "Stunden"; +$a->strings["minute"] = "Minute"; +$a->strings["minutes"] = "Minuten"; +$a->strings["second"] = "Sekunde"; +$a->strings["seconds"] = "Sekunden"; +$a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s"; +$a->strings["%s's birthday"] = "%ss Geburtstag"; +$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht"; $a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; @@ -139,6 +92,44 @@ $a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss $a->strings["photo"] = "Foto"; $a->strings["status"] = "Status"; $a->strings["event"] = "Event"; +$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei"; +$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"; +$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen."; +$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!"; +$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten"; +$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos"; +$a->strings["%d contact not imported"] = array( + 0 => "%d Kontakt nicht importiert", + 1 => "%d Kontakte nicht importiert", +); +$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"; +$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; +$a->strings["An invitation is required."] = "Du benötigst eine Einladung."; +$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; +$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."; +$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; +$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein."; +$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen."; +$a->strings["Name too short."] = "Der Name ist zu kurz."; +$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."; +$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."; +$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; +$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; +$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."; +$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; +$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; +$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["default"] = "Standard"; +$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["Friends"] = "Kontakte"; +$a->strings["Profile Photos"] = "Profilbilder"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden."; +$a->strings["Registration at %s"] = "Registrierung als %s"; +$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; +$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; +$a->strings["Registration details for %s"] = "Details der Registration von %s"; $a->strings["Male"] = "Männlich"; $a->strings["Female"] = "Weiblich"; $a->strings["Currently Male"] = "Momentan männlich"; @@ -178,7 +169,6 @@ $a->strings["Infatuated"] = "verliebt"; $a->strings["Dating"] = "Dating"; $a->strings["Unfaithful"] = "Untreu"; $a->strings["Sex Addict"] = "Sexbesessen"; -$a->strings["Friends"] = "Kontakte"; $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen"; $a->strings["Casual"] = "Casual"; $a->strings["Engaged"] = "Verlobt"; @@ -200,59 +190,6 @@ $a->strings["Uncertain"] = "Unsicher"; $a->strings["It's complicated"] = "Ist kompliziert"; $a->strings["Don't care"] = "Ist mir nicht wichtig"; $a->strings["Ask me"] = "Frag mich"; -$a->strings["Welcome "] = "Willkommen "; -$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; -$a->strings["Welcome back "] = "Willkommen zurück "; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; -$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei"; -$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"; -$a->strings["Error! Cannot check nickname"] = "Fehler! Konnte den Nickname nicht überprüfen."; -$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!"; -$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten"; -$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos"; -$a->strings["%d contact not imported"] = array( - 0 => "%d Kontakt nicht importiert", - 1 => "%d Kontakte nicht importiert", -); -$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"; -$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; -$a->strings["An invitation is required."] = "Du benötigst eine Einladung."; -$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; -$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."; -$a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; -$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein."; -$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen."; -$a->strings["Name too short."] = "Der Name ist zu kurz."; -$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."; -$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."; -$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse."; -$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden."; -$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."; -$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; -$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; -$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; -$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; -$a->strings["default"] = "Standard"; -$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; -$a->strings["Profile Photos"] = "Profilbilder"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde muss noch vom Admin des Knotens geprüft werden."; -$a->strings["Registration at %s"] = "Registrierung als %s"; -$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet."; -$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; -$a->strings["Registration details for %s"] = "Details der Registration von %s"; -$a->strings["View Profile"] = "Profil anschauen"; -$a->strings["Connect/Follow"] = "Verbinden/Folgen"; -$a->strings["View Status"] = "Pinnwand anschauen"; -$a->strings["View Photos"] = "Bilder anschauen"; -$a->strings["Network Posts"] = "Netzwerkbeiträge"; -$a->strings["View Contact"] = "Kontakt anzeigen"; -$a->strings["Drop Contact"] = "Kontakt löschen"; -$a->strings["Send PM"] = "Private Nachricht senden"; -$a->strings["Poke"] = "Anstupsen"; -$a->strings["Organisation"] = "Organisation"; -$a->strings["News"] = "Nachrichten"; -$a->strings["Forum"] = "Forum"; $a->strings["System"] = "System"; $a->strings["Network"] = "Netzwerk"; $a->strings["Personal"] = "Persönlich"; @@ -320,30 +257,6 @@ $a->strings["Diaspora Connector"] = "Diaspora"; $a->strings["GNU Social Connector"] = "GNU social Connector"; $a->strings["pnut"] = "pnut"; $a->strings["App.net"] = "App.net"; -$a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen"; -$a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben"; -$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara"; -$a->strings["Connect"] = "Verbinden"; -$a->strings["%d invitation available"] = array( - 0 => "%d Einladung verfügbar", - 1 => "%d Einladungen verfügbar", -); -$a->strings["Find People"] = "Leute finden"; -$a->strings["Enter name or interest"] = "Name oder Interessen eingeben"; -$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln"; -$a->strings["Find"] = "Finde"; -$a->strings["Friend Suggestions"] = "Kontaktvorschläge"; -$a->strings["Similar Interests"] = "Ähnliche Interessen"; -$a->strings["Random Profile"] = "Zufälliges Profil"; -$a->strings["Invite Friends"] = "Freunde einladen"; -$a->strings["Networks"] = "Netzwerke"; -$a->strings["All Networks"] = "Alle Netzwerke"; -$a->strings["Everything"] = "Alles"; -$a->strings["Categories"] = "Kategorien"; -$a->strings["%d contact in common"] = array( - 0 => "%d gemeinsamer Kontakt", - 1 => "%d gemeinsame Kontakte", -); $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil."; $a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil."; $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil."; @@ -372,6 +285,14 @@ $a->strings["Please wait"] = "Bitte warten"; $a->strings["remove"] = "löschen"; $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge"; $a->strings["Follow Thread"] = "Folge der Unterhaltung"; +$a->strings["View Status"] = "Pinnwand anschauen"; +$a->strings["View Profile"] = "Profil anschauen"; +$a->strings["View Photos"] = "Bilder anschauen"; +$a->strings["Network Posts"] = "Netzwerkbeiträge"; +$a->strings["View Contact"] = "Kontakt anzeigen"; +$a->strings["Send PM"] = "Private Nachricht senden"; +$a->strings["Poke"] = "Anstupsen"; +$a->strings["Connect/Follow"] = "Verbinden/Folgen"; $a->strings["%s likes this."] = "%s mag das."; $a->strings["%s doesn't like this."] = "%s mag das nicht."; $a->strings["%s attends."] = "%s nimmt teil."; @@ -447,7 +368,6 @@ $a->strings[": Database update"] = ": Datenbank Update"; $a->strings["%s: updating %s table."] = "%s: aktualisiere Tabelle %s"; $a->strings["(no subject)"] = "(kein Betreff)"; $a->strings["noreply"] = "noreply"; -$a->strings["%s\\'s birthday"] = "%ss Geburtstag"; $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; $a->strings["Attachments:"] = "Anhänge:"; $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung"; @@ -509,6 +429,53 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "D $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Registrierungsanfrage[/url] von %2\$s erhalten."; $a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Kompletter Name:\t%1\$s\\nURL der Seite:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"; $a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten."; +$a->strings["all-day"] = "ganztägig"; +$a->strings["Sun"] = "So"; +$a->strings["Mon"] = "Mo"; +$a->strings["Tue"] = "Di"; +$a->strings["Wed"] = "Mi"; +$a->strings["Thu"] = "Do"; +$a->strings["Fri"] = "Fr"; +$a->strings["Sat"] = "Sa"; +$a->strings["Sunday"] = "Sonntag"; +$a->strings["Monday"] = "Montag"; +$a->strings["Tuesday"] = "Dienstag"; +$a->strings["Wednesday"] = "Mittwoch"; +$a->strings["Thursday"] = "Donnerstag"; +$a->strings["Friday"] = "Freitag"; +$a->strings["Saturday"] = "Samstag"; +$a->strings["Jan"] = "Jan"; +$a->strings["Feb"] = "Feb"; +$a->strings["Mar"] = "März"; +$a->strings["Apr"] = "Apr"; +$a->strings["May"] = "Mai"; +$a->strings["Jun"] = "Jun"; +$a->strings["Jul"] = "Juli"; +$a->strings["Aug"] = "Aug"; +$a->strings["Sept"] = "Sep"; +$a->strings["Oct"] = "Okt"; +$a->strings["Nov"] = "Nov"; +$a->strings["Dec"] = "Dez"; +$a->strings["January"] = "Januar"; +$a->strings["February"] = "Februar"; +$a->strings["March"] = "März"; +$a->strings["April"] = "April"; +$a->strings["June"] = "Juni"; +$a->strings["July"] = "Juli"; +$a->strings["August"] = "August"; +$a->strings["September"] = "September"; +$a->strings["October"] = "Oktober"; +$a->strings["November"] = "November"; +$a->strings["December"] = "Dezember"; +$a->strings["today"] = "Heute"; +$a->strings["No events to display"] = "Keine Veranstaltung zum Anzeigen"; +$a->strings["l, F j"] = "l, F j"; +$a->strings["Edit event"] = "Veranstaltung bearbeiten"; +$a->strings["Delete event"] = "Veranstaltung löschen"; +$a->strings["link to source"] = "Link zum Originalbeitrag"; +$a->strings["Export"] = "Exportieren"; +$a->strings["Export calendar as ical"] = "Kalender als ical exportieren"; +$a->strings["Export calendar as csv"] = "Kalender als csv exportieren"; $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; $a->strings["Blocked domain"] = "Blockierte Daimain"; $a->strings["Connect URL missing."] = "Connect-URL fehlt"; @@ -533,67 +500,6 @@ $a->strings["Create a new group"] = "Neue Gruppe erstellen"; $a->strings["Group Name: "] = "Gruppenname:"; $a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe"; $a->strings["add"] = "hinzufügen"; -$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; -$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; -$a->strings["Edit profile"] = "Profil bearbeiten"; -$a->strings["Atom feed"] = "Atom-Feed"; -$a->strings["Profiles"] = "Profile"; -$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; -$a->strings["Change profile photo"] = "Profilbild ändern"; -$a->strings["Create New Profile"] = "Neues Profil anlegen"; -$a->strings["Profile Image"] = "Profilbild"; -$a->strings["visible to everybody"] = "sichtbar für jeden"; -$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; -$a->strings["Gender:"] = "Geschlecht:"; -$a->strings["Status:"] = "Status:"; -$a->strings["Homepage:"] = "Homepage:"; -$a->strings["About:"] = "Über:"; -$a->strings["XMPP:"] = "XMPP:"; -$a->strings["Network:"] = "Netzwerk:"; -$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; -$a->strings["F d"] = "d. F"; -$a->strings["[today]"] = "[heute]"; -$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; -$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; -$a->strings["[No description]"] = "[keine Beschreibung]"; -$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; -$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; -$a->strings["Profile"] = "Profil"; -$a->strings["Full Name:"] = "Kompletter Name:"; -$a->strings["j F, Y"] = "j F, Y"; -$a->strings["j F"] = "j F"; -$a->strings["Age:"] = "Alter:"; -$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; -$a->strings["Hometown:"] = "Heimatort:"; -$a->strings["Tags:"] = "Tags:"; -$a->strings["Political Views:"] = "Politische Ansichten:"; -$a->strings["Religion:"] = "Religion:"; -$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; -$a->strings["Likes:"] = "Likes:"; -$a->strings["Dislikes:"] = "Dislikes:"; -$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; -$a->strings["Musical interests:"] = "Musikalische Interessen:"; -$a->strings["Books, literature:"] = "Literatur/Bücher:"; -$a->strings["Television:"] = "Fernsehen:"; -$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; -$a->strings["Love/Romance:"] = "Liebesleben:"; -$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; -$a->strings["School/education:"] = "Schule/Ausbildung:"; -$a->strings["Forums:"] = "Foren:"; -$a->strings["Basic"] = "Allgemein"; -$a->strings["Advanced"] = "Erweitert"; -$a->strings["Status"] = "Status"; -$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; -$a->strings["Profile Details"] = "Profildetails"; -$a->strings["Photos"] = "Bilder"; -$a->strings["Photo Albums"] = "Fotoalben"; -$a->strings["Videos"] = "Videos"; -$a->strings["Events"] = "Veranstaltungen"; -$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; -$a->strings["Personal Notes"] = "Persönliche Notizen"; -$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; -$a->strings["Contacts"] = "Kontakte"; $a->strings["[Name Withheld]"] = "[Name unterdrückt]"; $a->strings["Item not found."] = "Beitrag nicht gefunden."; $a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; @@ -606,10 +512,15 @@ $a->strings["Clear notifications"] = "Bereinige Benachrichtigungen"; $a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content"; $a->strings["Logout"] = "Abmelden"; $a->strings["End this session"] = "Diese Sitzung beenden"; +$a->strings["Status"] = "Status"; $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen"; +$a->strings["Profile"] = "Profil"; $a->strings["Your profile page"] = "Deine Profilseite"; +$a->strings["Photos"] = "Bilder"; $a->strings["Your photos"] = "Deine Fotos"; +$a->strings["Videos"] = "Videos"; $a->strings["Your videos"] = "Deine Videos"; +$a->strings["Events"] = "Veranstaltungen"; $a->strings["Your events"] = "Deine Ereignisse"; $a->strings["Personal notes"] = "Persönliche Notizen"; $a->strings["Your personal notes"] = "Deine persönlichen Notizen"; @@ -626,9 +537,11 @@ $a->strings["Search"] = "Suche"; $a->strings["Search site content"] = "Inhalt der Seite durchsuchen"; $a->strings["Full Text"] = "Volltext"; $a->strings["Tags"] = "Tags"; +$a->strings["Contacts"] = "Kontakte"; $a->strings["Community"] = "Gemeinschaft"; $a->strings["Conversations on this site"] = "Unterhaltungen auf dieser Seite"; $a->strings["Conversations on the network"] = "Unterhaltungen im Netzwerk"; +$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; $a->strings["Directory"] = "Verzeichnis"; $a->strings["People directory"] = "Nutzerverzeichnis"; $a->strings["Information"] = "Information"; @@ -652,6 +565,7 @@ $a->strings["Delegations"] = "Delegationen"; $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; $a->strings["Settings"] = "Einstellungen"; $a->strings["Account settings"] = "Kontoeinstellungen"; +$a->strings["Profiles"] = "Profile"; $a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; $a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren"; $a->strings["Admin"] = "Administration"; @@ -669,6 +583,10 @@ $a->strings["Contact Photos"] = "Kontaktbilder"; $a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze Deines Abonnements."; $a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in Deinem Abonnement nicht verfügbar."; +$a->strings["Welcome "] = "Willkommen "; +$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; +$a->strings["Welcome back "] = "Willkommen zurück "; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; $a->strings["newer"] = "neuer"; $a->strings["older"] = "älter"; $a->strings["first"] = "erste"; @@ -728,6 +646,89 @@ $a->strings["comment"] = array( ); $a->strings["post"] = "Beitrag"; $a->strings["Item filed"] = "Beitrag abgelegt"; +$a->strings["Drop Contact"] = "Kontakt löschen"; +$a->strings["Organisation"] = "Organisation"; +$a->strings["News"] = "Nachrichten"; +$a->strings["Forum"] = "Forum"; +$a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen"; +$a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben"; +$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara"; +$a->strings["Connect"] = "Verbinden"; +$a->strings["%d invitation available"] = array( + 0 => "%d Einladung verfügbar", + 1 => "%d Einladungen verfügbar", +); +$a->strings["Find People"] = "Leute finden"; +$a->strings["Enter name or interest"] = "Name oder Interessen eingeben"; +$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln"; +$a->strings["Find"] = "Finde"; +$a->strings["Friend Suggestions"] = "Kontaktvorschläge"; +$a->strings["Similar Interests"] = "Ähnliche Interessen"; +$a->strings["Random Profile"] = "Zufälliges Profil"; +$a->strings["Invite Friends"] = "Freunde einladen"; +$a->strings["View Global Directory"] = "Globales Verzeichnis betrachten"; +$a->strings["Networks"] = "Netzwerke"; +$a->strings["All Networks"] = "Alle Netzwerke"; +$a->strings["Everything"] = "Alles"; +$a->strings["Categories"] = "Kategorien"; +$a->strings["%d contact in common"] = array( + 0 => "%d gemeinsamer Kontakt", + 1 => "%d gemeinsame Kontakte", +); +$a->strings["%s\\'s birthday"] = "%ss Geburtstag"; +$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden."; +$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden."; +$a->strings["Edit profile"] = "Profil bearbeiten"; +$a->strings["Atom feed"] = "Atom-Feed"; +$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren"; +$a->strings["Change profile photo"] = "Profilbild ändern"; +$a->strings["Create New Profile"] = "Neues Profil anlegen"; +$a->strings["Profile Image"] = "Profilbild"; +$a->strings["visible to everybody"] = "sichtbar für jeden"; +$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten"; +$a->strings["Gender:"] = "Geschlecht:"; +$a->strings["Status:"] = "Status:"; +$a->strings["Homepage:"] = "Homepage:"; +$a->strings["About:"] = "Über:"; +$a->strings["XMPP:"] = "XMPP:"; +$a->strings["Network:"] = "Netzwerk:"; +$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; +$a->strings["F d"] = "d. F"; +$a->strings["[today]"] = "[heute]"; +$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; +$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; +$a->strings["[No description]"] = "[keine Beschreibung]"; +$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; +$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; +$a->strings["Full Name:"] = "Kompletter Name:"; +$a->strings["j F, Y"] = "j F, Y"; +$a->strings["j F"] = "j F"; +$a->strings["Age:"] = "Alter:"; +$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; +$a->strings["Hometown:"] = "Heimatort:"; +$a->strings["Tags:"] = "Tags:"; +$a->strings["Political Views:"] = "Politische Ansichten:"; +$a->strings["Religion:"] = "Religion:"; +$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:"; +$a->strings["Likes:"] = "Likes:"; +$a->strings["Dislikes:"] = "Dislikes:"; +$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:"; +$a->strings["Musical interests:"] = "Musikalische Interessen:"; +$a->strings["Books, literature:"] = "Literatur/Bücher:"; +$a->strings["Television:"] = "Fernsehen:"; +$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:"; +$a->strings["Love/Romance:"] = "Liebesleben:"; +$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:"; +$a->strings["School/education:"] = "Schule/Ausbildung:"; +$a->strings["Forums:"] = "Foren:"; +$a->strings["Basic"] = "Allgemein"; +$a->strings["Advanced"] = "Erweitert"; +$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge"; +$a->strings["Profile Details"] = "Profildetails"; +$a->strings["Photo Albums"] = "Fotoalben"; +$a->strings["Personal Notes"] = "Persönliche Notizen"; +$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; $a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen."; $a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren"; $a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"; @@ -1189,103 +1190,11 @@ $a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder $a->strings["Recipient"] = "Empfänger"; $a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:"; $a->strings["Make this post private"] = "Diesen Beitrag privat machen"; -$a->strings["Only logged in users are permitted to perform a probing."] = "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet."; $a->strings["Tips for New Members"] = "Tipps für neue Nutzer"; -$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; -$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; -$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; -$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden"; -$a->strings["Upload File:"] = "Datei hochladen:"; -$a->strings["Select a profile:"] = "Profil auswählen:"; -$a->strings["Upload"] = "Hochladen"; -$a->strings["or"] = "oder"; -$a->strings["skip this step"] = "diesen Schritt überspringen"; -$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben"; -$a->strings["Crop Image"] = "Bild zurechtschneiden"; -$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."; -$a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; -$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; -$a->strings["Profile deleted."] = "Profil gelöscht."; -$a->strings["Profile-"] = "Profil-"; -$a->strings["New profile created."] = "Neues Profil angelegt."; -$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; -$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; -$a->strings["Marital Status"] = "Familienstand"; -$a->strings["Romantic Partner"] = "Romanze"; -$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; -$a->strings["Religion"] = "Religion"; -$a->strings["Political Views"] = "Politische Ansichten"; -$a->strings["Gender"] = "Geschlecht"; -$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; -$a->strings["XMPP"] = "XMPP"; -$a->strings["Homepage"] = "Webseite"; -$a->strings["Interests"] = "Interessen"; -$a->strings["Address"] = "Adresse"; -$a->strings["Location"] = "Wohnort"; -$a->strings["Profile updated."] = "Profil aktualisiert."; -$a->strings[" and "] = " und "; -$a->strings["public profile"] = "öffentliches Profil"; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; -$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; -$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; -$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; -$a->strings["Profile Actions"] = "Profilaktionen"; -$a->strings["Edit Profile Details"] = "Profil bearbeiten"; -$a->strings["Change Profile Photo"] = "Profilbild ändern"; -$a->strings["View this profile"] = "Dieses Profil anzeigen"; -$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; -$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; -$a->strings["Delete this profile"] = "Dieses Profil löschen"; -$a->strings["Basic information"] = "Grundinformationen"; -$a->strings["Profile picture"] = "Profilbild"; -$a->strings["Preferences"] = "Vorlieben"; -$a->strings["Status information"] = "Status Informationen"; -$a->strings["Additional information"] = "Zusätzliche Informationen"; -$a->strings["Relation"] = "Beziehung"; -$a->strings["Your Gender:"] = "Dein Geschlecht:"; -$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:"; -$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; -$a->strings["Profile Name:"] = "Profilname:"; -$a->strings["Required"] = "Benötigt"; -$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."; -$a->strings["Your Full Name:"] = "Dein kompletter Name:"; -$a->strings["Title/Description:"] = "Titel/Beschreibung:"; -$a->strings["Street Address:"] = "Adresse:"; -$a->strings["Locality/City:"] = "Wohnort:"; -$a->strings["Region/State:"] = "Region/Bundesstaat:"; -$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; -$a->strings["Country:"] = "Land:"; -$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "Seit [Datum]:"; -$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; -$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse"; -$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können."; -$a->strings["Homepage URL:"] = "Adresse der Homepage:"; -$a->strings["Religious Views:"] = "Religiöse Ansichten:"; -$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; -$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; -$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; -$a->strings["Musical interests"] = "Musikalische Interessen"; -$a->strings["Books, literature"] = "Bücher, Literatur"; -$a->strings["Television"] = "Fernsehen"; -$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; -$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; -$a->strings["Love/romance"] = "Liebe/Romantik"; -$a->strings["Work/employment"] = "Arbeit/Anstellung"; -$a->strings["School/education"] = "Schule/Ausbildung"; -$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; -$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner."; $a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit"; $a->strings["Visible To"] = "Sichtbar für"; $a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)"; -$a->strings["Account approved."] = "Konto freigegeben."; -$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; -$a->strings["Please login."] = "Bitte melde Dich an."; $a->strings["Remove My Account"] = "Konto löschen"; $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."; $a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:"; @@ -1303,14 +1212,6 @@ $a->strings["Export your account info and contacts. Use this to make a backup of $a->strings["Export all"] = "Alles exportieren"; $a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportiere Deine Account Informationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert)."; $a->strings["Export personal data"] = "Persönliche Daten exportieren"; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."; -$a->strings["Import"] = "Import"; -$a->strings["Move account"] = "Account umziehen"; -$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren."; -$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist."; -$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"; -$a->strings["Account file"] = "Account Datei"; -$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""; $a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"; $a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?"; $a->strings["Delete Video"] = "Video Löschen"; @@ -1328,6 +1229,18 @@ $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = $a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen."; $a->strings["No recipient."] = "Kein Empfänger."; $a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."; +$a->strings["Only logged in users are permitted to perform a probing."] = "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet."; +$a->strings["Account approved."] = "Konto freigegeben."; +$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; +$a->strings["Please login."] = "Bitte melde Dich an."; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."; +$a->strings["Import"] = "Import"; +$a->strings["Move account"] = "Account umziehen"; +$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren."; +$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist."; +$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"; +$a->strings["Account file"] = "Account Datei"; +$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""; $a->strings["Not available."] = "Nicht verfügbar."; $a->strings["No results."] = "Keine Ergebnisse."; $a->strings["%d contact edited."] = array( @@ -1463,6 +1376,7 @@ $a->strings["Create New Event"] = "Neue Veranstaltung erstellen"; $a->strings["Event details"] = "Veranstaltungsdetails"; $a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt"; $a->strings["Event Starts:"] = "Veranstaltungsbeginn:"; +$a->strings["Required"] = "Benötigt"; $a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant"; $a->strings["Event Finishes:"] = "Veranstaltungsende:"; $a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen"; @@ -1505,6 +1419,93 @@ $a->strings["Favourite Posts"] = "Favorisierte Beiträge"; $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; $a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; +$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl."; +$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte."; +$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."; +$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden"; +$a->strings["Upload File:"] = "Datei hochladen:"; +$a->strings["Select a profile:"] = "Profil auswählen:"; +$a->strings["Upload"] = "Hochladen"; +$a->strings["or"] = "oder"; +$a->strings["skip this step"] = "diesen Schritt überspringen"; +$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben"; +$a->strings["Crop Image"] = "Bild zurechtschneiden"; +$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."; +$a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; +$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen."; +$a->strings["Profile deleted."] = "Profil gelöscht."; +$a->strings["Profile-"] = "Profil-"; +$a->strings["New profile created."] = "Neues Profil angelegt."; +$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar."; +$a->strings["Profile Name is required."] = "Profilname ist erforderlich."; +$a->strings["Marital Status"] = "Familienstand"; +$a->strings["Romantic Partner"] = "Romanze"; +$a->strings["Work/Employment"] = "Arbeit / Beschäftigung"; +$a->strings["Religion"] = "Religion"; +$a->strings["Political Views"] = "Politische Ansichten"; +$a->strings["Gender"] = "Geschlecht"; +$a->strings["Sexual Preference"] = "Sexuelle Vorlieben"; +$a->strings["XMPP"] = "XMPP"; +$a->strings["Homepage"] = "Webseite"; +$a->strings["Interests"] = "Interessen"; +$a->strings["Address"] = "Adresse"; +$a->strings["Location"] = "Wohnort"; +$a->strings["Profile updated."] = "Profil aktualisiert."; +$a->strings[" and "] = " und "; +$a->strings["public profile"] = "öffentliches Profil"; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = " – %1\$ss %2\$s besuchen"; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; +$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen"; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"; +$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:"; +$a->strings["Profile Actions"] = "Profilaktionen"; +$a->strings["Edit Profile Details"] = "Profil bearbeiten"; +$a->strings["Change Profile Photo"] = "Profilbild ändern"; +$a->strings["View this profile"] = "Dieses Profil anzeigen"; +$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden"; +$a->strings["Clone this profile"] = "Dieses Profil duplizieren"; +$a->strings["Delete this profile"] = "Dieses Profil löschen"; +$a->strings["Basic information"] = "Grundinformationen"; +$a->strings["Profile picture"] = "Profilbild"; +$a->strings["Preferences"] = "Vorlieben"; +$a->strings["Status information"] = "Status Informationen"; +$a->strings["Additional information"] = "Zusätzliche Informationen"; +$a->strings["Relation"] = "Beziehung"; +$a->strings["Your Gender:"] = "Dein Geschlecht:"; +$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = "<span class=\"heart\">♥</span> Beziehungsstatus:"; +$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; +$a->strings["Profile Name:"] = "Profilname:"; +$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."; +$a->strings["Your Full Name:"] = "Dein kompletter Name:"; +$a->strings["Title/Description:"] = "Titel/Beschreibung:"; +$a->strings["Street Address:"] = "Adresse:"; +$a->strings["Locality/City:"] = "Wohnort:"; +$a->strings["Region/State:"] = "Region/Bundesstaat:"; +$a->strings["Postal/Zip Code:"] = "Postleitzahl:"; +$a->strings["Country:"] = "Land:"; +$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "Seit [Datum]:"; +$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …"; +$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse"; +$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können."; +$a->strings["Homepage URL:"] = "Adresse der Homepage:"; +$a->strings["Religious Views:"] = "Religiöse Ansichten:"; +$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)"; +$a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; +$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; +$a->strings["Musical interests"] = "Musikalische Interessen"; +$a->strings["Books, literature"] = "Bücher, Literatur"; +$a->strings["Television"] = "Fernsehen"; +$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung"; +$a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; +$a->strings["Love/romance"] = "Liebe/Romantik"; +$a->strings["Work/employment"] = "Arbeit/Anstellung"; +$a->strings["School/education"] = "Schule/Ausbildung"; +$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke"; +$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile"; $a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."; $a->strings["Failed to send email message. Here your accout details:<br> login: %s<br> password: %s<br><br>You can change your password after login."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."; $a->strings["Registration successful."] = "Registrierung erfolgreich."; @@ -1718,6 +1719,7 @@ $a->strings["DB updates"] = "DB Updates"; $a->strings["Inspect Queue"] = "Warteschlange Inspizieren"; $a->strings["Server Blocklist"] = "Server Blockliste"; $a->strings["Federation Statistics"] = "Federation Statistik"; +$a->strings["Delete Item"] = "Eintrag löschen"; $a->strings["Logs"] = "Protokolle"; $a->strings["View Logs"] = "Protokolle anzeigen"; $a->strings["probe address"] = "Adresse untersuchen"; @@ -1743,6 +1745,12 @@ $a->strings["Delete entry from blocklist"] = "Eintrag von der Blockliste entfern $a->strings["Delete entry from blocklist?"] = "Eintrag von der Blockliste entfernen?"; $a->strings["Server added to blocklist."] = "Server zur Blockliste hinzugefügt."; $a->strings["Site blocklist updated."] = "Blockliste aktualisiert."; +$a->strings["Delete this Item"] = "Diesen Eintrag löschen"; +$a->strings["On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted."] = "Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der beginn einer Diskussion ist, wird der gesamte Diskussions-Thread gelöscht."; +$a->strings["You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456."] = "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456 ist die GUID 123456."; +$a->strings["GUID"] = "GUID"; +$a->strings["The GUID of the item you want to delete."] = "Die GUID des zu löschenden Eintrags"; +$a->strings["Item marked for deletion."] = "Eintrag wurden zur Löschung markiert"; $a->strings["unknown"] = "Unbekannt"; $a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt."; $a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."; @@ -2004,8 +2012,6 @@ $a->strings["To enable logging of PHP errors and warnings you can add the follow $a->strings["Lock feature %s"] = "Feature festlegen: %s"; $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten"; $a->strings["via"] = "via"; -$a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; -$a->strings["show fewer"] = "weniger anzeigen"; $a->strings["greenzero"] = "greenzero"; $a->strings["purplezero"] = "purplezero"; $a->strings["easterbunny"] = "easterbunny"; @@ -2013,6 +2019,14 @@ $a->strings["darkzero"] = "darkzero"; $a->strings["comix"] = "comix"; $a->strings["slackr"] = "slackr"; $a->strings["Variations"] = "Variationen"; +$a->strings["Repeat the image"] = "Bild wiederholen"; +$a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen."; +$a->strings["Stretch"] = "Strecken"; +$a->strings["Will stretch to width/height of the image."] = "Streckt Breite/Höhe des Bildes."; +$a->strings["Resize fill and-clip"] = "Größe anpassen - Ausfüllen und abschneiden"; +$a->strings["Resize to fill and retain aspect ratio."] = "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten"; +$a->strings["Resize best fit"] = "Größe anpassen - Optimale Größe"; +$a->strings["Resize to best fit and retain aspect ratio."] = "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten"; $a->strings["Default"] = "Standard"; $a->strings["Note: "] = "Hinweis:"; $a->strings["Check image permissions if all users are allowed to visit the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen"; @@ -2023,14 +2037,6 @@ $a->strings["Link color"] = "Linkfarbe"; $a->strings["Set the background color"] = "Hintergrundfarbe festlegen"; $a->strings["Content background transparency"] = "Transparanz des Hintergrunds von Beiträgem"; $a->strings["Set the background image"] = "Hintergrundbild festlegen"; -$a->strings["Repeat the image"] = "Bild wiederholen"; -$a->strings["Will repeat your image to fill the background."] = "Wiederholt das Bild um den Hintergrund auszufüllen."; -$a->strings["Stretch"] = "Strecken"; -$a->strings["Will stretch to width/height of the image."] = "Streckt Breite/Höhe des Bildes."; -$a->strings["Resize fill and-clip"] = "Größe anpassen - Ausfüllen und abschneiden"; -$a->strings["Resize to fill and retain aspect ratio."] = "Größe anpassen: Ausfüllen und Seitenverhältnis beibehalten"; -$a->strings["Resize best fit"] = "Größe anpassen - Optimale Größe"; -$a->strings["Resize to best fit and retain aspect ratio."] = "Größe anpassen - Optimale Größe und Seitenverhältnisse beibehalten"; $a->strings["Guest"] = "Gast"; $a->strings["Visitor"] = "Besucher"; $a->strings["Alignment"] = "Ausrichtung"; @@ -2049,6 +2055,9 @@ $a->strings["Find Friends"] = "Kontakte finden"; $a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Local Directory"] = "Lokales Verzeichnis"; $a->strings["Quick Start"] = "Schnell-Start"; +$a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; +$a->strings["show fewer"] = "weniger anzeigen"; +$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."; $a->strings["Create a New Account"] = "Neues Konto erstellen"; $a->strings["Password: "] = "Passwort: "; @@ -2059,4 +2068,3 @@ $a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen"; $a->strings["terms of service"] = "Nutzungsbedingungen"; $a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung"; $a->strings["privacy policy"] = "Datenschutzerklärung"; -$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln"; From 568abd537a774290204fa45fcd02e53c53d66f5c Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Wed, 12 Jul 2017 08:14:36 +0000 Subject: [PATCH 158/160] Fixed error reporting --- include/dba.php | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/include/dba.php b/include/dba.php index 49ec956453..08b6e0ad8a 100644 --- a/include/dba.php +++ b/include/dba.php @@ -638,20 +638,22 @@ class dba { } if (self::$dbo->errorno != 0) { - $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); - $called_from = array_shift($trace); + $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3); - // We are having an own error logging in the function "p" - if ($called_from['function'] != 'p') { + if (isset($trace[2])) { + $called_from = $trace[2]; + } else { + // We use just something that is defined to avoid warnings + $called_from = $trace[0]; + } + // We are having an own error logging in the function "e" + if ($called_from['function'] != 'e') { // We have to preserve the error code, somewhere in the logging it get lost $error = self::$dbo->error; $errorno = self::$dbo->errorno; - $sql = $args[0]; - array_shift($args); - logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n". - $a->callstack(8)."\n".self::replace_parameters($sql, $args)); + $a->callstack(8)."\n".self::replace_parameters($sql, $params)); self::$dbo->error = $error; self::$dbo->errorno = $errorno; @@ -714,11 +716,17 @@ class dba { $error = self::$dbo->error; $errorno = self::$dbo->errorno; - $sql = $args[0]; array_shift($args); + // When the second function parameter is an array then use this as the parameter array + if ((count($args) > 0) && (is_array($args[0]))) { + $params = $args[0]; + } else { + $params = $args; + } + logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n". - $a->callstack(8)."\n".self::replace_parameters($sql, $args)); + $a->callstack(8)."\n".self::replace_parameters($sql, $params)); self::$dbo->error = $error; self::$dbo->errorno = $errorno; From beaa911bac302c67b140cffbc0a083f413e71611 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 13 Jul 2017 05:57:37 +0000 Subject: [PATCH 159/160] Bugfix: Some special characters weren't converted correctly --- include/bb2diaspora.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 80ee1b50dc..832dab7e8d 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -188,7 +188,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) { $Text = $converter->convert($Text); // unmask the special chars back to HTML - $Text = str_replace(array('&_lt_;', '&_gt_;', '&_amp_;'), array('<', '>', '&'), $Text); + $Text = str_replace(array('&\_lt\_;', '&\_gt\_;', '&\_amp\_;'), array('<', '>', '&'), $Text); $a->save_timestamp($stamp1, "parser"); From 4c7a197f4b879ea966437792574aa0bb86c7e977 Mon Sep 17 00:00:00 2001 From: Michael <heluecht@pirati.ca> Date: Thu, 13 Jul 2017 06:00:53 +0000 Subject: [PATCH 160/160] Avoid duplicate database errors when storing the conversations --- include/items.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 5eb254b1e2..1e11c08c4b 100644 --- a/include/items.php +++ b/include/items.php @@ -6,6 +6,7 @@ use Friendica\App; use Friendica\ParseUrl; +use Friendica\Util\Lock; require_once 'include/bbcode.php'; require_once 'include/oembed.php'; @@ -444,6 +445,15 @@ function store_conversation($arr) { $conversation['source'] = $arr['source']; } + if (!Lock::set('store_conversation')) { + // When using semaphores, this case never can't happen + unset($arr['conversation-uri']); + unset($arr['conversation-href']); + unset($arr['protocol']); + unset($arr['source']); + return $arr; + } + $old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source` FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']); if (dbm::is_result($old_conv)) { @@ -465,6 +475,7 @@ function store_conversation($arr) { logger('Conversation: insert for '.$conversation['item-uri'].' (protocol '.$conversation['protocol'].') failed', LOGGER_DEBUG); } } + Lock::remove('store_conversation'); } unset($arr['conversation-uri']); @@ -2317,7 +2328,7 @@ function drop_item($id, $interactive = true) { } - +/// @todo: This query seems to be really slow function first_post_date($uid, $wall = false) { $r = q("SELECT `id`, `created` FROM `item` WHERE `uid` = %d AND `wall` = %d AND `deleted` = 0 AND `visible` = 1 AND `moderated` = 0