[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5-6727-g10aba36

Michal Čihař nijel at users.sourceforge.net
Thu Aug 19 11:37:19 CEST 2010


The branch, master has been updated
       via  10aba362877fc54be4aba6897026d060c3364b75 (commit)
       via  d76fe3856b0c76d4d3d9acb72010606eadc6469d (commit)
       via  660324620ce473dcf6ef30b5b0b865edcd33836a (commit)
       via  3f33397651094c417926e6eb44c7c064137536f0 (commit)
      from  882892af230aefcc3d8beb99a3c0ae13b3dda848 (commit)


- Log -----------------------------------------------------------------
commit 10aba362877fc54be4aba6897026d060c3364b75
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Aug 19 11:37:04 2010 +0200

    Refresh po files.

commit d76fe3856b0c76d4d3d9acb72010606eadc6469d
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Aug 19 11:35:45 2010 +0200

    Remove some HTML from translatable strings.

commit 660324620ce473dcf6ef30b5b0b865edcd33836a
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Aug 19 11:32:26 2010 +0200

    No HTML for translators.

commit 3f33397651094c417926e6eb44c7c064137536f0
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Aug 19 11:31:28 2010 +0200

    No need to translate SQL statements.

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

Summary of changes:
 libraries/display_import.lib.php   |    8 ++-
 libraries/export/sql.php           |    4 +-
 libraries/plugin_interface.lib.php |    2 +-
 po/af.po                           |   75 ++++++++++++++----------------
 po/ar.po                           |   83 ++++++++++++++++-----------------
 po/az.po                           |   82 ++++++++++++++++-----------------
 po/be.po                           |   82 ++++++++++++++++-----------------
 po/be at latin.po                     |   83 ++++++++++++++++-----------------
 po/bg.po                           |   82 ++++++++++++++++-----------------
 po/bn.po                           |   82 ++++++++++++++++-----------------
 po/bs.po                           |   82 ++++++++++++++++-----------------
 po/ca.po                           |   83 ++++++++++++++++-----------------
 po/cs.po                           |   90 ++++++++++++++++++-----------------
 po/cy.po                           |   83 ++++++++++++++++-----------------
 po/da.po                           |   83 ++++++++++++++++-----------------
 po/de.po                           |   83 ++++++++++++++++-----------------
 po/el.po                           |   82 ++++++++++++++++-----------------
 po/en_GB.po                        |   90 ++++++++++++++++++-----------------
 po/es.po                           |   82 ++++++++++++++++-----------------
 po/et.po                           |   82 ++++++++++++++++-----------------
 po/eu.po                           |   82 ++++++++++++++++-----------------
 po/fa.po                           |   75 ++++++++++++++----------------
 po/fi.po                           |   83 ++++++++++++++++-----------------
 po/fr.po                           |   90 ++++++++++++++++++-----------------
 po/gl.po                           |   83 ++++++++++++++++-----------------
 po/he.po                           |   82 ++++++++++++++++-----------------
 po/hi.po                           |   82 ++++++++++++++++-----------------
 po/hr.po                           |   82 ++++++++++++++++-----------------
 po/hu.po                           |   82 ++++++++++++++++-----------------
 po/id.po                           |   82 ++++++++++++++++-----------------
 po/it.po                           |   86 +++++++++++++++++-----------------
 po/ja.po                           |   86 +++++++++++++++++-----------------
 po/ka.po                           |   82 ++++++++++++++++-----------------
 po/ko.po                           |   82 ++++++++++++++++-----------------
 po/lt.po                           |   83 ++++++++++++++++-----------------
 po/lv.po                           |   82 ++++++++++++++++-----------------
 po/mk.po                           |   82 ++++++++++++++++-----------------
 po/mn.po                           |   83 ++++++++++++++++-----------------
 po/ms.po                           |   75 ++++++++++++++----------------
 po/nb.po                           |   83 ++++++++++++++++-----------------
 po/nl.po                           |   83 ++++++++++++++++-----------------
 po/phpmyadmin.pot                  |   68 +++++++++++++--------------
 po/pl.po                           |   85 +++++++++++++++++-----------------
 po/pt.po                           |   82 ++++++++++++++++-----------------
 po/pt_BR.po                        |   89 ++++++++++++++++++-----------------
 po/ro.po                           |   82 ++++++++++++++++-----------------
 po/ru.po                           |   83 ++++++++++++++++-----------------
 po/si.po                           |   82 ++++++++++++++++-----------------
 po/sk.po                           |   83 ++++++++++++++++-----------------
 po/sl.po                           |   83 ++++++++++++++++-----------------
 po/sq.po                           |   82 ++++++++++++++++-----------------
 po/sr.po                           |   82 ++++++++++++++++-----------------
 po/sr at latin.po                     |   82 ++++++++++++++++-----------------
 po/sv.po                           |   82 ++++++++++++++++-----------------
 po/ta.po                           |   75 +++++++++++++++---------------
 po/te.po                           |   68 +++++++++++++--------------
 po/th.po                           |   82 ++++++++++++++++-----------------
 po/tr.po                           |   83 ++++++++++++++++-----------------
 po/tt.po                           |   82 ++++++++++++++++-----------------
 po/ug.po                           |   83 ++++++++++++++++-----------------
 po/uk.po                           |   76 ++++++++++++++----------------
 po/ur.po                           |   83 ++++++++++++++++-----------------
 po/uz.po                           |   83 ++++++++++++++++-----------------
 po/uz at latin.po                     |   83 ++++++++++++++++-----------------
 po/zh_CN.po                        |   83 ++++++++++++++++-----------------
 po/zh_TW.po                        |   82 ++++++++++++++++-----------------
 66 files changed, 2546 insertions(+), 2635 deletions(-)

diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index d83244e..76865f4 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -152,8 +152,12 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
         }
         // We don't have show anything about compression, when no supported
         if ($compressions != array()) {
-             printf(__('<div class="formelementrow" id="compression_info">File may be compressed (%s) or uncompressed.<br />A compressed file\'s name must end in <b>.[format].[compression]</b>. Example: <b>.sql.zip</b></div>'), implode(", ", $compressions));
-         }?>
+            echo '<div class="formelementrow" id="compression_info">';
+            printf(__('File may be compressed (%s) or uncompressed.'), implode(", ", $compressions));
+            echo '<br />';
+            echo __('A compressed file\'s name must end in <b>.[format].[compression]</b>. Example: <b>.sql.zip</b>');
+            echo '</div>';
+        }?>
 
         <div class="formelementrow" id="upload_form">
         <?php if($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?>
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index e093339..2d6708d 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -110,9 +110,9 @@ if (isset($plugin_list)) {
             $plugin_list['sql']['options'][] =
                 array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'bool', 'name' => 'create_table_statements', 'text' => __('<code>CREATE TABLE</code> options:')));
                 $plugin_list['sql']['options'][] =
-                array('type' => 'bool', 'name' => 'if_not_exists', 'text' => __('<code>IF NOT EXISTS</code>'));
+                array('type' => 'bool', 'name' => 'if_not_exists', 'text' => '<code>IF NOT EXISTS</code>');
             $plugin_list['sql']['options'][] =
-                array('type' => 'bool', 'name' => 'auto_increment', 'text' => __('<code>AUTO_INCREMENT</code>'));
+                array('type' => 'bool', 'name' => 'auto_increment', 'text' => '<code>AUTO_INCREMENT</code>');
             $plugin_list['sql']['options'][] = array('type' => 'end_subgroup');
             /* end CREATE TABLE statements */
 
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index ffa5cb4..48dc975 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -333,7 +333,7 @@ function PMA_pluginGetOptions($section, &$list)
             }
         }
         if ($count == 0) {
-            $ret .= __('<p>This format has no options</p>');
+            $ret .= '<p>' . __('This format has no options') . '</p>';
         }
         $ret .= '</div>';
     }
diff --git a/po/af.po b/po/af.po
index aa341f2..c474310 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-30 23:04+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: afrikaans <af at li.org>\n"
@@ -49,7 +49,7 @@ msgstr "Soek"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -788,7 +788,8 @@ msgid "Database Log"
 msgstr "Databasis"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2057,14 +2058,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Skep 'n nuwe tabel op databasis %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Skep 'n nuwe tabel op databasis %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2164,8 +2167,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Karakterstel van die leer:"
 
@@ -2197,18 +2200,18 @@ msgstr "\"ge-gzip\""
 msgid "bzipped"
 msgstr "\"ge-bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formaat"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2238,50 +2241,54 @@ msgid "Importing into the current server"
 msgstr ""
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Geen databasisse"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Geen databasisse"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Gedeeltelike Tekste"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3105,7 +3112,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3117,23 +3125,10 @@ msgstr "Stellings"
 msgid "Add statements:"
 msgstr "Stellings"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr ""
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3707,7 +3702,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
diff --git a/po/ar.po b/po/ar.po
index 6fc398e..6aaa7ff 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-05-29 14:16+0200\n"
 "Last-Translator: Ahmed <aa.mahdawy.10 at gmail.com>\n"
 "Language-Team: arabic <ar at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "ابحث"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -789,7 +789,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2059,14 +2060,16 @@ msgid "Exporting databases in the current server"
 msgstr "يسمح بقفل الجداول للعملية الحالية."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "تكوين جدول جديد في قاعدة البيانات %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "تكوين جدول جديد في قاعدة البيانات %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2169,8 +2172,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "شيفرة أحرف الملف:"
 
@@ -2204,18 +2207,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "صيغة"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2247,51 +2250,56 @@ msgid "Importing into the current server"
 msgstr "لا يمكن الدخول إلى خادم MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No databases"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "لايوجد قواعد بيانات"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No databases"
+msgid "Importing into the table \"%s\""
+msgstr "لايوجد قواعد بيانات"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "نصوص جزئية"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3120,7 +3128,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3132,25 +3141,10 @@ msgstr "أوامر"
 msgid "Add statements:"
 msgstr "أوامر"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "أضف قيمة AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3721,7 +3715,7 @@ msgstr "نافذة الاستعلام"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "هذا التنسيق ليس له أي خيارات"
 
 #: libraries/relation.lib.php:77
@@ -8457,6 +8451,11 @@ msgid "Rename view to"
 msgstr ""
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "أضف قيمة AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "احدف %s سطر بدء من السطر %s."
diff --git a/po/az.po b/po/az.po
index fe6d1fa..88f74f5 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: azerbaijani <az at li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Axtarış"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -786,7 +786,8 @@ msgid "Database Log"
 msgstr "Me'lumat Bazası"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2073,14 +2074,16 @@ msgid "Exporting databases in the current server"
 msgstr "Allows locking tables for the current thread."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "%s bazasında yeni cedvel qur"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "%s bazasında yeni cedvel qur"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2184,8 +2187,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Faylın Charset-i:"
 
@@ -2219,18 +2222,18 @@ msgstr "\"gzip\"lenmiş"
 msgid "bzipped"
 msgstr "\"bzip\"lenmiş"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2262,50 +2265,54 @@ msgid "Importing into the current server"
 msgstr "MySQL server-e gire bilmirem"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Baza seçilmemişdir ve ya mövcud deyildir."
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Baza seçilmemişdir ve ya mövcud deyildir."
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Qismi Metnler"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3141,7 +3148,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3153,25 +3161,10 @@ msgstr "Variantlar"
 msgid "Add statements:"
 msgstr "Variantlar"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT deyeri elave et"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3752,7 +3745,7 @@ msgstr "Sorğu penceresi"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Bu formatın variantları yoxdur"
 
 #: libraries/relation.lib.php:77
@@ -8569,6 +8562,11 @@ msgid "Rename view to"
 msgstr "Cedveli yeniden adlandır"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT deyeri elave et"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s setri %s nömreli qeydden başlayaraq göster."
diff --git a/po/be.po b/po/be.po
index 2a3025a..a25f7aa 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: belarusian_cyrillic <be at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Пошук"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -793,7 +793,8 @@ msgid "Database Log"
 msgstr "База дадзеных"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2118,14 +2119,16 @@ msgid "Exporting databases in the current server"
 msgstr "Дазваляе блякаваць табліцы для бягучага патоку."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Стварыць новую табліцу ў БД %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Стварыць новую табліцу ў БД %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2235,8 +2238,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Кадыроўка файла:"
 
@@ -2270,18 +2273,18 @@ msgstr "архіваваны ў gzip"
 msgid "bzipped"
 msgstr "сьціскаць у bzip"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Фармат"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Вэрсія кліента MySQL"
@@ -2314,13 +2317,14 @@ msgid "Importing into the current server"
 msgstr "Немагчыма залагавацца на сэрвэр MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Базы дадзеных адсутнічаюць"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Базы дадзеных адсутнічаюць"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2328,25 +2332,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Імпартаваць файл"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Загрузкі файлаў не дазволеныя на гэтым сэрвэры."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Частковы імпарт"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2354,7 +2361,7 @@ msgstr ""
 "Папярэдняе імпартаваньне спынілася з-за недахопу часу. Пасьля новай загрузкі "
 "імпартаваньне будзе працягнутае з пазыцыі %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2369,7 +2376,7 @@ msgstr ""
 "скончваецца час выкананьня. Гэта можа быць добрым спосабам імпартаваньня "
 "вялікіх файлаў, аднак, гэта можа перапыніць транзакцыі."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3264,7 +3271,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3276,25 +3284,10 @@ msgstr "Выразы"
 msgid "Add statements:"
 msgstr "Выразы"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Дадаць значэньне AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3874,7 +3867,7 @@ msgstr "Акно запыту"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Гэты фармат ня мае опцыяў"
 
 #: libraries/relation.lib.php:77
@@ -8918,6 +8911,11 @@ msgid "Rename view to"
 msgstr "Перайменаваць табліцу ў"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Дадаць значэньне AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Дамп %s радкоў, пачынаючы з %s."
diff --git a/po/be at latin.po b/po/be at latin.po
index f4f56cd..e39075c 100644
--- a/po/be at latin.po
+++ b/po/be at latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-30 23:09+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: belarusian_latin <be at latin@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Pošuk"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -791,7 +791,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2118,14 +2119,16 @@ msgid "Exporting databases in the current server"
 msgstr "Dazvalaje blakavać tablicy dla biahučaha patoku."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Stvaryć novuju tablicu ŭ BD %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Stvaryć novuju tablicu ŭ BD %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2235,8 +2238,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Kadyroŭka fajła:"
 
@@ -2270,18 +2273,18 @@ msgstr "archivavany ŭ gzip"
 msgid "bzipped"
 msgstr "ściskać u bzip"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Farmat"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2313,14 +2316,16 @@ msgid "Importing into the current server"
 msgstr "Niemahčyma załahavacca na server MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No databases"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Bazy dadzienych adsutničajuć"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No databases"
+msgid "Importing into the table \"%s\""
+msgstr "Bazy dadzienych adsutničajuć"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2328,25 +2333,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Impartavać fajł"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Zahruzki fajłaŭ nie dazvolenyja na hetym servery."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Častkovy impart"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2354,7 +2362,7 @@ msgstr ""
 "Papiaredniaje impartavańnie spyniłasia z-za niedachopu času. Paśla novaj "
 "zahruzki impartavańnie budzie praciahnutaje z pazycyi %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2369,7 +2377,7 @@ msgstr ""
 "skončvajecca čas vykanańnia. Heta moža być dobrym sposabam impartavańnia "
 "vialikich fajłaŭ, adnak, heta moža pierapynić tranzakcyi."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3267,7 +3275,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3279,25 +3288,10 @@ msgstr "Vyrazy"
 msgid "Add statements:"
 msgstr "Vyrazy"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Dadać značeńnie AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3873,7 +3867,7 @@ msgstr "Akno zapytu"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Hety farmat nia maje opcyjaŭ"
 
 #: libraries/relation.lib.php:77
@@ -8847,6 +8841,11 @@ msgid "Rename view to"
 msgstr ""
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Dadać značeńnie AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Damp %s radkoŭ, pačynajučy z %s."
diff --git a/po/bg.po b/po/bg.po
index 94a76c3..ef2f22d 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-06-11 17:28+0200\n"
 "Last-Translator:  <stanprog at stanprog.com>\n"
 "Language-Team: bulgarian <bg at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Търсене"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -785,7 +785,8 @@ msgid "Database Log"
 msgstr "БД"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2084,14 +2085,16 @@ msgid "Exporting databases in the current server"
 msgstr "Позволява заключване на таблици за текущата нишка."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Създаване на нова таблица в БД %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Създаване на нова таблица в БД %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2196,8 +2199,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Набор от знаци на файла:"
 
