diff --git a/ChangeLog b/ChangeLog
index ab3d6a7753..62de324c73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 + Removed the PHP version of the ENUM editor
 + Patch #3507111 Display distinct results, linked to corresponding data rows
 + Update to jQuery 1.7.2
+- bug #3507917 [export] JSON has unescaped values for allegedly numeric columns
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered
diff --git a/js/db_structure.js b/js/db_structure.js
index 827c0df0f9..5ef5e99875 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -259,7 +259,7 @@ $(document).ready(function() {
      */
     $(".fkc_switch").click(function(event){
        if ($("#fkc_checkbox").prop('checked')) {
-           $("#fkc_checkbox").removeProp('checked');
+           $("#fkc_checkbox").prop('checked', false);
            $("#fkc_status").html(PMA_messages['strForeignKeyCheckDisabled']);
            return;
        }
diff --git a/js/export.js b/js/export.js
index 2982e1ef14..3c8f56a0e3 100644
--- a/js/export.js
+++ b/js/export.js
@@ -136,13 +136,14 @@ function toggle_sql_include_comments()
  * For SQL plugin, if "CREATE TABLE options" is checked/unchecked, check/uncheck each of its sub-options
  */
 $(document).ready(function() {
-     $("#checkbox_sql_create_table_statements").change(function() {
-         if($("#checkbox_sql_create_table_statements:checked").length == 0) {
-            $("#checkbox_sql_if_not_exists").removeProp('checked');
-            $("#checkbox_sql_auto_increment").removeProp('checked');
-        } else {
-            $("#checkbox_sql_if_not_exists").prop('checked', true);
-            $("#checkbox_sql_auto_increment").prop('checked', true);
+    var $create = $("#checkbox_sql_create_table_statements");
+    var $create_options = $("#ul_create_table_statements input");
+    $create.change(function() {
+        $create_options.prop('checked', $(this).prop("checked"));
+    });
+    $create_options.change(function() {
+        if ($create_options.is(":checked")) {
+            $create.prop('checked', true);
         }
     });
 });
diff --git a/js/functions.js b/js/functions.js
index 30e5511ce0..4d4da3a0c8 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -681,16 +681,10 @@ function unMarkAllRows( container_id )
  * @param   boolean  state         new value for checkbox (true or false)
  * @return  boolean  always true
  */
-function setCheckboxes( container_id, state )
+function setCheckboxes(container_id, state)
 {
 
-    if (state) {
-        $("#"+container_id).find("input:checkbox").prop('checked', true);
-    }
-    else {
-        $("#"+container_id).find("input:checkbox").removeProp('checked');
-    }
-
+    $("#" + container_id).find("input:checkbox").prop('checked', state);
     return true;
 } // end of the 'setCheckboxes()' function
 
diff --git a/js/get_image.js.php b/js/get_image.js.php
index b327844bdb..60888c88f7 100644
--- a/js/get_image.js.php
+++ b/js/get_image.js.php
@@ -68,7 +68,8 @@ function PMA_getImage(image, alternate, attributes) {
             // this is private
             alt: '',
             title: '',
-            src: 'themes/dot.gif'
+            src: (typeof PMA_TEST_THEME == 'undefined' ? '' : '../') 
+                + 'themes/dot.gif'
         },
         isSprite: true,
         attr: function (name, value) {
diff --git a/js/import.js b/js/import.js
index 04f5217a4d..8b25e85aa2 100644
--- a/js/import.js
+++ b/js/import.js
@@ -66,11 +66,11 @@ $(document).ready(function() {
      */
     $("#input_import_file").bind("focus change", function() {
          $("#radio_import_file").prop('checked', true);
-         $("#radio_local_import_file").removeProp('checked');
+         $("#radio_local_import_file").prop('checked', false);
     });
     $("#select_local_import_file").focus(function() {
          $("#radio_local_import_file").prop('checked', true);
-         $("#radio_import_file").removeProp('checked');
+         $("#radio_import_file").prop('checked', false);
     });
 
     /**
diff --git a/js/makegrid.js b/js/makegrid.js
index 1027dbf6bb..459205e0de 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -437,14 +437,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 ) {
                     text += text.length > 0 ? '<br />' : '';
                     text += g.markHint;
+                    text += text.length > 0 ? '<br />' : '';
+                    text += g.copyHint;
                 }
                 if (g.showColVisibHint && g.colVisibHint) {
                     text += text.length > 0 ? '<br />' : '';
                     text += g.colVisibHint;
                 }
-                text += text.length > 0 ? '<br />' : '';
-                text += g.copyHint;
-
                 // hide the hint if no text and the event is mouseenter
                 if (g.qtip) {
                     g.qtip.disable(!text && e.type == 'mouseenter');
@@ -478,7 +477,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                                .hide();
                     });
                     g.colVisib[n] = 0;
-                    $(g.cList).find('.lDiv div:eq(' + n + ') input').removeProp('checked');
+                    $(g.cList).find('.lDiv div:eq(' + n + ') input').prop('checked', false);
                 } else {
                     // cannot hide, force the checkbox to stay checked
                     $(g.cList).find('.lDiv div:eq(' + n + ') input').prop('checked', true);
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 86dbf07f28..1f45ef2884 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -483,6 +483,12 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
         /* Possible login form */
         'pma_servername', 'pma_username', 'pma_password'
     );
+    /**
+     * Allow changing themes in test/theme.php
+     */
+    if (defined('PMA_TEST_THEME')) {
+        $allow_list[] = 'set_theme';
+    }
     /**
      * Require cleanup functions
      */
@@ -596,11 +602,11 @@ require './libraries/select_lang.lib.php';
  * this check is done here after loading language files to present errors in locale
  */
 if ($GLOBALS['PMA_Config']->error_config_file) {
-    $error = '<h1>' . __('Failed to read configuration file') . '</h1>'
+    $error = '[strong]' . __('Failed to read configuration file') . '[/strong][br][br]'
         . _('This usually means there is a syntax error in it, please check any errors shown below.')
-        . '<br />'
-        . '<br />'
-        . '<iframe src="show_config_errors.php" />';
+        . '[br]'
+        . '[br]'
+        . '[conferr]';
     trigger_error($error, E_USER_ERROR);
 }
 if ($GLOBALS['PMA_Config']->error_config_default_file) {
@@ -611,7 +617,7 @@ if ($GLOBALS['PMA_Config']->error_config_default_file) {
     trigger_error($error, E_USER_ERROR);
 }
 if ($GLOBALS['PMA_Config']->error_pma_uri) {
-    trigger_error(__('The <code>$cfg[\'PmaAbsoluteUri\']</code> directive MUST be set in your configuration file!'), E_USER_ERROR);
+    trigger_error(__('The [code]$cfg[\'PmaAbsoluteUri\'][/code] directive MUST be set in your configuration file!'), E_USER_ERROR);
 }
 
 
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 21787b34c1..cc04812c44 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -140,7 +140,7 @@ function PMA_getImage($image, $alternate = '', $attributes = array())
     $class = str_replace(array('.gif','.png'), '', $image);
     if (array_key_exists($class, $sprites)) {
         $is_sprite = true;
-        $url = 'themes/dot.gif';
+        $url = (defined('PMA_TEST_THEME') ? '../' : '') . 'themes/dot.gif';
     } else {
         $url = $GLOBALS['pmaThemeImage'] . $image;
     }
diff --git a/libraries/export/json.php b/libraries/export/json.php
index 313742c6ac..0d65e175c6 100644
--- a/libraries/export/json.php
+++ b/libraries/export/json.php
@@ -121,6 +121,10 @@ if (isset($plugin_list)) {
         $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
 
         $columns_cnt = PMA_DBI_num_fields($result);
+
+        // Get field information
+        $fields_meta = PMA_DBI_get_fields_meta($result);
+
         for ($i = 0; $i < $columns_cnt; $i++) {
             $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
         }
@@ -148,7 +152,7 @@ if (isset($plugin_list)) {
 
                 if (is_null($record[$i])) {
                     $buffer .= '"' . addslashes($column) . '": null' . (! $isLastLine ? ',' : '');
-                } elseif (is_numeric($record[$i])) {
+                } elseif ($fields_meta[$i]->numeric) {
                     $buffer .= '"' . addslashes($column) . '": ' . $record[$i] . (! $isLastLine ? ',' : '');
                 } else {
                     $buffer .= '"' . addslashes($column) . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : '');
diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
index 2ab9a22729..f52ebad0f4 100644
--- a/libraries/rte/rte_routines.lib.php
+++ b/libraries/rte/rte_routines.lib.php
@@ -63,7 +63,7 @@ function PMA_RTN_main()
         trigger_error(
             __('You are using PHP\'s deprecated \'mysql\' extension, '
             . 'which is not capable of handling multi queries. '
-            . '<b>The execution of some stored routines may fail!</b> '
+            . '[strong]The execution of some stored routines may fail![/strong] '
             . 'Please use the improved \'mysqli\' extension to '
             . 'avoid any problems.'),
             E_USER_WARNING
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 9529970e5b..802481679b 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -110,8 +110,9 @@ function PMA_sanitize($message, $escape = false, $safe = false)
         '[/kbd]'    => '</kbd>',
         '[br]'      => '<br />',
         '[/a]'      => '</a>',
-        '[sup]'      => '<sup>',
-        '[/sup]'      => '</sup>',
+        '[sup]'     => '<sup>',
+        '[/sup]'    => '</sup>',
+        '[conferr]' => '<iframe src="show_config_errors.php" />' // used in common.inc.php
     );
     /* Adjust links for setup, which lives in subfolder */
     if (defined('PMA_SETUP')) {
diff --git a/main.php b/main.php
index 15bcdf250f..6e7ac2b153 100644
--- a/main.php
+++ b/main.php
@@ -289,14 +289,14 @@ if (! @extension_loaded('mbstring')) {
  */
 $gc_time = (int)@ini_get('session.gc_maxlifetime');
 if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) {
-    trigger_error(PMA_Message::decodeBB(__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.')), E_USER_WARNING);
+    trigger_error(__('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING);
 }
 
 /**
  * Check whether LoginCookieValidity is limited by LoginCookieStore.
  */
 if ($GLOBALS['cfg']['LoginCookieStore'] != 0 && $GLOBALS['cfg']['LoginCookieStore'] < $GLOBALS['cfg']['LoginCookieValidity']) {
-    trigger_error(PMA_Message::decodeBB(__('Login cookie store is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.')), E_USER_WARNING);
+    trigger_error(__('Login cookie store is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'), E_USER_WARNING);
 }
 
 /**
diff --git a/po/af.po b/po/af.po
index b8d3c229a7..7afc46aef8 100644
--- a/po/af.po
+++ b/po/af.po
@@ -8441,7 +8441,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 51dfd0372d..24030c0781 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8394,7 +8394,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/az.po b/po/az.po
index 260770a872..5195f0ad9d 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8612,7 +8612,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/be.po b/po/be.po
index 08e5d32a39..626367b44d 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8885,7 +8885,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/be@latin.po b/po/be@latin.po
index 2674c00186..14641a8519 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -8873,7 +8873,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 736129669a..633bb394ce 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8139,7 +8139,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/bn.po b/po/bn.po
index f63b5ad6bb..ae7f946008 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8630,7 +8630,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/br.po b/po/br.po
index 53bf24bf29..bf2e4ca302 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8181,7 +8181,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 3a43a650de..7decd609aa 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -8607,7 +8607,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 28fd01fb80..4da4cebafb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8423,7 +8423,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index efb5346fd4..b83387fc72 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8366,7 +8366,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/cy.po b/po/cy.po
index b17ac08b0c..39e6bf3d0d 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8511,7 +8511,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 170e44670e..dd1027a37f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8470,7 +8470,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 9ad41ffce7..570c723ba1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8515,7 +8515,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/el.po b/po/el.po
index 4018cc984d..5d80570b2f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8506,7 +8506,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 34d54fa927..323fd01be2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8384,12 +8384,12 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 
diff --git a/po/es.po b/po/es.po
index 0e6e05169a..809ab87107 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8536,7 +8536,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/et.po b/po/et.po
index 26441bd714..6bf682de5a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8381,7 +8381,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index 2072903a82..cd52ec07dd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8566,7 +8566,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 600fd07381..fd45fe4eca 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8427,7 +8427,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index f8557f706f..7e95ddc56f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8747,7 +8747,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index b7af7136d3..d13d213e8f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8474,7 +8474,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index f393d0018b..3ac37215e5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9032,7 +9032,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 8f53658240..b251d7ce97 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8565,7 +8565,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index d6888261dd..fa51dfb5b2 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8436,7 +8436,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index ff2c8fc7e8..e37684a181 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8858,7 +8858,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 54b39d0812..089106b8c0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8536,7 +8536,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/hy.po b/po/hy.po
index c3679d0209..af82d7d2ee 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7916,7 +7916,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/id.po b/po/id.po
index b189f49dc0..7a0c30504f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8193,7 +8193,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 5a120f553b..522b9d4721 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8523,7 +8523,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index e82dbb1dc2..0fca09fd3c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8375,7 +8375,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ka.po b/po/ka.po
index c3c51b06c0..f7bcbc4fc4 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8804,7 +8804,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
@@ -8821,7 +8821,7 @@ msgid ""
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 
diff --git a/po/kk.po b/po/kk.po
index 1368aaa994..9b39be9460 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7929,7 +7929,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index dd6ddd92db..136e993438 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8294,7 +8294,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 469e34685f..9e5497b4ec 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8412,7 +8412,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index fac5d3a0de..b57ea1f917 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -8650,7 +8650,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 5f1e467433..247c81d849 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -8718,7 +8718,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 3522a8e53f..59837d52c3 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7922,7 +7922,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/mn.po b/po/mn.po
index 46d503234d..b17f50d4a7 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8699,7 +8699,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index ba5e58e6af..829e86e0ae 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -8485,7 +8485,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index d96dcd3bd0..bec9987a3e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8717,7 +8717,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e434b9ff37..6df68012a2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8484,7 +8484,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 8241a7082b..26fd9fb909 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -7916,7 +7916,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7a20a958c5..9ec53cae3e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8456,7 +8456,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 92f7eb62d4..20737f5970 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8492,7 +8492,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 28b51a7a8e..57232a5ad5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8584,7 +8584,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index a1feb72856..79b8772d3c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8913,7 +8913,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 8dac7c98ae..53ff5309e4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8476,7 +8476,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/si.po b/po/si.po
index 15ec28e068..cae60d0927 100644
--- a/po/si.po
+++ b/po/si.po
@@ -8174,7 +8174,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index efdac2bb1f..3cbecae8cd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8421,7 +8421,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index e6250163a5..4dcc54194b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8415,7 +8415,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index fb7c6db909..adc3916b00 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8644,7 +8644,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 0959e9ee43..627ed72b73 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8804,7 +8804,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 74aefe9e73..15fdd576fb 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -8794,7 +8794,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 150cdfee0b..6eb04d8021 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8391,7 +8391,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 9517694b61..d9d843c242 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8066,7 +8066,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/te.po b/po/te.po
index faa8c63d00..6d7913e25b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8269,7 +8269,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 4aace0f15b..337a69e982 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8337,7 +8337,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/tk.po b/po/tk.po
index d3f40996ed..0f22dbc1a1 100644
--- a/po/tk.po
+++ b/po/tk.po
@@ -7924,7 +7924,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index a681b31749..d7bcffb58a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8435,7 +8435,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/tt.po b/po/tt.po
index c15bb5a293..04edf4ed0b 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -8711,7 +8711,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 591cf4b7d9..f638328ae3 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8371,7 +8371,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 08c2bfb28b..682434532a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8333,7 +8333,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/ur.po b/po/ur.po
index e479a492f3..3c6d93e400 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -8423,7 +8423,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 9a206582ec..40bbb516f8 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -9181,7 +9181,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/uz@latin.po b/po/uz@latin.po
index ffacfbd324..095d54d9fa 100644
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -9215,7 +9215,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 56e4d295bd..80c141a40b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8128,7 +8128,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index eae18c4495..97d1ea44e5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8425,7 +8425,7 @@ msgstr ""
 #: main.php:292
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie "
+"session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower than cookie "
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
diff --git a/show_config_errors.php b/show_config_errors.php
index ccaf4b586e..0b295ed031 100644
--- a/show_config_errors.php
+++ b/show_config_errors.php
@@ -7,7 +7,20 @@
  */
 
 $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
-PMA_no_cache_header();
+header('Expires: ' . date(DATE_RFC1123)); // rfc2616 - Section 14.21
+header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
+if (isset($_SERVER['HTTP_USER_AGENT'])
+    && stristr($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
+
+    /* FIXME: Why is this special case for IE needed? */
+    header('Pragma: public');
+} else {
+    header('Pragma: no-cache'); // HTTP/1.0
+    // test case: exporting a database into a .gz file with Safari
+    // would produce files not having the current time
+    // (added this header for Safari but should not harm other browsers)
+    header('Last-Modified: ' . date(DATE_RFC1123));
+}
 header('Content-Type: text/html; charset=utf-8');
 
 require 'libraries/vendor_config.php';
diff --git a/test/theme.php b/test/theme.php
index c7d150a9db..419cea792c 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -6,24 +6,23 @@
  * @package PhpMyAdmin-test
  */
 
+define('PMA_TEST_THEME', true);
+
 chdir('..');
 
 /**
  * Gets core libraries and defines some variables
  */
 require_once './libraries/common.inc.php';
+$GLOBALS['pmaThemeImage'] = '../' . $GLOBALS['pmaThemeImage'];
 
 $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
 
 // start output
 header('Content-Type: text/html; charset=utf-8');
 ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xml:lang="<?php echo $lang_iso_code; ?>"
-    lang="<?php echo $lang_iso_code; ?>"
-    dir="<?php echo $GLOBALS['text_dir']; ?>">
+<!DOCTYPE HTML>
+<html lang="<?php echo $lang_iso_code; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>">
 <head>
     <title>phpMyAdmin <?php echo PMA_VERSION; ?> -
         <?php echo htmlspecialchars($HTTP_HOST); ?> - Theme Test</title>
@@ -32,15 +31,19 @@ header('Content-Type: text/html; charset=utf-8');
         href="../phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
     <link rel="stylesheet" type="text/css" media="print"
         href="../print.css" />
+    <script src="../js/jquery/jquery-1.7.2.js" type="text/javascript"></script>
+    <script src="../js/messages.php" type="text/javascript"></script>
+    <script type="text/javascript">
+        var PMA_TEST_THEME = true;
+    </script>
+    <script src="../js/get_image.js.php" type="text/javascript"></script>
     <script src="../js/functions.js" type="text/javascript"></script>
 </head>
 <body>
 <?php
 
 
-$separator = '<span class="separator">'
-    .'<img class="icon ic_item_ltr" src="../themes/dot.gif"'
-    .' width="5" height="9" alt="-" /></span>' . "\n";
+$separator = '<span class=\'separator item\'>&nbsp;»</span>' . "\n";
 $item = '<a href="%1$s?%2$s" class="item">'
     .' <img class="icon %5$s" src="../themes/dot.gif"'
     .' width="16" height="16" alt="" /> ' . "\n"
@@ -81,7 +84,7 @@ printf(
     );
 
 echo '<span class="table_comment" id="span_table_comment">'
-    .'&quot;Table comment&quot</span>' . "\n";
+    .'&quot;Table comment&quot;</span>' . "\n";
 
 echo '</div>';
 
@@ -91,7 +94,7 @@ echo '</div>';
  */
 $tabs = array();
 
-$tabs['databases']['icon'] = 'ic_s_db';
+$tabs['databases']['icon'] = 's_db.png';
 $tabs['databases']['link'] = 'server_databases.php';
 $tabs['databases']['text'] = __('Databases');
 
@@ -99,43 +102,43 @@ $tabs['sql']['icon'] = 'b_sql.png';
 $tabs['sql']['link'] = 'server_sql.php';
 $tabs['sql']['text'] = __('SQL');
 
-$tabs['status']['icon'] = 'ic_s_status';
+$tabs['status']['icon'] = 's_status.png';
 $tabs['status']['link'] = 'server_status.php';
 $tabs['status']['text'] = __('Status');
 
-$tabs['vars']['icon'] = 'ic_s_vars';
+$tabs['vars']['icon'] = 's_vars.png';
 $tabs['vars']['link'] = 'server_variables.php';
 $tabs['vars']['text'] = __('Variables');
 
-$tabs['charset']['icon'] = 'ic_s_asci';
+$tabs['charset']['icon'] = 's_asci.png';
 $tabs['charset']['link'] = 'server_collations.php';
 $tabs['charset']['text'] = __('Charsets');
 
-$tabs['engine']['icon'] = 'ic_b_engine';
+$tabs['engine']['icon'] = 'b_engine.png';
 $tabs['engine']['link'] = 'server_engines.php';
 $tabs['engine']['text'] = __('Engines');
 
-$tabs['rights']['icon'] = 'ic_s_rights';
+$tabs['rights']['icon'] = 's_rights.png';
 $tabs['rights']['link'] = 'server_privileges.php';
 $tabs['rights']['text'] = __('Privileges');
 
-$tabs['binlog']['icon'] = 'ic_s_tbl';
+$tabs['binlog']['icon'] = 's_tbl.png';
 $tabs['binlog']['link'] = 'server_binlog.php';
 $tabs['binlog']['text'] = __('Binary log');
 
-$tabs['process']['icon'] =  'ic_s_process';
+$tabs['process']['icon'] =  's_process.png';
 $tabs['process']['link'] = 'server_processlist.php';
 $tabs['process']['text'] = 'caution';
 $tabs['process']['class'] = 'caution';
 
-$tabs['export']['icon'] = 'ic_b_export';
+$tabs['export']['icon'] = 'b_export.png';
 $tabs['export']['text'] = 'disabled';
 
-$tabs['export2']['icon'] = 'ic_b_export';
+$tabs['export2']['icon'] = 'b_export.png';
 $tabs['export2']['text'] = 'disabled caution';
 $tabs['export2']['class'] = 'caution';
 
-$tabs['import']['icon'] = 'ic_b_import';
+$tabs['import']['icon'] = 'b_import.png';
 $tabs['import']['link'] = 'server_import.php';
 $tabs['import']['text'] = 'active';
 $tabs['import']['class'] = 'active';
@@ -153,19 +156,18 @@ if (@file_exists($pmaThemeImage . 'logo_right.png')) {
 <h1>
 <?php
 echo sprintf(__('Welcome to %s'),
-    '<bdo dir="ltr" xml:lang="en">phpMyAdmin ' . PMA_VERSION . '</bdo>');
+    '<bdo dir="ltr" lang="en">phpMyAdmin ' . PMA_VERSION . '</bdo>');
 ?>
 </h1>
 
 <hr class="clearfloat" />
 
-<form method="post" action="theme.php" target="_parent">
+<form method="post" action="theme.php">
 <fieldset>
     <legend><?php echo __('Theme'); ?></legend>
 <?php
     echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(false);
 ?>
-<noscript><input type="submit" value="Go" style="vertical-align: middle" /></noscript>
 </fieldset>
 </form>
 
@@ -180,7 +182,7 @@ echo sprintf(__('Welcome to %s'),
     success message box content!
 </div>
 <div class="success">
-    <h1>Auccess message box header!</h1>
+    <h1>Success message box header!</h1>
     success message box content!
 </div>