diff --git a/boot.php b/boot.php index 4bdf25d410..f2cc34aea3 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1518' ); +define ( 'FRIENDICA_VERSION', '3.0.1523' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); @@ -361,17 +361,26 @@ if(! class_exists('App')) { // Allow themes to control internal parameters // by changing App values in theme.php - // - // Possibly should make these part of the plugin - // system, but it seems like overkill to invoke - // all the plugin machinery just to change a couple - // of values + public $sourcename = ''; public $videowidth = 425; public $videoheight = 350; public $force_max_items = 0; public $theme_thread_allow = true; + // An array for all theme-controllable parameters + // Mostly unimplemented yet. Only options 'stylesheet' and + // beyond are used. + + public $theme = array( + 'sourcename' => '', + 'videowidth' => 425, + 'videoheight' => 350, + 'force_max_items' => 0, + 'thread_allow' => true, + 'stylesheet' => '' + ); + private $scheme; private $hostname; private $baseurl; @@ -580,6 +589,13 @@ if(! class_exists('App')) { $interval = 40000; $this->page['title'] = $this->config['sitename']; + + /* put the head template at the beginning of page['htmlhead'] + * since the code added by the modules frequently depends on it + * being first + */ + if(!isset($this->page['htmlhead'])) + $this->page['htmlhead'] = ''; $tpl = get_markup_template('head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! @@ -590,14 +606,16 @@ if(! class_exists('App')) { '$showmore' => t('show more'), '$showfewer' => t('show fewer'), '$update_interval' => $interval - )); + )) . $this->page['htmlhead']; } function init_page_end() { + if(!isset($this->page['end'])) + $this->page['end'] = ''; $tpl = get_markup_template('end.tpl'); $this->page['end'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl() // FIXME for z_path!!!! - )); + )) . $this->page['end']; } function set_curl_code($code) { @@ -917,6 +935,7 @@ if(! function_exists('login')) { $tpl = get_markup_template("login.tpl"); $_SESSION['return_url'] = $a->query_string; + $a->module = 'login'; } @@ -928,6 +947,7 @@ if(! function_exists('login')) { '$lname' => array('username', t('Nickname or Email address: ') , '', ''), '$lpassword' => array('password', t('Password: '), '', ''), + '$lremember' => array('remember', t('Remember me'), 0, ''), '$openid' => !$noid, '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''), @@ -989,6 +1009,13 @@ if(! function_exists('remote_user')) { // a page is loaded. Usually used for errors or alerts. if(! function_exists('notice')) { + /** + * Show an error message to user. + * + * This function save text in session, to be shown to the user at next page load + * + * @param string $s - Text of notice + */ function notice($s) { $a = get_app(); if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array(); @@ -997,6 +1024,13 @@ if(! function_exists('notice')) { } } if(! function_exists('info')) { + /** + * Show an info message to user. + * + * This function save text in session, to be shown to the user at next page load + * + * @param string $s - Text of notice + */ function info($s) { $a = get_app(); if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array(); diff --git a/doc/Account-Basics.md b/doc/Account-Basics.md index 41ca95b360..2c3c05e8bf 100644 --- a/doc/Account-Basics.md +++ b/doc/Account-Basics.md @@ -73,5 +73,7 @@ You can export a copy of your personal data in XML format from the "Export perso * [Groups and Privacy](help/Groups-and-Privacy) +* [Move Account](help/Move-Account) + * [Remove Account](help/Remove-Account) diff --git a/doc/Home.md b/doc/Home.md index 1df74b5f26..7c86ce805a 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -14,6 +14,7 @@ Friendica Documentation and Resources * [Groups and Privacy](help/Groups-and-Privacy) * [Tags and Mentions](help/Tags-and-Mentions) * [Pages](help/Pages) +* [Move Account](help/Move-Account) * [Remove Account](help/Remove-Account) * [Bugs and Issues](help/Bugs-and-Issues) diff --git a/doc/Move-Account.md b/doc/Move-Account.md new file mode 100644 index 0000000000..cb20f99b42 --- /dev/null +++ b/doc/Move-Account.md @@ -0,0 +1,33 @@ +Move Account +============ + +* [Home](help) + + +! **this is an experimental feature** + +** How to move an account between servers ** + +Go to "Settings" -> "[Export personal data](uexport)" +Click on "Export account" to save your account data. +This file contains your details, your contacts, groups, and personal settings. +It contains also your secret keys to authenticate yourself to your contacts: +**save this file in a secure place**! + +Go to your new server, and open *http://newserver.com/uimport* (there is not a +direct link to this page at the moment). + +Load your saved account file and click "Import". + +Friendica will recreate your account on new server, with your contacts and groups. +A message is sent to Friendica contacts, to inform them about your move: if your +contacts are runnning on an updated server, automatically your details on their +side will be updated. +Contacts on Statusnet/Identi.ca or Diaspora will be archived, as we can't inform +them about your move. +You should ask them to remove your contact from their lists and readd you, and you +should do the same with their contact. + +After the move, the account on the old server will not work reliably anymore, and +should be not used. + diff --git a/include/Scrape.php b/include/Scrape.php index 7eaac3b449..611cbda886 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -590,6 +590,12 @@ function probe_url($url, $mode = PROBE_NORMAL) { $check_feed = false; + if(stristr($url,'tumblr.com') && (! stristr($url,'/rss'))) { + $poll = $url . '/rss'; + $check_feed = true; + // Will leave it to others to figure out how to grab the avatar, which is on the $url page in the open graph meta links + } + if($twitter || ! $poll) $check_feed = true; if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile)) diff --git a/include/auth.php b/include/auth.php index 523de88ce9..b534d4a4d3 100644 --- a/include/auth.php +++ b/include/auth.php @@ -2,6 +2,7 @@ require_once('include/security.php'); +require_once('include/datetime.php'); function nuke_session() { unset($_SESSION['authenticated']); @@ -68,7 +69,18 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p goaway(z_root()); } - authenticate_success($r[0]); + // Make sure to refresh the last login time for the user if the user + // stays logged in for a long time, e.g. with "Remember Me" + $login_refresh = false; + if(! x($_SESSION['last_login_date'])) { + $_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); + } + if( strcmp(datetime_convert('UTC','UTC','now - 12 hours'), $_SESSION['last_login_date']) > 0 ) { + + $_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); + $login_refresh = true; + } + authenticate_success($r[0], false, false, $login_refresh); } } else { @@ -162,8 +174,36 @@ else { goaway(z_root()); } + // If the user specified to remember the authentication, then change the cookie + // to expire after one year (the default is when the browser is closed). + // If the user did not specify to remember, change the cookie to expire when the + // browser is closed. The reason this is necessary is because if the user + // specifies to remember, then logs out and logs back in without specifying to + // remember, the old "remember" cookie may remain and prevent the session from + // expiring when the browser is closed. + // + // It seems like I should be able to test for the old cookie, but for some reason when + // I read the lifetime value from session_get_cookie_params(), I always get '0' + // (i.e. expire when the browser is closed), even when there's a time expiration + // on the cookie + if($_POST['remember']) { + $old_sid = session_id(); + session_set_cookie_params('31449600'); // one year + session_regenerate_id(false); + + q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); + } + else { + $old_sid = session_id(); + session_set_cookie_params('0'); + session_regenerate_id(false); + + q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); + } + // if we haven't failed up this point, log them in. + $_SESSION['last_login_date'] = datetime_convert('UTC','UTC'); authenticate_success($record, true, true); } } diff --git a/include/conversation.php b/include/conversation.php index 43d20a4014..1de77feb1b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -865,11 +865,15 @@ function format_like($cnt,$arr,$type,$id) { $total = count($arr); if($total >= MAX_LIKERS) $arr = array_slice($arr, 0, MAX_LIKERS - 1); - if($total < MAX_LIKERS) - $arr[count($arr)-1] = t('and') . ' ' . $arr[count($arr)-1]; - $str = implode(', ', $arr); - if($total >= MAX_LIKERS) + if($total < MAX_LIKERS) { + $last = t('and') . ' ' . $arr[count($arr)-1]; + $arr2 = array_slice($arr, 0, -1); + $str = implode(', ', $arr2) . ' ' . $last; + } + if($total >= MAX_LIKERS) { + $str = implode(', ', $arr); $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS ); + } $str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str)); $o .= "\t" . ''; } diff --git a/include/onepoll.php b/include/onepoll.php index 019455e820..a50d234e22 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -294,34 +294,147 @@ function onepoll_run(&$argv, &$argc){ $metas = email_msg_meta($mbox,implode(',',$msgs)); if(count($metas) != count($msgs)) { logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG); - break; } - $msgs = array_combine($msgs, $metas); + else { + $msgs = array_combine($msgs, $metas); - foreach($msgs as $msg_uid => $meta) { - logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); + foreach($msgs as $msg_uid => $meta) { + logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA); - $datarray = array(); -// $meta = email_msg_meta($mbox,$msg_uid); -// $headers = email_msg_headers($mbox,$msg_uid); + $datarray = array(); + // $meta = email_msg_meta($mbox,$msg_uid); + // $headers = email_msg_headers($mbox,$msg_uid); - $datarray['uri'] = msgid2iri(trim($meta->message_id,'<>')); + $datarray['uri'] = msgid2iri(trim($meta->message_id,'<>')); - // Have we seen it before? - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", - intval($importer_uid), - dbesc($datarray['uri']) - ); + // Have we seen it before? + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", + intval($importer_uid), + dbesc($datarray['uri']) + ); - if(count($r)) { - logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); - if($meta->deleted && ! $r[0]['deleted']) { - q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", - dbesc(datetime_convert()), - intval($r[0]['id']) - ); + if(count($r)) { + logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG); + if($meta->deleted && ! $r[0]['deleted']) { + q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1", + dbesc(datetime_convert()), + intval($r[0]['id']) + ); + } + /*switch ($mailconf[0]['action']) { + case 0: + logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); + break; + case 1: + logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']); + imap_delete($mbox, $msg_uid, FT_UID); + break; + case 2: + logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + break; + case 3: + logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']); + imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); + if ($mailconf[0]['movetofolder'] != "") + imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); + break; + }*/ + continue; } - /*switch ($mailconf[0]['action']) { + + + // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally. + + // $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : ''); + $raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : ''); + if(! trim($raw_refs)) + $raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : ''); + $raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr + + if($raw_refs) { + $refs_arr = explode(' ', $raw_refs); + if(count($refs_arr)) { + for($x = 0; $x < count($refs_arr); $x ++) + $refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'"; + } + $qstr = implode(',',$refs_arr); + $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1", + intval($importer_uid) + ); + if(count($r)) + $datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item + // $datarray['parent-uri'] = $r[0]['uri']; + } + + + if(! x($datarray,'parent-uri')) + $datarray['parent-uri'] = $datarray['uri']; + + // Decoding the header + $subject = imap_mime_header_decode($meta->subject); + $datarray['title'] = ""; + foreach($subject as $subpart) + if ($subpart->charset != "default") + $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); + else + $datarray['title'] .= $subpart->text; + + $datarray['title'] = notags(trim($datarray['title'])); + + //$datarray['title'] = notags(trim($meta->subject)); + $datarray['created'] = datetime_convert('UTC','UTC',$meta->date); + + // Is it reply? + $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or + (substr(strtolower($datarray['title']), 0, 3) == "re-") or + (raw_refs != "")); + + $r = email_get_msg($mbox,$msg_uid, $reply); + if(! $r) { + logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']); + continue; + } + $datarray['body'] = escape_tags($r['body']); + + logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']); + + // some mailing lists have the original author as 'from' - add this sender info to msg body. + // todo: adding a gravatar for the original author would be cool + + if(! stristr($meta->from,$contact['addr'])) { + $from = imap_mime_header_decode($meta->from); + $fromdecoded = ""; + foreach($from as $frompart) + if ($frompart->charset != "default") + $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); + else + $fromdecoded .= $frompart->text; + + $datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; + } + + $datarray['uid'] = $importer_uid; + $datarray['contact-id'] = $contact['id']; + if($datarray['parent-uri'] === $datarray['uri']) + $datarray['private'] = 1; + if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { + $datarray['private'] = 1; + $datarray['allow_cid'] = '<' . $contact['id'] . '>'; + } + $datarray['author-name'] = $contact['name']; + $datarray['author-link'] = 'mailbox'; + $datarray['author-avatar'] = $contact['photo']; + + $stored_item = item_store($datarray); + q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d", + dbesc($datarray['parent-uri']), + intval($importer_uid) + ); + q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", + intval($stored_item) + ); + switch ($mailconf[0]['action']) { case 0: logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); break; @@ -339,119 +452,7 @@ function onepoll_run(&$argv, &$argc){ if ($mailconf[0]['movetofolder'] != "") imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); break; - }*/ - continue; - } - - - // look for a 'references' or an 'in-reply-to' header and try to match with a parent item we have locally. - -// $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : ''); - $raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : ''); - if(! trim($raw_refs)) - $raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : ''); - $raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr - - if($raw_refs) { - $refs_arr = explode(' ', $raw_refs); - if(count($refs_arr)) { - for($x = 0; $x < count($refs_arr); $x ++) - $refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'"; } - $qstr = implode(',',$refs_arr); - $r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `uri` IN ( $qstr ) AND `uid` = %d LIMIT 1", - intval($importer_uid) - ); - if(count($r)) - $datarray['parent-uri'] = $r[0]['parent-uri']; // Set the parent as the top-level item -// $datarray['parent-uri'] = $r[0]['uri']; - } - - - if(! x($datarray,'parent-uri')) - $datarray['parent-uri'] = $datarray['uri']; - - // Decoding the header - $subject = imap_mime_header_decode($meta->subject); - $datarray['title'] = ""; - foreach($subject as $subpart) - if ($subpart->charset != "default") - $datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text); - else - $datarray['title'] .= $subpart->text; - - $datarray['title'] = notags(trim($datarray['title'])); - - //$datarray['title'] = notags(trim($meta->subject)); - $datarray['created'] = datetime_convert('UTC','UTC',$meta->date); - - // Is it reply? - $reply = ((substr(strtolower($datarray['title']), 0, 3) == "re:") or - (substr(strtolower($datarray['title']), 0, 3) == "re-") or - (raw_refs != "")); - - $r = email_get_msg($mbox,$msg_uid, $reply); - if(! $r) { - logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']); - continue; - } - $datarray['body'] = escape_tags($r['body']); - - logger("Mail: Importing ".$msg_uid." for ".$mailconf[0]['user']); - - // some mailing lists have the original author as 'from' - add this sender info to msg body. - // todo: adding a gravatar for the original author would be cool - - if(! stristr($meta->from,$contact['addr'])) { - $from = imap_mime_header_decode($meta->from); - $fromdecoded = ""; - foreach($from as $frompart) - if ($frompart->charset != "default") - $fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text); - else - $fromdecoded .= $frompart->text; - - $datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body']; - } - - $datarray['uid'] = $importer_uid; - $datarray['contact-id'] = $contact['id']; - if($datarray['parent-uri'] === $datarray['uri']) - $datarray['private'] = 1; - if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) { - $datarray['private'] = 1; - $datarray['allow_cid'] = '<' . $contact['id'] . '>'; - } - $datarray['author-name'] = $contact['name']; - $datarray['author-link'] = 'mailbox'; - $datarray['author-avatar'] = $contact['photo']; - - $stored_item = item_store($datarray); - q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d", - dbesc($datarray['parent-uri']), - intval($importer_uid) - ); - q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1", - intval($stored_item) - ); - switch ($mailconf[0]['action']) { - case 0: - logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'].". Doing nothing.", LOGGER_DEBUG); - break; - case 1: - logger("Mail: Deleting ".$msg_uid." for ".$mailconf[0]['user']); - imap_delete($mbox, $msg_uid, FT_UID); - break; - case 2: - logger("Mail: Mark as seen ".$msg_uid." for ".$mailconf[0]['user']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - break; - case 3: - logger("Mail: Moving ".$msg_uid." to ".$mailconf[0]['movetofolder']." for ".$mailconf[0]['user']); - imap_setflag_full($mbox, $msg_uid, "\\Seen", ST_UID); - if ($mailconf[0]['movetofolder'] != "") - imap_mail_move($mbox, $msg_uid, $mailconf[0]['movetofolder'], FT_UID); - break; } } } diff --git a/include/security.php b/include/security.php index 0558df1a1a..56d4cad36f 100644 --- a/include/security.php +++ b/include/security.php @@ -1,6 +1,6 @@ identities,true), LOGGER_DEBUG); + 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'])); @@ -76,7 +78,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) { + if($login_initial || $login_refresh) { $l = get_browser_language(); q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1", @@ -84,7 +86,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive dbesc($l), intval($_SESSION['uid']) ); - + } + if($login_initial) { call_hooks('logged_in', $a->user); if(($a->module !== 'home') && isset($_SESSION['return_url'])) diff --git a/index.php b/index.php index 7d7674530a..bd5b3e396e 100644 --- a/index.php +++ b/index.php @@ -115,19 +115,9 @@ if(! x($_SESSION,'authenticated')) header('X-Account-Management-Status: none'); -/* - * Create the page head after setting the language - * and getting any auth credentials - */ - -$a->init_pagehead(); - -/** - * Build the page ending -- this is stuff that goes right before - * the closing tag - */ - -$a->init_page_end(); +/* set up page['htmlhead'] and page['end'] for the modules to use */ +$a->page['htmlhead'] = ''; +$a->page['end'] = ''; if(! x($_SESSION,'sysmsg')) @@ -300,8 +290,32 @@ if($a->module_loaded) { $a->page['content'] .= $arr['content']; } + if(function_exists(str_replace('-','_',current_theme()) . '_content_loaded')) { + $func = str_replace('-','_',current_theme()) . '_content_loaded'; + $func($a); + } + } + +/* + * Create the page head after setting the language + * and getting any auth credentials + * + * Moved init_pagehead() and init_page_end() to after + * all the module functions have executed so that all + * theme choices made by the modules can take effect + */ + +$a->init_pagehead(); + +/** + * Build the page ending -- this is stuff that goes right before + * the closing tag + */ + +$a->init_page_end(); + // If you're just visiting, let javascript take you home if(x($_SESSION,'visitor_home')) @@ -366,7 +380,11 @@ if($a->module != 'install') { * Build the page - now that we have all the components */ -$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => current_theme_url())); +if(!$a->theme['stylesheet']) + $stylesheet = current_theme_url(); +else + $stylesheet = $a->theme['stylesheet']; +$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet)); if($a->is_mobile || $a->is_tablet) { if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { diff --git a/mod/help.php b/mod/help.php index af05bd47c0..44edbf9318 100644 --- a/mod/help.php +++ b/mod/help.php @@ -1,47 +1,101 @@ block_gamut += array( + "doBlockWarning" => 45, + ); + parent::MarkdownExtra_Parser(); + } + function doBlockWarning($text) { + $text = preg_replace_callback('/ + ( # Wrap whole match in $1 + (?> + ^[ ]*![ ]? # "!" at the start of a line + .+\n # rest of the first line + (.+\n)* # subsequent consecutive lines + \n* # blanks + )+ + ) + /xm', array(&$this, '_doBlockWarning_callback'), $text); + + return $text; + } + + function _doBlockWarning_callback($matches) { + $bq = $matches[1]; + # trim one level of quoting - trim whitespace-only lines + $bq = preg_replace('/^[ ]*![ ]?|^[ ]+$/m', '', $bq); + $bq = $this->runBlockGamut($bq); # recurse + + $bq = preg_replace('/^/m', " ", $bq); + # These leading spaces cause problem with
 content, 
+		# so we need to fix that:
+//		$bq = preg_replace_callback('{(\s*
.+?
)}sx', array(&$this, '__doBlockWarning_callback2'), $bq); + + return "\n" . $this->hashBlock("
\n$bq\n
") . "\n\n"; + } + + function _doBlockWarning_callback2($matches) { + $pre = $matches[1]; + $pre = preg_replace('/^ /m', '', $pre); + return $pre; + } + +} + +if (!function_exists('load_doc_file')) { + + function load_doc_file($s) { + global $lang; + if (!isset($lang)) + $lang = 'en'; + $b = basename($s); + $d = dirname($s); + if (file_exists("$d/$lang/$b")) + return file_get_contents("$d/$lang/$b"); + if (file_exists($s)) + return file_get_contents($s); + return ''; + } + +} function help_content(&$a) { + + nav_set_selected('help'); global $lang; - require_once('library/markdown.php'); - $text = ''; - if($a->argc > 1) { + if ($a->argc > 1) { $text = load_doc_file('doc/' . $a->argv[1] . '.md'); - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags($a->argv[1])); + $a->page['title'] = t('Help:') . ' ' . str_replace('-', ' ', notags($a->argv[1])); } - if(! $text) { - $text = load_doc_file('doc/Home.md'); + $home = load_doc_file('doc/Home.md'); + if (!$text) { + $text = $home; $a->page['title'] = t('Help'); + } else { + $a->page['aside'] = Markdown($home); } - - if(! strlen($text)) { + + if (!strlen($text)) { header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found')); $tpl = get_markup_template("404.tpl"); return replace_macros($tpl, array( - '$message' => t('Page not found.' ) - )); + '$message' => t('Page not found.') + )); } - return Markdown($text); - + $html = Markdown($text); + $html = "".$html; + return $html; + } diff --git a/mod/photos.php b/mod/photos.php index 12ca99e60f..08dc0e0fc5 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -27,12 +27,13 @@ function photos_init(&$a) { if(! count($r)) return; + $a->data['user'] = $r[0]; + $o .= '
'; $o .= '
' . $a->data['user']['username'] . '
'; $o .= '
' . $a->data['user']['username'] . '
'; $o .= '
'; - $a->data['user'] = $r[0]; $sql_extra = permissions_sql($a->data['user']['uid']); diff --git a/mod/uexport.php b/mod/uexport.php index f216f551fa..85a3fef5b6 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -1,6 +1,5 @@ $v) @@ -102,7 +102,7 @@ function _uexport_multirow($query) { function _uexport_row($query) { $result = array(); $r = q($query); - if(count($r)) { + if ($r) { foreach($r as $rr) foreach($rr as $k => $v) $result[$k] = $v; @@ -128,20 +128,20 @@ function uexport_account($a){ ); $photo = _uexport_multirow( - sprintf( "SELECT * FROM photo WHERE uid = %d AND profile = 1", intval(local_user()) ) + sprintf( "SELECT * FROM `photo` WHERE uid = %d AND profile = 1", intval(local_user()) ) ); foreach ($photo as &$p) $p['data'] = bin2hex($p['data']); $pconfig = _uexport_multirow( - sprintf( "SELECT * FROM pconfig WHERE uid = %d",intval(local_user()) ) + sprintf( "SELECT * FROM `pconfig` WHERE uid = %d",intval(local_user()) ) ); $group = _uexport_multirow( - sprintf( "SELECT * FROM group WHERE uid = %d",intval(local_user()) ) + sprintf( "SELECT * FROM `group` WHERE uid = %d",intval(local_user()) ) ); $group_member = _uexport_multirow( - sprintf( "SELECT * FROM group_member WHERE uid = %d",intval(local_user()) ) + sprintf( "SELECT * FROM `group_member` WHERE uid = %d",intval(local_user()) ) ); $output = array( diff --git a/mod/wall_upload.php b/mod/wall_upload.php index ee1bf3c14c..17de7cceb7 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -4,6 +4,8 @@ require_once('Photo.php'); function wall_upload_post(&$a) { + logger("wall upload: starting new upload", LOGGER_DEBUG); + if($a->argc > 1) { if(! x($_FILES,'media')) { $nick = $a->argv[1]; @@ -160,10 +162,12 @@ function wall_upload_post(&$a) { if ($_REQUEST['hush']!='yeah') { /*existing code*/ - if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) + if(local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || x($_REQUEST['nomce'])) ) { echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n"; - else + } + else { echo '