@@ -2231,18 +2234,18 @@ msgstr "\"gzip-нато\""
 msgid "bzipped"
 msgstr "\"bzip-нато\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Формат"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Версия на клиента за MySQL"
@@ -2275,13 +2278,14 @@ msgid "Importing into the current server"
 msgstr "Не мога да се логна към MySQL сървъра"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Няма бази от данни"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Няма бази от данни"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2289,38 +2293,41 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Файл за импортиране"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "На този сървър не е позволени качване на файлове."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Частично импортиране"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3162,7 +3169,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3174,25 +3182,10 @@ msgstr "Заявление"
 msgid "Add statements:"
 msgstr "Заявление"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Добавяне на AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3773,7 +3766,7 @@ msgstr "Прозорец за заявки"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Този формат няма опции"
 
 #: libraries/relation.lib.php:77
@@ -8638,6 +8631,11 @@ msgstr "Име на ИЗГЛЕД-а"
 msgid "Rename view to"
 msgstr "Преименуване на изгледа на"
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Добавяне на AUTO_INCREMENT"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Дъмп-ни %s ред(а) като започнеш от ред # %s."
 
diff --git a/po/bn.po b/po/bn.po
index 588b414..dc622ac 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:11+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bangla <bn at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "খুঁজুন"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -787,7 +787,8 @@ msgid "Database Log"
 msgstr "ডাটাবেজ"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2094,14 +2095,16 @@ msgid "Exporting databases in the current server"
 msgstr "Allows locking tables for the current thread."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "%s ডাটাবেজ় এ নতুন টেবিল তৈরী কর"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "%s ডাটাবেজ় এ নতুন টেবিল তৈরী কর"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2211,8 +2214,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "ফাইল এর অক্ষরসমূহঃ"
 
@@ -2246,18 +2249,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "ফরমেট"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "MySQL client version"
@@ -2290,13 +2293,14 @@ msgid "Importing into the current server"
 msgstr "MySQL সার্ভার এ লগ ইন করা যায়নি"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "কোন ডাটাবেজ নাই"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "কোন ডাটাবেজ নাই"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2304,32 +2308,35 @@ msgstr ""
 msgid "File to Import:"
 msgstr "ইম্পোর্ট করার জন্য ফাইল"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Partial import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 "Previous import timed out, after resubmitting will continue from position %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2344,7 +2351,7 @@ msgstr ""
 "This might be good way to import large files, however it can break "
 "transactions."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3202,7 +3209,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3214,25 +3222,10 @@ msgstr "Statements"
 msgid "Add statements:"
 msgstr "Statements"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Add AUTO_INCREMENT value"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3815,7 +3808,7 @@ msgstr "Query window"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "This format has no options"
 
 #: libraries/relation.lib.php:77
@@ -8812,6 +8805,11 @@ msgid "Rename view to"
 msgstr "টেবিল রিনেম করুন"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Add AUTO_INCREMENT value"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump %s row(s) starting at record # %s."
diff --git a/po/bs.po b/po/bs.po
index ed4f508..eb2f08c 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:12+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: bosnian <bs at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Pretraživanje"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -788,7 +788,8 @@ msgid "Database Log"
 msgstr "Baza podataka"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2074,14 +2075,16 @@ msgid "Exporting databases in the current server"
 msgstr "Dozvoljava zaključavanje tabela tekućim procesima."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Napravi novu tabelu u bazi %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Napravi novu tabelu u bazi %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2185,8 +2188,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Karakter set datoteke:"
 
@@ -2220,18 +2223,18 @@ msgstr "\"gzip-ovano\""
 msgid "bzipped"
 msgstr "\"bzip-ovano\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2263,50 +2266,54 @@ msgid "Importing into the current server"
 msgstr "Ne mogu da se prijavim na MySQL server"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Baza ne postoji"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Baza ne postoji"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Dio teksta"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3137,7 +3144,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3149,25 +3157,10 @@ msgstr "Ime"
 msgid "Add statements:"
 msgstr "Ime"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Dodaj AUTO_INCREMENT vrijednost"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3747,7 +3740,7 @@ msgstr "Prozor za upite"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ne postoje opcije za ovaj format"
 
 #: libraries/relation.lib.php:77
@@ -8561,6 +8554,11 @@ msgid "Rename view to"
 msgstr "Promjeni ime tabele u "
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Dodaj AUTO_INCREMENT vrijednost"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Prikaži %s redova počevši od reda %s."
diff --git a/po/ca.po b/po/ca.po
index b3fb3ce..48ccff5 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:13+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: catalan <ca at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Cerca"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -783,7 +783,8 @@ msgid "Database Log"
 msgstr "Registre de la base de dades"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2111,14 +2112,16 @@ msgid "Exporting databases in the current server"
 msgstr "Permet bloquejar taules per l'actual fil d'execució."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Crear una taula nova a la base de dades %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Crear una taula nova a la base de dades %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2230,8 +2233,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Joc de caràcters de l'arxiu:"
 
@@ -2265,18 +2268,18 @@ msgstr "\"comprimit amb gzip\""
 msgid "bzipped"
 msgstr "\"comprimit amb bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2315,14 +2318,16 @@ msgid "Importing into the current server"
 msgstr "No podem connectar amb el servidor MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Vés a la base de dades"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Vés a la base de dades"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2330,25 +2335,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Arxiu a importar"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<d
iv class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "No es permet pujar arxius en aquest servidor."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Importació parcial"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2356,7 +2364,7 @@ msgstr ""
 "La darrera importació ha esgotat el temps, després de reenviar continuarà "
 "des de la posició %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2371,7 +2379,7 @@ msgstr ""
 "que s'acosta el limit del temps. Pot ser una bona solució per importar "
 "arxius grans, però pot trencar transaccions."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3269,7 +3277,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3281,25 +3290,10 @@ msgstr "Sentències"
 msgid "Add statements:"
 msgstr "Sentències"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Afegeix valor AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3886,7 +3880,7 @@ msgstr "Finestra de consultes"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Aquest format no té opcions"
 
 #: libraries/relation.lib.php:77
@@ -9135,6 +9129,11 @@ msgid "Rename view to"
 msgstr "Reanomena les taules a"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Afegeix valor AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Bolcar %s files començant a la fila %s."
diff --git a/po/cs.po b/po/cs.po
index a34d4f9..f03edf5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-08-17 13:32+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: czech <cs at li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Vyhledávání"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -769,7 +769,8 @@ msgid "Database Log"
 msgstr "Historie databáze"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2023,14 +2024,16 @@ msgid "Exporting databases in the current server"
 msgstr "Umožňuje zamknout tabulku pro aktuální vlákno."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Vytvořit novou tabulku v databázi %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Vytvořit novou tabulku v databázi %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2142,8 +2145,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Znaková sada souboru:"
 
@@ -2171,18 +2174,18 @@ msgstr "„zagzipováno“"
 msgid "bzipped"
 msgstr "„zabzipováno“"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formát"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2221,14 +2224,16 @@ msgid "Importing into the current server"
 msgstr "Nepodařilo se přihlášení k MySQL serveru"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Přejít na databázi"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Přejít na databázi"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2236,25 +2241,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Soubor pro importování"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Upload souborů není na tomto serveru povolen."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Částečný import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2262,7 +2270,7 @@ msgstr ""
 "Předchozí ímport vyčerpal veškerý čas, po dalším odeslání bude import "
 "pokračovat od pozice %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2277,7 +2285,7 @@ msgstr ""
 "limit nastavený v PHP. Tímto způsobem můžete importovat i velké soubory, ale "
 "může to způsobit problémy s transakcemi."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3163,7 +3171,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3175,29 +3184,12 @@ msgstr "Údaj"
 msgid "Add statements:"
 msgstr "Údaj"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 #, fuzzy
 #| msgid "<code>@TABLE@</code>"
 msgid "<code>CREATE TABLE</code> options:"
 msgstr "<code>@TABLE@</code>"
 
-#: libraries/export/sql.php:113
-#, fuzzy
-#| msgid "<code>@TABLE@</code>"
-msgid "<code>IF NOT EXISTS</code>"
-msgstr "<code>@TABLE@</code>"
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "<code>@DATABASE@</code>"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "<code>@DATABASE@</code>"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3772,7 +3764,7 @@ msgstr "Okno dotazů"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Tento formát nemá žádná nastavení"
 
 #: libraries/relation.lib.php:77
@@ -8806,6 +8798,16 @@ msgstr "Jméno pohledu"
 msgid "Rename view to"
 msgstr "Přejmenovat pohled na"
 
+#, fuzzy
+#~| msgid "<code>@TABLE@</code>"
+#~ msgid "<code>IF NOT EXISTS</code>"
+#~ msgstr "<code>@TABLE@</code>"
+
+#, fuzzy
+#~| msgid "<code>@DATABASE@</code>"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "<code>@DATABASE@</code>"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Vypsat %s řádků od %s"
 
diff --git a/po/cy.po b/po/cy.po
index 44a35b9..da224a4 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-06-07 20:23+0200\n"
 "Last-Translator:  <ardavies at tiscali.co.uk>\n"
 "Language-Team: Welsh <cy at li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Chwilio"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -778,7 +778,8 @@ msgid "Database Log"
 msgstr "Log cronfa ddata"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2009,14 +2010,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Creu tabl mewn cronfa ddata %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Creu tabl mewn cronfa ddata %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2121,8 +2124,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Set nodau'r ffeil:"
 
@@ -2156,18 +2159,18 @@ msgstr "\"gzip-iwyd\""
 msgid "bzipped"
 msgstr "\"bzip-iwyd\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Fformat"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2201,14 +2204,16 @@ msgid "Importing into the current server"
 msgstr "Methu â mewngofnodi i'r gweinydd MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Neidiwch i'r gronfa ddata"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Neidiwch i'r gronfa ddata"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2216,38 +2221,41 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Ffeil i'w mewnforio"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Dyw lanlwytho ffeiliau ddim yn cael ei ganiatáu ar y gweinydd hwn."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Mewnforiad rhannol"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3075,7 +3083,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, php-format
 msgid "Add %s statement"
 msgstr ""
@@ -3086,25 +3095,10 @@ msgstr ""
 msgid "Add statements:"
 msgstr "Ychwanegwch cyfyngiadau"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Ychwanegwch werth AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3669,7 +3663,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
@@ -8266,6 +8260,11 @@ msgstr "Enw VIEW"
 msgid "Rename view to"
 msgstr "Ailenwch golwg i"
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Ychwanegwch werth AUTO_INCREMENT"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dympio %s rhes wrth ddechrau ar res #%s"
 
diff --git a/po/da.po b/po/da.po
index 109fea5..8e3cea1 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-21 14:55+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: danish <da at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Søg"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -783,7 +783,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2095,14 +2096,16 @@ msgid "Exporting databases in the current server"
 msgstr "Tillader låsning af tabeller for nuværende tråd."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Opret ny tabel i database %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Opret ny tabel i database %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2212,8 +2215,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Tegnsæt for filen:"
 
@@ -2247,18 +2250,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2290,14 +2293,16 @@ msgid "Importing into the current server"
 msgstr "Kan ikke logge ind på MySQL-serveren"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No databases"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Ingen databaser"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No databases"
+msgid "Importing into the table \"%s\""
+msgstr "Ingen databaser"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2305,25 +2310,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Fil til import"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Fil-uploads er ikke tilladte på denne server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Delvis import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2331,7 +2339,7 @@ msgstr ""
 "Foregående import timede ud, efter genindsendelse vil fortsætte fra position "
 "%d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2346,7 +2354,7 @@ msgstr ""
 "være en god metode til at importere større filer, men kan knække "
 "transaktioner."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3195,7 +3203,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3207,25 +3216,10 @@ msgstr "Erklæringer"
 msgid "Add statements:"
 msgstr "Erklæringer"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Tilføj AUTO_INCREMENT værdi"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3801,7 +3795,7 @@ msgstr "Foresp. vindue"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Dette format har ingen indstillinger"
 
 #: libraries/relation.lib.php:77
@@ -8741,6 +8735,11 @@ msgid "Rename view to"
 msgstr ""
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Tilføj AUTO_INCREMENT værdi"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump %s rækker startende med række %s."
diff --git a/po/de.po b/po/de.po
index feeb4ec..dcd9844 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-31 21:09+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: german <de at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Suche"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -782,7 +782,8 @@ msgid "Database Log"
 msgstr "Datenbank-Log"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2059,14 +2060,16 @@ msgid "Exporting databases in the current server"
 msgstr "Erlaubt die Sperrung bestimmter Tabellen."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Neue Tabelle in Datenbank %s erstellen"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Neue Tabelle in Datenbank %s erstellen"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2178,8 +2181,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Zeichencodierung der Datei:"
 
@@ -2213,18 +2216,18 @@ msgstr "GZip-komprimiert"
 msgid "bzipped"
 msgstr "BZip-komprimiert"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2264,14 +2267,16 @@ msgid "Importing into the current server"
 msgstr "Die Anmeldung am MySQL-Server ist fehlgeschlagen."
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Springe  zu Datenbank"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Springe  zu Datenbank"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2279,25 +2284,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Zu importierende Datei"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Das hochladen von Dateien ist auf diesem Server nicht erlaubt."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Partieller Import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2305,7 +2313,7 @@ msgstr ""
 "Der vorherige Import-Vorgang wurde abgebrochen. Er wird nun bei Position %d "
 "fortgesetzt."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2319,7 +2327,7 @@ msgstr ""
 "Abbruch wenn die maximale Scriptlaufzeit erreicht wird. Damit ist es möglich "
 "große Dateien zu importieren, allerdings kann es Transaktionen zerstören."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3211,7 +3219,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3223,25 +3232,10 @@ msgstr "Angaben"
 msgid "Add statements:"
 msgstr "Angaben"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT-Wert hinzufügen"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3826,7 +3820,7 @@ msgstr "Abfragefenster"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Für dieses Format sind keine Optionen vorhanden"
 
 #: libraries/relation.lib.php:77
@@ -9080,6 +9074,11 @@ msgid "Rename view to"
 msgstr "View umbenennen in"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT-Wert hinzufügen"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Exportiere %s Datensätze ab Zeile %s."
diff --git a/po/el.po b/po/el.po
index 0e90d8c..f135db1 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-30 23:16+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: greek <el at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Αναζήτηση"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -786,7 +786,8 @@ msgid "Database Log"
 msgstr "Καταγραφή Βάσης Δεδομένων"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2084,14 +2085,16 @@ msgid "Exporting databases in the current server"
 msgstr "Επιτρέπει το κλείδωμα πινάκων για την τρέχουσα λειτουργία."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Δημιουργία νέου πίνακα στη βάση %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Δημιουργία νέου πίνακα στη βάση %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2204,8 +2207,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Σύνολο χαρακτήρων του αρχείου:"
 
@@ -2236,18 +2239,18 @@ msgstr "συμπίεση «gzip»"
 msgid "bzipped"
 msgstr "συμπίεση «bzip»"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Μορφοποίηση"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Μηχανή επανακωδικοποίησης"
@@ -2285,13 +2288,14 @@ msgid "Importing into the current server"
 msgstr "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Μετάβαση στη βάση δεδομένων"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Μετάβαση στη βάση δεδομένων"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2299,25 +2303,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Αρχείο για εισαγωγή"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Οι αποστολές αρχείων δεν επιτρέπονται σε αυτό τον διακομιστή."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Μερική εισαγωγή"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2325,7 +2332,7 @@ msgstr ""
 "Η προηγούμενη εισαγωγή εξάντλησε το χρονικό όριο, μετά την επανυποβολή θα "
 "συνεχίσει από τη θέση %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2340,7 +2347,7 @@ msgstr ""
 "εφαρμογή του κώδικα προσεγγίζει το χρονικό όριο. Αυτό μπορεί να είναι καλό "
 "για εισαγωγή μεγάλων αρχείων, ωστόσο, μπορεί να κόψει τις μεταφορές."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3241,7 +3248,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3253,25 +3261,10 @@ msgstr "Δηλώσεις"
 msgid "Add statements:"
 msgstr "Δηλώσεις"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Προσθήκη τιμής AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3855,7 +3848,7 @@ msgstr "Παράθυρο ερωτήματος"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Αυτή η μορφή δεν έχει επιλογές"
 
 #: libraries/relation.lib.php:77
