The branch, master has been updated via 9f81cf3cf5199d9952ea8487a4d9afcda2e1ea16 (commit) via 9b2aa599ade28e196e780035aca44ec077aa03e6 (commit) via cbb204ec2a538f66362f32d1caa72aa089c38f27 (commit) via 6aef287e283d276f1d73ab26211399d088c07dfe (commit) via dbed304d006a503ed7183c01704327b53c17bcc6 (commit) via a36dc9cd35d561a2ad01048d9af6a6a517ffb6ac (commit) from 5b815953d9ba1413b78eadfa1b294011e6255400 (commit)

- Log ----------------------------------------------------------------- commit 9f81cf3cf5199d9952ea8487a4d9afcda2e1ea16 Author: Michal Čihař michal@cihar.com Date: Mon May 10 14:06:53 2010 +0200

Translation update done using Pootle.

commit 9b2aa599ade28e196e780035aca44ec077aa03e6 Author: Michal Čihař michal@cihar.com Date: Mon May 10 14:06:50 2010 +0200

Translation update done using Pootle.

commit cbb204ec2a538f66362f32d1caa72aa089c38f27 Author: Michal Čihař michal@cihar.com Date: Mon May 10 14:06:48 2010 +0200

Translation update done using Pootle.

commit 6aef287e283d276f1d73ab26211399d088c07dfe Author: Michal Čihař michal@cihar.com Date: Mon May 10 14:06:43 2010 +0200

Translation update done using Pootle.

commit dbed304d006a503ed7183c01704327b53c17bcc6 Author: Michal Čihař michal@cihar.com Date: Mon May 10 14:06:40 2010 +0200

Translation update done using Pootle.

commit a36dc9cd35d561a2ad01048d9af6a6a517ffb6ac Author: Michal Čihař michal@cihar.com Date: Mon May 10 14:06:27 2010 +0200

Translation update done using Pootle.

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

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

diff --git a/po/en_GB.po b/po/en_GB.po index a6f48c6..62e2494 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@lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-10 09:35+0200\n" -"PO-Revision-Date: 2010-05-04 11:46+0200\n" +"PO-Revision-Date: 2010-05-10 14:06+0200\n" "Last-Translator: Michal michal@cihar.com\n" "Language-Team: english-gb en_GB@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"

@@ -2808,7 +2808,6 @@ msgstr "Go to view"

#. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:142 -#, fuzzy #| msgid "None" msgctxt "None encoding conversion" msgid "None" @@ -2816,15 +2815,14 @@ msgstr "None"

#. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:146 -#, fuzzy #| msgid "Recoding engine" msgid "encoding conversion" -msgstr "Recoding engine" +msgstr "encoding conversion"

#. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:149 msgid "Convert to Kana" -msgstr "" +msgstr "Convert to Kana"

#. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:19 @@ -6739,7 +6737,6 @@ msgid "Jump to database" msgstr "Jump to database"

#: server_privileges.php:263 server_privileges.php:264 -#, fuzzy #| msgid "None" msgctxt "None privileges" msgid "None" @@ -6750,7 +6747,6 @@ msgid "Wildcards % and _ should be escaped with a \ to use them literally" msgstr "Wildcards % and _ should be escaped with a \ to use them literally"

#: server_privileges.php:1998 -#, fuzzy #| msgid "None" msgctxt "Create none database for user" msgid "None" @@ -8561,7 +8557,6 @@ msgid "Foreign key constraint" msgstr "Foreign key constraint"

#: tbl_structure.php:362 -#, fuzzy #| msgid "None" msgctxt "None for default" msgid "None"

hooks/post-receive