The branch, master has been updated via 98f9a70ed92690167e498eba9ab7de2480dca694 (commit) via a87e7ffb1011722a24afa478dcb6ba8b2e4ec67c (commit) via b4032e3ca3251ab760299e4eddfffdb455105f2c (commit) via c4b69d65d0cf2429f7402f426de1efbbbd59e853 (commit) via e2efb95b06d437a95c4ad62e797a70afa80532cd (commit) via 9428656f9443db71065e6e8ceb82986e6d97748f (commit) via 01fac6264f156d59fd589ca36429cf25b0a51de4 (commit) via 3687808e53f33e86752e89f8ab2a5911485721b5 (commit) via 7d8130e9b7e9110bcbb0e3ca11be61d5a43f9492 (commit) via 8e9b6103b7eccafc2dbf62b7d5f136cc35948f75 (commit) via 15fa0e7fb50f43eb094bdaef1dfea6459b441aeb (commit) via 8a564bb725a1ba0aa443dfa719288b33608b758d (commit) via c9b0dfdd30da82d1536cdc3911d121f1ab8548c5 (commit) via 02ead19e6605c4c3b4b0d9a289d70f321b8a6d66 (commit) via 7ef067719248a02aa7d0bd75794f5fcb76d81d84 (commit) via d94f6d366c99599293d2b794ab124a9c99f11159 (commit) via 1eadc64855cf19c62a93ff22bc31d1de5b0c7f1e (commit) from db84b2005243f66934d8ae10d9459022e17f46de (commit)
- Log ----------------------------------------------------------------- commit 98f9a70ed92690167e498eba9ab7de2480dca694 Merge: a87e7ff db84b20 Author: Pootle server pootle@cihar.com Date: Tue Aug 9 10:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit a87e7ffb1011722a24afa478dcb6ba8b2e4ec67c Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 09:37:50 2011 +0200
Translation update done using Pootle.
commit b4032e3ca3251ab760299e4eddfffdb455105f2c Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 09:37:26 2011 +0200
Translation update done using Pootle.
commit c4b69d65d0cf2429f7402f426de1efbbbd59e853 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 09:37:05 2011 +0200
Translation update done using Pootle.
commit e2efb95b06d437a95c4ad62e797a70afa80532cd Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:52:53 2011 +0200
Translation update done using Pootle.
commit 9428656f9443db71065e6e8ceb82986e6d97748f Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:49:59 2011 +0200
Translation update done using Pootle.
commit 01fac6264f156d59fd589ca36429cf25b0a51de4 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:44:54 2011 +0200
Translation update done using Pootle.
commit 3687808e53f33e86752e89f8ab2a5911485721b5 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:44:32 2011 +0200
Translation update done using Pootle.
commit 7d8130e9b7e9110bcbb0e3ca11be61d5a43f9492 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:44:22 2011 +0200
Translation update done using Pootle.
commit 8e9b6103b7eccafc2dbf62b7d5f136cc35948f75 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:44:11 2011 +0200
Translation update done using Pootle.
commit 15fa0e7fb50f43eb094bdaef1dfea6459b441aeb Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:43:24 2011 +0200
Translation update done using Pootle.
commit 8a564bb725a1ba0aa443dfa719288b33608b758d Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:43:00 2011 +0200
Translation update done using Pootle.
commit c9b0dfdd30da82d1536cdc3911d121f1ab8548c5 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:42:41 2011 +0200
Translation update done using Pootle.
commit 02ead19e6605c4c3b4b0d9a289d70f321b8a6d66 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:42:34 2011 +0200
Translation update done using Pootle.
commit 7ef067719248a02aa7d0bd75794f5fcb76d81d84 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:41:27 2011 +0200
Translation update done using Pootle.
commit d94f6d366c99599293d2b794ab124a9c99f11159 Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:41:19 2011 +0200
Translation update done using Pootle.
commit 1eadc64855cf19c62a93ff22bc31d1de5b0c7f1e Author: shanyan baishui Siramizu@gmail.com Date: Tue Aug 9 08:40:58 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/zh_CN.po | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/po/zh_CN.po b/po/zh_CN.po index 58319e8..23a47e8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-09 08:37+0200\n" +"PO-Revision-Date: 2011-08-09 09:37+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: chinese_simplified zh_CN@li.org\n" "Language: zh_CN\n" @@ -1276,68 +1276,67 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log 已启用，但服务器仅记录查询时间超过 %d 秒的查询。请根据您的系统适当设置 long_query_time 为 0-2 " +"秒。"
#: js/messages.php:137 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time 已设为 %d 秒。"
#: js/messages.php:138 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" -msgstr "" +msgstr "下列设置将被应用到整个服务器直到服务器重新启动:"
#. l10n: %s is FILE or TABLE #: js/messages.php:140 -#, fuzzy, php-format +#, php-format #| msgid "Save output to a file" msgid "Set log_output to %s" -msgstr "保存为文件" +msgstr "设置 log_output 为 %s"
#. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:142 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "已启用" +msgstr "启用 %s"
#. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:144 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "已禁用" +msgstr "禁用 %s"
#. l10n: %d seconds #: js/messages.php:146 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "设置 long_query_time 为 %d 秒"
#: js/messages.php:147 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." -msgstr "" +msgstr "无法修改这些变量。请以 root 登录或联系数据库管理员。"
#: js/messages.php:148 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "管理我的设置" +msgstr "修改设置"
#: js/messages.php:149 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "更多设置" +msgstr "当前设置"
#: js/messages.php:151 server_status.php:1472 -#, fuzzy #| msgid "Report title:" msgid "Chart Title" -msgstr "报告标题：" +msgstr "图表标题"
#. l10n: As in differential values #: js/messages.php:153 @@ -1431,14 +1430,14 @@ msgstr "正在加载"
#: js/messages.php:176 msgid "Monitor refresh failed" -msgstr "" +msgstr "监控刷新失败"
#: js/messages.php:177 msgid "" "While requesting new chart data the server returned an invalid response. " "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." -msgstr "" +msgstr "请求新图表数据时服务器返回了无效数据。这可能是因为会话过期。请尝试重新加载页面。"
#: js/messages.php:178 #, fuzzy @@ -1966,7 +1965,7 @@ msgstr "字号"
#: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "文件不是上传的文件。"
#: libraries/File.class.php:259 libraries/File.class.php:388 #, fuzzy @@ -2014,11 +2013,11 @@ msgstr ""
#: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "移动上传的文件时发生错误。"
#: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "无法读取移动后的上传文件。"
#: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!"
hooks/post-receive