diff --git a/ChangeLog b/ChangeLog
index 45fcd13605..2af1768e6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
 + FULLTEXT support for InnoDB, starting with MySQL 5.6.4
 
 3.4.11.0 (not yet released)
+- bug #3486970 [import] Exception on XML import
 
 3.4.10.0 (2012-02-14)
 - bug #3460090 [interface] TextareaAutoSelect feature broken
diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index 65fa1fc44d..eb8d2f001e 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -152,13 +152,14 @@ class PMA_Error extends PMA_Message
      */
     public function getHash()
     {
+        $backtrace = PMA_isSerializable($this->getBacktrace()) ? serialize($this->getBacktrace()) : '';
         if (null === $this->_hash) {
             $this->_hash = md5(
                 $this->getNumber() .
                 $this->getMessage() .
                 $this->getFile() .
                 $this->getLine() .
-                serialize($this->getBacktrace())
+                $backtrace
             );
         }
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index cd56d03f49..37e2cf9125 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3831,4 +3831,21 @@ function PMA_printButton()
     echo '<input type="button" id="print" value="' . __('Print') . '" />';
     echo '</p>';
 }
+
+/**
+ * Determines whether a variable is serializable.
+ *
+ * @param object $var object which needs to be checked for serializability
+ *
+ * @return whether the object is serializable.
+ */
+function PMA_isSerializable($var)
+{
+    try {
+        serialize($var);
+        return true;
+    } catch(Exception $e) {
+        return false;
+    }
+}
 ?>
diff --git a/libraries/data_drizzle.inc.php b/libraries/data_drizzle.inc.php
index 7b06ee075a..f8b9dc9469 100644
--- a/libraries/data_drizzle.inc.php
+++ b/libraries/data_drizzle.inc.php
@@ -1,10 +1,12 @@
 <?php
 /**
- * Column types and functions supported by MySQL
+ * Column types and functions supported by Drizzle
  *
  * @package PhpMyAdmin
  */
 
+$auto_column_types = empty($cfg['ColumnTypes']);
+
 // VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
 $cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array(
     // most used
@@ -39,12 +41,20 @@ $cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array(
     'STRING' => array(
         'VARCHAR',
         'TEXT',
+        '-',
         'VARBINARY',
         'BLOB',
+        '-',
         'ENUM',
     ),
 );
 
+if ($auto_column_types && PMA_MYSQL_INT_VERSION >= 20120130) {
+    $cfg['ColumnTypes']['STRING'][] = '-';
+    $cfg['ColumnTypes']['STRING'][] = 'IPV6';
+}
+unset($auto_column_types);
+
 $cfg['AttributeTypes'] = !empty($cfg['AttributeTypes']) ? $cfg['AttributeTypes'] : array(
    '',
    'on update CURRENT_TIMESTAMP',
@@ -89,6 +99,7 @@ if ($cfg['ShowFunctionFields']) {
             'QUOTE',
             'REVERSE',
             'RTRIM',
+            'SCHEMA',
             'SPACE',
             'TRIM',
             'UNCOMPRESS',
@@ -169,27 +180,6 @@ if ($cfg['ShowFunctionFields']) {
             'WEEKOFYEAR',
             'YEARWEEK',
         ),
-
-        'FUNC_SPATIAL' => array(
-            'GeomFromText',
-            'GeomFromWKB',
-
-            'GeomCollFromText',
-            'LineFromText',
-            'MLineFromText',
-            'PointFromText',
-            'MPointFromText',
-            'PolyFromText',
-            'MPolyFromText',
-
-            'GeomCollFromWKB',
-            'LineFromWKB',
-            'MLineFromWKB',
-            'PointFromWKB',
-            'MPointFromWKB',
-            'PolyFromWKB',
-            'MPolyFromWKB',
-        ),
     );
     $cfg_default_restrict_funcs = empty($cfg['RestrictFunctions']);
     if ($cfg_default_restrict_funcs) {
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index e1652fe49f..8d8f37e095 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1064,13 +1064,13 @@ function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = fals
             FROM data_dictionary.columns
             WHERE table_schema = '" . PMA_sqlAddSlashes($database) . "'
                 AND table_name = '" . PMA_sqlAddSlashes($table) . "'
-                " . ($column ? "
+                " . (($column != null) ? "
                 AND column_name = '" . PMA_sqlAddSlashes($column) . "'" : '');
         // ORDER BY ordinal_position
     } else {
         $sql = 'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS
             FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table)
-            . ($column ? "LIKE '" . PMA_sqlAddSlashes($column, true) . "'" : '');
+            . (($column != null) ? "LIKE '" . PMA_sqlAddSlashes($column, true) . "'" : '');
     }
     return $sql;
 }
@@ -1124,7 +1124,7 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $
         }
     }
 
