The branch, master has been updated via 3499d8f79b1bcfbc00b8e1218b16069cde20cacd (commit) via 9a04278d17e6fdfeb75caa7093a21c135d2a8061 (commit) via 59faf06b39db39d25e715401b23cb0f4bd2d127a (commit) via 5f2a6ed8653727000a4e32964f1ba256d3381aec (commit) via 7eb7c00186ff1d352190229303443ba2497e23ca (commit) via 25f727f41e6a4836a89cebc96b8514f21042b2dc (commit) via 08076158859a01e6f8f57750b3b04f41ba726695 (commit) via b46f0f1e20903f76ed63b2399babca2ef22a97ec (commit) from 38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa (commit)

- Log ----------------------------------------------------------------- commit 3499d8f79b1bcfbc00b8e1218b16069cde20cacd Merge: 9a04278d17e6fdfeb75caa7093a21c135d2a8061 38d99b4e17a5c0cee966ddb4de13a9987c5ae6fa Author: Pootle server pootle@cihar.com Date: Mon Aug 8 10:06:23 2011 +0200

Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 9a04278d17e6fdfeb75caa7093a21c135d2a8061 Merge: 59faf06b39db39d25e715401b23cb0f4bd2d127a 21c3988cbf2ab7272e5b9acf65f37e649001c6b7 Author: Pootle server pootle@cihar.com Date: Mon Aug 8 08:40:10 2011 +0200

Merge remote-tracking branch 'origin/master'

commit 59faf06b39db39d25e715401b23cb0f4bd2d127a Author: shanyan baishui Siramizu@gmail.com Date: Mon Aug 8 08:33:16 2011 +0200

Translation update done using Pootle.

commit 5f2a6ed8653727000a4e32964f1ba256d3381aec Author: Sven Strickroth email@cs-ware.de Date: Sun Aug 7 22:28:04 2011 +0200

Translation update done using Pootle.

commit 7eb7c00186ff1d352190229303443ba2497e23ca Author: Sven Strickroth email@cs-ware.de Date: Sun Aug 7 22:26:57 2011 +0200

Translation update done using Pootle.

commit 25f727f41e6a4836a89cebc96b8514f21042b2dc Author: Sven Strickroth email@cs-ware.de Date: Sun Aug 7 22:26:37 2011 +0200

Translation update done using Pootle.

commit 08076158859a01e6f8f57750b3b04f41ba726695 Author: Sven Strickroth email@cs-ware.de Date: Sun Aug 7 22:26:08 2011 +0200

Translation update done using Pootle.

commit b46f0f1e20903f76ed63b2399babca2ef22a97ec Author: Sven Strickroth email@cs-ware.de Date: Sun Aug 7 22:25:39 2011 +0200

Translation update done using Pootle.

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

Summary of changes: po/de.po | 10 ++++------ po/zh_CN.po | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/po/de.po b/po/de.po index 6653ff9..eaa2038 100644 --- a/po/de.po +++ b/po/de.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-05 10:53+0200\n" -"PO-Revision-Date: 2011-08-06 23:06+0200\n" +"PO-Revision-Date: 2011-08-07 22:28+0200\n" "Last-Translator: Sven Strickroth email@cs-ware.de\n" "Language-Team: german de@li.org\n" "Language: de\n" @@ -418,7 +418,7 @@ msgstr "Bitte wählen Sie mindestens eine anzuzeigende Spalte" #, fuzzy, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "visueller Builder" +msgstr "Wechseln zu %s visual builder %s"

#: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939 @@ -1442,7 +1442,6 @@ msgid "Loading logs" msgstr "Lade Protokolle"

#: js/messages.php:176 -#, fuzzy msgid "Monitor refresh failed" msgstr "Aktualisierung der Überwachung fehlgeschlagen"

@@ -2312,10 +2311,9 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS: Infos über BLOB nicht erhalten:"

#: libraries/blobstreaming.lib.php:332 -#, fuzzy #| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" -msgstr "PBMS konnte den BLOB Content-Typs nicht bestimmen" +msgstr "PBMS konnte den Content-Typ des BLOBs nicht bestimmen"

#: libraries/blobstreaming.lib.php:358 msgid "View image" @@ -6402,7 +6400,7 @@ msgid "Go to table" msgstr "Gehe zur Tabelle"

#: libraries/import.lib.php:1099 -#, fuzzy, php-format +#, php-format #| msgid "Structure only" msgid "Structure of %s" msgstr "Struktur von %s" diff --git a/po/zh_CN.po b/po/zh_CN.po index 45f296e..c416905 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-05 10:53+0200\n" -"PO-Revision-Date: 2011-06-08 05:00+0200\n" +"PO-Revision-Date: 2011-08-08 08:33+0200\n" "Last-Translator: shanyan baishui Siramizu@gmail.com\n" "Language-Team: chinese_simplified zh_CN@li.org\n" "Language: zh_CN\n" @@ -409,10 +409,10 @@ msgid "You have to choose at least one column to display" msgstr "您最少要选择显示一列"

#: db_qbe.php:186 -#, fuzzy, php-format +#, php-format #| msgid "visual builder" msgid "Switch to %svisual builder%s" -msgstr "可视化查询生成器" +msgstr "切换到 %s可视化查询生成器%s"

#: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:939

hooks/post-receive