diff --git a/db_designer.php b/db_designer.php
index d3d0927b05..f776cad9f4 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -97,7 +97,7 @@ if (isset($_REQUEST['operation'])) {
                 . '.' . PMA_Util::backquote($cfgDesigner['table'])
                 . ' VALUES("' . $cfgDesigner['user'] . '", "'
                 . $_REQUEST['index'] . '", "' . $_REQUEST['value'] . '") ON DUPLICATE KEY '
-                . 'UPDATE VALUE = "' . $_REQUEST['value'] . '";';
+                . 'UPDATE `stored_value` = "' . $_REQUEST['value'] . '";';
 
             $success = $GLOBALS['dbi']->query($query);
             $response->isSuccess($success);
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index de899cf26d..8b20b12542 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -186,60 +186,60 @@ function PMA_getSideMenuParamsArray()
 
     if ($GLOBALS['cfgRelation']['designer_settingswork']) {
         // angular_direct
-        $query = 'SELECT `value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
+        $query = 'SELECT `stored_value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
             . PMA_Util::backquote($cfgRelation['designer_settings']) . ' WHERE ' . PMA_Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('index') . ' = "angular_direct"';
+            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('setting') . ' = "angular_direct"';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
-        $params['angular_direct'] = $result['value'];
+        $params['angular_direct'] = $result['stored_value'];
 
         // snap_to_grid
-        $query = 'SELECT `value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
+        $query = 'SELECT `stored_value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
             . PMA_Util::backquote($cfgRelation['designer_settings']) . ' WHERE ' . PMA_Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('index') . ' = "snap_to_grid"';
+            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('setting') . ' = "snap_to_grid"';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
-        $params['snap_to_grid'] = $result['value'];
+        $params['snap_to_grid'] = $result['stored_value'];
 
         // small_big_all
-        $query = 'SELECT `value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
+        $query = 'SELECT `stored_value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
             . PMA_Util::backquote($cfgRelation['designer_settings']) . ' WHERE ' . PMA_Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('index') . ' = "small_big_all"';
+            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('setting') . ' = "small_big_all"';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
-        $params['small_big_all'] = $result['value'];
+        $params['small_big_all'] = $result['stored_value'];
 
         // relation_lines
-        $query = 'SELECT `value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
+        $query = 'SELECT `stored_value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
             . PMA_Util::backquote($cfgRelation['designer_settings']) . ' WHERE ' . PMA_Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('index') . ' = "relation_lines"';
+            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('setting') . ' = "relation_lines"';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
-        $params['relation_lines'] = $result['value'];
+        $params['relation_lines'] = $result['stored_value'];
 
         // full_screen
-        $query = 'SELECT `value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
+        $query = 'SELECT `stored_value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
             . PMA_Util::backquote($cfgRelation['designer_settings']) . ' WHERE ' . PMA_Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('index') . ' = "full_screen"';
+            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('setting') . ' = "full_screen"';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
-        $params['full_screen'] = $result['value'];
+        $params['full_screen'] = $result['stored_value'];
 
         // side_menu
-        $query = 'SELECT `value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
+        $query = 'SELECT `stored_value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
             . PMA_Util::backquote($cfgRelation['designer_settings']) . ' WHERE ' . PMA_Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('index') . ' = "side_menu"';
+            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('setting') . ' = "side_menu"';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
-        $params['side_menu'] = $result['value'];
+        $params['side_menu'] = $result['stored_value'];
 
         // pin_text
-        $query = 'SELECT `value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
+        $query = 'SELECT `stored_value` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.'
             . PMA_Util::backquote($cfgRelation['designer_settings']) . ' WHERE ' . PMA_Util::backquote('username') . ' = "'
-            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('index') . ' = "pin_text"';
+            . $GLOBALS['cfg']['Server']['user'] . '" AND ' . PMA_Util::backquote('setting') . ' = "pin_text"';
 
         $result = $GLOBALS['dbi']->fetchSingleRow($query);
-        $params['pin_text'] = $result['value'];
+        $params['pin_text'] = $result['stored_value'];
     }
 
     return $params;
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index ef9db13f07..23bc0ba151 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -603,7 +603,7 @@ function PMA_exportDatabase(
     ) {
         if ($separate_files == 'database') {
             if (! $export_plugin->exportHeader($db)) {
-                break;
+                return;
             }
             if (! $export_plugin->exportDBHeader($db, $db_alias)) {
                 return;
@@ -643,7 +643,7 @@ function PMA_exportDatabase(
                             $export_type, $do_relation, $do_comments,
                             $do_mime, $do_dates, $aliases
                         )) {
-                            break 1;
+                            break;
                         }
                     }
                 }
@@ -672,7 +672,7 @@ function PMA_exportDatabase(
                     $export_type, $do_relation, $do_comments,
                     $do_mime, $do_dates, $aliases
                 )) {
-                    break 1;
+                    break;
                 }
 
             }