-    return $column ? array_shift($fields) : $fields;
+    return ($column != null) ? array_shift($fields) : $fields;
 }
 
 /**
@@ -1847,7 +1847,7 @@ function PMA_DBI_formatError($error_number, $error_message)
 function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false)
 {
     return strtolower($schema_name) == 'information_schema'
-            || strtolower($schema_name) == 'performance_schema'
+            || (!PMA_DRIZZLE && strtolower($schema_name) == 'performance_schema')
             || (PMA_DRIZZLE && strtolower($schema_name) == 'data_dictionary')
             || ($test_for_mysql_schema && !PMA_DRIZZLE && $schema_name == 'mysql');
 }
diff --git a/libraries/import/xml.php b/libraries/import/xml.php
index 727c63b414..38c2054bff 100644
--- a/libraries/import/xml.php
+++ b/libraries/import/xml.php
@@ -186,7 +186,7 @@ $data_present = false;
 /**
  * Only attempt to analyze/collect data if there is data present
  */
-if (@count($xml->children())) {
+if ($xml && @$xml->count()) {
     $data_present = true;
 
     /**
diff --git a/po/id.po b/po/id.po
index def3da779d..4012f0f3e8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-02-14 16:01+0100\n"
-"PO-Revision-Date: 2012-01-12 07:41+0200\n"
-"Last-Translator: udienz <udienz@ubuntu.com>\n"
+"PO-Revision-Date: 2012-02-16 20:01+0200\n"
+"Last-Translator: haze_skw <julungpujut@ymail.com>\n"
 "Language-Team: indonesian <id@li.org>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
@@ -1109,16 +1109,14 @@ msgid "This is not a number!"
 msgstr "Ini bukan angka!"
 
 #: js/messages.php:46
-#, fuzzy
 #| msgid "Add index"
 msgid "Add Index"
-msgstr "Tambahkan indeks"
+msgstr "Tambah indek"
 
 #: js/messages.php:47
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit Index"
-msgstr "Modus pengubahan"
+msgstr "Mengedit Indeks"
 
 #: js/messages.php:48 tbl_indexes.php:293
 #, php-format
@@ -1379,11 +1377,11 @@ msgid "EiB"
 msgstr "EB"
 
 #: js/messages.php:132
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s table"
 #| msgid_plural "%s tables"
 msgid "%d table(s)"
-msgstr "%s tabel"
+msgstr "%d tabel"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:135
@@ -1590,10 +1588,9 @@ msgid "Analyzing..."
 msgstr "Menganalisis..."
 
 #: js/messages.php:186
-#, fuzzy
 #| msgid "Explain SQL"
 msgid "Explain output"
-msgstr "Jelaskan SQL"
+msgstr "Jelaskan hasil"
 
 #: js/messages.php:188 js/messages.php:494 libraries/rte/rte_list.lib.php:62
 #: server_status.php:1241 sql.php:901
@@ -1605,13 +1602,11 @@ msgid "Total time:"
 msgstr "Total waktu:"
 
 #: js/messages.php:190
-#, fuzzy
 #| msgid "Profiling"
 msgid "Profiling results"
-msgstr "Profil"
+msgstr "Profil Hasil"
 
 #: js/messages.php:191
-#, fuzzy
 #| msgid "Table"
 msgctxt "Display format"
 msgid "Table"
@@ -1653,7 +1648,7 @@ msgstr "Memuat log"
 
 #: js/messages.php:204
 msgid "Monitor refresh failed"
-msgstr ""
+msgstr "Penyegaran layar gagal"
 
 #: js/messages.php:205
 msgid ""
@@ -1661,6 +1656,9 @@ msgid ""
 "This is most likely because your session expired. Reloading the page and "
 "reentering your credentials should help."
 msgstr ""
+"Ketika meminta data grafik baru server melaporkan respon tidak sah. Hal ini "
+"kemungkinan besar karena sesi Anda berakhir. Muat ulang halaman dan masukkan "
+"ulang mandat Anda akan membantu"
 
 #: js/messages.php:206
 msgid "Reload page"
@@ -1672,13 +1670,15 @@ msgstr "Baris yang terpengaruh:"
 
 #: js/messages.php:210
 msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
-msgstr ""
+msgstr "Gagal mengurai berkas config.Ini mungkin kesalahan kode JSON."
 
 #: js/messages.php:211
 msgid ""
 "Failed building chart grid with imported config. Resetting to default "
 "config..."
 msgstr ""
+"Gagal membangun Grafik kisi dengan mengimport config. Mengembalikan ke "
+"Setelan baku..."
 
 #: js/messages.php:212 libraries/config/messages.inc.php:172
 #: libraries/db_links.inc.php:82 libraries/display_import.lib.php:126
@@ -1809,11 +1809,11 @@ msgstr "Menjelajahi"
 
 #: js/messages.php:260
 msgid "Deleting"
-msgstr "Menghapus %s"
+msgstr "Menghapus"
 
 #: js/messages.php:263
 msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "Definisi fungsi disimpan harus mengandung pernyataan RETURN!"
 
 #: js/messages.php:270
 #, php-format
@@ -1871,35 +1871,37 @@ msgstr "Pencarian Zum"
 
 #: js/messages.php:293
 msgid "Each point represents a data row."
-msgstr ""
+msgstr "Setiap titik mewakili sebaris data."
 
 #: js/messages.php:295
 msgid "Hovering over a point will show its label."
-msgstr ""
+msgstr "Melayang di atas titik akan menunjukkan labelnya."
 
 #: js/messages.php:297
 msgid "Use mousewheel to zoom in or out of the plot."
-msgstr ""
+msgstr "Gunakan roda tetikus untuk memperbesar atau keluar dari plot."
 
 #: js/messages.php:299
 msgid "Click and drag the mouse to navigate the plot."
-msgstr ""
+msgstr "Klik dan tarik tetikus untuk mengarah ke plot."
 
 #: js/messages.php:301
 msgid "Click reset zoom link to come back to original state."
-msgstr ""
+msgstr "Klik link Zoom reset untuk kembali ke keadaan semula."
 
 #: js/messages.php:303
 msgid "Click a data point to view and possibly edit the data row."
-msgstr ""
+msgstr "Klik titik data untuk melihat dan mungkin mengedit baris data."
 
 #: js/messages.php:305
 msgid "The plot can be resized by dragging it along the bottom right corner."
 msgstr ""
+"Plot dapat diubah ukurannya dengan menyeretnya di sepanjang sudut kanan "
+"bawah."
 
 #: js/messages.php:307
 msgid "Strings are converted into integer for plotting"
-msgstr ""
+msgstr "string dikonversi menjadi integer untuk perencanaan"
 
 #: js/messages.php:309
 msgid "Select two columns"
@@ -1910,16 +1912,14 @@ msgid "Select two different columns"
 msgstr "Pilih dua kolom yang berbeda"
 
 #: js/messages.php:311
-#, fuzzy
 #| msgid "Query results operations"
 msgid "Query results"
-msgstr "Operasi hasil kueri"
+msgstr "Operasi hasil pertanyaan"
 
 #: js/messages.php:312
-#, fuzzy
 #| msgid "Data pointer size"
 msgid "Data point content"
-msgstr "Ukuran petunjuk data (Data Pointer)"
+msgstr "Isi titk data"
 
 #: js/messages.php:315 tbl_change.php:312 tbl_indexes.php:228
 #: tbl_indexes.php:255
@@ -1971,6 +1971,8 @@ msgid ""
 "You have edited some data and they have not been saved. Are you sure you "
 "want to leave this page before saving the data?"
 msgstr ""
+"Anda telah mengedit beberapa data dan belum di simpan. Apakah anda yakin "
+"akan meninggalkan halaman ini sebelum menyimpan data?"
 
 #: js/messages.php:346
 msgid "Drag to reorder"
@@ -1986,13 +1988,16 @@ msgstr "Klik untuk memberi/menghapus tanda"
 
 #: js/messages.php:349
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
-msgstr ""
+msgstr "Klik tanda panah ke bawah<br /> untuk beralih visibilitas kolom"
 
 #: js/messages.php:351
 msgid ""
 "This table does not contain a unique column. Features related to the grid "
 "edit, checkbox, Edit, Copy and Delete links may not work after saving."
 msgstr ""
+"Tabel ini tidak berisi kolom yang unik. Fitur yang berhubungan dengan edit "
+"grid, kotak centang, Edit, Copy dan Delete link mungkin tidak bekerja "
+"setelah disimpan."
 
 #: js/messages.php:352
 msgid ""
@@ -2274,15 +2279,14 @@ msgstr "Mingguan"
 #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month".
 #: js/messages.php:484
 msgid "calendar-month-year"
-msgstr ""
+msgstr "Kalender-bulan-tahun"
 
 #. l10n: Year suffix for calendar, "none" is empty.
 #: js/messages.php:486
-#, fuzzy
 #| msgid "None"
 msgctxt "Year suffix"
 msgid "none"
-msgstr "Tidak ada"
+msgstr "Kosong"
 
 #: js/messages.php:495
 msgid "Hour"
@@ -2300,6 +2304,7 @@ msgstr "Detik"
 #, php-format
 msgid "Failed formatting string for rule '%s'. PHP threw following error: %s"
 msgstr ""
+"Gagal format string untuk aturan '%s'. PHP melemparkan kesalahan berikut:% s"
 
 #: libraries/Advisor.class.php:326 server_status.php:952
 msgid "per second"
@@ -2316,20 +2321,21 @@ msgstr "dalam sejam"
 
 #: libraries/Advisor.class.php:335
 msgid "per day"
-msgstr ""
+msgstr "per hari"
 
 #: libraries/Config.class.php:703
 msgid "Remove \"./config\" directory before using phpMyAdmin!"
-msgstr ""
+msgstr "Hapus folder \"./config\" sebelum menggunakan phpMyAdmin!"
 
 #: libraries/Config.class.php:727
 #, php-format
 msgid "Existing configuration file (%s) is not readable."
-msgstr ""
+msgstr "File configuration yang ada (%s) tidak dapat di baca."
 
 #: libraries/Config.class.php:752
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
+"Perizinan yang salah pada file konfigurasi, sehingga tidak dapat ditulis!"
 
 #: libraries/Config.class.php:1303
 msgid "Font size"
@@ -2337,11 +2343,11 @@ msgstr "Ukuran huruf"
 
 #: libraries/Error_Handler.class.php:62
 msgid "Too many error messages, some are not displayed."
-msgstr ""
+msgstr "Terlalu banyak pesan kesalahan, sebagian tidak bisa ditampilkan."
 
 #: libraries/File.class.php:221
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "File bukan file unggah."
 
 #: libraries/File.class.php:260 libraries/File.class.php:389
 msgid "Unknown error while uploading."
@@ -2393,7 +2399,7 @@ msgstr "Terjadi galat sewaktu memindahkan berkas unggahan."
 
 #: libraries/File.class.php:516
 msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Tidak bisa membaca (memindah) file unggah."
 
 #: libraries/Index.class.php:419 tbl_relation.php:522
 msgid "No index defined!"
@@ -2517,7 +2523,7 @@ msgstr "Server MySQL ini tidak mendukung mesin penyimpanan %s."
 
 #: libraries/Table.class.php:329
 msgid "unknown table status: "
-msgstr ""
+msgstr "status tabel tidak diketahui:"
 
 #: libraries/Table.class.php:1120
 msgid "Invalid database"
@@ -2547,6 +2553,8 @@ msgid ""
 "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]"
 "['MaxTableUiprefs'] %s)"
 msgstr ""
+"Gagal membersihkan tabel UI preferences (lihat "
+"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)"
 
 #: libraries/Table.class.php:1533
 #, php-format
@@ -2555,6 +2563,9 @@ msgid ""
 "after you refresh this page. Please check if the table structure has been "
 "changed."
 msgstr ""
+"Tidak bisa menyimpan UI properti \"% s\". Perubahan yang dibuat tidak akan "
+"terus-menerus setelah Anda me-refresh halaman ini. Silakan periksa jika "
+"struktur tabel telah berubah."
 
 #: libraries/Theme.class.php:145
 #, php-format
@@ -2621,7 +2632,7 @@ msgstr ""
 
 #: libraries/auth/cookie.auth.lib.php:35
 msgid "Failed to use Blowfish from mcrypt!"
-msgstr ""
+msgstr "Gagal menggunakan Blowfish dari mcrypt!"
 
 #: libraries/auth/cookie.auth.lib.php:197
 msgid "Log in"
@@ -2687,7 +2698,7 @@ msgstr "Nama pengguna/kata sandi salah. Akses ditolak."
 
 #: libraries/auth/signon.auth.lib.php:88
 msgid "Can not find signon authentication script:"
-msgstr ""
+msgstr "Tidak dapat menemukan script otentikasi signon:"
 
 #: libraries/auth/swekey/swekey.auth.lib.php:116
 #, php-format
@@ -2796,11 +2807,11 @@ msgstr "Periksa Hak Akses"
 
 #: libraries/common.inc.php:151
 msgid "possible exploit"
-msgstr ""
+msgstr "memungkinkan mengeksploitasi"
 
 #: libraries/common.inc.php:160
 msgid "numeric key detected"
-msgstr ""
+msgstr "tombol angka terdeteksi"
 
 #: libraries/common.inc.php:607
 msgid "Failed to read configuration file"
@@ -2811,6 +2822,8 @@ msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
 msgstr ""
+"Hal ini biasanya berarti ada kesalahan sintaks di dalamnya, silahkan cek "
+"kesalahan di bawah ini."
 
 #: libraries/common.inc.php:615
 #, php-format
@@ -3286,10 +3299,12 @@ msgid ""
 "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] "
 "authentication"
 msgstr ""
+"Rahasia passphrase digunakan untuk enkripsi cookie dalam otentifikasi "
+"[kbd]cookie[kbd]"
 
 #: libraries/config/messages.inc.php:25
 msgid "Blowfish secret"
-msgstr ""
+msgstr "rahasia Blow fish"
 
 #: libraries/config/messages.inc.php:26
 msgid "Highlight selected rows"
@@ -3312,6 +3327,8 @@ msgid ""
 "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for "
 "import and export operations"
 msgstr ""
+"Izinkan [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] kompresi untuk "
+"operasi impor dan ekspor"
 
 #: libraries/config/messages.inc.php:31
 msgid "Bzip2"
@@ -3376,6 +3393,8 @@ msgid ""
 "Compress gzip/bzip2 exports on the fly without the need for much memory; if "
 "you encounter problems with created gzip/bzip2 files disable this feature"
 msgstr ""
+"Kompres ekspor gzip/bzip2 dengan cepat tanpa memerlukan banyak memori, jika "
+"Anda mengalami masalah dengan file gzip/bzip2 nonaktifkan fitur ini"
 
 #: libraries/config/messages.inc.php:44
 msgid "Compress on the fly"
@@ -3391,6 +3410,8 @@ msgid ""
 "Whether a warning (&quot;Are your really sure...&quot;) should be displayed "
 "when you're about to lose data"
 msgstr ""
+"Apakah suatu peringatan (&quot;Apakah Anda benar-benar yakin ...&quot;) "
+"harus ditampilkan bila Anda akan kehilangan data"
 
 #: libraries/config/messages.inc.php:47
 msgid "Confirm DROP queries"
@@ -3457,6 +3478,8 @@ msgid ""
 "Disable the table maintenance mass operations, like optimizing or repairing "
 "the selected tables of a database."
 msgstr ""
+"Nonaktifkan operasi pemeliharaan tabel massa, seperti mengoptimalkan atau "
+"memperbaiki tabel yang dipilih dari database."
 
 #: libraries/config/messages.inc.php:63
 msgid "Disable multi table maintenance"
diff --git a/po/ja.po b/po/ja.po
index ad409efcd4..8b7ca82702 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-02-14 16:01+0100\n"
-"PO-Revision-Date: 2012-02-01 12:01+0200\n"
+"PO-Revision-Date: 2012-02-17 12:20+0200\n"
 "Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
 "Language: ja\n"
@@ -7435,10 +7435,9 @@ msgid "Definition"
 msgstr "定義"
 
 #: libraries/rte/rte_events.lib.php:471
-#, fuzzy
 #| msgid "complete inserts"
 msgid "On completion preserve"
-msgstr "完全な INSERT 文を作成する"
+msgstr "完了後もイベントを残す"
 
 #: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:933
 #: libraries/rte/rte_triggers.lib.php:360
@@ -8248,9 +8247,7 @@ msgstr ""
 msgid ""
 "Displays a clickable thumbnail. The options are the maximum width and height "
 "in pixels. The original aspect ratio is preserved."
-msgstr ""
-"クリック可能なサムネイルを表示します; オプションとして幅と高さの最大値をピク"
-"セル単位で指定できます。アスペクト比はそのまま維持されます"
+msgstr "クリック可能なサムネイルを表示します。オプションとして幅と高さの最大値をピクセル単位で指定できます。アスペクト比はそのまま維持されます"
 
 #: libraries/transformations/image_jpeg__link.inc.php:10
 msgid "Displays a link to download this image."
diff --git a/po/ko.po b/po/ko.po
index 9fd8cc9668..2718aa1c6d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-02-14 16:01+0100\n"
-"PO-Revision-Date: 2012-01-27 08:18+0200\n"
+"PO-Revision-Date: 2012-02-17 10:54+0200\n"
 "Last-Translator: minsung kang <manyfun7@gmail.com>\n"
 "Language-Team: korean <ko@li.org>\n"
 "Language: ko\n"
@@ -1451,7 +1451,7 @@ msgstr ""
 #: js/messages.php:154
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time이 %d초로 설정되였습니다."
 
 #: js/messages.php:155
 msgid ""
@@ -1482,7 +1482,7 @@ msgstr "%s 사용안함"
 #: js/messages.php:163
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "long_query_time을 %d초로 설정합니다."
 
 #: js/messages.php:164
 msgid ""
@@ -1507,7 +1507,7 @@ msgstr "차트 제목"
 #. l10n: As in differential values
 #: js/messages.php:170
 msgid "Differential"
-msgstr ""
+msgstr "차이"
 
 #: js/messages.php:171
 #, php-format
@@ -1516,15 +1516,15 @@ msgstr "%s로 구분"
 
 #: js/messages.php:172
 msgid "Unit"
-msgstr ""
+msgstr "단위"
 
 #: js/messages.php:174
 msgid "From slow log"
-msgstr ""
+msgstr "느린 로그로부터"
 
 #: js/messages.php:175
 msgid "From general log"
-msgstr ""
+msgstr "일반 로그로부터"
 
 #: js/messages.php:176
 msgid "Analysing & loading logs. This may take a while."
@@ -1552,7 +1552,7 @@ msgstr ""
 
 #: js/messages.php:180
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
+msgstr "로그자료가 적재되였습니다. 그동안 질의가 실행되였습니다."
 
 #: js/messages.php:182
 msgid "Jump to Log table"
@@ -1627,11 +1627,11 @@ msgstr "전체 사용량"
 #: js/messages.php:203
 #, fuzzy
 msgid "Loading logs"
-msgstr "Local"
+msgstr "로그를 불러오고 있습니다."
 
 #: js/messages.php:204
 msgid "Monitor refresh failed"
-msgstr ""
+msgstr "모니터링 리프리쉬가 실패하였습니다."
 
 #: js/messages.php:205
 msgid ""
@@ -1671,11 +1671,11 @@ msgstr "질의 분석"
 
 #: js/messages.php:218
 msgid "Advisor system"
-msgstr ""
+msgstr "조언 시스템"
 
 #: js/messages.php:219
 msgid "Possible performance issues"
-msgstr ""
+msgstr "가능한 성능 문제"
 
 #: js/messages.php:220
 msgid "Issue"
@@ -1727,7 +1727,7 @@ msgstr "열을 삭제하고 있습니다."
 
 #: js/messages.php:237
 msgid "Adding Primary Key"
-msgstr ""
+msgstr "기본 키를 추가하고 있습니다."
 
 #: js/messages.php:238 libraries/relation.lib.php:80 pmd_general.php:380
 #: pmd_general.php:537 pmd_general.php:585 pmd_general.php:661
@@ -1737,7 +1737,7 @@ msgstr "확인"
 
 #: js/messages.php:239
 msgid "Click to dismiss this notification"
-msgstr ""
+msgstr "클릭하면 이 알림을 받지 않습니다."
 
 #: js/messages.php:242
 msgid "Renaming Databases"
@@ -1849,7 +1849,7 @@ msgstr "검색 조건 보이기"
 #, fuzzy
 #| msgid "Search"
 msgid "Zoom Search"
-msgstr "검색"
+msgstr "추가 검색"
 
 #: js/messages.php:293
 #, fuzzy
diff --git a/po/nl.po b/po/nl.po
index 9468960f81..9bc8ea4168 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-02-14 16:01+0100\n"
-"PO-Revision-Date: 2012-01-30 14:03+0200\n"
-"Last-Translator: Herman van Rink <rink@initfour.nl>\n"
+"PO-Revision-Date: 2012-02-17 18:26+0200\n"
+"Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
 "Language-Team: dutch <nl@li.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -563,10 +563,9 @@ msgid "Search in database"
 msgstr "Zoeken in de database"
 
 #: db_search.php:277
-#, fuzzy
 #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
 msgid "Words or values to search for (wildcard: \"%\"):"
-msgstr "Woord(en) of waarde(s) waarnaar gezocht moet worden (wildcard: \"%\"):"
+msgstr "Woorden of waarden waarnaar gezocht moet worden (wildcard: \"%\"):"
 
 #: db_search.php:282
 msgid "Find:"
@@ -577,10 +576,9 @@ msgid "Words are separated by a space character (\" \")."
 msgstr "Woorden worden gesplits door een spatiekarakter (\" \")."
 
 #: db_search.php:300
-#, fuzzy
 #| msgid "Inside table(s):"
 msgid "Inside tables:"
-msgstr "In de tabel(len):"
+msgstr "In de tabellen:"
 
 #: db_search.php:330
 msgid "Inside column:"
@@ -818,22 +816,21 @@ msgid "Values for a new column"
 msgstr "Waarden voor een neiuwe kolom"
 
 #: enum_editor.php:30 js/messages.php:267
-#, fuzzy, php-format
+#, php-format
 #| msgid "Values for the column \"%s\""
 msgid "Values for column %s"
-msgstr "Waarden voor kolom \"%s\""
+msgstr "Waarden voor kolom %s"
 
 #: enum_editor.php:34 js/messages.php:269
-#, fuzzy
 #| msgid "Enter each value in a separate field."
 msgid "Enter each value in a separate field"
-msgstr "Plaats elke waarde in een afzonderlijk veld."
+msgstr "Plaats elke waarde in een afzonderlijk veld"
 
 #: enum_editor.php:123
 #, fuzzy
 #| msgid "+ Add a new value"
 msgid "Add a value"
-msgstr "Nieuwe waarde toevoegen"
+msgstr "Een nieuwe waarde toevoegen"
 
 #: enum_editor.php:129 gis_data_editor.php:317
 msgid "Output"
@@ -1141,10 +1138,9 @@ msgid "This is not a number!"
 msgstr "Dit is geen cijfer!"
 
 #: js/messages.php:46
-#, fuzzy
 #| msgid "Add index"
 msgid "Add Index"
-msgstr "Voeg index toe"
+msgstr "Voeg een index toe"
 
 #: js/messages.php:47
 #, fuzzy
@@ -1206,20 +1202,18 @@ msgid "Edit"
 msgstr "Wijzig"
 
 #: js/messages.php:66 server_status.php:803
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Live traffic chart"
-msgstr "Live traffic grafiek"
+msgstr "Grafiek met huidig dataverkeer"
 
 #: js/messages.php:67 server_status.php:806
 msgid "Live conn./process chart"
 msgstr "Live conn./process grafiek"
 
 #: js/messages.php:68 server_status.php:824
-#, fuzzy
 #| msgid "Show query chart"
 msgid "Live query chart"
-msgstr "Query grafiek tonen"
+msgstr "Grafiek van actieve queries"
 
 #: js/messages.php:70
 msgid "Static data"
@@ -1257,10 +1251,9 @@ msgid "KiB received since last refresh"
 msgstr "Onvangen KiB sinds laatste verversing"
 
 #: js/messages.php:82
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic (in KiB)"
-msgstr "Server traffic (in KiB)"
+msgstr "Server verkeer (in KiB)"
 
 #: js/messages.php:83
 msgid "Connections since last refresh"
@@ -1279,22 +1272,21 @@ msgstr "Connecties / Processen"
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
 msgid "Questions since last refresh"
-msgstr "Vragen sinds laatste verversing"
+msgstr "Questions sinds laatste verversing"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Questions (aantal door de server uitgevoerde opdrachten)"
 
 #: js/messages.php:91 server_status.php:785
 msgid "Query statistics"
-msgstr "Toon statistieken"
+msgstr "Query statistieken"
 
 #: js/messages.php:94
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Local monitor configuration incompatible"
-msgstr "Opslaan van het configuratiebestand is niet mogelijk"
+msgstr "Configuratie van lokale monitoring is niet geldig"
 
 #: js/messages.php:95
 msgid ""
@@ -1305,104 +1297,96 @@ msgid ""
 msgstr ""
 
 #: js/messages.php:97
-#, fuzzy
 #| msgid "Query cache"
 msgid "Query cache efficiency"
-msgstr "Query cache"
+msgstr "Query cache efficiëntie"
 
 #: js/messages.php:98
-#, fuzzy
 #| msgid "Query cache"
 msgid "Query cache usage"
-msgstr "Query cache"
+msgstr "Query cache gebruik"
 
 #: js/messages.php:99
-#, fuzzy
 #| msgid "Query cache"
 msgid "Query cache used"
-msgstr "Query cache"
+msgstr "Query cache gebruikt"
 
 #: js/messages.php:101
 msgid "System CPU Usage"
-msgstr ""
+msgstr "CPU gebruik"
 
 #: js/messages.php:102
 msgid "System memory"
-msgstr ""
+msgstr "Systeem geheugen"
 
 #: js/messages.php:103
 msgid "System swap"
-msgstr ""
+msgstr "Systeem wisselbestand"
 
 #. l10n: shortcuts for Megabyte
 #: js/messages.php:104 js/messages.php:127 libraries/common.lib.php:1399
 #: server_status.php:1680
 msgid "MiB"
-msgstr "MB"
+msgstr "MiB"
 
 #. l10n: shortcuts for Kilobyte
 #: js/messages.php:105 js/messages.php:126 libraries/common.lib.php:1397
 #: server_status.php:1680
 msgid "KiB"
-msgstr "KB"
+msgstr "KiB"
 
 #: js/messages.php:107
 msgid "Average load"
-msgstr ""
+msgstr "Gemiddelde systeembelasting"
 
 #: js/messages.php:108
-#, fuzzy
 #| msgid "Total count"
 msgid "Total memory"
-msgstr "Totaal aantal"
+msgstr "Totaal geheugen"
 
 #: js/messages.php:109
 msgid "Cached memory"
-msgstr ""
+msgstr "Gecached geheugen"
 
 #: js/messages.php:110
-#, fuzzy
 #| msgid "Buffer Pool"
 msgid "Buffered memory"
-msgstr "Buffer Pool"
+msgstr "Gebufferd geheugen"
 
 #: js/messages.php:111
 msgid "Free memory"
-msgstr ""
+msgstr "Vrij geheugen"
 
 #: js/messages.php:112
 msgid "Used memory"
-msgstr ""
+msgstr "Gebruikt geheugen"
 
 #: js/messages.php:114
-#, fuzzy
 #| msgid "Total"
 msgid "Total Swap"
-msgstr "Totaal"
+msgstr "Totaal wisselbestand"
 
 #: js/messages.php:115
 msgid "Cached Swap"
-msgstr ""
+msgstr "Gecached wisselbestand"
 
 #: js/messages.php:116
 msgid "Used Swap"
-msgstr ""
+msgstr "Wisselbestand in gebruik"
 
 #: js/messages.php:117
-#, fuzzy
 #| msgid "Free pages"
 msgid "Free Swap"
-msgstr "Vrije pages"
+msgstr "Vrij wisselbestand"
 
 #: js/messages.php:119
 msgid "Bytes sent"
-msgstr ""
+msgstr "Doorgestuurde bytes"
 
 #: js/messages.php:120
-#, fuzzy
 #| msgid "Received"
 msgid "Bytes received"
-msgstr "Ontvangen"
+msgstr "Ontvangen bytes"
 
 #: js/messages.php:121 server_status.php:1145
 msgid "Connections"
@@ -1416,36 +1400,35 @@ msgstr "B"
 #. l10n: shortcuts for Gigabyte
 #: js/messages.php:128 libraries/common.lib.php:1401
 msgid "GiB"
-msgstr "GB"
+msgstr "GiB"
 
 #. l10n: shortcuts for Terabyte
 #: js/messages.php:129 libraries/common.lib.php:1403
 msgid "TiB"
-msgstr "TB"
+msgstr "TiB"
 
 #. l10n: shortcuts for Petabyte
 #: js/messages.php:130 libraries/common.lib.php:1405
 msgid "PiB"
-msgstr "PB"
+msgstr "PiB"
 
 #. l10n: shortcuts for Exabyte
 #: js/messages.php:131 libraries/common.lib.php:1407
 msgid "EiB"
-msgstr "EB"
+msgstr "EiB"
 
 #: js/messages.php:132
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s table"
 #| msgid_plural "%s tables"
 msgid "%d table(s)"
-msgstr "%s tabel"
+msgstr "%d tabel(len)"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:135
-#, fuzzy
 #| msgid "Versions"
 msgid "Questions"
-msgstr "Versies"
+msgstr "Questions"
 
 #: js/messages.php:136 server_status.php:1100
 msgid "Traffic"
@@ -1457,24 +1440,22 @@ msgid "Settings"
 msgstr "Instellingen"
 
 #: js/messages.php:138
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "Verwijder database"
+msgstr "Verwijder grafiek"
 
 #: js/messages.php:139
 msgid "Edit title and labels"
-msgstr ""
+msgstr "Titel en labels aanpassen"
 
 #: js/messages.php:140
-#, fuzzy
 #| msgid "Snap to grid"
 msgid "Add chart to grid"
-msgstr "Kleef aan raster"
+msgstr "Grafiek toevoegen aan raster"
 
 #: js/messages.php:142
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "Gelieve tenminste één variable toe te voegen aan de reeks"
 
 #: js/messages.php:143 libraries/display_export.lib.php:308
 #: libraries/display_tbl.lib.php:573 libraries/export/sql.php:1093
@@ -1486,35 +1467,35 @@ msgstr "Geen"
 
 #: js/messages.php:144
 msgid "Resume monitor"
-msgstr ""
+msgstr "Monitor heropstarten"
 
 #: js/messages.php:145
 msgid "Pause monitor"
-msgstr ""
+msgstr "Monitor pauzeren"
 
 #: js/messages.php:147
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log en slow_query_log zijn ingeschakeld."
 
 #: js/messages.php:148
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log is ingeschakeld."
 
 #: js/messages.php:149
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log is ingeschakeld."
 
 #: js/messages.php:150
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log en general_log zijn uitgeschakeld."
 
 #: js/messages.php:151
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output heeft niet TABLE als instelling."
 
 #: js/messages.php:152
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output is ingesteld op TABLE."
 
 #: js/messages.php:153
 #, php-format
@@ -1523,68 +1504,72 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
+"slow_query_log is ingeschakeld, maar de server logt enkel queries die langer "
+"duren dan %d seconden. Het is aangeraden om long_query_time in te stellen "
+"op 0-2 seconden, afhankelijk van uw systeem."
 
 #: js/messages.php:154
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time is ingesteld op %d seconde(n)."
 
 #: js/messages.php:155
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
 msgstr ""
+"Volgende instellingen zullen algemeen toegepast worden en worden gereset tot "
+"de standaardwaarde bij herstart van de server:"
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:157
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save output to a file"
 msgid "Set log_output to %s"
-msgstr "Opslaan als bestand"
+msgstr "log_ouput instellen op %s"
 
 #. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:159
-#, fuzzy, php-format
+#, php-format
 #| msgid "Enabled"
 msgid "Enable %s"
-msgstr "Ingeschakeld"
+msgstr "%s inschakelen"
 
 #. l10n: Disable in this context means setting a status variable to OFF
 #: js/messages.php:161
-#, fuzzy, php-format
+#, php-format
 #| msgid "Disabled"
 msgid "Disable %s"
-msgstr "Uitgeschakeld"
+msgstr "%s uitschakelen"
 
 #. l10n: %d seconds
 #: js/messages.php:163
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "long_query_time instellen op %dsec"
 
 #: js/messages.php:164
 msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
+"U kan deze variabelen niet wijzigen. Gelieve in te loggen als root of neem "
+"contact op met de databasebeheerder."
 
 #: js/messages.php:165
-#, fuzzy
 #| msgid "Manage your settings"
 msgid "Change settings"
-msgstr "Beheer uw instellingen"
+msgstr "Instellingen wijzigen"
 
 #: js/messages.php:166
-#, fuzzy
 #| msgid "More settings"
 msgid "Current settings"
-msgstr "Overige instellingen"
+msgstr "Huidige instellingen"
 
 #: js/messages.php:168 server_status.php:1645
-#, fuzzy
 #| msgid "Report title:"
 msgid "Chart Title"
-msgstr "Report titel:"
+msgstr "Grafiek titel"
 
 #. l10n: As in differential values
 #: js/messages.php:170
@@ -1596,29 +1581,28 @@ msgstr "Verschil"
 #: js/messages.php:171
 #, php-format
 msgid "Divided by %s"
-msgstr ""
+msgstr "Gedeeld door %s"
 
 #: js/messages.php:172
 msgid "Unit"
-msgstr ""
+msgstr "Eenheid"
 
 #: js/messages.php:174
 msgid "From slow log"
-msgstr ""
+msgstr "Uit het trage query logbestand"
 
 #: js/messages.php:175
 msgid "From general log"
-msgstr ""
+msgstr "Uit het algemene logbestand"
 
 #: js/messages.php:176
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "Logbestanden worden geladen en geanalyseerd. Dit kan even duren."
 
 #: js/messages.php:177
-#, fuzzy
 #| msgid "Read requests"
 msgid "Cancel request"
-msgstr "Lees aanvragen"
+msgstr "Aanvraag onderbreken"
 
 #: js/messages.php:178
 msgid ""