Merge remote branch 'pootle/master'

Conflicts:
	po/en_GB.po
This commit is contained in:
Michal Čihař
2010-10-04 14:49:30 +02:00

View File

@@ -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-10-04 08:08-0400\n"
"PO-Revision-Date: 2010-09-23 18:12+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"PO-Revision-Date: 2010-10-04 13:11+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"
"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"