[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10523-g51129bc

[Michal Čihař]

The branch, master has been updated
       via  51129bc12f448883f39e863e1ad25aabed67a514 (commit)
       via  b4e8007d572fb361143454d7007112be2d4ccab9 (commit)
       via  c7ec6ed3cfa02e945a111ad89bd5b10fbfb1ef39 (commit)
      from  77e5bd4e07d8c93f62c47a58a4a44f82e8365bf6 (commit)


- Log -----------------------------------------------------------------
commit 51129bc12f448883f39e863e1ad25aabed67a514
Merge: 77e5bd4e07d8c93f62c47a58a4a44f82e8365bf6 b4e8007d572fb361143454d7007112be2d4ccab9
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Oct 4 14:49:30 2010 +0200

    Merge remote branch 'pootle/master'
    
    Conflicts:
    	po/en_GB.po

commit b4e8007d572fb361143454d7007112be2d4ccab9
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Mon Oct 4 13:11:11 2010 +0200

    Translation update done using Pootle.

commit c7ec6ed3cfa02e945a111ad89bd5b10fbfb1ef39
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Mon Oct 4 13:11:08 2010 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/en_GB.po |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index ec8ea0f..85799e3 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-10-04 08:08-0400\n"
-"PO-Revision-Date: 2010-09-23 18:12+0200\n"
-"Last-Translator: Marc Delisle <marc at infomarc.info>\n"
+"PO-Revision-Date: 2010-10-04 13:11+0200\n"
+"Last-Translator: Robert Readman <robert_readman at hotmail.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.5\n"
 
@@ -1070,16 +1070,14 @@ msgid "Searching"
 msgstr "Searching"
 
 #: js/messages.php:84
-#, fuzzy
 #| msgid "SQL Query box"
 msgid "Hide query box"
-msgstr "SQL Query box"
+msgstr "Hide query box"
 
 #: js/messages.php:85
-#, fuzzy
 #| msgid "SQL Query box"
 msgid "Show query box"
-msgstr "SQL Query box"
+msgstr "Show query box"
 
 #: js/messages.php:86
 msgid "Inline Edit"


hooks/post-receive
-- 
phpMyAdmin