[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, updated. RELEASE_3_3_1RC1-384-g24b457f

[Michal Čihař]

The branch, gettext has been updated
       via  24b457f7d69305d108eea5f9f94f0b70f24a3e2c (commit)
       via  f652e63e4efd6e3a2a5a8357471cadcf89ee0874 (commit)
       via  f6185e5341a154accbe179079128f62e0d34822e (commit)
       via  368bf583502dacb70fd0021c41dcda6e937d1010 (commit)
       via  a96ae5e596b9e3fcd29e5e222c5a8c30720ae0fd (commit)
       via  2f26a58ad5fdc0cfd27377f97af38f0b863b61a0 (commit)
       via  b0e1c8dbd1319672e9604cfeb00e8cdc70c1f002 (commit)
       via  f87497e4a34f5c59a466efb88833d4a336b685a0 (commit)
       via  e982dc0ca3a9d65730ff766d3393222213c0a6dd (commit)
       via  7dae6f125f0e26ce26662d91e65780d1f3537ba8 (commit)
       via  f66514a09467f133ff726a15ba0107a33211216f (commit)
       via  445af4bfb0ed3cf76fac3bf7e443701334b888fb (commit)
      from  568be7147b2aa9796cb26f02fefa34f278c469c5 (commit)


- Log -----------------------------------------------------------------
commit 24b457f7d69305d108eea5f9f94f0b70f24a3e2c
Merge: 568be7147b2aa9796cb26f02fefa34f278c469c5 f652e63e4efd6e3a2a5a8357471cadcf89ee0874
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Mar 12 10:19:31 2010 +0100

    Merge remote branch 'pootle/gettext' into gettext

commit f652e63e4efd6e3a2a5a8357471cadcf89ee0874
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:16:37 2010 +0200

    Translation update done using Pootle.

commit f6185e5341a154accbe179079128f62e0d34822e
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:16:34 2010 +0200

    Translation update done using Pootle.

commit 368bf583502dacb70fd0021c41dcda6e937d1010
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:16:17 2010 +0200

    Translation update done using Pootle.

commit a96ae5e596b9e3fcd29e5e222c5a8c30720ae0fd
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:15:50 2010 +0200

    Translation update done using Pootle.

commit 2f26a58ad5fdc0cfd27377f97af38f0b863b61a0
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:15:47 2010 +0200

    Translation update done using Pootle.

commit b0e1c8dbd1319672e9604cfeb00e8cdc70c1f002
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:15:15 2010 +0200

    Translation update done using Pootle.

commit f87497e4a34f5c59a466efb88833d4a336b685a0
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:13:17 2010 +0200

    Translation update done using Pootle.

commit e982dc0ca3a9d65730ff766d3393222213c0a6dd
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:13:14 2010 +0200

    Translation update done using Pootle.

commit 7dae6f125f0e26ce26662d91e65780d1f3537ba8
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:13:11 2010 +0200

    Translation update done using Pootle.

commit f66514a09467f133ff726a15ba0107a33211216f
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:13:08 2010 +0200

    Translation update done using Pootle.

commit 445af4bfb0ed3cf76fac3bf7e443701334b888fb
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Mar 12 11:13:04 2010 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/de.po    |   12 ++++++------
 po/en_GB.po |   11 +++--------
 po/fr.po    |   11 ++++++-----
 po/zh_CN.po |   11 ++++++-----
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/po/de.po b/po/de.po
index 33d1d93..950883a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,13 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-03-12 09:48+0100\n"
-"PO-Revision-Date: 2010-03-12 09:14+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-03-12 11:16+0200\n"
+"Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: german <de at li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: libraries/auth/config.auth.lib.php:107
 #, php-format
@@ -37,17 +39,15 @@ msgstr ""
 
 #. l10n: Language to use for MySQL 5.1 documentation
 #: libraries/common.lib.php:411
-#, fuzzy
 msgctxt "$mysql_5_1_doc_lang"
 msgid "en"
 msgstr "de"
 
 #. l10n: Language to use for MySQL 5.0 documentation
 #: libraries/common.lib.php:415
-#, fuzzy
 msgctxt "$mysql_5_0_doc_lang"
 msgid "en"
-msgstr "de"
+msgstr "en"
 
 #. l10n: Text direction, use either ltr or rtl
 #: libraries/messages.inc.php:15
diff --git a/po/en_GB.po b/po/en_GB.po
index 0921592..cf4e10f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-03-12 09:48+0100\n"
-"PO-Revision-Date: 2010-03-12 09:13+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-03-12 11:13+0200\n"
+"Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: english-gb <en_GB at li.org>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
 
@@ -37,7 +37,6 @@ msgstr ""
 
 #. l10n: Language to use for MySQL 5.1 documentation
 #: libraries/common.lib.php:411
-#, fuzzy
 msgctxt "$mysql_5_1_doc_lang"
 msgid "en"
 msgstr "en"
@@ -459,7 +458,6 @@ msgid "Are you sure you want to disable all BLOB references for database %s?"
 msgstr "Are you sure you want to disable all BLOB references for database %s?"
 
 #: libraries/messages.inc.php:96
-#, fuzzy
 msgctxt "$strBLOBRepositoryDisabled"
 msgid "Disabled"
 msgstr "Disabled"
@@ -473,7 +471,6 @@ msgid "You are about to DISABLE a BLOB Repository!"
 msgstr "You are about to DISABLE a BLOB Repository!"
 
 #: libraries/messages.inc.php:99
-#, fuzzy
 msgctxt "$strBLOBRepositoryEnabled"
 msgid "Enabled"
 msgstr "Enabled"
@@ -487,7 +484,6 @@ msgid "Remove BLOB Repository Reference"
 msgstr "Remove BLOB Repository Reference"
 
 #: libraries/messages.inc.php:102
-#, fuzzy
 msgctxt "$strBLOBRepositoryRepair"
 msgid "Repair"
 msgstr "Repair"
@@ -941,7 +937,6 @@ msgid "Create database with same name and grant all privileges"
 msgstr "Create database with same name and grant all privileges"
 
 #: libraries/messages.inc.php:203
-#, fuzzy
 msgctxt "$strCreateUserDatabaseNone"
 msgid "None"
 msgstr "None"
diff --git a/po/fr.po b/po/fr.po
index cdf4335..c0d5d76 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-03-12 09:48+0100\n"
-"PO-Revision-Date: 2010-03-12 09:14+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-03-12 11:16+0200\n"
+"Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: french <fr at li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: libraries/auth/config.auth.lib.php:107
 #, php-format
@@ -35,10 +37,9 @@ msgstr ""
 
 #. l10n: Language to use for MySQL 5.1 documentation
 #: libraries/common.lib.php:411
-#, fuzzy
 msgctxt "$mysql_5_1_doc_lang"
 msgid "en"
-msgstr "fr"
+msgstr "en"
 
 #. l10n: Language to use for MySQL 5.0 documentation
 #: libraries/common.lib.php:415
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 41fc740..5989f75 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,13 +3,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-03-12 09:48+0100\n"
-"PO-Revision-Date: 2010-03-12 09:15+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-03-12 11:15+0200\n"
+"Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: chinese_simplified <zh_CN at 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"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: libraries/auth/config.auth.lib.php:107
 #, php-format
@@ -31,10 +33,9 @@ msgstr ""
 
 #. l10n: Language to use for MySQL 5.1 documentation
 #: libraries/common.lib.php:411
-#, fuzzy
 msgctxt "$mysql_5_1_doc_lang"
 msgid "en"
-msgstr "zh"
+msgstr "en"
 
 #. l10n: Language to use for MySQL 5.0 documentation
 #: libraries/common.lib.php:415


hooks/post-receive
-- 
phpMyAdmin