@@ -9151,6 +9144,11 @@ msgid "Rename view to"
 msgstr "Μετονομασία πίνακα σε"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Προσθήκη τιμής AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Εμφάνιση %s εγγραφών ξεκινώντας από την εγγραφή %s."
diff --git a/po/en_GB.po b/po/en_GB.po
index 9faa235..cb08c67 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-08-09 22:22+0200\n"
 "Last-Translator: Robert Readman <robert_readman at hotmail.com>\n"
 "Language-Team: english-gb <en_GB at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Search"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -765,7 +765,8 @@ msgid "Database Log"
 msgstr "Database Log"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2013,14 +2014,16 @@ msgid "Exporting databases in the current server"
 msgstr "Allows locking tables for the current thread."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Create table on database %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Create table on database %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2132,8 +2135,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Character set of the file:"
 
@@ -2167,18 +2170,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2217,14 +2220,16 @@ msgid "Importing into the current server"
 msgstr "Cannot log in to the MySQL server"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Jump to database"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Jump to database"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2232,32 +2237,35 @@ msgstr ""
 msgid "File to Import:"
 msgstr "File to import"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Partial import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 "Previous import timed out, after resubmitting will continue from position %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2272,7 +2280,7 @@ msgstr ""
 "to the PHP timeout limit. This might be good way to import large files, "
 "however it can break transactions."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3160,7 +3168,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3172,29 +3181,12 @@ msgstr "Statements"
 msgid "Add statements:"
 msgstr "Statements"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 #, fuzzy
 #| msgid "<code>@TABLE@</code>"
 msgid "<code>CREATE TABLE</code> options:"
 msgstr "<code>@TABLE@</code>"
 
-#: libraries/export/sql.php:113
-#, fuzzy
-#| msgid "<code>@TABLE@</code>"
-msgid "<code>IF NOT EXISTS</code>"
-msgstr "<code>@TABLE@</code>"
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "<code>@DATABASE@</code>"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "<code>@DATABASE@</code>"
-
 #: libraries/export/sql.php:123
 #, fuzzy
 #| msgid ""
@@ -3777,7 +3769,7 @@ msgstr "Query window"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "This format has no options"
 
 #: libraries/relation.lib.php:77
@@ -8813,6 +8805,16 @@ msgstr "VIEW name"
 msgid "Rename view to"
 msgstr "Rename view to"
 
+#, fuzzy
+#~| msgid "<code>@TABLE@</code>"
+#~ msgid "<code>IF NOT EXISTS</code>"
+#~ msgstr "<code>@TABLE@</code>"
+
+#, fuzzy
+#~| msgid "<code>@DATABASE@</code>"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "<code>@DATABASE@</code>"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump %s row(s) starting at row # %s"
 
diff --git a/po/es.po b/po/es.po
index 59b1361..ec1e714 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 11:23+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: spanish <es at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Buscar"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -793,7 +793,8 @@ msgid "Database Log"
 msgstr "Base de datos"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2131,14 +2132,16 @@ msgid "Exporting databases in the current server"
 msgstr "Permite poner candados a las tablas para el proceso actual."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Crear nueva tabla en la base de datos %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Crear nueva tabla en la base de datos %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2249,8 +2252,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Juego de caracteres del archivo:"
 
@@ -2284,18 +2287,18 @@ msgstr "\"Comprimido con gzip\""
 msgid "bzipped"
 msgstr "\"Comprimido con bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formato"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2329,13 +2332,14 @@ msgid "Importing into the current server"
 msgstr "El servidor MySQL no autorizó su ingreso"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "No hay bases de datos"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "No hay bases de datos"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2343,25 +2347,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Archivo a importar"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "No está permitido subir archivos a este servidor."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Importación parcial"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2369,7 +2376,7 @@ msgstr ""
 "Se agotó el tiempo de ejecución en la importación previa; si lo reenvía "
 "continuará desde la posición %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2385,7 +2392,7 @@ msgstr ""
 "método para importar archivos grandes; sin embargo, puede dañar las "
 "transacciones."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3290,7 +3297,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3302,25 +3310,10 @@ msgstr "Enunciado"
 msgid "Add statements:"
 msgstr "Enunciado"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Añadir el valor AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3900,7 +3893,7 @@ msgstr "Ventana de consulta"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Este formato no tiene opciones"
 
 #: libraries/relation.lib.php:77
@@ -9121,6 +9114,11 @@ msgid "Rename view to"
 msgstr "Cambiar el nombre de la tabla a"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Añadir el valor AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Volcar %s filas empezando por la fila %s."
diff --git a/po/et.po b/po/et.po
index 006db8b..4e6776b 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: estonian <et at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Otsi"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -787,7 +787,8 @@ msgid "Database Log"
 msgstr "Andmebaas"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2094,14 +2095,16 @@ msgid "Exporting databases in the current server"
 msgstr "Lubab lukustada tabeleid aktiivse päringu tarbeks."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Loo uus tabel andmebaasi %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Loo uus tabel andmebaasi %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2211,8 +2214,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Faili tähetabel:"
 
@@ -2246,18 +2249,18 @@ msgstr "\"gzipitud\""
 msgid "bzipped"
 msgstr "\"bzipitud\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formaat"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "MySQL kliendi versioon"
@@ -2290,13 +2293,14 @@ msgid "Importing into the current server"
 msgstr "Ei suuda MySQL serverisse logida"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Pole andmebaase"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Pole andmebaase"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2304,31 +2308,34 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Imporditav Fail"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Faile pole lubatud laadida sellesse serverisse."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Osaline import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr "Eelmine Import aegus, peale uuesti postitamist jätkub asukohast %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2343,7 +2350,7 @@ msgstr ""
 "See võib olla hea viis suurte failide importimisel, kuigi võib katkestada "
 "ülekanded."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3201,7 +3208,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3213,25 +3221,10 @@ msgstr "Parameerid"
 msgid "Add statements:"
 msgstr "Parameerid"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Lisa AUTO_INCREMENT väärtus"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3811,7 +3804,7 @@ msgstr "Päringuaken"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Sellel formaadil pole seadeid"
 
 #: libraries/relation.lib.php:77
@@ -8797,6 +8790,11 @@ msgid "Rename view to"
 msgstr "Nimeta tabel ümber"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Lisa AUTO_INCREMENT väärtus"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Päri %s rida alustades reast %s."
diff --git a/po/eu.po b/po/eu.po
index d3c0a6a..bffd91d 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-21 14:53+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: basque <eu at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Bilatu"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -789,7 +789,8 @@ msgid "Database Log"
 msgstr "Datu-basea"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2076,14 +2077,16 @@ msgid "Exporting databases in the current server"
 msgstr "Momentuko harian taulak blokeatzea baimentzen du."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Taula berri bat sortu %s datu-basean"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Taula berri bat sortu %s datu-basean"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2187,8 +2190,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Fitxategiaren karaktereen kodeketa:"
 
@@ -2222,18 +2225,18 @@ msgstr "\"gzip-ez trinkotuta\""
 msgid "bzipped"
 msgstr "\"Bzip-ez trinkotua\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formatoa"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2265,50 +2268,54 @@ msgid "Importing into the current server"
 msgstr "Ezinezkoa MySql zerbitzarian saioa hastea"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Datu-baserik ez"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Datu-baserik ez"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Testu partzialak"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3139,7 +3146,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3151,25 +3159,10 @@ msgstr "Sententziak"
 msgid "Add statements:"
 msgstr "Sententziak"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Gehitu AUTO_INCREMENT balioa"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3749,7 +3742,7 @@ msgstr "Kontsulta-leihoa"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Formato honek ez du aukerarik"
 
 #: libraries/relation.lib.php:77
@@ -8589,6 +8582,11 @@ msgid "Rename view to"
 msgstr "Taula berrizendatu izen honetara: "
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Gehitu AUTO_INCREMENT balioa"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s errenkada irauli, erregistro honetatik hasita: # %s."
diff --git a/po/fa.po b/po/fa.po
index 5425526..d9ad485 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-05-19 03:54+0200\n"
 "Last-Translator:  <ahmad_usa2007 at yahoo.com>\n"
 "Language-Team: persian <fa at li.org>\n"
@@ -49,7 +49,7 @@ msgstr "جستجو"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -781,7 +781,8 @@ msgid "Database Log"
 msgstr "پايگاه داده"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2051,14 +2052,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "ساخت جدول جديد در پايگاه داده %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "ساخت جدول جديد در پايگاه داده %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2159,8 +2162,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "مجموعه كاراكترهاي پرونده:"
 
@@ -2194,18 +2197,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "قالب"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2235,48 +2238,52 @@ msgid "Importing into the current server"
 msgstr ""
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "No databases"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "No databases"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#:
 libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 msgid "Partial Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3098,7 +3105,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3110,23 +3118,10 @@ msgstr "شرج"
 msgid "Add statements:"
 msgstr "شرج"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr ""
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3704,7 +3699,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
diff --git a/po/fi.po b/po/fi.po
index fce2782..4471b2a 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-04-30 18:08+0200\n"
 "Last-Translator:  <kajouni at gmail.com>\n"
 "Language-Team: finnish <fi at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Etsi"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -785,7 +785,8 @@ msgid "Database Log"
 msgstr "Tietokantaloki"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2107,14 +2108,16 @@ msgid "Exporting databases in the current server"
 msgstr "Sallii taulujen lukitsemisen nykyiselle säikeelle."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Luo uusi taulu tietokantaan %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Luo uusi taulu tietokantaan %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2226,8 +2229,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Tiedoston merkistö:"
 
@@ -2261,18 +2264,18 @@ msgstr "\"gzip-pakkaus\""
 msgid "bzipped"
 msgstr "\"bzip-pakkaus\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Muoto"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2311,14 +2314,16 @@ msgid "Importing into the current server"
 msgstr "MySQL-palvelimelle ei voitu kirjautua"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Siirry tietokantaan"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Siirry tietokantaan"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2326,25 +2331,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Tuotava tiedosto"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Osittainen tuonti"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2352,7 +2360,7 @@ msgstr ""
 "Edellinen tuonti keskeytyi aikakatkaisun takia. Kun lähetät tiedoston "
 "uudestaan, jatkamme kohdasta %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2367,7 +2375,7 @@ msgstr ""
 "Tätä kannattaa käyttää tuotaessa suuria tiedostoja; se voi kuitenkin "
 "aiheuttaa häiriöitä transaktioihin."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3259,7 +3267,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3271,25 +3280,10 @@ msgstr "Tieto"
 msgid "Add statements:"
 msgstr "Tieto"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Lisää AUTO_INCREMENT-arvo"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3875,7 +3869,7 @@ msgstr "Kyselyikkuna"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Tälle tiedostomuodolle ei ole valinta-asetuksia"
 
 #: libraries/relation.lib.php:77
@@ -9111,6 +9105,11 @@ msgid "Rename view to"
 msgstr "Nimeä taulu uudelleen"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Lisää AUTO_INCREMENT-arvo"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Tee vedos %s rivistä, alkaen riviltä: %s."
diff --git a/po/fr.po b/po/fr.po
index 9034ed2..9b921f3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-08-06 14:16+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: french <fr at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Rechercher"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -765,7 +765,8 @@ msgid "Database Log"
 msgstr "Journal de la base de données"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2037,14 +2038,16 @@ msgstr ""
 "d'exécution)."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Créer une nouvelle table sur la base %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Créer une nouvelle table sur la base %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2156,8 +2159,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Jeu de caractères du fichier: "
 
@@ -2191,18 +2194,18 @@ msgstr " «gzippé »"
 msgid "bzipped"
 msgstr " «bzippé »"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2241,14 +2244,16 @@ msgid "Importing into the current server"
 msgstr "Connexion au serveur MySQL non permise"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Aller à la base de données"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Aller à la base de données"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2256,25 +2261,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Fichier à importer"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Les téléchargements vers ce serveur ne sont pas permis."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Importation partielle"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2282,7 +2290,7 @@ msgstr ""
 "L'importation précédente a échoué en raison du temps; retransmettez et le "
 "traitement reprendra à la position %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2297,7 +2305,7 @@ msgstr ""
 "point d'être atteinte. Ceci pourrait aider à importer des fichiers "
 "volumineux, au détriment du respect des transactions."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3188,7 +3196,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3200,29 +3209,12 @@ msgstr "Information"
 msgid "Add statements:"
 msgstr "Information"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 #, fuzzy
 #| msgid "<code>@TABLE@</code>"
 msgid "<code>CREATE TABLE</code> options:"
 msgstr "<code>@TABLE@</code>"
 
-#: libraries/export/sql.php:113
-#, fuzzy
-#| msgid "<code>@TABLE@</code>"
-msgid "<code>IF NOT EXISTS</code>"
-msgstr "<code>@TABLE@</code>"
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "<code>@DATABASE@</code>"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "<code>@DATABASE@</code>"
-
 #: libraries/export/sql.php:123
 #, fuzzy
 msgid ""
@@ -3802,7 +3794,7 @@ msgstr "Fenêtre de requête"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ce format ne comporte pas d'options"
 
 #: libraries/relation.lib.php:77
@@ -8926,6 +8918,16 @@ msgstr "Nom de la vue"
 msgid "Rename view to"
 msgstr "Changer le nom de la vue pour"
 
+#, fuzzy
+#~| msgid "<code>@TABLE@</code>"
+#~ msgid "<code>IF NOT EXISTS</code>"
+#~ msgstr "<code>@TABLE@</code>"
+
+#, fuzzy
+#~| msgid "<code>@DATABASE@</code>"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "<code>@DATABASE@</code>"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Exporter %s ligne(s) à partir du rang n° %s"
 
diff --git a/po/gl.po b/po/gl.po
index d5aed0f..d7ec2d3 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-21 14:50+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: galician <gl at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Procurar"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -786,7 +786,8 @@ msgid "Database Log"
 msgstr "Rexistro de actividade da base de datos"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2115,14 +2116,16 @@ msgid "Exporting databases in the current server"
 msgstr "Permite bloquear táboas do fío en uso"
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Crear unha táboa nova na base de datos %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Crear unha táboa nova na base de datos %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2234,8 +2237,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Conxunto de caracteres do ficheiro:"
 
@@ -2269,18 +2272,18 @@ msgstr "comprimido no formato \"gzip\""
 msgid "bzipped"
 msgstr "comprimido no formato \"bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formato"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2319,14 +2322,16 @@ msgid "Importing into the current server"
 msgstr "Non se dá conectado co servidor de MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Ir á base de datos"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Ir á base de datos"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2334,25 +2339,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Ficheiro a importar"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Este servidor non admite a recepción de ficheiros."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Importación parcial"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2360,7 +2368,7 @@ msgstr ""
 "A importación anterior excedeu do tempo permitido; unha vez reiniciada "
 "continuará desde a posición %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2375,7 +2383,7 @@ msgstr ""
 "está perto do limite. Este podería ser un bon método para importar ficheiros "
 "longos, aínda que pode rachar transaccións."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3271,7 +3279,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3283,25 +3292,10 @@ msgstr "Informacións"
 msgid "Add statements:"
 msgstr "Informacións"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Engadir o valor incremental (AUTO_INCREMENT)"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3887,7 +3881,7 @@ msgstr "Xanela de procuras"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Este formato non ten opcións"
 
 #: libraries/relation.lib.php:77
@@ -9161,6 +9155,11 @@ msgid "Rename view to"
 msgstr "Mudar o nome da táboa para"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Engadir o valor incremental (AUTO_INCREMENT)"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Pór %s fileiras a partir da fileira %s."
diff --git a/po/he.po b/po/he.po
index 025352a..3fbe415 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: hebrew <he at li.org>\n"
@@ -48,7 +48,7 @@ msgstr "חיפוש"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -780,7 +780,8 @@ msgid "Database Log"
 msgstr "מאגר נתונים"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2060,14 +2061,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "יצירת טבלה חדשה על מאגר נתונים %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "יצירת טבלה חדשה על מאגר נתונים %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2171,8 +2174,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "חבילת הקידוד של הקובץ:"
 
