Git
Threads by month
- ----- 2025 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 10 participants
- 38613 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2982-g9bb46c6
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via 9bb46c6fb5439c047f0de238c00ea196063ceaf8 (commit)
via 8835c9249b50780fcb70fcf3023fffa0ff040127 (commit)
from 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f (commit)
- Log -----------------------------------------------------------------
commit 9bb46c6fb5439c047f0de238c00ea196063ceaf8
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 16:46:53 2010 +0200
Load datepicker translations only if it is used.
commit 8835c9249b50780fcb70fcf3023fffa0ff040127
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 16:46:41 2010 +0200
Whitespace cleanup.
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 1653ceb..30969d6 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -22,45 +22,45 @@ require_once './libraries/common.inc.php';
// But this one is needed for PMA_escapeJsString()
require_once './libraries/js_escape.lib.php';
-$js_messages['strClickToSelect'] = __('Click to select');
-$js_messages['strClickToUnselect'] = __('Click to unselect');
-$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled.');
+$js_messages['strClickToSelect'] = __('Click to select');
+$js_messages['strClickToUnselect'] = __('Click to unselect');
+$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled.');
/* For confirmations */
-$js_messages['strDoYouReally'] = __('Do you really want to ');
-$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a complete database!');
+$js_messages['strDoYouReally'] = __('Do you really want to ');
+$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a complete database!');
/* For blobstreaming */
-$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!');
+$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!');
$js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure you want to disable all BLOB references for database %s?'), $GLOBALS['db']);
/* For indexes */
-$js_messages['strFormEmpty'] = __('Missing value in the form!');
-$js_messages['strNotNumber'] = __('This is not a number!');
+$js_messages['strFormEmpty'] = __('Missing value in the form!');
+$js_messages['strNotNumber'] = __('This is not a number!');
/* For server_privileges.js */
-$js_messages['strHostEmpty'] = __('The host name is empty!');
-$js_messages['strUserEmpty'] = __('The user name is empty!');
-$js_messages['strPasswordEmpty'] = __('The password is empty!');
-$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!');
+$js_messages['strHostEmpty'] = __('The host name is empty!');
+$js_messages['strUserEmpty'] = __('The user name is empty!');
+$js_messages['strPasswordEmpty'] = __('The password is empty!');
+$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!');
/* For inline query editing */
$js_messages['strGo'] = __('Go');
$js_messages['strCancel'] = __('Cancel');
/* Designer */
-$js_messages['strModifications'] = __('Modifications have been saved');
-$js_messages['strRelationDeleted'] = __('Relation deleted');
-$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation added');
-$js_messages['strInternalRelationAdded'] = __('Internal relation added');
-$js_messages['strErrorRelationAdded'] = __('Error: Relation not added.');
-$js_messages['strErrorRelationExists'] = __('Error: relation already exists.');
-$js_messages['strErrorSaveTable'] = __('Error saving coordinates for Designer.');
+$js_messages['strModifications'] = __('Modifications have been saved');
+$js_messages['strRelationDeleted'] = __('Relation deleted');
+$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation added');
+$js_messages['strInternalRelationAdded'] = __('Internal relation added');
+$js_messages['strErrorRelationAdded'] = __('Error: Relation not added.');
+$js_messages['strErrorRelationExists'] = __('Error: relation already exists.');
+$js_messages['strErrorSaveTable'] = __('Error saving coordinates for Designer.');
$js_messages['strGeneralRelationFeat:strDisabled'] = __('General relation features') . ': ' . __('Disabled');
-$js_messages['strSelectReferencedKey'] = __('Select referenced key');
-$js_messages['strSelectForeignKey'] = __('Select Foreign Key');
-$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key');
-$js_messages['strChangeDisplay'] = __('Choose field to display');
+$js_messages['strSelectReferencedKey'] = __('Select referenced key');
+$js_messages['strSelectForeignKey'] = __('Select Foreign Key');
+$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key');
+$js_messages['strChangeDisplay'] = __('Choose field to display');
echo "var PMA_messages = new Array();\n";
foreach ($js_messages as $name => $js_message) {
@@ -68,6 +68,7 @@ foreach ($js_messages as $name => $js_message) {
}
/* Calendar */
+echo "if ($.datepicker) {\n";
/* l10n: Display text for calendar close link */
PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done'));
/* l10n: Display text for previous month link in calendar */
@@ -165,3 +166,4 @@ PMA_printJsValue("$.datepicker.regional['']['minuteText']", __('Minute'));
PMA_printJsValue("$.datepicker.regional['']['secondText']", __('Second'));
?>
$.extend($.datepicker._defaults, $.datepicker.regional['']);
+} /* if ($.datepicker) */
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2980-g355b4c9
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f (commit)
from 23e96896ac9ba59e64eaa637fce0f389c95a2c2e (commit)
- Log -----------------------------------------------------------------
commit 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 15:26:22 2010 +0200
Cleanup after wrong merge.
-----------------------------------------------------------------------
Summary of changes:
po/fr.po | 17 +----------------
po/nb.po | 10 ----------
2 files changed, 1 insertions(+), 26 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index cc54f0e..f69a4dc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2836,36 +2836,21 @@ msgid "Go to view"
msgstr "Aller à la vue"
#. l10n: This is currently used only in Japanese locales
-<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:143
#, fuzzy
#| msgid "Recoding engine"
msgid "Encoding conversion"
-msgstr "Moteur de conversion"
+msgstr "Conversion de l'encodage"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:145
-#, fuzzy
-=======
#: libraries/kanji-encoding.lib.php:142
->>>>>>> pootle/master
#| msgid "None"
msgctxt "None encoding conversion"
msgid "None"
msgstr "aucune"
#. l10n: This is currently used only in Japanese locales
-<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:151
-=======
-#: libraries/kanji-encoding.lib.php:146
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Conversion de l'encodage"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
->>>>>>> pootle/master
msgid "Convert to Kana"
msgstr "Conversion en kana"
diff --git a/po/nb.po b/po/nb.po
index 06ad6e3..3eb7757 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2804,7 +2804,6 @@ msgid "Go to view"
msgstr "Gå til visning"
#. l10n: This is currently used only in Japanese locales
-<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:143
#, fuzzy
#| msgid "Recoding engine"
@@ -2812,28 +2811,19 @@ msgid "Encoding conversion"
msgstr "Rekodingsmotor"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:145
-#, fuzzy
-=======
#: libraries/kanji-encoding.lib.php:142
->>>>>>> pootle/master
#| msgid "None"
msgctxt "None encoding conversion"
msgid "None"
msgstr "Ingen"
#. l10n: This is currently used only in Japanese locales
-<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:151
-=======
-#: libraries/kanji-encoding.lib.php:146
-#| msgid "Recoding engine"
msgid "encoding conversion"
msgstr "kodingskonvertering"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:149
->>>>>>> pootle/master
msgid "Convert to Kana"
msgstr "Konverter til Kana"
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2979-g23e9689
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via 23e96896ac9ba59e64eaa637fce0f389c95a2c2e (commit)
via d381668355ea85f12c14412f57ec2511120b81a2 (commit)
from 7bf11881a021cb075c791faa4e0031dacb69ada8 (commit)
- Log -----------------------------------------------------------------
commit 23e96896ac9ba59e64eaa637fce0f389c95a2c2e
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 14:24:15 2010 +0200
Translation update done using Pootle.
commit d381668355ea85f12c14412f57ec2511120b81a2
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 14:24:04 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 181 +----------------------------------------------------------
po/en_GB.po | 7 +-
2 files changed, 6 insertions(+), 182 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index df750e3..70c8f9b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,13 +5,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-10 09:52+0200\n"
+"PO-Revision-Date: 2010-05-10 14:24+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Pootle 2.0.1\n"
@@ -2812,10 +2812,9 @@ msgstr "Přejít na podhled"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:143
-#, fuzzy
#| msgid "encoding conversion"
msgid "Encoding conversion"
-msgstr "konverze znakových sad"
+msgstr "Převod znakové sady"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:145
@@ -8571,177 +8570,3 @@ msgstr "Vytvořit index na %s sloupcích"
msgctxt "for MIME transformation"
msgid "Description"
msgstr "Popis"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Žádná"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Žádná"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""
-#~ "Přidělit všechna oprávnění na jméno odpovídající masce (uživatel\\_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Tabulka „%s“ neexistuje!"
-
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: „%1“"
-
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr "Chybné jméno serveru pro server %1. Prosím zkontrolujte nastavení."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Chyba při přejmenování tabulky %1$s na %2$s"
-
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "Nelze nahrát rozšíření [a@http://php.net/%1@Documentation][em]%1[/em][/"
-#~ "a], prosím zkontrolujte nastavení PHP."
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as master in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as master in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Tento server není nastaven jako nadřízený v replikačním procesu. Přejete "
-#~ "si ho <a href=\"%s\">nastavit</a>?"
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as slave in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as slave in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Tento server není nastaven jako podřízený v replikačním procesu. Přejete "
-#~ "si ho <a href=\"%s\">nastavit</a>?"
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Nepodařilo se připojit k MySQL serveru"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Je možné, že jste našli chybu v SQL parseru. Prosím prozkoumejte podrobně "
-#~ "SQL dotaz, především jestli jsou správně uvozovky a jestli nejsou "
-#~ "proházené. Další možnost selhání je pokud nahráváte soubor s binárními "
-#~ "daty nezapsanými v uvozovkách. Můžete také vyzkoušet příkazovou řádku "
-#~ "MySQL. Níže uvedený výstup z MySQL serveru (pokud je nějaký) vám také "
-#~ "může pomoci při zkoumání problému. Pokud stále máte problémy nebo pokud "
-#~ "SQL parser ohlásí chybu u dotazu, který na příkazové řádce funguje, "
-#~ "prosím pokuste se zredukovat dotaz na co nejmenší, ve kterém se problém "
-#~ "ještě vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí "
-#~ "VÝPIS uvedenou níže:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Kopírovat"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Odstranit uživatele a znovu načíst oprávnění."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr "Toto je nejčistší řešení, ale načítání oprávnění může trvat dlouho."
-
-#~ msgid "has been altered."
-#~ msgstr "byla změněna."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Prohlížeč Internet Explorer tuto funkci nepodporuje."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "Odstranění uživatelé stále budou mít přístup na server, dokud nebudou "
-#~ "znovu načtena oprávnění."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Jen odstranit uživatele z tabulek s oprávněními."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Umožňuje spouštět uložené procedury. V této verzi MySQL se nepoužívá."
-
-#~ msgid "Process list"
-#~ msgstr "Seznam procesů"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Znovu načíst oprávnění"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Uživatelé budou mít oprávnění „USAGE“ (používání), dokud nebudou znovu "
-#~ "načtena oprávnění."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Nativní formát MS Excelu"
-
-#~ msgid "Alter index(s)"
-#~ msgstr "Změnit indexy"
-
-#~ msgid "Tracking Mechanism"
-#~ msgstr "Sledovací mechanismus"
-
-#~ msgid "SELECT *"
-#~ msgstr "SELECT *"
-
-#~ msgid "SELECT"
-#~ msgstr "SELECT"
-
-#~ msgid "INSERT"
-#~ msgstr "INSERT"
-
-#~ msgid "UPDATE"
-#~ msgstr "UPDATE"
-
-#~ msgid "DELETE"
-#~ msgstr "DELETE"
diff --git a/po/en_GB.po b/po/en_GB.po
index a329561..e105fee 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(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-10 14:06+0200\n"
+"PO-Revision-Date: 2010-05-10 14:24+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: english-gb <en_GB(a)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,10 +2808,9 @@ msgstr "Go to view"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:143
-#, fuzzy
#| msgid "encoding conversion"
msgid "Encoding conversion"
-msgstr "encoding conversion"
+msgstr "Encoding conversion"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:145
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2977-g7bf1188
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via 7bf11881a021cb075c791faa4e0031dacb69ada8 (commit)
via 78bf68f4cd049877aa2421bcc1000c072992b242 (commit)
via 47f65e03a32d5fa93b306af1ab33265f1f6c4c1e (commit)
via 51becf5d6a7b15b78c17ed4d9da23e80fadba7c6 (commit)
via 3a69f57d2e4a48e6f59e3edff75308034b758b9d (commit)
via 03daa1112b0a15606c7dd52c7d8f916cb504573d (commit)
via a4b9ec7ab42db705d6d42bc0908b087646b46121 (commit)
via df15b29460dee6587b51bfa25fc89b47eb3bcb23 (commit)
via 5199997c5520e5bba5b22fd29a5bb6512690d6a7 (commit)
via b086c0ca73ce6f3f242e6ba2b4d08dacd163e953 (commit)
via cf3fd1b33d2b7b7c0a80fd26c7a094a718979071 (commit)
via 28eb92ee72ab28e192a4a8d810d98519c4a62b34 (commit)
via 83e93911ade08acdd1f0452a5a652a06a8515744 (commit)
via 72bae4b972c53c7d2d35a15137a94a667cb7547d (commit)
via 227ce7913b4d12c069639b8a749c631c21c76635 (commit)
from d47b913599355823b036d54093cf484c6236f9dd (commit)
- Log -----------------------------------------------------------------
commit 7bf11881a021cb075c791faa4e0031dacb69ada8
Merge: d47b913599355823b036d54093cf484c6236f9dd 78bf68f4cd049877aa2421bcc1000c072992b242
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 14:20:47 2010 +0200
Merge remote branch 'pootle/master'
Conflicts:
po/fr.po
po/hi.po
po/nb.po
commit 78bf68f4cd049877aa2421bcc1000c072992b242
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:17:29 2010 +0200
Translation update done using Pootle.
commit 47f65e03a32d5fa93b306af1ab33265f1f6c4c1e
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:17:02 2010 +0200
Translation update done using Pootle.
commit 51becf5d6a7b15b78c17ed4d9da23e80fadba7c6
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:16:49 2010 +0200
Translation update done using Pootle.
commit 3a69f57d2e4a48e6f59e3edff75308034b758b9d
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:16:32 2010 +0200
Translation update done using Pootle.
commit 03daa1112b0a15606c7dd52c7d8f916cb504573d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Mon May 10 14:16:01 2010 +0200
Translation update done using Pootle.
commit a4b9ec7ab42db705d6d42bc0908b087646b46121
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:16:00 2010 +0200
Translation update done using Pootle.
commit df15b29460dee6587b51bfa25fc89b47eb3bcb23
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:15:48 2010 +0200
Translation update done using Pootle.
commit 5199997c5520e5bba5b22fd29a5bb6512690d6a7
Author: Marc Delisle <marc(a)infomarc.info>
Date: Mon May 10 14:14:01 2010 +0200
Translation update done using Pootle.
commit b086c0ca73ce6f3f242e6ba2b4d08dacd163e953
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:14:00 2010 +0200
Translation update done using Pootle.
commit cf3fd1b33d2b7b7c0a80fd26c7a094a718979071
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 14:13:40 2010 +0200
Translation update done using Pootle.
commit 28eb92ee72ab28e192a4a8d810d98519c4a62b34
Author: Marc Delisle <marc(a)infomarc.info>
Date: Mon May 10 14:13:34 2010 +0200
Translation update done using Pootle.
commit 83e93911ade08acdd1f0452a5a652a06a8515744
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Mon May 10 14:08:32 2010 +0200
Translation update done using Pootle.
commit 72bae4b972c53c7d2d35a15137a94a667cb7547d
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Mon May 10 14:08:23 2010 +0200
Translation update done using Pootle.
commit 227ce7913b4d12c069639b8a749c631c21c76635
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Mon May 10 14:07:39 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/fr.po | 18 ++++++++++++++++--
po/hi.po | 9 ++++-----
po/nb.po | 20 +++++++++++++++++---
3 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 9b87ffd..cc54f0e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-09 22:26+0200\n"
+"PO-Revision-Date: 2010-05-10 14:16+0200\n"
"Last-Translator: Marc <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -2836,6 +2836,7 @@ msgid "Go to view"
msgstr "Aller à la vue"
#. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:143
#, fuzzy
#| msgid "Recoding engine"
@@ -2845,15 +2846,28 @@ msgstr "Moteur de conversion"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:145
#, fuzzy
+=======
+#: libraries/kanji-encoding.lib.php:142
+>>>>>>> pootle/master
#| msgid "None"
msgctxt "None encoding conversion"
msgid "None"
msgstr "aucune"
#. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:151
+=======
+#: libraries/kanji-encoding.lib.php:146
+#| msgid "Recoding engine"
+msgid "encoding conversion"
+msgstr "Conversion de l'encodage"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:149
+>>>>>>> pootle/master
msgid "Convert to Kana"
-msgstr ""
+msgstr "Conversion en kana"
#. l10n: Text direction, use either ltr or rtl
#: libraries/messages.inc.php:19
diff --git a/po/hi.po b/po/hi.po
index 14125b0..955fca3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-10 10:00+0200\n"
+"PO-Revision-Date: 2010-05-10 14:17+0200\n"
"Last-Translator: <u4663530(a)anu.edu.au>\n"
"Language-Team: hindi <hi(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -227,7 +227,7 @@ msgstr " डेटाबेस %s से %s में कॉपी किया
#: db_operations.php:410 libraries/messages.inc.php:244
msgid "Rename database to"
-msgstr "दताबसे का नाम बदल कर ____ रखें"
+msgstr "डेटाबेस का नाम बदल कर ____ रखें"
#: db_operations.php:415 libraries/messages.inc.php:169
#: server_processlist.php:57
@@ -259,7 +259,7 @@ msgstr "केवल डाटा"
#: db_operations.php:468 libraries/messages.inc.php:194
msgid "CREATE DATABASE before copying"
-msgstr "डेटाबेस कॉपी करने पहले डेटाबेस का निर्माण करें"
+msgstr "डेटाबेस कॉपी करने से पहले डेटाबेस का निर्माण करें"
#: db_operations.php:471 libraries/export/sql.php:52
#: libraries/export/sql.php:74 libraries/export/sql.php:76
@@ -293,7 +293,6 @@ msgid "Status"
msgstr "स्थिति"
#: db_operations.php:544
-#, fuzzy
#| msgctxt "$strBLOBRepositoryEnabled"
#| msgid "Enabled"
msgctxt "BLOB repository"
@@ -330,7 +329,7 @@ msgstr "सक्षम"
#: tbl_select.php:137 tbl_structure.php:179 tbl_structure.php:768
#: tbl_tracking.php:275 tbl_tracking.php:326
msgid "Collation"
-msgstr ""
+msgstr "क्रम में करें"
#: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34
#, php-format
diff --git a/po/nb.po b/po/nb.po
index 146ab4c..06ad6e3 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 14:17+0200\n"
-"PO-Revision-Date: 2010-05-06 08:35+0200\n"
+"PO-Revision-Date: 2010-05-10 14:08+0200\n"
"Last-Translator: <sven.erik.andersen(a)gmail.com>\n"
"Language-Team: norwegian <no(a)li.org>\n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -2804,6 +2804,7 @@ msgid "Go to view"
msgstr "Gå til visning"
#. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:143
#, fuzzy
#| msgid "Recoding engine"
@@ -2813,15 +2814,28 @@ msgstr "Rekodingsmotor"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:145
#, fuzzy
+=======
+#: libraries/kanji-encoding.lib.php:142
+>>>>>>> pootle/master
#| msgid "None"
msgctxt "None encoding conversion"
msgid "None"
msgstr "Ingen"
#. l10n: This is currently used only in Japanese locales
+<<<<<<< HEAD
#: libraries/kanji-encoding.lib.php:151
+=======
+#: libraries/kanji-encoding.lib.php:146
+#| msgid "Recoding engine"
+msgid "encoding conversion"
+msgstr "kodingskonvertering"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:149
+>>>>>>> pootle/master
msgid "Convert to Kana"
-msgstr ""
+msgstr "Konverter til Kana"
#. l10n: Text direction, use either ltr or rtl
#: libraries/messages.inc.php:19
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2962-gd47b913
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via d47b913599355823b036d54093cf484c6236f9dd (commit)
from 9f81cf3cf5199d9952ea8487a4d9afcda2e1ea16 (commit)
- Log -----------------------------------------------------------------
commit d47b913599355823b036d54093cf484c6236f9dd
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 14:17:34 2010 +0200
Adjust Kanji encoding feature to match look of the rest interface.
Move all options to single <fieldset>, now it looks at least consistent
with rest of the dialogs where it is being used.
-----------------------------------------------------------------------
Summary of changes:
libraries/display_export.lib.php | 2 --
libraries/kanji-encoding.lib.php | 10 +++++++---
po/af.po | 20 ++++++++++----------
po/ar.po | 20 ++++++++++----------
po/az.po | 20 ++++++++++----------
po/be.po | 22 +++++++++++-----------
po/be(a)latin.po | 20 ++++++++++----------
po/bg.po | 22 +++++++++++-----------
po/bn.po | 22 +++++++++++-----------
po/bs.po | 20 ++++++++++----------
po/ca.po | 24 ++++++++++++------------
po/cs.po | 24 ++++++++++++------------
po/da.po | 20 ++++++++++----------
po/de.po | 24 ++++++++++++------------
po/el.po | 24 ++++++++++++------------
po/en_GB.po | 29 +++++++++++++----------------
po/es.po | 24 ++++++++++++------------
po/et.po | 22 +++++++++++-----------
po/eu.po | 20 ++++++++++----------
po/fa.po | 20 ++++++++++----------
po/fi.po | 24 ++++++++++++------------
po/fr.po | 26 +++++++++++++-------------
po/gl.po | 24 ++++++++++++------------
po/he.po | 20 ++++++++++----------
po/hi.po | 26 +++++++++++---------------
po/hr.po | 22 +++++++++++-----------
po/hu.po | 24 ++++++++++++------------
po/id.po | 20 ++++++++++----------
po/it.po | 24 ++++++++++++------------
po/ja.po | 22 ++++++++++++----------
po/ka.po | 24 ++++++++++++------------
po/ko.po | 20 ++++++++++----------
po/lt.po | 22 +++++++++++-----------
po/lv.po | 20 ++++++++++----------
po/mk.po | 20 ++++++++++----------
po/mn.po | 20 ++++++++++----------
po/ms.po | 20 ++++++++++----------
po/nb.po | 24 ++++++++++++------------
po/nl.po | 24 ++++++++++++------------
po/phpmyadmin.pot | 18 +++++++++---------
po/pl.po | 24 ++++++++++++------------
po/pt.po | 20 ++++++++++----------
po/pt_BR.po | 22 +++++++++++-----------
po/ro.po | 22 +++++++++++-----------
po/ru.po | 24 ++++++++++++------------
po/si.po | 22 +++++++++++-----------
po/sk.po | 22 +++++++++++-----------
po/sl.po | 24 ++++++++++++------------
po/sq.po | 20 ++++++++++----------
po/sr.po | 22 +++++++++++-----------
po/sr(a)latin.po | 22 +++++++++++-----------
po/sv.po | 24 ++++++++++++------------
po/ta.po | 18 +++++++++---------
po/te.po | 20 ++++++++++----------
po/th.po | 20 ++++++++++----------
po/tr.po | 24 ++++++++++++------------
po/tt.po | 22 +++++++++++-----------
po/uk.po | 20 ++++++++++----------
po/ur.po | 18 +++++++++---------
po/uz.po | 24 ++++++++++++------------
po/uz(a)latin.po | 24 ++++++++++++------------
po/zh_CN.po | 24 ++++++++++++------------
po/zh_TW.po | 22 +++++++++++-----------
63 files changed, 677 insertions(+), 680 deletions(-)
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 160e7bf..a3ba84e 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -267,9 +267,7 @@ if ($is_zip || $is_gzip || $is_bzip) { ?>
<?php if (function_exists('PMA_set_enc_form')) { ?>
<!-- Encoding setting form appended by Y.Kawada -->
<!-- Japanese encoding setting -->
-<fieldset>
<?php echo PMA_set_enc_form(' '); ?>
-</fieldset>
<?php } ?>
<fieldset class="tblFooters">
diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php
index 9b6d9b1..e1590a3 100644
--- a/libraries/kanji-encoding.lib.php
+++ b/libraries/kanji-encoding.lib.php
@@ -138,15 +138,19 @@ function PMA_kanji_file_conv($file, $enc, $kana) {
*/
function PMA_set_enc_form($spaces) {
return "\n"
+ . "<fieldset>\n"
+ /* l10n: This is currently used only in Japanese locales */
+ . $spaces . '<legend>' . __('Encoding conversion') . '</legend>' . "\n"
/* l10n: This is currently used only in Japanese locales */
. $spaces . '<input type="radio" name="knjenc" value="" checked="checked" id="kj-none" /><label for="kj-none">' . _pgettext('None encoding conversion', 'None') . "</label>\n"
. $spaces . '<input type="radio" name="knjenc" value="EUC-JP" id="kj-euc" /><label for="kj-euc">EUC</label>' . "\n"
. $spaces . '<input type="radio" name="knjenc" value="SJIS" id="kj-sjis" /><label for="kj-sjis">SJIS</label>' . "\n"
- /* l10n: This is currently used only in Japanese locales */
- . $spaces . ' ' . __('encoding conversion') . '<br />' . "\n"
+ . $spaces . '<br />'
. $spaces . '<input type="checkbox" name="xkana" value="kana" id="kj-kana" />' . "\n"
/* l10n: This is currently used only in Japanese locales */
- . $spaces . ' <label for="kj-kana">' . __('Convert to Kana') . '</label><br />' . "\n";
+ . $spaces . '<label for="kj-kana">' . __('Convert to Kana') . '</label><br />' . "\n"
+ . "</fieldset>\n"
+ ;
} // end of the 'PMA_set_enc_form' function
diff --git a/po/af.po b/po/af.po
index dd4f731..7c2f5ab 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:04+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: afrikaans <af(a)li.org>\n"
@@ -49,7 +49,7 @@ msgstr "Soek"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2123,7 +2123,7 @@ msgstr "\"ge-gzip\""
msgid "bzipped"
msgstr "\"ge-bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2805,7 +2805,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2813,12 +2818,7 @@ msgid "None"
msgstr "Geen"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index f2fcf3e..d250b78 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: arabic <ar(a)li.org>\n"
@@ -49,7 +49,7 @@ msgstr "ابحث"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2111,7 +2111,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2782,7 +2782,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2790,12 +2795,7 @@ msgid "None"
msgstr "لا شيء"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/az.po b/po/az.po
index 84f2aab..7399840 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: azerbaijani <az(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Axtarış"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2130,7 +2130,7 @@ msgstr "\"gzip\"lenmiş"
msgid "bzipped"
msgstr "\"bzip\"lenmiş"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2813,7 +2813,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2821,12 +2826,7 @@ msgid "None"
msgstr "Heç biri"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/be.po b/po/be.po
index a918b8c..c052c7c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: belarusian_cyrillic <be(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Пошук"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2170,7 +2170,7 @@ msgstr "архіваваны ў gzip"
msgid "bzipped"
msgstr "сьціскаць у bzip"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Рэжым сумяшчальнасьці SQL"
@@ -2898,7 +2898,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "Вэрсія кліента MySQL"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2906,13 +2912,7 @@ msgid "None"
msgstr "Няма"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "Вэрсія кліента MySQL"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/be(a)latin.po b/po/be(a)latin.po
index a77c408..ec0f6ec 100644
--- a/po/be(a)latin.po
+++ b/po/be(a)latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:09+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: belarusian_latin <be@latin@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Pošuk"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2165,7 +2165,7 @@ msgstr "archivavany ŭ gzip"
msgid "bzipped"
msgstr "ściskać u bzip"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Režym sumiaščalnaści SQL"
@@ -2893,7 +2893,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2901,12 +2906,7 @@ msgid "None"
msgstr "Nijakaja"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index c3441e3..ef228d4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bulgarian <bg(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Търсене"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2140,7 +2140,7 @@ msgstr "\"gzip-нато\""
msgid "bzipped"
msgstr "\"bzip-нато\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Режим на съвместимост на SQL"
@@ -2821,7 +2821,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "Версия на клиента за MySQL"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2829,13 +2835,7 @@ msgid "None"
msgstr "Няма"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "Версия на клиента за MySQL"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 06bbd84..e23caef 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bangla <bn(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "খুঁজুন"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2151,7 +2151,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -2854,7 +2854,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "MySQL client version"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2862,13 +2868,7 @@ msgid "None"
msgstr "কোনটিই নয়"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "MySQL client version"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 2d234f4..2115388 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bosnian <bs(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Pretraživanje"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2130,7 +2130,7 @@ msgstr "\"gzip-ovano\""
msgid "bzipped"
msgstr "\"bzip-ovano\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2812,7 +2812,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2820,12 +2825,7 @@ msgid "None"
msgstr "nema"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index e7dd32d..f977b0a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:13+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: catalan <ca(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Cerca"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2156,7 +2156,7 @@ msgstr "\"comprimit amb gzip\""
msgid "bzipped"
msgstr "\"comprimit amb bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Modus de compatibilitat SQL"
@@ -2890,7 +2890,14 @@ msgid "Go to view"
msgstr "Vés a la vista"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Motor d'enregistrament"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2898,14 +2905,7 @@ msgid "None"
msgstr "Res"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Motor d'enregistrament"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 409496b..df750e3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-05-10 09:52+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Vyhledávání"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2087,7 +2087,7 @@ msgstr "„zagzipováno“"
msgid "bzipped"
msgstr "„zabzipováno“"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Režim kompatibility SQL"
@@ -2811,20 +2811,20 @@ msgid "Go to view"
msgstr "Přejít na podhled"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
-#| msgid "None"
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "encoding conversion"
+msgid "Encoding conversion"
+msgstr "konverze znakových sad"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
msgctxt "None encoding conversion"
msgid "None"
msgstr "Žádná"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "konverze znakových sad"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr "Převést na Kanu"
diff --git a/po/da.po b/po/da.po
index c746ccd..415fe43 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:13+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: danish <da(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Søg"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2143,7 +2143,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL-kompatibilitetsmodus"
@@ -2837,7 +2837,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2845,12 +2850,7 @@ msgid "None"
msgstr "Ingen"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/de.po b/po/de.po
index d4c6dd9..a96ea12 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-23 21:07+0200\n"
"Last-Translator: <me(a)michaelkeck.de>\n"
"Language-Team: german <de(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Suche"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2177,7 +2177,7 @@ msgstr "GZip-komprimiert"
msgid "bzipped"
msgstr "BZip-komprimiert"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL-Kompatibilitätsmodus"
@@ -2902,7 +2902,14 @@ msgid "Go to view"
msgstr "Gehe zum View"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Umwandlungs Engine"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2910,14 +2917,7 @@ msgid "None"
msgstr "keine"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Umwandlungs Engine"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/el.po b/po/el.po
index e450d6e..c529b7f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:16+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: greek <el(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Αναζήτηση"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2166,7 +2166,7 @@ msgstr "συμπίεση «gzip»"
msgid "bzipped"
msgstr "συμπίεση «bzip»"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Κατάσταση συμβατότητας SQL"
@@ -2901,7 +2901,14 @@ msgid "Go to view"
msgstr "Μετάβαση στην προβολή"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Μηχανή επανακωδικοποίησης"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2909,14 +2916,7 @@ msgid "None"
msgstr "Καμία"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Μηχανή επανακωδικοποίησης"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 62e2494..a329561 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-05-10 14:06+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: english-gb <en_GB(a)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"
@@ -52,7 +52,7 @@ msgstr "Search"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2081,7 +2081,7 @@ msgstr "gzipped"
msgid "bzipped"
msgstr "bzipped"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -2807,20 +2807,20 @@ msgid "Go to view"
msgstr "Go to view"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
-#| msgid "None"
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "encoding conversion"
+msgid "Encoding conversion"
+msgstr "encoding conversion"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
msgctxt "None encoding conversion"
msgid "None"
msgstr "None"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "encoding conversion"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr "Convert to Kana"
@@ -6737,7 +6737,6 @@ msgid "Jump to database"
msgstr "Jump to database"
#: server_privileges.php:263 server_privileges.php:264
-#| msgid "None"
msgctxt "None privileges"
msgid "None"
msgstr "None"
@@ -6747,7 +6746,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
-#| msgid "None"
msgctxt "Create none database for user"
msgid "None"
msgstr "None"
@@ -8557,7 +8555,6 @@ msgid "Foreign key constraint"
msgstr "Foreign key constraint"
#: tbl_structure.php:362
-#| msgid "None"
msgctxt "None for default"
msgid "None"
msgstr "None"
diff --git a/po/es.po b/po/es.po
index 0b56fd8..b7259ad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 11:23+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: spanish <es(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Buscar"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2181,7 +2181,7 @@ msgstr "\"Comprimido con gzip\""
msgid "bzipped"
msgstr "\"Comprimido con bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Modalidad compatible con SQL"
@@ -2922,7 +2922,14 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Motor de recodificación"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2930,14 +2937,7 @@ msgid "None"
msgstr "Ninguna"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Motor de recodificación"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/et.po b/po/et.po
index 224ab28..2c7807f 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: estonian <et(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Otsi"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2146,7 +2146,7 @@ msgstr "\"gzipitud\""
msgid "bzipped"
msgstr "\"bzipitud\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL ühilduvus viis"
@@ -2846,7 +2846,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "MySQL kliendi versioon"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2854,13 +2860,7 @@ msgid "None"
msgstr "Pole"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "MySQL kliendi versioon"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 564af86..35cdd7d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-31 10:40+0200\n"
"Last-Translator: <hey_neken(a)mundurat.net>\n"
"Language-Team: basque <eu(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Bilatu"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2134,7 +2134,7 @@ msgstr "\"gzip-ez trinkotuta\""
msgid "bzipped"
msgstr "\"Bzip-ez trinkotua\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2816,7 +2816,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2824,12 +2829,7 @@ msgid "None"
msgstr "Batez"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/fa.po b/po/fa.po
index b1f57b8..36ee02a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: persian <fa(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "جستجو"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2122,7 +2122,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2801,7 +2801,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2809,12 +2814,7 @@ msgid "None"
msgstr "خير"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index a31cff9..0eeba93 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-30 18:08+0200\n"
"Last-Translator: <kajouni(a)gmail.com>\n"
"Language-Team: finnish <fi(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Etsi"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2154,7 +2154,7 @@ msgstr "\"gzip-pakkaus\""
msgid "bzipped"
msgstr "\"bzip-pakkaus\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL-yhteensopiva tila"
@@ -2880,7 +2880,14 @@ msgid "Go to view"
msgstr "Siirry näkymään"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Merkistön uudelleenkoodaus"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2888,14 +2895,7 @@ msgid "None"
msgstr "Ei mitään"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Merkistön uudelleenkoodaus"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 487895d..9b87ffd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-05-09 22:26+0200\n"
"Last-Translator: Marc <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
-"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -52,7 +52,7 @@ msgstr "Rechercher"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2101,7 +2101,7 @@ msgstr "gzippé"
msgid "bzipped"
msgstr "bzippé"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Mode de compatibilité SQL"
@@ -2836,7 +2836,14 @@ msgid "Go to view"
msgstr "Aller à la vue"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Moteur de conversion"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2844,14 +2851,7 @@ msgid "None"
msgstr "aucune"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Moteur de conversion"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index cecb754..c97b668 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: galician <gl(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Procurar"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2160,7 +2160,7 @@ msgstr "comprimido no formato \"gzip\""
msgid "bzipped"
msgstr "comprimido no formato \"bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Modo de compatiblidade SQL"
@@ -2894,7 +2894,14 @@ msgid "Go to view"
msgstr "Ir á vista"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Motor de recodificación"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2902,14 +2909,7 @@ msgid "None"
msgstr "Ningunha"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Motor de recodificación"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/he.po b/po/he.po
index 9b42424..1d2bfe6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:15+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: hebrew <he(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "חיפוש"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2122,7 +2122,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2804,7 +2804,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2812,12 +2817,7 @@ msgid "None"
msgstr "ללא"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index d1ccd52..14125b0 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,14 +3,14 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-05-10 10:00+0200\n"
"Last-Translator: <u4663530(a)anu.edu.au>\n"
"Language-Team: hindi <hi(a)li.org>\n"
-"Language: hi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -51,7 +51,7 @@ msgstr "खोजें"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -309,15 +309,11 @@ msgid "Damaged"
msgstr "क्षतिग्रस्त"
#: db_operations.php:562
-#| msgctxt "$strBLOBRepositoryRepair"
-#| msgid "Repair"
msgctxt "BLOB repository"
msgid "Repair"
msgstr "मरम्मत"
#: db_operations.php:570
-#| msgctxt "$strBLOBRepositoryDisabled"
-#| msgid "Disabled"
msgctxt "BLOB repository"
msgid "Disabled"
msgstr "असक्षम"
@@ -2083,7 +2079,7 @@ msgstr ""
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2756,7 +2752,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "No"
msgctxt "None encoding conversion"
@@ -2764,12 +2765,7 @@ msgid "None"
msgstr "नहीं"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 91f2c21..161349a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:13+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: croatian <hr(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Traži"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2163,7 +2163,7 @@ msgstr "\"gzipano\""
msgid "bzipped"
msgstr "\"bzipano\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Način rada SQL kompatibilnosti"
@@ -2891,7 +2891,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "MySQL verzija klijenta"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2899,13 +2905,7 @@ msgid "None"
msgstr "bez kompresije"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "MySQL verzija klijenta"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 5a6fcc9..2e532d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:15+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: hungarian <hu(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Keresés"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2168,7 +2168,7 @@ msgstr "\"gzip tömörítés\""
msgid "bzipped"
msgstr "\"bzip tömörítés\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL kompatibilitási mód"
@@ -2897,7 +2897,14 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Átkódoló motor"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2905,14 +2912,7 @@ msgid "None"
msgstr "Nincs"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Átkódoló motor"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/id.po b/po/id.po
index 4d13295..94b4a88 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-17 21:14+0200\n"
"Last-Translator: Azhari Harahap <azhari.harahap(a)yahoo.com>\n"
"Language-Team: indonesian <id(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Cari"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2137,7 +2137,7 @@ msgstr "Dikompress dengan GZip"
msgid "bzipped"
msgstr "\"Dikompress dengan BZip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2837,7 +2837,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2845,12 +2850,7 @@ msgid "None"
msgstr "tanpa"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 598a3ed..cb0b7c0 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-11 11:19+0200\n"
"Last-Translator: Fabio <fantonifabio(a)tiscali.it>\n"
"Language-Team: italian <it(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Cerca"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2164,7 +2164,7 @@ msgstr "\"compresso con gzip\""
msgid "bzipped"
msgstr "\"compresso con bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Modo di compatibilità SQL"
@@ -2899,7 +2899,14 @@ msgid "Go to view"
msgstr "Vai alla visualizzazione"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Use light version"
+msgid "Encoding conversion"
+msgstr "Usa versione leggera"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2907,14 +2914,7 @@ msgid "None"
msgstr "Nessuno"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Use light version"
-msgid "encoding conversion"
-msgstr "Usa versione leggera"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 5f72223..c1f5ea8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 11:22+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: japanese <jp(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "検索"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2142,7 +2142,7 @@ msgstr "\"gzip 形式\""
msgid "bzipped"
msgstr "\"bzip 形式\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL互換モード"
@@ -2859,7 +2859,14 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "encoding conversion"
+msgid "Encoding conversion"
+msgstr "エンコーディングへ変換する"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2867,12 +2874,7 @@ msgid "None"
msgstr "なし"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr "エンコーディングへ変換する"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr "全角カナへ変換する"
diff --git a/po/ka.po b/po/ka.po
index 4677fa7..4f0152b 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-
"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: georgian <ka(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "ძებნა"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2158,7 +2158,7 @@ msgstr "\"gzip-ით დაარქივებული\""
msgid "bzipped"
msgstr "\"bzip-ით დაარქივებული\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -2882,7 +2882,14 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Recoding engine"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2890,14 +2897,7 @@ msgid "None"
msgstr "არაა"
#. 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"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 077abeb..b6f0755 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: korean <ko(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "검색"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2117,7 +2117,7 @@ msgstr "gz 압축"
msgid "bzipped"
msgstr "\"bz 압축\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2798,7 +2798,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2806,12 +2811,7 @@ msgid "None"
msgstr "없음"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index f212bab..b4b56dc 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-16 19:52+0200\n"
"Last-Translator: Rytis <rytis.s(a)gmail.com>\n"
"Language-Team: lithuanian <lt(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Paieška"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2140,7 +2140,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL suderinamumas"
@@ -2831,7 +2831,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "MySQL kliento versija"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2839,13 +2845,7 @@ msgid "None"
msgstr "Nėra"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "MySQL kliento versija"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/lv.po b/po/lv.po
index e75ad16..b7ad98f 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: latvian <lv(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Meklēt"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2133,7 +2133,7 @@ msgstr "Arhivēts ar gzip"
msgid "bzipped"
msgstr "Arhivēts ar bzip"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2815,7 +2815,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2823,12 +2828,7 @@ msgid "None"
msgstr "Nav"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 31b2026..f8b0a62 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: macedonian_cyrillic <mk(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Пребарување"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2139,7 +2139,7 @@ msgstr "\"gzip\""
msgid "bzipped"
msgstr "\"bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2840,7 +2840,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2848,12 +2853,7 @@ msgid "None"
msgstr "нема"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/mn.po b/po/mn.po
index 4963944..0303308 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: mongolian <mn(a)li.org>\n"
@@ -49,7 +49,7 @@ msgstr "Хайх"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2118,7 +2118,7 @@ msgstr "gzip-ээр шахах"
msgid "bzipped"
msgstr "bzip-ээр шахагдсан"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL нийцтэй горим"
@@ -2809,7 +2809,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2817,12 +2822,7 @@ msgid "None"
msgstr "Байхгүй"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 08f2480..27d6785 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: malay <ms(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Cari"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2124,7 +2124,7 @@ msgstr "\"digzip\""
msgid "bzipped"
msgstr "bzipped"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2806,7 +2806,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2814,12 +2819,7 @@ msgid "None"
msgstr "Tiada"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 7090e79..146ab4c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-05-06 08:35+0200\n"
"Last-Translator: <sven.erik.andersen(a)gmail.com>\n"
"Language-Team: norwegian <no(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Søk"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2077,7 +2077,7 @@ msgstr "Komprimert (gz)"
msgid "bzipped"
msgstr "Komprimert (bz2)"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL kompatibilitetsmodus"
@@ -2804,7 +2804,14 @@ msgid "Go to view"
msgstr "Gå til visning"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Rekodingsmotor"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2812,14 +2819,7 @@ msgid "None"
msgstr "Ingen"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Rekodingsmotor"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index db7e43f..93c3f2e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-26 15:46+0200\n"
"Last-Translator: <rink(a)initfour.nl>\n"
"Language-Team: dutch <nl(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Zoeken"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2167,7 +2167,7 @@ msgstr "\"ge-gzipt\""
msgid "bzipped"
msgstr "\"ge-bzipt\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL-compatibiliteits mode"
@@ -2901,7 +2901,14 @@ msgid "Go to view"
msgstr "Ga naar view"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Hercoderings engine"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2909,14 +2916,7 @@ msgid "None"
msgstr "Geen"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Hercoderings engine"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 1792ce8..c662c2e 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2033,7 +2033,7 @@ msgstr ""
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2704,18 +2704,18 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
-msgctxt "None encoding conversion"
-msgid "None"
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
+#: libraries/kanji-encoding.lib.php:145
+msgctxt "None encoding conversion"
+msgid "None"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 1782c5f..357fec4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: polish <pl(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Szukaj"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2162,7 +2162,7 @@ msgstr "\".gz\""
msgid "bzipped"
msgstr "\".bz2\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Tryb zgodności SQL"
@@ -2883,7 +2883,14 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Mechanizm konwersji kodowania napisów"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2891,14 +2898,7 @@ msgid "None"
msgstr "Brak"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Mechanizm konwersji kodowania napisów"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/pt.po b/po/pt.po
index a7f8013..8d2d585 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: portuguese <pt(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Pesquisar"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2138,7 +2138,7 @@ msgstr "\"Compressão gzip\""
msgid "bzipped"
msgstr "\"Compressão bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2823,7 +2823,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2831,12 +2836,7 @@ msgid "None"
msgstr "Nenhum"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 986cc10..37c251a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-21 05:17+0200\n"
"Last-Translator: Maurício Meneghini Fauth <mauriciofauth(a)gmail.com>\n"
"Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Procurar"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2155,7 +2155,7 @@ msgstr "\"compactado com gzip\""
msgid "bzipped"
msgstr "\"compactado com bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Modo de compatibilidade SQL"
@@ -2858,7 +2858,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "Versão do cliente MySQL"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2866,13 +2872,7 @@ msgid "None"
msgstr "Nenhum"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "Versão do cliente MySQL"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 81d4b35..7088ba5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-13 00:41+0200\n"
"Last-Translator: <ronaldinia(a)yahoo.com>\n"
"Language-Team: romanian <ro(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Caută"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2168,7 +2168,7 @@ msgstr "cu „gzip”"
msgid "bzipped"
msgstr "cu „bzip2”"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Regim de compatibilitate SQL"
@@ -2893,7 +2893,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "Versiunea clientului MySQL"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2901,13 +2907,7 @@ msgid "None"
msgstr "Nici unul(a)"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "Versiunea clientului MySQL"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index baed425..68f7162 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:23+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: russian <ru(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Поиск"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2163,7 +2163,7 @@ msgstr "gzip"
msgid "bzipped"
msgstr "bzip"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Режим совместимости SQL"
@@ -2893,7 +2893,14 @@ msgid "Go to view"
msgstr "Перейти к отображению (VIEW)"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Механизм перекодирования"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2901,14 +2908,7 @@ msgid "None"
msgstr "Нет"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Механизм перекодирования"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/si.po b/po/si.po
index 7d1c4be..ec817bf 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:09+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: sinhala <si(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "සෙවීම"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2149,7 +2149,7 @@ msgstr "\"gzipp ගත කරන ලදි\""
msgid "bzipped"
msgstr "\"bzipp ගතකරන ලදි\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL compatibility mode"
@@ -2852,7 +2852,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "MySQL සේවාදායකයාගේ සංස්කරණය"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2860,13 +2866,7 @@ msgid "None"
msgstr "කිසිවක් නැත"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "MySQL සේවාදායකයාගේ සංස්කරණය"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/sk.po b/po/sk.po
index bee0010..b651b8f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:47+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: slovak <sk(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Hľadať"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2150,7 +2150,7 @@ msgstr "\"gzip-ované\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Režim kompatibility SQL"
@@ -2854,7 +2854,13 @@ msgid "Go to view"
msgstr "Prejsť na Prejsť na pohľad"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "Verzia MySQL klienta"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2862,13 +2868,7 @@ msgid "None"
msgstr "Žiadny"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "Verzia MySQL klienta"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index c1b0702..4635adc 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-05-07 23:30+0200\n"
"Last-Translator: <dbc334(a)gmail.com>\n"
"Language-Team: slovenian <sl(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Iskanje"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2091,7 +2091,7 @@ msgstr "gzipano"
msgid "bzipped"
msgstr "bzipano"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Združljivostni način SQL"
@@ -2785,7 +2785,14 @@ msgid "Go to view"
msgstr "Pojdi na pogled"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Use light version"
+msgid "Encoding conversion"
+msgstr "Uporabi lahko različico"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2793,14 +2800,7 @@ msgid "None"
msgstr "Brez"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Use light version"
-msgid "encoding conversion"
-msgstr "Uporabi lahko različico"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 79d0d23..b6a8f75 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:08+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: albanian <sq(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Kërko"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2130,7 +2130,7 @@ msgstr "\"kompresuar me gzip\""
msgid "bzipped"
msgstr "\"kompresuar me bzip2\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2812,7 +2812,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2820,12 +2825,7 @@ msgid "None"
msgstr "Asnjë lloj"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 81d2fe6..035dc80 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:47+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: serbian_cyrillic <sr(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Претраживање"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2153,7 +2153,7 @@ msgstr "\"гзип-овано\""
msgid "bzipped"
msgstr "\"бзип-овано\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Мод SQL компатибилности"
@@ -2855,7 +2855,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "Верзија MySQL клијента"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2863,13 +2869,7 @@ msgid "None"
msgstr "нема"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "Верзија MySQL клијента"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po
index 3b6dd68..5068a13 100644
--- a/po/sr(a)latin.po
+++ b/po/sr(a)latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:47+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: serbian_latin <sr@latin@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Pretraživanje"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2153,7 +2153,7 @@ msgstr "\"gzip-ovano\""
msgid "bzipped"
msgstr "\"bzip-ovano\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "Mod SQL kompatibilnosti"
@@ -2855,7 +2855,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "Verzija MySQL klijenta"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2863,13 +2869,7 @@ msgid "None"
msgstr "nema"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "Verzija MySQL klijenta"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 2a166bd..431977b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:19+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: swedish <sv(a)li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Sök"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2155,7 +2155,7 @@ msgstr "\"gzippad\""
msgid "bzipped"
msgstr "\"bzippad\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL-kompatibilitet"
@@ -2884,7 +2884,14 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Omvandlingsmotor"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2892,14 +2899,7 @@ msgid "None"
msgstr "Inget"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Omvandlingsmotor"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ta.po b/po/ta.po
index a748b57..31da5c2 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-16 10:43+0200\n"
"Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n"
"Language-Team: Tamil <ta(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2076,7 +2076,7 @@ msgstr ""
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2747,18 +2747,18 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
-msgctxt "None encoding conversion"
-msgid "None"
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
+#: libraries/kanji-encoding.lib.php:145
+msgctxt "None encoding conversion"
+msgid "None"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/te.po b/po/te.po
index 01d179b..20bb98a 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-02 12:04+0200\n"
"Last-Translator: <veeven(a)gmail.com>\n"
"Language-Team: Telugu <te(a)li.org>\n"
@@ -53,7 +53,7 @@ msgstr "శోధించు"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2107,7 +2107,7 @@ msgstr ""
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2782,7 +2782,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "No"
msgctxt "None encoding conversion"
@@ -2790,12 +2795,7 @@ msgid "None"
msgstr "కాదు"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/th.po b/po/th.po
index dbc30ca..ef3ff72 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:19+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: thai <th(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "ค้นหา"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2118,7 +2118,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2801,7 +2801,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2809,12 +2814,7 @@ msgid "None"
msgstr "ไม่มี"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index f10ca23..62e469f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-03 11:44+0200\n"
"Last-Translator: <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Ara"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2155,7 +2155,7 @@ msgstr "\"gzip olarak\""
msgid "bzipped"
msgstr "\"bzip olarak\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL uyumluluk kipi"
@@ -2887,7 +2887,14 @@ msgid "Go to view"
msgstr "Görünüme git"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Kaydetme motoru"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2895,14 +2902,7 @@ msgid "None"
msgstr "Hiçbiri"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Kaydetme motoru"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/tt.po b/po/tt.po
index 227b9a1..bb4ffb2 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-30 23:14+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: tatarish <tt(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Ezläw"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2135,7 +2135,7 @@ msgstr "\"gziple\""
msgid "bzipped"
msgstr "\"bziple\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL, kileşterü ısulı"
@@ -2833,7 +2833,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "MySQL belän totaştırğıç söreme"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2841,13 +2847,7 @@ msgid "None"
msgstr "Buş"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "MySQL belän totaştırğıç söreme"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/uk.po b/po/uk.po
index cb9a237..6114ea3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:19+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: ukrainian <uk(a)li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Шукати"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2109,7 +2109,7 @@ msgstr "запакувати в \"gzip\""
msgid "bzipped"
msgstr "запакувати в \"bzip\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2780,7 +2780,12 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
+msgstr ""
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2788,12 +2793,7 @@ msgid "None"
msgstr "Немає"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
-msgstr ""
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 8f4acb9..eda5ba0 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-09 14:02+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: Urdu <ur(a)li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2033,7 +2033,7 @@ msgstr ""
msgid "bzipped"
msgstr ""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr ""
@@ -2704,18 +2704,18 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
-msgctxt "None encoding conversion"
-msgid "None"
+#: libraries/kanji-encoding.lib.php:143
+msgid "Encoding conversion"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-msgid "encoding conversion"
+#: libraries/kanji-encoding.lib.php:145
+msgctxt "None encoding conversion"
+msgid "None"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/uz.po b/po/uz.po
index bcb311a..9f09976 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: uzbek_cyrillic <uz(a)li.org>\n"
@@ -49,7 +49,7 @@ msgstr "Қидириш"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2169,7 +2169,7 @@ msgstr "gzip"
msgid "bzipped"
msgstr "bzip ёрдамида сиқилган"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL билан мослик режими"
@@ -2900,7 +2900,14 @@ msgid "Go to view"
msgstr "Ушбу кўринишга ўтиш"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Кодировкалаш функцияси"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2908,14 +2915,7 @@ msgid "None"
msgstr "Йўқ"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Кодировкалаш функцияси"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po
index df1e9f8..02252e8 100644
--- a/po/uz(a)latin.po
+++ b/po/uz(a)latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:20+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: uzbek_latin <uz@latin@li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Qidirish"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2176,7 +2176,7 @@ msgstr "gzip"
msgid "bzipped"
msgstr "bzip yordamida siqilgan"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL bilan moslik rejimi"
@@ -2913,7 +2913,14 @@ msgid "Go to view"
msgstr "Ushbu ko‘rinishga o‘tish"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "Kodirovkalash funksiyasi"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2921,14 +2928,7 @@ msgid "None"
msgstr "Yo‘q"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "Kodirovkalash funksiyasi"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6bf18c6..95c89e3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-04-08 13:06+0200\n"
"Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN(a)li.org>\n"
@@ -51,7 +51,7 @@ msgstr "搜索"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2116,7 +2116,7 @@ msgstr "gzip 压缩"
msgid "bzipped"
msgstr "bzip 压缩"
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL 兼容模式"
@@ -2810,7 +2810,14 @@ msgid "Go to view"
msgstr "转到视图"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+#| msgid "Recoding engine"
+msgid "Encoding conversion"
+msgstr "记录引擎"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2818,14 +2825,7 @@ msgid "None"
msgstr "无"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-#| msgid "Recoding engine"
-msgid "encoding conversion"
-msgstr "记录引擎"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e3b
52a5..acb66de 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
"PO-Revision-Date: 2010-03-12 09:15+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: chinese_traditional <zh_TW(a)li.org>\n"
@@ -49,7 +49,7 @@ msgstr "搜索"
#: libraries/common.lib.php:1333 libraries/common.lib.php:2224
#: libraries/display_change_password.lib.php:82
#: libraries/display_create_table.lib.php:63
-#: libraries/display_export.lib.php:277 libraries/display_import.lib.php:276
+#: libraries/display_export.lib.php:275 libraries/display_import.lib.php:276
#: libraries/display_tbl.lib.php:532 libraries/display_tbl.lib.php:614
#: libraries/messages.inc.php:369 libraries/replication_gui.lib.php:73
#: libraries/replication_gui.lib.php:365 libraries/select_server.lib.php:104
@@ -2122,7 +2122,7 @@ msgstr "\"gzipped\""
msgid "bzipped"
msgstr "\"bzipped\""
-#: libraries/display_export.lib.php:276 libraries/messages.inc.php:1026
+#: libraries/display_export.lib.php:274 libraries/messages.inc.php:1026
msgid "SQL compatibility mode"
msgstr "SQL 兼容模式"
@@ -2811,7 +2811,13 @@ msgid "Go to view"
msgstr ""
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:142
+#: libraries/kanji-encoding.lib.php:143
+#, fuzzy
+msgid "Encoding conversion"
+msgstr "MySQL 客戶端版本"
+
+#. l10n: This is currently used only in Japanese locales
+#: libraries/kanji-encoding.lib.php:145
#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
@@ -2819,13 +2825,7 @@ msgid "None"
msgstr "不適用"
#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
-msgid "encoding conversion"
-msgstr "MySQL 客戶端版本"
-
-#. l10n: This is currently used only in Japanese locales
-#: libraries/kanji-encoding.lib.php:149
+#: libraries/kanji-encoding.lib.php:151
msgid "Convert to Kana"
msgstr ""
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2961-g9f81cf3
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
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(a)cihar.com>
Date: Mon May 10 14:06:53 2010 +0200
Translation update done using Pootle.
commit 9b2aa599ade28e196e780035aca44ec077aa03e6
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 14:06:50 2010 +0200
Translation update done using Pootle.
commit cbb204ec2a538f66362f32d1caa72aa089c38f27
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 14:06:48 2010 +0200
Translation update done using Pootle.
commit 6aef287e283d276f1d73ab26211399d088c07dfe
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 14:06:43 2010 +0200
Translation update done using Pootle.
commit dbed304d006a503ed7183c01704327b53c17bcc6
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 14:06:40 2010 +0200
Translation update done using Pootle.
commit a36dc9cd35d561a2ad01048d9af6a6a517ffb6ac
Author: Michal Čihař <michal(a)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(a)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(a)cihar.com>\n"
"Language-Team: english-gb <en_GB(a)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
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2955-g5b81595
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via 5b815953d9ba1413b78eadfa1b294011e6255400 (commit)
via fd49308bffd6e7c5d6aa298a1264e09ae3cbb73e (commit)
via 65a4aecde1974ae4a8dffc12853aaa95aa5cb352 (commit)
via 05b7f1a230f8ae1248877f119b817280099e3cac (commit)
via f3414fa611102a5ce2cfd02c8406b43d094a13b7 (commit)
via 52cd7d436d408eda06c24cdd49e13b21f6974888 (commit)
via 73a95305a9d254822d1fa47f6ba1195363512c6a (commit)
via 5f5fbe427faa5bbb18095894f232745ceba3c4bc (commit)
via 9da7c19c0002d2c7bfac87d54c79371e466eb8ab (commit)
via c2fb36705c780d4ebd4ae2e17ea3b7f7e9312d5a (commit)
via 6f2586a00e24df411551923bb143fcf555fcd1dc (commit)
via 46fba4fb638c38f905e77b1f7cbc776fc17e86a3 (commit)
via a100e183cf5973da3e94f6310b0b3c2e12473508 (commit)
via 7ef7b0fc56052c53f8700fa36337d1ee61f3d8d9 (commit)
via da987d195dc4e6b7a38f750e3038eeb1fd4ab6a6 (commit)
via 523dbbe3d170c90871cfb48b84f98a78ccf4a3a3 (commit)
via f8eeb59cf96c8ca7510b903ed3e2e2fea74b7d4c (commit)
via 0bf85872fed944ab13f9feea102cbe09c5aeb44d (commit)
via 9fbcff7cb7a2edcb11fbbc8205b7724be24d4307 (commit)
via f9d1ed025a4dd1f03aa4a95563908ce61afcbd5e (commit)
via 791f0f12c3c6e136bf9d4be583d62c08f198d205 (commit)
via 387bcf07dec3de98181b8d26fdc2a28f1737aa1a (commit)
via ae701494ebdd9f9c421b55e6af4ac71ab6feb888 (commit)
from c3768afb229c2b250d4ec418c1eb81054ba546c2 (commit)
- Log -----------------------------------------------------------------
commit 5b815953d9ba1413b78eadfa1b294011e6255400
Merge: c3768afb229c2b250d4ec418c1eb81054ba546c2 fd49308bffd6e7c5d6aa298a1264e09ae3cbb73e
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 13:33:04 2010 +0200
Merge remote branch 'pootle/master'
Conflicts:
po/fr.po
po/hi.po
commit fd49308bffd6e7c5d6aa298a1264e09ae3cbb73e
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:56 2010 +0200
Translation update done using Pootle.
commit 65a4aecde1974ae4a8dffc12853aaa95aa5cb352
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:47 2010 +0200
Translation update done using Pootle.
commit 05b7f1a230f8ae1248877f119b817280099e3cac
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:42 2010 +0200
Translation update done using Pootle.
commit f3414fa611102a5ce2cfd02c8406b43d094a13b7
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 10:00:11 2010 +0200
Translation update done using Pootle.
commit 52cd7d436d408eda06c24cdd49e13b21f6974888
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:59:55 2010 +0200
Translation update done using Pootle.
commit 73a95305a9d254822d1fa47f6ba1195363512c6a
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:59:31 2010 +0200
Translation update done using Pootle.
commit 5f5fbe427faa5bbb18095894f232745ceba3c4bc
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:58:17 2010 +0200
Translation update done using Pootle.
commit 9da7c19c0002d2c7bfac87d54c79371e466eb8ab
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:57:22 2010 +0200
Translation update done using Pootle.
commit c2fb36705c780d4ebd4ae2e17ea3b7f7e9312d5a
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:56:21 2010 +0200
Translation update done using Pootle.
commit 6f2586a00e24df411551923bb143fcf555fcd1dc
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:55:06 2010 +0200
Translation update done using Pootle.
commit 46fba4fb638c38f905e77b1f7cbc776fc17e86a3
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:54:59 2010 +0200
Translation update done using Pootle.
commit a100e183cf5973da3e94f6310b0b3c2e12473508
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:53:34 2010 +0200
Translation update done using Pootle.
commit 7ef7b0fc56052c53f8700fa36337d1ee61f3d8d9
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:51:47 2010 +0200
Translation update done using Pootle.
commit da987d195dc4e6b7a38f750e3038eeb1fd4ab6a6
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:51:17 2010 +0200
Translation update done using Pootle.
commit 523dbbe3d170c90871cfb48b84f98a78ccf4a3a3
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:49:26 2010 +0200
Translation update done using Pootle.
commit f8eeb59cf96c8ca7510b903ed3e2e2fea74b7d4c
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:47:03 2010 +0200
Translation update done using Pootle.
commit 0bf85872fed944ab13f9feea102cbe09c5aeb44d
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:46:56 2010 +0200
Translation update done using Pootle.
commit 9fbcff7cb7a2edcb11fbbc8205b7724be24d4307
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:46:09 2010 +0200
Translation update done using Pootle.
commit f9d1ed025a4dd1f03aa4a95563908ce61afcbd5e
Author: u4663530 <u4663530(a)anu.edu.au>
Date: Mon May 10 09:44:16 2010 +0200
Translation update done using Pootle.
commit 791f0f12c3c6e136bf9d4be583d62c08f198d205
Merge: 387bcf07dec3de98181b8d26fdc2a28f1737aa1a bcf9a3a5f30846296b530a819430d3208f1f368d
Author: Pootle server <pootle(a)cihar.com>
Date: Mon May 10 08:40:15 2010 +0200
Merge remote branch 'origin/master' into HEAD
commit 387bcf07dec3de98181b8d26fdc2a28f1737aa1a
Merge: ae701494ebdd9f9c421b55e6af4ac71ab6feb888 632211d06557ceb56131a059e5eb116f65fcbedd
Author: Pootle server <pootle(a)cihar.com>
Date: Mon May 10 07:35:30 2010 +0200
Merge remote branch 'origin/master' into HEAD
Conflicts:
po/fr.po
commit ae701494ebdd9f9c421b55e6af4ac71ab6feb888
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun May 9 22:26:51 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/fr.po | 4 ++--
po/hi.po | 49 ++++++++++++++++---------------------------------
2 files changed, 18 insertions(+), 35 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 5af3ddb..487895d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 09:35+0200\n"
-"PO-Revision-Date: 2010-05-04 16:34+0200\n"
+"PO-Revision-Date: 2010-05-09 22:26+0200\n"
"Last-Translator: Marc <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.1\n"
diff --git a/po/hi.po b/po/hi.po
index b799c6c..d1ccd52 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 09:35+0200\n"
-"PO-Revision-Date: 2010-05-05 04:47+0200\n"
+"PO-Revision-Date: 2010-05-10 10:00+0200\n"
"Last-Translator: <u4663530(a)anu.edu.au>\n"
"Language-Team: hindi <hi(a)li.org>\n"
+"Language: hi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -88,12 +88,12 @@ msgstr "वर्णन"
#: browse_foreigners.php:268 browse_foreigners.php:276
#: libraries/messages.inc.php:1226
msgid "Use this value"
-msgstr "इस वाल्यु का उपयोग करें"
+msgstr "इस वेलियु का उपयोग करें"
#: db_create.php:46 libraries/messages.inc.php:223
#, php-format
msgid "Database %1$s has been created."
-msgstr ""
+msgstr "%1$s डेटाबेस बनाया गया है."
#: db_datadict.php:49 db_operations.php:378 libraries/messages.inc.php:240
msgid "Database comment: "
@@ -199,7 +199,7 @@ msgstr "छापें"
#: db_export.php:29 libraries/messages.inc.php:1234
msgid "View dump (schema) of database"
-msgstr "डंप (स्कीमा) डेटाबेस दिखाएं"
+msgstr "डेटाबेस का डंप (स्कीमा) दिखाएं"
#: db_export.php:43 db_search.php:344 libraries/messages.inc.php:853
#: server_export.php:27
@@ -209,21 +209,21 @@ msgstr "सभी का चयन करें"
#: db_export.php:45 db_search.php:347 libraries/messages.inc.php:1196
#: server_export.php:29
msgid "Unselect All"
-msgstr " सभी को रद्द करें"
+msgstr "सभी को रद्द करें"
#: db_operations.php:38 libraries/messages.inc.php:221 tbl_create.php:54
msgid "The database name is empty!"
-msgstr ""
+msgstr "डेटाबेस नाम खाली है"
#: db_operations.php:236 libraries/messages.inc.php:761
#, php-format
msgid "Database %s has been renamed to %s"
-msgstr ""
+msgstr " डेटाबेस का नाम %s बदल कर %s रखा गया है"
#: db_operations.php:240 libraries/messages.inc.php:186
#, php-format
msgid "Database %s has been copied to %s"
-msgstr ""
+msgstr " डेटाबेस %s से %s में कॉपी किया गया है"
#: db_operations.php:410 libraries/messages.inc.php:244
msgid "Rename database to"
@@ -240,7 +240,7 @@ msgstr "और फिर"
#: db_operations.php:451 libraries/messages.inc.php:241
msgid "Copy database to"
-msgstr ""
+msgstr "डेटाबेस को ______ में कॉपी करें"
#: db_operations.php:458 libraries/messages.inc.php:1051
#: tbl_operations.php:526 tbl_tracking.php:388
@@ -259,7 +259,7 @@ msgstr "केवल डाटा"
#: db_operations.php:468 libraries/messages.inc.php:194
msgid "CREATE DATABASE before copying"
-msgstr ""
+msgstr "डेटाबेस कॉपी करने पहले डेटाबेस का निर्माण करें"
#: db_operations.php:471 libraries/export/sql.php:52
#: libraries/export/sql.php:74 libraries/export/sql.php:76
@@ -276,11 +276,11 @@ msgstr "AUTO_INCREMENT मूल्य जोडें"
#: db_operations.php:479 libraries/messages.inc.php:39 tbl_operations.php:543
msgid "Add constraints"
-msgstr "कांस्त्रैन्ट्स जोडें"
+msgstr "शर्तें जोडें"
#: db_operations.php:492 libraries/messages.inc.php:1067
msgid "Switch to copied database"
-msgstr ""
+msgstr "नक़ल किये गए डाटाबेस पर जायें"
#: db_operations.php:533 libraries/messages.inc.php:97
msgid "BLOB Repository"
@@ -290,7 +290,7 @@ msgstr "BLOB भंडार गृह"
#: libraries/messages.inc.php:1045 libraries/server_links.inc.php:49
#: server_processlist.php:59 tbl_tracking.php:596 test/theme.php:101
msgid "Status"
-msgstr ""
+msgstr "स्थिति"
#: db_operations.php:544
#, fuzzy
@@ -302,14 +302,13 @@ msgstr "सक्षम"
#: db_operations.php:548 libraries/messages.inc.php:101
msgid "Disable"
-msgstr "दिसअबल "
+msgstr "असक्षम"
#: db_operations.php:558 libraries/messages.inc.php:98
msgid "Damaged"
msgstr "क्षतिग्रस्त"
#: db_operations.php:562
-#, fuzzy
#| msgctxt "$strBLOBRepositoryRepair"
#| msgid "Repair"
msgctxt "BLOB repository"
@@ -317,12 +316,11 @@ msgid "Repair"
msgstr "मरम्मत"
#: db_operations.php:570
-#, fuzzy
#| msgctxt "$strBLOBRepositoryDisabled"
#| msgid "Disabled"
msgctxt "BLOB repository"
msgid "Disabled"
-msgstr "दिसअबल्ड "
+msgstr "असक्षम"
#: db_operations.php:574 libraries/messages.inc.php:104
msgid "Enable"
@@ -8097,18 +8095,3 @@ msgstr " %s कोलम पर इन्डेक्स बना
msgctxt "for MIME transformation"
msgid "Description"
msgstr "वर्णन"
-
-#, fuzzy
-#~| msgid "No"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "नहीं"
-
-#, fuzzy
-#~| msgid "No"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "नहीं"
-
-#~ msgid "has been altered."
-#~ msgstr "को बदला गया। "
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2932-gc3768af
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via c3768afb229c2b250d4ec418c1eb81054ba546c2 (commit)
from ffcf1a844711c24e61104d3800dc7f865f6fe2c9 (commit)
- Log -----------------------------------------------------------------
commit c3768afb229c2b250d4ec418c1eb81054ba546c2
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 09:52:55 2010 +0200
Czech translation update.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 74fb783..409496b 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-05-10 09:35+0200\n"
-"PO-Revision-Date: 2010-05-06 07:14+0200\n"
+"PO-Revision-Date: 2010-05-10 09:52+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -2812,7 +2812,6 @@ msgstr "Přejít na podhled"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:142
-#, fuzzy
#| msgid "None"
msgctxt "None encoding conversion"
msgid "None"
@@ -2820,15 +2819,14 @@ msgstr "Žádná"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:146
-#, fuzzy
#| msgid "Recoding engine"
msgid "encoding conversion"
-msgstr "Nástroje pro konverzi znakových sad"
+msgstr "konverze znakových sad"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:149
msgid "Convert to Kana"
-msgstr ""
+msgstr "Převést na Kanu"
#. l10n: Text direction, use either ltr or rtl
#: libraries/messages.inc.php:19
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2927-gbcf9a3a
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via bcf9a3a5f30846296b530a819430d3208f1f368d (commit)
via 5227d998ec1d59d7f980ad793ddf807f7a58ac3e (commit)
from 06cb15eab79f85ae5cff918736eaccd928526dca (commit)
- Log -----------------------------------------------------------------
commit bcf9a3a5f30846296b530a819430d3208f1f368d
Merge: 06cb15eab79f85ae5cff918736eaccd928526dca 5227d998ec1d59d7f980ad793ddf807f7a58ac3e
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 07:42:50 2010 +0200
Merge branch 'QA_3_3'
Conflicts:
libraries/display_import.lib.php
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2925-g06cb15e
by Michal Čihař 10 May '10
by Michal Čihař 10 May '10
10 May '10
The branch, master has been updated
via 06cb15eab79f85ae5cff918736eaccd928526dca (commit)
via 18dabff6a0f8237466073ab0396d89c8290536fd (commit)
from 632211d06557ceb56131a059e5eb116f65fcbedd (commit)
- Log -----------------------------------------------------------------
commit 06cb15eab79f85ae5cff918736eaccd928526dca
Merge: 632211d06557ceb56131a059e5eb116f65fcbedd 18dabff6a0f8237466073ab0396d89c8290536fd
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon May 10 07:30:43 2010 +0200
Merge remote branch 'pootle/master'
commit 18dabff6a0f8237466073ab0396d89c8290536fd
Merge: 53f68b2faf8a8b9aee6433f647953cb88bb91c36 2b4a5e68eee3a9342e061946ac8d356af7a4d16a
Author: Pootle server <pootle(a)cihar.com>
Date: Sun May 9 20:40:07 2010 +0200
Merge remote branch 'origin/master'
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
1
0