@@ -688,7 +688,7 @@ function PMA_exportDatabase(
             if (! $export_plugin->exportData(
                 $db, $table, $crlf, $err_url, $local_query, $aliases
             )) {
-                break 1;
+                break;
             }
         }
 
@@ -706,7 +706,7 @@ function PMA_exportDatabase(
                 $export_type, $do_relation, $do_comments,
                 $do_mime, $do_dates, $aliases
             )) {
-                break 1;
+                break;
             }
             if ($separate_files == 'database') {
                 PMA_saveObjectInBuffer('triggers', true);
@@ -734,7 +734,7 @@ function PMA_exportDatabase(
                     $export_type, $do_relation, $do_comments,
                     $do_mime, $do_dates, $aliases
                 )) {
-                    break 1;
+                    break;
                 }
                 if ($separate_files == 'database') {
                     PMA_saveObjectInBuffer('view_' . $view);
diff --git a/po/it.po b/po/it.po
index e16cdd597d..376ea808fc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-06-22 08:04-0400\n"
-"PO-Revision-Date: 2015-06-11 18:16+0200\n"
+"PO-Revision-Date: 2015-06-24 22:37+0200\n"
 "Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/it/>\n"
+"Language-Team: Italian "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2595,33 +2595,33 @@ msgstr "Sei sicuro di voler eliminare questo bookmark?"
 #: js/messages.php:591
 msgid "Some error occurred while getting SQL debug info."
 msgstr ""
+"Ci sono stati alcuni errori durante il recupero delle informazioni di debug "
+"SQL."
 
 #: js/messages.php:592
-#, fuzzy, php-format
+#, php-format
 #| msgid "Enter executes queries in console"
 msgid "%s queries executed %s times in %s seconds."
-msgstr "INVIO esegue query in console"
+msgstr "%s query eseguite %s volte in %s secondi."
 
 #: js/messages.php:593
 #, php-format
 msgid "%s argument(s) passed"
-msgstr ""
+msgstr "%s argomento(i) passati"
 
 #: js/messages.php:594
-#, fuzzy
 #| msgid "Show table comments"
 msgid "Show arguments"
-msgstr "Mostra i commenti alla tabella"
+msgstr "Mostra argomenti"
 
 #: js/messages.php:595
-#, fuzzy
 #| msgid "Hide search results"
 msgid "Hide arguments"
-msgstr "Nascondi i risultati della ricerca"
+msgstr "Nascondi argomenti"
 
 #: js/messages.php:596 libraries/Console.class.php:318
 msgid "Time taken:"
-msgstr ""
+msgstr "Tempo utilizzato:"
 
 #: js/messages.php:597
 msgid ""
@@ -3192,72 +3192,62 @@ msgid "Press Enter to execute query"
 msgstr "Premere INVIO per eseguire query"
 
 #: libraries/Console.class.php:277
-#, fuzzy
 #| msgid "Ascending"
 msgid "ascending"
-msgstr "Crescente"
+msgstr "crescente"
 
 #: libraries/Console.class.php:280
-#, fuzzy
 #| msgid "Descending"
 msgid "descending"
-msgstr "Decrescente"
+msgstr "decrescente"
 
 #: libraries/Console.class.php:283
-#, fuzzy
 #| msgid "Order"
 msgid "Order:"
-msgstr "Ordine"
+msgstr "Ordine:"
 
 #: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
 msgid "Count"
 msgstr "Conteggio"
 
 #: libraries/Console.class.php:292
-#, fuzzy
 #| msgid "Execute every"
 msgid "Execution order"
-msgstr "Esegui ogni"
+msgstr "Ordine di esecuzione"
 
 #: libraries/Console.class.php:295
 msgid "Time taken"
-msgstr ""
+msgstr "Tempo utilizzato"
 
 #: libraries/Console.class.php:298
-#, fuzzy
 #| msgid "Order"
 msgid "Order by:"
-msgstr "Ordine"
+msgstr "Ordine per:"
 
 #: libraries/Console.class.php:301
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Group queries"
-msgstr "Query SQL"
+msgstr "Raggruppa query"
 
 #: libraries/Console.class.php:304
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Ungroup queries"
-msgstr "Query SQL"
+msgstr "Dividi Query"
 
 #: libraries/Console.class.php:315
-#, fuzzy
 #| msgid "Show create"
 msgid "Show trace"
-msgstr "Mostra crea"
+msgstr "Mostra traccia"
 
 #: libraries/Console.class.php:316
-#, fuzzy
 #| msgid "Hide Panel"
 msgid "Hide trace"
-msgstr "Nascondi pannello"
+msgstr "Nascondi traccia"
 
 #: libraries/Console.class.php:317
-#, fuzzy
 #| msgid "Count"
 msgid "Count:"
-msgstr "Conteggio"
+msgstr "Conteggio:"
 
 #: libraries/Console.class.php:332 libraries/Util.class.php:1263
 #: libraries/config/messages.inc.php:779
@@ -3342,14 +3332,13 @@ msgstr "Colonna:"
 
 #: libraries/DBQbe.class.php:513
 msgid "Alias:"
-msgstr ""
+msgstr "Alias:"
 
 #: libraries/DBQbe.class.php:566
 msgid "Sort:"
 msgstr "Ordinamento:"
 
 #: libraries/DBQbe.class.php:630
-#, fuzzy
 #| msgid "Sort:"
 msgid "Sort order:"
 msgstr "Ordinamento:"
@@ -5159,10 +5148,9 @@ msgid "display column"
 msgstr "visualizza campo"
 
 #: libraries/config.values.php:102
-#, fuzzy
 #| msgid "Welcome to %s"
 msgid "Welcome"
-msgstr "Benvenuto in %s"
+msgstr "Benvenuto"
 
 #: libraries/config.values.php:122
 msgid "Open"
@@ -5734,7 +5722,7 @@ msgstr "Conferma query DROP"
 #: libraries/config/messages.inc.php:86
 msgid ""
 "Log SQL queries and their execution time, to be displayed in the console"
-msgstr ""
+msgstr "Query Log SQL e loro tempo di esecuzione, da visualizzare nella console"
 
 #: libraries/config/messages.inc.php:89
 msgid "Tab that is displayed when entering a database."
@@ -6802,11 +6790,11 @@ msgstr "Dove mostrare i collegamenti per le righe delle tabelle"
 
 #: libraries/config/messages.inc.php:493
 msgid "Whether to show row links even in the absence of a unique key."
-msgstr ""
+msgstr "Se visualizzare i link di riga anche in assenza di una chiave univoca."
 
 #: libraries/config/messages.inc.php:494
 msgid "Show row links anyway"
-msgstr ""
+msgstr "Mostra comunque i link di riga"
 
 #: libraries/config/messages.inc.php:496
 msgid "Use natural order for sorting table and database names."
@@ -13796,7 +13784,7 @@ msgid "Showing as PHP code"
 msgstr "Visualizzo comel codice PHP"
 
 #: libraries/sql.lib.php:1767
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
 #| "Edit, Copy and Delete features are not available."
@@ -13805,10 +13793,10 @@ msgid ""
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 "La selezione corrente non contiene un campo unico. Modifica griglia, "
-"checkbox, Modifica, Copia ed Elimina potrebbero non essere disponibili."
+"checkbox, Modifica, Copia ed Elimina potrebbero non essere disponibili. %s"
 
 #: libraries/sql.lib.php:1778
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
 #| "Edit, Copy and Delete features are not available."
@@ -13817,7 +13805,7 @@ msgid ""
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 "La selezione corrente non contiene un campo unico. Modifica griglia, "
-"checkbox, Modifica, Copia ed Elimina potrebbero non essere disponibili."
+"Modifica, Copia ed Elimina potrebbero mostrare comportamenti indesiderati. %s"
 
 #: libraries/sql.lib.php:1817
 #, php-format
diff --git a/sql/create_tables.sql b/sql/create_tables.sql
index 1a793b744e..5b55d1e5d7 100644
--- a/sql/create_tables.sql
+++ b/sql/create_tables.sql
@@ -330,9 +330,9 @@ CREATE TABLE IF NOT EXISTS `pma__central_columns` (
 
 CREATE TABLE IF NOT EXISTS `pma__designer_settings` (
   `username` varchar(64) NOT NULL,
-  `index` varchar(64) NOT NULL,
-  `value` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`index`)
+  `setting` varchar(64) NOT NULL,
+  `stored_value` varchar(64) NOT NULL,
+  PRIMARY KEY (`username`,`setting`)
 )
   COMMENT='Settings related to Designer'
   DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
diff --git a/sql/create_tables_drizzle.sql b/sql/create_tables_drizzle.sql
index f98120de16..e0c8342b76 100644
--- a/sql/create_tables_drizzle.sql
+++ b/sql/create_tables_drizzle.sql
@@ -282,9 +282,9 @@ CREATE TABLE IF NOT EXISTS `pma__savedsearches` (
 
 CREATE TABLE IF NOT EXISTS `pma__designer_settings` (
   `username` varchar(64) NOT NULL,
-  `index` varchar(64) NOT NULL,
-  `value` varchar(64) NOT NULL,
-  PRIMARY KEY (`username`,`index`)
+  `setting` varchar(64) NOT NULL,
+  `stored_value` varchar(64) NOT NULL,
+  PRIMARY KEY (`username`,`setting`)
 )
   COMMENT='Settings related to Designer'
   DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;