@@ -2206,18 +2209,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "תבנית"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2249,50 +2252,54 @@ msgid "Importing into the current server"
 msgstr "נכשל בכניסה לשרת MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "אין מאגרי נתונים"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "אין מאגרי נתונים"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "טקסטים חלקיים"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3124,7 +3131,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3136,25 +3144,10 @@ msgstr "משפטים"
 msgid "Add statements:"
 msgstr "משפטים"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "הוספת ערך AUTO_INCREMENT (מספור אוטומטי)"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3732,7 +3725,7 @@ msgstr "חלון שאילתה"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "לתבנית זאת אין אפשרויות"
 
 #: libraries/relation.lib.php:77
@@ -8469,6 +8462,11 @@ msgid "Rename view to"
 msgstr "שינוי שם טבלה אל"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "הוספת ערך AUTO_INCREMENT (מספור אוטומטי)"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "הוצאת %s שורות מתחילת רשומה מספר %s."
diff --git a/po/hi.po b/po/hi.po
index b787017..a3f2eff 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-05-21 05:48+0200\n"
 "Last-Translator:  <u4663530 at anu.edu.au>\n"
 "Language-Team: hindi <hi at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "खोजें"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -782,7 +782,8 @@ msgid "Database Log"
 msgstr "डेटाबेस लॉग"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2005,13 +2006,14 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
-msgid "Exporting tables in the database \""
+#, fuzzy, php-format
+msgid "Exporting tables in the database \"%s\""
 msgstr " डाटाबेस मे नया टेबल बनाओ"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Exporting rows in the table \"%s\""
+msgstr " डाटाबेस मे नया टेबल बनाओ"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2109,8 +2111,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2136,16 +2138,16 @@ msgstr ""
 msgid "bzipped"
 msgstr ""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 msgid "Format:"
 msgstr ""
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2177,42 +2179,47 @@ msgid "Importing into the current server"
 msgstr "MySQL सर्वर में प्रवेश नहीं कर सकते"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No databases"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "कोइ डाटाबेस नहिं"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No databases"
+msgid "Importing into the table \"%s\""
+msgstr "कोइ डाटाबेस नहिं"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 msgid "Partial Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2226,7 +2233,7 @@ msgstr ""
 "यदि स्क्रिप्ट पता लगाए की वो PHP मध्यांतर सीमा के करीब है तब एक रुकावट के आयात की "
 "अनुमति दें. यह बड़ी फाइल के आयात के लिए अच्छा है लेकिन, लेकिन यह लेनदेन तोड़ सकता है. "
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3041,7 +3048,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, php-format
 msgid "Add %s statement"
 msgstr ""
@@ -3052,25 +3060,10 @@ msgstr ""
 msgid "Add statements:"
 msgstr "शर्तें जोडें"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT मूल्य जोडें"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3639,7 +3632,7 @@ msgid "Query window"
 msgstr "क्वरी पेज"
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
@@ -8266,6 +8259,11 @@ msgid "Rename view to"
 msgstr ""
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT मूल्य जोडें"
+
+#, fuzzy
 #~| msgid "row(s) starting from record #"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "रौ,  इस  record  से #"
diff --git a/po/hr.po b/po/hr.po
index 24aa4a0..adc98fe 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-21 14:54+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: croatian <hr at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Traži"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -792,7 +792,8 @@ msgid "Database Log"
 msgstr "Baza podataka"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2112,14 +2113,16 @@ msgid "Exporting databases in the current server"
 msgstr "Dopušta zaključavanje tablica u trenutnoj grani."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Izradi novu tablicu u bazi podataka %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Izradi novu tablicu u bazi podataka %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2229,8 +2232,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Tablica znakova za datoteku:"
 
@@ -2264,18 +2267,18 @@ msgstr "\"gzipano\""
 msgid "bzipped"
 msgstr "\"bzipano\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Oblikovanje"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "MySQL verzija klijenta"
@@ -2308,13 +2311,14 @@ msgid "Importing into the current server"
 msgstr "Prijavljivanje na MySQL poslužitelj nije moguće"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Nema baza podataka"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Nema baza podataka"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2322,25 +2326,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Datoteka za uvoz"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Učitavanje datoteka nije dopušteno na ovom poslužitelju."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Djelomičan uvoz"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2348,7 +2355,7 @@ msgstr ""
 "Vrijeme prethodnog uvoza je isteklo. Nakon ponovno podnošenja bit će "
 "nastavljeno od položaja %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2363,7 +2370,7 @@ msgstr ""
 "ograničenja. Ovo bi mogao biti dobar način uvoza velikih datoteka, ali može "
 "prekinuti transakcije."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3253,7 +3260,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3265,25 +3273,10 @@ msgstr "Izjave"
 msgid "Add statements:"
 msgstr "Izjave"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Dodaj vrijednost AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3863,7 +3856,7 @@ msgstr "Prozor za upite"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ovaj oblik nema raspoložive opcije"
 
 #: libraries/relation.lib.php:77
@@ -8885,6 +8878,11 @@ msgid "Rename view to"
 msgstr "Preimenuj tablicu u"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Dodaj vrijednost AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Izbaci %s redaka, počevši od zapisa # %s."
diff --git a/po/hu.po b/po/hu.po
index 1eba454..4a15cbb 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:22+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: hungarian <hu at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Keresés"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -791,7 +791,8 @@ msgid "Database Log"
 msgstr "Adatbázis"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2119,14 +2120,16 @@ msgid "Exporting databases in the current server"
 msgstr "A jelenlegi szálon engedélyezi a táblák blokkolását."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Új tábla létrehozása a(z) %s adatbázisban"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Új tábla létrehozása a(z) %s adatbázisban"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2236,8 +2239,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "A fájl karakterkészlete:"
 
@@ -2271,18 +2274,18 @@ msgstr "\"gzip tömörítés\""
 msgid "bzipped"
 msgstr "\"bzip tömörítés\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formátum"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2316,13 +2319,14 @@ msgid "Importing into the current server"
 msgstr "Nem lehet bejelentkezni a MySQL szerverre"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Nincs adatbázis"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Nincs adatbázis"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2330,25 +2334,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Importálandó fájl"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Ezen a szerveren a fájlfeltöltések nem engedélyezettek."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Részleges importálás"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2356,7 +2363,7 @@ msgstr ""
 "Az előző importálás időtúllépés miatt leállt, újraküldés után a(z) %d "
 "pozíciótól folytatódik."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2371,7 +2378,7 @@ msgstr ""
 "közel van az időkorláthoz. Nagy fájlok importálásakor jól jöhet, azonban meg "
 "tudja szakítani a tranzakciót."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3266,7 +3273,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3278,25 +3286,10 @@ msgstr "Utasítások"
 msgid "Add statements:"
 msgstr "Utasítások"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT érték hozzáadása"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3877,7 +3870,7 @@ msgstr "Lekérdezés ablak"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ennek a formátumnak nincsenek beállításai"
 
 #: libraries/relation.lib.php:77
@@ -9135,6 +9128,11 @@ msgid "Rename view to"
 msgstr "Tábla átnevezése"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT érték hozzáadása"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s sor kiírása a(z) %s. rekorddal kezdődően"
diff --git a/po/id.po b/po/id.po
index f3e4afa..643af3d 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-06-16 01:45+0200\n"
 "Last-Translator:  <jack.hakim at yahoo.com>\n"
 "Language-Team: indonesian <id at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Cari"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -773,7 +773,8 @@ msgid "Database Log"
 msgstr "Log Database"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2077,14 +2078,16 @@ msgid "Exporting databases in the current server"
 msgstr "Mengizinkan untuk mengunci tabel dalam Thread yang lagi berjalan."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Ciptakan tabel baru pada database %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Ciptakan tabel baru pada database %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2190,8 +2193,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Penyusunan karakter dalam file:"
 
@@ -2225,18 +2228,18 @@ msgstr "Dikompress dengan GZip"
 msgid "bzipped"
 msgstr "\"Dikompress dengan BZip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2268,50 +2271,54 @@ msgid "Importing into the current server"
 msgstr "Gagal login ke MySQL server"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Database tidak ditemukan"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Database tidak ditemukan"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Upload file tidak diizinkan di server ini."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Teks yang disingkat"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3167,7 +3174,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3179,25 +3187,10 @@ msgstr "Keterangan"
 msgid "Add statements:"
 msgstr "Keterangan"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Menambahkan nilai AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3781,7 +3774,7 @@ msgstr "Jendela Pencarian"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Format ini tidak ada pilihannya"
 
 #: libraries/relation.lib.php:77
@@ -8646,6 +8639,11 @@ msgid "Rename view to"
 msgstr "Ubah nama tabel menjadi "
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Menambahkan nilai AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump %s baris bermula pada baris %s."
diff --git a/po/it.po b/po/it.po
index 9b45b3a..14ef946 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-05-24 21:25+0200\n"
 "Last-Translator: Fabio <fantonifabio at tiscali.it>\n"
 "Language-Team: italian <it at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Cerca"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -788,7 +788,8 @@ msgid "Database Log"
 msgstr "Log database"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2055,14 +2056,16 @@ msgid "Exporting databases in the current server"
 msgstr "Permette di bloccare le tabelle per il thread corrente."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Crea una nuova tabella nel database %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Crea una nuova tabella nel database %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2172,8 +2175,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Set di caratteri del file:"
 
@@ -2207,18 +2210,18 @@ msgstr "\"compresso con gzip\""
 msgid "bzipped"
 msgstr "\"compresso con bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formato"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Use light version"
 msgid "Encoding Conversion:"
@@ -2257,14 +2260,16 @@ msgid "Importing into the current server"
 msgstr "Impossibile eseguire il login nel server MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Vai al database"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Vai al database"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2272,25 +2277,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "File importato"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Non è permesso l'upload dei file su questo server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Importazione parziale"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2298,7 +2306,7 @@ msgstr ""
 "Una precedente importazione è entrata in timeout, dopo un nuovo inoltro "
 "riprenderà dalla posizione: %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2313,7 +2321,7 @@ msgstr ""
 "essere troppo vicino al tempo limite. Questo potrebbe essere un buon modo di "
 "importare grandi file, tuttavia potrebbe interrompere la transazione."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3210,7 +3218,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3222,26 +3231,11 @@ msgstr "Istruzioni"
 msgid "Add statements:"
 msgstr "Istruzioni"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 #, fuzzy
 msgid "<code>CREATE TABLE</code> options:"
 msgstr "<code>, VARIABLE as myname</code>"
 
-#: libraries/export/sql.php:113
-#, fuzzy
-msgid "<code>IF NOT EXISTS</code>"
-msgstr "<code>, VARIABLE as myname</code>"
-
-#: libraries/export/sql.php:115
-#, fuzzy
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "<code>, VARIABLE as myname</code>"
-
 #: libraries/export/sql.php:123
 #, fuzzy
 msgid ""
@@ -3825,7 +3819,7 @@ msgstr "Finestra della Query"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Questo formato non ha opzioni"
 
 #: libraries/relation.lib.php:77
@@ -8890,6 +8884,14 @@ msgid "Rename view to"
 msgstr "Rinomina la tabella in"
 
 #, fuzzy
+#~ msgid "<code>IF NOT EXISTS</code>"
+#~ msgstr "<code>, VARIABLE as myname</code>"
+
+#, fuzzy
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "<code>, VARIABLE as myname</code>"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump di %s righe a partire dalla riga %s."
diff --git a/po/ja.po b/po/ja.po
index c6c89d3..c5a5b1a 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 11:22+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: japanese <jp at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "検索"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -780,7 +780,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2087,14 +2088,16 @@ msgid "Exporting databases in the current server"
 msgstr "現在のスレッドのテーブルロックを許可する"
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "データベース %s に新しいテーブルを作成する"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "データベース %s に新しいテーブルを作成する"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2204,8 +2207,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "ファイルの文字セット:"
 
@@ -2239,18 +2242,18 @@ msgstr "\"gzip 形式\""
 msgid "bzipped"
 msgstr "\"bzip 形式\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "フォーマット"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "encoding conversion"
 msgid "Encoding Conversion:"
@@ -2284,14 +2287,16 @@ msgid "Importing into the current server"
 msgstr "MySQL サーバにログインできません"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No databases"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "データベースが存在しません"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No databases"
+msgid "Importing into the table \"%s\""
+msgstr "データベースが存在しません"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2299,32 +2304,35 @@ msgstr ""
 msgid "File to Import:"
 msgstr "インポートするファイル"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "このサーバではファイルのアップロードはできません"
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "部分インポート"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 "直前のインポートはタイムアウトしました。再送信すると位置 %d から再開されます"
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2339,7 +2347,7 @@ msgstr ""
 "大きなファイルをインポートする場合には便利ですが、トランザクションが壊れるこ"
 "ともあります"
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from st
art"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3226,7 +3234,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3238,26 +3247,11 @@ msgstr "ステートメント"
 msgid "Add statements:"
 msgstr "ステートメント"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 #, fuzzy
 msgid "<code>CREATE TABLE</code> options:"
 msgstr "<code>, 変数 as myname</code>"
 
-#: libraries/export/sql.php:113
-#, fuzzy
-msgid "<code>IF NOT EXISTS</code>"
-msgstr "<code>, 変数 as myname</code>"
-
-#: libraries/export/sql.php:115
-#, fuzzy
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "<code>, 変数 as myname</code>"
-
 #: libraries/export/sql.php:123
 #, fuzzy
 msgid ""
@@ -3836,7 +3830,7 @@ msgstr "クエリウィンドウ"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "この書式にはオプションはありません"
 
 #: libraries/relation.lib.php:77
@@ -8740,6 +8734,14 @@ msgid "Rename view to"
 msgstr ""
 
 #, fuzzy
+#~ msgid "<code>IF NOT EXISTS</code>"
+#~ msgstr "<code>, 変数 as myname</code>"
+
+#, fuzzy
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "<code>, 変数 as myname</code>"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s 行をダンプします(開始行: %s)"
diff --git a/po/ka.po b/po/ka.po
index c6316c1..a464eab 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:14+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: georgian <ka at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "ძებნა"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -791,7 +791,8 @@ msgid "Database Log"
 msgstr "მონაცემთა ბაზა"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2108,14 +2109,16 @@ msgid "Exporting databases in the current server"
 msgstr "Allows locking tables for the current thread."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Create new table on database %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Create new table on database %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2225,8 +2228,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "სიმბოლოთა ნაკრები ფაილისთვის:"
 
@@ -2260,18 +2263,18 @@ msgstr "\"gzip-ით დაარქივებული\""
 msgid "bzipped"
 msgstr "\"bzip-ით დაარქივებული\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "ფორმატი"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2305,13 +2308,14 @@ msgid "Importing into the current server"
 msgstr "MySQL სერვერზე შესვლა შეუძლებელია"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "მონაცემთა ბაზები არაა"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "მონაცემთა ბაზები არაა"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2319,32 +2323,35 @@ msgstr ""
 msgid "File to Import:"
 msgstr "შემოსატანი ფაილი"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Partial import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 "Previous import timed out, after resubmitting will continue from position %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2359,7 +2366,7 @@ msgstr ""
 "to the PHP timeout limit. This might be good way to import large files, "
 "however it can break transactions."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3251,7 +3258,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3263,25 +3271,10 @@ msgstr "Statements"
 msgid "Add statements:"
 msgstr "Statements"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Add AUTO_INCREMENT value"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3861,7 +3854,7 @@ msgstr "Query window"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "ამ ფორმატს არ აქვს პარამეტრები"
 
 #: libraries/relation.lib.php:77
@@ -9028,6 +9021,11 @@ msgid "Rename view to"
 msgstr "Rename table to"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Add AUTO_INCREMENT value"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump %s row(s) starting at record # %s."
diff --git a/po/ko.po b/po/ko.po
index 11b40ab..e745ec7 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-06-16 18:18+0200\n"
 "Last-Translator:  <cihar at nvyu.net>\n"
 "Language-Team: korean <ko at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "검색"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -774,7 +774,8 @@ msgid "Database Log"
 msgstr "데이터베이스"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2004,14 +2005,16 @@ msgid "Exporting databases in the current server"
 msgstr "현재 쓰레드에 대한 테이블 잠금(lock) 허용."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "데이터베이스 %s에 새로운 테이블을 만듭니다."
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "데이터베이스 %s에 새로운 테이블을 만듭니다."
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2114,8 +2117,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "파일 문자셋:"
 
