friendica 8 years ago
parent
commit
407473f2ce
15 changed files with 15050 additions and 17826 deletions
  1. +5
    -1
      boot.php
  2. +18
    -4
      include/api.php
  3. +4
    -0
      include/ostatus_conversation.php
  4. +93
    -71
      include/text.php
  5. +38
    -37
      view/cs/messages.po
  6. +1
    -1
      view/cs/strings.php
  7. +5468
    -5375
      view/it/messages.po
  8. +1367
    -1346
      view/it/strings.php
  9. +5443
    -7977
      view/nb-no/messages.po
  10. +1516
    -1956
      view/nb-no/strings.php
  11. +1
    -1
      view/nb-no/update_fail_eml.tpl
  12. +13
    -0
      view/templates/paginate.tpl
  13. +985
    -964
      view/zh-cn/messages.po
  14. +89
    -84
      view/zh-cn/strings.php
  15. +9
    -9
      view/zh-cn/update_fail_eml.tpl

+ 5
- 1
boot.php View File

@ -635,7 +635,11 @@ if(! class_exists('App')) {
function set_pager_itemspage($n) {
$this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0);
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
}
function set_pager_page($n) {
$this->pager['page'] = $n;
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
}
function init_pagehead() {


+ 18
- 4
include/api.php View File

@ -741,8 +741,9 @@
if ($page<0) $page=0;
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
$conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
$start = $page*$count;
@ -753,6 +754,8 @@
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
if ($exclude_replies > 0)
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
if ($conversation_id > 0)
$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@ -816,6 +819,8 @@
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
$conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
$start = $page*$count;
@ -823,6 +828,10 @@
if ($max_id > 0)
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
if ($exclude_replies > 0)
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
if ($conversation_id > 0)
$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
@ -1124,14 +1133,19 @@
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
if ($page<0) $page=0;
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
$exclude_replies = (x($_REQUEST,'exclude_replies')?1:0);
$conversation_id = (x($_REQUEST,'conversation_id')?$_REQUEST['conversation_id']:0);
$start = $page*$count;
$sql_extra = '';
if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 ";
if ($exclude_replies > 0) $sql_extra .= ' AND `item`.`parent` = `item`.`id`';
if ($exclude_replies > 0)
$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
if ($conversation_id > 0)
$sql_extra .= ' AND `item`.`parent` = '.intval($conversation_id);
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,


+ 4
- 0
include/ostatus_conversation.php View File

@ -100,6 +100,10 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
$items = array_reverse($items);
foreach ($items as $single_conv) {
// identi.ca just changed the format of the activity streams. This is a quick fix.
if (@is_string($single_conv->object->id))
$single_conv->id = $single_conv->object->id;
if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;


+ 93
- 71
include/text.php View File

@ -27,7 +27,11 @@ function replace_macros($s,$r) {
$a = get_app();
$t = $a->template_engine();
$output = $t->replace_macros($s,$r);
try {
$output = $t->replace_macros($s,$r);
} catch (Exception $e) {
echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
}
$a->save_timestamp($stamp1, "rendering");
@ -260,75 +264,106 @@ function hex2bin($s) {
}}
if(! function_exists('paginate')) {
if(! function_exists('paginate_data')) {
/**
* Automatic pagination.
* Automatica pagination data.
*
* To use, get the count of total items.
* Then call $a->set_pager_total($number_items);
* Optionally call $a->set_pager_itemspage($n) to the number of items to display on each page
* Then call paginate($a) after the end of the display loop to insert the pager block on the page
* (assuming there are enough items to paginate).
* When using with SQL, the setting LIMIT %d, %d => $a->pager['start'],$a->pager['itemspage']
* will limit the results to the correct items for the current page.
* The actual page handling is then accomplished at the application layer.
*
* @param App $a App instance
* @return string html for pagination #FIXME remove html
* @param int $count [optional] item count (used with alt pager)
* @return Array data for pagination template
*/
function paginate(&$a) {
$o = '';
function paginate_data(&$a, $count=null) {
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
// $stripped = preg_replace('/&zrl=(.*?)([\?&]|$)/ism','',$stripped);
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];
$url = $a->get_baseurl() . '/' . $stripped;
if($a->pager['total'] > $a->pager['itemspage']) {
$o .= '<div class="pager">';
if($a->pager['page'] != 1)
$o .= '<span class="pager_prev">'."<a href=\"$url".'&page='.($a->pager['page'] - 1).'">' . t('prev') . '</a></span> ';
$data = array();
function _l(&$d, $name, $url, $text, $class="") {
$d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class);
}
if (!is_null($count)){
// alt pager
if($a->pager['page']>1)
_l($data, "prev", $url.'&page='.($a->pager['page'] - 1), t('newer'));
if($count>0)
_l($data, "next", $url.'&page='.($a->pager['page'] + 1), t('older'));
} else {
// full pager
if($a->pager['total'] > $a->pager['itemspage']) {
if($a->pager['page'] != 1)
_l($data, "prev", $url.'&page='.($a->pager['page'] - 1), t('prev'));
$o .= "<span class=\"pager_first\"><a href=\"$url"."&page=1\">" . t('first') . "</a></span> ";
_l($data, "first", $url."&page=1", t('first'));
$numpages = $a->pager['total'] / $a->pager['itemspage'];
$numpages = $a->pager['total'] / $a->pager['itemspage'];
$numstart = 1;
$numstop = $numpages;
$numstop = $numpages;
if($numpages > 14) {
$numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
}
for($i = $numstart; $i <= $numstop; $i++){
if($i == $a->pager['page'])
$o .= '<span class="pager_current">'.(($i < 10) ? '&nbsp;'.$i : $i);
else
$o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? '&nbsp;'.$i : $i)."</a>";
$o .= '</span> ';
}
if($numpages > 14) {
$numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
}
if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
if($i == $a->pager['page'])
$o .= '<span class="pager_current">'.(($i < 10) ? '&nbsp;'.$i : $i);
else
$o .= "<span class=\"pager_n\"><a href=\"$url"."&page=$i\">".(($i < 10) ? '&nbsp;'.$i : $i)."</a>";
$o .= '</span> ';
}
$pages = array();
$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
$o .= "<span class=\"pager_last\"><a href=\"$url"."&page=$lastpage\">" . t('last') . "</a></span> ";
for($i = $numstart; $i <= $numstop; $i++){
if($i == $a->pager['page'])
_l($pages, $i, "#", $i, "current");
else
_l($pages, $i, $url."&page=$i", $i, "n");
}
if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
if($i == $a->pager['page'])
_l($pages, $i, "#", $i, "current");
else
_l($pages, $i, $url."&page=$i", $i, "n");
}
$data['pages'] = $pages;
if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
$o .= '<span class="pager_next">'."<a href=\"$url"."&page=".($a->pager['page'] + 1).'">' . t('next') . '</a></span>';
$o .= '</div>'."\r\n";
$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
_l($data, "last", $url."&page=$lastpage", t('last'));
if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
_l($data, "next", $url."&page=".($a->pager['page'] + 1), t('next'));
}
}
return $o;
return $data;
}}
if(! function_exists('paginate')) {
/**
* Automatic pagination.
*
* To use, get the count of total items.
* Then call $a->set_pager_total($number_items);
* Optionally call $a->set_pager_itemspage($n) to the number of items to display on each page
* Then call paginate($a) after the end of the display loop to insert the pager block on the page
* (assuming there are enough items to paginate).
* When using with SQL, the setting LIMIT %d, %d => $a->pager['start'],$a->pager['itemspage']
* will limit the results to the correct items for the current page.
* The actual page handling is then accomplished at the application layer.
*
* @param App $a App instance
* @return string html for pagination #FIXME remove html
*/
function paginate(&$a) {
$data = paginate_data($a);
$tpl = get_markup_template("paginate.tpl");
return replace_macros($tpl, array("pager" => $data));
}}
if(! function_exists('alt_pager')) {
@ -339,27 +374,11 @@ if(! function_exists('alt_pager')) {
* @return string html for pagination #FIXME remove html
*/
function alt_pager(&$a, $i) {
$o = '';
$stripped = preg_replace('/(&page=[0-9]*)/','',$a->query_string);
$stripped = str_replace('q=','',$stripped);
$stripped = trim($stripped,'/');
$pagenum = $a->pager['page'];
$url = $a->get_baseurl() . '/' . $stripped;
$o .= '<div class="pager">';
if($a->pager['page']>1)
$o .= "<a href=\"$url"."&page=".($a->pager['page'] - 1).'" class="pager_newer">' . t('newer') . '</a>';
if($i>0) {
if($a->pager['page']>1)
$o .= "&nbsp;-&nbsp;";
$o .= "<a href=\"$url"."&page=".($a->pager['page'] + 1).'" class="pager_older">' . t('older') . '</a>';
}
$o .= '</div>'."\r\n";
return $o;
$data = paginate_data($a, $i);
$tpl = get_markup_template("paginate.tpl");
return replace_macros($tpl, array('pager' => $data));
}}
@ -564,8 +583,11 @@ function get_markup_template($s, $root = '') {
$a = get_app();
$t = $a->template_engine();
$template = $t->get_template_file($s, $root);
try {
$template = $t->get_template_file($s, $root);
} catch (Exception $e) {
echo "<pre><b>".__function__."</b>: ".$e->getMessage()."</pre>"; killme();
}
$a->save_timestamp($stamp1, "file");


+ 38
- 37
view/cs/messages.po View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
"POT-Creation-Date: 2013-05-22 00:01-0700\n"
"PO-Revision-Date: 2013-05-24 17:03+0000\n"
"POT-Creation-Date: 2013-06-12 00:01-0700\n"
"PO-Revision-Date: 2013-06-12 18:39+0000\n"
"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
"MIME-Version: 1.0\n"
@ -401,7 +401,8 @@ msgstr "Editovat Kontakty"
msgid "Send PM"
msgstr "Poslat soukromou zprávu"
#: ../../include/bbcode.php:210 ../../include/bbcode.php:549
#: ../../include/bbcode.php:210 ../../include/bbcode.php:550
#: ../../include/bbcode.php:551
msgid "Image/photo"
msgstr "Obrázek/fotografie"
@ -416,7 +417,7 @@ msgstr "<span><a href=\"%s\" target=\"external-link\">%s</a> napsal následujíc
msgid "$1 wrote:"
msgstr "$1 napsal:"
#: ../../include/bbcode.php:557 ../../include/bbcode.php:558
#: ../../include/bbcode.php:559 ../../include/bbcode.php:560
msgid "Encrypted content"
msgstr "Šifrovaný obsah"
@ -594,7 +595,7 @@ msgstr "Závažná chyba: Generování bezpečnostních klíčů se nezdařilo."
msgid "An error occurred during registration. Please try again."
msgstr "Došlo k chybě při registraci. Zkuste to prosím znovu."
#: ../../include/user.php:237 ../../include/text.php:1594
#: ../../include/user.php:237 ../../include/text.php:1596
msgid "default"
msgstr "standardní"
@ -926,7 +927,7 @@ msgstr "%1$s je nyní přítel s %2$s"
msgid "Sharing notification from Diaspora network"
msgstr "Sdílení oznámení ze sítě Diaspora"
#: ../../include/diaspora.php:1874 ../../include/text.php:1860
#: ../../include/diaspora.php:1874 ../../include/text.php:1862
#: ../../include/conversation.php:126 ../../include/conversation.php:254
#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 ../../mod/like.php:151
#: ../../view/theme/diabook/theme.php:464
@ -1361,112 +1362,112 @@ msgstr "uvolněný"
msgid "surprised"
msgstr "překvapený"
#: ../../include/text.php:1161
#: ../../include/text.php:1163
msgid "Monday"
msgstr "Pondělí"
#: ../../include/text.php:1161
#: ../../include/text.php:1163
msgid "Tuesday"
msgstr "Úterý"
#: ../../include/text.php:1161
#: ../../include/text.php:1163
msgid "Wednesday"
msgstr "Středa"
#: ../../include/text.php:1161
#: ../../include/text.php:1163
msgid "Thursday"
msgstr "Čtvrtek"
#: ../../include/text.php:1161
#: ../../include/text.php:1163
msgid "Friday"
msgstr "Pátek"
#: ../../include/text.php:1161
#: ../../include/text.php:1163
msgid "Saturday"
msgstr "Sobota"
#: ../../include/text.php:1161
#: ../../include/text.php:1163
msgid "Sunday"
msgstr "Neděle"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "January"
msgstr "Ledna"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "February"
msgstr "Února"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "March"
msgstr "Března"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "April"
msgstr "Dubna"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "May"
msgstr "Května"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "June"
msgstr "Června"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "July"
msgstr "Července"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "August"
msgstr "Srpna"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "September"
msgstr "Září"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "October"
msgstr "Října"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "November"
msgstr "Listopadu"
#: ../../include/text.php:1165
#: ../../include/text.php:1167
msgid "December"
msgstr "Prosinec"
#: ../../include/text.php:1321 ../../mod/videos.php:301
#: ../../include/text.php:1323 ../../mod/videos.php:301
msgid "View Video"
msgstr "Zobrazit video"
#: ../../include/text.php:1353
#: ../../include/text.php:1355
msgid "bytes"
msgstr "bytů"
#: ../../include/text.php:1377 ../../include/text.php:1389
#: ../../include/text.php:1379 ../../include/text.php:1391
msgid "Click to open/close"
msgstr "Klikněte pro otevření/zavření"
#: ../../include/text.php:1551 ../../mod/events.php:335
#: ../../include/text.php:1553 ../../mod/events.php:335
msgid "link to source"
msgstr "odkaz na zdroj"
#: ../../include/text.php:1606
#: ../../include/text.php:1608
msgid "Select an alternate language"
msgstr "Vyběr alternativního jazyka"
#: ../../include/text.php:1858 ../../include/conversation.php:118
#: ../../include/text.php:1860 ../../include/conversation.php:118
#: ../../include/conversation.php:246 ../../view/theme/diabook/theme.php:456
msgid "event"
msgstr "událost"
#: ../../include/text.php:1862
#: ../../include/text.php:1864
msgid "activity"
msgstr "aktivita"
#: ../../include/text.php:1864 ../../mod/content.php:628
#: ../../include/text.php:1866 ../../mod/content.php:628
#: ../../object/Item.php:364 ../../object/Item.php:377
msgid "comment"
msgid_plural "comments"
@ -1474,11 +1475,11 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] "komentář"
#: ../../include/text.php:1865
#: ../../include/text.php:1867
msgid "post"
msgstr "příspěvek"
#: ../../include/text.php:2020
#: ../../include/text.php:2022
msgid "Item filed"
msgstr "Položka vyplněna"
@ -6367,8 +6368,8 @@ msgid "Tips for New Members"
msgstr "Tipy pro nové členy"
#: ../../mod/install.php:117
msgid "Friendica Social Communications Server - Setup"
msgstr "Friendica Sociální komunkační server - Nastavení"
msgid "Friendica Communications Server - Setup"
msgstr "Friendica Komunikační server - Nastavení"
#: ../../mod/install.php:123
msgid "Could not connect to database."


+ 1
- 1
view/cs/strings.php View File

@ -1489,7 +1489,7 @@ $a->strings["Go to the Help Section"] = "Navštivte sekci nápovědy";
$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací.";
$a->strings["Requested profile is not available."] = "Požadovaný profil není k dispozici.";
$a->strings["Tips for New Members"] = "Tipy pro nové členy";
$a->strings["Friendica Social Communications Server - Setup"] = "Friendica Sociální komunkační server - Nastavení";
$a->strings["Friendica Communications Server - Setup"] = "Friendica Komunikač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.";
$a->strings["Your Friendica site database has been installed."] = "Vaše databáze Friendica byla nainstalována.";


+ 5468
- 5375
view/it/messages.po
File diff suppressed because it is too large
View File


+ 1367
- 1346
view/it/strings.php
File diff suppressed because it is too large
View File


+ 5443
- 7977
view/nb-no/messages.po
File diff suppressed because it is too large
View File


+ 1516
- 1956
view/nb-no/strings.php
File diff suppressed because it is too large
View File


+ 1
- 1
view/nb-no/update_fail_eml.tpl View File

@ -1,5 +1,5 @@
Hei,
jeg er $sitename.
Jeg er $sitename;
Friendica-utviklerne slapp nylig oppdateringen $update,
men da jeg prøvde å installere den, gikk noe forferdelig galt.
Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en


+ 13
- 0
view/templates/paginate.tpl View File

@ -0,0 +1,13 @@
<div class="pager">
{{if $pager}}
{{if $pager.prev}}<span class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></span>{{/if}}
{{if $pager.first}}<span class="pager_first $pager.first.class"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}}
{{foreach $pager.pages as $p}}<span class="pager_{{$p.class}}"><a href="{{$p.url}}">{{$p.text}}</a></span>{{/foreach}}
{{if $pager.last}}&nbsp;<span class="pager_last {{$pager.last.class}}"><a href="{{$pager.last.url}}">{{$pager.last.text}}</a></span>{{/if}}
{{if $pager.next}}<span class="pager_next {{$pager.next.class}}"><a href="{{$pager.next.url}}">{{$pager.next.text}}</a></span>{{/if}}
{{/if}}
</div>

