[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2RC1-1376-g5c032d4 - Git

8 Apr 2010

The branch, master has been updated
       via  5c032d4110cd618413f88a513443932bce4fa18e (commit)
       via  3aa8e025cb29285148dc45e03e8cd8b1ab09b89b (commit)
       via  8222253192faa0c8fe63d4eb47699d97a974ebb7 (commit)
       via  bc71de609830a33469dd327db1d4408a0e619c9b (commit)
       via  c98d8fb52ef2379196f3ff91ff9a95e407c92f95 (commit)
       via  1e3549fc83e5c431225bc78b88a56854895c24a9 (commit)
       via  c9823db143bbe08e1267661f2e79712f20ad8a8d (commit)
       via  6cc17647f0bb704b605a049ccb37e3ed95572cf5 (commit)
       via  1207812164e8d8cecc6bc5294b2e9e3cce788853 (commit)
       via  1c201362da9bb748f483149bee2cbf2eaf969c12 (commit)
       via  ca659b86069d9317236e360e28bcf61d5c6fddd9 (commit)
       via  ee6f8f80e118fe4a9179e4e64c5c8a771bb4e7ba (commit)
       via  93227883e66d8a7fe7d42fda270cced801016350 (commit)
       via  ee554717cc3f15297762edb17caa95895a454895 (commit)
       via  cc86df8e295502573bcce43b7a976a60668faad2 (commit)
       via  f20bf63cd39a4a187bfb516492d127e17cee5fc9 (commit)
       via  5541b1415b95fee7020008bb733c60b6bb855b7c (commit)
       via  07f4b9e039eebe390c5eeb8e2bb8f6ca8e7615cc (commit)
       via  c6ead622575cf1c8e22297736868090ee17f2d0b (commit)
       via  2b5319abe86a6742d9695c9330afc71c34d9a743 (commit)
       via  ed3724cc7a660b1db1d394d4e72b517ea5053f86 (commit)
       via  c72fe83d5634c9e2f7c23007c80976a46c7c5d9c (commit)
      from  1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 (commit)
- Log -----------------------------------------------------------------
commit 5c032d4110cd618413f88a513443932bce4fa18e
Author: Michal Čihař michal@cihar.com
Date:   Thu Apr 8 15:12:07 2010 +0200
Translation update done using Pootle.
commit 3aa8e025cb29285148dc45e03e8cd8b1ab09b89b
Merge: 8222253192faa0c8fe63d4eb47699d97a974ebb7 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14
Author: Michal Čihař michal@cihar.com
Date:   Thu Apr 8 14:40:27 2010 +0200
Merge remote branch 'origin/master'
commit 8222253192faa0c8fe63d4eb47699d97a974ebb7
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:06:28 2010 +0200
Translation update done using Pootle.
commit bc71de609830a33469dd327db1d4408a0e619c9b
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:05:15 2010 +0200
Translation update done using Pootle.
commit c98d8fb52ef2379196f3ff91ff9a95e407c92f95
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:05:01 2010 +0200
Translation update done using Pootle.
commit 1e3549fc83e5c431225bc78b88a56854895c24a9
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:04:55 2010 +0200
Translation update done using Pootle.
commit c9823db143bbe08e1267661f2e79712f20ad8a8d
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:04:35 2010 +0200
Translation update done using Pootle.
commit 6cc17647f0bb704b605a049ccb37e3ed95572cf5
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:04:17 2010 +0200
Translation update done using Pootle.
commit 1207812164e8d8cecc6bc5294b2e9e3cce788853
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:03:36 2010 +0200
Translation update done using Pootle.
commit 1c201362da9bb748f483149bee2cbf2eaf969c12
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:02:43 2010 +0200
Translation update done using Pootle.
commit ca659b86069d9317236e360e28bcf61d5c6fddd9
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:02:15 2010 +0200
Translation update done using Pootle.
commit ee6f8f80e118fe4a9179e4e64c5c8a771bb4e7ba
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 13:00:05 2010 +0200
Translation update done using Pootle.
commit 93227883e66d8a7fe7d42fda270cced801016350
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:59:59 2010 +0200
Translation update done using Pootle.
commit ee554717cc3f15297762edb17caa95895a454895
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:59:30 2010 +0200
Translation update done using Pootle.
commit cc86df8e295502573bcce43b7a976a60668faad2
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:57:22 2010 +0200
Translation update done using Pootle.
commit f20bf63cd39a4a187bfb516492d127e17cee5fc9
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:56:58 2010 +0200
Translation update done using Pootle.
commit 5541b1415b95fee7020008bb733c60b6bb855b7c
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:56:20 2010 +0200
Translation update done using Pootle.
commit 07f4b9e039eebe390c5eeb8e2bb8f6ca8e7615cc
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:56:10 2010 +0200
Translation update done using Pootle.
commit c6ead622575cf1c8e22297736868090ee17f2d0b
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:54:02 2010 +0200
Translation update done using Pootle.
commit 2b5319abe86a6742d9695c9330afc71c34d9a743
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:53:45 2010 +0200
Translation update done using Pootle.
commit ed3724cc7a660b1db1d394d4e72b517ea5053f86
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:53:18 2010 +0200
Translation update done using Pootle.
commit c72fe83d5634c9e2f7c23007c80976a46c7c5d9c
Author: shanyan baishui Siramizu@gmail.com
Date:   Thu Apr 8 12:52:46 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/en_GB.po |   52 +++++++++++++++++----------------------------
 po/zh_CN.po |   67 ++++++++++++++++++++++-------------------------------------
 2 files changed, 45 insertions(+), 74 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index 8838ebd..ae4689b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -57,13 +57,12 @@ msgstr "en"
#: libraries/common.lib.php:1276
 msgid "Inline edit of this query"
-msgstr ""
+msgstr "Inline edit of this query"
#: libraries/common.lib.php:1278
-#, fuzzy
 #| msgid "Engines"
 msgid "Inline"
-msgstr "Engines"
+msgstr "Inline"
#: libraries/Message.class.php:282
 #, php-format
@@ -6518,11 +6517,11 @@ msgstr "PMA database"
#: setup/lib/messages.inc.php:133
 msgid "Tracking of changes made in database. Requires configured PMA database."
-msgstr ""
+msgstr "Tracking of changes made in database. Requires configured PMA database."
#: setup/lib/messages.inc.php:134
 msgid "Changes tracking"
-msgstr ""
+msgstr "Changes tracking"
#: setup/lib/messages.inc.php:135
 msgid "Customization"
@@ -7231,7 +7230,6 @@ msgid "SQL query history table"
 msgstr "SQL query history table"
#: setup/lib/messages.inc.php:279
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history"
 #| "[/kbd]"
@@ -7239,14 +7237,13 @@ msgid ""
 "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/"
 "kbd]"
 msgstr ""
-"Leave blank for no SQL query history support, suggested: [kbd]pma_history[/"
-"kbd]"
+"Leave blank for no SQL query tracking support, suggested: "
+"[kbd]pma_tracking[/kbd]"
#: setup/lib/messages.inc.php:280
-#, fuzzy
 #| msgid "SQL query history table"
 msgid "SQL query tracking table"
-msgstr "SQL query history table"
+msgstr "SQL query tracking table"
#: setup/lib/messages.inc.php:281
 msgid "Hostname where MySQL server is running"
@@ -7353,7 +7350,6 @@ msgid "Signon URL"
 msgstr "Signon URL"
#: setup/lib/messages.inc.php:303
-#, fuzzy
 #| msgid ""
 #| "Whether the tracking mechanism creates versions for tables and views "
 #| "automatically. Default value is false."
@@ -7362,68 +7358,60 @@ msgid ""
 "automatically."
 msgstr ""
 "Whether the tracking mechanism creates versions for tables and views "
-"automatically. Default value is false."
+"automatically."
#: setup/lib/messages.inc.php:304
-#, fuzzy
 #| msgid "Automatic recovery mode"
 msgid "Automatically create versions"
-msgstr "Automatic recovery mode"
+msgstr "Automatically create versions"
#: setup/lib/messages.inc.php:305
-#, fuzzy
 #| msgid ""
 #| "Defines the list of statements the auto-creation uses for new versions. "
 #| "Default value is"
 msgid "Defines the list of statements the auto-creation uses for new versions."
-msgstr ""
-"Defines the list of statements the auto-creation uses for new versions. "
-"Default value is"
+msgstr "Defines the list of statements the auto-creation uses for new versions."
#: setup/lib/messages.inc.php:306
-#, fuzzy
 #| msgid "Statements"
 msgid "Statements to track"
-msgstr "Statements"
+msgstr "Statements to track"
#: setup/lib/messages.inc.php:307
-#, fuzzy
 msgid ""
 "Whether a DROP VIEW IF EXISTS statement will be added as first line to the "
 "log when creating a view."
 msgstr ""
-"Whether a DROP VIEW IF EXISTS statement will added as first line to the log "
-"when creating a view. Default value is true."
+"Whether a DROP VIEW IF EXISTS statement will be added as first line to the "
+"log when creating a view."
#: setup/lib/messages.inc.php:308
 msgid "Add DROP VIEW"
-msgstr ""
+msgstr "Add DROP VIEW"
#: setup/lib/messages.inc.php:309
-#, fuzzy
 msgid ""
 "Whether a DROP TABLE IF EXISTS statement will be added as first line to the "
 "log when creating a table."
 msgstr ""
-"Whether a DROP TABLE IF EXISTS statement will added as first line to the log "
-"when creating a table. Default value is true."
+"Whether a DROP TABLE IF EXISTS statement will be added as first line to the "
+"log when creating a table."
#: setup/lib/messages.inc.php:310
 msgid "Add DROP TABLE"
-msgstr ""
+msgstr "Add DROP TABLE"
#: setup/lib/messages.inc.php:311
-#, fuzzy
 msgid ""
 "Whether a DROP DATABASE IF EXISTS statement will be added as first line to "
 "the log when creating a database."
 msgstr ""
-"Whether a DROP DATABASE IF EXISTS statement will added as first line to the "
-"log when creating a database. Default value is true."
+"Whether a DROP DATABASE IF EXISTS statement will be added as first line to "
+"the log when creating a database."
#: setup/lib/messages.inc.php:312
 msgid "Add DROP DATABASE"
-msgstr ""
+msgstr "Add DROP DATABASE"
#: setup/lib/messages.inc.php:313
 msgid "You should use SSL connections if your web server supports it"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4d7f459..db69e9a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-04-02 13:41+0200\n"
-"PO-Revision-Date: 2010-03-19 03:34+0200\n"
+"PO-Revision-Date: 2010-04-08 13:06+0200\n"
 "Last-Translator: shanyan baishui Siramizu@gmail.com\n"
 "Language-Team: chinese_simplified zh_CN@li.org\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.1\n"
@@ -44,7 +44,7 @@ msgstr ""
 #: libraries/common.lib.php:411
 msgctxt "$mysql_5_1_doc_lang"
 msgid "en"
-msgstr "en"
+msgstr "zh"
#. l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation.
 #: libraries/common.lib.php:415
@@ -54,34 +54,33 @@ msgstr "zh"
#: libraries/common.lib.php:1276
 msgid "Inline edit of this query"
-msgstr ""
+msgstr "在本页面编辑此查询"
#: libraries/common.lib.php:1278
-#, fuzzy
 #| msgid "Engines"
 msgid "Inline"
-msgstr "引擎"
+msgstr "内联"
#: libraries/Message.class.php:282
-#, fuzzy, php-format
+#, php-format
 #| msgid "%1$d row(s) affected."
 msgid "%1$d row affected."
 msgid_plural "%1$d rows affected."
 msgstr[0] "影响了 %1$d 行。"
#: libraries/Message.class.php:301
-#, fuzzy, php-format
+#, php-format
 #| msgid "%1$d row(s) deleted."
 msgid "%1$d row deleted."
 msgid_plural "%1$d rows deleted."
-msgstr[0] "已删除 %1$d 行。"
+msgstr[0] "删除了 %1$d 行。"
#: libraries/Message.class.php:320
-#, fuzzy, php-format
+#, php-format
 #| msgid "%1$d row(s) inserted."
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "已插入 %1$d 行。"
+msgstr[0] "插入了 %1$d 行。"
#. l10n: Text direction, use either ltr or rtl
 #: libraries/messages.inc.php:19
@@ -6302,7 +6301,7 @@ msgstr "PMA 数据库"
#: setup/lib/messages.inc.php:133
 msgid "Tracking of changes made in database. Requires configured PMA database."
-msgstr ""
+msgstr "追踪数据库的修改。需要设置 PMA 数据库。"
#: setup/lib/messages.inc.php:134
 msgid "Changes tracking"
@@ -6988,20 +6987,18 @@ msgid "SQL query history table"
 msgstr "SQL 查询历史表"
#: setup/lib/messages.inc.php:279
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history"
 #| "[/kbd]"
 msgid ""
 "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/"
 "kbd]"
-msgstr "不使用 SQL 查询历史功能请留空，默认：[kbd]pma_history[/kbd]"
+msgstr "不使用 SQL 查询追踪功能请留空，默认：[kbd]pma_tracking[/kbd]"
#: setup/lib/messages.inc.php:280
-#, fuzzy
 #| msgid "SQL query history table"
 msgid "SQL query tracking table"
-msgstr "SQL 查询历史表"
+msgstr "SQL 查询追踪表"
#: setup/lib/messages.inc.php:281
 msgid "Hostname where MySQL server is running"
@@ -7106,72 +7103,60 @@ msgid "Signon URL"
 msgstr "登录地址"
#: setup/lib/messages.inc.php:303
-#, fuzzy
 #| msgid ""
 #| "Whether the tracking mechanism creates versions for tables and views "
 #| "automatically. Default value is false."
 msgid ""
 "Whether the tracking mechanism creates versions for tables and views "
 "automatically."
-msgstr "设置追踪系统是否自动为数据表和视图创建版本。默认为 false 。"
+msgstr "设置追踪系统是否自动为数据表和视图创建版本。"
#: setup/lib/messages.inc.php:304
-#, fuzzy
 #| msgid "Automatic recovery mode"
 msgid "Automatically create versions"
-msgstr "自动恢复模式"
+msgstr "自动创建版本"
#: setup/lib/messages.inc.php:305
-#, fuzzy
 #| msgid ""
 #| "Defines the list of statements the auto-creation uses for new versions. "
 #| "Default value is"
 msgid "Defines the list of statements the auto-creation uses for new versions."
-msgstr "定义自动创建新版的命令列表。默认值为"
+msgstr "定义自动创建新版的命令列表。"
#: setup/lib/messages.inc.php:306
-#, fuzzy
 #| msgid "Statements"
 msgid "Statements to track"
-msgstr "说明"
+msgstr "要追踪的命令"
#: setup/lib/messages.inc.php:307
-#, fuzzy
 msgid ""
 "Whether a DROP VIEW IF EXISTS statement will be added as first line to the "
 "log when creating a view."
-msgstr ""
-"设置当记录视图创建时，是否在前面加上 DROP VIEW IF EXISTS 命令。默认为 true 。"
+msgstr "设置当记录视图创建时，是否在前面加上 DROP VIEW IF EXISTS 命令。"
#: setup/lib/messages.inc.php:308
 msgid "Add DROP VIEW"
-msgstr ""
+msgstr "添加 DROP VIEW"
#: setup/lib/messages.inc.php:309
-#, fuzzy
 msgid ""
 "Whether a DROP TABLE IF EXISTS statement will be added as first line to the "
 "log when creating a table."
-msgstr ""
-"设置当记录数据表创建时，是否在前面加上 DROP TABLE IF EXISTS 命令。默认为 "
-"true 。"
+msgstr "设置当记录数据表创建时，是否在前面加上 DROP TABLE IF EXISTS 命令。"
#: setup/lib/messages.inc.php:310
 msgid "Add DROP TABLE"
-msgstr ""
+msgstr "添加 DROP TABLE"
#: setup/lib/messages.inc.php:311
-#, fuzzy
 msgid ""
 "Whether a DROP DATABASE IF EXISTS statement will be added as first line to "
 "the log when creating a database."
-msgstr ""
-"设置当记录数据库创建时，是否在前面加上 DROP DATABASE IF EXISTS 命令。默认为 "
-"true 。"
+msgstr "设置当记录数据库创建时，是否在前面加上 DROP DATABASE IF EXISTS 命令。"
#: setup/lib/messages.inc.php:312
 msgid "Add DROP DATABASE"
-msgstr ""
+msgstr "添加 DROP DATABASE"
#: setup/lib/messages.inc.php:313
 msgid "You should use SSL connections if your web server supports it"
@@ -7435,16 +7420,14 @@ msgid ""
 msgstr "有新的 phpMyAdmin 可用，请考虑升级。最新的版本是 %s，于 %s 发布。"
#: setup/lib/messages.inc.php:372
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "You are using subversion version, run [kbd]svn update[/kbd] :-)[br]The "
 #| "latest stable version is %s, released on %s."
 msgid ""
 "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable "
 "version is %s, released on %s."
-msgstr ""
-"你现在使用的是开发版，请通过 [kbd]svn update[/kbd] 检查更新 :-)[br]最新正式版"
-"为 %s，于 %s 发布。"
+msgstr "你现在使用的是开发版，请通过 [kbd]git pull[/kbd] 检查更新 :-)[br]最新正式版为 %s，于 %s 发布。"
#: setup/lib/messages.inc.php:373
 msgid "No newer stable version is available"
hooks/post-receive
-- 
phpMyAdmin


    