The branch, master has been updated
       via  0c30ed069af362b0e703b8de71527b310db6bafa (commit)
       via  e80694659d7c3473e1bf0f6d22f336976fee2b57 (commit)
       via  e1ab5851398b3f84103b47ae43d61de8e80a08c3 (commit)
       via  8abe2aced5d494ff699a0e6fa44cf64393a26f33 (commit)
      from  564d4d7d2daaef2ed3e669d0a7ee7cdd2907f2e8 (commit)


- Log -----------------------------------------------------------------
commit 0c30ed069af362b0e703b8de71527b310db6bafa
Merge: e80694659d7c3473e1bf0f6d22f336976fee2b57 
564d4d7d2daaef2ed3e669d0a7ee7cdd2907f2e8
Author: Pootle server <[email protected]>
Date:   Mon Feb 28 20:40:03 2011 +0100

    Merge remote-tracking branch 'origin/master'

commit e80694659d7c3473e1bf0f6d22f336976fee2b57
Author: shanyan baishui <[email protected]>
Date:   Mon Feb 28 18:54:19 2011 +0200

    Translation update done using Pootle.

commit e1ab5851398b3f84103b47ae43d61de8e80a08c3
Author: shanyan baishui <[email protected]>
Date:   Mon Feb 28 18:52:19 2011 +0200

    Translation update done using Pootle.

commit 8abe2aced5d494ff699a0e6fa44cf64393a26f33
Author: shanyan baishui <[email protected]>
Date:   Mon Feb 28 18:45:56 2011 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/zh_CN.po |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 76db0e6..41171df 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2011-02-24 15:48+0100\n"
-"PO-Revision-Date: 2011-02-13 11:36+0200\n"
+"PO-Revision-Date: 2011-02-28 18:54+0200\n"
 "Last-Translator: shanyan baishui <[email protected]>\n"
 "Language-Team: chinese_simplified <[email protected]>\n"
 "Language: zh_CN\n"
@@ -5037,14 +5037,13 @@ msgid ""
 msgstr "关于 PBMS 的文档和更多信息请参见 %sPrimeBase Media Streaming 主页%s。"
 
 #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
-#, fuzzy
 #| msgid "Relations"
 msgid "Related Links"
-msgstr "关系"
+msgstr "相关链接"
 
 #: libraries/engines/pbms.lib.php:98
 msgid "The PrimeBase Media Streaming Blog by Barry Leslie"
-msgstr ""
+msgstr "Barry 的 PrimeBase 开发博客 —— Barry Leslie 著"
 
 #: libraries/engines/pbms.lib.php:99
 msgid "PrimeBase XT Home Page"
@@ -5189,7 +5188,7 @@ msgstr "关于 PBXT 的文档和更多信息请参见 %sPrimeBase XT 主页%s。
 
 #: libraries/engines/pbxt.lib.php:129
 msgid "The PrimeBase XT Blog by Paul McCullagh"
-msgstr ""
+msgstr "PrimeBase XT 博客 —— Paul McCullagh 著"
 
 #: libraries/engines/pbxt.lib.php:130
 msgid "The PrimeBase Media Streaming (PBMS) home page"


hooks/post-receive
-- 
phpMyAdmin

------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in 
Real-Time with Splunk. Collect, index and harness all the fast moving IT data 
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business 
insights. http://p.sf.net/sfu/splunk-dev2dev 
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to