@@ -2149,18 +2152,18 @@ msgstr "gz 압축"
 msgid "bzipped"
 msgstr "\"bz 압축\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2192,50 +2195,54 @@ msgid "Importing into the current server"
 msgstr "MySQL 서버에 로그인할 수 없습니다"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "데이터베이스가 없습니다"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "데이터베이스가 없습니다"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Partial Texts"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3058,7 +3065,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3070,25 +3078,10 @@ msgstr "명세"
 msgid "Add statements:"
 msgstr "명세"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT 값 추가"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3664,7 +3657,7 @@ msgid "Query window"
 msgstr "질의 창"
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
@@ -8389,6 +8382,11 @@ msgid "Rename view to"
 msgstr "테이블 이름 바꾸기"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT 값 추가"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s개의 행(레코드)을 덤프 (%s번째 레코드부터)."
diff --git a/po/lt.po b/po/lt.po
index 9d6585b..3aecee7 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-04-16 19:52+0200\n"
 "Last-Translator: Rytis <rytis.s at gmail.com>\n"
 "Language-Team: lithuanian <lt at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Paieška"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -789,7 +789,8 @@ msgid "Database Log"
 msgstr "Duombazė"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2090,14 +2091,16 @@ msgid "Exporting databases in the current server"
 msgstr "Leisti užrakinti lenteles procesų metu."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Sukurti naują lentelę duombazėje %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Sukurti naują lentelę duombazėje %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2209,8 +2212,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Simbolių koduotė faile:"
 
@@ -2244,18 +2247,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formatas"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "MySQL kliento versija"
@@ -2288,14 +2291,16 @@ msgid "Importing into the current server"
 msgstr "Nepavyksta prisijungti prie MySQL darbinės stoties"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Eiti į duomenų bazę"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Eiti į duomenų bazę"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2303,31 +2308,34 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Failas importavimui"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Dalinis įkėlimas"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2342,7 +2350,7 @@ msgstr ""
 "limito. Gali būti naudinga importuojant didelius failus, tačiau gali "
 "sugadinti transakcijas."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3191,7 +3199,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3203,25 +3212,10 @@ msgstr "Parametrai"
 msgid "Add statements:"
 msgstr "Parametrai"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Pridėti AUTO_INCREMENT reikšmę"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3800,7 +3794,7 @@ msgstr "Užklausų langas"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Šis formatas neturi nustatymų"
 
 #: libraries/relation.lib.php:77
@@ -8687,6 +8681,11 @@ msgid "Rename view to"
 msgstr "Pervadinti lentelę į"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Pridėti AUTO_INCREMENT reikšmę"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Išvesti %s eilučių pradedant nuo %s eilutės."
diff --git a/po/lv.po b/po/lv.po
index f322b8b..1f7cf66 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: latvian <lv at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Meklēt"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -785,7 +785,8 @@ msgid "Database Log"
 msgstr "Datubāze"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2079,14 +2080,16 @@ msgid "Exporting databases in the current server"
 msgstr "Ļauj bloķēt tabulas tekošajai darbībai."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Izveidot jaunu tabulu datubāzē %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Izveidot jaunu tabulu datubāzē %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2190,8 +2193,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Tabulas kodējums:"
 
@@ -2225,18 +2228,18 @@ msgstr "Arhivēts ar gzip"
 msgid "bzipped"
 msgstr "Arhivēts ar bzip"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formats"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2268,50 +2271,54 @@ msgid "Importing into the current server"
 msgstr "Nevar pieslēgties MySQL serverim"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Nav datubāzu"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Nav datubāzu"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Daļēji teksti"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3150,7 +3157,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3162,25 +3170,10 @@ msgstr "Parametrs"
 msgid "Add statements:"
 msgstr "Parametrs"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Pievienot AUTO_INCREMENT vērtību"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3758,7 +3751,7 @@ msgstr "Vaicājuma logs"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Šim formātam nav opciju"
 
 #: libraries/relation.lib.php:77
@@ -8597,6 +8590,11 @@ msgid "Rename view to"
 msgstr "Pārsaukt tabulu uz"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Pievienot AUTO_INCREMENT vērtību"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Saglabāt %s rindas, sākot ar %s."
diff --git a/po/mk.po b/po/mk.po
index 1fdc0c2..ad8f0a5 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:16+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: macedonian_cyrillic <mk at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Пребарување"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -785,7 +785,8 @@ msgid "Database Log"
 msgstr "База на податоци"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2086,14 +2087,16 @@ msgid "Exporting databases in the current server"
 msgstr "Дозволува заклучување на табели на тековните процеси."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Креирај нова табела во базата на податоци %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Креирај нова табела во базата на податоци %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2197,8 +2200,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Кодна страна на податотеката:"
 
@@ -2232,18 +2235,18 @@ msgstr "\"gzip\""
 msgid "bzipped"
 msgstr "\"bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Формат"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2275,50 +2278,54 @@ msgid "Importing into the current server"
 msgstr "Не можам да се пријавам на MySQL серверот"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Базата на податоци не постои"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Базата на податоци не постои"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Дел на текстот"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3177,7 +3184,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3189,25 +3197,10 @@ msgstr "Име"
 msgid "Add statements:"
 msgstr "Име"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Додади AUTO_INCREMENT вредност"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3786,7 +3779,7 @@ msgstr "Прозорец за упити"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Не постојат опции за овој формат"
 
 #: libraries/relation.lib.php:77
@@ -8653,6 +8646,11 @@ msgid "Rename view to"
 msgstr "Промени го името на табелата во "
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Додади AUTO_INCREMENT вредност"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Прикажи %s записи почнувајќи од запис %s."
diff --git a/po/mn.po b/po/mn.po
index 8a90b2c..44017b6 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: mongolian <mn at li.org>\n"
@@ -50,7 +50,7 @@ msgstr "Хайх"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -779,7 +779,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2064,14 +2065,16 @@ msgid "Exporting databases in the current server"
 msgstr "Тухайн процесст хүснэгт түгжихийг зөвшөөрөх."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "%s ӨС-д шинэ хүснэгт үүсгэх"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "%s ӨС-д шинэ хүснэгт үүсгэх"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2181,8 +2184,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Файлын кодлол:"
 
@@ -2216,18 +2219,18 @@ msgstr "gzip-ээр шахах"
 msgid "bzipped"
 msgstr "bzip-ээр шахагдсан"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Тогтнол"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2259,14 +2262,16 @@ msgid "Importing into the current server"
 msgstr "MySQL руу нэвтэрч чадсангүй"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No databases"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "ӨС байхгүй"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No databases"
+msgid "Importing into the table \"%s\""
+msgstr "ӨС байхгүй"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2274,31 +2279,34 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Оруулах файл"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Хэсэгчлэн оруулах"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2313,7 +2321,7 @@ msgstr ""
 "зөвшөөрөх. Магадгүй энэ нь том файлыг оруулахад боломжийн арга боловч, "
 "хэлэлцээрийг зогсоож чадна."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3163,7 +3171,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3175,25 +3184,10 @@ msgstr "Баримтжуулал"
 msgid "Add statements:"
 msgstr "Баримтжуулал"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT утга нэмэх"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3769,7 +3763,7 @@ msgstr "Асуултын цонх"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Энэ тогтнол сонголтгүй"
 
 #: libraries/relation.lib.php:77
@@ -8591,6 +8585,11 @@ msgid "Rename view to"
 msgstr ""
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT утга нэмэх"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s мөрүүдийг, %s-аас эхлэн устгах."
diff --git a/po/ms.po b/po/ms.po
index aa5e186..3a42c45 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:17+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: malay <ms at li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Cari"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -786,7 +786,8 @@ msgid "Database Log"
 msgstr "Pangkalan Data"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2060,14 +2061,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Cipta jadual baru pada pangkalan data %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Cipta jadual baru pada pangkalan data %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2170,8 +2173,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Fail bagi set Aksara:"
 
@@ -2205,18 +2208,18 @@ msgstr "\"digzip\""
 msgid "bzipped"
 msgstr "bzipped"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2248,50 +2251,54 @@ msgid "Importing into the current server"
 msgstr "Tidak boleh log-masuk ke server MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Tiada pangkalan data"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Tiada pangkalan data"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Sebahagian Teks"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3117,7 +3124,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3129,23 +3137,10 @@ msgstr "Penyataan"
 msgid "Add statements:"
 msgstr "Penyataan"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr ""
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3720,7 +3715,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
diff --git a/po/nb.po b/po/nb.po
index cff97cd..f0006da 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 08:43+0200\n"
 "Last-Translator:  <sven.erik.andersen at gmail.com>\n"
 "Language-Team: norwegian <no at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Søk"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -771,7 +771,8 @@ msgid "Database Log"
 msgstr "Databaselogg"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2021,14 +2022,16 @@ msgid "Exporting databases in the current server"
 msgstr "Tillater låsing av tabeller for den kjørende tråden."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Opprett ny tabell i database %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Opprett ny tabell i database %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2140,8 +2143,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Filens tegnsett:"
 
@@ -2175,18 +2178,18 @@ msgstr "Komprimert (gz)"
 msgid "bzipped"
 msgstr "Komprimert (bz2)"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2224,14 +2227,16 @@ msgid "Importing into the current server"
 msgstr "Kan ikke logge inn til MySQL tjeneren"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Gå til database"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Gå til database"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2239,25 +2244,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Fil for importering"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Filopplastinger er ikke tillatt på denne tjeneren."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Delvis importering"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2265,7 +2273,7 @@ msgstr ""
 "Forrige import ble tidsavbrutt, vil fortsette fra posisjon %d etter "
 "gjenninnsending."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2280,7 +2288,7 @@ msgstr ""
 "før det når tidsavbrudd. Dette kan være en god måte å importere store filer "
 "på, men det kan knekke transaksjoner."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3164,7 +3172,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3176,25 +3185,10 @@ msgstr "Oversikt"
 msgid "Add statements:"
 msgstr "Oversikt"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Legg til AUTO_INCREMENT verdi"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3772,7 +3766,7 @@ msgstr "Spørringsvindu"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Dette formatet har ingen valg"
 
 #: libraries/relation.lib.php:77
@@ -8836,6 +8830,11 @@ msgstr "VIEW navn"
 msgid "Rename view to"
 msgstr "Endre tabellens navn"
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Legg til AUTO_INCREMENT verdi"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dumpe %s rader fra rad %s."
 
diff --git a/po/nl.po b/po/nl.po
index 2c10b78..0f7ab43 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-05-31 01:06+0200\n"
 "Last-Translator: Bjorn <inbox at bjornroesbeke.be>\n"
 "Language-Team: dutch <nl at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Zoeken"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -783,7 +783,8 @@ msgid "Database Log"
 msgstr "Database-log"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2083,14 +2084,16 @@ msgid "Exporting databases in the current server"
 msgstr "Maakt het mogelijk tabellen op slot te zetten voor de huidige thread."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Nieuwe tabel aanmaken in database %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Nieuwe tabel aanmaken in database %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2202,8 +2205,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Karakter set van het bestand:"
 
@@ -2237,19 +2240,19 @@ msgstr "\"ge-gzipt\""
 msgid "bzipped"
 msgstr "\"ge-bzipt\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Opmaak"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
 # Is er een betere vertaling voor 'encoding' ?
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2288,14 +2291,16 @@ msgid "Importing into the current server"
 msgstr "Kan niet inloggen op de MySQL-server"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Ga naar database"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Ga naar database"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2303,25 +2308,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Te importeren bestand"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Het uploaden van bestanden is niet toegestaan op deze server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Gedeeltelijke import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2329,7 +2337,7 @@ msgstr ""
 "Tijdslimiet voor de import is verlopen, na het opnieuw versturen zal er "
 "hervat worden vanaf positie %d"
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2344,7 +2352,7 @@ msgstr ""
 "tijdslimiet nadert. Dit kan nuttig zijn bij het importeren van grote "
 "bestanden, maar kan transacties verstoren."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3244,7 +3252,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3256,25 +3265,10 @@ msgstr "Opdrachten"
 msgid "Add statements:"
 msgstr "Opdrachten"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Voeg AUTO_INCREMENT waarde toe"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3859,7 +3853,7 @@ msgstr "Query-venster"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Dit format heeft geen opties"
 
 #: libraries/relation.lib.php:77
@@ -9143,6 +9137,11 @@ msgid "Rename view to"
 msgstr "Tabel hernoemen naar"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Voeg AUTO_INCREMENT waarde toe"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s rijen aan het dumpen, start bij rij %s."
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index c306627..9949330 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -762,7 +762,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, possible-php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -1958,11 +1959,13 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-msgid "Exporting tables in the database \""
+#, possible-php-format
+msgid "Exporting tables in the database \"%s\""
 msgstr ""
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
+#, possible-php-format
+msgid "Exporting rows in the table \"%s\""
 msgstr ""
 
 #: libraries/display_export.lib.php:97
@@ -2051,8 +2054,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2078,16 +2081,16 @@ msgstr ""
 msgid "bzipped"
 msgstr ""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 msgid "Format:"
 msgstr ""
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2117,47 +2120,52 @@ msgid "Importing into the current server"
 msgstr ""
 
 #: libraries/display_import.lib.php:131
-msgid "Importing into the database \""
+#, possible-php-format
+msgid "Importing into the database \"%s\""
 msgstr ""
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
+#, possible-php-format
+msgid "Importing into the table \"%s\""
 msgstr ""
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_impor
t.lib.php:156
 #, possible-php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 msgid "Partial Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, possible-php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -2948,7 +2956,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, possible-php-format
 msgid "Add %s statement"
 msgstr ""
@@ -2957,23 +2966,10 @@ msgstr ""
 msgid "Add statements:"
 msgstr ""
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, possible-php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr ""
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3532,7 +3528,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
diff --git a/po/pl.po b/po/pl.po
index 01b208c..bb2aef5 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:29+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: polish <pl at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Szukaj"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -793,7 +793,8 @@ msgid "Database Log"
 msgstr "Baza danych"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2117,14 +2118,16 @@ msgid "Exporting databases in the current server"
 msgstr "Pozwól blokować tabele dla aktualnego wątku."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Utwórz nową tabelę w bazie danych %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Utwórz nową tabelę w bazie danych %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2234,8 +2237,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Kodowanie pliku:"
 
@@ -2269,18 +2272,18 @@ msgstr "\".gz\""
 msgid "bzipped"
 msgstr "\".bz2\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2314,13 +2317,14 @@ msgid "Importing into the current server"
 msgstr "Nie udało się zalogować na serwer MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Brak baz danych"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Brak baz danych"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2328,25 +2332,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Plik do importu"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Serwer nie pozwala na upload plików."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Import częściowy"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2354,7 +2361,7 @@ msgstr ""
 "Poprzedni import przekroczył limit czasu, ponowne przedłożenie tego pliku  "
 "spowoduje kontynuacje od miejsca %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2369,7 +2376,7 @@ msgstr ""
 "koniec limitu czasu. Może to być dobry sposób importu dużych plików, "
 "jednakże może on popsuć transakcje."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3248,7 +3255,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3260,26 +3268,11 @@ msgstr "Cecha"
 msgid "Add statements:"
 msgstr "Cecha"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 #, fuzzy
 msgid "<code>CREATE TABLE</code> options:"
 msgstr "<code>, ZMIENNA as mojanazwa</code>"
 
-#: libraries/export/sql.php:113
-#, fuzzy
-msgid "<code>IF NOT EXISTS</code>"
-msgstr "<code>, ZMIENNA as mojanazwa</code>"
-
-#: libraries/export/sql.php:115
-#, fuzzy
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "<code>, ZMIENNA as mojanazwa</code>"
-
 #: libraries/export/sql.php:123
 #, fuzzy
 msgid ""
@@ -3864,7 +3857,7 @@ msgstr "Okienko zapytania"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ten format nie ma żadnych opcji"
 
 #: libraries/relation.lib.php:77
@@ -8972,6 +8965,14 @@ msgid "Rename view to"
 msgstr "Zmień nazwę tabeli na"
 
 #, fuzzy