getExt()."\" alt=\"$basename\" />

"; + } /*existing code*/ } else { diff --git a/util/messages.po b/util/messages.po index ff3924b99a..4945c38d2f 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1518\n" +"Project-Id-Version: 3.0.1523\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-05 10:00-0800\n" +"POT-Creation-Date: 2012-11-10 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,12 +37,12 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994 +#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 #: ../../mod/notifications.php:66 ../../mod/contacts.php:146 #: ../../mod/settings.php:86 ../../mod/settings.php:525 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 +#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 @@ -52,15 +52,15 @@ msgstr "" #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/message.php:38 ../../mod/message.php:168 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 -#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 +#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 #: ../../mod/display.php:165 ../../mod/profiles.php:7 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 -#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971 +#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 #: ../../addon.old/dav/friendica/layout.fnk.php:354 @@ -130,10 +130,10 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:455 ../../mod/photos.php:1027 -#: ../../mod/photos.php:1103 ../../mod/photos.php:1366 -#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1522 ../../mod/install.php:246 +#: ../../mod/events.php:455 ../../mod/photos.php:1028 +#: ../../mod/photos.php:1104 ../../mod/photos.php:1367 +#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 +#: ../../mod/photos.php:1523 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:351 #: ../../mod/settings.php:543 ../../mod/settings.php:697 @@ -240,11 +240,11 @@ msgstr "" msgid "Help" msgstr "" -#: ../../mod/help.php:38 ../../index.php:228 +#: ../../mod/help.php:38 ../../index.php:218 msgid "Not Found" msgstr "" -#: ../../mod/help.php:41 ../../index.php:231 +#: ../../mod/help.php:41 ../../index.php:221 msgid "Page not found." msgstr "" @@ -287,7 +287,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:52 ../../boot.php:1701 +#: ../../include/nav.php:52 ../../boot.php:1731 msgid "Events" msgstr "" @@ -345,7 +345,7 @@ msgstr "" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1237 +#: ../../boot.php:1261 msgid "Location:" msgstr "" @@ -360,7 +360,7 @@ msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1001 +#: ../../include/conversation.php:1005 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -413,7 +413,7 @@ msgstr "" #: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:236 +#: ../../mod/settings.php:967 ../../mod/register.php:237 #: ../../mod/profiles.php:574 msgid "Yes" msgstr "" @@ -425,38 +425,38 @@ msgstr "" #: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:237 +#: ../../mod/settings.php:967 ../../mod/register.php:238 #: ../../mod/profiles.php:575 msgid "No" msgstr "" -#: ../../mod/photos.php:50 ../../boot.php:1694 +#: ../../mod/photos.php:51 ../../boot.php:1724 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 -#: ../../mod/photos.php:1095 ../../mod/photos.php:1110 -#: ../../mod/photos.php:1565 ../../mod/photos.php:1577 +#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 +#: ../../mod/photos.php:1096 ../../mod/photos.php:1111 +#: ../../mod/photos.php:1566 ../../mod/photos.php:1578 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615 +#: ../../mod/photos.php:66 ../../mod/photos.php:1127 ../../mod/photos.php:1616 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:78 ../../mod/settings.php:23 +#: ../../mod/photos.php:79 ../../mod/settings.php:23 msgid "everybody" msgstr "" -#: ../../mod/photos.php:142 +#: ../../mod/photos.php:143 msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095 -#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74 +#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1096 +#: ../../mod/photos.php:1111 ../../mod/profile_photo.php:74 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 @@ -467,220 +467,220 @@ msgstr "" msgid "Profile Photos" msgstr "" -#: ../../mod/photos.php:163 +#: ../../mod/photos.php:164 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:181 ../../mod/photos.php:1104 +#: ../../mod/photos.php:182 ../../mod/photos.php:1105 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:244 ../../mod/photos.php:1367 +#: ../../mod/photos.php:245 ../../mod/photos.php:1368 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:606 +#: ../../mod/photos.php:607 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/photos.php:606 +#: ../../mod/photos.php:607 msgid "a photo" msgstr "" -#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:315 #: ../../addon.old/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:719 +#: ../../mod/photos.php:720 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153 -#: ../../mod/wall_upload.php:110 +#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153 +#: ../../mod/wall_upload.php:112 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301 -#: ../../mod/wall_upload.php:136 +#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301 +#: ../../mod/wall_upload.php:138 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:864 ../../mod/community.php:18 +#: ../../mod/photos.php:865 ../../mod/community.php:18 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:874 +#: ../../mod/photos.php:875 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:975 +#: ../../mod/photos.php:976 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:1037 +#: ../../mod/photos.php:1038 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:1040 +#: ../../mod/photos.php:1041 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:1046 +#: ../../mod/photos.php:1047 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:1050 ../../mod/photos.php:1099 +#: ../../mod/photos.php:1051 ../../mod/photos.php:1100 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:1051 +#: ../../mod/photos.php:1052 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:1052 +#: ../../mod/photos.php:1053 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:1054 ../../mod/photos.php:1362 +#: ../../mod/photos.php:1055 ../../mod/photos.php:1363 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:1114 +#: ../../mod/photos.php:1115 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1120 +#: ../../mod/photos.php:1121 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:1122 +#: ../../mod/photos.php:1123 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:1146 ../../mod/photos.php:1598 +#: ../../mod/photos.php:1147 ../../mod/photos.php:1599 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1181 +#: ../../mod/photos.php:1182 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1183 +#: ../../mod/photos.php:1184 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1240 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1239 +#: ../../mod/photos.php:1240 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1240 +#: ../../mod/photos.php:1241 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1246 ../../mod/content.php:603 +#: ../../mod/photos.php:1247 ../../mod/content.php:603 #: ../../object/Item.php:103 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1265 +#: ../../mod/photos.php:1266 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1339 +#: ../../mod/photos.php:1340 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1342 +#: ../../mod/photos.php:1343 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1352 +#: ../../mod/photos.php:1353 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1353 +#: ../../mod/photos.php:1354 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1355 +#: ../../mod/photos.php:1356 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1358 +#: ../../mod/photos.php:1359 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1360 +#: ../../mod/photos.php:1361 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1364 +#: ../../mod/photos.php:1365 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1384 ../../mod/content.php:667 +#: ../../mod/photos.php:1385 ../../mod/content.php:667 #: ../../object/Item.php:196 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1385 ../../mod/content.php:668 +#: ../../mod/photos.php:1386 ../../mod/content.php:668 #: ../../object/Item.php:197 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1386 ../../include/conversation.php:962 +#: ../../mod/photos.php:1387 ../../include/conversation.php:966 msgid "Share" msgstr "" -#: ../../mod/photos.php:1387 ../../mod/editpost.php:118 +#: ../../mod/photos.php:1388 ../../mod/editpost.php:118 #: ../../mod/content.php:482 ../../mod/content.php:846 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/message.php:481 ../../include/conversation.php:624 -#: ../../include/conversation.php:981 ../../object/Item.php:258 +#: ../../include/conversation.php:985 ../../object/Item.php:258 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 -#: ../../mod/photos.php:1519 ../../mod/content.php:690 +#: ../../mod/photos.php:1404 ../../mod/photos.php:1448 +#: ../../mod/photos.php:1520 ../../mod/content.php:690 #: ../../object/Item.php:556 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1405 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585 +#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 +#: ../../mod/photos.php:1522 ../../mod/content.php:692 ../../boot.php:605 #: ../../object/Item.php:558 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 -#: ../../mod/photos.php:1523 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:999 +#: ../../mod/photos.php:1408 ../../mod/photos.php:1452 +#: ../../mod/photos.php:1524 ../../mod/editpost.php:139 +#: ../../mod/content.php:702 ../../include/conversation.php:1003 #: ../../object/Item.php:568 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1491 ../../mod/content.php:439 +#: ../../mod/photos.php:1492 ../../mod/content.php:439 #: ../../mod/content.php:724 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 #: ../../include/conversation.php:569 ../../object/Item.php:117 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1604 +#: ../../mod/photos.php:1605 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1613 +#: ../../mod/photos.php:1614 msgid "Recent Photos" msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:948 +#: ../../mod/editpost.php:88 ../../include/conversation.php:952 msgid "Post to Email" msgstr "" @@ -749,85 +749,85 @@ msgstr "" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:963 +#: ../../include/conversation.php:967 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:964 +#: ../../mod/editpost.php:105 ../../include/conversation.php:968 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:965 +#: ../../mod/editpost.php:106 ../../include/conversation.php:969 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:107 ../../include/conversation.php:966 +#: ../../mod/editpost.php:107 ../../include/conversation.php:970 msgid "attach file" msgstr "" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:967 +#: ../../include/conversation.php:971 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:968 +#: ../../mod/editpost.php:109 ../../include/conversation.php:972 msgid "web link" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:969 +#: ../../mod/editpost.php:110 ../../include/conversation.php:973 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:970 +#: ../../mod/editpost.php:111 ../../include/conversation.php:974 msgid "video link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:971 +#: ../../mod/editpost.php:112 ../../include/conversation.php:975 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:972 +#: ../../mod/editpost.php:113 ../../include/conversation.php:976 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:973 +#: ../../mod/editpost.php:114 ../../include/conversation.php:977 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:974 +#: ../../mod/editpost.php:115 ../../include/conversation.php:978 msgid "set location" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:975 +#: ../../mod/editpost.php:116 ../../include/conversation.php:979 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:976 +#: ../../mod/editpost.php:117 ../../include/conversation.php:980 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:982 +#: ../../mod/editpost.php:119 ../../include/conversation.php:986 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:127 ../../include/conversation.php:991 +#: ../../mod/editpost.php:127 ../../include/conversation.php:995 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:128 ../../include/conversation.php:992 +#: ../../mod/editpost.php:128 ../../include/conversation.php:996 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:978 +#: ../../mod/editpost.php:131 ../../include/conversation.php:982 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:133 ../../include/conversation.php:980 +#: ../../mod/editpost.php:133 ../../include/conversation.php:984 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:994 +#: ../../mod/editpost.php:134 ../../include/conversation.php:998 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -948,7 +948,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350 msgid "[Name Withheld]" msgstr "" @@ -1020,6 +1020,64 @@ msgstr "" msgid "Submit Request" msgstr "" +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:137 +msgid "Account settings" +msgstr "" + +#: ../../mod/uexport.php:14 ../../mod/settings.php:35 +msgid "Display settings" +msgstr "" + +#: ../../mod/uexport.php:20 ../../mod/settings.php:41 +msgid "Connector settings" +msgstr "" + +#: ../../mod/uexport.php:25 ../../mod/settings.php:46 +msgid "Plugin settings" +msgstr "" + +#: ../../mod/uexport.php:30 ../../mod/settings.php:51 +msgid "Connected apps" +msgstr "" + +#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:56 +msgid "Export personal data" +msgstr "" + +#: ../../mod/uexport.php:40 ../../mod/settings.php:61 +msgid "Remove account" +msgstr "" + +#: ../../mod/uexport.php:48 ../../mod/settings.php:69 +#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon.old/mathjax/mathjax.php:36 +msgid "Settings" +msgstr "" + +#: ../../mod/uexport.php:72 +msgid "Export account" +msgstr "" + +#: ../../mod/uexport.php:72 +msgid "" +"Export your account info and contacts. Use this to make a backup of your " +"account and/or to move it to another server." +msgstr "" + +#: ../../mod/uexport.php:73 +msgid "Export all" +msgstr "" + +#: ../../mod/uexport.php:73 +msgid "" +"Export your accout info, contacts and all your items as json. Could be a " +"very big file, and could take a lot of time. Use this to make a full backup " +"of your account (photos are not exported)" +msgstr "" + #: ../../mod/install.php:117 msgid "Friendica Social Communications Server - Setup" msgstr "" @@ -1340,7 +1398,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1175 +#: ../../include/contact_widgets.php:9 ../../boot.php:1199 msgid "Connect" msgstr "" @@ -1407,7 +1465,7 @@ msgstr[1] "" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:586 +#: ../../include/contact_widgets.php:195 ../../boot.php:606 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" @@ -2007,13 +2065,13 @@ msgid "Password reset requested at %s" msgstr "" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:90 ../../mod/register.php:144 +#: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 -#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359 +#: ../../boot.php:821 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2027,7 +2085,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:936 +#: ../../mod/lostpass.php:83 ../../boot.php:960 msgid "Password Reset" msgstr "" @@ -2071,43 +2129,6 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/settings.php:30 ../../include/nav.php:137 -msgid "Account settings" -msgstr "" - -#: ../../mod/settings.php:35 -msgid "Display settings" -msgstr "" - -#: ../../mod/settings.php:41 -msgid "Connector settings" -msgstr "" - -#: ../../mod/settings.php:46 -msgid "Plugin settings" -msgstr "" - -#: ../../mod/settings.php:51 -msgid "Connected apps" -msgstr "" - -#: ../../mod/settings.php:56 -msgid "Export personal data" -msgstr "" - -#: ../../mod/settings.php:61 -msgid "Remove account" -msgstr "" - -#: ../../mod/settings.php:69 ../../mod/newmember.php:22 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 -#: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 -#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 -#: ../../addon.old/mathjax/mathjax.php:36 -msgid "Settings" -msgstr "" - #: ../../mod/settings.php:113 msgid "Missing some important data!" msgstr "" @@ -2717,7 +2738,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1708 +#: ../../mod/notes.php:44 ../../boot.php:1738 msgid "Personal Notes" msgstr "" @@ -2735,6 +2756,35 @@ msgstr "" msgid "Save" msgstr "" +#: ../../mod/uimport.php:41 +msgid "Import" +msgstr "" + +#: ../../mod/uimport.php:43 +msgid "Move account" +msgstr "" + +#: ../../mod/uimport.php:44 +msgid "" +"You can import an account from another Friendica server.
\r\n" +" 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." +"
\r\n" +" This feature is experimental. We can't import " +"contacts from the OStatus network (statusnet/identi.ca) or from diaspora" +msgstr "" + +#: ../../mod/uimport.php:47 +msgid "Account file" +msgstr "" + +#: ../../mod/uimport.php:47 +msgid "" +"To export your accont, go to \"Settings->Export your porsonal data\" and " +"select \"Export account\"" +msgstr "" + #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 #, php-format msgid "Number of daily wall messages for %s exceeded. Message failed." @@ -2766,7 +2816,7 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:898 ../../include/conversation.php:916 +#: ../../include/conversation.php:902 ../../include/conversation.php:920 msgid "Please enter a link URL:" msgstr "" @@ -2849,7 +2899,7 @@ msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1684 +#: ../../boot.php:1714 msgid "Profile" msgstr "" @@ -3020,7 +3070,7 @@ msgstr "" msgid "Group name changed." msgstr "" -#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318 +#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332 msgid "Permission denied" msgstr "" @@ -3076,91 +3126,91 @@ msgstr "" msgid "View Contacts" msgstr "" -#: ../../mod/register.php:88 ../../mod/regmod.php:52 +#: ../../mod/register.php:89 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../mod/register.php:96 +#: ../../mod/register.php:97 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: ../../mod/register.php:100 +#: ../../mod/register.php:101 msgid "Failed to send email message. Here is the message that failed." msgstr "" -#: ../../mod/register.php:105 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:142 +#: ../../mod/register.php:143 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../mod/register.php:151 +#: ../../mod/register.php:152 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:189 +#: ../../mod/register.php:190 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:217 +#: ../../mod/register.php:218 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "" -#: ../../mod/register.php:218 +#: ../../mod/register.php:219 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:219 +#: ../../mod/register.php:220 msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:233 +#: ../../mod/register.php:234 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:255 +#: ../../mod/register.php:256 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:256 +#: ../../mod/register.php:257 msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:259 ../../mod/admin.php:444 +#: ../../mod/register.php:260 ../../mod/admin.php:444 msgid "Registration" msgstr "" -#: ../../mod/register.php:267 +#: ../../mod/register.php:268 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:268 +#: ../../mod/register.php:269 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:269 +#: ../../mod/register.php:270 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/register.php:270 +#: ../../mod/register.php:271 msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:920 msgid "Register" msgstr "" @@ -3208,7 +3258,7 @@ msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 -#: ../../mod/display.php:169 ../../include/items.php:3780 +#: ../../mod/display.php:169 ../../include/items.php:3837 msgid "Item not found." msgstr "" @@ -3217,7 +3267,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:51 ../../boot.php:1691 +#: ../../include/nav.php:51 ../../boot.php:1721 msgid "Photos" msgstr "" @@ -3246,8 +3296,8 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:420 ../../mod/wall_upload.php:133 -#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 +#: ../../mod/item.php:420 ../../mod/wall_upload.php:135 +#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" @@ -3311,7 +3361,7 @@ msgstr "" msgid "Unable to process image" msgstr "" -#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88 +#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90 #, php-format msgid "Image exceeds size limit of %d" msgstr "" @@ -4094,7 +4144,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1085 +#: ../../mod/profile.php:21 ../../boot.php:1109 msgid "Requested profile is not available." msgstr "" @@ -4164,8 +4214,8 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "" -#: ../../mod/openid.php:93 ../../include/auth.php:98 -#: ../../include/auth.php:161 +#: ../../mod/openid.php:93 ../../include/auth.php:110 +#: ../../include/auth.php:173 msgid "Login failed." msgstr "" @@ -4495,28 +4545,28 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:689 ../../boot.php:1203 +#: ../../mod/profiles.php:689 ../../boot.php:1227 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:690 ../../boot.php:1204 +#: ../../mod/profiles.php:690 ../../boot.php:1228 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:701 ../../boot.php:1214 +#: ../../mod/profiles.php:701 ../../boot.php:1238 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:703 ../../boot.php:1217 +#: ../../mod/profiles.php:703 ../../boot.php:1241 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:704 ../../boot.php:1218 +#: ../../mod/profiles.php:704 ../../boot.php:1242 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:902 -#: ../../include/conversation.php:920 +#: ../../mod/filer.php:29 ../../include/conversation.php:906 +#: ../../include/conversation.php:924 msgid "Save to Folder:" msgstr "" @@ -4640,17 +4690,17 @@ msgid "Gender: " msgstr "" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1239 +#: ../../boot.php:1263 msgid "Gender:" msgstr "" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1242 +#: ../../boot.php:1266 msgid "Status:" msgstr "" #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1244 +#: ../../boot.php:1268 msgid "Homepage:" msgstr "" @@ -5521,7 +5571,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:923 +#: ../../include/nav.php:64 ../../boot.php:946 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -6130,7 +6180,7 @@ msgstr "" #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:724 +#: ../../include/enotify.php:28 ../../include/notifier.php:774 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -8122,7 +8172,7 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:457 ../../include/notifier.php:717 +#: ../../include/delivery.php:457 ../../include/notifier.php:767 msgid "(no subject)" msgstr "" @@ -8389,6 +8439,37 @@ msgstr "" msgid "Embedding disabled" msgstr "" +#: ../../include/uimport.php:61 +msgid "Error decoding account file" +msgstr "" + +#: ../../include/uimport.php:67 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "" + +#: ../../include/uimport.php:72 +msgid "Error! I can't import this file: DB schema version is not compatible." +msgstr "" + +#: ../../include/uimport.php:92 +msgid "User creation error" +msgstr "" + +#: ../../include/uimport.php:110 +msgid "User profile creation error" +msgstr "" + +#: ../../include/uimport.php:155 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/uimport.php:233 +msgid "Done. You can now login with your username and password" +msgstr "" + #: ../../include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -8420,7 +8501,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:922 +#: ../../include/nav.php:46 ../../boot.php:945 msgid "Logout" msgstr "" @@ -8428,7 +8509,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1677 +#: ../../include/nav.php:49 ../../boot.php:1707 msgid "Status" msgstr "" @@ -8508,11 +8589,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1197 +#: ../../include/nav.php:138 ../../boot.php:1221 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1197 +#: ../../include/nav.php:138 ../../boot.php:1221 msgid "Manage/edit profiles" msgstr "" @@ -8587,17 +8668,17 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../include/auth.php:35 +#: ../../include/auth.php:36 msgid "Logged out." msgstr "" -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: ../../include/auth.php:114 +#: ../../include/auth.php:126 msgid "The error message was:" msgstr "" @@ -8937,15 +9018,15 @@ msgstr "" msgid "following" msgstr "" -#: ../../include/items.php:3300 +#: ../../include/items.php:3357 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:3300 +#: ../../include/items.php:3357 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:3981 +#: ../../include/items.php:4038 msgid "Archives" msgstr "" @@ -9029,7 +9110,7 @@ msgstr "" msgid "Welcome back " msgstr "" -#: ../../include/security.php:354 +#: ../../include/security.php:357 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." @@ -9128,46 +9209,46 @@ msgstr "" msgid "and" msgstr "" -#: ../../include/conversation.php:872 +#: ../../include/conversation.php:875 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:873 +#: ../../include/conversation.php:877 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:873 +#: ../../include/conversation.php:877 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:897 ../../include/conversation.php:915 +#: ../../include/conversation.php:901 ../../include/conversation.php:919 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:899 ../../include/conversation.php:917 +#: ../../include/conversation.php:903 ../../include/conversation.php:921 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:900 ../../include/conversation.php:918 +#: ../../include/conversation.php:904 ../../include/conversation.php:922 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:901 ../../include/conversation.php:919 +#: ../../include/conversation.php:905 ../../include/conversation.php:923 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:903 ../../include/conversation.php:921 +#: ../../include/conversation.php:907 ../../include/conversation.php:925 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:904 +#: ../../include/conversation.php:908 msgid "Delete item(s)?" msgstr "" -#: ../../include/conversation.php:983 +#: ../../include/conversation.php:987 msgid "permissions" msgstr "" @@ -9183,105 +9264,109 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../boot.php:584 +#: ../../boot.php:604 msgid "Delete this item?" msgstr "" -#: ../../boot.php:587 +#: ../../boot.php:607 msgid "show fewer" msgstr "" -#: ../../boot.php:794 +#: ../../boot.php:816 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:796 +#: ../../boot.php:818 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:897 +#: ../../boot.php:919 msgid "Create a New Account" msgstr "" -#: ../../boot.php:925 +#: ../../boot.php:948 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:926 +#: ../../boot.php:949 msgid "Password: " msgstr "" -#: ../../boot.php:929 +#: ../../boot.php:950 +msgid "Remember me" +msgstr "" + +#: ../../boot.php:953 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:935 +#: ../../boot.php:959 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1046 +#: ../../boot.php:1070 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1123 +#: ../../boot.php:1147 msgid "Edit profile" msgstr "" -#: ../../boot.php:1189 +#: ../../boot.php:1213 msgid "Message" msgstr "" -#: ../../boot.php:1311 ../../boot.php:1397 +#: ../../boot.php:1335 ../../boot.php:1421 msgid "g A l F d" msgstr "" -#: ../../boot.php:1312 ../../boot.php:1398 +#: ../../boot.php:1336 ../../boot.php:1422 msgid "F d" msgstr "" -#: ../../boot.php:1357 ../../boot.php:1438 +#: ../../boot.php:1381 ../../boot.php:1462 msgid "[today]" msgstr "" -#: ../../boot.php:1369 +#: ../../boot.php:1393 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1370 +#: ../../boot.php:1394 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1431 +#: ../../boot.php:1455 msgid "[No description]" msgstr "" -#: ../../boot.php:1449 +#: ../../boot.php:1473 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1450 +#: ../../boot.php:1474 msgid "Events this week:" msgstr "" -#: ../../boot.php:1680 +#: ../../boot.php:1710 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1687 +#: ../../boot.php:1717 msgid "Profile Details" msgstr "" -#: ../../boot.php:1704 +#: ../../boot.php:1734 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1711 +#: ../../boot.php:1741 msgid "Only You Can See This" msgstr "" -#: ../../index.php:380 +#: ../../index.php:398 msgid "toggle mobile" msgstr "" diff --git a/view/cs/messages.po b/view/cs/messages.po index 4f6c4f944a..cf9b1d6769 100644 --- a/view/cs/messages.po +++ b/view/cs/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-10-18 10:00-0700\n" -"PO-Revision-Date: 2012-10-17 19:52+0000\n" +"POT-Creation-Date: 2012-11-08 10:00-0800\n" +"PO-Revision-Date: 2012-11-10 18:38+0000\n" "Last-Translator: Michal Šupler \n" "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n" "MIME-Version: 1.0\n" @@ -24,6 +24,7 @@ msgstr "Příspěvek úspěšně odeslán" #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 +#: ../../mod/update_display.php:22 msgid "[Embedded content - reload page to view]" msgstr "[Vložený obsah - obnovení stránky pro zobrazení]" @@ -42,24 +43,24 @@ msgstr "Aktualizace kontaktu selhala." #: ../../mod/notifications.php:66 ../../mod/contacts.php:146 #: ../../mod/settings.php:86 ../../mod/settings.php:525 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 +#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126 -#: ../../mod/item.php:142 ../../mod/mood.php:114 +#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139 +#: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/message.php:38 ../../mod/message.php:168 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:64 ../../mod/follow.php:9 -#: ../../mod/display.php:141 ../../mod/profiles.php:7 +#: ../../mod/display.php:165 ../../mod/profiles.php:7 #: ../../mod/profiles.php:424 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -132,10 +133,10 @@ msgstr "Nové foto z této URL adresy" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:455 ../../mod/photos.php:1027 #: ../../mod/photos.php:1103 ../../mod/photos.php:1366 -#: ../../mod/photos.php:1406 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1520 ../../mod/install.php:246 +#: ../../mod/photos.php:1406 ../../mod/photos.php:1450 +#: ../../mod/photos.php:1522 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:348 +#: ../../mod/content.php:693 ../../mod/contacts.php:351 #: ../../mod/settings.php:543 ../../mod/settings.php:697 #: ../../mod/settings.php:769 ../../mod/settings.php:976 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 @@ -179,10 +180,10 @@ msgstr "Nové foto z této URL adresy" #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:599 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -282,12 +283,12 @@ msgstr "l, F j" msgid "Edit event" msgstr "Editovat událost" -#: ../../mod/events.php:323 ../../include/text.php:1187 +#: ../../mod/events.php:323 ../../include/text.php:1185 msgid "link to source" msgstr "odkaz na zdroj" -#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:52 ../../boot.php:1701 +#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 +#: ../../include/nav.php:52 ../../boot.php:1711 msgid "Events" msgstr "Události" @@ -345,7 +346,7 @@ msgstr "Popis:" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1237 +#: ../../boot.php:1241 msgid "Location:" msgstr "Místo:" @@ -360,7 +361,7 @@ msgstr "Sdílet tuto událost" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:1001 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Zrušit" @@ -385,8 +386,8 @@ msgstr "Odstranit" #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530 #, php-format -msgid "%s welcomes %s" -msgstr "%s vítá %s " +msgid "%1$s welcomes %2$s" +msgstr "%1$s vítá %2$s" #: ../../mod/api.php:76 ../../mod/api.php:102 msgid "Authorize application connection" @@ -413,7 +414,7 @@ msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a konta #: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:236 +#: ../../mod/settings.php:967 ../../mod/register.php:237 #: ../../mod/profiles.php:574 msgid "Yes" msgstr "Ano" @@ -425,25 +426,25 @@ msgstr "Ano" #: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:237 +#: ../../mod/settings.php:967 ../../mod/register.php:238 #: ../../mod/profiles.php:575 msgid "No" msgstr "Ne" -#: ../../mod/photos.php:50 ../../boot.php:1694 +#: ../../mod/photos.php:50 ../../boot.php:1704 msgid "Photo Albums" msgstr "Fotoalba" #: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110 -#: ../../mod/photos.php:1562 ../../mod/photos.php:1574 +#: ../../mod/photos.php:1565 ../../mod/photos.php:1577 #: ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook/theme.php:492 +#: ../../view/theme/diabook/theme.php:485 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "Fotogalerie kontaktu" -#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612 +#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615 msgid "Upload New Photos" msgstr "Nahrát nové fotografie" @@ -461,7 +462,7 @@ msgstr "Kontakt byl zablokován" #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324 +#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324 #: ../../include/user.php:331 ../../include/user.php:338 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" @@ -480,21 +481,13 @@ msgid "Delete Photo" msgstr "Smazat fotografii" #: ../../mod/photos.php:606 -msgid "was tagged in a" -msgstr "štítek byl přidán v" - -#: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87 -#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439 -#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 -#: ../../include/conversation.php:253 -#: ../../addon.old/communityhome/communityhome.php:163 -msgid "photo" -msgstr "fotografie" +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "%1$s byl označen v %2$s uživatelem %3$s" #: ../../mod/photos.php:606 -msgid "by" -msgstr "od" +msgid "a photo" +msgstr "fotografie" #: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315 #: ../../addon.old/js_upload/js_upload.php:315 @@ -571,7 +564,7 @@ msgstr "Zobrazit nejprve nejnovější:" msgid "Show Oldest First" msgstr "Zobrazit nejprve nejstarší:" -#: ../../mod/photos.php:1146 ../../mod/photos.php:1595 +#: ../../mod/photos.php:1146 ../../mod/photos.php:1598 msgid "View Photo" msgstr "Zobraz fotografii" @@ -647,49 +640,49 @@ msgstr "Líbí se mi to (přepínač)" msgid "I don't like this (toggle)" msgstr "Nelíbí se mi to (přepínač)" -#: ../../mod/photos.php:1386 ../../include/conversation.php:956 +#: ../../mod/photos.php:1386 ../../include/conversation.php:962 msgid "Share" msgstr "Sdílet" #: ../../mod/photos.php:1387 ../../mod/editpost.php:118 -#: ../../mod/content.php:482 ../../mod/content.php:845 +#: ../../mod/content.php:482 ../../mod/content.php:846 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293 -#: ../../mod/message.php:481 ../../include/conversation.php:619 -#: ../../include/conversation.php:975 ../../object/Item.php:258 +#: ../../mod/message.php:481 ../../include/conversation.php:624 +#: ../../include/conversation.php:981 ../../object/Item.php:258 msgid "Please wait" msgstr "Čekejte prosím" -#: ../../mod/photos.php:1403 ../../mod/photos.php:1446 -#: ../../mod/photos.php:1517 ../../mod/content.php:690 -#: ../../object/Item.php:555 +#: ../../mod/photos.php:1403 ../../mod/photos.php:1447 +#: ../../mod/photos.php:1519 ../../mod/content.php:690 +#: ../../object/Item.php:556 msgid "This is you" msgstr "Nastavte Vaši polohu" -#: ../../mod/photos.php:1405 ../../mod/photos.php:1448 -#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585 -#: ../../object/Item.php:557 +#: ../../mod/photos.php:1405 ../../mod/photos.php:1449 +#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589 +#: ../../object/Item.php:558 msgid "Comment" msgstr "Okomentovat" -#: ../../mod/photos.php:1407 ../../mod/photos.php:1450 -#: ../../mod/photos.php:1521 ../../mod/editpost.php:139 -#: ../../mod/content.php:702 ../../include/conversation.php:993 -#: ../../object/Item.php:567 +#: ../../mod/photos.php:1407 ../../mod/photos.php:1451 +#: ../../mod/photos.php:1523 ../../mod/editpost.php:139 +#: ../../mod/content.php:702 ../../include/conversation.php:999 +#: ../../object/Item.php:568 msgid "Preview" msgstr "Náhled" -#: ../../mod/photos.php:1489 ../../mod/content.php:439 -#: ../../mod/content.php:723 ../../mod/settings.php:606 +#: ../../mod/photos.php:1491 ../../mod/content.php:439 +#: ../../mod/content.php:724 ../../mod/settings.php:606 #: ../../mod/group.php:168 ../../mod/admin.php:696 -#: ../../include/conversation.php:564 ../../object/Item.php:117 +#: ../../include/conversation.php:569 ../../object/Item.php:117 msgid "Delete" msgstr "Odstranit" -#: ../../mod/photos.php:1601 +#: ../../mod/photos.php:1604 msgid "View Album" msgstr "Zobrazit album" -#: ../../mod/photos.php:1610 +#: ../../mod/photos.php:1613 msgid "Recent Photos" msgstr "Aktuální fotografie" @@ -697,7 +690,7 @@ msgstr "Aktuální fotografie" msgid "Not available." msgstr "Není k dispozici." -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92 #: ../../include/nav.php:101 msgid "Community" msgstr "Komunita" @@ -747,96 +740,96 @@ msgstr "Položka nenalezena" msgid "Edit post" msgstr "Upravit příspěvek" -#: ../../mod/editpost.php:88 ../../include/conversation.php:942 +#: ../../mod/editpost.php:88 ../../include/conversation.php:948 msgid "Post to Email" msgstr "Poslat příspěvek na e-mail" -#: ../../mod/editpost.php:103 ../../mod/content.php:710 +#: ../../mod/editpost.php:103 ../../mod/content.php:711 #: ../../mod/settings.php:605 ../../object/Item.php:107 msgid "Edit" msgstr "Upravit" #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/message.php:291 ../../mod/message.php:478 -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:963 msgid "Upload photo" msgstr "Nahrát fotografii" -#: ../../mod/editpost.php:105 ../../include/conversation.php:958 +#: ../../mod/editpost.php:105 ../../include/conversation.php:964 msgid "upload photo" msgstr "nahrát fotky" -#: ../../mod/editpost.php:106 ../../include/conversation.php:959 +#: ../../mod/editpost.php:106 ../../include/conversation.php:965 msgid "Attach file" msgstr "Přiložit soubor" -#: ../../mod/editpost.php:107 ../../include/conversation.php:960 +#: ../../mod/editpost.php:107 ../../include/conversation.php:966 msgid "attach file" msgstr "přidat soubor" #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151 #: ../../mod/message.php:292 ../../mod/message.php:479 -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:967 msgid "Insert web link" msgstr "Vložit webový odkaz" -#: ../../mod/editpost.php:109 ../../include/conversation.php:962 +#: ../../mod/editpost.php:109 ../../include/conversation.php:968 msgid "web link" msgstr "webový odkaz" -#: ../../mod/editpost.php:110 ../../include/conversation.php:963 +#: ../../mod/editpost.php:110 ../../include/conversation.php:969 msgid "Insert video link" msgstr "Zadejte odkaz na video" -#: ../../mod/editpost.php:111 ../../include/conversation.php:964 +#: ../../mod/editpost.php:111 ../../include/conversation.php:970 msgid "video link" msgstr "odkaz na video" -#: ../../mod/editpost.php:112 ../../include/conversation.php:965 +#: ../../mod/editpost.php:112 ../../include/conversation.php:971 msgid "Insert audio link" msgstr "Zadejte odkaz na zvukový záznam" -#: ../../mod/editpost.php:113 ../../include/conversation.php:966 +#: ../../mod/editpost.php:113 ../../include/conversation.php:972 msgid "audio link" msgstr "odkaz na audio" -#: ../../mod/editpost.php:114 ../../include/conversation.php:967 +#: ../../mod/editpost.php:114 ../../include/conversation.php:973 msgid "Set your location" msgstr "Nastavte vaši polohu" -#: ../../mod/editpost.php:115 ../../include/conversation.php:968 +#: ../../mod/editpost.php:115 ../../include/conversation.php:974 msgid "set location" msgstr "nastavit místo" -#: ../../mod/editpost.php:116 ../../include/conversation.php:969 +#: ../../mod/editpost.php:116 ../../include/conversation.php:975 msgid "Clear browser location" msgstr "Odstranit adresu v prohlížeči" -#: ../../mod/editpost.php:117 ../../include/conversation.php:970 +#: ../../mod/editpost.php:117 ../../include/conversation.php:976 msgid "clear location" msgstr "vymazat místo" -#: ../../mod/editpost.php:119 ../../include/conversation.php:976 +#: ../../mod/editpost.php:119 ../../include/conversation.php:982 msgid "Permission settings" msgstr "Nastavení oprávnění" -#: ../../mod/editpost.php:127 ../../include/conversation.php:985 +#: ../../mod/editpost.php:127 ../../include/conversation.php:991 msgid "CC: email addresses" msgstr "skrytá kopie: e-mailové adresy" -#: ../../mod/editpost.php:128 ../../include/conversation.php:986 +#: ../../mod/editpost.php:128 ../../include/conversation.php:992 msgid "Public post" msgstr "Veřejný příspěvek" -#: ../../mod/editpost.php:131 ../../include/conversation.php:972 +#: ../../mod/editpost.php:131 ../../include/conversation.php:978 msgid "Set title" msgstr "Nastavit titulek" -#: ../../mod/editpost.php:133 ../../include/conversation.php:974 +#: ../../mod/editpost.php:133 ../../include/conversation.php:980 msgid "Categories (comma-separated list)" msgstr "Kategorie (čárkou oddělený seznam)" -#: ../../mod/editpost.php:134 ../../include/conversation.php:988 +#: ../../mod/editpost.php:134 ../../include/conversation.php:994 msgid "Example: bob@example.com, mary@example.com" msgstr "Příklad: bob@example.com, mary@example.com" @@ -958,7 +951,7 @@ msgstr "Prosím potvrďte Vaši žádost o propojení %s." msgid "Confirm" msgstr "Potvrdit" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350 msgid "[Name Withheld]" msgstr "[Jméno odepřeno]" @@ -1030,6 +1023,65 @@ msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"re msgid "Submit Request" msgstr "Odeslat žádost" +#: ../../mod/uexport.php:10 ../../mod/settings.php:30 +#: ../../include/nav.php:137 +msgid "Account settings" +msgstr "Nastavení účtu" + +#: ../../mod/uexport.php:15 ../../mod/settings.php:35 +msgid "Display settings" +msgstr "Nastavení zobrazení" + +#: ../../mod/uexport.php:21 ../../mod/settings.php:41 +msgid "Connector settings" +msgstr "Nastavení konektoru" + +#: ../../mod/uexport.php:26 ../../mod/settings.php:46 +msgid "Plugin settings" +msgstr "Nastavení pluginu" + +#: ../../mod/uexport.php:31 ../../mod/settings.php:51 +msgid "Connected apps" +msgstr "Propojené aplikace" + +#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56 +msgid "Export personal data" +msgstr "Export osobních údajů" + +#: ../../mod/uexport.php:41 ../../mod/settings.php:61 +msgid "Remove account" +msgstr "Odstranit účet" + +#: ../../mod/uexport.php:49 ../../mod/settings.php:69 +#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon.old/mathjax/mathjax.php:36 +msgid "Settings" +msgstr "Nastavení" + +#: ../../mod/uexport.php:73 +msgid "Export account" +msgstr "Exportovat účet" + +#: ../../mod/uexport.php:73 +msgid "" +"Export your account info and contacts. Use this to make a backup of your " +"account and/or to move it to another server." +msgstr "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření zálohy svého účtu a/nebo k přesunu na jiný server." + +#: ../../mod/uexport.php:74 +msgid "Export all" +msgstr "Exportovat vše" + +#: ../../mod/uexport.php:74 +msgid "" +"Export your accout info, contacts and all your items as json. Could be a " +"very big file, and could take a lot of time. Use this to make a full backup " +"of your account (photos are not exported)" +msgstr "Exportujte své informace k účtu, kontakty a vše své položky jako json. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu(fotografie se neexportují)" + #: ../../mod/install.php:117 msgid "Friendica Social Communications Server - Setup" msgstr "Friendica Sociální komunkační server - Nastavení" @@ -1295,9 +1347,9 @@ msgstr "Časová konverze" #: ../../mod/localtime.php:26 msgid "" -"Friendika provides this service for sharing events with other networks and " +"Friendica provides this service for sharing events with other networks and " "friends in unknown timezones." -msgstr "Friendika poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem." +msgstr "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přáteli v neznámých časových zónách" #: ../../mod/localtime.php:30 #, php-format @@ -1351,7 +1403,7 @@ msgid "is interested in:" msgstr "zajímá se o:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1175 +#: ../../include/contact_widgets.php:9 ../../boot.php:1179 msgid "Connect" msgstr "Spojit" @@ -1380,25 +1432,25 @@ msgstr "Skupina je prázdná" msgid "Group: " msgstr "Skupina: " -#: ../../mod/content.php:438 ../../mod/content.php:722 -#: ../../include/conversation.php:563 ../../object/Item.php:116 +#: ../../mod/content.php:438 ../../mod/content.php:723 +#: ../../include/conversation.php:568 ../../object/Item.php:116 msgid "Select" msgstr "Vybrat" -#: ../../mod/content.php:455 ../../mod/content.php:815 -#: ../../mod/content.php:816 ../../include/conversation.php:582 +#: ../../mod/content.php:455 ../../mod/content.php:816 +#: ../../mod/content.php:817 ../../include/conversation.php:587 #: ../../object/Item.php:227 ../../object/Item.php:228 #, php-format msgid "View %s's profile @ %s" msgstr "Zobrazit profil uživatele %s na %s" -#: ../../mod/content.php:465 ../../mod/content.php:827 -#: ../../include/conversation.php:602 ../../object/Item.php:240 +#: ../../mod/content.php:465 ../../mod/content.php:828 +#: ../../include/conversation.php:607 ../../object/Item.php:240 #, php-format msgid "%s from %s" msgstr "%s od %s" -#: ../../mod/content.php:480 ../../include/conversation.php:617 +#: ../../mod/content.php:480 ../../include/conversation.php:622 msgid "View in context" msgstr "Pohled v kontextu" @@ -1410,7 +1462,7 @@ msgstr[0] "%d komentář" msgstr[1] "%d komentářů" msgstr[2] "%d komentářů" -#: ../../mod/content.php:588 ../../include/text.php:1443 +#: ../../mod/content.php:588 ../../include/text.php:1441 #: ../../object/Item.php:279 ../../object/Item.php:292 msgid "comment" msgid_plural "comments" @@ -1420,7 +1472,7 @@ msgstr[2] "komentář" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:586 +#: ../../include/contact_widgets.php:195 ../../boot.php:590 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" @@ -1442,75 +1494,75 @@ msgstr "Sdílet toto" msgid "share" msgstr "sdílí" -#: ../../mod/content.php:694 ../../object/Item.php:559 +#: ../../mod/content.php:694 ../../object/Item.php:560 msgid "Bold" msgstr "Tučné" -#: ../../mod/content.php:695 ../../object/Item.php:560 +#: ../../mod/content.php:695 ../../object/Item.php:561 msgid "Italic" msgstr "Kurzíva" -#: ../../mod/content.php:696 ../../object/Item.php:561 +#: ../../mod/content.php:696 ../../object/Item.php:562 msgid "Underline" msgstr "Podrtžené" -#: ../../mod/content.php:697 ../../object/Item.php:562 +#: ../../mod/content.php:697 ../../object/Item.php:563 msgid "Quote" msgstr "Citovat" -#: ../../mod/content.php:698 ../../object/Item.php:563 +#: ../../mod/content.php:698 ../../object/Item.php:564 msgid "Code" msgstr "Kód" -#: ../../mod/content.php:699 ../../object/Item.php:564 +#: ../../mod/content.php:699 ../../object/Item.php:565 msgid "Image" msgstr "Obrázek" -#: ../../mod/content.php:700 ../../object/Item.php:565 +#: ../../mod/content.php:700 ../../object/Item.php:566 msgid "Link" msgstr "Odkaz" -#: ../../mod/content.php:701 ../../object/Item.php:566 +#: ../../mod/content.php:701 ../../object/Item.php:567 msgid "Video" msgstr "Video" -#: ../../mod/content.php:735 ../../object/Item.php:180 +#: ../../mod/content.php:736 ../../object/Item.php:180 msgid "add star" msgstr "přidat hvězdu" -#: ../../mod/content.php:736 ../../object/Item.php:181 +#: ../../mod/content.php:737 ../../object/Item.php:181 msgid "remove star" msgstr "odebrat hvězdu" -#: ../../mod/content.php:737 ../../object/Item.php:182 +#: ../../mod/content.php:738 ../../object/Item.php:182 msgid "toggle star status" msgstr "přepnout hvězdu" -#: ../../mod/content.php:740 ../../object/Item.php:185 +#: ../../mod/content.php:741 ../../object/Item.php:185 msgid "starred" msgstr "označeno hvězdou" -#: ../../mod/content.php:741 ../../object/Item.php:186 +#: ../../mod/content.php:742 ../../object/Item.php:186 msgid "add tag" msgstr "přidat štítek" -#: ../../mod/content.php:745 ../../object/Item.php:120 +#: ../../mod/content.php:746 ../../object/Item.php:120 msgid "save to folder" msgstr "uložit do složky" -#: ../../mod/content.php:817 ../../object/Item.php:229 +#: ../../mod/content.php:818 ../../object/Item.php:229 msgid "to" msgstr "pro" -#: ../../mod/content.php:818 ../../object/Item.php:230 +#: ../../mod/content.php:819 ../../object/Item.php:230 msgid "Wall-to-Wall" msgstr "Zeď-na-Zeď" -#: ../../mod/content.php:819 ../../object/Item.php:231 +#: ../../mod/content.php:820 ../../object/Item.php:231 msgid "via Wall-To-Wall:" msgstr "přes Zeď-na-Zeď " -#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1526,8 +1578,8 @@ msgid "Discard" msgstr "Odstranit" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:321 -#: ../../mod/contacts.php:375 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:324 +#: ../../mod/contacts.php:378 msgid "Ignore" msgstr "Ignorovat" @@ -1543,7 +1595,7 @@ msgstr "Síť" msgid "Personal" msgstr "Osobní" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86 #: ../../include/nav.php:77 ../../include/nav.php:115 msgid "Home" msgstr "Domů" @@ -1579,7 +1631,7 @@ msgid "suggested by %s" msgstr "navrhl %s" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:384 msgid "Hide this contact from others" msgstr "Skrýt tento kontakt před ostatními" @@ -1729,59 +1781,59 @@ msgstr "Kontakt bude ignorován" msgid "Contact has been unignored" msgstr "Kontakt přestal být ignorován" -#: ../../mod/contacts.php:216 +#: ../../mod/contacts.php:219 msgid "Contact has been archived" msgstr "Kontakt byl archivován" -#: ../../mod/contacts.php:216 +#: ../../mod/contacts.php:219 msgid "Contact has been unarchived" msgstr "Kontakt byl vrácen z archívu." -#: ../../mod/contacts.php:229 +#: ../../mod/contacts.php:232 msgid "Contact has been removed." msgstr "Kontakt byl odstraněn." -#: ../../mod/contacts.php:263 +#: ../../mod/contacts.php:266 #, php-format msgid "You are mutual friends with %s" msgstr "Jste vzájemní přátelé s uživatelem %s" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:270 #, php-format msgid "You are sharing with %s" msgstr "Sdílíte s uživatelem %s" -#: ../../mod/contacts.php:272 +#: ../../mod/contacts.php:275 #, php-format msgid "%s is sharing with you" msgstr "uživatel %s sdílí s vámi" -#: ../../mod/contacts.php:289 +#: ../../mod/contacts.php:292 msgid "Private communications are not available for this contact." msgstr "Soukromá komunikace není dostupná pro tento kontakt." -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:295 msgid "Never" msgstr "Nikdy" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:299 msgid "(Update was successful)" msgstr "(Aktualizace byla úspěšná)" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:299 msgid "(Update was not successful)" msgstr "(Aktualizace nebyla úspěšná)" -#: ../../mod/contacts.php:298 +#: ../../mod/contacts.php:301 msgid "Suggest friends" msgstr "Navrhněte přátelé" -#: ../../mod/contacts.php:302 +#: ../../mod/contacts.php:305 #, php-format msgid "Network type: %s" msgstr "Typ sítě: %s" -#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190 +#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" @@ -1789,220 +1841,220 @@ msgstr[0] "%d sdílený kontakt" msgstr[1] "%d sdílených kontaktů" msgstr[2] "%d sdílených kontaktů" -#: ../../mod/contacts.php:310 +#: ../../mod/contacts.php:313 msgid "View all contacts" msgstr "Zobrazit všechny kontakty" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 #: ../../mod/admin.php:698 msgid "Unblock" msgstr "Odblokovat" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 #: ../../mod/admin.php:697 msgid "Block" msgstr "Blokovat" -#: ../../mod/contacts.php:318 +#: ../../mod/contacts.php:321 msgid "Toggle Blocked status" msgstr "Přepnout stav Blokováno" -#: ../../mod/contacts.php:321 ../../mod/contacts.php:375 +#: ../../mod/contacts.php:324 ../../mod/contacts.php:378 msgid "Unignore" msgstr "Přestat ignorovat" -#: ../../mod/contacts.php:324 +#: ../../mod/contacts.php:327 msgid "Toggle Ignored status" msgstr "Přepnout stav Ignorováno" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:331 msgid "Unarchive" msgstr "Vrátit z archívu" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:331 msgid "Archive" msgstr "Archivovat" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:334 msgid "Toggle Archive status" msgstr "Přepnout stav Archivováno" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:337 msgid "Repair" msgstr "Opravit" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:340 msgid "Advanced Contact Settings" msgstr "Pokročilé nastavení kontaktu" -#: ../../mod/contacts.php:343 +#: ../../mod/contacts.php:346 msgid "Communications lost with this contact!" msgstr "Komunikace s tímto kontaktem byla ztracena!" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:349 msgid "Contact Editor" msgstr "Editor kontaktu" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:352 msgid "Profile Visibility" msgstr "Viditelnost profilu" -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:353 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu." -#: ../../mod/contacts.php:351 +#: ../../mod/contacts.php:354 msgid "Contact Information / Notes" msgstr "Kontaktní informace / poznámky" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:355 msgid "Edit contact notes" msgstr "Editovat poznámky kontaktu" -#: ../../mod/contacts.php:357 ../../mod/contacts.php:549 +#: ../../mod/contacts.php:360 ../../mod/contacts.php:552 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Navštivte profil uživatele %s [%s]" -#: ../../mod/contacts.php:358 +#: ../../mod/contacts.php:361 msgid "Block/Unblock contact" msgstr "Blokovat / Odblokovat kontakt" -#: ../../mod/contacts.php:359 +#: ../../mod/contacts.php:362 msgid "Ignore contact" msgstr "Ignorovat kontakt" -#: ../../mod/contacts.php:360 +#: ../../mod/contacts.php:363 msgid "Repair URL settings" msgstr "Opravit nastavení adresy URL " -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:364 msgid "View conversations" msgstr "Zobrazit konverzace" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:366 msgid "Delete contact" msgstr "Odstranit kontakt" -#: ../../mod/contacts.php:367 +#: ../../mod/contacts.php:370 msgid "Last update:" msgstr "Poslední aktualizace:" -#: ../../mod/contacts.php:369 +#: ../../mod/contacts.php:372 msgid "Update public posts" msgstr "Aktualizovat veřejné příspěvky" -#: ../../mod/contacts.php:371 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:374 ../../mod/admin.php:1170 msgid "Update now" msgstr "Aktualizovat" -#: ../../mod/contacts.php:378 +#: ../../mod/contacts.php:381 msgid "Currently blocked" msgstr "V současnosti zablokováno" -#: ../../mod/contacts.php:379 +#: ../../mod/contacts.php:382 msgid "Currently ignored" msgstr "V současnosti ignorováno" -#: ../../mod/contacts.php:380 +#: ../../mod/contacts.php:383 msgid "Currently archived" msgstr "Aktuálně archivován" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:384 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Odpovědi/Libí se na Vaše veřejné příspěvky mohou být stále viditelné" -#: ../../mod/contacts.php:434 +#: ../../mod/contacts.php:437 msgid "Suggestions" msgstr "Doporučení" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:440 msgid "Suggest potential friends" msgstr "Navrhnout potenciální přátele" -#: ../../mod/contacts.php:440 ../../mod/group.php:191 +#: ../../mod/contacts.php:443 ../../mod/group.php:191 msgid "All Contacts" msgstr "Všechny kontakty" -#: ../../mod/contacts.php:443 +#: ../../mod/contacts.php:446 msgid "Show all contacts" msgstr "Zobrazit všechny kontakty" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:449 msgid "Unblocked" msgstr "Odblokován" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:452 msgid "Only show unblocked contacts" msgstr "Zobrazit pouze neblokované kontakty" -#: ../../mod/contacts.php:453 +#: ../../mod/contacts.php:456 msgid "Blocked" msgstr "Blokován" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:459 msgid "Only show blocked contacts" msgstr "Zobrazit pouze blokované kontakty" -#: ../../mod/contacts.php:460 +#: ../../mod/contacts.php:463 msgid "Ignored" msgstr "Ignorován" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:466 msgid "Only show ignored contacts" msgstr "Zobrazit pouze ignorované kontakty" -#: ../../mod/contacts.php:467 +#: ../../mod/contacts.php:470 msgid "Archived" msgstr "Archivován" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:473 msgid "Only show archived contacts" msgstr "Zobrazit pouze archivované kontakty" -#: ../../mod/contacts.php:474 +#: ../../mod/contacts.php:477 msgid "Hidden" msgstr "Skrytý" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:480 msgid "Only show hidden contacts" msgstr "Zobrazit pouze skryté kontakty" -#: ../../mod/contacts.php:525 +#: ../../mod/contacts.php:528 msgid "Mutual Friendship" msgstr "Vzájemné přátelství" -#: ../../mod/contacts.php:529 +#: ../../mod/contacts.php:532 msgid "is a fan of yours" msgstr "je Váš fanoušek" -#: ../../mod/contacts.php:533 +#: ../../mod/contacts.php:536 msgid "you are a fan of" msgstr "jste fanouškem" -#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Editovat kontakt" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89 +#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakty" -#: ../../mod/contacts.php:575 +#: ../../mod/contacts.php:578 msgid "Search your contacts" msgstr "Prohledat Vaše kontakty" -#: ../../mod/contacts.php:576 ../../mod/directory.php:59 +#: ../../mod/contacts.php:579 ../../mod/directory.php:59 msgid "Finding: " msgstr "Zjištění: " -#: ../../mod/contacts.php:577 ../../mod/directory.php:61 +#: ../../mod/contacts.php:580 ../../mod/directory.php:61 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Najít" @@ -2021,13 +2073,13 @@ msgid "Password reset requested at %s" msgstr "Na %s bylo zažádáno o resetování hesla" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:90 ../../mod/register.php:144 +#: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301 -#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359 +#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2041,7 +2093,7 @@ msgid "" "Password reset failed." msgstr "Žádost nemohla být ověřena. (Možná jste ji odeslali již dříve.) Obnovení hesla se nezdařilo." -#: ../../mod/lostpass.php:83 ../../boot.php:936 +#: ../../mod/lostpass.php:83 ../../boot.php:940 msgid "Password Reset" msgstr "Obnovení hesla" @@ -2085,44 +2137,6 @@ msgstr "Přezdívka nebo e-mail: " msgid "Reset" msgstr "Reset" -#: ../../mod/settings.php:30 ../../include/nav.php:137 -msgid "Account settings" -msgstr "Nastavení účtu" - -#: ../../mod/settings.php:35 -msgid "Display settings" -msgstr "Nastavení zobrazení" - -#: ../../mod/settings.php:41 -msgid "Connector settings" -msgstr "Nastavení konektoru" - -#: ../../mod/settings.php:46 -msgid "Plugin settings" -msgstr "Nastavení pluginu" - -#: ../../mod/settings.php:51 -msgid "Connected apps" -msgstr "Propojené aplikace" - -#: ../../mod/settings.php:56 -msgid "Export personal data" -msgstr "Export osobních údajů" - -#: ../../mod/settings.php:61 -msgid "Remove account" -msgstr "Odstranit účet" - -#: ../../mod/settings.php:69 ../../mod/newmember.php:22 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 -#: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137 -#: ../../addon.old/dav/friendica/layout.fnk.php:225 -#: ../../addon.old/mathjax/mathjax.php:36 -msgid "Settings" -msgstr "Nastavení" - #: ../../mod/settings.php:113 msgid "Missing some important data!" msgstr "Chybí některé důležité údaje!" @@ -2734,7 +2748,7 @@ msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení." msgid "Invalid contact." msgstr "Neplatný kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1708 +#: ../../mod/notes.php:44 ../../boot.php:1718 msgid "Personal Notes" msgstr "Osobní poznámky" @@ -2752,6 +2766,31 @@ msgstr "Osobní poznámky" msgid "Save" msgstr "Uložit" +#: ../../mod/uimport.php:41 +msgid "Import" +msgstr "Import" + +#: ../../mod/uimport.php:43 +msgid "Move account" +msgstr "Přesunout účet" + +#: ../../mod/uimport.php:44 +msgid "" +"You can move here an account from another Friendica server.
\r\n" +" You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n" +" This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora" +msgstr "Zde si můžete přesunout účet z jiného serveru Friendika.
\n Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.
\n Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory" + +#: ../../mod/uimport.php:47 +msgid "Account file" +msgstr "Soubor s účtem" + +#: ../../mod/uimport.php:47 +msgid "" +"To export your accont, go to \"Settings->Export your porsonal data\" and " +"select \"Export account\"" +msgstr "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\"" + #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 #, php-format msgid "Number of daily wall messages for %s exceeded. Message failed." @@ -2783,7 +2822,7 @@ msgstr "Žádný příjemce." #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:242 ../../mod/message.php:250 -#: ../../include/conversation.php:893 ../../include/conversation.php:910 +#: ../../include/conversation.php:898 ../../include/conversation.php:916 msgid "Please enter a link URL:" msgstr "Zadejte prosím URL odkaz:" @@ -2864,9 +2903,9 @@ msgid "" msgstr "Prohlédněte si další nastavení, a to zejména nastavení soukromí. Nezveřejnění svého účtu v adresáři je jako mít nezveřejněné telefonní číslo. Obecně platí, že je lepší mít svůj účet zveřejněný, leda by všichni vaši potenciální přátelé věděli, jak vás přesně najít." #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1684 +#: ../../boot.php:1694 msgid "Profile" msgstr "Profil" @@ -3093,91 +3132,91 @@ msgstr "Žádné kontakty." msgid "View Contacts" msgstr "Zobrazit kontakty" -#: ../../mod/register.php:88 ../../mod/regmod.php:52 +#: ../../mod/register.php:89 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "Registrační údaje pro %s" -#: ../../mod/register.php:96 +#: ../../mod/register.php:97 msgid "" "Registration successful. Please check your email for further instructions." msgstr "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce." -#: ../../mod/register.php:100 +#: ../../mod/register.php:101 msgid "Failed to send email message. Here is the message that failed." msgstr "Nepodařilo se odeslat zprávu na e-mail. Zde je zpráva, která nebyla odeslána." -#: ../../mod/register.php:105 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "Vaši registraci nelze zpracovat." -#: ../../mod/register.php:142 +#: ../../mod/register.php:143 #, php-format msgid "Registration request at %s" msgstr "Žádost o registraci na %s" -#: ../../mod/register.php:151 +#: ../../mod/register.php:152 msgid "Your registration is pending approval by the site owner." msgstr "Vaše registrace čeká na schválení vlastníkem serveru." -#: ../../mod/register.php:189 +#: ../../mod/register.php:190 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to zítra znovu." -#: ../../mod/register.php:217 +#: ../../mod/register.php:218 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko 'Zaregistrovat'." -#: ../../mod/register.php:218 +#: ../../mod/register.php:219 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky." -#: ../../mod/register.php:219 +#: ../../mod/register.php:220 msgid "Your OpenID (optional): " msgstr "Vaše OpenID (nepovinné): " -#: ../../mod/register.php:233 +#: ../../mod/register.php:234 msgid "Include your profile in member directory?" msgstr "Toto je Váš veřejný profil.
Ten může být viditelný kýmkoliv na internetu." -#: ../../mod/register.php:255 +#: ../../mod/register.php:256 msgid "Membership on this site is by invitation only." msgstr "Členství na tomto webu je pouze na pozvání." -#: ../../mod/register.php:256 +#: ../../mod/register.php:257 msgid "Your invitation ID: " msgstr "Vaše pozvání ID:" -#: ../../mod/register.php:259 ../../mod/admin.php:444 +#: ../../mod/register.php:260 ../../mod/admin.php:444 msgid "Registration" msgstr "Registrace" -#: ../../mod/register.php:267 +#: ../../mod/register.php:268 msgid "Your Full Name (e.g. Joe Smith): " msgstr "Vaše celé jméno (např. Jan Novák):" -#: ../../mod/register.php:268 +#: ../../mod/register.php:269 msgid "Your Email Address: " msgstr "Vaše e-mailová adresa:" -#: ../../mod/register.php:269 +#: ../../mod/register.php:270 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be " "'nickname@$sitename'." msgstr "Vyberte přezdívku k profilu. Ta musí začít s textovým znakem. Vaše profilová adresa na tomto webu pak bude \"přezdívka@$sitename\"." -#: ../../mod/register.php:270 +#: ../../mod/register.php:271 msgid "Choose a nickname: " msgstr "Vyberte přezdívku:" -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902 msgid "Register" msgstr "Registrovat" @@ -3185,12 +3224,21 @@ msgstr "Registrovat" msgid "People Search" msgstr "Vyhledávání lidí" +#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437 +#: ../../include/diaspora.php:1835 ../../include/conversation.php:125 +#: ../../include/conversation.php:253 +#: ../../addon.old/communityhome/communityhome.php:163 +msgid "photo" +msgstr "fotografie" + #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook/theme.php:459 -#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835 +#: ../../view/theme/diabook/theme.php:452 +#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3201,7 +3249,7 @@ msgstr "Stav" #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851 +#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3215,8 +3263,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s nemá rád %2$s na %3$s" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29 -#: ../../mod/display.php:145 ../../include/items.php:3779 +#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 +#: ../../mod/display.php:169 ../../include/items.php:3837 msgid "Item not found." msgstr "Položka nenalezena." @@ -3224,8 +3272,8 @@ msgstr "Položka nenalezena." msgid "Access denied." msgstr "Přístup odmítnut" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:51 ../../boot.php:1691 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 +#: ../../include/nav.php:51 ../../boot.php:1701 msgid "Photos" msgstr "Fotografie" @@ -3246,43 +3294,43 @@ msgstr "Registrace zrušena pro %s" msgid "Please login." msgstr "Přihlaste se, prosím." -#: ../../mod/item.php:91 +#: ../../mod/item.php:104 msgid "Unable to locate original post." msgstr "Nelze nalézt původní příspěvek." -#: ../../mod/item.php:275 +#: ../../mod/item.php:288 msgid "Empty post discarded." msgstr "Prázdný příspěvek odstraněn." -#: ../../mod/item.php:407 ../../mod/wall_upload.php:133 +#: ../../mod/item.php:420 ../../mod/wall_upload.php:133 #: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Fotografie na zdi" -#: ../../mod/item.php:820 +#: ../../mod/item.php:833 msgid "System error. Post not saved." msgstr "Chyba systému. Příspěvek nebyl uložen." -#: ../../mod/item.php:845 +#: ../../mod/item.php:858 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social " "network." msgstr "Tato zpráva vám byla zaslána od %s, člena sociální sítě Friendica." -#: ../../mod/item.php:847 +#: ../../mod/item.php:860 #, php-format msgid "You may visit them online at %s" msgstr "Můžete je navštívit online na adrese %s" -#: ../../mod/item.php:848 +#: ../../mod/item.php:861 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam." -#: ../../mod/item.php:850 +#: ../../mod/item.php:863 #, php-format msgid "%s posted an update." msgstr "%s poslal aktualizaci." @@ -4106,11 +4154,11 @@ msgstr "FTP uživatel" msgid "FTP Password" msgstr "FTP heslo" -#: ../../mod/profile.php:21 ../../boot.php:1085 +#: ../../mod/profile.php:21 ../../boot.php:1089 msgid "Requested profile is not available." msgstr "Požadovaný profil není k dispozici." -#: ../../mod/profile.php:155 ../../mod/display.php:77 +#: ../../mod/profile.php:155 ../../mod/display.php:87 msgid "Access to this profile has been restricted." msgstr "Přístup na tento profil byl omezen." @@ -4202,7 +4250,7 @@ msgstr "%1$s následuje %3$s uživatele %2$s" msgid "link" msgstr "odkaz" -#: ../../mod/display.php:138 +#: ../../mod/display.php:162 msgid "Item has been removed." msgstr "Položka byla odstraněna." @@ -4507,28 +4555,28 @@ msgstr "Věk: " msgid "Edit/Manage Profiles" msgstr "Upravit / Spravovat profily" -#: ../../mod/profiles.php:689 ../../boot.php:1203 +#: ../../mod/profiles.php:689 ../../boot.php:1207 msgid "Change profile photo" msgstr "Změnit profilovou fotografii" -#: ../../mod/profiles.php:690 ../../boot.php:1204 +#: ../../mod/profiles.php:690 ../../boot.php:1208 msgid "Create New Profile" msgstr "Vytvořit nový profil" -#: ../../mod/profiles.php:701 ../../boot.php:1214 +#: ../../mod/profiles.php:701 ../../boot.php:1218 msgid "Profile Image" msgstr "Profilový obrázek" -#: ../../mod/profiles.php:703 ../../boot.php:1217 +#: ../../mod/profiles.php:703 ../../boot.php:1221 msgid "visible to everybody" msgstr "viditelné pro všechny" -#: ../../mod/profiles.php:704 ../../boot.php:1218 +#: ../../mod/profiles.php:704 ../../boot.php:1222 msgid "Edit visibility" msgstr "Upravit viditelnost" -#: ../../mod/filer.php:29 ../../include/conversation.php:897 -#: ../../include/conversation.php:914 +#: ../../mod/filer.php:29 ../../include/conversation.php:902 +#: ../../include/conversation.php:920 msgid "Save to Folder:" msgstr "Uložit do složky:" @@ -4620,7 +4668,7 @@ msgstr "Vstupní data (ve formátu Diaspora): " msgid "diaspora2bb: " msgstr "diaspora2bb: " -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "Návrhy přátel" @@ -4635,7 +4683,7 @@ msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to msgid "Ignore/Hide" msgstr "Ignorovat / skrýt" -#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518 +#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511 msgid "Global Directory" msgstr "Globální adresář" @@ -4652,17 +4700,17 @@ msgid "Gender: " msgstr "Pohlaví: " #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1239 +#: ../../boot.php:1243 msgid "Gender:" msgstr "Pohlaví:" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1242 +#: ../../boot.php:1246 msgid "Status:" msgstr "Status:" #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1244 +#: ../../boot.php:1248 msgid "Homepage:" msgstr "Domácí stránka:" @@ -5535,7 +5583,7 @@ msgstr "Povolit Planets plugin" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:923 +#: ../../include/nav.php:64 ../../boot.php:927 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5575,7 +5623,7 @@ msgid "Latest likes" msgstr "Poslední \"líbí se mi\"" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437 +#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5729,7 +5777,7 @@ msgstr "Dny" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5740,7 +5788,7 @@ msgstr "Neděle" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5748,35 +5796,35 @@ msgid "Monday" msgstr "Pondělí" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "Úterý" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "Středa" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "Čtvrtek" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "Pátek" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -6144,7 +6192,7 @@ msgstr "Rozšířený kalendář s podporou CalDAV" #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:710 +#: ../../include/enotify.php:28 ../../include/notifier.php:774 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -7589,137 +7637,135 @@ msgstr "Nastavení šířku grafické šablony" msgid "Color scheme" msgstr "Barevné schéma" -#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "Vaše příspěvky a konverzace" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50 msgid "Your profile page" msgstr "Vaše profilová stránka" -#: ../../view/theme/diabook/theme.php:89 +#: ../../view/theme/diabook/theme.php:88 msgid "Your contacts" msgstr "Vaše kontakty" -#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51 msgid "Your photos" msgstr "Vaše fotky" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52 msgid "Your events" msgstr "Vaše události" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Personal notes" msgstr "Osobní poznámky" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53 msgid "Your personal photos" msgstr "Vaše osobní fotky" -#: ../../view/theme/diabook/theme.php:94 -#: ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:632 +#: ../../view/theme/diabook/theme.php:93 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "Komunitní stránky" -#: ../../view/theme/diabook/theme.php:384 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:377 +#: ../../view/theme/diabook/theme.php:591 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "Komunitní profily" -#: ../../view/theme/diabook/theme.php:405 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:398 +#: ../../view/theme/diabook/theme.php:596 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "Poslední uživatelé" -#: ../../view/theme/diabook/theme.php:434 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:427 +#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "Poslední líbí/nelíbí" -#: ../../view/theme/diabook/theme.php:479 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:472 +#: ../../view/theme/diabook/theme.php:597 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "Poslední fotografie" -#: ../../view/theme/diabook/theme.php:516 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:509 +#: ../../view/theme/diabook/theme.php:594 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "Nalézt Přátele" -#: ../../view/theme/diabook/theme.php:517 +#: ../../view/theme/diabook/theme.php:510 msgid "Local Directory" msgstr "Lokální Adresář" -#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "Podobné zájmy" -#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "Pozvat přátele" -#: ../../view/theme/diabook/theme.php:572 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:531 +#: ../../view/theme/diabook/theme.php:590 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "Earth Layers" -#: ../../view/theme/diabook/theme.php:577 +#: ../../view/theme/diabook/theme.php:536 msgid "Set zoomfactor for Earth Layers" msgstr "Nastavit faktor přiblížení pro Earth Layers" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:537 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "Nastavit zeměpistnou délku (X) pro Earth Layers" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "Nastavit zeměpistnou šířku (X) pro Earth Layers" +#: ../../view/theme/diabook/theme.php:551 #: ../../view/theme/diabook/theme.php:592 -#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "Pomoc nebo @ProNováčky ?" -#: ../../view/theme/diabook/theme.php:599 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:558 +#: ../../view/theme/diabook/theme.php:593 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "Propojené služby" -#: ../../view/theme/diabook/theme.php:606 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:565 +#: ../../view/theme/diabook/theme.php:595 msgid "Last Tweets" msgstr "Poslední tweety" -#: ../../view/theme/diabook/theme.php:609 +#: ../../view/theme/diabook/theme.php:568 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "Nastavit vyhledávací frázi na twitteru" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288 msgid "don't show" msgstr "nikdy nezobrazit" -#: ../../view/theme/diabook/theme.php:629 +#: ../../view/theme/diabook/theme.php:587 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287 msgid "show" msgstr "zobrazit" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:588 msgid "Show/hide boxes at right-hand column:" msgstr "Zobrazit/skrýt boxy na pravém sloupci:" @@ -8134,7 +8180,7 @@ msgstr "Začíná:" msgid "Finishes:" msgstr "Končí:" -#: ../../include/delivery.php:457 ../../include/notifier.php:703 +#: ../../include/delivery.php:457 ../../include/notifier.php:767 msgid "(no subject)" msgstr "(Bez předmětu)" @@ -8306,79 +8352,79 @@ msgstr "uvolněný" msgid "surprised" msgstr "překvapený" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "January" msgstr "Ledna" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "February" msgstr "Února" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "March" msgstr "Března" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "April" msgstr "Dubna" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "May" msgstr "Května" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "June" msgstr "Června" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "July" msgstr "Července" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "August" msgstr "Srpna" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "September" msgstr "Září" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "October" msgstr "Října" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "November" msgstr "Listopadu" -#: ../../include/text.php:921 +#: ../../include/text.php:919 msgid "December" msgstr "Prosinec" -#: ../../include/text.php:1007 +#: ../../include/text.php:1005 msgid "bytes" msgstr "bytů" -#: ../../include/text.php:1034 ../../include/text.php:1046 +#: ../../include/text.php:1032 ../../include/text.php:1044 msgid "Click to open/close" msgstr "Klikněte pro otevření/zavření" -#: ../../include/text.php:1219 ../../include/user.php:236 +#: ../../include/text.php:1217 ../../include/user.php:236 msgid "default" msgstr "standardní" -#: ../../include/text.php:1231 +#: ../../include/text.php:1229 msgid "Select an alternate language" msgstr "Vyběr alternativního jazyka" -#: ../../include/text.php:1441 +#: ../../include/text.php:1439 msgid "activity" msgstr "aktivita" -#: ../../include/text.php:1444 +#: ../../include/text.php:1442 msgid "post" msgstr "příspěvek" -#: ../../include/text.php:1599 +#: ../../include/text.php:1597 msgid "Item filed" msgstr "Položka vyplněna" @@ -8402,6 +8448,38 @@ msgstr "vložený obsah" msgid "Embedding disabled" msgstr "Vkládání zakázáno" +#: ../../include/uimport.php:61 +msgid "Error decoding account file" +msgstr "Chyba dekódování uživatelského účtu" + +#: ../../include/uimport.php:67 +msgid "Error! No version data in file! This is not a Friendica account file?" +msgstr "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?" + +#: ../../include/uimport.php:72 +msgid "Error! I can't import this file: DB schema version is not compatible." +msgstr "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní." + +#: ../../include/uimport.php:92 +msgid "User creation error" +msgstr "Chyba vytváření uživatele" + +#: ../../include/uimport.php:110 +msgid "User profile creation error" +msgstr "Chyba vytváření uživatelského účtu" + +#: ../../include/uimport.php:155 +#, php-format +msgid "%d contact not imported" +msgid_plural "%d contacts not imported" +msgstr[0] "%d kontakt nenaimporován" +msgstr[1] "%d kontaktů nenaimporováno" +msgstr[2] "%d kontakty nenaimporovány" + +#: ../../include/uimport.php:233 +msgid "Done. You can now login with your username and password" +msgstr "Hotovo. Nyní se můžete přihlásit se svými uživatelským účtem a heslem" + #: ../../include/group.php:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -8433,7 +8511,7 @@ msgstr "Vytvořit novou skupinu" msgid "Contacts not in any group" msgstr "Kontakty, které nejsou v žádné skupině" -#: ../../include/nav.php:46 ../../boot.php:922 +#: ../../include/nav.php:46 ../../boot.php:926 msgid "Logout" msgstr "Odhlásit se" @@ -8441,7 +8519,7 @@ msgstr "Odhlásit se" msgid "End this session" msgstr "Konec této relace" -#: ../../include/nav.php:49 ../../boot.php:1677 +#: ../../include/nav.php:49 ../../boot.php:1687 msgid "Status" msgstr "Stav" @@ -8521,11 +8599,11 @@ msgstr "Spravovat" msgid "Manage other pages" msgstr "Spravovat jiné stránky" -#: ../../include/nav.php:138 ../../boot.php:1197 +#: ../../include/nav.php:138 ../../boot.php:1201 msgid "Profiles" msgstr "Profily" -#: ../../include/nav.php:138 ../../boot.php:1197 +#: ../../include/nav.php:138 ../../boot.php:1201 msgid "Manage/edit profiles" msgstr "Spravovat/upravit profily" @@ -8672,17 +8750,17 @@ msgstr "sekund" msgid "%1$d %2$s ago" msgstr "před %1$d %2$s" -#: ../../include/datetime.php:472 ../../include/items.php:1688 +#: ../../include/datetime.php:472 ../../include/items.php:1689 #, php-format msgid "%s's birthday" msgstr "%s má narozeniny" -#: ../../include/datetime.php:473 ../../include/items.php:1689 +#: ../../include/datetime.php:473 ../../include/items.php:1690 #, php-format msgid "Happy Birthday %s" msgstr "Veselé narozeniny %s" -#: ../../include/onepoll.php:409 +#: ../../include/onepoll.php:414 msgid "From: " msgstr "Od:" @@ -8952,15 +9030,15 @@ msgstr "Nepodařilo se získat kontaktní informace." msgid "following" msgstr "následující" -#: ../../include/items.php:3299 +#: ../../include/items.php:3357 msgid "A new person is sharing with you at " msgstr "Nový člověk si s vámi sdílí na" -#: ../../include/items.php:3299 +#: ../../include/items.php:3357 msgid "You have a new follower at " msgstr "Máte nového následovníka na" -#: ../../include/items.php:3980 +#: ../../include/items.php:4038 msgid "Archives" msgstr "Archív" @@ -9050,38 +9128,38 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním." -#: ../../include/Contact.php:111 +#: ../../include/Contact.php:115 msgid "stopped following" msgstr "následování zastaveno" -#: ../../include/Contact.php:220 ../../include/conversation.php:790 +#: ../../include/Contact.php:225 ../../include/conversation.php:795 msgid "Poke" msgstr "Šťouchnout" -#: ../../include/Contact.php:221 ../../include/conversation.php:784 +#: ../../include/Contact.php:226 ../../include/conversation.php:789 msgid "View Status" msgstr "Zobrazit Status" -#: ../../include/Contact.php:222 ../../include/conversation.php:785 +#: ../../include/Contact.php:227 ../../include/conversation.php:790 msgid "View Profile" msgstr "Zobrazit Profil" -#: ../../include/Contact.php:223 ../../include/conversation.php:786 +#: ../../include/Contact.php:228 ../../include/conversation.php:791 msgid "View Photos" msgstr "Zobrazit Fotky" -#: ../../include/Contact.php:224 ../../include/Contact.php:237 -#: ../../include/conversation.php:787 +#: ../../include/Contact.php:229 ../../include/Contact.php:242 +#: ../../include/conversation.php:792 msgid "Network Posts" msgstr "Zobrazit Příspěvky sítě" -#: ../../include/Contact.php:225 ../../include/Contact.php:237 -#: ../../include/conversation.php:788 +#: ../../include/Contact.php:230 ../../include/Contact.php:242 +#: ../../include/conversation.php:793 msgid "Edit Contact" msgstr "Editovat Kontakty" -#: ../../include/Contact.php:226 ../../include/Contact.php:237 -#: ../../include/conversation.php:789 +#: ../../include/Contact.php:231 ../../include/Contact.php:242 +#: ../../include/conversation.php:794 msgid "Send PM" msgstr "Poslat soukromou zprávu" @@ -9099,86 +9177,90 @@ msgstr "příspěvek/položka" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "uživatel %1$s označil %2$s's %3$s jako oblíbeného" -#: ../../include/conversation.php:594 ../../object/Item.php:218 +#: ../../include/conversation.php:599 ../../object/Item.php:218 msgid "Categories:" msgstr "Kategorie:" -#: ../../include/conversation.php:595 ../../object/Item.php:219 +#: ../../include/conversation.php:600 ../../object/Item.php:219 msgid "Filed under:" msgstr "Vyplněn pod:" -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:685 msgid "remove" msgstr "odstranit" -#: ../../include/conversation.php:684 +#: ../../include/conversation.php:689 msgid "Delete Selected Items" msgstr "Smazat vybrané položky" -#: ../../include/conversation.php:783 +#: ../../include/conversation.php:788 msgid "Follow Thread" msgstr "Následovat vlákno" -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:857 #, php-format msgid "%s likes this." msgstr "%s se to líbí." -#: ../../include/conversation.php:852 +#: ../../include/conversation.php:857 #, php-format msgid "%s doesn't like this." msgstr "%s se to nelíbí." -#: ../../include/conversation.php:856 +#: ../../include/conversation.php:861 #, php-format msgid "%2$d people like this." msgstr "%2$d lidem se to líbí." -#: ../../include/conversation.php:858 +#: ../../include/conversation.php:863 #, php-format msgid "%2$d people don't like this." msgstr "%2$d lidem se to nelíbí." -#: ../../include/conversation.php:864 +#: ../../include/conversation.php:869 msgid "and" msgstr "a" -#: ../../include/conversation.php:867 +#: ../../include/conversation.php:872 #, php-format msgid ", and %d other people" msgstr ", a %d dalších lidí" -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:873 #, php-format msgid "%s like this." msgstr "%s se to líbí." -#: ../../include/conversation.php:868 +#: ../../include/conversation.php:873 #, php-format msgid "%s don't like this." msgstr "%s se to nelíbí." -#: ../../include/conversation.php:892 ../../include/conversation.php:909 +#: ../../include/conversation.php:897 ../../include/conversation.php:915 msgid "Visible to everybody" msgstr "Viditelné pro všechny" -#: ../../include/conversation.php:894 ../../include/conversation.php:911 +#: ../../include/conversation.php:899 ../../include/conversation.php:917 msgid "Please enter a video link/URL:" msgstr "Prosím zadejte URL adresu videa:" -#: ../../include/conversation.php:895 ../../include/conversation.php:912 +#: ../../include/conversation.php:900 ../../include/conversation.php:918 msgid "Please enter an audio link/URL:" msgstr "Prosím zadejte URL adresu zvukového záznamu:" -#: ../../include/conversation.php:896 ../../include/conversation.php:913 +#: ../../include/conversation.php:901 ../../include/conversation.php:919 msgid "Tag term:" msgstr "Štítek:" -#: ../../include/conversation.php:898 ../../include/conversation.php:915 +#: ../../include/conversation.php:903 ../../include/conversation.php:921 msgid "Where are you right now?" msgstr "Kde právě jste?" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:904 +msgid "Delete item(s)?" +msgstr "Smazat položku(y)?" + +#: ../../include/conversation.php:983 msgid "permissions" msgstr "oprávnění" @@ -9194,101 +9276,101 @@ msgstr "Tato akce překročí limit nastavené Vaším předplatným." msgid "This action is not available under your subscription plan." msgstr "Tato akce není v rámci Vašeho předplatného dostupná." -#: ../../boot.php:584 +#: ../../boot.php:588 msgid "Delete this item?" msgstr "Odstranit tuto položku?" -#: ../../boot.php:587 +#: ../../boot.php:591 msgid "show fewer" msgstr "zobrazit méně" -#: ../../boot.php:794 +#: ../../boot.php:798 #, php-format msgid "Update %s failed. See error logs." msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb." -#: ../../boot.php:796 +#: ../../boot.php:800 #, php-format msgid "Update Error at %s" msgstr "Chyba aktualizace na %s" -#: ../../boot.php:897 +#: ../../boot.php:901 msgid "Create a New Account" msgstr "Vytvořit nový účet" -#: ../../boot.php:925 +#: ../../boot.php:929 msgid "Nickname or Email address: " msgstr "Přezdívka nebo e-mailová adresa:" -#: ../../boot.php:926 +#: ../../boot.php:930 msgid "Password: " msgstr "Heslo: " -#: ../../boot.php:929 +#: ../../boot.php:933 msgid "Or login using OpenID: " msgstr "Nebo přihlášení pomocí OpenID: " -#: ../../boot.php:935 +#: ../../boot.php:939 msgid "Forgot your password?" msgstr "Zapomněli jste své heslo?" -#: ../../boot.php:1046 +#: ../../boot.php:1050 msgid "Requested account is not available." msgstr "Požadovaný účet není dostupný." -#: ../../boot.php:1123 +#: ../../boot.php:1127 msgid "Edit profile" msgstr "Upravit profil" -#: ../../boot.php:1189 +#: ../../boot.php:1193 msgid "Message" msgstr "Zpráva" -#: ../../boot.php:1311 ../../boot.php:1397 +#: ../../boot.php:1315 ../../boot.php:1401 msgid "g A l F d" msgstr "g A l F d" -#: ../../boot.php:1312 ../../boot.php:1398 +#: ../../boot.php:1316 ../../boot.php:1402 msgid "F d" msgstr "d. F" -#: ../../boot.php:1357 ../../boot.php:1438 +#: ../../boot.php:1361 ../../boot.php:1442 msgid "[today]" msgstr "[Dnes]" -#: ../../boot.php:1369 +#: ../../boot.php:1373 msgid "Birthday Reminders" msgstr "Připomínka narozenin" -#: ../../boot.php:1370 +#: ../../boot.php:1374 msgid "Birthdays this week:" msgstr "Narozeniny tento týden:" -#: ../../boot.php:1431 +#: ../../boot.php:1435 msgid "[No description]" msgstr "[Žádný popis]" -#: ../../boot.php:1449 +#: ../../boot.php:1453 msgid "Event Reminders" msgstr "Připomenutí událostí" -#: ../../boot.php:1450 +#: ../../boot.php:1454 msgid "Events this week:" msgstr "Události tohoto týdne:" -#: ../../boot.php:1680 +#: ../../boot.php:1690 msgid "Status Messages and Posts" msgstr "Statusové zprávy a příspěvky " -#: ../../boot.php:1687 +#: ../../boot.php:1697 msgid "Profile Details" msgstr "Detaily profilu" -#: ../../boot.php:1704 +#: ../../boot.php:1714 msgid "Events and Calendar" msgstr "Události a kalendář" -#: ../../boot.php:1711 +#: ../../boot.php:1721 msgid "Only You Can See This" msgstr "Toto můžete vidět jen Vy" diff --git a/view/cs/strings.php b/view/cs/strings.php index 72fc58bcbf..26ade31633 100644 --- a/view/cs/strings.php +++ b/view/cs/strings.php @@ -58,7 +58,7 @@ $a->strings["Tag removed"] = "Štítek odstraněn"; $a->strings["Remove Item Tag"] = "Odebrat štítek položky"; $a->strings["Select a tag to remove: "] = "Vyberte štítek k odebrání: "; $a->strings["Remove"] = "Odstranit"; -$a->strings["%s welcomes %s"] = "%s vítá %s "; +$a->strings["%1\$s welcomes %2\$s"] = "%1\$s vítá %2\$s"; $a->strings["Authorize application connection"] = "Povolit připojení aplikacím"; $a->strings["Return to your app and insert this Securty Code:"] = "Vraťte se do vaší aplikace a zadejte tento bezpečnostní kód:"; $a->strings["Please login to continue."] = "Pro pokračování se prosím přihlaste."; @@ -74,9 +74,8 @@ $a->strings["Profile Photos"] = "Profilové fotografie"; $a->strings["Album not found."] = "Album nenalezeno."; $a->strings["Delete Album"] = "Smazat album"; $a->strings["Delete Photo"] = "Smazat fotografii"; -$a->strings["was tagged in a"] = "štítek byl přidán v"; -$a->strings["photo"] = "fotografie"; -$a->strings["by"] = "od"; +$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s byl označen v %2\$s uživatelem %3\$s"; +$a->strings["a photo"] = "fotografie"; $a->strings["Image exceeds size limit of "] = "Velikost obrázku překračuje limit velikosti"; $a->strings["Image file is empty."] = "Soubor obrázku je prázdný."; $a->strings["Unable to process image."] = "Obrázek není možné zprocesovat"; @@ -200,6 +199,18 @@ $a->strings["Diaspora"] = "Diaspora"; $a->strings[" - please do not use this form. Instead, enter %s into your Diaspora search bar."] = " - prosím nepoužívejte tento formulář. Místo toho zadejte %s do Vašeho Diaspora vyhledávacího pole."; $a->strings["Your Identity Address:"] = "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"register_argc_argv\"."; $a->strings["Submit Request"] = "Odeslat žádost"; +$a->strings["Account settings"] = "Nastavení účtu"; +$a->strings["Display settings"] = "Nastavení zobrazení"; +$a->strings["Connector settings"] = "Nastavení konektoru"; +$a->strings["Plugin settings"] = "Nastavení pluginu"; +$a->strings["Connected apps"] = "Propojené aplikace"; +$a->strings["Export personal data"] = "Export osobních údajů"; +$a->strings["Remove account"] = "Odstranit účet"; +$a->strings["Settings"] = "Nastavení"; +$a->strings["Export account"] = "Exportovat účet"; +$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření zálohy svého účtu a/nebo k přesunu na jiný server."; +$a->strings["Export all"] = "Exportovat vše"; +$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportujte své informace k účtu, kontakty a vše své položky jako json. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu(fotografie se neexportují)"; $a->strings["Friendica Social Communications Server - Setup"] = "Friendica Sociální komunkační server - Nastavení"; $a->strings["Could not connect to database."] = "Nelze se připojit k databázi."; $a->strings["Could not create table."] = "Nelze vytvořit tabulku."; @@ -256,7 +267,7 @@ $a->strings["