+ 985
- 964
view/zh-cn/messages.po
File diff suppressed because it is too large
View File


+ 89
- 84
view/zh-cn/strings.php View File

@ -98,83 +98,10 @@ $a->strings["View Photos"] = "看照片";
$a->strings["Network Posts"] = "网络文章";
$a->strings["Edit Contact"] = "编辑熟人";
$a->strings["Send PM"] = "法私人的新闻";
$a->strings["prev"] = "上个";
$a->strings["first"] = "首先";
$a->strings["last"] = "最后";
$a->strings["next"] = "下个";
$a->strings["newer"] = "更新";
$a->strings["older"] = "更旧";
$a->strings["No contacts"] = "没有熟人";
$a->strings["%d Contact"] = array(
0 => "%d熟人",
);
$a->strings["View Contacts"] = "看熟人";
$a->strings["Search"] = "搜索";
$a->strings["Save"] = "保存";
$a->strings["poke"] = "";
$a->strings["poked"] = "戳了";
$a->strings["ping"] = "";
$a->strings["pinged"] = "砰了";
$a->strings["prod"] = "柔戳";
$a->strings["prodded"] = "柔戳了";
$a->strings["slap"] = "掌击";
$a->strings["slapped"] = "掌击了";
$a->strings["finger"] = "";
$a->strings["fingered"] = "指了";
$a->strings["rebuff"] = "窝脖儿";
$a->strings["rebuffed"] = "窝脖儿了";
$a->strings["happy"] = "开心";
$a->strings["sad"] = "伤心";
$a->strings["mellow"] = "轻松";
$a->strings["tired"] = "";
$a->strings["perky"] = "机敏";
$a->strings["angry"] = "生气";
$a->strings["stupified"] = "麻醉";
$a->strings["puzzled"] = "纳闷";
$a->strings["interested"] = "有兴趣";
$a->strings["bitter"] = "";
$a->strings["cheerful"] = "快乐";
$a->strings["alive"] = "活着";
$a->strings["annoyed"] = "被烦恼";
$a->strings["anxious"] = "心焦";
$a->strings["cranky"] = "不稳";
$a->strings["disturbed"] = "不安";
$a->strings["frustrated"] = "被作梗";
$a->strings["motivated"] = "士气高涨";
$a->strings["relaxed"] = "轻松";
$a->strings["surprised"] = "诧异";
$a->strings["Monday"] = "星期一";
$a->strings["Tuesday"] = "星期二";
$a->strings["Wednesday"] = "星期三";
$a->strings["Thursday"] = "星期四";
$a->strings["Friday"] = "星期五";
$a->strings["Saturday"] = "星期六";
$a->strings["Sunday"] = "星期天";
$a->strings["January"] = "一月";
$a->strings["February"] = "二月";
$a->strings["March"] = "三月";
$a->strings["April"] = "四月";
$a->strings["May"] = "五月";
$a->strings["June"] = "六月";
$a->strings["July"] = "七月";
$a->strings["August"] = "八月";
$a->strings["September"] = "九月";
$a->strings["October"] = "十月";
$a->strings["November"] = "十一月";
$a->strings["December"] = "十二月";
$a->strings["bytes"] = "字节";
$a->strings["Click to open/close"] = "点击为开关";
$a->strings["link to source"] = "链接到来源";
$a->strings["default"] = "默认";
$a->strings["Select an alternate language"] = "选择别的语言";
$a->strings["event"] = "项目";
$a->strings["photo"] = "照片";
$a->strings["activity"] = "活动";
$a->strings["comment"] = array(
0 => "评论",
);
$a->strings["post"] = "文章";
$a->strings["Item filed"] = "把项目归档了";
$a->strings["Image/photo"] = "图像/照片";
$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
$a->strings["$1 wrote:"] = "$1写:";
$a->strings["Encrypted content"] = "加密的内容";
$a->strings["Visible to everybody"] = "任何人可见的";
$a->strings["show"] = "";
$a->strings["don't show"] = "别著";
@ -214,6 +141,7 @@ $a->strings["Nickname is already registered. Please choose another."] = "昵称
$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "昵称曾经这里注册于是不能再用。请选择别的。";
$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "要紧错误:产生安全钥匙失败了。";
$a->strings["An error occurred during registration. Please try again."] = "报到出了问题。请再试。";
$a->strings["default"] = "默认";
$a->strings["An error occurred creating your default profile. Please try again."] = "造成默认简介出了问题。请再试。";
$a->strings["Profile Photos"] = "简介照片";
$a->strings["Unknown | Not categorised"] = "未知的 |无分类";
@ -265,10 +193,6 @@ $a->strings["%d contact in common"] = array(
);
$a->strings["show more"] = "看多";
$a->strings[" on Last.fm"] = "在Last.fm";
$a->strings["Image/photo"] = "图像/照片";
$a->strings["<span><a href=\"%s\" target=\"external-link\">%s</a> wrote the following <a href=\"%s\" target=\"external-link\">post</a>"] = "<span><a href=\"%s\" target=\"external-link\">%s</a>写了下面的<a href=\"%s\" target=\"external-link\">文章</a>";
$a->strings["$1 wrote:"] = "$1写:";
$a->strings["Encrypted content"] = "加密的内容";
$a->strings["view full size"] = "看全尺寸";
$a->strings["Miscellaneous"] = "形形色色";
$a->strings["year"] = "";
@ -297,6 +221,7 @@ $a->strings["(no subject)"] = "沒有题目";
$a->strings["noreply"] = "noreply";
$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s是成为%2\$s的朋友";
$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
$a->strings["photo"] = "照片";
$a->strings["status"] = "现状";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s喜欢%2\$s的%3\$s";
$a->strings["Attachments:"] = "附件:";
@ -348,6 +273,82 @@ $a->strings["Ability to dislike posts/comments"] = "能不喜欢文章/评论"
$a->strings["Star Posts"] = "文章星";
$a->strings["Ability to mark special posts with a star indicator"] = "能把优秀文章跟星标注";
$a->strings["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%s」";
$a->strings["prev"] = "上个";
$a->strings["first"] = "首先";
$a->strings["last"] = "最后";
$a->strings["next"] = "下个";
$a->strings["newer"] = "更新";
$a->strings["older"] = "更旧";
$a->strings["No contacts"] = "没有熟人";
$a->strings["%d Contact"] = array(
0 => "%d熟人",
);
$a->strings["View Contacts"] = "看熟人";
$a->strings["Search"] = "搜索";
$a->strings["Save"] = "保存";
$a->strings["poke"] = "";
$a->strings["poked"] = "戳了";
$a->strings["ping"] = "";
$a->strings["pinged"] = "砰了";
$a->strings["prod"] = "柔戳";
$a->strings["prodded"] = "柔戳了";
$a->strings["slap"] = "掌击";
$a->strings["slapped"] = "掌击了";
$a->strings["finger"] = "";
$a->strings["fingered"] = "指了";
$a->strings["rebuff"] = "窝脖儿";
$a->strings["rebuffed"] = "窝脖儿了";
$a->strings["happy"] = "开心";
$a->strings["sad"] = "伤心";
$a->strings["mellow"] = "轻松";
$a->strings["tired"] = "";
$a->strings["perky"] = "机敏";
$a->strings["angry"] = "生气";
$a->strings["stupified"] = "麻醉";
$a->strings["puzzled"] = "纳闷";
$a->strings["interested"] = "有兴趣";
$a->strings["bitter"] = "";
$a->strings["cheerful"] = "快乐";
$a->strings["alive"] = "活着";
$a->strings["annoyed"] = "被烦恼";
$a->strings["anxious"] = "心焦";
$a->strings["cranky"] = "不稳";
$a->strings["disturbed"] = "不安";
$a->strings["frustrated"] = "被作梗";
$a->strings["motivated"] = "士气高涨";
$a->strings["relaxed"] = "轻松";
$a->strings["surprised"] = "诧异";
$a->strings["Monday"] = "星期一";
$a->strings["Tuesday"] = "星期二";
$a->strings["Wednesday"] = "星期三";
$a->strings["Thursday"] = "星期四";
$a->strings["Friday"] = "星期五";
$a->strings["Saturday"] = "星期六";
$a->strings["Sunday"] = "星期天";
$a->strings["January"] = "一月";
$a->strings["February"] = "二月";
$a->strings["March"] = "三月";
$a->strings["April"] = "四月";
$a->strings["May"] = "五月";
$a->strings["June"] = "六月";
$a->strings["July"] = "七月";
$a->strings["August"] = "八月";
$a->strings["September"] = "九月";
$a->strings["October"] = "十月";
$a->strings["November"] = "十一月";
$a->strings["December"] = "十二月";
$a->strings["View Video"] = "看视频";
$a->strings["bytes"] = "字节";
$a->strings["Click to open/close"] = "点击为开关";
$a->strings["link to source"] = "链接到来源";
$a->strings["Select an alternate language"] = "选择别的语言";
$a->strings["event"] = "项目";
$a->strings["activity"] = "活动";
$a->strings["comment"] = array(
0 => "评论",
);
$a->strings["post"] = "文章";
$a->strings["Item filed"] = "把项目归档了";
$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "一个删除的组用这名被复兴。现有的项目权利<strong>可能</strong>还效为这个组和未来的成员。如果这不是您想的,请造成新组给起别的名。";
$a->strings["Default privacy group for new contacts"] = "默认隐私组为新熟人";
$a->strings["Everybody"] = "每人";
@ -1173,6 +1174,11 @@ $a->strings["No suggestions available. If this is a new site, please try again i
$a->strings["Ignore/Hide"] = "不理/隐藏";
$a->strings["People Search"] = "搜索人物";
$a->strings["No matches"] = "没有结果";
$a->strings["No videos selected"] = "没选择的视频";
$a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
$a->strings["View Album"] = "看照片册";
$a->strings["Recent Videos"] = "最近视频";
$a->strings["Upload New Videos"] = "上传新视频";
$a->strings["Tag removed"] = "标签去除了";
$a->strings["Remove Item Tag"] = "去除项目标签";
$a->strings["Select a tag to remove: "] = "选择标签去除";
@ -1392,7 +1398,6 @@ $a->strings["a photo"] = "一张照片";
$a->strings["Image exceeds size limit of "] = "图片超出最大尺寸";
$a->strings["Image file is empty."] = "图片文件空的。";
$a->strings["No photos selected"] = "没有照片挑选了";
$a->strings["Access to this item is restricted."] = "这个项目使用权限的。";
$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "您用%2$.2f兆字节的%1$.2f兆字节照片存储。";
$a->strings["Upload Photos"] = "上传照片";
$a->strings["New album name: "] = "新册名:";
@ -1426,7 +1431,6 @@ $a->strings["I like this (toggle)"] = "我喜欢这(交替)";
$a->strings["I don't like this (toggle)"] = "我不喜欢这(交替)";
$a->strings["This is you"] = "这是你";
$a->strings["Comment"] = "评论";
$a->strings["View Album"] = "看照片册";
$a->strings["Recent Photos"] = "最近的照片";
$a->strings["Welcome to Friendica"] = "Friendica欢迎你";
$a->strings["New Member Checklist"] = "新的成员一览表";
@ -1463,7 +1467,7 @@ $a->strings["Go to the Help Section"] = "看帮助部分";
$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "我们<strong>帮助</strong>页可查阅到详情关于别的编程特点和资源。";
$a->strings["Requested profile is not available."] = "要求的简介联系不上的。";
$a->strings["Tips for New Members"] = "提示对新成员";
$a->strings["Friendica Social Communications Server - Setup"] = "Friendica社会交通服务器-安装";
$a->strings["Friendica Communications Server - Setup"] = "Friendica通服务器-安装";
$a->strings["Could not connect to database."] = "解不了数据库。";
$a->strings["Could not create table."] = "造成不了表格。";
$a->strings["Your Friendica site database has been installed."] = "您Friendica网站数据库被安装了。";
@ -1630,5 +1634,6 @@ $a->strings["Event Reminders"] = "事件提醒";
$a->strings["Events this week:"] = "这周的事件:";
$a->strings["Status Messages and Posts"] = "现状通知和文章";
$a->strings["Profile Details"] = "简介内容";
$a->strings["Videos"] = "视频";
$a->strings["Events and Calendar"] = "项目和日历";
$a->strings["Only You Can See This"] = "只您许看这个";

+ 9
- 9
view/zh-cn/update_fail_eml.tpl View File

@ -1,11 +1,11 @@
Hey,
I'm $sitename.
The friendica developers released update $update recently,
but when I tried to install it, something went terribly wrong.
This needs to be fixed soon and I can't do it alone. Please contact a
friendica developer if you can not help me on your own. My database might be invalid.
你好,
我是$sitename;
Friendica开发者最近出版更新$update,
可我安装的时候,遇到什么灾害,
这要紧急地维修,可我不会自己做。请联系
一个Friendica开发者如果你不会自己帮我。我的数据库会不效。
The error message is '$error'.
错误通信是「$error」
I'm sorry,
your friendica server at $siteurl
不好意思,
你Friendica服务器在$siteurl

Loading…
Cancel
Save