+#~ msgid "<code>IF NOT EXISTS</code>"
+#~ msgstr "<code>, ZMIENNA as mojanazwa</code>"
+
+#, fuzzy
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "<code>, ZMIENNA as mojanazwa</code>"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Zrzuć %s rekordów zaczynając od rekordu %s."
diff --git a/po/pt.po b/po/pt.po
index 4181801..6554f74 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:23+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: portuguese <pt at li.org>\n"
@@ -49,7 +49,7 @@ msgstr "Pesquisar"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -790,7 +790,8 @@ msgid "Database Log"
 msgstr "Base de Dados"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2077,14 +2078,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Criar nova tabela na base de dados %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Criar nova tabela na base de dados %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2189,8 +2192,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Configurar o Mapa de Caracteres do ficheiro:"
 
@@ -2224,18 +2227,18 @@ msgstr "\"Compressão gzip\""
 msgid "bzipped"
 msgstr "\"Compressão bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formato"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2267,50 +2270,54 @@ msgid "Importing into the current server"
 msgstr "Não é possível fazer login no servidor MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Sem bases de dados"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Sem bases de dados"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Texto parcial"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3140,7 +3147,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3152,25 +3160,10 @@ msgstr "Itens"
 msgid "Add statements:"
 msgstr "Itens"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Adicionar valor AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3754,7 +3747,7 @@ msgstr "Janela de Query"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Este formato não tem opções"
 
 #: libraries/relation.lib.php:77
@@ -8547,6 +8540,11 @@ msgid "Rename view to"
 msgstr "Renomeia a tabela para "
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Adicionar valor AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Exporta %s registos começando em %s."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5c38b7e..05dd73d 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-13 23:58+0200\n"
 "Last-Translator: William  Bachion <william at bachiondesign.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Procurar"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -790,7 +790,8 @@ msgid "Database Log"
 msgstr "Banco de Dados"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2105,14 +2106,16 @@ msgid "Exporting databases in the current server"
 msgstr "Permitir bloquear tabelas para a processo atual."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Criar nova tabela no Banco de Dados %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Criar nova tabela no Banco de Dados %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2222,8 +2225,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Conjunto de caracteres do arquivo"
 
@@ -2257,18 +2260,18 @@ msgstr "\"compactado com gzip\""
 msgid "bzipped"
 msgstr "\"compactado com bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formato"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Versão do cliente MySQL"
@@ -2301,13 +2304,14 @@ msgid "Importing into the current server"
 msgstr "Não foi possível se logar no servidor MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Sem bases"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Sem bases"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2315,25 +2319,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Arquivo para importar"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Não é permitido subir arquivos neste servidor."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Importação parcial"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2341,7 +2348,7 @@ msgstr ""
 "Importação anterior passou do tempo limite, depois de reenviar, irá "
 "continuar na posição %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2356,7 +2363,7 @@ msgstr ""
 "perto do tempo limite. Isso pode ser um bom caminho para importar arquivos "
 "grandes, entretanto isso pode interromper as transações."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3214,7 +3221,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3226,29 +3234,12 @@ msgstr "Comandos"
 msgid "Add statements:"
 msgstr "Comandos"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 #, fuzzy
 #| msgid "<code>@TABLE@</code>"
 msgid "<code>CREATE TABLE</code> options:"
 msgstr "<code>@TABLE@</code>"
 
-#: libraries/export/sql.php:113
-#, fuzzy
-#| msgid "<code>@TABLE@</code>"
-msgid "<code>IF NOT EXISTS</code>"
-msgstr "<code>@TABLE@</code>"
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "<code>@DATABASE@</code>"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "<code>@DATABASE@</code>"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3827,7 +3818,7 @@ msgstr "Janela de consulta"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Esse formato não tem opções"
 
 #: libraries/relation.lib.php:77
@@ -8847,6 +8838,16 @@ msgid "Rename view to"
 msgstr "Renomear a tabela para "
 
 #, fuzzy
+#~| msgid "<code>@TABLE@</code>"
+#~ msgid "<code>IF NOT EXISTS</code>"
+#~ msgstr "<code>@TABLE@</code>"
+
+#, fuzzy
+#~| msgid "<code>@DATABASE@</code>"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "<code>@DATABASE@</code>"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dumpar %s registros, começando pelo registro %s."
diff --git a/po/ro.po b/po/ro.po
index 3a0358e..189b864 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:28+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: romanian <ro at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Caută"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -795,7 +795,8 @@ msgid "Database Log"
 msgstr "Jurnalul (log) bazei de date"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2120,14 +2121,16 @@ msgid "Exporting databases in the current server"
 msgstr "Permite blocarea tabelelor din firul curent de execuție."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Creează tabel nou în baza de date %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Creează tabel nou în baza de date %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2237,8 +2240,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Setul de caractere al fișierului:"
 
@@ -2272,18 +2275,18 @@ msgstr "cu „gzip”"
 msgid "bzipped"
 msgstr "cu „bzip2”"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Versiunea clientului MySQL"
@@ -2316,13 +2319,14 @@ msgid "Importing into the current server"
 msgstr "Nu pot face conexiunea catre serverul MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Nu sînt baze de date"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Nu sînt baze de date"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2330,32 +2334,35 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Fișier de importat"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Încărcările de fișiere nu sînt permise pe acest server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Importare parțială"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 "Previous import timed out, after resubmitting will continue from position %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2370,7 +2377,7 @@ msgstr ""
 "apropie de limita de timp. Aceasta poate fi o metodă bună de a importa "
 "fișiere mari, deși poate strica tranzacții."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3259,7 +3266,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3271,25 +3279,10 @@ msgstr "Comenzi"
 msgid "Add statements:"
 msgstr "Comenzi"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Adaugă valoare pentru AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3869,7 +3862,7 @@ msgstr "Fereastra de comandă"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Acest format nu are opțiuni"
 
 #: libraries/relation.lib.php:77
@@ -8884,6 +8877,11 @@ msgid "Rename view to"
 msgstr "Redenumire tabel la"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Adaugă valoare pentru AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Aruncă %s rînduri, începînd de la rîndul %s."
diff --git a/po/ru.po b/po/ru.po
index 6bdb621..252814c 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:27+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: russian <ru at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Поиск"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -790,7 +790,8 @@ msgid "Database Log"
 msgstr "Журнал базы данных"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2119,14 +2120,16 @@ msgid "Exporting databases in the current server"
 msgstr "Разрешает блокировку таблиц для текущего потока"
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Создать новую таблицу в базе данных %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Создать новую таблицу в базе данных %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2238,8 +2241,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Кодировка файла:"
 
@@ -2273,18 +2276,18 @@ msgstr "gzip"
 msgid "bzipped"
 msgstr "bzip"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Формат"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2321,14 +2324,16 @@ msgid "Importing into the current server"
 msgstr "Невозможно подключиться к серверу MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Перейти к базе данных"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Перейти к базе данных"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2336,25 +2341,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Импортируемый файл"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Загрузка файлов на сервер, невозможна."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Частичный импорт"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2362,7 +2370,7 @@ msgstr ""
 "Процесс импорта был прерван из-за приближения временного лимита, после "
 "перезапуска импорт будет продолжен с позиции %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2376,7 +2384,7 @@ msgstr ""
 "Разрешить скрипту разбивать процесс импорта при приближении временного "
 "лимита. Может быть использовано при импорте файлов большого размера."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3272,7 +3280,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3284,25 +3293,10 @@ msgstr "Характеристика"
 msgid "Add statements:"
 msgstr "Характеристика"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Добавить AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3887,7 +3881,7 @@ msgstr "Окно запроса"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Для этого формата нет настраиваемых параметров"
 
 #: libraries/relation.lib.php:77
@@ -9180,6 +9174,11 @@ msgid "Rename view to"
 msgstr "Переименовать таблицу в"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Добавить AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Дамп из %s строк, начиная с записи # %s."
diff --git a/po/si.po b/po/si.po
index 72d5ed8..cf824c7 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:26+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: sinhala <si at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "සෙවීම"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -788,7 +788,8 @@ msgid "Database Log"
 msgstr "දත්තගබඩාව"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2094,14 +2095,16 @@ msgid "Exporting databases in the current server"
 msgstr "Allows locking tables for the current thread."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "%s දත්තගබඩාවේ නව වගුවක් සාදන්න"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "%s දත්තගබඩාවේ නව වගුවක් සාදන්න"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2211,8 +2214,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "ගොනුවේ අක්ෂර කට්ටලය:"
 
@@ -2246,18 +2249,18 @@ msgstr "\"gzipp ගත කරන ලදි\""
 msgid "bzipped"
 msgstr "\"bzipp ගතකරන ලදි\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "ආකෘතිය"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "MySQL සේවාදායකයාගේ සංස්කරණය"
@@ -2290,13 +2293,14 @@ msgid "Importing into the current server"
 msgstr "MySQL සර්වරයට ලොග් විය නොහැක"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "දත්තගබඩා නොමැත"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "දත්තගබඩා නොමැත"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2304,32 +2308,35 @@ msgstr ""
 msgid "File to Import:"
 msgstr "ආනයනය සඳහා වූ ගොනුව"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "File uploads are not allowed on this server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Partial import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 "Previous import timed out, after resubmitting will continue from position %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2344,7 +2351,7 @@ msgstr ""
 "This might be good way to import large files, however it can break "
 "transactions."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3198,7 +3205,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3210,25 +3218,10 @@ msgstr "ප්‍රකාශය"
 msgid "Add statements:"
 msgstr "ප්‍රකාශය"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT අගයක් එක් කරන්න"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3811,7 +3804,7 @@ msgstr "Query window"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "මෙම ආකෘතියේ විකල්ප කිසිවක් නැත"
 
 #: libraries/relation.lib.php:77
@@ -8786,6 +8779,11 @@ msgid "Rename view to"
 msgstr "වගුව බවට නම වෙනස් කරන්න"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT අගයක් එක් කරන්න"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump %s row(s) starting at record # %s."
diff --git a/po/sk.po b/po/sk.po
index 3c23c47..7d15e31 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:26+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: slovak <sk at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Hľadať"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -790,7 +790,8 @@ msgid "Database Log"
 msgstr "Databáza"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2102,14 +2103,16 @@ msgid "Exporting databases in the current server"
 msgstr "Povolí zmaknutie tabuliek pre aktuálne vlákno."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Vytvoriť novú tabuľku v databáze %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Vytvoriť novú tabuľku v databáze %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2221,8 +2224,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Znaková sada súboru:"
 
@@ -2256,18 +2259,18 @@ msgstr "\"gzip-ované\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formát"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Verzia MySQL klienta"
@@ -2303,14 +2306,16 @@ msgid "Importing into the current server"
 msgstr "Nedá sa prihlásiť k MySQL serveru"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Prejsť do databázy"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Prejsť do databázy"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2318,25 +2323,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Súbor na importovanie"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Ukladanie súborov na server nie je povolené."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Čiastočný import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2344,7 +2352,7 @@ msgstr ""
 "Predchádzajúcemu importu vypršal časový limit. Po znovuodoslaní formulára sa "
 "bude pokračovať od pozície %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2359,7 +2367,7 @@ msgstr ""
 "Týmto spôsobom sa môžu importovať aj veľké súbory, ale môže to zároveň "
 "spôsobiť problémy s transakciami."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3211,7 +3219,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3223,25 +3232,10 @@ msgstr "Údaj"
 msgid "Add statements:"
 msgstr "Údaj"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Pridať hodnotu AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3821,7 +3815,7 @@ msgstr "SQL okno"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Tento formát nemá žiadne nastavenia"
 
 #: libraries/relation.lib.php:77
@@ -8823,6 +8817,11 @@ msgid "Rename view to"
 msgstr "Premenovať tabuľku na"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Pridať hodnotu AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Zobraziť %s riadkov od riadku %s."
diff --git a/po/sl.po b/po/sl.po
index 2bbf8d4..b487693 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-08-10 10:16+0200\n"
 "Last-Translator: Domen <dbc334 at gmail.com>\n"
 "Language-Team: slovenian <sl at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Iskanje"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -769,7 +769,8 @@ msgid "Database Log"
 msgstr "Dnevnik zbirke podatkov"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2029,14 +2030,16 @@ msgid "Exporting databases in the current server"
 msgstr "Omogoča zaklepanje tabel za trenutno temo."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Ustvari novo tabelo v podatkovni zbirki %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Ustvari novo tabelo v podatkovni zbirki %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2148,8 +2151,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Nabor znakov datoteke:"
 
@@ -2183,18 +2186,18 @@ msgstr "\"gzipano\""
 msgid "bzipped"
 msgstr "\"bzipano\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Oblika"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2233,14 +2236,16 @@ msgid "Importing into the current server"
 msgstr "Ne morem se prijaviti v strežnik MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Pojdi v zbirko podatkov"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Pojdi v zbirko podatkov"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2248,25 +2253,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Datoteka za uvoz"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Nalaganje datotek na tem strežniku ni dovoljeno."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Delni uvoz"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2274,7 +2282,7 @@ msgstr ""
 "Čas prejšnjega uvoza se je iztekel, po ponovni potrditvi se bo nadaljeval od "
 "položaja %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2289,7 +2297,7 @@ msgstr ""
 "omejitve PHP. To je morda dober način za uvoz velikih datotek, čeprav lahko "
 "prekine transakcije."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3180,7 +3188,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3192,25 +3201,10 @@ msgstr "Izjave"
 msgid "Add statements:"
 msgstr "Izjave"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Dodaj vrednost AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3788,7 +3782,7 @@ msgstr "Okno za poizvedbe"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Za to obliko ni možnosti"
 
 #: libraries/relation.lib.php:77
@@ -8854,6 +8848,11 @@ msgstr "Ime VIEW"
 msgid "Rename view to"
 msgstr "Preimenuj pogled v"
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Dodaj vrednost AUTO_INCREMENT"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Odloži %s vrstic, začni pri vrstici # %s"
 
diff --git a/po/sq.po b/po/sq.po
index 6d3d131..3bf7257 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-21 14:51+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: albanian <sq at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Kërko"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -787,7 +787,8 @@ msgid "Database Log"
 msgstr "Databazat"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2075,14 +2076,16 @@ msgid "Exporting databases in the current server"
 msgstr "Lejon bllokimin e tabelave për thread e momentit."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Krijo një tabelë të re tek databaza %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Krijo një tabelë të re tek databaza %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2186,8 +2189,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Familja gërmave të file:"
 
@@ -2221,18 +2224,18 @@ msgstr "\"kompresuar me gzip\""
 msgid "bzipped"
 msgstr "\"kompresuar me bzip2\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Formati"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2264,50 +2267,54 @@ msgid "Importing into the current server"
 msgstr "E pamundur kryerja e login tek server-i MySQL"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Asnjë databazë"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Asnjë databazë"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Tekst i pjesëshëm"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3142,7 +3149,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3154,25 +3162,10 @@ msgstr "Instruksione"
 msgid "Add statements:"
 msgstr "Instruksione"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Shto vlerë AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3751,7 +3744,7 @@ msgstr "Dritarja e Query"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ky format nuk ka opcione"
 
 #: libraries/relation.lib.php:77
@@ -8597,6 +8590,11 @@ msgid "Rename view to"
 msgstr "Riemërto tabelën në"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Shto vlerë AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Dump i %s rreshta duke filluar nga rreshti %s."
diff --git a/po/sr.po b/po/sr.po
index cc84929..c9440a2 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-30 23:47+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: serbian_cyrillic <sr at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Претраживање"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -794,7 +794,8 @@ msgid "Database Log"
 msgstr "База података"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2105,14 +2106,16 @@ msgid "Exporting databases in the current server"
 msgstr "Дозвољава закључавање табела текућим процесима."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Направи нову табелу у бази %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Направи нову табелу у бази %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2222,8 +2225,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Карактер сет датотеке:"
 
@@ -2257,18 +2260,18 @@ msgstr "\"гзип-овано\""
 msgid "bzipped"
 msgstr "\"бзип-овано\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Формат"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Верзија MySQL клијента"
@@ -2301,13 +2304,14 @@ msgid "Importing into the current server"
 msgstr "Не могу да се пријавим на MySQL сервер"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "База не постоји"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "База не постоји"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2315,25 +2319,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Датотека за увоз"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+
