The branch, master has been updated via 0933b7157d486af8fa1422fe79d6a0c8075d22c2 (commit) via 3d6e28865133b6ba1029b5cc3e82f1dd7b5d5b25 (commit) via 232ebc3c8c4c961526c9cc79a5f2605eb273fc10 (commit) from cfc7fd7a2dda8ce07647369593da3040c3603c72 (commit)
- Log ----------------------------------------------------------------- commit 0933b7157d486af8fa1422fe79d6a0c8075d22c2 Merge: cfc7fd7a2dda8ce07647369593da3040c3603c72 3d6e28865133b6ba1029b5cc3e82f1dd7b5d5b25 Author: Michal Čihař mcihar@novell.com Date: Mon Jul 26 17:18:16 2010 +0200
Merge remote branch 'pootle/master'
commit 3d6e28865133b6ba1029b5cc3e82f1dd7b5d5b25 Author: Robert Readman robert_readman@hotmail.com Date: Mon Jul 26 16:54:15 2010 +0200
Translation update done using Pootle.
commit 232ebc3c8c4c961526c9cc79a5f2605eb273fc10 Author: Robert Readman robert_readman@hotmail.com Date: Mon Jul 26 16:53:54 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index 2348e4f..a1a3b9a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-07-21 13:53+0200\n" -"PO-Revision-Date: 2010-07-21 14:43+0200\n" -"Last-Translator: Marc Delisle marc@infomarc.info\n" +"PO-Revision-Date: 2010-07-26 16:54+0200\n" +"Last-Translator: Robert Readman robert_readman@hotmail.com\n" "Language-Team: english-gb en_GB@li.org\n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -1674,10 +1674,9 @@ msgid "MySQL said: " msgstr "MySQL said: "
#: libraries/common.lib.php:1136 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "Could not connect to MySQL server" +msgstr "Failed to connect to SQL validator!"
#: libraries/common.lib.php:1174 setup/lib/messages.inc.php:350 msgid "Explain SQL" @@ -7736,10 +7735,9 @@ msgid "Showing SQL query" msgstr "Showing SQL query"
#: sql.php:517 -#, fuzzy #| msgid "Validate SQL" msgid "Validated SQL" -msgstr "Validate SQL" +msgstr "Validated SQL"
#: sql.php:638 #, php-format
hooks/post-receive