diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 160e7bfbd..a3ba84e89 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 9b6d9b150..e1590a312 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 . '&nbsp;' . __('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 . '&nbsp;<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 dd4f731c1..7c2f5ab1e 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@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@cihar.com>\n"
 "Language-Team: afrikaans <af@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 f2fcf3eec..d250b7812 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@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@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 84f2aab29..739984097 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@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@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 a918b8cb2..c052c7ce4 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@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@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@latin.po b/po/be@latin.po
index a77c408b9..ec0f6eca1 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal@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 c3441e360..ef228d407 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@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@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 06bbd840d..e23caefb3 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@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@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 2d234f4b4..211538857 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@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@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 e7dd32de1..f977b0aa1 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@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@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 409496b58..df750e391 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@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@cihar.com>\n"
 "Language-Team: czech <cs@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 c746ccd6c..415fe4394 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@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@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 d4c6dd93c..a96ea127b 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@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@michaelkeck.de>\n"
 "Language-Team: german <de@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 e450d6eaa..c529b7f3b 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@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@cihar.com>\n"
 "Language-Team: greek <el@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 62e249494..a32956184 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@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@cihar.com>\n"
 "Language-Team: english-gb <en_GB@li.org>\n"
-"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.1\n"
 
@@ -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 0b56fd800..b7259ad2d 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@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@cihar.com>\n"
 "Language-Team: spanish <es@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 224ab2888..2c7807ff5 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@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@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 564af8665..35cdd7d81 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@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@mundurat.net>\n"
 "Language-Team: basque <eu@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 b1f57b8f2..36ee02a1e 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@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@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 a31cff94f..0eeba93ba 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@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@gmail.com>\n"
 "Language-Team: finnish <fi@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 487895d75..9b87ffd5c 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@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@infomarc.info>\n"
 "Language-Team: french <fr@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 cecb7549e..c97b66881 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@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@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 9b4242413..1d2bfe6ff 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@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@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 d1ccd52f2..14125b0e2 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@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@anu.edu.au>\n"
 "Language-Team: hindi <hi@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 91f2c21fc..161349aae 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@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@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 5a6fcc9fc..2e532d177 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@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@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 4d1329566..94b4a8882 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@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@yahoo.com>\n"
 "Language-Team: indonesian <id@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 598a3edfb..cb0b7c02a 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@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@tiscali.it>\n"
 "Language-Team: italian <it@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 5f72223e2..c1f5ea8ba 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@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@cihar.com>\n"
 "Language-Team: japanese <jp@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 4677fa758..4f0152ba5 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@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@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 077abebc6..b6f075502 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@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@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 f212bab78..b4b56dc7e 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@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@gmail.com>\n"
 "Language-Team: lithuanian <lt@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 e75ad1626..b7ad98fac 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@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@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 31b2026fb..f8b0a62a5 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@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@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 4963944f7..03033085e 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@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@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 08f2480fb..27d67851d 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@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@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 7090e7950..146ab4ccb 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@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@gmail.com>\n"
 "Language-Team: norwegian <no@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 db7e43fb6..93c3f2eb8 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@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@initfour.nl>\n"
 "Language-Team: dutch <nl@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 1792ce814..c662c2e28 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@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@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
+#: 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
 msgctxt "None encoding conversion"
 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/pl.po b/po/pl.po
index 1782c5f9c..357fec47e 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@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@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 a7f8013db..8d2d58581 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@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@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 986cc1022..37c251af8 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@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@gmail.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR@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 81d4b35c3..7088ba585 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@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@yahoo.com>\n"
 "Language-Team: romanian <ro@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 baed425a2..68f716267 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@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@cihar.com>\n"
 "Language-Team: russian <ru@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 7d1c4beaa..ec817bfb8 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@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@cihar.com>\n"
 "Language-Team: sinhala <si@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 bee001026..b651b8fd0 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@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@cihar.com>\n"
 "Language-Team: slovak <sk@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 c1b070256..4635adce0 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@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@gmail.com>\n"
 "Language-Team: slovenian <sl@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 79d0d238c..b6a8f7528 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@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@cihar.com>\n"
 "Language-Team: albanian <sq@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 81d2fe6c2..035dc807b 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@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@cihar.com>\n"
 "Language-Team: serbian_cyrillic <sr@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@latin.po b/po/sr@latin.po
index 3b6dd6859..5068a1377 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"POT-Creation-Date: 2010-05-10 14:17+0200\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal@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 2a166bd7e..431977b5b 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@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@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 a748b5720..31da5c2af 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@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@gmail.com>\n"
 "Language-Team: Tamil <ta@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
+#: 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
 msgctxt "None encoding conversion"
 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/te.po b/po/te.po
index 01d179b3a..20bb98a23 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@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@gmail.com>\n"
 "Language-Team: Telugu <te@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 dbc30ca54..ef3ff72d4 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@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@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 f10ca2329..62e469f76 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@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@hotmail.com>\n"
 "Language-Team: turkish <tr@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 227b9a17e..bb4ffb237 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@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@cihar.com>\n"
 "Language-Team: tatarish <tt@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 cb9a237f5..6114ea387 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@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@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 8f4acb93c..eda5ba0aa 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@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@cihar.com>\n"
 "Language-Team: Urdu <ur@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
+#: 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
 msgctxt "None encoding conversion"
 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/uz.po b/po/uz.po
index bcb311a5b..9f09976a8 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@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@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@latin.po b/po/uz@latin.po
index df1e9f8cb..02252e88f 100644
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-05-10 09:35+0200\n"
+"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 6bf18c664..95c89e38d 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@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@gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN@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 e3b52a5ee..acb66de58 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@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@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 ""