"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Слање датотека на овај сервер није дозвољено."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Делимични увоз"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2341,7 +2348,7 @@ msgstr ""
 "Претходном увозу је истекло време, након поновног слања биће настављен од "
 "позиције %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2356,7 +2363,7 @@ msgstr ""
 "ограничења. Ово може бити добар начин увоза великих датотека, али са друге "
 "стране може покварити трансакције."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3214,7 +3221,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3226,25 +3234,10 @@ msgstr "Име"
 msgid "Add statements:"
 msgstr "Име"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Додај AUTO_INCREMENT вредност"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3824,7 +3817,7 @@ msgstr "Прозор за упите"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Не постоје опције за овај формат"
 
 #: libraries/relation.lib.php:77
@@ -8814,6 +8807,11 @@ msgid "Rename view to"
 msgstr "Промени име табеле у "
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Додај AUTO_INCREMENT вредност"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Прикажи %s редова почевши од реда %s."
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 46b7525..51ae308 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:27+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: serbian_latin <sr at latin@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Pretraživanje"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -794,7 +794,8 @@ msgid "Database Log"
 msgstr "Baza podataka"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2105,14 +2106,16 @@ msgid "Exporting databases in the current server"
 msgstr "Dozvoljava zaključavanje tabela tekućim procesima."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Napravi novu tabelu u bazi %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Napravi novu tabelu u bazi %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2222,8 +2225,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Karakter set datoteke:"
 
@@ -2257,18 +2260,18 @@ msgstr "\"gzip-ovano\""
 msgid "bzipped"
 msgstr "\"bzip-ovano\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "Verzija MySQL klijenta"
@@ -2301,13 +2304,14 @@ msgid "Importing into the current server"
 msgstr "Ne mogu da se prijavim na MySQL server"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Baza ne postoji"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Baza ne postoji"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2315,25 +2319,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Datoteka za uvoz"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Slanje datoteka na ovaj server nije dozvoljeno."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Delimični uvoz"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2341,7 +2348,7 @@ msgstr ""
 "Prethodnom uvozu je isteklo vreme, nakon ponovnog slanja biće nastavljen od "
 "pozicije %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2356,7 +2363,7 @@ msgstr ""
 "ograničenja. Ovo može biti dobar način uvoza velikih datoteka, ali sa druge "
 "strane može pokvariti transakcije."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3210,7 +3217,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3222,25 +3230,10 @@ msgstr "Ime"
 msgid "Add statements:"
 msgstr "Ime"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Dodaj AUTO_INCREMENT vrednost"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3820,7 +3813,7 @@ msgstr "Prozor za upite"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ne postoje opcije za ovaj format"
 
 #: libraries/relation.lib.php:77
@@ -8815,6 +8808,11 @@ msgid "Rename view to"
 msgstr "Promeni ime tabele u "
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Dodaj AUTO_INCREMENT vrednost"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Prikaži %s redova počevši od reda %s."
diff --git a/po/sv.po b/po/sv.po
index 205bb06..b5aea71 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-21 14:48+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: swedish <sv at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Sök"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -790,7 +790,8 @@ msgid "Database Log"
 msgstr "Databas"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2108,14 +2109,16 @@ msgid "Exporting databases in the current server"
 msgstr "Tillåter låsning av tabeller för gällande tråd."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Skapa ny tabell i databas %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Skapa ny tabell i databas %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2225,8 +2228,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Filens teckenuppsättning:"
 
@@ -2260,18 +2263,18 @@ msgstr "\"gzippad\""
 msgid "bzipped"
 msgstr "\"bzippad\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2310,13 +2313,14 @@ msgid "Importing into the current server"
 msgstr "Kan ej logga in på MySQL-server"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Inga databaser"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Inga databaser"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2324,25 +2328,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Fil att importera"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Filuppladdningar är inte tillåtna på denna server."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Partiell import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2350,7 +2357,7 @@ msgstr ""
 "Tidsbegränsningen överskreds vid föregående import. Efter återupptagning av "
 "importen kommer den fortsätta från position %d."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2365,7 +2372,7 @@ msgstr ""
 "tidsbegränsningen. Detta kan vara ett bra sätt att importera stora filer, "
 "men det kan bryta transaktioner."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3256,7 +3263,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3268,25 +3276,10 @@ msgstr "Uppgift"
 msgid "Add statements:"
 msgstr "Uppgift"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "Lägg till AUTO_INCREMENT-värde"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3868,7 +3861,7 @@ msgstr "Frågefönster"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Detta format har inga alternativ"
 
 #: libraries/relation.lib.php:77
@@ -9059,6 +9052,11 @@ msgid "Rename view to"
 msgstr "Döp om tabellen till"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "Lägg till AUTO_INCREMENT-värde"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Visa %s rader med början på rad %s."
diff --git a/po/ta.po b/po/ta.po
index 6cffa82..d7dabc8 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-04-16 10:43+0200\n"
 "Last-Translator: Sutharshan <sutharshan02 at gmail.com>\n"
 "Language-Team: Tamil <ta at li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -765,7 +765,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2004,11 +2005,13 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-msgid "Exporting tables in the database \""
+#, php-format
+msgid "Exporting tables in the database \"%s\""
 msgstr ""
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
+#, php-format
+msgid "Exporting rows in the table \"%s\""
 msgstr ""
 
 #: libraries/display_export.lib.php:97
@@ -2097,8 +2100,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2124,16 +2127,16 @@ msgstr ""
 msgid "bzipped"
 msgstr ""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 msgid "Format:"
 msgstr ""
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2163,47 +2166,52 @@ msgid "Importing into the current server"
 msgstr ""
 
 #: libraries/display_import.lib.php:131
-msgid "Importing into the database \""
+#, php-format
+msgid "Importing into the database \"%s\""
 msgstr ""
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
+#, php-format
+msgid "Importing into the table \"%s\""
 msgstr ""
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 msgid "Partial Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -2996,7 +3004,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, php-format
 msgid "Add %s statement"
 msgstr ""
@@ -3007,25 +3016,10 @@ msgstr ""
 msgid "Add statements:"
 msgstr "தடைகளை சேர்க்க"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "தானாக அதிகரிக்கும் பெறுமதியை சேர்க்க"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3584,7 +3578,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
@@ -8165,6 +8159,11 @@ msgstr ""
 msgid "Rename view to"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "தானாக அதிகரிக்கும் பெறுமதியை சேர்க்க"
+
 #~ msgid "Actions"
 #~ msgstr "செயல்கள்"
 
diff --git a/po/te.po b/po/te.po
index ad7fd2d..80e8b2f 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-05-26 14:20+0200\n"
 "Last-Translator:  <veeven at gmail.com>\n"
 "Language-Team: Telugu <te at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "శోధించు"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -781,7 +781,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2039,11 +2040,13 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-msgid "Exporting tables in the database \""
+#, php-format
+msgid "Exporting tables in the database \"%s\""
 msgstr ""
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
+#, php-format
+msgid "Exporting rows in the table \"%s\""
 msgstr ""
 
 #: libraries/display_export.lib.php:97
@@ -2139,8 +2142,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2166,16 +2169,16 @@ msgstr ""
 msgid "bzipped"
 msgstr ""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 msgid "Format:"
 msgstr ""
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2205,49 +2208,54 @@ msgid "Importing into the current server"
 msgstr ""
 
 #: libraries/display_import.lib.php:131
-msgid "Importing into the database \""
+#, php-format
+msgid "Importing into the database \"%s\""
 msgstr ""
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
+#, php-format
+msgid "Importing into the table \"%s\""
 msgstr ""
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "పాక్షిక పాఠ్యాలు"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3044,7 +3052,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, php-format
 msgid "Add %s statement"
 msgstr ""
@@ -3056,23 +3065,10 @@ msgstr ""
 msgid "Add statements:"
 msgstr "స్పందనలకు చేర్చు"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr ""
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3650,7 +3646,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
diff --git a/po/th.po b/po/th.po
index 08cab35..ffe0535 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:19+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: thai <th at li.org>\n"
@@ -48,7 +48,7 @@ msgstr "ค้นหา"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -784,7 +784,8 @@ msgid "Database Log"
 msgstr "ฐานข้อมูล"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2057,14 +2058,16 @@ msgid "Exporting databases in the current server"
 msgstr "อนุญาตให้ล็อกตารางสำหรับเธรดปัจจุบัน"
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "สร้างตารางในฐานข้อมูลนี้ %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "สร้างตารางในฐานข้อมูลนี้ %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2167,8 +2170,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "ชุดอักขระของไฟล์ (character set):"
 
@@ -2202,18 +2205,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "รูปแบบ"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2245,50 +2248,54 @@ msgid "Importing into the current server"
 msgstr "ไม่สามารถล็อกอินเข้าเซิร์ฟเวอร์ MySQL ได้"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "ไม่มีฐานข้อมูล"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "ไม่มีฐานข้อมูล"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "ข้อความบางส่วน"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3120,7 +3127,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3132,25 +3140,10 @@ msgstr "คำสั่ง"
 msgid "Add statements:"
 msgstr "คำสั่ง"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "เพิ่มค่า AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3727,7 +3720,7 @@ msgstr "หน้าต่างคำค้น"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "รูปแบบนี้ไม่มีตัวเลือก"
 
 #: libraries/relation.lib.php:77
@@ -8471,6 +8464,11 @@ msgid "Rename view to"
 msgstr "เปลี่ยนชื่อตารางเป็น"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "เพิ่มค่า AUTO_INCREMENT"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "ดัมพ์แถว %s แถว เริ่มที่แถว %s"
diff --git a/po/tr.po b/po/tr.po
index e779b33..0825480 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-08-08 22:05+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit at hotmail.com>\n"
 "Language-Team: turkish <tr at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Ara"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -762,7 +762,8 @@ msgid "Database Log"
 msgstr "Veritabanı Günlüğü"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2017,14 +2018,16 @@ msgid "Exporting databases in the current server"
 msgstr "Şu anki işlem için tabloların kilitlenmesine izin verir."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "%s veritabanında yeni tablo oluştur"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "%s veritabanında yeni tablo oluştur"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2136,8 +2139,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Dosyanın karakter grubu:"
 
@@ -2171,18 +2174,18 @@ msgstr "\"gzip olarak\""
 msgid "bzipped"
 msgstr "\"bzip olarak\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Biçim"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2221,14 +2224,16 @@ msgid "Importing into the current server"
 msgstr "MySQL sunucusuna oturum açılamıyor"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Veritabanına git"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "Veritabanına git"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2236,25 +2241,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "İçe aktarmak için dosya"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Bu sunucuda dosya gönderimlerine izin verilmez."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Kısmi içe aktarma"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2262,7 +2270,7 @@ msgstr ""
 "Önceki içe aktarma zaman aşımına uğradı, sonradan yeniden gönderim %d "
 "konumundan devam edecek."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2277,7 +2285,7 @@ msgstr ""
 "aktarımı kesmeye izin verir. Bu büyük dosyaların içe aktarımı için iyi bir "
 "yol olabilir, ancak bu işlemleri bozabilir."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3170,7 +3178,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3182,25 +3191,10 @@ msgstr "İfadeler"
 msgid "Add statements:"
 msgstr "İfadeler"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT değeri ekle"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3777,7 +3771,7 @@ msgstr "Sorgu penceresi"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Bu biçimin seçenekleri yok"
 
 #: libraries/relation.lib.php:77
@@ -8869,6 +8863,11 @@ msgstr "GÖRÜNÜM adı"
 msgid "Rename view to"
 msgstr "Görünümü yeniden şuna adlandır"
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT değeri ekle"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "%s satır dökümü, %s. satırdan başlıyor"
 
diff --git a/po/tt.po b/po/tt.po
index 581b4c8..1f5c9b2 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:25+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: tatarish <tt at li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Ezläw"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -786,7 +786,8 @@ msgid "Database Log"
 msgstr "Biremlek"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2080,14 +2081,16 @@ msgid "Exporting databases in the current server"
 msgstr "Allows locking tables for the current thread."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "%s biremlegendä yaña tüşämä yaratu"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "%s biremlegendä yaña tüşämä yaratu"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2190,8 +2193,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Şul biremneñ bilgelämäse:"
 
@@ -2225,18 +2228,18 @@ msgstr "\"gziple\""
 msgid "bzipped"
 msgstr "\"bziple\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Tözeleş"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "MySQL belän totaştırğıç söreme"
@@ -2269,13 +2272,14 @@ msgid "Importing into the current server"
 msgstr "MySQL servergä totaşılıp bulmadı"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "Biremleklär yuq"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "Biremleklär yuq"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2283,38 +2287,41 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Yöklise birem"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Öleşçä yökläw"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3165,7 +3172,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3177,25 +3185,10 @@ msgstr "Cömlä"
 msgid "Add statements:"
 msgstr "Cömlä"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "\"AUTO_INCREMENT\" bäyäsen östise"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3779,7 +3772,7 @@ msgstr "Soraw täräzäse"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Bu tözeleşeneñ köyläneşe yuq"
 
 #: libraries/relation.lib.php:77
@@ -8643,6 +8636,11 @@ msgid "Rename view to"
 msgstr "Tüşämä adın üzgärtü"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "\"AUTO_INCREMENT\" bäyäsen östise"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "Eçtälek: %s kerem, #%s keremnän başlap."
diff --git a/po/ug.po b/po/ug.po
index 20b3247..cd43486 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-30 11:41+0200\n"
 "Last-Translator:  <gheni at yahoo.cn>\n"
 "Language-Team: Uyghur <ug at li.org>\n"
@@ -54,7 +54,7 @@ msgstr "ئىزدەش"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -762,7 +762,8 @@ msgid "Database Log"
 msgstr "ساندان خاتىرىسى"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -1989,14 +1990,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "ساندان %s غا جەدىۋەل قۇرۇش"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "ساندان %s غا جەدىۋەل قۇرۇش"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2099,8 +2102,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "ھۆججەتنىڭ ھەرىپ-بەلگە توپلىمى"
 
@@ -2134,18 +2137,18 @@ msgstr "gzipپىرىسلاش"
 msgid "bzipped"
 msgstr "bzip پىرىسلاش"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "فورماتلاش"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2177,14 +2180,16 @@ msgid "Importing into the current server"
 msgstr "MySQL مۇلازىمىتېرىغا ئۇلىنالمىدى."
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Drop the database (DROP)"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "كۆچۈرۈلگەن ساندان"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Drop the database (DROP)"
+msgid "Importing into the table \"%s\""
+msgstr "كۆچۈرۈلگەن ساندان"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2192,25 +2197,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "ئەكىرىشكە تىگىشلىك ھۆججەت"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "مۇلازىمىتىرنىڭ ھۆججەت چىقىرىشىنى چەكلەندى"
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "بۆلۈپ كىرگۈزىش"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2218,14 +2226,14 @@ msgstr ""
 "ئالدىنقى قېتىملىق مەشغۇلاتنىڭ ۋاقتى ئېشىپ كەتتى، %d دىن باشلاپ قايتىدىن "
 "تاپشۇرۇڭ."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3043,7 +3051,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, php-format
 msgid "Add %s statement"
 msgstr ""
@@ -3054,25 +3063,10 @@ msgstr ""
 msgid "Add statements:"
 msgstr "مەجبۇرى قوشۇش"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT قوشۇش"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3637,7 +3631,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
@@ -8223,6 +8217,11 @@ msgstr ""
 msgid "Rename view to"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT قوشۇش"
+
 #~ msgid "remember template"
 #~ msgstr "ئەستە ساقلاش قېلىپى"
 
diff --git a/po/uk.po b/po/uk.po
index 5fdf340..3cdf2eb 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-27 23:41+0200\n"
 "Last-Translator: Olexiy Zagorskyi <zalex_ua at i.ua>\n"
 "Language-Team: ukrainian <uk at li.org>\n"
@@ -53,7 +53,7 @@ msgstr "Шукати"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -770,7 +770,8 @@ msgid "Database Log"
 msgstr ""
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2050,14 +2051,16 @@ msgid "Exporting databases in the current server"
 msgstr "Дозволити блокування таблиць для біжучих потоків."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "Створити нову таблицю в БД %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "Створити нову таблицю в БД %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2160,8 +2163,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Кодування файлу:"
 
@@ -2195,18 +2198,18 @@ msgstr "запакувати в \"gzip\""
 msgid "bzipped"
 msgstr "запакувати в \"bzip\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Формат"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2238,51 +2241,56 @@ msgid "Importing into the current server"
 msgstr "Не можу зареєструватися на MySQL сервері"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No databases"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "БД відсутні"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No databases"