What next

"] = "

Co dál

"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno."; $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["Time Conversion"] = "Časová konverze"; -$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendika poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem."; +$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přáteli v neznámých časových zónách"; $a->strings["UTC time: %s"] = "UTC čas: %s"; $a->strings["Current timezone: %s"] = "Aktuální časové pásmo: %s"; $a->strings["Converted localtime: %s"] = "Převedený lokální čas : %s"; @@ -446,14 +457,6 @@ $a->strings["Forgot your Password?"] = "Zapomněli jste heslo?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Zadejte svůj e-mailovou adresu a odešlete žádost o zaslání Vašeho nového hesla. Poté zkontrolujte svůj e-mail pro další instrukce."; $a->strings["Nickname or Email: "] = "Přezdívka nebo e-mail: "; $a->strings["Reset"] = "Reset"; -$a->strings["Account settings"] = "Nastavení účtu"; -$a->strings["Display settings"] = "Nastavení zobrazení"; -$a->strings["Connector settings"] = "Nastavení konektoru"; -$a->strings["Plugin settings"] = "Nastavení pluginu"; -$a->strings["Connected apps"] = "Propojené aplikace"; -$a->strings["Export personal data"] = "Export osobních údajů"; -$a->strings["Remove account"] = "Odstranit účet"; -$a->strings["Settings"] = "Nastavení"; $a->strings["Missing some important data!"] = "Chybí některé důležité údaje!"; $a->strings["Update"] = "Aktualizace"; $a->strings["Failed to connect with email account using the settings provided."] = "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení."; @@ -605,6 +608,11 @@ $a->strings["Private messages to this person are at risk of public disclosure."] $a->strings["Invalid contact."] = "Neplatný kontakt."; $a->strings["Personal Notes"] = "Osobní poznámky"; $a->strings["Save"] = "Uložit"; +$a->strings["Import"] = "Import"; +$a->strings["Move account"] = "Přesunout účet"; +$a->strings["You can move here an account from another Friendica server.
\r\n You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Zde si můžete přesunout účet z jiného serveru Friendika.
\n Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.
\n Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory"; +$a->strings["Account file"] = "Soubor s účtem"; +$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\""; $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena."; $a->strings["No recipient selected."] = "Nevybrán příjemce."; $a->strings["Unable to check your home location."] = "Nebylo možné zjistit Vaši domácí lokaci."; @@ -694,6 +702,7 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y $a->strings["Choose a nickname: "] = "Vyberte přezdívku:"; $a->strings["Register"] = "Registrovat"; $a->strings["People Search"] = "Vyhledávání lidí"; +$a->strings["photo"] = "fotografie"; $a->strings["status"] = "Stav"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s má rád %2\$s' na %3\$s"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s nemá rád %2\$s na %3\$s"; @@ -1806,6 +1815,17 @@ $a->strings["Attachments:"] = "Přílohy:"; $a->strings["view full size"] = "zobrazit v plné velikosti"; $a->strings["Embedded content"] = "vložený obsah"; $a->strings["Embedding disabled"] = "Vkládání zakázáno"; +$a->strings["Error decoding account file"] = "Chyba dekódování uživatelského účtu"; +$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?"; +$a->strings["Error! I can't import this file: DB schema version is not compatible."] = "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní."; +$a->strings["User creation error"] = "Chyba vytváření uživatele"; +$a->strings["User profile creation error"] = "Chyba vytváření uživatelského účtu"; +$a->strings["%d contact not imported"] = array( + 0 => "%d kontakt nenaimporován", + 1 => "%d kontaktů nenaimporováno", + 2 => "%d kontakty nenaimporovány", +); +$a->strings["Done. You can now login with your username and password"] = "Hotovo. Nyní se můžete přihlásit se svými uživatelským účtem a heslem"; $a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Dříve smazaná skupina s tímto jménem byla obnovena. Stávající oprávnění může ovlivnit tuto skupinu a její budoucí členy. Pokud to není to, co jste chtěli, vytvořte, prosím, další skupinu s jiným názvem."; $a->strings["Default privacy group for new contacts"] = "Defaultní soukromá skrupina pro nové kontakty."; $a->strings["Everybody"] = "Všichni"; @@ -1986,6 +2006,7 @@ $a->strings["Please enter a video link/URL:"] = "Prosím zadejte URL adresu vide $a->strings["Please enter an audio link/URL:"] = "Prosím zadejte URL adresu zvukového záznamu:"; $a->strings["Tag term:"] = "Štítek:"; $a->strings["Where are you right now?"] = "Kde právě jste?"; +$a->strings["Delete item(s)?"] = "Smazat položku(y)?"; $a->strings["permissions"] = "oprávnění"; $a->strings["Click here to upgrade."] = "Klikněte zde pro aktualizaci."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Tato akce překročí limit nastavené Vaším předplatným."; diff --git a/view/de/messages.po b/view/de/messages.po index 827318d642..0f0c64da7c 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-11-03 15:31-0700\n" -"PO-Revision-Date: 2012-11-05 06:28+0000\n" +"POT-Creation-Date: 2012-11-08 10:00-0800\n" +"PO-Revision-Date: 2012-11-10 07:33+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/notifications.php:66 ../../mod/contacts.php:146 #: ../../mod/settings.php:86 ../../mod/settings.php:525 #: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6 -#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 +#: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 @@ -74,7 +74,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159 #: ../../addon/fbpost/fbpost.php:165 -#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914 +#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510 #: ../../addon.old/facebook/facebook.php:516 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165 @@ -150,7 +150,7 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/photos.php:1406 ../../mod/photos.php:1450 #: ../../mod/photos.php:1522 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:693 ../../mod/contacts.php:348 +#: ../../mod/content.php:693 ../../mod/contacts.php:351 #: ../../mod/settings.php:543 ../../mod/settings.php:697 #: ../../mod/settings.php:769 ../../mod/settings.php:976 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294 @@ -302,7 +302,7 @@ msgid "link to source" msgstr "Link zum Originalbeitrag" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:52 ../../boot.php:1701 +#: ../../include/nav.php:52 ../../boot.php:1711 msgid "Events" msgstr "Veranstaltungen" @@ -360,7 +360,7 @@ msgstr "Beschreibung" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1237 +#: ../../boot.php:1241 msgid "Location:" msgstr "Ort:" @@ -428,7 +428,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak #: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:236 +#: ../../mod/settings.php:967 ../../mod/register.php:237 #: ../../mod/profiles.php:574 msgid "Yes" msgstr "Ja" @@ -440,12 +440,12 @@ msgstr "Ja" #: ../../mod/settings.php:927 ../../mod/settings.php:933 #: ../../mod/settings.php:963 ../../mod/settings.php:964 #: ../../mod/settings.php:965 ../../mod/settings.php:966 -#: ../../mod/settings.php:967 ../../mod/register.php:237 +#: ../../mod/settings.php:967 ../../mod/register.php:238 #: ../../mod/profiles.php:575 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:50 ../../boot.php:1694 +#: ../../mod/photos.php:50 ../../boot.php:1704 msgid "Photo Albums" msgstr "Fotoalben" @@ -673,7 +673,7 @@ msgid "This is you" msgstr "Das bist du" #: ../../mod/photos.php:1405 ../../mod/photos.php:1449 -#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:585 +#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589 #: ../../object/Item.php:558 msgid "Comment" msgstr "Kommentar" @@ -964,7 +964,7 @@ msgstr "Bitte bestätige deine Kontaktanfrage bei %s." msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293 +#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" @@ -1036,6 +1036,65 @@ msgstr "Adresse deines Profils:" msgid "Submit Request" msgstr "Anfrage abschicken" +#: ../../mod/uexport.php:10 ../../mod/settings.php:30 +#: ../../include/nav.php:137 +msgid "Account settings" +msgstr "Kontoeinstellungen" + +#: ../../mod/uexport.php:15 ../../mod/settings.php:35 +msgid "Display settings" +msgstr "Anzeige-Einstellungen" + +#: ../../mod/uexport.php:21 ../../mod/settings.php:41 +msgid "Connector settings" +msgstr "Connector-Einstellungen" + +#: ../../mod/uexport.php:26 ../../mod/settings.php:46 +msgid "Plugin settings" +msgstr "Plugin-Einstellungen" + +#: ../../mod/uexport.php:31 ../../mod/settings.php:51 +msgid "Connected apps" +msgstr "Verbundene Programme" + +#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56 +msgid "Export personal data" +msgstr "Persönliche Daten exportieren" + +#: ../../mod/uexport.php:41 ../../mod/settings.php:61 +msgid "Remove account" +msgstr "Konto löschen" + +#: ../../mod/uexport.php:49 ../../mod/settings.php:69 +#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990 +#: ../../addon/dav/friendica/layout.fnk.php:225 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 +#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 +#: ../../addon.old/mathjax/mathjax.php:36 +msgid "Settings" +msgstr "Einstellungen" + +#: ../../mod/uexport.php:73 +msgid "Export account" +msgstr "Account exportieren" + +#: ../../mod/uexport.php:73 +msgid "" +"Export your account info and contacts. Use this to make a backup of your " +"account and/or to move it to another server." +msgstr "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen." + +#: ../../mod/uexport.php:74 +msgid "Export all" +msgstr "Alles exportieren" + +#: ../../mod/uexport.php:74 +msgid "" +"Export your accout info, contacts and all your items as json. Could be a " +"very big file, and could take a lot of time. Use this to make a full backup " +"of your account (photos are not exported)" +msgstr "Exportiere deine 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 (Photos werden nicht exportiert)." + #: ../../mod/install.php:117 msgid "Friendica Social Communications Server - Setup" msgstr "Friendica-Server für soziale Netzwerke – Setup" @@ -1357,7 +1416,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1175 +#: ../../include/contact_widgets.php:9 ../../boot.php:1179 msgid "Connect" msgstr "Verbinden" @@ -1424,7 +1483,7 @@ msgstr[1] "Kommentar" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:195 ../../boot.php:586 +#: ../../include/contact_widgets.php:195 ../../boot.php:590 #: ../../object/Item.php:280 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" @@ -1514,7 +1573,7 @@ msgstr "Wall-to-Wall" msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1530,8 +1589,8 @@ msgid "Discard" msgstr "Verwerfen" #: ../../mod/notifications.php:51 ../../mod/notifications.php:163 -#: ../../mod/notifications.php:209 ../../mod/contacts.php:321 -#: ../../mod/contacts.php:375 +#: ../../mod/notifications.php:209 ../../mod/contacts.php:324 +#: ../../mod/contacts.php:378 msgid "Ignore" msgstr "Ignorieren" @@ -1583,7 +1642,7 @@ msgid "suggested by %s" msgstr "vorgeschlagen von %s" #: ../../mod/notifications.php:156 ../../mod/notifications.php:203 -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:384 msgid "Hide this contact from others" msgstr "Verberge diesen Kontakt vor anderen" @@ -1733,279 +1792,279 @@ msgstr "Kontakt wurde ignoriert" msgid "Contact has been unignored" msgstr "Kontakt wird nicht mehr ignoriert" -#: ../../mod/contacts.php:216 +#: ../../mod/contacts.php:219 msgid "Contact has been archived" msgstr "Kontakt wurde archiviert" -#: ../../mod/contacts.php:216 +#: ../../mod/contacts.php:219 msgid "Contact has been unarchived" msgstr "Kontakt wurde aus dem Archiv geholt" -#: ../../mod/contacts.php:229 +#: ../../mod/contacts.php:232 msgid "Contact has been removed." msgstr "Kontakt wurde entfernt." -#: ../../mod/contacts.php:263 +#: ../../mod/contacts.php:266 #, php-format msgid "You are mutual friends with %s" msgstr "Du hast mit %s eine beidseitige Freundschaft" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:270 #, php-format msgid "You are sharing with %s" msgstr "Du teilst mit %s" -#: ../../mod/contacts.php:272 +#: ../../mod/contacts.php:275 #, php-format msgid "%s is sharing with you" msgstr "%s teilt mit Dir" -#: ../../mod/contacts.php:289 +#: ../../mod/contacts.php:292 msgid "Private communications are not available for this contact." msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar." -#: ../../mod/contacts.php:292 +#: ../../mod/contacts.php:295 msgid "Never" msgstr "Niemals" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:299 msgid "(Update was successful)" msgstr "(Aktualisierung war erfolgreich)" -#: ../../mod/contacts.php:296 +#: ../../mod/contacts.php:299 msgid "(Update was not successful)" msgstr "(Aktualisierung war nicht erfolgreich)" -#: ../../mod/contacts.php:298 +#: ../../mod/contacts.php:301 msgid "Suggest friends" msgstr "Kontakte vorschlagen" -#: ../../mod/contacts.php:302 +#: ../../mod/contacts.php:305 #, php-format msgid "Network type: %s" msgstr "Netzwerktyp: %s" -#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190 +#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "%d gemeinsamer Kontakt" msgstr[1] "%d gemeinsame Kontakte" -#: ../../mod/contacts.php:310 +#: ../../mod/contacts.php:313 msgid "View all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 #: ../../mod/admin.php:698 msgid "Unblock" msgstr "Entsperren" -#: ../../mod/contacts.php:315 ../../mod/contacts.php:374 +#: ../../mod/contacts.php:318 ../../mod/contacts.php:377 #: ../../mod/admin.php:697 msgid "Block" msgstr "Sperren" -#: ../../mod/contacts.php:318 +#: ../../mod/contacts.php:321 msgid "Toggle Blocked status" msgstr "Geblockt-Status ein-/ausschalten" -#: ../../mod/contacts.php:321 ../../mod/contacts.php:375 +#: ../../mod/contacts.php:324 ../../mod/contacts.php:378 msgid "Unignore" msgstr "Ignorieren aufheben" -#: ../../mod/contacts.php:324 +#: ../../mod/contacts.php:327 msgid "Toggle Ignored status" msgstr "Ignoriert-Status ein-/ausschalten" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:331 msgid "Unarchive" msgstr "Aus Archiv zurückholen" -#: ../../mod/contacts.php:328 +#: ../../mod/contacts.php:331 msgid "Archive" msgstr "Archivieren" -#: ../../mod/contacts.php:331 +#: ../../mod/contacts.php:334 msgid "Toggle Archive status" msgstr "Archiviert-Status ein-/ausschalten" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:337 msgid "Repair" msgstr "Reparieren" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:340 msgid "Advanced Contact Settings" msgstr "Fortgeschrittene Kontakteinstellungen" -#: ../../mod/contacts.php:343 +#: ../../mod/contacts.php:346 msgid "Communications lost with this contact!" msgstr "Verbindungen mit diesem Kontakt verloren!" -#: ../../mod/contacts.php:346 +#: ../../mod/contacts.php:349 msgid "Contact Editor" msgstr "Kontakt Editor" -#: ../../mod/contacts.php:349 +#: ../../mod/contacts.php:352 msgid "Profile Visibility" msgstr "Profil-Sichtbarkeit" -#: ../../mod/contacts.php:350 +#: ../../mod/contacts.php:353 #, 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:351 +#: ../../mod/contacts.php:354 msgid "Contact Information / Notes" msgstr "Kontakt Informationen / Notizen" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:355 msgid "Edit contact notes" msgstr "Notizen zum Kontakt bearbeiten" -#: ../../mod/contacts.php:357 ../../mod/contacts.php:549 +#: ../../mod/contacts.php:360 ../../mod/contacts.php:552 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "Besuche %ss Profil [%s]" -#: ../../mod/contacts.php:358 +#: ../../mod/contacts.php:361 msgid "Block/Unblock contact" msgstr "Kontakt blockieren/freischalten" -#: ../../mod/contacts.php:359 +#: ../../mod/contacts.php:362 msgid "Ignore contact" msgstr "Ignoriere den Kontakt" -#: ../../mod/contacts.php:360 +#: ../../mod/contacts.php:363 msgid "Repair URL settings" msgstr "URL Einstellungen reparieren" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:364 msgid "View conversations" msgstr "Unterhaltungen anzeigen" -#: ../../mod/contacts.php:363 +#: ../../mod/contacts.php:366 msgid "Delete contact" msgstr "Lösche den Kontakt" -#: ../../mod/contacts.php:367 +#: ../../mod/contacts.php:370 msgid "Last update:" msgstr "letzte Aktualisierung:" -#: ../../mod/contacts.php:369 +#: ../../mod/contacts.php:372 msgid "Update public posts" msgstr "Öffentliche Beiträge aktualisieren" -#: ../../mod/contacts.php:371 ../../mod/admin.php:1170 +#: ../../mod/contacts.php:374 ../../mod/admin.php:1170 msgid "Update now" msgstr "Jetzt aktualisieren" -#: ../../mod/contacts.php:378 +#: ../../mod/contacts.php:381 msgid "Currently blocked" msgstr "Derzeit geblockt" -#: ../../mod/contacts.php:379 +#: ../../mod/contacts.php:382 msgid "Currently ignored" msgstr "Derzeit ignoriert" -#: ../../mod/contacts.php:380 +#: ../../mod/contacts.php:383 msgid "Currently archived" msgstr "Momentan archiviert" -#: ../../mod/contacts.php:381 +#: ../../mod/contacts.php:384 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Antworten/Likes auf deine öffentlichen Beiträge könnten weiterhin sichtbar sein" -#: ../../mod/contacts.php:434 +#: ../../mod/contacts.php:437 msgid "Suggestions" msgstr "Kontaktvorschläge" -#: ../../mod/contacts.php:437 +#: ../../mod/contacts.php:440 msgid "Suggest potential friends" msgstr "Freunde vorschlagen" -#: ../../mod/contacts.php:440 ../../mod/group.php:191 +#: ../../mod/contacts.php:443 ../../mod/group.php:191 msgid "All Contacts" msgstr "Alle Kontakte" -#: ../../mod/contacts.php:443 +#: ../../mod/contacts.php:446 msgid "Show all contacts" msgstr "Alle Kontakte anzeigen" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:449 msgid "Unblocked" msgstr "Ungeblockt" -#: ../../mod/contacts.php:449 +#: ../../mod/contacts.php:452 msgid "Only show unblocked contacts" msgstr "Nur nicht-blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:453 +#: ../../mod/contacts.php:456 msgid "Blocked" msgstr "Geblockt" -#: ../../mod/contacts.php:456 +#: ../../mod/contacts.php:459 msgid "Only show blocked contacts" msgstr "Nur blockierte Kontakte anzeigen" -#: ../../mod/contacts.php:460 +#: ../../mod/contacts.php:463 msgid "Ignored" msgstr "Ignoriert" -#: ../../mod/contacts.php:463 +#: ../../mod/contacts.php:466 msgid "Only show ignored contacts" msgstr "Nur ignorierte Kontakte anzeigen" -#: ../../mod/contacts.php:467 +#: ../../mod/contacts.php:470 msgid "Archived" msgstr "Archiviert" -#: ../../mod/contacts.php:470 +#: ../../mod/contacts.php:473 msgid "Only show archived contacts" msgstr "Nur archivierte Kontakte anzeigen" -#: ../../mod/contacts.php:474 +#: ../../mod/contacts.php:477 msgid "Hidden" msgstr "Verborgen" -#: ../../mod/contacts.php:477 +#: ../../mod/contacts.php:480 msgid "Only show hidden contacts" msgstr "Nur verborgene Kontakte anzeigen" -#: ../../mod/contacts.php:525 +#: ../../mod/contacts.php:528 msgid "Mutual Friendship" msgstr "Beidseitige Freundschaft" -#: ../../mod/contacts.php:529 +#: ../../mod/contacts.php:532 msgid "is a fan of yours" msgstr "ist ein Fan von dir" -#: ../../mod/contacts.php:533 +#: ../../mod/contacts.php:536 msgid "you are a fan of" msgstr "du bist Fan von" -#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Kontakt bearbeiten" -#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88 +#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88 #: ../../include/nav.php:139 msgid "Contacts" msgstr "Kontakte" -#: ../../mod/contacts.php:575 +#: ../../mod/contacts.php:578 msgid "Search your contacts" msgstr "Suche in deinen Kontakten" -#: ../../mod/contacts.php:576 ../../mod/directory.php:59 +#: ../../mod/contacts.php:579 ../../mod/directory.php:59 msgid "Finding: " msgstr "Funde: " -#: ../../mod/contacts.php:577 ../../mod/directory.php:61 +#: ../../mod/contacts.php:580 ../../mod/directory.php:61 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "Finde" @@ -2024,13 +2083,13 @@ msgid "Password reset requested at %s" msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:90 ../../mod/register.php:144 +#: ../../mod/register.php:91 ../../mod/register.php:145 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302 -#: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359 +#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2044,7 +2103,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:83 ../../boot.php:936 +#: ../../mod/lostpass.php:83 ../../boot.php:940 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -2088,43 +2147,6 @@ msgstr "Spitzname oder E-Mail:" msgid "Reset" msgstr "Zurücksetzen" -#: ../../mod/settings.php:30 ../../include/nav.php:137 -msgid "Account settings" -msgstr "Kontoeinstellungen" - -#: ../../mod/settings.php:35 -msgid "Display settings" -msgstr "Anzeige-Einstellungen" - -#: ../../mod/settings.php:41 -msgid "Connector settings" -msgstr "Connector-Einstellungen" - -#: ../../mod/settings.php:46 -msgid "Plugin settings" -msgstr "Plugin-Einstellungen" - -#: ../../mod/settings.php:51 -msgid "Connected apps" -msgstr "Verbundene Programme" - -#: ../../mod/settings.php:56 -msgid "Export personal data" -msgstr "Persönliche Daten exportieren" - -#: ../../mod/settings.php:61 -msgid "Remove account" -msgstr "Konto löschen" - -#: ../../mod/settings.php:69 ../../mod/newmember.php:22 -#: ../../mod/admin.php:785 ../../mod/admin.php:990 -#: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614 -#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225 -#: ../../addon.old/mathjax/mathjax.php:36 -msgid "Settings" -msgstr "Einstellungen" - #: ../../mod/settings.php:113 msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" @@ -2735,7 +2757,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1708 +#: ../../mod/notes.php:44 ../../boot.php:1718 msgid "Personal Notes" msgstr "Persönliche Notizen" @@ -2753,6 +2775,31 @@ msgstr "Persönliche Notizen" msgid "Save" msgstr "Speichern" +#: ../../mod/uimport.php:41 +msgid "Import" +msgstr "Import" + +#: ../../mod/uimport.php:43 +msgid "Move account" +msgstr "Account umziehen" + +#: ../../mod/uimport.php:44 +msgid "" +"You can move here an account from another Friendica server.
\r\n" +" You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n" +" This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora" +msgstr "Du kannst deinen Account auf einen anderen Friendica Server umziehen.
Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.
Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden." + +#: ../../mod/uimport.php:47 +msgid "Account file" +msgstr "Account Datei" + +#: ../../mod/uimport.php:47 +msgid "" +"To export your accont, go to \"Settings->Export your porsonal data\" and " +"select \"Export account\"" +msgstr "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"" + #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112 #, php-format msgid "Number of daily wall messages for %s exceeded. Message failed." @@ -2867,7 +2914,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1684 +#: ../../boot.php:1694 msgid "Profile" msgstr "Profil" @@ -3094,91 +3141,91 @@ msgstr "Keine Kontakte." msgid "View Contacts" msgstr "Kontakte anzeigen" -#: ../../mod/register.php:88 ../../mod/regmod.php:52 +#: ../../mod/register.php:89 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "Details der Registration von %s" -#: ../../mod/register.php:96 +#: ../../mod/register.php:97 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 msgid "Failed to send email message. Here is the message that failed." msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte." -#: ../../mod/register.php:105 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "Deine Registrierung konnte nicht verarbeitet werden." -#: ../../mod/register.php:142 +#: ../../mod/register.php:143 #, php-format msgid "Registration request at %s" msgstr "Registrierungsanfrage auf %s" -#: ../../mod/register.php:151 +#: ../../mod/register.php:152 msgid "Your registration is pending approval by the site owner." msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." -#: ../../mod/register.php:189 +#: ../../mod/register.php:190 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:217 +#: ../../mod/register.php:218 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:218 +#: ../../mod/register.php:219 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:219 +#: ../../mod/register.php:220 msgid "Your OpenID (optional): " msgstr "Deine OpenID (optional): " -#: ../../mod/register.php:233 +#: ../../mod/register.php:234 msgid "Include your profile in member directory?" msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?" -#: ../../mod/register.php:255 +#: ../../mod/register.php:256 msgid "Membership on this site is by invitation only." msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: ../../mod/register.php:256 +#: ../../mod/register.php:257 msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:259 ../../mod/admin.php:444 +#: ../../mod/register.php:260 ../../mod/admin.php:444 msgid "Registration" msgstr "Registrierung" -#: ../../mod/register.php:267 +#: ../../mod/register.php:268 msgid "Your Full Name (e.g. Joe Smith): " msgstr "Vollständiger Name (z.B. Max Mustermann): " -#: ../../mod/register.php:268 +#: ../../mod/register.php:269 msgid "Your Email Address: " msgstr "Deine E-Mail-Adresse: " -#: ../../mod/register.php:269 +#: ../../mod/register.php:270 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be " "'nickname@$sitename'." msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird 'spitzname@$sitename' sein." -#: ../../mod/register.php:270 +#: ../../mod/register.php:271 msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902 msgid "Register" msgstr "Registrieren" @@ -3226,7 +3273,7 @@ msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39 -#: ../../mod/display.php:169 ../../include/items.php:3780 +#: ../../mod/display.php:169 ../../include/items.php:3837 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -3235,7 +3282,7 @@ msgid "Access denied." msgstr "Zugriff verweigert." #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:51 ../../boot.php:1691 +#: ../../include/nav.php:51 ../../boot.php:1701 msgid "Photos" msgstr "Bilder" @@ -4113,7 +4160,7 @@ msgstr "FTP Nutzername" msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:21 ../../boot.php:1085 +#: ../../mod/profile.php:21 ../../boot.php:1089 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." @@ -4514,23 +4561,23 @@ msgstr "Alter: " msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:689 ../../boot.php:1203 +#: ../../mod/profiles.php:689 ../../boot.php:1207 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:690 ../../boot.php:1204 +#: ../../mod/profiles.php:690 ../../boot.php:1208 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:701 ../../boot.php:1214 +#: ../../mod/profiles.php:701 ../../boot.php:1218 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:703 ../../boot.php:1217 +#: ../../mod/profiles.php:703 ../../boot.php:1221 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:704 ../../boot.php:1218 +#: ../../mod/profiles.php:704 ../../boot.php:1222 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" @@ -4659,17 +4706,17 @@ msgid "Gender: " msgstr "Geschlecht:" #: ../../mod/directory.php:136 ../../include/profile_advanced.php:17 -#: ../../boot.php:1239 +#: ../../boot.php:1243 msgid "Gender:" msgstr "Geschlecht:" #: ../../mod/directory.php:138 ../../include/profile_advanced.php:37 -#: ../../boot.php:1242 +#: ../../boot.php:1246 msgid "Status:" msgstr "Status:" #: ../../mod/directory.php:140 ../../include/profile_advanced.php:48 -#: ../../boot.php:1244 +#: ../../boot.php:1248 msgid "Homepage:" msgstr "Homepage:" @@ -5539,7 +5586,7 @@ msgstr "Aktiviere Planeten Plugin" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:923 +#: ../../include/nav.php:64 ../../boot.php:927 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -6148,7 +6195,7 @@ msgstr "Erweiterter Kalender mit CalDAV Unterstützung." #: ../../addon/dav/friendica/main.php:279 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:710 +#: ../../include/enotify.php:28 ../../include/notifier.php:774 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -8136,7 +8183,7 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:457 ../../include/notifier.php:703 +#: ../../include/delivery.php:457 ../../include/notifier.php:767 msgid "(no subject)" msgstr "(kein Betreff)" @@ -8403,6 +8450,37 @@ msgstr "Eingebetteter Inhalt" msgid "Embedding disabled" msgstr "Einbettungen deaktiviert" +#: ../../include/uimport.php:61 +msgid "Error decoding account file" +msgstr "Fehler beim Verarbeiten der Account Datei" + +#: ../../include/uimport.php:67 +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:72 +msgid "Error! I can't import this file: DB schema version is not compatible." +msgstr "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel." + +#: ../../include/uimport.php:92 +msgid "User creation error" +msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten" + +#: ../../include/uimport.php:110 +msgid "User profile creation error" +msgstr "Fehler beim Anlegen des Nutzerkontos" + +#: ../../include/uimport.php:155 +#, 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:233 +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:25 msgid "" "A deleted group with this name was revived. Existing item permissions " @@ -8434,7 +8512,7 @@ msgstr "Neue Gruppe erstellen" msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:922 +#: ../../include/nav.php:46 ../../boot.php:926 msgid "Logout" msgstr "Abmelden" @@ -8442,7 +8520,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1677 +#: ../../include/nav.php:49 ../../boot.php:1687 msgid "Status" msgstr "Status" @@ -8522,11 +8600,11 @@ msgstr "Verwalten" msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:138 ../../boot.php:1197 +#: ../../include/nav.php:138 ../../boot.php:1201 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:138 ../../boot.php:1197 +#: ../../include/nav.php:138 ../../boot.php:1201 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" @@ -8952,15 +9030,15 @@ msgstr "Konnte die Kontaktinformationen nicht empfangen." msgid "following" msgstr "folgen" -#: ../../include/items.php:3300 +#: ../../include/items.php:3357 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:3300 +#: ../../include/items.php:3357 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " -#: ../../include/items.php:3981 +#: ../../include/items.php:4038 msgid "Archives" msgstr "Archiv" @@ -9050,37 +9128,37 @@ msgid "" "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/Contact.php:111 +#: ../../include/Contact.php:115 msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:220 ../../include/conversation.php:795 +#: ../../include/Contact.php:225 ../../include/conversation.php:795 msgid "Poke" msgstr "Anstupsen" -#: ../../include/Contact.php:221 ../../include/conversation.php:789 +#: ../../include/Contact.php:226 ../../include/conversation.php:789 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:222 ../../include/conversation.php:790 +#: ../../include/Contact.php:227 ../../include/conversation.php:790 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:223 ../../include/conversation.php:791 +#: ../../include/Contact.php:228 ../../include/conversation.php:791 msgid "View Photos" msgstr "Bilder anschauen" -#: ../../include/Contact.php:224 ../../include/Contact.php:237 +#: ../../include/Contact.php:229 ../../include/Contact.php:242 #: ../../include/conversation.php:792 msgid "Network Posts" msgstr "Netzwerkbeiträge" -#: ../../include/Contact.php:225 ../../include/Contact.php:237 +#: ../../include/Contact.php:230 ../../include/Contact.php:242 #: ../../include/conversation.php:793 msgid "Edit Contact" msgstr "Kontakt bearbeiten" -#: ../../include/Contact.php:226 ../../include/Contact.php:237 +#: ../../include/Contact.php:231 ../../include/Contact.php:242 #: ../../include/conversation.php:794 msgid "Send PM" msgstr "Private Nachricht senden" @@ -9198,101 +9276,101 @@ 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." -#: ../../boot.php:584 +#: ../../boot.php:588 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:587 +#: ../../boot.php:591 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:794 +#: ../../boot.php:798 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: ../../boot.php:796 +#: ../../boot.php:800 #, php-format msgid "Update Error at %s" msgstr "Updatefehler bei %s" -#: ../../boot.php:897 +#: ../../boot.php:901 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: ../../boot.php:925 +#: ../../boot.php:929 msgid "Nickname or Email address: " msgstr "Spitzname oder E-Mail-Adresse: " -#: ../../boot.php:926 +#: ../../boot.php:930 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:929 +#: ../../boot.php:933 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:935 +#: ../../boot.php:939 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:1046 +#: ../../boot.php:1050 msgid "Requested account is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../boot.php:1123 +#: ../../boot.php:1127 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1189 +#: ../../boot.php:1193 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1311 ../../boot.php:1397 +#: ../../boot.php:1315 ../../boot.php:1401 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1312 ../../boot.php:1398 +#: ../../boot.php:1316 ../../boot.php:1402 msgid "F d" msgstr "d. F" -#: ../../boot.php:1357 ../../boot.php:1438 +#: ../../boot.php:1361 ../../boot.php:1442 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1369 +#: ../../boot.php:1373 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1370 +#: ../../boot.php:1374 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1431 +#: ../../boot.php:1435 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1449 +#: ../../boot.php:1453 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1450 +#: ../../boot.php:1454 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1680 +#: ../../boot.php:1690 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1687 +#: ../../boot.php:1697 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1704 +#: ../../boot.php:1714 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1711 +#: ../../boot.php:1721 msgid "Only You Can See This" msgstr "Nur du kannst das sehen" diff --git a/view/de/strings.php b/view/de/strings.php index 26ac10b0c6..b1547de2f4 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -198,6 +198,18 @@ $a->strings["Diaspora"] = "Diaspora"; $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["Account settings"] = "Kontoeinstellungen"; +$a->strings["Display settings"] = "Anzeige-Einstellungen"; +$a->strings["Connector settings"] = "Connector-Einstellungen"; +$a->strings["Plugin settings"] = "Plugin-Einstellungen"; +$a->strings["Connected apps"] = "Verbundene Programme"; +$a->strings["Export personal data"] = "Persönliche Daten exportieren"; +$a->strings["Remove account"] = "Konto löschen"; +$a->strings["Settings"] = "Einstellungen"; +$a->strings["Export account"] = "Account exportieren"; +$a->strings["Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server."] = "Exportiere deine Account Informationen und die Kontakte. Verwende dies um ein Backup deines Accounts anzulegen und/oder ihn auf einen anderen Server umzuziehen."; +$a->strings["Export all"] = "Alles exportieren"; +$a->strings["Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"] = "Exportiere deine 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 (Photos werden nicht exportiert)."; $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert"; $a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen."; @@ -441,14 +453,6 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."; $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:"; $a->strings["Reset"] = "Zurücksetzen"; -$a->strings["Account settings"] = "Kontoeinstellungen"; -$a->strings["Display settings"] = "Anzeige-Einstellungen"; -$a->strings["Connector settings"] = "Connector-Einstellungen"; -$a->strings["Plugin settings"] = "Plugin-Einstellungen"; -$a->strings["Connected apps"] = "Verbundene Programme"; -$a->strings["Export personal data"] = "Persönliche Daten exportieren"; -$a->strings["Remove account"] = "Konto löschen"; -$a->strings["Settings"] = "Einstellungen"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; $a->strings["Update"] = "Aktualisierungen"; $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; @@ -599,6 +603,11 @@ $a->strings["Private messages to this person are at risk of public disclosure."] $a->strings["Invalid contact."] = "Ungültiger Kontakt."; $a->strings["Personal Notes"] = "Persönliche Notizen"; $a->strings["Save"] = "Speichern"; +$a->strings["Import"] = "Import"; +$a->strings["Move account"] = "Account umziehen"; +$a->strings["You can move here an account from another Friendica server.
\r\n You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Du kannst deinen Account auf einen anderen Friendica Server umziehen.
Dazu musst du deinen Account von deinem alten Server exportieren und hier hochladen. Wir werden dann deinen alten Account, mit allen Kontakten, hier wieder herstellen. Außerdem werden wir deine Kontakte darüber informieren, dass du hierher umgezogen bist.
Dieses Feature ist experimentell. Kontakte aus dem OStatus Netzwerk (StatusNet/identi.ca) oder von Diaspora können nicht mit umgezogen werden."; +$a->strings["Account file"] = "Account Datei"; +$a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "Um deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""; $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."; $a->strings["No recipient selected."] = "Kein Empfänger gewählt."; $a->strings["Unable to check your home location."] = "Konnte deinen Heimatort nicht bestimmen."; @@ -1794,6 +1803,16 @@ $a->strings["Attachments:"] = "Anhänge:"; $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! I can't import this file: DB schema version is not compatible."] = "Fehler! Kann diese Datei nicht importieren. Die DB Schema Versionen sind nicht kompatibel."; +$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["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten 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"; diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl index afab292433..5e170370ab 100644 --- a/view/field_checkbox.tpl +++ b/view/field_checkbox.tpl @@ -1,5 +1,5 @@ -
+
$field.3 diff --git a/view/login.tpl b/view/login.tpl index 4cbbb16240..297b36c9ac 100644 --- a/view/login.tpl +++ b/view/login.tpl @@ -13,6 +13,8 @@
{{ endif }} + {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }} +