+msgid "Importing into the table \"%s\""
+msgstr "БД відсутні"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial Import:"
 msgstr "Часткові тексти"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3108,7 +3116,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3120,23 +3129,10 @@ msgstr "Параметр"
 msgid "Add statements:"
 msgstr "Параметр"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr ""
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3707,7 +3703,7 @@ msgstr "Вікно запиту"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Цей формат не має опцій"
 
 #: libraries/relation.lib.php:77
diff --git a/po/ur.po b/po/ur.po
index 8f6dabd..0727bdb 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-05-14 12:35+0200\n"
 "Last-Translator:  <monymirza at gmail.com>\n"
 "Language-Team: Urdu <ur at li.org>\n"
@@ -55,7 +55,7 @@ msgstr "تلاش"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -786,7 +786,8 @@ msgid "Database Log"
 msgstr "ڈیٹا بیس لوگ"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -1996,14 +1997,16 @@ msgid "Exporting databases in the current server"
 msgstr ""
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "No tables found in database."
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "ڈیٹا بیس میں کوئی ٹیبل نہیں مِلا"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "No tables found in database."
+msgid "Exporting rows in the table \"%s\""
+msgstr "ڈیٹا بیس میں کوئی ٹیبل نہیں مِلا"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2097,8 +2100,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr ""
 
@@ -2124,16 +2127,16 @@ msgstr ""
 msgid "bzipped"
 msgstr ""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 msgid "Format:"
 msgstr ""
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
 msgstr ""
 
@@ -2163,49 +2166,54 @@ msgid "Importing into the current server"
 msgstr ""
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Copy database to"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "ڈیٹا بیس کاپی کریں"
 
 #: libraries/display
_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Copy database to"
+msgid "Importing into the table \"%s\""
+msgstr "ڈیٹا بیس کاپی کریں"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 msgid "Partial Import:"
 msgstr ""
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
 msgstr ""
 
@@ -3004,7 +3012,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, php-format
 msgid "Add %s statement"
 msgstr ""
@@ -3015,25 +3024,10 @@ msgstr ""
 msgid "Add statements:"
 msgstr "Add constraints"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "ویلیو شامل کریں AUTO_INCREMENT"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3596,7 +3590,7 @@ msgid "Query window"
 msgstr ""
 
 #: libraries/plugin_interface.lib.php:336
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr ""
 
 #: libraries/relation.lib.php:77
@@ -8191,6 +8185,11 @@ msgstr ""
 msgid "Rename view to"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "ویلیو شامل کریں AUTO_INCREMENT"
+
 #~ msgid "BLOB Repository"
 #~ msgstr "BLOB Repository"
 
diff --git a/po/uz.po b/po/uz.po
index d396581..65ae8f6 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:31+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: uzbek_cyrillic <uz at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "Қидириш"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -784,7 +784,8 @@ msgid "Database Log"
 msgstr "База лог файлини"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2121,14 +2122,16 @@ msgid "Exporting databases in the current server"
 msgstr "Жорий оқим учун жадвални блокировку қилишга рухсат беради"
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "\"%s\" маълумотлар базасида янги жадвал тузиш"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "\"%s\" маълумотлар базасида янги жадвал тузиш"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2240,8 +2243,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Файл кодировкаси: "
 
@@ -2275,18 +2278,18 @@ msgstr "gzip"
 msgid "bzipped"
 msgstr "bzip ёрдамида сиқилган"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Формат"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2325,14 +2328,16 @@ msgid "Importing into the current server"
 msgstr "MySQL серверига уланиб бўлмади"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Ушбу базага ўтиш"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Ушбу базага ўтиш"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2340,25 +2345,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Импорт қилинаётган файл "
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Файлларни серверга юклаб бўлмади."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Қисман импорт"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2366,7 +2374,7 @@ msgstr ""
 "Чегараланган вақт яқинлашганлиги сабабли, импорт жараёни узилди. Қайта ишга "
 "туширилганда, импорт жараёни %d позициядандавом этади."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2381,7 +2389,7 @@ msgstr ""
 "Катта ҳажмдаги файлларни импорт қилишда қўл келиши мумкин, аммо бунда "
 "транзакция узилиши мумкин."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3273,7 +3281,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3285,25 +3294,10 @@ msgstr "Тавсиф"
 msgid "Add statements:"
 msgstr "Тавсиф"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT қўшиш"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3892,7 +3886,7 @@ msgstr "Сўровлар ойнаси"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ушбу формат учун созланадиган параметр мавжуд эмас"
 
 #: libraries/relation.lib.php:77
@@ -9178,6 +9172,11 @@ msgid "Rename view to"
 msgstr "Кўриниш номини ўзгартириш"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT қўшиш"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "# %s ёзувидан бошлаб %s сатрни дамп қилиш."
diff --git a/po/uz at latin.po b/po/uz at latin.po
index c21bc64..90ecde4 100644
--- a/po/uz at latin.po
+++ b/po/uz at latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-07-22 02:30+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: uzbek_latin <uz at latin@li.org>\n"
@@ -52,7 +52,7 @@ msgstr "Qidirish"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -786,7 +786,8 @@ msgid "Database Log"
 msgstr "Baza log faylini"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2128,14 +2129,16 @@ msgid "Exporting databases in the current server"
 msgstr "Joriy oqim uchun jadvalni blokirovku qilishga ruxsat beradi"
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "\"%s\" ma`lumotlar bazasida yangi jadval tuzish"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "\"%s\" ma`lumotlar bazasida yangi jadval tuzish"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2247,8 +2250,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "Fayl kodirovkasi: "
 
@@ -2282,18 +2285,18 @@ msgstr "gzip"
 msgid "bzipped"
 msgstr "bzip yordamida siqilgan"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "Format"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
@@ -2332,14 +2335,16 @@ msgid "Importing into the current server"
 msgstr "MySQL serveriga ulanib bo‘lmadi"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Go to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "Ushbu bazaga o‘tish"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Go to database"
+msgid "Importing into the table \"%s\""
+msgstr "Ushbu bazaga o‘tish"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2347,25 +2352,28 @@ msgstr ""
 msgid "File to Import:"
 msgstr "Import qilinayotgan fayl "
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "Fayllarni serverga yuklab bo‘lmadi."
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "Qisman import"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
@@ -2373,7 +2381,7 @@ msgstr ""
 "Chegaralangan vaqt yaqinlashganligi sababli, import jarayoni uzildi. Qayta "
 "ishga tushirilganda, import jarayoni %d pozitsiyadandavom etadi."
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2388,7 +2396,7 @@ msgstr ""
 "berish. Katta hajmdagi fayllarni import qilishda qo‘l kelishi mumkin, ammo "
 "bunda tranzaksiya uzilishi mumkin."
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3287,7 +3295,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3299,25 +3308,10 @@ msgstr "Tavsif"
 msgid "Add statements:"
 msgstr "Tavsif"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "AUTO_INCREMENT qo‘shish"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3907,7 +3901,7 @@ msgstr "So‘rovlar oynasi"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "Ushbu format uchun sozlanadigan parametr mavjud emas"
 
 #: libraries/relation.lib.php:77
@@ -9244,6 +9238,11 @@ msgid "Rename view to"
 msgstr "Ko‘rinish nomini o‘zgartirish"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "AUTO_INCREMENT qo‘shish"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "# %s yozuvidan boshlab %s satrni damp qilish."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 50f9957..7fbdb17 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-08-10 08:13+0200\n"
 "Last-Translator: shanyan baishui <Siramizu at gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN at li.org>\n"
@@ -51,7 +51,7 @@ msgstr "搜索"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -764,7 +764,8 @@ msgid "Database Log"
 msgstr "数据库日志"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -1983,14 +1984,16 @@ msgid "Exporting databases in the current server"
 msgstr "允许锁定当前线程的表。"
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "在数据库 %s 中新建一张数据表"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "在数据库 %s 中新建一张数据表"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2101,8 +2104,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "文件的字符集:"
 
@@ -2136,18 +2139,18 @@ msgstr "gzip 压缩"
 msgid "bzipped"
 msgstr "bzip 压缩"
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "格式"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 #| msgid "Encoding conversion"
 msgid "Encoding Conversion:"
@@ -2183,14 +2186,16 @@ msgid "Importing into the current server"
 msgstr "无法登录 MySQL 服务器"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Jump to database"
-msgid "Importing into the database \""
+msgid "Importing into the database \"%s\""
 msgstr "转到数据库"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Jump to database"
+msgid "Importing into the table \"%s\""
+msgstr "转到数据库"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2198,31 +2203,34 @@ msgstr ""
 msgid "File to Import:"
 msgstr "要导入的文件"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr "此服务器禁止了文件上传。"
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "部分导入"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr "上一个导入操作超时,随后重新提交将会从 %d 处开始。"
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 #, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
@@ -2236,7 +2244,7 @@ msgstr ""
 "在导入时脚本若检测到可能需要花费很长时间则允许中断。尽管这会中断事务,但在导"
 "入大文件时是个很好的方法。"
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of queries to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3093,7 +3101,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3105,25 +3114,10 @@ msgstr "说明"
 msgid "Add statements:"
 msgstr "说明"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "添加自增 (AUTO_INCREMENT) 值"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3696,7 +3690,7 @@ msgstr "查询窗口"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "此格式没有选项"
 
 #: libraries/relation.lib.php:77
@@ -8530,6 +8524,11 @@ msgstr "视图名"
 msgid "Rename view to"
 msgstr "将视图改名为"
 
+#, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "添加自增 (AUTO_INCREMENT) 值"
+
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "从 # %2$s 行开始转储 %1$s 行"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 95c606d..136a388 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 at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-08-19 11:13+0200\n"
+"POT-Creation-Date: 2010-08-19 11:36+0200\n"
 "PO-Revision-Date: 2010-03-12 09:15+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: chinese_traditional <zh_TW at li.org>\n"
@@ -50,7 +50,7 @@ msgstr "搜索"
 #: libraries/common.lib.php:1346 libraries/common.lib.php:2296
 #: libraries/display_change_password.lib.php:72
 #: libraries/display_create_table.lib.php:62
-#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:263
+#: libraries/display_export.lib.php:361 libraries/display_import.lib.php:267
 #: libraries/display_pdf_schema.lib.php:68 libraries/display_tbl.lib.php:530
 #: libraries/display_tbl.lib.php:612 libraries/replication_gui.lib.php:75
 #: libraries/replication_gui.lib.php:371 libraries/select_server.lib.php:100
@@ -781,7 +781,8 @@ msgid "Database Log"
 msgstr "資料庫"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:798
-msgid "Values for the column \""
+#, php-format
+msgid "Values for the column \"%s\""
 msgstr ""
 
 #: enum_editor.php:22
@@ -2068,14 +2069,16 @@ msgid "Exporting databases in the current server"
 msgstr "容許鎖上現時連線之資料表."
 
 #: libraries/display_export.lib.php:89
-#, fuzzy
+#, fuzzy, php-format
 #| msgid "Create table on database %s"
-msgid "Exporting tables in the database \""
+msgid "Exporting tables in the database \"%s\""
 msgstr "建立新資料表於資料庫 %s"
 
 #: libraries/display_export.lib.php:91
-msgid "Exporting rows in the table \""
-msgstr ""
+#, fuzzy, php-format
+#| msgid "Create table on database %s"
+msgid "Exporting rows in the table \"%s\""
+msgstr "建立新資料表於資料庫 %s"
 
 #: libraries/display_export.lib.php:97
 #, fuzzy
@@ -2178,8 +2181,8 @@ msgstr ""
 msgid "use this for future exports"
 msgstr ""
 
-#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:184
-#: libraries/display_import.lib.php:197 libraries/sql_query_form.lib.php:509
+#: libraries/display_export.lib.php:290 libraries/display_import.lib.php:188
+#: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509
 msgid "Character set of the file:"
 msgstr "文字編碼檔案:"
 
@@ -2213,18 +2216,18 @@ msgstr "\"gzipped\""
 msgid "bzipped"
 msgstr "\"bzipped\""
 
-#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:240
+#: libraries/display_export.lib.php:340 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
 #, fuzzy
 #| msgid "Format"
 msgid "Format:"
 msgstr "格式"
 
-#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:246
+#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
 msgstr ""
 
-#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:256
+#: libraries/display_export.lib.php:354 libraries/display_import.lib.php:260
 #, fuzzy
 msgid "Encoding Conversion:"
 msgstr "MySQL 客戶端版本"
@@ -2257,13 +2260,14 @@ msgid "Importing into the current server"
 msgstr "無法登入 MySQL 伺服器"
 
 #: libraries/display_import.lib.php:131
-#, fuzzy
-msgid "Importing into the database \""
+#, fuzzy, php-format
+msgid "Importing into the database \"%s\""
 msgstr "沒有資料庫"
 
 #: libraries/display_import.lib.php:133
-msgid "Importing into the table \""
-msgstr ""
+#, fuzzy, php-format
+msgid "Importing into the table \"%s\""
+msgstr "沒有資料庫"
 
 #: libraries/display_import.lib.php:139
 #, fuzzy
@@ -2271,38 +2275,41 @@ msgstr ""
 msgid "File to Import:"
 msgstr "載入檔案"
 
-#: libraries/display_import.lib.php:155
+#: libraries/display_import.lib.php:156
 #, php-format
+msgid "File may be compressed (%s) or uncompressed."
+msgstr ""
+
+#: libraries/display_import.lib.php:158
 msgid ""
-"<div class=\"formelementrow\" id=\"compression_info\">File may be compressed "
-"(%s) or uncompressed.<br />A compressed file's name must end in <b>.[format]."
-"[compression]</b>. Example: <b>.sql.zip</b></div>"
+"A compressed file's name must end in <b>.[format].[compression]</b>. "
+"Example: <b>.sql.zip</b>"
 msgstr ""
 
-#: libraries/display_import.lib.php:174
+#: libraries/display_import.lib.php:178
 msgid "File uploads are not allowed on this server."
 msgstr ""
 
-#: libraries/display_import.lib.php:204
+#: libraries/display_import.lib.php:208
 #, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
 msgstr "部份載入"
 
-#: libraries/display_import.lib.php:210
+#: libraries/display_import.lib.php:214
 #, php-format
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
 
-#: libraries/display_import.lib.php:217
+#: libraries/display_import.lib.php:221
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
 
-#: libraries/display_import.lib.php:224
+#: libraries/display_import.lib.php:228
 #, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
@@ -3150,7 +3157,8 @@ msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
 msgstr ""
 
-#: libraries/export/sql.php:72
+#: libraries/export/sql.php:72 libraries/export/sql.php:105
+#: libraries/export/sql.php:107
 #, fuzzy, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
@@ -3162,25 +3170,10 @@ msgstr "敘述"
 msgid "Add statements:"
 msgstr "敘述"
 
-#: libraries/export/sql.php:105 libraries/export/sql.php:107
-#, php-format
-msgid "%s"
-msgstr ""
-
 #: libraries/export/sql.php:111
 msgid "<code>CREATE TABLE</code> options:"
 msgstr ""
 
-#: libraries/export/sql.php:113
-msgid "<code>IF NOT EXISTS</code>"
-msgstr ""
-
-#: libraries/export/sql.php:115
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
-msgid "<code>AUTO_INCREMENT</code>"
-msgstr "新增 AUTO_INCREMENT 數值"
-
 #: libraries/export/sql.php:123
 msgid ""
 "Enclose table and field names with backquotes <i>(Protects field and table "
@@ -3762,7 +3755,7 @@ msgstr "查詢視窗"
 #: libraries/plugin_interface.lib.php:336
 #, fuzzy
 #| msgid "This format has no options"
-msgid "<p>This format has no options</p>"
+msgid "This format has no options"
 msgstr "這種格式並無選項"
 
 #: libraries/relation.lib.php:77
@@ -8545,6 +8538,11 @@ msgid "Rename view to"
 msgstr "將資料表改名為"
 
 #, fuzzy
+#~| msgid "Add AUTO_INCREMENT value"
+#~ msgid "<code>AUTO_INCREMENT</code>"
+#~ msgstr "新增 AUTO_INCREMENT 數值"
+
+#, fuzzy
 #~| msgid "Dump %s row(s) starting at record # %s"
 #~ msgid "Dump %s row(s) starting at row # %s"
 #~ msgstr "備份 %s 行, 由 %s 行開始."


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list