Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Conflicts:
	js/export.js

92 files changed, 1002 insertions, 922 deletions

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..ca9a24ed18 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;
        }
@@ -298,7 +298,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = 'TRUNCATE ' + curr_table_name;
+        var question = 
+            PMA_messages.strTruncateTableStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />TRUNCATE ' + curr_table_name;
 
         $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function(url) {
 
diff --git a/js/export.js b/js/export.js
index 5c74a859ca..8801e31fd7 100644
--- a/js/export.js
+++ b/js/export.js
@@ -131,13 +131,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").prop("checked")) {
-            $("#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..84df1bdf7a 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
 
@@ -2288,7 +2282,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP DATABASE ' + escapeHtml(window.parent.db);
+        var question = 
+            PMA_messages.strDropDatabaseStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />DROP DATABASE ' + escapeHtml(window.parent.db);
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
@@ -3347,7 +3344,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strDropTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'DROP TABLE ' + window.parent.table;
+        var question = 
+            PMA_messages.strDropTableStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />DROP TABLE ' + window.parent.table;
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
@@ -3378,7 +3378,10 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strTruncateTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + '\n' + 'TRUNCATE TABLE ' + window.parent.table;
+        var question = 
+            PMA_messages.strTruncateTableStrongWarning + ' ' 
+            + PMA_messages.strDoYouReally
+            + '<br /><br />TRUNCATE ' + window.parent.table;
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
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/js/tbl_chart.js b/js/tbl_chart.js
index 74ff5af4ee..c5693d6af8 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -72,6 +72,7 @@ $(document).ready(function() {
         if (title.length == 0) {
             title = ' ';
         }
+        currentSettings.title.text = title;
         currentChart.setTitle({ text: title });
     });
 
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
@@ -484,6 +484,12 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST['
         '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
      */
     include './libraries/cleanup.lib.php';
@@ -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/display_tbl.lib.php b/libraries/display_tbl.lib.php
index f523b73591..a0cdd0d920 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2385,13 +2385,13 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
             $message->addMessage(', ', '');
         }
 
-        $messagge_qt = PMA_Message::notice(__('Query took %01.4f sec'));
+        $messagge_qt = PMA_Message::notice(__('Query took %01.4f sec') . ')');
         $messagge_qt->addParam($GLOBALS['querytime']);
 
         $message->addMessage($messagge_qt, '');
-        $message->addMessage(')', '');
-
-        $message->addMessage(isset($sorted_column_message) ? $sorted_column_message : '', '');
+        if (isset($sorted_column_message)) {
+            $message->addMessage($sorted_column_message, '');
+        }
 
         PMA_showMessage($message, $sql_query, 'success');
 
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/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php
index 4c126719ae..6d520bd553 100644
--- a/libraries/tbl_info.inc.php
+++ b/libraries/tbl_info.inc.php
@@ -24,7 +24,7 @@ PMA_checkParameters(array('db', 'table'));
  * Defining global variables, in case this script is included by a function.
  * This is necessary because this script can be included by libraries/header.inc.php.
  */
-global $showtable, $tbl_is_view, $tbl_type, $show_comment, $tbl_collation,
+global $showtable, $tbl_is_view, $tbl_storage_engine, $show_comment, $tbl_collation,
        $table_info_num_rows, $auto_increment;
 
 /**
@@ -52,16 +52,16 @@ $GLOBALS['showtable'] = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['tabl
 
 // need this test because when we are creating a table, we get 0 rows
 // from the SHOW TABLE query
-// and we don't want to mess up the $tbl_type coming from the form
+// and we don't want to mess up the $tbl_storage_engine coming from the form
 
 if ($showtable) {
     if (PMA_Table::isView($GLOBALS['db'], $GLOBALS['table'])) {
         $tbl_is_view     = true;
-        $tbl_type        = __('View');
+        $tbl_storage_engine = __('View');
         $show_comment    = null;
     } else {
         $tbl_is_view     = false;
-        $tbl_type        = isset($showtable['Engine'])
+        $tbl_storage_engine = isset($showtable['Engine'])
             ? strtoupper($showtable['Engine'])
             : '';
         // a new comment could be coming from tbl_operations.php
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index ae287f8608..3cbf3eadbd 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -669,8 +669,8 @@ if ($action == 'tbl_create.php') {
         <td width="25">&nbsp;</td>
         <td>
     <?php
-    echo PMA_StorageEngine::getHtmlSelect('tbl_type', null,
-        (isset($_REQUEST['tbl_type']) ? $_REQUEST['tbl_type'] : null));
+    echo PMA_StorageEngine::getHtmlSelect('tbl_storage_engine', null,
+        (isset($_REQUEST['tbl_storage_engine']) ? $_REQUEST['tbl_storage_engine'] : null));
     ?>
         </td>
         <td width="25">&nbsp;</td>
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 66ad52e9a3..69b9d0170d 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 492c79be07..6bf682de5a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,11 +3,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
+"Project-Id-Version: phpMyAdmin 3.4.11-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-06 13:06+0200\n"
-"PO-Revision-Date: 2012-03-21 23:50+0200\n"
-"Last-Translator: Jouni Kähkönen <asdfsdf@asdfasdfasdf.com>\n"
+"PO-Revision-Date: 2012-04-07 20:55+0200\n"
+"Last-Translator: LiivaneLord <liivane.lord@mail.ee>\n"
 "Language-Team: estonian <et@li.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
@@ -99,8 +99,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
-"%s fail pole selles süsteemis saadaval. Lisateavet leiad aadressilt www."
-"phpmyadmin.net ."
+"%s fail pole selles süsteemis saadaval. Lisateavet leiad aadressilt "
+"www.phpmyadmin.net ."
 
 #: db_create.php:73
 #, php-format
@@ -246,16 +246,16 @@ msgid "The database name is empty!"
 msgstr "Andmebaasi nimi on tühi!"
 
 #: db_operations.php:300
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been renamed to %s"
 msgid "Database %1$s has been renamed to %2$s"
-msgstr "%s andmebaasi uueks nimeks on %s"
+msgstr "%1$s andmebaasi uueks nimeks on %2$s"
 
 #: db_operations.php:304
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been copied to %s"
 msgid "Database %1$s has been copied to %2$s"
-msgstr "%s andmebaas on kopeeritud kohta %s"
+msgstr "%1$s andmebaas on kopeeritud kohta %2$s"
 
 #: db_operations.php:432
 msgid "Rename database to"
@@ -507,13 +507,13 @@ msgid "Search results for \"<i>%s</i>\" %s:"
 msgstr "\"<i>%s</i>\" %s otsingu tulemused:"
 
 #: db_search.php:227
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s match inside table <i>%s</i>"
 #| msgid_plural "%s matches inside table <i>%s</i>"
 msgid "%1$s match inside table <i>%2$s</i>"
 msgid_plural "%1$s matches inside table <i>%2$s</i>"
-msgstr[0] "%s vaste <i>%s</i> tabelis"
-msgstr[1] "%s vastet <i>%s</i> tabelis"
+msgstr[0] "%1$s vaste <i>%2$s</i> tabelis"
+msgstr[1] "%1$s vastet <i>%2$s</i> tabelis"
 
 #: db_search.php:234 libraries/common.lib.php:3147
 #: libraries/common.lib.php:3366 libraries/common.lib.php:3367
@@ -651,7 +651,7 @@ msgstr "Ära vali ühtegi"
 
 #: db_structure.php:579
 msgid "Check tables having overhead"
-msgstr "Kontrolli ülemisi tabeleid"
+msgstr "Kontrolli ballastiga  tabeleid"
 
 #: db_structure.php:587 libraries/common.lib.php:3379
 #: libraries/common.lib.php:3380 libraries/config/messages.inc.php:166
@@ -837,7 +837,7 @@ msgstr "\"%s\" veeru väärtus"
 
 #: gis_data_editor.php:113 tbl_gis_visualization.php:164
 msgid "Use OpenStreetMaps as Base Layer"
-msgstr ""
+msgstr "Use OpenStreetMaps as Base Layer"
 
 #: gis_data_editor.php:134
 msgid "SRID"
@@ -957,8 +957,8 @@ msgid ""
 "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
 msgstr ""
 "Importimisest andmeid vastu ei võetud. Faili nime kas ei saadetud või faili "
-"maht ületab sinu PHP seadistuses lubatud maksimaalset mahtu. Vaata [a@./"
-"Documentation.html#faq1_16@Documentation]KKK 1.16[/a]."
+"maht ületab sinu PHP seadistuses lubatud maksimaalset mahtu. Vaata "
+"[a@./Documentation.html#faq1_16@Documentation]KKK 1.16[/a]."
 
 #: import.php:415
 msgid ""
@@ -1019,10 +1019,9 @@ msgid "\"DROP DATABASE\" statements are disabled."
 msgstr "\"DROP DATABASE\" käsud on keelatud."
 
 #: js/messages.php:30 libraries/mult_submits.inc.php:305 sql.php:386
-#, fuzzy
 #| msgid "Do you really want to "
 msgid "Do you really want to execute following query?"
-msgstr "Kas tõesti tahad "
+msgstr "Kas tõesti tahad käivitada selle päringu?"
 
 #: js/messages.php:31 libraries/mult_submits.inc.php:303 sql.php:371
 msgid "You are about to DESTROY a complete database!"
@@ -1516,8 +1515,7 @@ msgstr ""
 
 #: js/messages.php:176
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
-"Logi andmed on laetud. Päringud sooritatakse selle ajavahemiku jooksul:"
+msgstr "Logi andmed on laetud. Päringud sooritatakse selle ajavahemiku jooksul:"
 
 #: js/messages.php:178
 msgid "Jump to Log table"
@@ -1626,7 +1624,7 @@ msgstr ""
 #: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89
 #: prefs_manage.php:229 server_status.php:1602 setup/frames/menu.inc.php:20
 msgid "Import"
-msgstr "Import"
+msgstr "Impordi"
 
 #: js/messages.php:210
 msgid "Analyse Query"
@@ -1733,22 +1731,19 @@ msgid "Show indexes"
 msgstr "Näita indekseid"
 
 #: js/messages.php:250 libraries/mult_submits.inc.php:313
-#, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key check:"
-msgstr "Keela võõrvõtme kontrollid"
+msgstr "Võõrvõtme kontroll:"
 
 #: js/messages.php:251 libraries/mult_submits.inc.php:317
-#, fuzzy
 #| msgid "Enabled"
 msgid "(Enabled)"
-msgstr "Lubatud"
+msgstr "(Lubatud)"
 
 #: js/messages.php:252 libraries/mult_submits.inc.php:317
-#, fuzzy
 #| msgid "Disabled"
 msgid "(Disabled)"
-msgstr "Keelatud"
+msgstr "(Keelatud)"
 
 #: js/messages.php:255
 msgid "Searching"
@@ -1959,7 +1954,7 @@ msgstr "Valimiseks/mittevalimiseks kliki"
 
 #: js/messages.php:348
 msgid "Double-click to copy column name"
-msgstr ""
+msgstr "Veeru nime kopeerimiseks topeltklõpsa sellel"
 
 #: js/messages.php:349
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
@@ -1985,20 +1980,18 @@ msgid "Go to link"
 msgstr "Mine lingile"
 
 #: js/messages.php:354
-#, fuzzy
 #| msgid "Column names"
 msgid "Copy column name"
-msgstr "Veeru nimed"
+msgstr "Kopeeri veeru nimi"
 
 #: js/messages.php:355
 msgid "Right-click the column name to copy it to your clipboard."
-msgstr ""
+msgstr "Veeru nime kopeerimiseks lõikelauale paremklõpsa sellel."
 
 #: js/messages.php:356
-#, fuzzy
 #| msgid "Update row(s)"
 msgid "Show data row(s)"
-msgstr "Uuenda rida/ridu"
+msgstr "Näita andmete rida/ridu"
 
 #: js/messages.php:359
 msgid "Generate password"
@@ -2292,8 +2285,7 @@ msgstr "Sekund"
 #: libraries/Advisor.class.php:168
 #, php-format
 msgid "Failed formatting string for rule '%s'. PHP threw following error: %s"
-msgstr ""
-"Sõne vormindamine reeglile '%s' ebaõnnestus. PHP andis järgneva vea: %s"
+msgstr "Sõne vormindamine reeglile '%s' ebaõnnestus. PHP andis järgneva vea: %s"
 
 #: libraries/Advisor.class.php:331 server_status.php:944
 msgid "per second"
@@ -2375,8 +2367,8 @@ msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
-"Üleslaetud faili liigutamisel esines viga, vaata [a@./Documentation."
-"html#faq1_11@Documentation]KKK 1.11[/a]"
+"Üleslaetud faili liigutamisel esines viga, vaata "
+"[a@./Documentation.html#faq1_11@Documentation]KKK 1.11[/a]"
 
 #: libraries/File.class.php:449
 msgid "Error while moving uploaded file."
@@ -2521,10 +2513,10 @@ msgid "Error renaming table %1$s to %2$s"
 msgstr "Esines viga %1$s tabeli ümbernimetamisel nimeks %2$s"
 
 #: libraries/Table.class.php:1257
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %s has been renamed to %s"
 msgid "Table %1$s has been renamed to %2$s."
-msgstr "%s tabeli uueks nimeks sai %s"
+msgstr "%1$s tabeli uueks nimeks sai %2$s."
 
 #: libraries/Table.class.php:1389
 msgid "Could not save table UI preferences"
@@ -2536,8 +2528,8 @@ msgid ""
 "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]"
 "['MaxTableUiprefs'] %s)"
 msgstr ""
-"Tabeli UI eelistuste puhastamine ebaõnnestus (vaata $cfg['Servers'][$i]"
-"['MaxTableUiprefs'] %s)"
+"Tabeli UI eelistuste puhastamine ebaõnnestus (vaata "
+"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)"
 
 #: libraries/Table.class.php:1538
 #, php-format
@@ -2546,8 +2538,8 @@ msgid ""
 "after you refresh this page. Please check if the table structure has been "
 "changed."
 msgstr ""
-"Ei saanud salvestada UI muudatust \"%s\". Muudatused ei säili, kui "
-"värskendad seda lehte. Palun kontrolli, kas tabeli struktuuri on muudetud."
+"Ei saanud salvestada UI muudatust \"%s\". Muudatused ei säili, kui värskendad "
+"seda lehte. Palun kontrolli, kas tabeli struktuuri on muudetud."
 
 #: libraries/Theme.class.php:145
 #, php-format
@@ -2597,8 +2589,8 @@ msgid ""
 "You probably did not create a configuration file. You might want to use the "
 "%1$ssetup script%2$s to create one."
 msgstr ""
-"Arvatavasti ei loonud sa seadistuse faili. Võid selle loomiseks kasutada "
-"%1$spaigaldaja skripti%2$s."
+"Arvatavasti ei loonud sa seadistuse faili. Võid selle loomiseks kasutada %"
+"1$spaigaldaja skripti%2$s."
 
 #: libraries/auth/config.auth.lib.php:110
 msgid ""
@@ -2614,13 +2606,12 @@ msgstr ""
 
 #: libraries/auth/cookie.auth.lib.php:44
 msgid "Failed to use Blowfish from mcrypt!"
-msgstr ""
+msgstr "Failed to use Blowfish from mcrypt!"
 
 #: libraries/auth/cookie.auth.lib.php:208 libraries/header.inc.php:90
-#, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point"
-msgstr "Küpsised peavad olema lubatud."
+msgstr "Javascript peab olema lubatud"
 
 #: libraries/auth/cookie.auth.lib.php:227
 msgid "Log in"
@@ -2663,8 +2654,7 @@ msgstr "Küpsised peavad olema lubatud."
 #: libraries/auth/signon.auth.lib.php:236
 msgid ""
 "Login without a password is forbidden by configuration (see AllowNoPassword)"
-msgstr ""
-"Paroolita sisselogimine on seadistuses keelatud (vaata AllowNoPassword)"
+msgstr "Paroolita sisselogimine on seadistuses keelatud (vaata AllowNoPassword)"
 
 #: libraries/auth/cookie.auth.lib.php:610
 #: libraries/auth/signon.auth.lib.php:240
@@ -3285,8 +3275,8 @@ msgid ""
 "kbd] - allows newlines in columns"
 msgstr ""
 "Määrab ära, milliseid muutmise tüüpe saab CHAR ja VARCHAR veergude jaoks "
-"kasutada. [kbd]input[/kbd] - lubab piirata sisendi pikkust, [kbd]textarea[/"
-"kbd] - lubab veergudes kasutada uusi ridu (newlines)"
+"kasutada. [kbd]input[/kbd] - lubab piirata sisendi pikkust, "
+"[kbd]textarea[/kbd] - lubab veergudes kasutada uusi ridu (newlines)"
 
 #: libraries/config/messages.inc.php:33
 msgid "CHAR columns editing"
@@ -3298,11 +3288,11 @@ msgid ""
 "columns"
 msgstr ""
 "Määrab CHAR ja VARCHAR veergude jaoks loodud sisestusväljade minimaalse "
-"suuruse"
+"laius"
 
 #: libraries/config/messages.inc.php:35
 msgid "Minimum size for input field"
-msgstr "Sisestusvälja minimaalne suurus"
+msgstr "Sisestusvälja minimaalne laius"
 
 #: libraries/config/messages.inc.php:36
 msgid ""
@@ -3310,11 +3300,11 @@ msgid ""
 "columns"
 msgstr ""
 "Määrab CHAR ja VARCHAR veergude jaoks loodud sisestusväljade maksimaalse "
-"suuruse"
+"laiuse"
 
 #: libraries/config/messages.inc.php:37
 msgid "Maximum size for input field"
-msgstr "Sisestusvälja maksimaalne suurus"
+msgstr "Sisestusvälja maksimaalne laius"
 
 #: libraries/config/messages.inc.php:38
 msgid "Number of columns for CHAR/VARCHAR textareas"
@@ -3628,11 +3618,11 @@ msgstr "Keela võõrvõtme kontrollid"
 
 #: libraries/config/messages.inc.php:130
 msgid "Use hexadecimal for BLOB"
-msgstr ""
+msgstr "Kasuta BLOBi heksadetsimaalsena"
 
 #: libraries/config/messages.inc.php:132
 msgid "Use ignore inserts"
-msgstr ""
+msgstr "Use ignore inserts"
 
 #: libraries/config/messages.inc.php:134
 msgid "Syntax to use when inserting data"
@@ -3667,8 +3657,8 @@ msgid ""
 "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is "
 "the referenced data, [kbd]id[/kbd] is the key value"
 msgstr ""
-"Vali sorteerimise järjekord võõrvõtme rippmenüü kasti üksustele. [kbd]content"
-"[/kbd] on viidatud andmed, [kbd]id[/kbd] on võtme väärtus"
+"Vali sorteerimise järjekord võõrvõtme rippmenüü kasti üksustele. "
+"[kbd]content[/kbd] on viidatud andmed, [kbd]id[/kbd] on võtme väärtus"
 
 #: libraries/config/messages.inc.php:153
 msgid "Foreign key dropdown order"
@@ -3817,9 +3807,9 @@ msgid ""
 "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to "
 "get special values."
 msgstr ""
-"Täpsusta veebilehitseja pealkirja. Vaata [a@Documentation."
-"html#cfg_TitleTable]dokumentatsioonist[/a], kuidas kasutada maagilisi sõne, "
-"mida saab kasutada eriliste väärtuste saamiseks."
+"Täpsusta veebilehitseja pealkirja. Vaata "
+"[a@Documentation.html#cfg_TitleTable]dokumentatsioonist[/a], kuidas kasutada "
+"maagilisi sõne, mida saab kasutada eriliste väärtuste saamiseks."
 
 #: libraries/config/messages.inc.php:196
 #: libraries/navigation_header.inc.php:79
@@ -3942,10 +3932,11 @@ msgid ""
 "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], "
 "Copyright 2002 Upright Database Technology. All rights reserved.[/em]"
 msgstr ""
-"Kui soovid kasutada SQL valideerija teenust, siis peaksid teadma, et [strong]"
-"kõiki SQL käskusid salvestatakse anonüümselt statistika eesmärgil[/strong]."
-"[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], "
-"Autoriõigus 2002 Upright Database Technology. Kõik õigused on kaitstud.[/em]"
+"Kui soovid kasutada SQL valideerija teenust, siis peaksid teadma, et "
+"[strong]kõiki SQL käskusid salvestatakse anonüümselt statistika "
+"eesmärgil[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL "
+"Validator[/a], Autoriõigus 2002 Upright Database Technology. Kõik õigused on "
+"kaitstud.[/em]"
 
 #: libraries/config/messages.inc.php:224
 msgid "Startup"
@@ -4082,7 +4073,7 @@ msgstr "Ära kasuta AUTO_INCREMENT null-väärtuste jaoks"
 
 #: libraries/config/messages.inc.php:266
 msgid "Initial state for sliders"
-msgstr ""
+msgstr "Liugurite algne asetus"
 
 #: libraries/config/messages.inc.php:267
 msgid "How many rows can be inserted at one time"
@@ -4090,7 +4081,7 @@ msgstr "Mitu rida saab korraga lisada"
 
 #: libraries/config/messages.inc.php:268
 msgid "Number of inserted rows"
-msgstr "Lisatavate ridade hulk"
+msgstr "Lisatud ridade hulk"
 
 #: libraries/config/messages.inc.php:269
 msgid "Target for quick access icon"
@@ -4333,8 +4324,8 @@ msgid ""
 "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] "
 "([kbd]0[/kbd] for no limit)"
 msgstr ""
-"Baitide hulk, mida skriptil on lubatud kasutada, nt [kbd]32M[/kbd] ([kbd]0[/"
-"kbd] - piiramatu)"
+"Baitide hulk, mida skriptil on lubatud kasutada, nt [kbd]32M[/kbd] "
+"([kbd]0[/kbd] - piiramatu)"
 
 #: libraries/config/messages.inc.php:320
 msgid "Memory limit"
@@ -4536,7 +4527,7 @@ msgstr "Luba sisse logida 'root' kasutajana"
 
 #: libraries/config/messages.inc.php:368
 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth"
-msgstr ""
+msgstr "HTTP Basic Auth Realm name to display when doing HTTP Auth"
 
 #: libraries/config/messages.inc.php:369
 msgid "HTTP Realm"
@@ -4568,8 +4559,9 @@ msgid ""
 "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] "
 "support, suggested: [kbd]pma_bookmark[/kbd]"
 msgstr ""
-"Jäta tühjaks, kui puudub [a@http://wiki.phpmyadmin.net/pma/bookmark]"
-"järjehoidja[/a] tugi, soovitatav: [kbd]pma_bookmark[/kbd]"
+"Jäta tühjaks, kui puudub "
+"[a@http://wiki.phpmyadmin.net/pma/bookmark]järjehoidja[/a] tugi, soovitatav: "
+"[kbd]pma_bookmark[/kbd]"
 
 #: libraries/config/messages.inc.php:375
 msgid "Bookmark table"
@@ -4580,8 +4572,8 @@ msgid ""
 "Leave blank for no column comments/mime types, suggested: [kbd]"
 "pma_column_info[/kbd]"
 msgstr ""
-"Jäta tühjaks, kui puuduvad kommentaarid/mime-tüübid, soovitatav: [kbd]"
-"pma_column_info[/kbd]"
+"Jäta tühjaks, kui puuduvad kommentaarid/mime-tüübid, soovitatav: "
+"[kbd]pma_column_info[/kbd]"
 
 #: libraries/config/messages.inc.php:377
 msgid "Column information table"
@@ -4612,8 +4604,8 @@ msgid ""
 "A special MySQL user configured with limited permissions, more information "
 "available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]"
 msgstr ""
-"Eriline MySQL kasutaja, mis on piiratud õigustega. Lisainfot saab [a@http://"
-"wiki.phpmyadmin.net/pma/controluser]vikist[/a]"
+"Eriline MySQL kasutaja, mis on piiratud õigustega. Lisainfot saab "
+"[a@http://wiki.phpmyadmin.net/pma/controluser]vikist[/a]"
 
 #: libraries/config/messages.inc.php:384
 msgid "Control user"
@@ -4644,8 +4636,8 @@ msgid ""
 "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/"
 "kbd]"
 msgstr ""
-"Jäta tühjaks, kui puudub kujundaja tugi, soovitatav: [kbd]pma_designer_coords"
-"[/kbd]"
+"Jäta tühjaks, kui puudub kujundaja tugi, soovitatav: "
+"[kbd]pma_designer_coords[/kbd]"
 
 #: libraries/config/messages.inc.php:390
 msgid "Designer table"
@@ -4685,8 +4677,8 @@ msgid ""
 "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/"
 "kbd]"
 msgstr ""
-"Jäta tühjaks, kuid puudub SQL päringu ajaloo tugi, soovitatav: [kbd]"
-"pma_history[/kbd]"
+"Jäta tühjaks, kuid puudub SQL päringu ajaloo tugi, soovitatav: "
+"[kbd]pma_history[/kbd]"
 
 #: libraries/config/messages.inc.php:398
 msgid "SQL query history table"
@@ -4754,8 +4746,8 @@ msgstr "'config' autentimise parool"
 msgid ""
 "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]"
 msgstr ""
-"Jäta tühjaks, kui puudub PDF skeemi tugi, soovitatav: [kbd]pma_pdf_pages[/"
-"kbd]"
+"Jäta tühjaks, kui puudub PDF skeemi tugi, soovitatav: "
+"[kbd]pma_pdf_pages[/kbd]"
 
 #: libraries/config/messages.inc.php:411
 msgid "PDF schema: pages table"
@@ -4768,9 +4760,9 @@ msgid ""
 "no support. Suggested: [kbd]phpmyadmin[/kbd]"
 msgstr ""
 "Andmebaas, mida kasutada seoste, järjehoidjate ja PDF võimaluste "
-"säilitamiseks. Lisateavet leiad aadressilt [a@http://wiki.phpmyadmin.net/pma/"
-"pmadb]pmadb[/a]. Kui tugi puudub, siis jäta tühjaks, soovitatav: [kbd]"
-"phpmyadmin[/kbd]"
+"säilitamiseks. Lisateavet leiad aadressilt "
+"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a]. Kui tugi puudub, siis "
+"jäta tühjaks, soovitatav: [kbd]phpmyadmin[/kbd]"
 
 #: libraries/config/messages.inc.php:413
 msgid "Database name"
@@ -4823,8 +4815,8 @@ msgid ""
 "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types"
 "[/a] for an example"
 msgstr ""
-"Vaata näiteks [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]"
-"autentimise tüüpe[/a]"
+"Vaata näiteks "
+"[a@http://wiki.phpmyadmin.net/pma/auth_types#signon]autentimise tüüpe[/a]"
 
 #: libraries/config/messages.inc.php:423
 msgid "Signon session name"
@@ -4856,8 +4848,8 @@ msgstr "Kasuta SSL'i"
 msgid ""
 "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]"
 msgstr ""
-"Jäta tühjaks, kui puudub PDF skeemi tugi, soovitatav: [kbd]pma_table_coords[/"
-"kbd]"
+"Jäta tühjaks, kui puudub PDF skeemi tugi, soovitatav: "
+"[kbd]pma_table_coords[/kbd]"
 
 #: libraries/config/messages.inc.php:430
 msgid "PDF schema: table coordinates"
@@ -4880,8 +4872,8 @@ msgid ""
 "Leave blank for no \"persistent\" tables'UI preferences across sessions, "
 "suggested: [kbd]pma_table_uiprefs[/kbd]"
 msgstr ""
-"Jäta tühjaks, kui seansside vahel puuduvad \"püsivad\" tabelite UI "
-"eelistused, soovitatav: [kbd]pma_table_uiprefs[/kbd]"
+"Jäta tühjaks, kui seansside vahel puuduvad \"püsivad\" tabelite UI eelistused, "
+"soovitatav: [kbd]pma_table_uiprefs[/kbd]"
 
 #: libraries/config/messages.inc.php:434
 msgid "UI preferences table"
@@ -4936,8 +4928,8 @@ msgid ""
 "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/"
 "kbd]"
 msgstr ""
-"Jäta tühjaks, kui puudub SQL päringu jälgimise tugi, soovitatav: [kbd]"
-"pma_tracking[/kbd]"
+"Jäta tühjaks, kui puudub SQL päringu jälgimise tugi, soovitatav: "
+"[kbd]pma_tracking[/kbd]"
 
 #: libraries/config/messages.inc.php:444
 msgid "SQL query tracking table"
@@ -4960,8 +4952,8 @@ msgid ""
 "Leave blank for no user preferences storage in database, suggested: [kbd]"
 "pma_userconfig[/kbd]"
 msgstr ""
-"Jäta tühjaks, kui kasutaja eelistusi andmebaasis ei hoita, soovitatav: [kbd]"
-"pma_userconfig[/kbd]"
+"Jäta tühjaks, kui kasutaja eelistusi andmebaasis ei hoita, soovitatav: "
+"[kbd]pma_userconfig[/kbd]"
 
 #: libraries/config/messages.inc.php:448
 msgid "User preferences storage table"
@@ -5117,6 +5109,10 @@ msgid ""
 "['LeftFrameTableSeparator'] directive, so only the folder is called like the "
 "alias, the table name itself stays unchanged"
 msgstr ""
+"Kui valida selleks [kbd]nested[/kbd], siis tabeli nime aliast kasutatakse "
+"sõltuvalt $cfg['LeftFrameTableSeparator'] direktiivist ainult tabelite "
+"poolitamiseks. Seega on ainult kausta nimeks alias ja tabeli nimi jääb ise "
+"muutmata"
 
 #: libraries/config/messages.inc.php:480
 msgid "Display table comment instead of its name"
@@ -5168,8 +5164,8 @@ msgid ""
 "If you have a custom username, specify it here (defaults to [kbd]anonymous[/"
 "kbd])"
 msgstr ""
-"Kui sul on enda kasutajanimi, siis täpsusta seda siin (vaikimisi on [kbd]"
-"anonymous[/kbd])"
+"Kui sul on enda kasutajanimi, siis täpsusta seda siin (vaikimisi on "
+"[kbd]anonymous[/kbd])"
 
 #: libraries/config/messages.inc.php:494 tbl_tracking.php:472
 #: tbl_tracking.php:529
@@ -5247,6 +5243,10 @@ msgid ""
 "For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: "
 "HTTP_X_FORWARDED_FOR[/kbd]"
 msgstr ""
+"Sisesta proksid formaadis [kbd]IP: usaldusväärse HTTP päis[/kbd]. Järgnev "
+"näide täpsustab, et phpMyAdmin peab usaldama HTTP_X_FORWARDED_FOR (X"
+"-Forwarded-For) päist, mis tuleb proksist 1.2.3.4:[br][kbd]1.2.3.4: "
+"HTTP_X_FORWARDED_FOR[/kbd]"
 
 #: libraries/config/messages.inc.php:512
 msgid "List of trusted proxies for IP allow/deny"
@@ -5286,9 +5286,9 @@ msgid ""
 "libraries/import.lib.php for defaults on how many queries a statement may "
 "contain."
 msgstr ""
-"Näita mitmekäsuliste päringute iga käsu poolt mõjutatud ridu. Loe libraries/"
-"import.lib.php failist vaikimisi väärtust, kui palju päringuid üks käsk võib "
-"sisaldada."
+"Näita mitmekäsuliste päringute iga käsu poolt mõjutatud ridu. Loe "
+"libraries/import.lib.php failist vaikimisi väärtust, kui palju päringuid üks "
+"käsk võib sisaldada."
 
 #: libraries/config/messages.inc.php:520
 msgid "Verbose multiple statements"
@@ -5814,7 +5814,7 @@ msgstr "%d ei ole õige reanumber."
 
 #: libraries/display_tbl.lib.php:428
 msgid "Start row"
-msgstr "Alguse rida"
+msgstr "Alusta reaga"
 
 #: libraries/display_tbl.lib.php:430
 msgid "Number of rows"
@@ -5888,7 +5888,7 @@ msgstr "Näita BLOB sisu"
 
 #: libraries/display_tbl.lib.php:686
 msgid "Hide browser transformation"
-msgstr ""
+msgstr "Peida veebilehitseja transformatsioon"
 
 #: libraries/display_tbl.lib.php:693
 msgid "Well Known Text"
@@ -5938,7 +5938,7 @@ msgstr "Näita diagrammi"
 
 #: libraries/display_tbl.lib.php:2686
 msgid "Visualize GIS data"
-msgstr ""
+msgstr "Visualiseeri GIS andmed"
 
 #: libraries/display_tbl.lib.php:2707
 msgid "Create view"
@@ -5969,7 +5969,6 @@ msgid "Autoextend increment"
 msgstr "Automaatse laiendamise suurendamine"
 
 #: libraries/engines/innodb.lib.php:28
-#, fuzzy
 #| msgid ""
 #| " The increment size for extending the size of an autoextending tablespace "
 #| "when it becomes full."
@@ -5977,7 +5976,7 @@ msgid ""
 "The increment size for extending the size of an autoextending tablespace "
 "when it becomes full."
 msgstr ""
-" Tabeliruumi täitumisel selle suurendamine antud suurendamise mahu võrra."
+"Tabeliruumi täitumisel selle suurendamine antud suurendamise mahu võrra."
 
 #: libraries/engines/innodb.lib.php:32
 msgid "Buffer pool size"
@@ -5988,7 +5987,8 @@ msgid ""
 "The size of the memory buffer InnoDB uses to cache data and indexes of its "
 "tables."
 msgstr ""
-"Mälupuhvri maht, mida InnoDB kasutab oma andmete ja indeksite puhverdamiseks."
+"Mälupuhvri maht, mida InnoDB kasutab oma andmete ja indeksite "
+"puhverdamiseks."
 
 #: libraries/engines/innodb.lib.php:130
 msgid "Buffer Pool"
@@ -6275,10 +6275,10 @@ msgid ""
 "will be deleted, otherwise they are renamed and given the next highest "
 "number."
 msgstr ""
-"See on süsteemi poolt hallatavate ülekannete logifailide hulk (pbxt/system/"
-"xlog*.xt). Kui logide hulk ületab seda väärtust, siis vanemad logid "
-"kustutatakse, muul juhul nimetatakse need ümber ja antakse järgmine kõrgeim "
-"number."
+"See on süsteemi poolt hallatavate ülekannete logifailide hulk "
+"(pbxt/system/xlog*.xt). Kui logide hulk ületab seda väärtust, siis vanemad "
+"logid kustutatakse, muul juhul nimetatakse need ümber ja antakse järgmine "
+"kõrgeim number."
 
 #: libraries/engines/pbxt.lib.php:125
 #, php-format
@@ -6286,8 +6286,8 @@ msgid ""
 "Documentation and further information about PBXT can be found on the "
 "%sPrimeBase XT Home Page%s."
 msgstr ""
-"PBXT kohta leiab dokumentatsiooni ja edasist teavet %sPrimeBase XT kodulehelt"
-"%s."
+"PBXT kohta leiab dokumentatsiooni ja edasist teavet %sPrimeBase XT "
+"kodulehelt%s."
 
 #: libraries/engines/pbxt.lib.php:127
 msgid "Related Links"
@@ -6321,7 +6321,7 @@ msgstr "NULL asendaja:"
 
 #: libraries/export/csv.php:29 libraries/export/excel.php:24
 msgid "Remove carriage return/line feed characters within columns"
-msgstr ""
+msgstr "Eemalda veergudest tagasijooksu/reavahetuse sümbolid"
 
 #: libraries/export/excel.php:33
 msgid "Excel edition:"
@@ -6406,7 +6406,7 @@ msgstr "PHP versioon"
 
 #: libraries/export/mediawiki.php:15
 msgid "MediaWiki Table"
-msgstr ""
+msgstr "MediaWiki tabel"
 
 #: libraries/export/pdf.php:18
 msgid "PDF"
@@ -6472,7 +6472,7 @@ msgstr ""
 
 #: libraries/export/sql.php:226 libraries/export/sql.php:1185
 msgid "Truncate table before insert"
-msgstr ""
+msgstr "Kärbi tabelit enne lisamist"
 
 #: libraries/export/sql.php:232
 msgid "Instead of <code>INSERT</code> statements, use:"
@@ -6534,8 +6534,8 @@ msgid ""
 "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes "
 "0x616263)</i>"
 msgstr ""
-"Tõmmista binaarsed veerud heksadetsimaalsena <i>(nt \"abc\" salvestatakse "
-"kui 0x616263)</i>"
+"Tõmmista binaarsed veerud heksadetsimaalsena <i>(nt \"abc\" salvestatakse kui "
+"0x616263)</i>"
 
 #: libraries/export/sql.php:302
 msgid ""
@@ -6604,7 +6604,7 @@ msgstr "Ava uus phpMyAdmini aken"
 
 #: libraries/gis_visualization.lib.php:134
 msgid "No data found for GIS visualization."
-msgstr ""
+msgstr "GIS visualiseerimiseks andmeid ei leitud."
 
 #: libraries/header_http.inc.php:15 libraries/header_meta_style.inc.php:15
 msgid "GLOBALS overwrite attempt"
@@ -7030,7 +7030,6 @@ msgid "not OK"
 msgstr "Ei ole korras"
 
 #: libraries/relation.lib.php:80
-#, fuzzy
 #| msgid "OK"
 msgctxt "Correctly working"
 msgid "OK"
@@ -7060,7 +7059,7 @@ msgstr "Veeru kommentaaride näitamine"
 #: libraries/relation.lib.php:116 libraries/tbl_properties.inc.php:136
 #: transformation_overview.php:46
 msgid "Browser transformation"
-msgstr "Browser transformation"
+msgstr "Veebilehitseja transformatsioon"
 
 #: libraries/relation.lib.php:119
 msgid ""
@@ -7320,7 +7319,7 @@ msgstr "Määraja"
 #: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:996
 #: libraries/rte/rte_triggers.lib.php:398
 msgid "The definer must be in the \"username@hostname\" format"
-msgstr "Määraja peab olema \"kasutajanimi@hostinimi\" formaadis"
+msgstr "Määraja peab olema formaadis \"kasutajanimi@hostinimi\""
 
 #: libraries/rte/rte_events.lib.php:525
 msgid "You must provide an event name"
@@ -7975,10 +7974,10 @@ msgid "Table seems to be empty!"
 msgstr "Tabel tundub olevat tühi!"
 
 #: libraries/tbl_links.inc.php:126
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking of %s is activated."
-msgstr "%s.%s jälgimine on aktiveeritud."
+msgstr "%s jälgimine on aktiveeritud."
 
 #: libraries/tbl_properties.inc.php:98
 msgid ""
@@ -7987,10 +7986,10 @@ msgid ""
 "a single quote (\"'\") amongst those values, precede it with a backslash "
 "(for example '\\\\xyz' or 'a\\'b')."
 msgstr ""
-"Kui veeru tüüp on \"enum\" või \"set\", siis palun sisesta väärtused "
-"formaadis: 'a','b','c'...<br />Kui pead nende väärtuste vahele lisama "
-"kurakaldkriipsu (\"\\\") või jutumärgi (\"'\"), siis lisa selle ette "
-"kurakaldkriips (nt '\\\\xyz' või 'a\\'b')."
+"Kui veeru tüüp on \"enum\" või \"set\", siis palun sisesta väärtused formaadis: "
+"'a','b','c'...<br />Kui pead nende väärtuste vahele lisama kurakaldkriipsu "
+"(\"\\\") või jutumärgi (\"'\"), siis lisa selle ette kurakaldkriips (nt '\\\\xyz' "
+"või 'a\\'b')."
 
 #: libraries/tbl_properties.inc.php:99
 msgid ""
@@ -8013,7 +8012,8 @@ msgid ""
 "transformations, click on %stransformation descriptions%s"
 msgstr ""
 "Saadavalolevate transformatsiooni valikute ja nende MIME-tüüpi "
-"transformatsioonide nimekirja jaoks vajuta %stransformatsiooni kirjeldusele%s"
+"transformatsioonide nimekirja jaoks vajuta %stransformatsiooni kirjeldusele%"
+"s"
 
 #: libraries/tbl_properties.inc.php:137
 msgid "Transformation options"
@@ -8137,6 +8137,8 @@ msgid ""
 "Appends text to a string. The only option is the text to be appended "
 "(enclosed in single quotes, default empty string)."
 msgstr ""
+"Lisab teksti sõnesse. Ainus valik on lisatav tekst (ümbritsetud ühekordsete "
+"jutumärkidega, vaikimisi tühi sõne)."
 
 #: libraries/transformations/text_plain__dateformat.inc.php:10
 msgid ""
@@ -8171,6 +8173,17 @@ msgid ""
 "will prevent wrapping and ensure that the output appears all on one line "
 "(Default 1)."
 msgstr ""
+"AINULT LINUXILE: Launches an external application and feeds it the column "
+"data via standard input. Returns the standard output of the application. The "
+"default is Tidy, to pretty-print HTML code. For security reasons, you have "
+"to manually edit the file "
+"libraries/transformations/text_plain__external.inc.php and list the tools "
+"you want to make available. The first option is then the number of the "
+"program you want to use and the second option is the parameters for the "
+"program. The third option, if set to 1, will convert the output using "
+"htmlspecialchars() (Vaikimisi 1). The fourth option, if set to 1, will "
+"prevent wrapping and ensure that the output appears all on one line "
+"(Vaikimisi 1)."
 
 #: libraries/transformations/text_plain__formatted.inc.php:10
 msgid ""
@@ -8203,8 +8216,7 @@ msgstr ""
 msgid ""
 "Converts an (IPv4) Internet network address into a string in Internet "
 "standard dotted format."
-msgstr ""
-"Teisendab (IPv4) interneti võrguaadressi punktidega eraldatud formaati."
+msgstr "Teisendab (IPv4) interneti võrguaadressi punktidega eraldatud formaati."
 
 #: libraries/transformations/text_plain__sql.inc.php:10
 msgid "Formats text as SQL query with syntax highlighting."
@@ -8369,14 +8381,15 @@ 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 ""
-"Sinu PHP parameeter [a@http://php.net/manual/en/session.configuration."
-"php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] on väiksem, kui "
-"phpMyAdminis seadistatud küpsise kehtivus. Seetõttu sinu sisselogimine aegub "
-"varem, kui phpMyAdminis seadistatud."
+"Sinu PHP parameeter "
+"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-"
+"maxlifetime@]session.gc_maxlifetime[/a] on väiksem, kui phpMyAdminis "
+"seadistatud küpsise kehtivus. Seetõttu sinu sisselogimine aegub varem, kui "
+"phpMyAdminis seadistatud."
 
 #: main.php:299
 msgid ""
@@ -8408,8 +8421,8 @@ msgid ""
 "extended features have been deactivated. To find out why click %shere%s."
 msgstr ""
 "phpMyAdmini seadistuse salvestus ei ole lõplikult seadistatud, mõned "
-"laiendatud võimalused on aktiveerimata. Põhjuse saad teada, kui vajutad "
-"%ssiia%s."
+"laiendatud võimalused on aktiveerimata. Põhjuse saad teada, kui vajutad %"
+"ssiia%s."
 
 #: main.php:346
 #, php-format
@@ -8426,8 +8439,8 @@ msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
 "issues."
 msgstr ""
-"Server töötab koos Suhosin'iga. Võimalike probleemide kohta loe "
-"%sdokumentatsioonist%s."
+"Server töötab koos Suhosin'iga. Võimalike probleemide kohta loe %"
+"sdokumentatsioonist%s."
 
 #: navigation.php:175 server_databases.php:299 server_synchronize.php:1376
 msgid "No databases"
@@ -8745,12 +8758,12 @@ msgid "No databases selected."
 msgstr "Ühtegi andmebaasi ei ole valitud."
 
 #: server_databases.php:99
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
-msgstr[0] "%s andmebaas(i) kustutati edukalt."
-msgstr[1] "%s andmebaas(i) kustutati edukalt."
+msgstr[0] "%1$d andmebaas kustutati edukalt."
+msgstr[1] "%1$d andmebaasi kustutati edukalt."
 
 #: server_databases.php:119
 msgid "Databases statistics"
@@ -8924,7 +8937,8 @@ msgstr ""
 #: server_privileges.php:785
 msgid "Limits the number of queries the user may send to the server per hour."
 msgstr ""
-"Piirab päringute hulka, mida kasutaja võib tunni aja jooksul serverile saata."
+"Piirab päringute hulka, mida kasutaja võib tunni aja jooksul serverile "
+"saata."
 
 #: server_privileges.php:112 server_privileges.php:789
 #: server_privileges.php:791
@@ -9023,7 +9037,7 @@ msgstr "Tabelipõhised õigused"
 #: server_privileges.php:604 server_privileges.php:756
 #: server_privileges.php:1821
 msgid "Note: MySQL privilege names are expressed in English"
-msgstr "Märkus: MySQL õigused on inglise keelsed"
+msgstr "Märkus: MySQL õigused on inglisekeelsed"
 
 #: server_privileges.php:681
 msgid "Administration"
@@ -9043,8 +9057,7 @@ msgstr "Ressursi piirangud"
 
 #: server_privileges.php:780
 msgid "Note: Setting these options to 0 (zero) removes the limit."
-msgstr ""
-"Märkus: Nende valikute muutmisel väärtuseks 0 (null) eemaldab piirangu."
+msgstr "Märkus: Nende valikute muutmisel väärtuseks 0 (null) eemaldab piirangu."
 
 #: server_privileges.php:858
 msgid "Login Information"
@@ -9112,10 +9125,9 @@ msgid "Revoke"
 msgstr "Tühista"
 
 #: server_privileges.php:1543
-#, fuzzy
 #| msgid "Export"
 msgid "Export all"
-msgstr "Ekspordi"
+msgstr "Ekspordi kõik"
 
 #: server_privileges.php:1562 server_privileges.php:1844
 #: server_privileges.php:2476
@@ -9123,16 +9135,15 @@ msgid "Any"
 msgstr "Kõik"
 
 #: server_privileges.php:1642
-#, fuzzy
 #| msgid "Privileges"
 msgid "Privileges for all users"
-msgstr "Õigused"
+msgstr "Kõikide kasutajate õigused"
 
 #: server_privileges.php:1654
-#, fuzzy, php-format
+#, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
-msgstr "Õigused"
+msgstr "%s õigused"
 
 #: server_privileges.php:1682
 msgid "Users overview"
@@ -9217,8 +9228,7 @@ msgstr "... tühista eelmise kõik aktiivsed õigused ja seejärel kustuta see."
 msgid ""
 "... delete the old one from the user tables and reload the privileges "
 "afterwards."
-msgstr ""
-"... kustuta eelmine kasutajate tabelist ja seejärel lae õigused uuesti."
+msgstr "... kustuta eelmine kasutajate tabelist ja seejärel lae õigused uuesti."
 
 #: server_privileges.php:2355
 msgid "Database for user"
@@ -9300,8 +9310,8 @@ msgid ""
 "This server is not configured as master in a replication process. Would you "
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
-"See server ei ole paljundamisel seatud ülemaks. Kas soovid seda <a href=\"%s"
-"\">teha</a>?"
+"See server ei ole paljundamisel seatud ülemaks. Kas soovid seda <a href=\"%"
+"s\">teha</a>?"
 
 #: server_replication.php:247
 msgid "Master configuration"
@@ -9347,8 +9357,8 @@ msgid ""
 "master"
 msgstr ""
 "Kui oled taaskäivitanud MySQL serveri, siis palun vajuta Mine nuppu. "
-"Seejärel peaksid nägema sõnumeid, mis teavitavad sind, et see server <b>on</"
-"b> seadistatud ülemaks"
+"Seejärel peaksid nägema sõnumeid, mis teavitavad sind, et see server "
+"<b>on</b> seadistatud ülemaks"
 
 #: server_replication.php:323
 msgid "Slave SQL Thread not running!"
@@ -9566,7 +9576,8 @@ msgid ""
 "system."
 msgstr ""
 "Pane tähele, et kuigi see süsteem annab soovitusi lihtsate arvutuste alusel, "
-"siiski rusikareegel on, et need ei pruugi tingimata su süsteemile rakenduda."
+"on siiski rusikareegel, et need ei pruugi tingimata su süsteemile "
+"rakenduda."
 
 #: server_status.php:905
 msgid ""
@@ -9618,8 +9629,8 @@ msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
-"See MySQL server töötab <b>paljundamisel</b> <b>ülemana</b> ja <b>alluvana</"
-"b>."
+"See MySQL server töötab <b>paljundamisel</b> <b>ülemana</b> ja "
+"<b>alluvana</b>."
 
 #: server_status.php:1063
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
@@ -9771,6 +9782,9 @@ msgid ""
 "table with a given name. This is called discovery. Handler_discover "
 "indicates the number of time tables have been discovered."
 msgstr ""
+"MySQL server saab pärida NDB Cluster varundusmootorit, kui ta teab antud "
+"nimega tabelit. Seda nimetatakse avastamiseks. Handler_discover näitab, mitu "
+"korda on tabeleid avastatud."
 
 #: server_status.php:1309
 msgid ""
@@ -9816,8 +9830,8 @@ msgid ""
 msgstr ""
 "Fikseeritud asukohal põhineva rea lugemise taotluste hulk. See on kõrge, kui "
 "teed palju päringuid, mis vajavad tulemuste sorteerimist. Tõenäoliselt teed "
-"palju päringuid, millega peab MySQL kontrolliga terveid tabeleid või kasutad "
-"liitmisi, mis ei kasuta võtmeid korralikult."
+"palju päringuid, millega peab MySQL kontrolliga terveid tabeleid või "
+"kasutad liitmisi, mis ei kasuta võtmeid korralikult."
 
 #: server_status.php:1314
 msgid ""
@@ -9876,6 +9890,10 @@ msgid ""
 "be calculated as Innodb_buffer_pool_pages_total - "
 "Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data."
 msgstr ""
+"Lehtede hulk, mis on hõivatud administratiivse ballasti tõttu (nt ridade "
+"lukustamised või adaptiivne räsi indeks). Seda väärtust saab arvutada ka "
+"valemiga Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - "
+"Innodb_buffer_pool_pages_data."
 
 #: server_status.php:1324
 msgid "Total size of buffer pool, in pages."
@@ -9886,8 +9904,8 @@ msgid ""
 "The number of \"random\" read-aheads InnoDB initiated. This happens when a "
 "query is to scan a large portion of a table but in random order."
 msgstr ""
-"InnoDB algatatud \"juhuslike\" ettelugemiste hulk. See juhtub siis, kui "
-"päring peab kontrollima palju tabeleid, aga juhuslikus järjekorras."
+"InnoDB algatatud \"juhuslike\" ettelugemiste hulk. See juhtub siis, kui päring "
+"peab kontrollima palju tabeleid, aga juhuslikus järjekorras."
 
 #: server_status.php:1326
 msgid ""
@@ -9989,7 +10007,7 @@ msgstr "fsync() poolt logi failisse tehtud kirjutamiste hulk."
 
 #: server_status.php:1345
 msgid "The number of pending log file fsyncs."
-msgstr ""
+msgstr "Järjekorras olevate logifailide fsync() operatsioonide hulk."
 
 #: server_status.php:1346
 msgid "Pending log file writes."
@@ -10082,10 +10100,9 @@ msgstr ""
 "olnud."
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid "Percentage of used open files limit"
 msgid "Percentage of used key cache (calculated value)"
-msgstr "Kasutatud avatud failide protsendi piirang"
+msgstr "Kasutatud võtme puhvri protsent (arvutatud väärtus)"
 
 #: server_status.php:1365
 msgid "The number of requests to read a key block from the cache."
@@ -10106,6 +10123,8 @@ msgid ""
 "Key cache miss calculated as rate of physical reads compared to read "
 "requests (calculated value)"
 msgstr ""
+"Võtme puhvri puudujäägi arvutamisel võrreldakse füüsilisi lugemisi lugemise "
+"taotlustega (arvutatud väärtus)"
 
 #: server_status.php:1368
 msgid "The number of requests to write a key block to the cache."
@@ -10119,6 +10138,8 @@ msgstr "Kettale võtmeploki füüsiliste kirjutamiste hulk."
 msgid ""
 "Percentage of physical writes compared to write requests (calculated value)"
 msgstr ""
+"Füüsiliste kirjutamiste ja kirjutamise taotluste võrdlemise protsent "
+"(arvutatud väärtus)"
 
 #: server_status.php:1371
 msgid ""
@@ -10343,10 +10364,9 @@ msgstr ""
 "märkimisväärset jõudluse kasvu, kui sul on hea lõimu kasutus.)"
 
 #: server_status.php:1406
-#, fuzzy
 #| msgid "Thread cache hit rate %%"
 msgid "Thread cache hit rate (calculated value)"
-msgstr "Lõimu puhvri kasutushulga %%"
+msgstr "Lõimu puhvri kasutushulk (arvutatud väärtus)"
 
 #: server_status.php:1407
 msgid "The number of threads that are not sleeping."
@@ -10410,8 +10430,8 @@ msgid ""
 msgstr ""
 "phpMyAdmini jälgija saab anda sulle soovitusi serveri seadistuse "
 "optimeerimise kohta ning jälgida ajakulukaid päringuid. Hiljem võib sul vaja "
-"minna muuta log_output väärtuseks 'TABLE' ning lubada kas slow_query_log või "
-"general_log. Pane siiski tähele, et general_log toodab palju andmeid ja "
+"minna muuta log_output väärtuseks 'TABLE' ning lubada kas slow_query_log "
+"või general_log. Pane siiski tähele, et general_log toodab palju andmeid ja "
 "suurendab serveri laadimisaega kuni 15%"
 
 #: server_status.php:1612
@@ -10700,9 +10720,10 @@ msgid ""
 "level directory as described in [a@Documentation.html#setup_script]"
 "documentation[/a]. Otherwise you will be only able to download or display it."
 msgstr ""
-"Palun loo phpMyAdmini juurkataloogi veebiserveri jaoks kirjutatav [em]config"
-"[/em] kaust, nagu on kirjeldatud [a@Documentation.html#setup_script]"
-"dokumentatsioonis[/a]. Muul juhul saad seda ainult alla laadida või vaadata."
+"Palun loo phpMyAdmini juurkataloogi veebiserveri jaoks kirjutatav "
+"[em]config[/em] kaust, nagu on kirjeldatud "
+"[a@Documentation.html#setup_script]dokumentatsioonis[/a]. Muul juhul saad "
+"seda ainult alla laadida või vaadata."
 
 #: setup/frames/index.inc.php:57
 msgid ""
@@ -10718,8 +10739,8 @@ msgid ""
 "If your server is also configured to accept HTTPS requests follow [a@%s]this "
 "link[/a] to use a secure connection."
 msgstr ""
-"Kui sinu server on seadistatud nõustuma ka HTTPS taotlustega, siis ava [a@%s]"
-"see link[/a], et teada saada, kuidas kasutada turvalist ühendust."
+"Kui sinu server on seadistatud nõustuma ka HTTPS taotlustega, siis ava [a@%"
+"s]see link[/a], et teada saada, kuidas kasutada turvalist ühendust."
 
 #: setup/frames/index.inc.php:65
 msgid "Insecure connection"
@@ -10901,8 +10922,7 @@ msgstr ""
 #: setup/lib/index.lib.php:277
 #, php-format
 msgid "This %soption%s should be enabled if your web server supports it."
-msgstr ""
-"Kui su veebiserver seda toetab, siis see %svalik%s peaks olema lubatud."
+msgstr "Kui su veebiserver seda toetab, siis see %svalik%s peaks olema lubatud."
 
 #: setup/lib/index.lib.php:279
 #, php-format
@@ -10951,8 +10971,8 @@ msgid ""
 "protection may not be reliable if your IP belongs to an ISP where thousands "
 "of users, including you, are connected to."
 msgstr ""
-"Kui tunned, et see on vajalik, siis kasuta täiendavaid kaitse sätteid - "
-"%shostiga autentimise%s sätteid ja %susaldusväärsete prokside nimekirja%s. "
+"Kui tunned, et see on vajalik, siis kasuta täiendavaid kaitse sätteid - %"
+"shostiga autentimise%s sätteid ja %susaldusväärsete prokside nimekirja%s. "
 "Siiski ei pruugi IP-põhine kaitse olla usaldusväärne, kui sinu IP kuulub "
 "ISP'le, kellega on ühendatud koos sinuga tuhandeid kasutajaid."
 
@@ -10968,8 +10988,8 @@ msgstr ""
 "Sa valisid [kbd]config[/kbd] autentimise tüübi ja kaasasid automaatsele "
 "sisselogimisele kasutajanime ja parooli, mis ei ole soovitatav valik "
 "liinilolevatele hostidele. Kõik, kes teavad või arvavad ära sinu phpMyAdmini "
-"URL'i, saavad otse ligipääsu sinu phpMyAdmini paneelile. Määra %sautentimise "
-"tüübiks%s [kbd]cookie[/kbd] või [kbd]http[/kbd]."
+"URL'i, saavad otse ligipääsu sinu phpMyAdmini paneelile. Määra %"
+"sautentimise tüübiks%s [kbd]cookie[/kbd] või [kbd]http[/kbd]."
 
 #: setup/lib/index.lib.php:291
 #, php-format
@@ -11106,22 +11126,22 @@ msgstr "Jätka %s rea lisamist"
 #: tbl_chart.php:81
 msgctxt "Chart type"
 msgid "Bar"
-msgstr "Riba"
+msgstr "Lint"
 
 #: tbl_chart.php:83
 msgctxt "Chart type"
 msgid "Column"
-msgstr "Veerg"
+msgstr "Tulp"
 
 #: tbl_chart.php:85
 msgctxt "Chart type"
 msgid "Line"
-msgstr "Graafik"
+msgstr "Joon"
 
 #: tbl_chart.php:87
 msgctxt "Chart type"
 msgid "Spline"
-msgstr "Spline"
+msgstr "Sujuvjoon"
 
 #: tbl_chart.php:89
 msgctxt "Chart type"
@@ -11146,7 +11166,7 @@ msgstr "Seeria:"
 
 #: tbl_chart.php:118
 msgid "The remaining columns"
-msgstr "Järelejäänud veerud"
+msgstr "Ülejäänud veerud"
 
 #: tbl_chart.php:131
 msgid "X-Axis label:"
@@ -11180,7 +11200,7 @@ msgstr "Vaata tabeli tõmmist (skeemi)"
 
 #: tbl_gis_visualization.php:104
 msgid "Display GIS Visualization"
-msgstr ""
+msgstr "Näita GIS visualiseerimist"
 
 #: tbl_gis_visualization.php:120
 msgid "Width"
@@ -11402,7 +11422,7 @@ msgstr "Rea pikkus"
 
 #: tbl_printview.php:373 tbl_structure.php:898
 msgid "Row size"
-msgstr "rea suurus"
+msgstr "Rea laius"
 
 #: tbl_printview.php:383 tbl_structure.php:906
 msgid "Next autoindex"
@@ -11542,22 +11562,22 @@ msgid "Tracking report for table `%s`"
 msgstr "`%s` tabeli jälgimise raport"
 
 #: tbl_tracking.php:174
-#, fuzzy, php-format
+#, php-format
 #| msgid "Version %s is created, tracking for %s.%s is activated."
 msgid "Version %1$s was created, tracking for %2$s is active."
-msgstr "Versioon %s on loodud, %s.%s jälgimine on aktiveeritud."
+msgstr "Versioon %1$s on loodud, %2$s jälgimine on aktiveeritud."
 
 #: tbl_tracking.php:186
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking for %1$s was deactivated at version %2$s."
-msgstr "%s.%s jälgimine on aktiveeritud."
+msgstr "%1$s jälgimine deaktiveeriti versioonil %2$s."
 
 #: tbl_tracking.php:198
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking for %1$s was activated at version %2$s."
-msgstr "%s.%s jälgimine on aktiveeritud."
+msgstr "%1$s jälgimine aktiveeriti versioonil %2$s."
 
 #: tbl_tracking.php:211
 msgid "SQL statements executed."
@@ -11601,10 +11621,10 @@ msgid "Tracking statements"
 msgstr "Jälgimise käsud"
 
 #: tbl_tracking.php:445 tbl_tracking.php:573
-#, fuzzy, php-format
+#, php-format
 #| msgid "Show %s with dates from %s to %s by user %s %s"
 msgid "Show %1$s with dates from %2$s to %3$s by user %4$s %5$s"
-msgstr "Näita %s koos kuupäevadega alates %s kuni %s kasutajaks %s %s"
+msgstr "Näita %1$s koos kuupäevadega alates %2$s kuni %3$s kasutajaks %4$s %5$s"
 
 #: tbl_tracking.php:450
 msgid "Delete tracking data row from report"
@@ -11652,30 +11672,30 @@ msgid "Show versions"
 msgstr "Näita versioone"
 
 #: tbl_tracking.php:714
-#, fuzzy, php-format
+#, php-format
 #| msgid "Deactivate tracking for %s.%s"
 msgid "Deactivate tracking for %s"
-msgstr "Deaktiveeri %s.%s jälgimine"
+msgstr "Deaktiveeri %s jälgimine"
 
 #: tbl_tracking.php:716
 msgid "Deactivate now"
 msgstr "Deaktiveeri kohe"
 
 #: tbl_tracking.php:727
-#, fuzzy, php-format
+#, php-format
 #| msgid "Activate tracking for %s.%s"
 msgid "Activate tracking for %s"
-msgstr "Aktiveeri %s.%s jälgimine"
+msgstr "Aktiveeri %s jälgimine"
 
 #: tbl_tracking.php:729
 msgid "Activate now"
 msgstr "Aktiveeri kohe"
 
 #: tbl_tracking.php:742
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create version %s of %s.%s"
 msgid "Create version %1$s of %2$s"
-msgstr "Loo versioon %s, %s.%s"
+msgstr "Loo versioon %1$s, %2$s"
 
 #: tbl_tracking.php:746
 msgid "Track these data definition statements:"
@@ -11691,8 +11711,7 @@ msgstr "Loo versioon"
 
 #: tbl_zoom_select.php:236
 msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Teosta kahe erineva veergu jaoks \"päring näite alusel\" (metamärk: \"%\")"
+msgstr "Teosta kahe erineva veergu jaoks \"päring näite alusel\" (metamärk: \"%\")"
 
 #: tbl_zoom_select.php:246
 msgid "Additional search criteria"
@@ -11953,7 +11972,7 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:103
 msgid "'source' found in version_comment"
-msgstr ""
+msgstr "'source' leitud kohas version_comment"
 
 #: libraries/advisory_rules.txt:108 libraries/advisory_rules.txt:115
 msgid "The MySQL manual only is accurate for official MySQL binaries."
@@ -11966,7 +11985,7 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:110
 msgid "'percona' found in version_comment"
-msgstr ""
+msgstr "'percona' leitud kohas version_comment"
 
 #: libraries/advisory_rules.txt:116
 msgid "Drizzle documentation is at http://docs.drizzle.org/"
@@ -12042,9 +12061,9 @@ msgid ""
 "cache, especially if you have multiple slaves."
 msgstr ""
 "Sa kasutad MySQL päringu puhvrit küllaltki suure liiklusega andmebaasis. "
-"Tasub kaaluda MySQL päringu puhvri asemel kasutada <a href=\"http://dev."
-"mysql.com/doc/refman/5.5/en/ha-memcached.html\">mälu puhvrit</a>, eriti, kui "
-"sul on palju alluvaid."
+"Tasub kaaluda MySQL päringu puhvri asemel kasutada <a "
+"href=\"http://dev.mysql.com/doc/refman/5.5/en/ha-memcached.html\">mälu "
+"puhvrit</a>, eriti, kui sul on palju alluvaid."
 
 #: libraries/advisory_rules.txt:142
 #, php-format
@@ -12096,8 +12115,8 @@ msgid ""
 "The current ratio of free query cache memory to total query cache size is %s"
 "%%. It should be above 80%%"
 msgstr ""
-"Praegune vaba päringu puhvri mälu võrreldes päringu puhvri kogumahuga on %s"
-"%%. See peaks olema üle 80%%"
+"Praegune vaba päringu puhvri mälu võrreldes päringu puhvri kogumahuga on %s%"
+"%. See peaks olema üle 80%%"
 
 #: libraries/advisory_rules.txt:158
 msgid "Query cache fragmentation"
@@ -12118,6 +12137,14 @@ msgid ""
 "using this formula: (query_cache_size - qcache_free_memory) / "
 "qcache_queries_in_cache"
 msgstr ""
+"Severe fragmentation is likely to (further) increase Qcache_lowmem_prunes. "
+"This might be caused by many Query cache low memory prunes due to "
+"{query_cache_size} being too small. For a immediate but short lived fix you "
+"can flush the query cache (might lock the query cache for a long time). "
+"Carefully adjusting {query_cache_min_res_unit} to a lower value might help "
+"too, e.g. you can set it to the average size of your queries in the cache "
+"using this formula: (query_cache_size - qcache_free_memory) / "
+"qcache_queries_in_cache"
 
 #: libraries/advisory_rules.txt:163
 #, php-format
@@ -12132,7 +12159,7 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:165
 msgid "Query cache low memory prunes"
-msgstr ""
+msgstr "Query cache low memory prunes"
 
 #: libraries/advisory_rules.txt:168
 msgid ""
@@ -12300,7 +12327,8 @@ msgstr ""
 #, php-format
 msgid "Table joins average: %s, this value should be less than 1 per hour"
 msgstr ""
-"Tabeli liitmiste keskmine: %s. See väärtus peaks ühe tunni kohta olema alla 1"
+"Tabeli liitmiste keskmine: %s. See väärtus peaks ühe tunni kohta olema alla "
+"1"
 
 #: libraries/advisory_rules.txt:217
 msgid "Rate of reading first index entry"
@@ -12418,8 +12446,7 @@ msgstr "Kettal asuvate ajutiste tabelite protsent"
 msgid ""
 "Many temporary tables are being written to disk instead of being kept in "
 "memory."
-msgstr ""
-"Paljud ajutised tabelid on mälus säilitamise asemel kirjutatud kettale."
+msgstr "Paljud ajutised tabelid on mälus säilitamise asemel kirjutatud kettale."
 
 #: libraries/advisory_rules.txt:250
 msgid ""
@@ -12435,9 +12462,9 @@ msgstr ""
 "mõned ajutised tabelid kirjutatakse alati kettale, sõltumata nende muutujate "
 "väärtusest. Nende kõrvaldamiseks pead oma päringud ümber kirjutama, et "
 "vältida taolisi tingimusi (ajutises tabelis: BLOB või TEXT veeruga või üle "
-"512 baidise veeruga), mida on mainitud <a href=\"http://www.facebook.com/"
-"note.php?note_id=10150111255065841&comments\"> Pythian Group artikli</a> "
-"alguses"
+"512 baidise veeruga), mida on mainitud <a "
+"href=\"http://www.facebook.com/note.php?note_id=10150111255065841&comments\"> "
+"Pythian Group artikli</a> alguses"
 
 #: libraries/advisory_rules.txt:251
 #, php-format
@@ -12466,8 +12493,9 @@ msgstr ""
 "mõned ajutised tabelid kirjutatakse alati kettale, sõltumata nende muutujate "
 "väärtusest. Nende vältimiseks pead oma päringud üle kirjutama, et vältida "
 "taolisi tingimusi (ajutises tabelis: BLOB või TEXT veeruga või üle 512 "
-"baidise veeruga), mida on mainitud <a href=\"http://dev.mysql.com/doc/"
-"refman/5.5/en/internal-temporary-tables.html\">MySQL dokumentatsioonis</a>"
+"baidise veeruga), mida on mainitud <a "
+"href=\"http://dev.mysql.com/doc/refman/5.5/en/internal-temporary-"
+"tables.html\">MySQL dokumentatsioonis</a>"
 
 #: libraries/advisory_rules.txt:258
 #, php-format
@@ -12534,7 +12562,8 @@ msgstr "Kasutatud MyISAM võtme puhvri protsent"
 #, php-format
 msgid "%% MyISAM key buffer used: %s%%, this value should be above 95%%"
 msgstr ""
-"Kasutatud MyISAM võtme puhvri %%: %s%%. See väärtus peaks olema vähemalt 95%%"
+"Kasutatud MyISAM võtme puhvri %%: %s%%. See väärtus peaks olema vähemalt 95%"
+"%"
 
 #: libraries/advisory_rules.txt:295
 msgid "Percentage of index reads from memory"
@@ -12613,8 +12642,7 @@ msgstr "Failide avamise hulk on kõrge."
 #: libraries/advisory_rules.txt:323
 #, php-format
 msgid "Opened files rate: %s, this value should be less than 5 per hour"
-msgstr ""
-"Avatud failide hulk: %s. See väärtus peaks ühe tunni kohta olema alla 5"
+msgstr "Avatud failide hulk: %s. See väärtus peaks ühe tunni kohta olema alla 5"
 
 #: libraries/advisory_rules.txt:325
 #, php-format
@@ -12699,6 +12727,8 @@ msgid ""
 "This generally happens in case of general system overload as it is pretty "
 "simple operations. You might want to monitor your system load carefully."
 msgstr ""
+"This generally happens in case of general system overload as it is pretty "
+"simple operations. You might want to monitor your system load carefully."
 
 #: libraries/advisory_rules.txt:358
 #, php-format
@@ -12770,8 +12800,8 @@ msgid ""
 "source-of-aborted_connects/\">This article</a> might help you track down the "
 "source."
 msgstr ""
-"Ühendused tavaliselt katkestatakse siis, kui nad ei saa autenditud. <a href="
-"\"http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-"
+"Ühendused tavaliselt katkestatakse siis, kui nad ei saa autenditud. <a "
+"href=\"http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-"
 "source-of-aborted_connects/\">See artikkel</a> võib aidata sul allikat leida."
 
 #: libraries/advisory_rules.txt:381
@@ -12814,8 +12844,8 @@ msgstr ""
 #, php-format
 msgid "%s%% of all clients are aborted. This value should be below 2%%"
 msgstr ""
-"%s%% kõikidest klientides on lahti ühendatud. See väärtus peaks olema alla "
-"2%%"
+"%s%% kõikidest klientides on lahti ühendatud. See väärtus peaks olema alla 2"
+"%%"
 
 #: libraries/advisory_rules.txt:397
 msgid "Rate of aborted clients"
@@ -12875,9 +12905,9 @@ msgstr ""
 "palju suurem 256-st MiB-st. Kuid palun pane tähele, et sa ei saa niisama "
 "lihtsalt selle muutuja väärtust muuta. Sa pead sulgema serveri, kustutama "
 "InnoDB logi failid, määrama my.cnf failis uue väärtuse, käivitama serveri ja "
-"siis kontrollima logisid, et kas kõik läks hästi. Vaata ka <a href=\"http://"
-"mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-"
-"proper-way.html\">selle blogi sissekannet</a>"
+"siis kontrollima logisid, et kas kõik läks hästi. Vaata ka <a "
+"href=\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-"
+"innodblogfilesize-proper-way.html\">selle blogi sissekannet</a>"
 
 #: libraries/advisory_rules.txt:418
 #, php-format
@@ -12911,13 +12941,13 @@ msgid ""
 msgstr ""
 "Tavaliselt piisab innodb_log_file_size väärtuseks 25%% "
 "{innodb_buffer_pool_size} mahust. Väga suur innodb_log_file_size aeglustab "
-"tunduvalt andmebaasi rikkumisel selle taastamist. Vaata ka <a href=\"http://"
-"www.mysqlperformanceblog.com/2006/07/03/choosing-proper-innodb_log_file_size/"
-"\">seda artiklit</a>. Sa pead sulgema serveri, kustutama InnoDB logi failid, "
-"määrama my.cnf failis uue väärtuse, käivitama serveri ja siis kontrollima "
-"vigade logisid, et kas kõik läks hästi. Vaata ka <a href=\"http://"
-"mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-"
-"proper-way.html\">selle blogi sissekannet</a>"
+"tunduvalt andmebaasi rikkumisel selle taastamist. Vaata ka <a "
+"href=\"http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-"
+"innodb_log_file_size/\">seda artiklit</a>. Sa pead sulgema serveri, kustutama "
+"InnoDB logi failid, määrama my.cnf failis uue väärtuse, käivitama serveri "
+"ja siis kontrollima vigade logisid, et kas kõik läks hästi. Vaata ka <a "
+"href=\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-"
+"innodblogfilesize-proper-way.html\">selle blogi sissekannet</a>"
 
 #: libraries/advisory_rules.txt:425
 #, php-format
@@ -12953,9 +12983,9 @@ msgstr ""
 "pead hoolikalt hindama teiste teenuste ja mitte-InnoDB tabelite mälu "
 "tarbimist ning vastavalt sellele määrama selle muutuja väärtuse. Kui see on "
 "määratud liiga kõrgeks, siis su süsteem hakkab andmeid saalima ning see "
-"vähendab jõudlust oluliselt. Vaata ka <a href=\"http://www."
-"mysqlperformanceblog.com/2007/11/03/choosing-innodb_buffer_pool_size/\">seda "
-"artiklit</a>"
+"vähendab jõudlust oluliselt. Vaata ka <a "
+"href=\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-"
+"innodb_buffer_pool_size/\">seda artiklit</a>"
 
 #: libraries/advisory_rules.txt:432
 #, php-format
@@ -12985,8 +13015,9 @@ msgid ""
 "refman/5.5/en/concurrent-inserts.html\">MySQL Documentation</a>"
 msgstr ""
 "Määrates {concurrent_insert} väärtuseks 1, väheneb antud tabelis konkurents "
-"lugejate ja kirjutajate vahel. Vaata ka <a href=\"http://dev.mysql.com/doc/"
-"refman/5.5/en/concurrent-inserts.html\">MySQL dokumentatsiooni</a>"
+"lugejate ja kirjutajate vahel. Vaata ka <a "
+"href=\"http://dev.mysql.com/doc/refman/5.5/en/concurrent-inserts.html\">MySQL "
+"dokumentatsiooni</a>"
 
 #: libraries/advisory_rules.txt:441
 msgid "concurrent_insert is set to 0"
@@ -12997,9 +13028,9 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "phpMyAdmin functionality will be missing. For example navigation frame "
 #~ "will not refresh automatically."
 #~ msgstr ""
-#~ "Javascripti tugi puudub või on sinu veebilehitsejas keelatud ning "
-#~ "seetõttu mõni phpMyAdmini funktsionaalsus ei toimi. Näiteks navigeerimise "
-#~ "raam ei uuene automaatselt."
+#~ "Javascripti tugi puudub või on sinu veebilehitsejas keelatud ning seetõttu "
+#~ "mõni phpMyAdmini funktsionaalsus ei toimi. Näiteks navigeerimise raam ei "
+#~ "uuene automaatselt."
 
 #~ msgid "Add a value"
 #~ msgstr "Lisa väärtus"
@@ -13107,8 +13138,8 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "removed after this time, unless they are referenced by a record in the "
 #~ "database."
 #~ msgstr ""
-#~ "Ajutiste BLOB'ide ooteaeg sekundites. Kui andmebaasis puudub viide "
-#~ "nendeni, siis üleslaetud BLOB andmed kustutatakse pärast seda aega."
+#~ "Ajutiste BLOB'ide ooteaeg sekundites. Kui andmebaasis puudub viide nendeni, "
+#~ "siis üleslaetud BLOB andmed kustutatakse pärast seda aega."
 
 #~ msgid "Temp Log Threshold"
 #~ msgstr "Ajutise logi maht"
@@ -13118,9 +13149,8 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "to indicate the unit of the value. A value in bytes is assumed when no "
 #~ "unit is specified."
 #~ msgstr ""
-#~ "Ajutise BLOB logifaili maksimaalne maht. Võid väärtuse ühikuna kasutada "
-#~ "Kb, MB või GB. Kui ühikut pole täpsustatud, siis eeldatakse, et see on "
-#~ "baitides."
+#~ "Ajutise BLOB logifaili maksimaalne maht. Võid väärtuse ühikuna kasutada Kb, "
+#~ "MB või GB. Kui ühikut pole täpsustatud, siis eeldatakse, et see on baitides."
 
 #~ msgid "Max Keep Alive"
 #~ msgstr "Maksimaalne liinilhoidmise aeg"
@@ -13190,7 +13220,7 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ msgstr "Muuda indeksit"
 
 #~ msgid "Column count has to be larger than zero."
-#~ msgstr "Veergude hulk peab olema nullist suurem."
+#~ msgstr "Veergude arv peab olema nullist suurem."
 
 #~ msgid "+ Restart insertion and add a new value"
 #~ msgstr "+ Ava lisamine uuesti ja lisa uus väärtus"
@@ -13205,23 +13235,23 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates "
 #~ "maximum number for which vertical model is used"
 #~ msgstr ""
-#~ "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] või number, mis näitab "
-#~ "suurimat numbrit, mida vertikaalne mudel kasutab"
+#~ "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] või number, mis näitab suurimat "
+#~ "numbrit, mida vertikaalne mudel kasutab"
 
 #~ msgid "Display direction for altering/creating columns"
 #~ msgstr "Näita veergude muutmise/loomise suunda"
 
 #~ msgid "Create table on database %s"
-#~ msgstr "Loo tabel andmebaasi %s"
+#~ msgstr "Loo uus tabel andmebaasi %s"
 
 #~ msgid "Data Label"
 #~ msgstr "Andmete nimi"
 
 #~ msgid "Location of the text file"
-#~ msgstr "Tekstifaili asukoht"
+#~ msgstr "tekstifaili asukoht"
 
 #~ msgid "MySQL charset"
-#~ msgstr "MySQL'i märgitabel"
+#~ msgstr "MySQLi tähetabel"
 
 #~ msgid "MySQL client version"
 #~ msgstr "MySQL kliendi versioon"
@@ -13234,9 +13264,9 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "column, click the \"Choose column to display\" icon, then click on the "
 #~ "appropriate column name."
 #~ msgstr ""
-#~ "Näidatavad veerud näidatakse roosana. Näidatava veeru määramiseks/"
-#~ "tühistamiseks vajuta \"Vali veerg, mida näidata\" ikoonile ja siis vajuta "
-#~ "sobivale veeru nimele."
+#~ "Näidatavad veerud näidatakse roosana. Näidatava veeru "
+#~ "määramiseks/tühistamiseks vajuta \"Vali veerg, mida näidata\" ikoonile ja siis "
+#~ "vajuta sobivale veeru nimele."
 
 #~ msgid "memcached usage"
 #~ msgstr "mälupuhvri kasutus"
@@ -13291,8 +13321,8 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "No themes support; please check your configuration and/or your themes in "
 #~ "directory %s."
 #~ msgstr ""
-#~ "Välimuste tugi puudub. Palun kontrolli oma seadistust ja/või oma välimusi "
-#~ "kataloogis %s."
+#~ "Teemade tugi puudub, palun kontrollige oma seadeid ja/või oma teemade "
+#~ "kataloogi %s."
 
 #~ msgid "The following queries have been executed:"
 #~ msgstr "Järgnevad päringud on teostatud:"
@@ -13346,7 +13376,7 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ msgstr "rida alates reast #"
 
 #~ msgid "in %s mode and repeat headers after %s cells"
-#~ msgstr "%s ja korda päiseid iga %s rea tagant"
+#~ msgstr "näita %s and korda pealkirju iga %s järel"
 
 #~ msgid "Query \"%s\" failed"
 #~ msgstr "\"%s\" päring ebaõnnestus"
@@ -13359,12 +13389,12 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "a semicolon is missing somewhere.<br />If you receive a blank page, "
 #~ "everything is fine."
 #~ msgstr ""
-#~ "phpMyAdmin ei suutnud lugeda sinu seadistusfaili!<br />See võib juhtuda "
-#~ "siis, kui PHP leiab selles parsimise vea või PHP ei leidnud vajalikku "
-#~ "faili.<br />Palun vali alloleva lingi kaudu seadistusfail otse või loe "
-#~ "PHP  veasõnumeid, mida sulle näidatakse. Enamasti on kuskil puudu "
-#~ "jutumärk või semikoolon.<br />Kui sulle avaneb tühi leht, siis on kõik "
-#~ "korras."
+#~ "phpMyAdmin ei suutnud lugeda Teie konfiguratsioonifaili!<br />See võib "
+#~ "juhtuda kui PHP leiab vea selles või PHP ei leia antud faili üles.<br "
+#~ "/>Palun kutsuge konfiguratsioonifail välja otseselt kasutades linki allpool "
+#~ "ja lugege PHP veateadet(eid) mis teile öeldakse. Enamustel juhtudel on "
+#~ "kuskilt puudu ülakoma või semikoolon.<br />Kui Teile kuvatakse tühi leht on "
+#~ "kõik korras."
 
 #~ msgid "Dropping Event"
 #~ msgstr "Sündmuse kustutamine"
@@ -13373,7 +13403,7 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ msgstr "Toimingu kustutamine"
 
 #~ msgid "Theme / Style"
-#~ msgstr "Välimus / Stiil"
+#~ msgstr "Teema / Stiil"
 
 #~ msgid "seconds"
 #~ msgstr "sekundit"
@@ -13388,11 +13418,11 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ msgstr "Diagrammi kohtspikrite jaoks on vajalik JSON kooder."
 
 #~ msgid "The number of free memory blocks in query cache."
-#~ msgstr "Vabade mäluplokkide hulk päringu puhvris."
+#~ msgstr "Vabad mälu plokid päringute vahemälus."
 
 #~ msgctxt "$strShowStatusReset"
 #~ msgid "Reset"
-#~ msgstr "Lähtesta"
+#~ msgstr "Nulli"
 
 #~ msgid "Show processes"
 #~ msgstr "Näita protsesse"
@@ -13405,15 +13435,15 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "<b>Server traffic</b>: These tables show the network traffic statistics "
 #~ "of this MySQL server since its startup."
 #~ msgstr ""
-#~ "<b>Serveri liiklus</b>: Need tabelid näitavad selle MySQL serveri "
-#~ "võrguliikluse statistikat alates serveri käivitumisest."
+#~ "<b>Serveri liiklus</b>: Need tabelid näitavad võrguliikluse statistikat "
+#~ "selle MySQL serveri jaoks alates tema käivitamisest."
 
 #~ msgid ""
 #~ "<b>Query statistics</b>: Since its startup, %s queries have been sent to "
 #~ "the server."
 #~ msgstr ""
-#~ "<b>Päringu statistika</b>: Alates serveri käivitumisest on saadetud "
-#~ "serverile %s päringut."
+#~ "<b>Päringu statistika</b>: Alates stardist, %s päringut on saadetud "
+#~ "serverile."
 
 #~ msgid "Note: Generating the query chart can take a long time."
 #~ msgstr "Märkus: Päringu diagrammi koostamine võib võtta palju aega."
@@ -13425,8 +13455,8 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "The result of this query can't be used for a chart. See [a@./"
 #~ "Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]"
 #~ msgstr ""
-#~ "Selle päringu tulemust ei saa kasutada diagrammis. Vaata [a@./"
-#~ "Documentation.html#faq6_29@Documentation]KKK 6.29[/a]"
+#~ "Selle päringu tulemust ei saa kasutada diagrammis. Vaata "
+#~ "[a@./Documentation.html#faq6_29@Documentation]KKK 6.29[/a]"
 
 #~ msgid "Title"
 #~ msgstr "Pealkiri"
@@ -13455,16 +13485,14 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 
 #~ msgid ""
 #~ "When drawing a radar chart all values are normalized to a range [0..10]."
-#~ msgstr ""
-#~ "Radari joonistamisel lähtestatakse kõik väärtused [0..10] vahemikku."
+#~ msgstr "Radari joonistamisel lähtestatakse kõik väärtused [0..10] vahemikku."
 
 #~ msgid ""
 #~ "Note that not every result table can be put to the chart. See <a href=\"./"
 #~ "Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>"
 #~ msgstr ""
 #~ "Pane tähele, et igat tulemuse tabelit ei saa lisada diagrammi. Vaata <a "
-#~ "href=\"./Documentation.html#faq6_29\" target=\"Documentation\">KKK 6.29</"
-#~ "a>"
+#~ "href=\"./Documentation.html#faq6_29\" target=\"Documentation\">KKK 6.29</a>"
 
 #~ msgid "Add a New User"
 #~ msgstr "Lisa uus kasutaja"
@@ -13497,10 +13525,10 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ msgstr "Meililist"
 
 #~ msgid "MySQL connection collation"
-#~ msgstr "MySQL ühenduse kodeering"
+#~ msgstr "MySQL ühenduse kollatsioon"
 
 #~ msgid "End"
-#~ msgstr "Viimane"
+#~ msgstr "Lõpp"
 
 #~ msgid "Create new database"
 #~ msgstr "Loo uus andmebaas"
@@ -13515,10 +13543,10 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ msgstr "Kiirmuutmine"
 
 #~ msgid " Row size "
-#~ msgstr " Rea suurus "
+#~ msgstr " rea suurus "
 
 #~ msgid " Show this query here again "
-#~ msgstr " Näita seda päringut siin uuesti "
+#~ msgstr " Näita päringut siin uuesti "
 
 #~ msgid "X Axis label"
 #~ msgstr "X-telje nimi"
@@ -13530,7 +13558,7 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ msgstr "Riba"
 
 #~ msgid "Line"
-#~ msgstr "Graafik"
+#~ msgstr "Joon"
 
 #~ msgid "Pie"
 #~ msgstr "Sektor"
@@ -13539,18 +13567,18 @@ msgstr "concurrent_insert väärtuseks on määratud 0"
 #~ "Enclose table and field names with backquotes <i>(Protects field and "
 #~ "table names formed with special characters or keywords)</i>"
 #~ msgstr ""
-#~ "Aseta tabeli ja väljade nimed alumise ja ülemise jutumärgi vahele <i>"
-#~ "(Kaitseb välja ja tabeli nimesid eriliste sümbolitega või võtmesõnadega "
+#~ "Aseta tabeli ja väljade nimed alumise ja ülemise jutumärgi vahele "
+#~ "<i>(Kaitseb välja ja tabeli nimesid eriliste sümbolitega või võtmesõnadega "
 #~ "vormimise eest)</i>"
 
 #~ msgid "Create a new index"
 #~ msgstr "Loo uus indeks"
 
 #~ msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
-#~ msgstr "Sõna(d) või väärtus(ed), mida otsida (metamärk: \"%\"):"
+#~ msgstr "Sõna(d) või väärtus(ed) otsinguks (lühend: \"%\"):"
 
 #~ msgid "Inside table(s):"
-#~ msgstr "Tabeli(te)st:"
+#~ msgstr "Otsi tabeli(te)st:"
 
 #~ msgid "User overview"
 #~ msgstr "Kasutaja ülevaade"
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 3aa70de28e..0fca09fd3c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-06 13:06+0200\n"
-"PO-Revision-Date: 2012-04-02 12:42+0200\n"
+"PO-Revision-Date: 2012-04-08 07:38+0200\n"
 "Last-Translator: Yuichiro Takahashi <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
 "Language: ja\n"
@@ -108,7 +108,7 @@ msgstr "データベース %1$s を作成しました。"
 
 #: db_datadict.php:49 db_operations.php:390
 msgid "Database comment: "
-msgstr "データベースのコメント"
+msgstr "データベースのコメント: "
 
 #: db_datadict.php:153 libraries/schema/Pdf_Relation_Schema.class.php:1279
 #: libraries/tbl_properties.inc.php:657 tbl_operations.php:366
@@ -245,16 +245,16 @@ msgid "The database name is empty!"
 msgstr "データベース名が空です!"
 
 #: db_operations.php:300
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been renamed to %s"
 msgid "Database %1$s has been renamed to %2$s"
-msgstr "データベース %s の名称を %s に変更しました"
+msgstr "データベース %1$s の名称を %2$s に変更しました"
 
 #: db_operations.php:304
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been copied to %s"
 msgid "Database %1$s has been copied to %2$s"
-msgstr "データベース %s を %s にコピーしました"
+msgstr "データベース %1$s を %2$s にコピーしました"
 
 #: db_operations.php:432
 msgid "Rename database to"
@@ -505,12 +505,12 @@ msgid "Search results for \"<i>%s</i>\" %s:"
 msgstr "\"<i>%s</i>\" の検索結果 %s:"
 
 #: db_search.php:227
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s match inside table <i>%s</i>"
 #| msgid_plural "%s matches inside table <i>%s</i>"
 msgid "%1$s match inside table <i>%2$s</i>"
 msgid_plural "%1$s matches inside table <i>%2$s</i>"
-msgstr[0] "%s 件 (テーブル <i>%s</i>)"
+msgstr[0] "%1$s 件 (テーブル <i>%2$s</i>)"
 
 #: db_search.php:234 libraries/common.lib.php:3147
 #: libraries/common.lib.php:3366 libraries/common.lib.php:3367
@@ -1736,16 +1736,14 @@ msgid "Foreign key check:"
 msgstr "外部キーのチェックを無効にする"
 
 #: js/messages.php:251 libraries/mult_submits.inc.php:317
-#, fuzzy
 #| msgid "Enabled"
 msgid "(Enabled)"
-msgstr "有効"
+msgstr "(有効)"
 
 #: js/messages.php:252 libraries/mult_submits.inc.php:317
-#, fuzzy
 #| msgid "Disabled"
 msgid "(Disabled)"
-msgstr "無効"
+msgstr "(無効)"
 
 #: js/messages.php:255
 msgid "Searching"
@@ -1956,7 +1954,7 @@ msgstr "クリックでカラムを反転/解除"
 
 #: js/messages.php:348
 msgid "Double-click to copy column name"
-msgstr ""
+msgstr "ダブルクリックでカラム名をコピー"
 
 #: js/messages.php:349
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
@@ -1983,20 +1981,18 @@ msgid "Go to link"
 msgstr "リンク先へ移動する"
 
 #: js/messages.php:354
-#, fuzzy
 #| msgid "Column names"
 msgid "Copy column name"
-msgstr "カラム名"
+msgstr "カラム名のコピー"
 
 #: js/messages.php:355
 msgid "Right-click the column name to copy it to your clipboard."
-msgstr ""
+msgstr "右クリックでカラム名をクリップボードにコピーしてください。"
 
 #: js/messages.php:356
-#, fuzzy
 #| msgid "Update row(s)"
 msgid "Show data row(s)"
-msgstr "行の更新"
+msgstr "データ行の表示"
 
 #: js/messages.php:359
 msgid "Generate password"
@@ -2505,7 +2501,7 @@ msgstr "この MySQL サーバは %s ストレージエンジンをサポート�
 
 #: libraries/Table.class.php:329
 msgid "unknown table status: "
-msgstr "不明なテーブルステータス："
+msgstr "不明なテーブルステータス: "
 
 #: libraries/Table.class.php:1125
 msgid "Invalid database"
@@ -2521,10 +2517,10 @@ msgid "Error renaming table %1$s to %2$s"
 msgstr "テーブル名を %1$s から %2$s に変更するときにエラーが発生しました"
 
 #: libraries/Table.class.php:1257
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %s has been renamed to %s"
 msgid "Table %1$s has been renamed to %2$s."
-msgstr "テーブル %s の名称を %s に変更しました"
+msgstr "テーブル %1$s の名称を %2$s に変更しました。"
 
 #: libraries/Table.class.php:1389
 msgid "Could not save table UI preferences"
@@ -2616,10 +2612,9 @@ msgid "Failed to use Blowfish from mcrypt!"
 msgstr "mcrypt から Blowfish を使おうとして失敗しました！"
 
 #: libraries/auth/cookie.auth.lib.php:208 libraries/header.inc.php:90
-#, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point"
-msgstr "クッキーを有効にしてください。"
+msgstr "Javascript を有効にしてください"
 
 #: libraries/auth/cookie.auth.lib.php:227
 msgid "Log in"
@@ -2641,7 +2636,7 @@ msgstr ""
 
 #: libraries/auth/cookie.auth.lib.php:241
 msgid "Server:"
-msgstr "サーバ"
+msgstr "サーバ:"
 
 #: libraries/auth/cookie.auth.lib.php:246
 msgid "Username:"
@@ -2663,9 +2658,7 @@ msgstr "クッキーを有効にしてください。"
 #: libraries/auth/signon.auth.lib.php:236
 msgid ""
 "Login without a password is forbidden by configuration (see AllowNoPassword)"
-msgstr ""
-"パスワード無しログインは設定 (AllowNoPassword 参照) によって禁止されていま"
-"す。"
+msgstr "パスワードなしログインは設定 (AllowNoPassword 参照) によって禁止されています"
 
 #: libraries/auth/cookie.auth.lib.php:610
 #: libraries/auth/signon.auth.lib.php:240
@@ -3206,7 +3199,7 @@ msgstr "リセット"
 
 #: libraries/config/messages.inc.php:17
 msgid "Improves efficiency of screen refresh"
-msgstr "画面更新を改善し効率化します。"
+msgstr "画面更新を改善し効率化します"
 
 #: libraries/config/messages.inc.php:18
 msgid "Enable Ajax"
@@ -6311,25 +6304,25 @@ msgstr "Paul McCullagh 氏による PrimeBase XT ブログ"
 
 #: libraries/export/csv.php:24 libraries/import/csv.php:28
 msgid "Columns separated with:"
-msgstr "カラムの区切り記号"
+msgstr "カラムの区切り記号:"
 
 #: libraries/export/csv.php:25 libraries/import/csv.php:29
 msgid "Columns enclosed with:"
-msgstr "カラム囲み記号"
+msgstr "カラム囲み記号:"
 
 #: libraries/export/csv.php:26 libraries/import/csv.php:30
 msgid "Columns escaped with:"
-msgstr "カラムのエスケープ記号"
+msgstr "カラムのエスケープ記号:"
 
 #: libraries/export/csv.php:27 libraries/import/csv.php:31
 msgid "Lines terminated with:"
-msgstr "行の終端記号"
+msgstr "行の終端記号:"
 
 #: libraries/export/csv.php:28 libraries/export/excel.php:23
 #: libraries/export/htmlword.php:29 libraries/export/latex.php:80
 #: libraries/export/ods.php:24 libraries/export/odt.php:60
 msgid "Replace NULL with:"
-msgstr "NULL の代替文字列"
+msgstr "NULL の代替文字列:"
 
 #: libraries/export/csv.php:29 libraries/export/excel.php:24
 msgid "Remove carriage return/line feed characters within columns"
@@ -6337,7 +6330,7 @@ msgstr "カラム内の改行/復帰文字を削除する"
 
 #: libraries/export/excel.php:33
 msgid "Excel edition:"
-msgstr "Excel のエディション"
+msgstr "Excel のエディション:"
 
 #: libraries/export/htmlword.php:28 libraries/export/latex.php:70
 #: libraries/export/odt.php:56 libraries/export/sql.php:222
@@ -6457,7 +6450,7 @@ msgstr "データベースの作成日時、最終更新日時、最終検査日
 #: libraries/export/sql.php:100
 msgid ""
 "Database system or older MySQL server to maximize output compatibility with:"
-msgstr "他のデータベースシステムまたは古い MySQL サーバとの互換性"
+msgstr "他のデータベースシステムまたは古い MySQL サーバとの互換性:"
 
 #: libraries/export/sql.php:114 libraries/export/sql.php:173
 #: libraries/export/sql.php:180
@@ -6479,7 +6472,7 @@ msgstr ""
 
 #: libraries/export/sql.php:226 libraries/export/sql.php:1185
 msgid "Truncate table before insert"
-msgstr ""
+msgstr "挿入前にテーブルを空にする"
 
 #: libraries/export/sql.php:232
 msgid "Instead of <code>INSERT</code> statements, use:"
@@ -6692,7 +6685,7 @@ msgstr ""
 
 #: libraries/import/csv.php:42
 msgid "Column names: "
-msgstr "カラム名："
+msgstr "カラム名: "
 
 #: libraries/import/csv.php:62 libraries/import/csv.php:75
 #: libraries/import/csv.php:80 libraries/import/csv.php:85
@@ -7037,7 +7030,6 @@ msgid "not OK"
 msgstr "NG"
 
 #: libraries/relation.lib.php:80
-#, fuzzy
 #| msgid "OK"
 msgctxt "Correctly working"
 msgid "OK"
@@ -7096,7 +7088,7 @@ msgstr "ユーザ環境設定"
 
 #: libraries/relation.lib.php:152
 msgid "Quick steps to setup advanced features:"
-msgstr "高度な機能の設定する簡単な方法"
+msgstr "高度な機能の設定する簡単な方法:"
 
 #: libraries/relation.lib.php:154
 msgid ""
@@ -7668,7 +7660,7 @@ msgstr "このページにはテーブルがありません！"
 
 #: libraries/schema/Export_Relation_Schema.class.php:228
 msgid "SCHEMA ERROR: "
-msgstr "スキーマエラー："
+msgstr "スキーマエラー: "
 
 #: libraries/schema/Pdf_Relation_Schema.class.php:858
 #: libraries/schema/Pdf_Relation_Schema.class.php:1171
@@ -7980,10 +7972,10 @@ msgid "Table seems to be empty!"
 msgstr "テーブルが空のようです!"
 
 #: libraries/tbl_links.inc.php:126
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking of %s is activated."
-msgstr "%s.%s の SQL コマンド追跡機能はアクティブです。"
+msgstr "%s の SQL コマンド追跡機能はアクティブです。"
 
 #: libraries/tbl_properties.inc.php:98
 msgid ""
@@ -8049,7 +8041,7 @@ msgstr "なし"
 
 #: libraries/tbl_properties.inc.php:348
 msgid "As defined:"
-msgstr "ユーザ定義"
+msgstr "ユーザ定義:"
 
 #: libraries/tbl_properties.inc.php:462 tbl_structure.php:152
 #: tbl_structure.php:157 tbl_structure.php:575
@@ -8383,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 ""
@@ -8766,11 +8758,11 @@ msgid "No databases selected."
 msgstr "データベースが選択されていません。"
 
 #: server_databases.php:99
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
-msgstr[0] "データベース %s を正常に削除しました"
+msgstr[0] "%1$d 個のデータベースを正常に削除しました。"
 
 #: server_databases.php:119
 msgid "Databases statistics"
@@ -9128,10 +9120,9 @@ msgid "Revoke"
 msgstr "取り消し"
 
 #: server_privileges.php:1543
-#, fuzzy
 #| msgid "Export"
 msgid "Export all"
-msgstr "エクスポート"
+msgstr "すべてエクスポート"
 
 #: server_privileges.php:1562 server_privileges.php:1844
 #: server_privileges.php:2476
@@ -9139,16 +9130,15 @@ msgid "Any"
 msgstr "すべて"
 
 #: server_privileges.php:1642
-#, fuzzy
 #| msgid "Privileges"
 msgid "Privileges for all users"
-msgstr "特権"
+msgstr "すべてのユーザに対する特権"
 
 #: server_privileges.php:1654
-#, fuzzy, php-format
+#, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
-msgstr "特権"
+msgstr "%s に対する特権"
 
 #: server_privileges.php:1682
 msgid "Users overview"
@@ -9537,7 +9527,7 @@ msgstr "アドバイザ"
 
 #: server_status.php:790 server_status.php:812
 msgid "Refresh rate: "
-msgstr "再描画間隔："
+msgstr "再描画間隔: "
 
 #: server_status.php:825 server_variables.php:108
 msgid "Filters"
@@ -10105,10 +10095,9 @@ msgstr ""
 "クの最大数です。"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid "Percentage of used open files limit"
 msgid "Percentage of used key cache (calculated value)"
-msgstr "開いているファイルの上限に対する比率"
+msgstr "使われているキーキャッシュの比率 (計算値)"
 
 #: server_status.php:1365
 msgid "The number of requests to read a key block from the cache."
@@ -10128,7 +10117,7 @@ msgstr ""
 msgid ""
 "Key cache miss calculated as rate of physical reads compared to read "
 "requests (calculated value)"
-msgstr ""
+msgstr "キーキャッシュミスの割合。読み込みリクエストに対する物理読み込みで算出。(計算値)"
 
 #: server_status.php:1368
 msgid "The number of requests to write a key block to the cache."
@@ -10141,7 +10130,7 @@ msgstr "ディスクにキーブロックを物理書き込みした回数。"
 #: server_status.php:1370
 msgid ""
 "Percentage of physical writes compared to write requests (calculated value)"
-msgstr ""
+msgstr "書き込みリクエストに対する物理書き込みの比率 (計算値)"
 
 #: server_status.php:1371
 msgid ""
@@ -10359,10 +10348,9 @@ msgstr ""
 "がない場合はふつうあまりパフォーマンスは向上しません)"
 
 #: server_status.php:1406
-#, fuzzy
 #| msgid "Thread cache hit rate %%"
 msgid "Thread cache hit rate (calculated value)"
-msgstr "スレッドキャッシュのヒット率"
+msgstr "スレッドキャッシュのヒット割合 (計算値)"
 
 #: server_status.php:1407
 msgid "The number of threads that are not sleeping."
@@ -10528,7 +10516,7 @@ msgstr "系列をクリアする"
 
 #: server_status.php:1697
 msgid "Series in Chart:"
-msgstr "グラフの系列"
+msgstr "グラフの系列:"
 
 #: server_status.php:1710
 msgid "Log statistics"
@@ -11307,7 +11295,7 @@ msgstr "(1 回)"
 
 #: tbl_operations.php:297
 msgid "Move table to (database<b>.</b>table):"
-msgstr "テーブルを (データベース)<b>.</b>(テーブル) へ移動する"
+msgstr "テーブルを (データベース)<b>.</b>(テーブル) へ移動する:"
 
 #: tbl_operations.php:355
 msgid "Table options"
@@ -11319,7 +11307,7 @@ msgstr "変更後のテーブル名称"
 
 #: tbl_operations.php:537
 msgid "Copy table to (database<b>.</b>table):"
-msgstr "テーブルを (データベース)<b>.</b>(テーブル) にコピーする"
+msgstr "テーブルを (データベース)<b>.</b>(テーブル) にコピーする:"
 
 #: tbl_operations.php:584
 msgid "Switch to copied table"
@@ -11425,7 +11413,7 @@ msgstr "行の長さ"
 
 #: tbl_printview.php:373 tbl_structure.php:898
 msgid "Row size"
-msgstr "行のサイズ "
+msgstr "行のサイズ"
 
 #: tbl_printview.php:383 tbl_structure.php:906
 msgid "Next autoindex"
@@ -11459,11 +11447,11 @@ msgstr "定型問い合わせ (ワイルドカード: \"%\")"
 
 #: tbl_select.php:203
 msgid "Select columns (at least one):"
-msgstr "表示するカラム (最低 1 つ)"
+msgstr "表示するカラム (最低 1 つ):"
 
 #: tbl_select.php:221
 msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "検索条件 (WHERE 節の全内容)"
+msgstr "検索条件 (WHERE 節の全内容):"
 
 #: tbl_select.php:228
 msgid "Number of rows per page"
@@ -11471,7 +11459,7 @@ msgstr "ページあたりの行数"
 
 #: tbl_select.php:234
 msgid "Display order:"
-msgstr "表示順"
+msgstr "表示順:"
 
 #: tbl_structure.php:155 tbl_structure.php:160 tbl_structure.php:581
 msgid "Spatial"
@@ -11567,23 +11555,22 @@ msgid "Tracking report for table `%s`"
 msgstr "テーブル `%s` に対しての追跡レポート"
 
 #: tbl_tracking.php:174
-#, fuzzy, php-format
+#, php-format
 #| msgid "Version %s is created, tracking for %s.%s is activated."
 msgid "Version %1$s was created, tracking for %2$s is active."
-msgstr ""
-"世代 %s を作成しました。%s.%s の SQL コマンド追跡機能はアクティブです。"
+msgstr "世代 %1$s を作成しました。%2$s の SQL コマンド追跡機能はアクティブです。"
 
 #: tbl_tracking.php:186
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking for %1$s was deactivated at version %2$s."
-msgstr "%s.%s の SQL コマンド追跡機能はアクティブです。"
+msgstr "%1$s に対する SQL コマンド追跡機能は、世代 %2$s で非アクティブです。"
 
 #: tbl_tracking.php:198
-#, fuzzy, php-format
+#, php-format
 #| msgid "Tracking of %s.%s is activated."
 msgid "Tracking for %1$s was activated at version %2$s."
-msgstr "%s.%s の SQL コマンド追跡機能はアクティブです。"
+msgstr "%1$s に対する SQL コマンド追跡機能は、世代 %2$s でアクティブです。"
 
 #: tbl_tracking.php:211
 msgid "SQL statements executed."
@@ -11630,10 +11617,10 @@ msgid "Tracking statements"
 msgstr "追跡しているコマンド"
 
 #: tbl_tracking.php:445 tbl_tracking.php:573
-#, fuzzy, php-format
+#, php-format
 #| msgid "Show %s with dates from %s to %s by user %s %s"
 msgid "Show %1$s with dates from %2$s to %3$s by user %4$s %5$s"
-msgstr "種別：%s、期間：%s－%s、ユーザ：%sで絞り込む %s"
+msgstr "種別：%1$s、期間：%2$s－%3$s、ユーザ：%4$sで絞り込む %5$s"
 
 #: tbl_tracking.php:450
 msgid "Delete tracking data row from report"
@@ -11682,38 +11669,38 @@ msgid "Show versions"
 msgstr "世代を表示する"
 
 #: tbl_tracking.php:714
-#, fuzzy, php-format
+#, php-format
 #| msgid "Deactivate tracking for %s.%s"
 msgid "Deactivate tracking for %s"
-msgstr "%s.%s への SQL コマンド追跡を非アクティブにする"
+msgstr "%s への SQL コマンド追跡を非アクティブにする"
 
 #: tbl_tracking.php:716
 msgid "Deactivate now"
 msgstr "すぐに非アクティブにする"
 
 #: tbl_tracking.php:727
-#, fuzzy, php-format
+#, php-format
 #| msgid "Activate tracking for %s.%s"
 msgid "Activate tracking for %s"
-msgstr "%s.%s への SQL コマンド追跡をアクティブにする"
+msgstr "%s への SQL コマンド追跡をアクティブにする"
 
 #: tbl_tracking.php:729
 msgid "Activate now"
 msgstr "すぐにアクティブにする"
 
 #: tbl_tracking.php:742
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create version %s of %s.%s"
 msgid "Create version %1$s of %2$s"
-msgstr "%2$s.%3$s に世代 %1$s を作成"
+msgstr "%2$s に世代 %1$s を作成"
 
 #: tbl_tracking.php:746
 msgid "Track these data definition statements:"
-msgstr "追跡するデータ定義コマンド"
+msgstr "追跡するデータ定義コマンド:"
 
 #: tbl_tracking.php:754
 msgid "Track these data manipulation statements:"
-msgstr "追跡するデータ操作コマンド"
+msgstr "追跡するデータ操作コマンド:"
 
 #: tbl_tracking.php:762
 msgid "Create version"
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 55f0aeae52..bec9987a3e 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-06 13:06+0200\n"
-"PO-Revision-Date: 2011-03-07 11:21+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2012-04-08 05:59+0200\n"
+"Last-Translator: Asle Ommundsen <aommundsen@gmail.com>\n"
 "Language-Team: norwegian <no@li.org>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.5\n"
+"X-Generator: Weblate 0.8\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350
 #: libraries/display_tbl.lib.php:359 server_privileges.php:1794
@@ -394,10 +394,10 @@ msgid "You have to choose at least one column to display"
 msgstr "Du må velge minst en kolonne for visning"
 
 #: db_qbe.php:186
-#, fuzzy, php-format
+#, php-format
 #| msgid "visual builder"
 msgid "Switch to %svisual builder%s"
-msgstr "visuell bygger"
+msgstr "Bytt til %svisuell bygger%s"
 
 #: db_qbe.php:222 libraries/db_structure.lib.php:91
 #: libraries/display_tbl.lib.php:1013
@@ -548,10 +548,9 @@ msgid "Search in database"
 msgstr "Søk i 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 "Ord eller verdi(er) å søke etter (jokertegn: \"%\"):"
+msgstr "Ord eller verdier å søke med (jokertegn: \"%\"):"
 
 #: db_search.php:282
 msgid "Find:"
@@ -562,10 +561,9 @@ msgid "Words are separated by a space character (\" \")."
 msgstr "Ord er separert med et mellomrom (\" \")."
 
 #: db_search.php:300
-#, fuzzy
 #| msgid "Inside table(s):"
 msgid "Inside tables:"
-msgstr "I tabell(ene):"
+msgstr "I tabellene:"
 
 #: db_search.php:330
 msgid "Inside column:"
@@ -698,22 +696,19 @@ msgid "Analyze table"
 msgstr "Analyser tabell"
 
 #: db_structure.php:607
-#, fuzzy
 #| msgid "Go to table"
 msgid "Add prefix to table"
-msgstr "Gå til tabell"
+msgstr "Legg prefiks til tabell"
 
 #: db_structure.php:609 libraries/mult_submits.inc.php:272
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Replace table prefix"
-msgstr "Erstatt tabell med filen"
+msgstr "Erstatt tabellprefiks"
 
 #: db_structure.php:611 libraries/mult_submits.inc.php:272
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Copy table with prefix"
-msgstr "Erstatt tabell med filen"
+msgstr "Kopier tabell med prefiks"
 
 #: db_structure.php:640 libraries/schema/User_Schema.class.php:423
 msgid "Data Dictionary"
@@ -799,20 +794,18 @@ msgid "Database Log"
 msgstr "Databaselogg"
 
 #: export.php:38
-#, fuzzy
 #| msgid "Bar type"
 msgid "Bad type!"
-msgstr "Spørringstype"
+msgstr "Feil type!"
 
 #: export.php:86
 msgid "Selected export type has to be saved in file!"
 msgstr "Valgte eksporteringstype krever lagring til ei fil!"
 
 #: export.php:115
-#, fuzzy
 #| msgid "Apply index(s)"
 msgid "Bad parameters!"
-msgstr "Utfør indeks(er)"
+msgstr "Feil parametere!"
 
 #: export.php:176 export.php:201 export.php:672
 #, php-format
@@ -838,29 +831,28 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump har blitt lagret til fila %s."
 
 #: file_echo.php:21
-#, fuzzy
 #| msgid "Export type"
 msgid "Invalid export type"
-msgstr "Eksport type"
+msgstr "Ugyldig eksport-type"
 
 #: gis_data_editor.php:84
-#, fuzzy, php-format
+#, php-format
 #| msgid "Values for the column \"%s\""
 msgid "Value for the column \"%s\""
-msgstr "Verdier for kolonnen \"%s\""
+msgstr "Verdi for kolonnen \"%s\""
 
 #: gis_data_editor.php:113 tbl_gis_visualization.php:164
 msgid "Use OpenStreetMaps as Base Layer"
-msgstr ""
+msgstr "Bruk OpenStreetMaps som baselag"
 
 #: gis_data_editor.php:134
 msgid "SRID"
-msgstr ""
+msgstr "SRID"
 
 #: gis_data_editor.php:151 js/messages.php:322
 #: libraries/display_tbl.lib.php:692
 msgid "Geometry"
-msgstr ""
+msgstr "Geometri"
 
 #: gis_data_editor.php:172 js/messages.php:318
 msgid "Point"
@@ -869,12 +861,12 @@ msgstr ""
 #: gis_data_editor.php:173 gis_data_editor.php:197 gis_data_editor.php:245
 #: gis_data_editor.php:297 js/messages.php:316
 msgid "X"
-msgstr ""
+msgstr "X"
 
 #: gis_data_editor.php:175 gis_data_editor.php:199 gis_data_editor.php:247
 #: gis_data_editor.php:299 js/messages.php:317
 msgid "Y"
-msgstr ""
+msgstr "Y"
 
 #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295
 #: js/messages.php:319
@@ -884,52 +876,46 @@ msgstr ""
 
 #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302
 #: js/messages.php:325
-#, fuzzy
 #| msgid "Apply index(s)"
 msgid "Add a point"
-msgstr "Utfør indeks(er)"
+msgstr ""
 
 #: gis_data_editor.php:220 js/messages.php:320
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Linestring"
-msgstr "Linker avsluttet med"
+msgstr "Linjestreng"
 
 #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:324
 msgid "Outer Ring"
-msgstr ""
+msgstr "Ytre ring"
 
 #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:323
 msgid "Inner Ring"
-msgstr ""
+msgstr "Indre ring"
 
 #: gis_data_editor.php:252
-#, fuzzy
 #| msgid "Add a new User"
 msgid "Add a linestring"
-msgstr "Legg til en ny bruker"
+msgstr "Legg til linjestreng"
 
 #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:326
-#, fuzzy
 #| msgid "Add a new User"
 msgid "Add an inner ring"
-msgstr "Legg til en ny bruker"
+msgstr "Legg til en indre ring"
 
 #: gis_data_editor.php:266 js/messages.php:321
 msgid "Polygon"
-msgstr ""
+msgstr "Polygon"
 
 #: gis_data_editor.php:306 js/messages.php:327
-#, fuzzy
 #| msgid "Add column"
 msgid "Add a polygon"
-msgstr "Legg til kolonne(r)"
+msgstr "Legg til polygon"
 
 #: gis_data_editor.php:310
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add geometry"
-msgstr "Legg til en ny tjener"
+msgstr "Legg til geometri"
 
 #: gis_data_editor.php:317
 msgid "Output"
@@ -940,6 +926,8 @@ msgid ""
 "Chose \"GeomFromText\" from the \"Function\" column and paste the below "
 "string into the \"Value\" field"
 msgstr ""
+"Velg \"GeomFromText\" fra kolonnen \"Funksjon\" og lim inn teksten nedenfor inn "
+"i feltet \"Verdi\""
 
 #: import.php:86
 #, php-format
@@ -988,6 +976,7 @@ msgstr ""
 msgid ""
 "Cannot convert file's character set without character set conversion library"
 msgstr ""
+"Kan ikke konvertere filens tegnsett uten tegnsett konverteringsbibliotek"
 
 #: import.php:439 libraries/display_import.lib.php:23
 msgid "Could not load import plugins, please check your installation!"
@@ -1052,16 +1041,14 @@ msgid "You are about to DESTROY a complete database!"
 msgstr "Du er i ferd med å SLETTE en komplett database!"
 
 #: js/messages.php:32
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to DESTROY a complete table!"
-msgstr "Du er i ferd med å SLETTE en komplett database!"
+msgstr "Du er i ferd med å SLETTE en hel database!"
 
 #: js/messages.php:33
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to TRUNCATE a complete table!"
-msgstr "Du er i ferd med å SLETTE en komplett database!"
+msgstr "Du er i ferd med å AVKORTE en hel database!"
 
 #: js/messages.php:35
 msgid "Deleting tracking data"
@@ -1084,29 +1071,26 @@ msgid "This is not a number!"
 msgstr "Dette er ikke ett tall!"
 
 #: js/messages.php:42
-#, fuzzy
 #| msgid "Apply index(s)"
 msgid "Add Index"
-msgstr "Utfør indeks(er)"
+msgstr "Legg til index"
 
 #: js/messages.php:43
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit Index"
-msgstr "Redigeringsmodus"
+msgstr "Rediger indeks"
 
 #: js/messages.php:44 tbl_indexes.php:293
-#, fuzzy, php-format
+#, php-format
 #| msgid "Add %s column(s)"
 msgid "Add %d column(s) to index"
-msgstr "Legg til %s kolonne(r)"
+msgstr "Legg %d kolonne(r) til index"
 
 #. l10n: Default description for the y-Axis of Charts
 #: js/messages.php:48
-#, fuzzy
 #| msgid "Log file count"
 msgid "Total count"
-msgstr "Antall loggfiler"
+msgstr "Totalt antall"
 
 #: js/messages.php:51
 msgid "The host name is empty!"
@@ -1126,10 +1110,9 @@ msgstr "Passordene er ikke like!"
 
 #: js/messages.php:55 server_privileges.php:1913 server_privileges.php:1937
 #: server_privileges.php:2349 server_privileges.php:2543
-#, fuzzy
 #| msgid "Any user"
 msgid "Add user"
-msgstr "Alle brukere"
+msgstr "Legg til bruker"
 
 #: js/messages.php:56
 msgid "Reloading Privileges"
@@ -1153,24 +1136,22 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: js/messages.php:62 server_status.php:795
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Live traffic chart"
-msgstr "Tjenervalg"
+msgstr "Live trafikk-graf"
 
 #: js/messages.php:63 server_status.php:798
 msgid "Live conn./process chart"
-msgstr ""
+msgstr "Live tilkbl./prosess-graf"
 
 #: js/messages.php:64 server_status.php:816
-#, fuzzy
 #| msgid "Show query box"
 msgid "Live query chart"
-msgstr "Vis spørringsboks"
+msgstr "Live spørrings-graf"
 
 #: js/messages.php:66
 msgid "Static data"
-msgstr ""
+msgstr "Statistikkdata"
 
 #. l10n: Total number of queries
 #: js/messages.php:68 libraries/build_html_for_db.lib.php:46
@@ -1183,7 +1164,7 @@ msgstr "Totalt"
 #. l10n: Other, small valued, queries
 #: js/messages.php:70 server_status.php:595 server_status.php:1014
 msgid "Other"
-msgstr ""
+msgstr "Annet"
 
 #. l10n: Thousands separator
 #: js/messages.php:72 libraries/common.lib.php:1484
@@ -1197,51 +1178,48 @@ msgstr ","
 
 #: js/messages.php:76
 msgid "KiB sent since last refresh"
-msgstr ""
+msgstr "KiB sendt siden sist oppdatering"
 
 #: js/messages.php:77
 msgid "KiB received since last refresh"
-msgstr ""
+msgstr "KiB mottatt siden sist oppdatering"
 
 #: js/messages.php:78
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic (in KiB)"
-msgstr "Tjenervalg"
+msgstr "Servertrafikk (i KiB)"
 
 #: js/messages.php:79
 msgid "Connections since last refresh"
-msgstr ""
+msgstr "Tilkoblinger siden sist oppdatering"
 
 #: js/messages.php:80 js/messages.php:118 server_status.php:1227
 msgid "Processes"
 msgstr "Prosesser"
 
 #: js/messages.php:81
-#, fuzzy
 #| msgid "Connections"
 msgid "Connections / Processes"
-msgstr "tilkoblinger"
+msgstr "Tilkoblinger/prosesser"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:83
 msgid "Questions since last refresh"
-msgstr ""
+msgstr "Spørringer siden sist oppdatering"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:85
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Spørringer (executed statements av serveren)"
 
 #: js/messages.php:87 server_status.php:777
 msgid "Query statistics"
 msgstr "Spørringsstatistikk"
 
 #: js/messages.php:90
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Local monitor configuration incompatible"
-msgstr "Kunne ikke lagre konfigurasjonen"
+msgstr "Lokal monitor-konfigurasjon er inkompatibel"
 
 #: js/messages.php:91
 msgid ""
@@ -1252,34 +1230,31 @@ msgid ""
 msgstr ""
 
 #: js/messages.php:93
-#, fuzzy
 #| msgid "Query cache"
 msgid "Query cache efficiency"
-msgstr "Spørringsmellomlager"
+msgstr "Spørrings cache effektivitet"
 
 #: js/messages.php:94
-#, fuzzy
 #| msgid "Query cache"
 msgid "Query cache usage"
-msgstr "Spørringsmellomlager"
+msgstr "Spørrings cache bruk"
 
 #: js/messages.php:95
-#, fuzzy
 #| msgid "Query cache"
 msgid "Query cache used"
-msgstr "Spørringsmellomlager"
+msgstr "Spørrings cache brukt"
 
 #: js/messages.php:97
 msgid "System CPU Usage"
-msgstr ""
+msgstr "System CPU-bruk"
 
 #: js/messages.php:98
 msgid "System memory"
-msgstr ""
+msgstr "System minne"
 
 #: js/messages.php:99
 msgid "System swap"
-msgstr ""
+msgstr "System swap"
 
 #. l10n: shortcuts for Megabyte
 #: js/messages.php:100 js/messages.php:123 libraries/common.lib.php:1434
@@ -1295,61 +1270,56 @@ msgstr "KiB"
 
 #: js/messages.php:103
 msgid "Average load"
-msgstr ""
+msgstr "Gjennomsnitt load"
 
 #: js/messages.php:104
-#, fuzzy
 #| msgid "Log file count"
 msgid "Total memory"
-msgstr "Antall loggfiler"
+msgstr "Totalt minne"
 
 #: js/messages.php:105
 msgid "Cached memory"
-msgstr ""
+msgstr "Cached minne"
 
 #: js/messages.php:106
-#, fuzzy
 #| msgid "Buffer Pool"
 msgid "Buffered memory"
-msgstr "Mellomlager"
+msgstr "Buffered minne"
 
 #: js/messages.php:107
 msgid "Free memory"
-msgstr ""
+msgstr "Ledig minne"
 
 #: js/messages.php:108
 msgid "Used memory"
-msgstr ""
+msgstr "Brukt minne"
 
 #: js/messages.php:110
-#, fuzzy
 #| msgid "Total"
 msgid "Total Swap"
-msgstr "Totalt"
+msgstr "Totalt swap"
 
 #: js/messages.php:111
 msgid "Cached Swap"
-msgstr ""
+msgstr "Cached swap"
 
 #: js/messages.php:112
 msgid "Used Swap"
-msgstr ""
+msgstr "Brukt swap"
 
 #: js/messages.php:113
-#, fuzzy
 #| msgid "Free pages"
 msgid "Free Swap"
-msgstr "Ledige sider"
+msgstr "Ledig swap"
 
 #: js/messages.php:115
 msgid "Bytes sent"
-msgstr ""
+msgstr "Bytes sendt"
 
 #: js/messages.php:116
-#, fuzzy
 #| msgid "Received"
 msgid "Bytes received"
-msgstr "Mottatt"
+msgstr "Bytes mottatt"
 
 #: js/messages.php:117 server_status.php:1137
 msgid "Connections"
@@ -1381,18 +1351,17 @@ msgid "EiB"
 msgstr "EiB"
 
 #: js/messages.php:128
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s table"
 #| msgid_plural "%s tables"
 msgid "%d table(s)"
-msgstr "%s tabell"
+msgstr "%d tabell(er)"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:131
-#, fuzzy
 #| msgid "Versions"
 msgid "Questions"
-msgstr "Versjoner"
+msgstr "Spørringer"
 
 #: js/messages.php:132 server_status.php:1092
 msgid "Traffic"
@@ -1401,27 +1370,25 @@ msgstr "Trafikk"
 #: js/messages.php:133 libraries/server_links.inc.php:73
 #: server_status.php:1557
 msgid "Settings"
-msgstr "Iinnstillinger"
+msgstr "Innstillinger"
 
 #: js/messages.php:134
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "Fjern database"
+msgstr "Fjern graf"
 
 #: js/messages.php:135
 msgid "Edit title and labels"
-msgstr ""
+msgstr "Rediger tittel og etiketter"
 
 #: js/messages.php:136
-#, fuzzy
 #| msgid "Snap to grid"
 msgid "Add chart to grid"
-msgstr "Lås til ruter"
+msgstr "Legg graf til grid"
 
 #: js/messages.php:138
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "Legg minst én variabel til serien"
 
 #: js/messages.php:139 libraries/display_export.lib.php:311
 #: libraries/display_tbl.lib.php:573 libraries/export/sql.php:1113
@@ -1433,35 +1400,35 @@ msgstr "Ingen"
 
 #: js/messages.php:140
 msgid "Resume monitor"
-msgstr ""
+msgstr "Gjenoppta monitor"
 
 #: js/messages.php:141
 msgid "Pause monitor"
-msgstr ""
+msgstr "Pause monitor"
 
 #: js/messages.php:143
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log og slow_query_log er aktivert."
 
 #: js/messages.php:144
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log er aktivert."
 
 #: js/messages.php:145
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log er aktivert."
 
 #: js/messages.php:146
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log og general_log er deaktivert."
 
 #: js/messages.php:147
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output er ikke satt til TABLE."
 
 #: js/messages.php:148
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output er satt til TABLE."
 
 #: js/messages.php:149
 #, php-format
@@ -1470,17 +1437,22 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
+"slow_query_log er aktivert, men serveren loggfører kun spørringer som tar "
+"lenger enn %d sekunder. Avhengig av ditt system, er det tilrådelig å sette "
+"long_query_time til 0-2 sekunder."
 
 #: js/messages.php:150
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time er satt til %d sekund(er)."
 
 #: js/messages.php:151
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
 msgstr ""
+"Følgende innstillinger blir lagt til globalt og endret til default ved "
+"omstart av server:"
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:153
@@ -1882,25 +1854,23 @@ msgstr ""
 
 #: js/messages.php:265 libraries/rte/rte_routines.lib.php:689
 msgid "ENUM/SET editor"
-msgstr ""
+msgstr "ENUM/SET-editor"
 
 #: js/messages.php:266
-#, fuzzy, php-format
+#, php-format
 #| msgid "Values for the column \"%s\""
 msgid "Values for column %s"
-msgstr "Verdier for kolonnen \"%s\""
+msgstr "Verdier for kolonne %s"
 
 #: js/messages.php:267
-#, fuzzy
 #| msgid "Values for the column \"%s\""
 msgid "Values for a new column"
-msgstr "Verdier for kolonnen \"%s\""
+msgstr "Verdier for ny kolonne"
 
 #: js/messages.php:268
-#, fuzzy
 #| msgid "Enter each value in a separate field."
 msgid "Enter each value in a separate field"
-msgstr "Skriv inn hver verdi i separate felter."
+msgstr "Skriv hver verdi i et eget felt"
 
 #: js/messages.php:269
 #, fuzzy, php-format
@@ -8747,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 80d6832fb0..eb43ef55de 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-06 13:06+0200\n"
-"PO-Revision-Date: 2012-04-04 22:26+0200\n"
+"PO-Revision-Date: 2012-04-07 15:11+0200\n"
 "Last-Translator: Victor Volkov <hanut@php-myadmin.ru>\n"
 "Language-Team: russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 0.8\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350
@@ -246,16 +246,16 @@ msgid "The database name is empty!"
 msgstr "Не указано имя базы данных!"
 
 #: db_operations.php:300
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been renamed to %s"
 msgid "Database %1$s has been renamed to %2$s"
-msgstr "База данных %s переименована в %s"
+msgstr "База данных %1$s переименована в %2$s"
 
 #: db_operations.php:304
-#, fuzzy, php-format
+#, php-format
 #| msgid "Database %s has been copied to %s"
 msgid "Database %1$s has been copied to %2$s"
-msgstr "База данных %s была скопирована в %s"
+msgstr "База данных %1$s скопирована в %2$s"
 
 #: db_operations.php:432
 msgid "Rename database to"
@@ -2001,10 +2001,9 @@ msgstr ""
 "мышки."
 
 #: js/messages.php:356
-#, fuzzy
 #| msgid "Update row(s)"
 msgid "Show data row(s)"
-msgstr "Обновить строку(и)"
+msgstr "Вывести строку(и) данных"
 
 #: js/messages.php:359
 msgid "Generate password"
@@ -2631,10 +2630,9 @@ msgid "Failed to use Blowfish from mcrypt!"
 msgstr "Невозможно использование Blowfish из mcrypt!"
 
 #: libraries/auth/cookie.auth.lib.php:208 libraries/header.inc.php:90
-#, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point"
-msgstr "Для полноценной работы необходима поддержка cookies браузером."
+msgstr "Для полноценной работы необходима поддержка Javascript браузером"
 
 #: libraries/auth/cookie.auth.lib.php:227
 msgid "Log in"
@@ -8478,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 8ae97f5bb0..be649c7872 100644
--- a/po/si.po
+++ b/po/si.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-06 13:06+0200\n"
-"PO-Revision-Date: 2012-04-06 18:03+0200\n"
+"PO-Revision-Date: 2012-04-08 16:29+0200\n"
 "Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
 "Language-Team: sinhala <si@li.org>\n"
 "Language: si\n"
@@ -1586,7 +1586,9 @@ msgstr "වෙනස් වූ පේළි:"
 
 #: js/messages.php:206
 msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
-msgstr "Config ගොනුව විග්‍රහ කිරීම අසමත් විය. ගොනුවෙහි වලංගු JSON කේත ඇත්දැයි පරීක්ෂා කරන්න."
+msgstr ""
+"වින්‍යාස ගොනුව විග්‍රහ කිරීම අසමත් විය. ගොනුවෙහි වලංගු JSON කේත ඇත්දැයි "
+"පරීක්ෂා කරන්න."
 
 #: js/messages.php:207
 msgid ""
@@ -2299,7 +2301,7 @@ msgstr "වින්‍යාස ගොනුව සඳහා වැරදි �
 
 #: libraries/Config.class.php:1298
 msgid "Font size"
-msgstr "ෆොන්ට් එකෙහි ප්‍රමාණය"
+msgstr "ෆොන්ටයෙහි ප්‍රමාණය"
 
 #: libraries/Error_Handler.class.php:62
 msgid "Too many error messages, some are not displayed."
@@ -2440,15 +2442,15 @@ msgstr "PDF සැදීමේදී දෝෂ:"
 
 #: libraries/RecentTable.class.php:106
 msgid "Could not save recent table"
-msgstr "නූතන වගු සුරැකීම අසමත් විය"
+msgstr "මෑතදී භාවිතා කල වගු සුරැකීම අසමත් විය"
 
 #: libraries/RecentTable.class.php:141
 msgid "Recent tables"
-msgstr "නූතන වගු"
+msgstr "මෑතදී භාවිතා කල වගු"
 
 #: libraries/RecentTable.class.php:148
 msgid "There are no recent tables"
-msgstr "නූතන වගු කිසිවක් නොමැත"
+msgstr "මෑතදී භාවිතා කල වගු කිසිවක් නොමැත"
 
 #: libraries/StorageEngine.class.php:203
 msgid ""
@@ -2563,8 +2565,8 @@ msgid ""
 "You probably did not create a configuration file. You might want to use the "
 "%1$ssetup script%2$s to create one."
 msgstr ""
-"Probably reason of this is that you did not create configuration file. You "
-"might want to use %1$ssetup script%2$s to create one."
+"ඔබ වින්‍යාස ගොනුවක් නොසෑදුවා විය යුතුය. වින්‍යාස ගොනුවක් සෑදීමට %"
+"1$sපිහිටුවීමේ විධානාවලිය%2$s භාවිතා කිරීම අවශ්‍ය විය හැකිය."
 
 #: libraries/auth/config.auth.lib.php:110
 msgid ""
@@ -3777,6 +3779,9 @@ msgid ""
 "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to "
 "get special values."
 msgstr ""
+"බව්සරයේ මාතෘකා පටියේ දැක්වෙන පෙළ සඳහන් කරයි. මේ සඳහා යොදාගත හැකි විශේෂ අගයන් "
+"ගෙනදෙන වචන දැනගැනීමට [a@Documentation.html#cfg_TitleTable]ලියකියවිලි[/a] "
+"බලන්න."
 
 #: libraries/config/messages.inc.php:196
 #: libraries/navigation_header.inc.php:79
@@ -3989,6 +3994,8 @@ msgid ""
 "Default format; be aware that this list depends on location (database, "
 "table) and only SQL is always available"
 msgstr ""
+"පෙරනිමි ආකෘතිය; මෙම ලැයිස්තුව ඔබ සිටිනා ස්ථානය (දත්තගබඩා, වගු) මත තීරණය වේ. "
+"SQL පමණක් සෑම විටම ඇත"
 
 #: libraries/config/messages.inc.php:249
 msgid "Format of imported file"
@@ -4141,7 +4148,7 @@ msgstr "මෑතදී භාවිතා කල වගු"
 
 #: libraries/config/messages.inc.php:292
 msgid "Use less graphically intense tabs"
-msgstr ""
+msgstr "දර්ශනය කිරීමට පහසු ටැබ පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:293
 msgid "Light tabs"
@@ -4165,17 +4172,18 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:297
 msgid "Delete all cookies on logout"
-msgstr ""
+msgstr "පිටවීමේදී කුකී සියල්ල ඉවත් කරන්න"
 
 #: libraries/config/messages.inc.php:298
 msgid ""
 "Define whether the previous login should be recalled or not in cookie "
 "authentication mode"
 msgstr ""
+"කුකී සත්‍යාපන ප්‍රකාරයේදී අවසන් ඇතුළු වීමම භාවිතා කල යුතුදැයි සඳහන් කරයි"
 
 #: libraries/config/messages.inc.php:299
 msgid "Recall user name"
-msgstr ""
+msgstr "භාවිත නාමය සිහියට නගන්න"
 
 #: libraries/config/messages.inc.php:300
 msgid ""
@@ -4184,10 +4192,14 @@ msgid ""
 "and will be deleted as soon as you close the browser window. This is "
 "recommended for non-trusted environments."
 msgstr ""
+"ඇතුල් වීමේ කුකිය කොපමණ කාලයක් (තත්පර වලින්) බ්‍රව්සරයේ තබාගත යුතුදැයි සඳහන් "
+"කරයි. පෙරනිමි අගය වන 0 න් අදහස් වනුයේ එය වත්මන් සැසිය සඳහ පමණක් තබාගෙන "
+"බ්‍රව්සරය වැසීමෙන් පසු ඉවත් කල යුතුය යන්නය. විශ්වාසදායි නොවන පරිසරයන් සඳහා "
+"මෙම පෙරනිමි අගය නිර්දේශිතය."
 
 #: libraries/config/messages.inc.php:301
 msgid "Login cookie store"
-msgstr ""
+msgstr "ඇතුල් වීමේ කුකිය රඳවාගන්න"
 
 #: libraries/config/messages.inc.php:302
 msgid "Define how long (in seconds) a login cookie is valid"
@@ -4199,7 +4211,7 @@ msgstr "ලොගින් කුකියේ වලංගුතාවය"
 
 #: libraries/config/messages.inc.php:304
 msgid "Double size of textarea for LONGTEXT columns"
-msgstr ""
+msgstr "LONGTEXT තීර සඳහා දෙගුණයක් විශාල පෙළපෙදෙසක්"
 
 #: libraries/config/messages.inc.php:305
 msgid "Bigger textarea for LONGTEXT"
@@ -4207,15 +4219,15 @@ msgstr "LONGTEXT සඳහා විශාල පෙළ පෙදෙසක්"
 
 #: libraries/config/messages.inc.php:306
 msgid "Use icons on main page"
-msgstr ""
+msgstr "ප්‍රධාන පිටුවේ අයිකන භාවිතා කරන්න"
 
 #: libraries/config/messages.inc.php:307
 msgid "Maximum number of characters used when a SQL query is displayed"
-msgstr ""
+msgstr "SQL විමසුම පෙන්වීමේදී භාවිතා කල යුතු උපරිම අනුලකුණු ගණන"
 
 #: libraries/config/messages.inc.php:308
 msgid "Maximum displayed SQL length"
-msgstr ""
+msgstr "දර්ෂිත SQL සඳහා උපරිම දිග"
 
 #: libraries/config/messages.inc.php:309 libraries/config/messages.inc.php:314
 #: libraries/config/messages.inc.php:341
@@ -4236,10 +4248,12 @@ msgid ""
 "contains more rows, &quot;Previous&quot; and &quot;Next&quot; links will be "
 "shown."
 msgstr ""
+"ප්‍රථිඵල පිරික්සීමේදී එකවර පෙන්විය යුතු පේළි ගණන. ප්‍රතිඵලයේ ඊට වඩා පේළි "
+"ඇත්නම් &quot;පෙර&quot; සහ &quot;මීළඟ&quot; සබැඳි පෙන්වයි."
 
 #: libraries/config/messages.inc.php:313
 msgid "Maximum number of rows to display"
-msgstr ""
+msgstr "පෙන්විය යුතු උපරිම පේළි ගණන"
 
 #: libraries/config/messages.inc.php:315
 msgid "Maximum number of tables displayed in table list"
@@ -4254,16 +4268,20 @@ msgid ""
 "Disable the default warning that is displayed if mcrypt is missing for "
 "cookie authentication"
 msgstr ""
+"කුකී සත්‍යාපනය සඳහා අවශ්‍ය mcrypt නොමැති අවස්ථාවකදී පෙන්වන අනතුරු ඇඟවීම "
+"අක්‍රීය කරන්න"
 
 #: libraries/config/messages.inc.php:318
 msgid "mcrypt warning"
-msgstr ""
+msgstr "mcrypt අනතුරු ඇඟවීම"
 
 #: libraries/config/messages.inc.php:319
 msgid ""
 "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] "
 "([kbd]0[/kbd] for no limit)"
 msgstr ""
+"විධානවලියකට වෙන් කිරීමට අවසර ඇති බයිට ගණන, උදා. [kbd]32M[/kbd] (අසීමිත බයිට "
+"ගණනක් සඳහා [kbd]0[/kbd])"
 
 #: libraries/config/messages.inc.php:320
 msgid "Memory limit"
@@ -4271,15 +4289,17 @@ msgstr "මතක සීමාව"
 
 #: libraries/config/messages.inc.php:321
 msgid "These are Edit, Copy and Delete links"
-msgstr ""
+msgstr "මේවා සංස්කරණය කරන්න, පිටපත් කරන්න සහ ඉවත් කරන්න යන සබැඳිය"
 
 #: libraries/config/messages.inc.php:322
 msgid "Where to show the table row links"
-msgstr ""
+msgstr "වගුවේ පේළි වලට අදාල සබැඳි පෙන්විය යුත්තේ කොහේද යන වග"
 
 #: libraries/config/messages.inc.php:323
 msgid "Use natural order for sorting table and database names"
 msgstr ""
+"වගු හා දත්තගබඩා වල නම් අනුපිළිවෙලට සැකසීම සඳහා ස්වභාවික අනුපිළිවෙල භාවිතා "
+"කරන්න"
 
 #: libraries/config/messages.inc.php:324
 msgid "Natural order"
@@ -4287,37 +4307,40 @@ msgstr "ස්වභාවික අනුපිළිවල"
 
 #: libraries/config/messages.inc.php:325 libraries/config/messages.inc.php:335
 msgid "Use only icons, only text or both"
-msgstr ""
+msgstr "භාවිතා කල යුත්තේ අයිකන පමණක්, පෙළ පමණක්, හෝ මේ දෙකම"
 
 #: libraries/config/messages.inc.php:326
 msgid "Iconic navigation bar"
-msgstr ""
+msgstr "අයිකන සහිත යාත්‍රණ පටිය"
 
 #: libraries/config/messages.inc.php:327
 msgid "use GZip output buffering for increased speed in HTTP transfers"
 msgstr ""
+"HTTP හුවමාරුවල වේගය වැඩි කිරීම සඳහා GZip ප්‍රතිදාන ගොඩගැසීම භාවිතා කරන්න"
 
 #: libraries/config/messages.inc.php:328
 msgid "GZip output buffering"
-msgstr ""
+msgstr "GZip ප්‍රතිදාන ගොඩගැසීම"
 
 #: libraries/config/messages.inc.php:329
 msgid ""
 "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, "
 "DATETIME and TIMESTAMP, ascending order otherwise"
 msgstr ""
+"[kbd]SMART[/kbd] - එනම් TIME, DATE, DATETIME සහ TIMESTAMP තීර සඳහා අවරෝහණ "
+"පිළිවෙලත්, අනෙකුත් තීර සඳහා ආරෝහණ පිළිවෙලත්"
 
 #: libraries/config/messages.inc.php:330
 msgid "Default sorting order"
-msgstr ""
+msgstr "පෙරනිමි අනුපිළිවෙල"
 
 #: libraries/config/messages.inc.php:331
 msgid "Use persistent connections to MySQL databases"
-msgstr ""
+msgstr "MySQL දත්තගබඩා වෙත කල්පවතිනා සබඳතා භාවිතා කරන්න"
 
 #: libraries/config/messages.inc.php:332
 msgid "Persistent connections"
-msgstr ""
+msgstr "කල්පවතිනා සබඳතා"
 
 #: libraries/config/messages.inc.php:333
 msgid ""
@@ -4325,22 +4348,24 @@ msgid ""
 "Structure page if any of the required tables for the phpMyAdmin "
 "configuration storage could not be found"
 msgstr ""
+"phpMyAdmin වින්‍යාස ගබඩාවට අවශ්‍ය එක් වගුවක් හෝ සොයාගත නොහැකි අවස්ථාවකදී "
+"දත්තගබඩා සැකිල්ල පිටුවේ පෙන්වන පෙරනිමි අනතුරු ඇඟවීම අක්‍රීය කරන්න"
 
 #: libraries/config/messages.inc.php:334
 msgid "Missing phpMyAdmin configuration storage tables"
-msgstr ""
+msgstr "phpMyAdmin වින්‍යාස ගබඩාවේ අඩු වගු"
 
 #: libraries/config/messages.inc.php:336
 msgid "Iconic table operations"
-msgstr ""
+msgstr "අයිකන සහිත වගු මෙහෙයුම්"
 
 #: libraries/config/messages.inc.php:337
 msgid "Disallow BLOB and BINARY columns from editing"
-msgstr ""
+msgstr "BLOB සහ BINARY තීරු සංස්කරණය වලකන්න"
 
 #: libraries/config/messages.inc.php:338
 msgid "Protect binary columns"
-msgstr ""
+msgstr "ද්වීමය තීරු ආරක්ෂා කරන්න"
 
 #: libraries/config/messages.inc.php:339
 msgid ""
@@ -4351,27 +4376,27 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:340
 msgid "Permanent query history"
-msgstr ""
+msgstr "ස්ථායී විමසුම් ඉතිහාසය"
 
 #: libraries/config/messages.inc.php:342
 msgid "How many queries are kept in history"
-msgstr ""
+msgstr "කොපමණ විමසුම් ප්‍රමාණයක් ඉතිහාසයේ රඳවා ගත යුතුද යන්න"
 
 #: libraries/config/messages.inc.php:343
 msgid "Query history length"
-msgstr ""
+msgstr "විමසුම් ඉතිහාසයේ ප්‍රමාණය"
 
 #: libraries/config/messages.inc.php:344
 msgid "Tab displayed when opening a new query window"
-msgstr ""
+msgstr "නව විමසුම් කවුළුවක් අරින විට පෙන්වන ටැබය"
 
 #: libraries/config/messages.inc.php:345
 msgid "Default query window tab"
-msgstr ""
+msgstr "පෙරනිමි විමසුම් කවුළු ටැබය"
 
 #: libraries/config/messages.inc.php:346
 msgid "Query window height (in pixels)"
-msgstr ""
+msgstr "විමසුම් කවුළුවේ උස(පික්සල් වලින්)"
 
 #: libraries/config/messages.inc.php:347
 msgid "Query window height"
@@ -4387,15 +4412,15 @@ msgstr "විමසුම් කවුළුවේ පළල"
 
 #: libraries/config/messages.inc.php:350
 msgid "Select which functions will be used for character set conversion"
-msgstr ""
+msgstr "අක්ෂර කට්ටල පරිවර්තනය සඳහා කුමන ශ්‍රිතය භාවිතා විය යුතුදැයි තෝරන්න"
 
 #: libraries/config/messages.inc.php:351
 msgid "Recoding engine"
-msgstr ""
+msgstr "පටිගත කිරීමේ යන්ත්‍රය"
 
 #: libraries/config/messages.inc.php:352
 msgid "When browsing tables, the sorting of each table is remembered"
-msgstr ""
+msgstr "වගු පිරික්සීමේදී එක් එක් වගුවේ අනුපිලිවෙල සැකසූ ආකාරය මතක තබා ගැනේ"
 
 #: libraries/config/messages.inc.php:353
 msgid "Remember table's sorting"
@@ -4404,6 +4429,8 @@ msgstr "වගුව සැකසූ අනුපිළිවෙල මතක �
 #: libraries/config/messages.inc.php:354
 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature"
 msgstr ""
+"පේළි x සංඛ්‍යාවකට වරක් ශීර්ෂ පුනරාවර්තනය කරන්න. අක්‍රීය කිරීමට [kbd]0[/kbd] "
+"යොදන්න"
 
 #: libraries/config/messages.inc.php:355
 msgid "Repeat headers"
@@ -4411,7 +4438,7 @@ msgstr "ශීර්ෂක පුනරාවර්තනය"
 
 #: libraries/config/messages.inc.php:356
 msgid "Show help button instead of Documentation text"
-msgstr ""
+msgstr "ලියකියවිලි වෙනුවට උදවු බොත්තම පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:357
 msgid "Show help button"
@@ -4419,11 +4446,11 @@ msgstr "උදවු බොත්තම පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:359
 msgid "Save all edited cells at once"
-msgstr ""
+msgstr "සංස්කරණය කල කොටු සියල්ල එකවර සුරකින්න"
 
 #: libraries/config/messages.inc.php:360
 msgid "Directory where exports can be saved on server"
-msgstr ""
+msgstr "සේවාදායකය මත අපනයන සුරැකිය හැකි ඩිරෙක්ටරිය"
 
 #: libraries/config/messages.inc.php:361
 msgid "Save directory"
@@ -4431,27 +4458,27 @@ msgstr "සුරැකුම් ඩිරෙක්ටරිය"
 
 #: libraries/config/messages.inc.php:362
 msgid "Leave blank if not used"
-msgstr ""
+msgstr "භාවිතා නොකෙරේ නම් හිස්ව තබන්න"
 
 #: libraries/config/messages.inc.php:363
 msgid "Host authorization order"
-msgstr ""
+msgstr "දායකයන් සඳහා අවසර ලබා දීමේ අනුපිළිවෙල"
 
 #: libraries/config/messages.inc.php:364
 msgid "Leave blank for defaults"
-msgstr ""
+msgstr "පෙරනිමි අගයන් සඳහා හිස්ව තබන්න"
 
 #: libraries/config/messages.inc.php:365
 msgid "Host authorization rules"
-msgstr ""
+msgstr "දායක සඳහා අවසර දීමේ රීති"
 
 #: libraries/config/messages.inc.php:366
 msgid "Allow logins without a password"
-msgstr ""
+msgstr "මුරපදයක් රහිතව ඇතුල් වීමට ඉඩ ලබා දෙන්න"
 
 #: libraries/config/messages.inc.php:367
 msgid "Allow root login"
-msgstr ""
+msgstr "root ලෙස ඇතුල් වීමට ඉඩ දෙන්න"
 
 #: libraries/config/messages.inc.php:368
 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth"
@@ -4470,47 +4497,52 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:371
 msgid "SweKey config file"
-msgstr ""
+msgstr "SweKey වින්‍යාස ගොනුව"
 
 #: libraries/config/messages.inc.php:372
 msgid "Authentication method to use"
-msgstr ""
+msgstr "භාවිතා කල යුතු සත්‍යාපන ක්‍රමය"
 
 #: libraries/config/messages.inc.php:373 setup/frames/index.inc.php:128
 msgid "Authentication type"
-msgstr ""
+msgstr "සත්‍යාපන වර්ගය"
 
 #: libraries/config/messages.inc.php:374
 msgid ""
 "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] "
 "support, suggested: [kbd]pma_bookmark[/kbd]"
 msgstr ""
+"[a@http://wiki.phpmyadmin.net/pma/bookmark]පොත්සලකුණු[/a] විශේෂාංගය අනවශ්‍ය "
+"නම් හිස්ව තබන්න. යෝජිත: [kbd]pma_bookmark[/kbd]"
 
 #: libraries/config/messages.inc.php:375
 msgid "Bookmark table"
-msgstr ""
+msgstr "පොත්සලකුණු ගොනුව"
 
 #: libraries/config/messages.inc.php:376
 msgid ""
 "Leave blank for no column comments/mime types, suggested: [kbd]"
 "pma_column_info[/kbd]"
 msgstr ""
+"තීර විස්තර/mime වර්ග විශේෂාංගය අනවශ්‍ය නම් හිස්ව තබන්න. යෝජිත: "
+"[kbd]pma_column_info[/kbd]"
 
 #: libraries/config/messages.inc.php:377
 msgid "Column information table"
-msgstr ""
+msgstr "තීර විස්තර ගොනුව"
 
 #: libraries/config/messages.inc.php:378
 msgid "Compress connection to MySQL server"
-msgstr ""
+msgstr "MySQL සේවාදායකය වෙත සම්බන්දතාව හකුලන්න"
 
 #: libraries/config/messages.inc.php:379
 msgid "Compress connection"
-msgstr ""
+msgstr "සම්බන්දතාව හකුලන්න"
 
 #: libraries/config/messages.inc.php:380
 msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
 msgstr ""
+"සේවාදායකයට කෙසේ සම්බන්ද විය යුතුද යන්න, අනියත නම් [kbd]tcp[/kbd] ලෙස යොදන්න"
 
 #: libraries/config/messages.inc.php:381
 msgid "Connection type"
@@ -4518,23 +4550,27 @@ msgstr "සම්බන්දතා වර්ගය"
 
 #: libraries/config/messages.inc.php:382
 msgid "Control user password"
-msgstr ""
+msgstr "පරිපාලක භාවිතා කරන්නාගේ මුරපදය"
 
 #: libraries/config/messages.inc.php:383
 msgid ""
 "A special MySQL user configured with limited permissions, more information "
 "available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]"
 msgstr ""
+"සීමිත අවසර සහිතව වින්‍යාස කරන ලද විශේෂ MySQL භාවිතා කරන්නෙක්, වැඩි විස්තර "
+"සඳහා [a@http://wiki.phpmyadmin.net/pma/controluser]විකිය[/a] බලන්න"
 
 #: libraries/config/messages.inc.php:384
 msgid "Control user"
-msgstr ""
+msgstr "පරිපාලක භාවිතා කරන්නා"
 
 #: libraries/config/messages.inc.php:385
 msgid ""
 "An alternate host to hold the configuration storage; leave blank to use the "
 "already defined host"
 msgstr ""
+"වින්‍යාස ගබඩාව තබා ගැනීම සඳහා විකල්ප දායකයෙක්; දැනට අර්ථ දක්වා ඇති දායකයා "
+"භාවිතා කිරීමට හිස්ව තබන්න"
 
 #: libraries/config/messages.inc.php:386
 msgid "Control host"
@@ -4542,7 +4578,7 @@ msgstr "පාලක දායකයා"
 
 #: libraries/config/messages.inc.php:387
 msgid "Count tables when showing database list"
-msgstr ""
+msgstr "දත්තගබඩා ලැයිස්තුව පෙන්වීමේදී වගු ගණන් කරන්න"
 
 #: libraries/config/messages.inc.php:388
 msgid "Count tables"
@@ -4553,6 +4589,8 @@ msgid ""
 "Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/"
 "kbd]"
 msgstr ""
+"සැලසුම්කරණය විශේෂාංගය අනවශ්‍ය නම් හිස්ව තබන්න, යෝජිත: "
+"[kbd]pma_designer_coords[/kbd]"
 
 #: libraries/config/messages.inc.php:390
 msgid "Designer table"
@@ -4566,11 +4604,12 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:392
 msgid "Disable use of INFORMATION_SCHEMA"
-msgstr ""
+msgstr "INFORMATION_SCHEMA භාවිතය අක්‍රීය කරන්න"
 
 #: libraries/config/messages.inc.php:393
 msgid "What PHP extension to use; you should use mysqli if supported"
 msgstr ""
+"කුමන PHP දිගුව භාවිතා කල යුතුද යන්න. mysqli සහය ඇත්නම් එය භාවිතා කල යුතුය"
 
 #: libraries/config/messages.inc.php:394
 msgid "PHP extension to use"
@@ -4589,14 +4628,16 @@ msgid ""
 "Leave blank for no SQL query history support, suggested: [kbd]pma_history[/"
 "kbd]"
 msgstr ""
+"SQL විමසුම් ඉතිහාසය රඳවා ගැනීමේ විශේෂාංගය අනවශ්‍ය නම් හිස්ව තබන්න, යෝජිත: "
+"[kbd]pma_history[/kbd]"
 
 #: libraries/config/messages.inc.php:398
 msgid "SQL query history table"
-msgstr ""
+msgstr "SQL විමසුම් ඉතිහාස වගුව"
 
 #: libraries/config/messages.inc.php:399
 msgid "Hostname where MySQL server is running"
-msgstr ""
+msgstr "MySQL සේවාදායකය ක්‍රියාත්මක දායකයේ දායක නාමය"
 
 #: libraries/config/messages.inc.php:400
 msgid "Server hostname"
@@ -4604,7 +4645,7 @@ msgstr "සේවාදායකයේ දායක නාමය"
 
 #: libraries/config/messages.inc.php:401
 msgid "Logout URL"
-msgstr ""
+msgstr "පිටවිය යුතු URLය"
 
 #: libraries/config/messages.inc.php:402
 msgid ""
@@ -4618,11 +4659,11 @@ msgstr "ගබඩා කල යුතු උපරිම වගු අභිර�
 
 #: libraries/config/messages.inc.php:404
 msgid "Try to connect without password"
-msgstr ""
+msgstr "මුරපදය නොමැතිව සම්බන්ධ වීමට උත්සාහ කරන්න"
 
 #: libraries/config/messages.inc.php:405
 msgid "Connect without password"
-msgstr ""
+msgstr "මුරපදය නොමැතිව සම්බන්ධ වන්න"
 
 #: libraries/config/messages.inc.php:406
 msgid ""
@@ -4639,20 +4680,22 @@ msgstr "සඳහන් දත්තගබඩා පමණක් පෙන්ව
 
 #: libraries/config/messages.inc.php:408 libraries/config/messages.inc.php:449
 msgid "Leave empty if not using config auth"
-msgstr ""
+msgstr "config සත්‍යාපනය භාවිතා නොකරයි නම් හිස්ව තබන්න"
 
 #: libraries/config/messages.inc.php:409
 msgid "Password for config auth"
-msgstr ""
+msgstr "config සත්‍යාපනය සඳහා මුරපදය"
 
 #: libraries/config/messages.inc.php:410
 msgid ""
 "Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]"
 msgstr ""
+"ක්‍රමානුරූපය PDF ලෙස අපනයනය කිරීමේ විශේෂාංගය අනවශ්‍ය නම් හිස්ව තබන්න, යෝජිත: "
+"[kbd]pma_pdf_pages[/kbd]"
 
 #: libraries/config/messages.inc.php:411
 msgid "PDF schema: pages table"
-msgstr ""
+msgstr "PDF ක්‍රමනුරූපයේ පිටු පිලිබඳ විස්තර අඩංගු වගුව"
 
 #: libraries/config/messages.inc.php:412
 msgid ""
@@ -4660,6 +4703,9 @@ msgid ""
 "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for "
 "no support. Suggested: [kbd]phpmyadmin[/kbd]"
 msgstr ""
+"වගු සබඳතා, පොත්සලකුණු, PDF අපනයන ආදී විශේෂාංග සඳහා භාවිතා කරන දත්තගබඩාව, "
+"පූර්ණ විස්තරයක් සඳහා [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] "
+"බලන්න. විශේෂාංග අනවශ්‍ය නම් හිස්ව තබන්න, යෝජිත: [kbd]phpmyadmin[/kbd]"
 
 #: libraries/config/messages.inc.php:413
 msgid "Database name"
@@ -4667,7 +4713,7 @@ msgstr "දත්තගබඩාවේ නම"
 
 #: libraries/config/messages.inc.php:414
 msgid "Port on which MySQL server is listening, leave empty for default"
-msgstr ""
+msgstr "MySQL සේවාදායකය සවන් දෙන පෝර්ටය, පෙරනිමි අගය සඳහා හිස්ව තබන්න"
 
 #: libraries/config/messages.inc.php:415
 msgid "Server port"
@@ -4678,6 +4724,8 @@ msgid ""
 "Leave blank for no \"persistent\" recently used tables across sessions, "
 "suggested: [kbd]pma_recent[/kbd]"
 msgstr ""
+"සැසි අතර \"කල් පවත්නා\" ලෙස මෑතදී භාවිතා කල වගු මතක තබාගැනීමේ විශේෂාංගය "
+"අනවශ්‍ය නම් හිස්ව තබන්න, යෝජිත: [kbd]pma_recent[/kbd]"
 
 #: libraries/config/messages.inc.php:417
 msgid "Recently used table"
@@ -4688,6 +4736,8 @@ msgid ""
 "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links"
 "[/a] support, suggested: [kbd]pma_relation[/kbd]"
 msgstr ""
+"[a@http://wiki.phpmyadmin.net/pma/relation]වගු අතර සම්බන්ධතා දැක්වෙන "
+"සබැඳි[/a] විශේෂාංගය අනවශ්‍ය නම් හිස්ව තබන්න, යෝජිත: [kbd]pma_relation[/kbd]"
 
 #: libraries/config/messages.inc.php:419
 msgid "Relation table"
@@ -4695,29 +4745,31 @@ msgstr "සබැඳුම් දත්ත ඇතුලත් වගුව"
 
 #: libraries/config/messages.inc.php:420
 msgid "SQL command to fetch available databases"
-msgstr ""
+msgstr "දත්තගබඩා ලබාගැනීම සඳහා SQL විධානය"
 
 #: libraries/config/messages.inc.php:421
 msgid "SHOW DATABASES command"
-msgstr ""
+msgstr "SHOW DATABASES විධානය"
 
 #: libraries/config/messages.inc.php:422
 msgid ""
 "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types"
 "[/a] for an example"
 msgstr ""
+"උදාහරණයක් ලෙස [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]සත්‍යාපන "
+"ක්‍රම[/a] බලන්න"
 
 #: libraries/config/messages.inc.php:423
 msgid "Signon session name"
-msgstr ""
+msgstr "Signon සැසි නාමය"
 
 #: libraries/config/messages.inc.php:424
 msgid "Signon URL"
-msgstr ""
+msgstr "Signon URLය"
 
 #: libraries/config/messages.inc.php:425
 msgid "Socket on which MySQL server is listening, leave empty for default"
-msgstr ""
+msgstr "MySQL සේවාදායකය සවන් දෙන සොකටය, පෙරනිමි අගය සඳහා හිස්ව තබන්න"
 
 #: libraries/config/messages.inc.php:426
 msgid "Server socket"
@@ -4725,26 +4777,30 @@ msgstr "සර්වරයේ සොකට්"
 
 #: libraries/config/messages.inc.php:427
 msgid "Enable SSL for connection to MySQL server"
-msgstr ""
+msgstr "MySQL සේවාදායකය වෙත සබඳතාවය සඳහා SSL සක්‍රීය කරන්න"
 
 #: libraries/config/messages.inc.php:428
 msgid "Use SSL"
-msgstr ""
+msgstr "SSL භාවිතා කරන්න"
 
 #: libraries/config/messages.inc.php:429
 msgid ""
 "Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]"
 msgstr ""
+"ක්‍රමානුරූපය PDF ලෙස අපනයනය කිරීමේ විශේෂාංගය අනවශ්‍ය නම් හිස්ව තබන්න, යෝජිත: "
+"[kbd]pma_table_coords[/kbd]"
 
 #: libraries/config/messages.inc.php:430
 msgid "PDF schema: table coordinates"
-msgstr ""
+msgstr "PDF ක්‍රමානුරූපය: වගු ඛණ්ඩාංක"
 
 #: libraries/config/messages.inc.php:431
 msgid ""
 "Table to describe the display columns, leave blank for no support; "
 "suggested: [kbd]pma_table_info[/kbd]"
 msgstr ""
+"දර්ෂිත තීර පිලිබඳ දත්ත අඩංගු වගුව. විශේෂාංගය අනවශ්‍ය නම් හිස්ව තබන්න; යෝජිත: "
+"[kbd]pma_table_info[/kbd]"
 
 #: libraries/config/messages.inc.php:432
 msgid "Display columns table"
@@ -4854,11 +4910,11 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:455
 msgid "Whether a user should be displayed a &quot;show all (rows)&quot; button"
-msgstr ""
+msgstr "&quot;සියලුම පේළි පෙන්වන්න&quot; සබැඳිය භාවිතා කරන්නාට පෙන්වන්නේද යන වග"
 
 #: libraries/config/messages.inc.php:456
 msgid "Allow to display all the rows"
-msgstr ""
+msgstr "සියලුම පේළි දර්ශනය කිරීමට ඉඩ ලබාදෙයි"
 
 #: libraries/config/messages.inc.php:457
 msgid ""
@@ -4880,6 +4936,7 @@ msgid ""
 "Defines whether or not type display direction option is shown when browsing "
 "a table"
 msgstr ""
+"වගුවක් පිරික්සීමේදී දර්ශන දිශාව තෝරාගැනීමට ඉඩ ලබා දෙන්නේද යන්න සඳහන් කරයි"
 
 #: libraries/config/messages.inc.php:461
 msgid "Show display direction"
@@ -4890,6 +4947,8 @@ msgid ""
 "Defines whether or not type fields should be initially displayed in edit/"
 "insert mode"
 msgstr ""
+"සංස්කරණ/ඇතුළුකිරීම් ප්‍රකාරයේදී තීර වර්ගය දක්වන ක්ෂේත්‍රය ආරම්භයේදී පෙන්විය "
+"යුතුද නැතිද යන වග"
 
 #: libraries/config/messages.inc.php:463
 msgid "Show field types"
@@ -4897,15 +4956,15 @@ msgstr "ක්ෂේත්‍රයේ වර්ගය පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:464
 msgid "Display the function fields in edit/insert mode"
-msgstr ""
+msgstr "සංස්කරණ/ඇතුළුකිරීම් ප්‍රකාරයේදී ශ්‍රිතය ක්ෂේත්‍රයන් පෙන්වයි"
 
 #: libraries/config/messages.inc.php:465
 msgid "Show function fields"
-msgstr ""
+msgstr "ශ්‍රිතය තීරුව පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:466
 msgid "Whether to show hint or not"
-msgstr ""
+msgstr "ඉඟිය පෙන්විය යුතුද නැත්ද යන වග"
 
 #: libraries/config/messages.inc.php:467
 msgid "Show hint"
@@ -4923,11 +4982,11 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:470
 msgid "Show detailed MySQL server information"
-msgstr ""
+msgstr "MySQL සේවාදායකය පිලිබඳ විස්තරාත්මක තොරතුරු පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:471
 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed"
-msgstr ""
+msgstr "phpMyAdmin විසින් සාදන ලද විමසුම් පෙන්විය යුතුදැයි සඳහන් කරයි"
 
 #: libraries/config/messages.inc.php:472
 msgid "Show SQL queries"
@@ -4937,6 +4996,8 @@ msgstr "SQL විමසුම් පෙන්වන්න"
 msgid ""
 "Defines whether the query box should stay on-screen after its submission"
 msgstr ""
+"විමසුම ක්‍රියාත්මක කිරීමෙන් පසුව විමසුම් කවුළුව තිරය මත රඳවා ගත යුතුදැයි "
+"සඳහන් කරයි"
 
 #: libraries/config/messages.inc.php:474 libraries/sql_query_form.lib.php:358
 msgid "Retain query box"
@@ -4945,6 +5006,8 @@ msgstr "විමසුම් කවුළුව රඳවාගන්න"
 #: libraries/config/messages.inc.php:475
 msgid "Allow to display database and table statistics (eg. space usage)"
 msgstr ""
+"දත්තගබඩා හා වගු වලට අදාල සංඛ්‍යාලේඛන (උදා. භාවිතා වන ඉඩ ප්‍රමාණය) පෙන්වීමට "
+"ඉඩ සලසයි"
 
 #: libraries/config/messages.inc.php:476
 msgid "Show statistics"
@@ -4955,10 +5018,12 @@ msgid ""
 "If tooltips are enabled and a database comment is set, this will flip the "
 "comment and the real name"
 msgstr ""
+"මෙවලම් ඉඟිය සක්‍රීය කර සහ දත්තගබඩා විස්තරය සිටුවා ඇත්නම්, මෙය දත්තගබඩා "
+"විස්තරය සහ නම හුවමාරුකර පෙන්වයි"
 
 #: libraries/config/messages.inc.php:478
 msgid "Display database comment instead of its name"
-msgstr ""
+msgstr "දත්තගබඩාවේ නම වෙනුවට එහි විස්තරය පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:479
 msgid ""
@@ -4970,16 +5035,17 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:480
 msgid "Display table comment instead of its name"
-msgstr ""
+msgstr "වගුවේ නම වෙනුවට විස්තරය පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:481
 msgid "Display table comments in tooltips"
-msgstr ""
+msgstr "මෙවලම් ඉඟිය ලෙස වගු විස්තරය පෙන්වන්න"
 
 #: libraries/config/messages.inc.php:482
 msgid ""
 "Mark used tables and make it possible to show databases with locked tables"
 msgstr ""
+"භාවිතා කරන ලද වගු සලකුණු කර අගුලු ළෑ වගු සහිත දත්තගබඩා පෙන්වීමට ඉඩ සලසන්න"
 
 #: libraries/config/messages.inc.php:483
 msgid "Skip locked tables"
@@ -4987,7 +5053,7 @@ msgstr "අගුලු ළෑ දත්තගබඩා මඟහරින්න
 
 #: libraries/config/messages.inc.php:488
 msgid "Requires SQL Validator to be enabled"
-msgstr ""
+msgstr "SQL වලංගු කරණය සක්‍රීය කිරීම අවශ්‍ය වේ"
 
 #: libraries/config/messages.inc.php:490
 #: libraries/display_change_password.lib.php:40
@@ -5025,24 +5091,28 @@ msgid ""
 "Suggest a database name on the &quot;Create Database&quot; form (if "
 "possible) or keep the text field empty"
 msgstr ""
+"හැකිනම් &quot;නව දත්තගබඩාවක් සාදන්න&quot; පෝරමයේ දත්තගබඩාව සඳහා නමක් යෝජනා "
+"කරන්න. එසේත් නැතිනම් පෙළ ක්ෂේත්‍රය හිස්ව තබන්න"
 
 #: libraries/config/messages.inc.php:496
 msgid "Suggest new database name"
-msgstr ""
+msgstr "නව දත්තගබඩා සඳහා නම් යෝජනා කරන්න"
 
 #: libraries/config/messages.inc.php:497
 msgid "A warning is displayed on the main page if Suhosin is detected"
-msgstr ""
+msgstr "Suhosin ඇති බව හඳුනාගතහොත් ප්‍රධාන පිටුවේ අනතුරු ඇඟවීමක් පෙන්වයි"
 
 #: libraries/config/messages.inc.php:498
 msgid "Suhosin warning"
-msgstr ""
+msgstr "Suhosin අනතුරු ඇඟවීම"
 
 #: libraries/config/messages.inc.php:499
 msgid ""
 "Textarea size (columns) in edit mode, this value will be emphasized for SQL "
 "query textareas (*2) and for query window (*1.25)"
 msgstr ""
+"සංස්කරණ ප්‍රකාරයේදී පෙළ පෙදෙසේ පළල (තීරු ගණනින්). මෙම අගය වැඩි කිරීමෙන් SQL "
+"විමසුම් පෙළ පෙදෙසේද (*2) විමසුම් කවුළුවේද (*1.25) පළල ලබා ගැනේ"
 
 #: libraries/config/messages.inc.php:500
 msgid "Textarea columns"
@@ -5053,6 +5123,8 @@ msgid ""
 "Textarea size (rows) in edit mode, this value will be emphasized for SQL "
 "query textareas (*2) and for query window (*1.25)"
 msgstr ""
+"සංස්කරණ ප්‍රකාරයේදී පෙළ පෙදෙසේ උස (පේලි ගණනින්). මෙම අගය වැඩි කිරීමෙන් SQL "
+"විමසුම් පෙළ පෙදෙසේද (*2) විමසුම් කවුළුවේද (*1.25) උස ලබා ගැනේ"
 
 #: libraries/config/messages.inc.php:502
 msgid "Textarea rows"
@@ -5060,11 +5132,11 @@ msgstr "පෙළ පෙදෙසේ උස"
 
 #: libraries/config/messages.inc.php:503
 msgid "Title of browser window when a database is selected"
-msgstr ""
+msgstr "දත්තගබඩාවක් තෝරා ඇති විට බ්‍රව්සර කවුළුවේ මාතෘකාව"
 
 #: libraries/config/messages.inc.php:505
 msgid "Title of browser window when nothing is selected"
-msgstr ""
+msgstr "කිසිවක් තෝරා නැති විට බ්‍රව්සර කවුළුවේ මාතෘකාව"
 
 #: libraries/config/messages.inc.php:506
 msgid "Default title"
@@ -5072,11 +5144,11 @@ msgstr "පෙරනිමි නාමය"
 
 #: libraries/config/messages.inc.php:507
 msgid "Title of browser window when a server is selected"
-msgstr ""
+msgstr "සේවාදායකයක් තෝරා ඇති විට බ්‍රව්සර කවුළුවේ මාතෘකාව"
 
 #: libraries/config/messages.inc.php:509
 msgid "Title of browser window when a table is selected"
-msgstr ""
+msgstr "වගුවක් තෝරා ඇති විට බ්‍රව්සර කවුළුවේ මාතෘකාව"
 
 #: libraries/config/messages.inc.php:511
 msgid ""
@@ -5172,7 +5244,7 @@ msgstr ""
 #: libraries/config/setup.forms.php:251
 #: libraries/config/user_preferences.forms.php:151 libraries/import/ldi.php:35
 msgid "CSV using LOAD DATA"
-msgstr ""
+msgstr "LOAD DATA භාවිතයෙන් CSV"
 
 #: libraries/config/setup.forms.php:260 libraries/config/setup.forms.php:353
 #: libraries/config/user_preferences.forms.php:159
@@ -5184,12 +5256,12 @@ msgstr "Open Document පැතුරුම්පත"
 #: libraries/config/setup.forms.php:267
 #: libraries/config/user_preferences.forms.php:166
 msgid "Quick"
-msgstr ""
+msgstr "කඩිනම්"
 
 #: libraries/config/setup.forms.php:271
 #: libraries/config/user_preferences.forms.php:170
 msgid "Custom"
-msgstr ""
+msgstr "අභිමත"
 
 #: libraries/config/setup.forms.php:292
 #: libraries/config/user_preferences.forms.php:190
@@ -5299,7 +5371,7 @@ msgstr "විමසුම"
 
 #: libraries/db_links.inc.php:75 libraries/relation.lib.php:132
 msgid "Designer"
-msgstr ""
+msgstr "සැලසුම්කරණය"
 
 #: libraries/db_links.inc.php:92 server_privileges.php:178
 #: server_privileges.php:1649 server_privileges.php:2038
@@ -6945,7 +7017,7 @@ msgstr "ස්වදේශී"
 
 #: libraries/replication_gui.lib.php:318 server_privileges.php:926
 msgid "This Host"
-msgstr "this host"
+msgstr "මෙම දායකයා"
 
 #: libraries/replication_gui.lib.php:324 server_privileges.php:932
 msgid "Use Host Table"
@@ -7509,7 +7581,7 @@ msgstr ""
 #. l10n: Text direction, use either ltr or rtl
 #: libraries/select_lang.lib.php:493
 msgid "ltr"
-msgstr "වමේ සිට දකුණට"
+msgstr "ltr"
 
 #: libraries/select_lang.lib.php:511 libraries/select_lang.lib.php:520
 #: libraries/select_lang.lib.php:529
@@ -7989,7 +8061,7 @@ msgstr "සේවාදායක සම්බන්ධතා collation"
 
 #: main.php:123
 msgid "Appearance Settings"
-msgstr ""
+msgstr "මුහුණුවර සම්බන්ධ සිටුවම්"
 
 # සිටුවම් = settings. Source: Glossary of Information Technology Terms - ICTA
 #: main.php:152 prefs_manage.php:272
@@ -8024,7 +8096,7 @@ msgstr "සේවාදායකයේ අක්ෂර කට්ටලය"
 
 #: main.php:195
 msgid "Web server"
-msgstr ""
+msgstr "වෙබ් සේවාදායකය"
 
 #: main.php:208
 msgid "Database client version"
@@ -8082,7 +8154,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 ""
@@ -8378,7 +8450,7 @@ msgstr "බ්‍රවුසරයේ ගබඩාවේ සිටුවම්
 
 #: prefs_manage.php:306
 msgid "Existing settings will be overwritten!"
-msgstr ""
+msgstr "වත්මන් සිටුවම් උඩින් නව සිටුවම් ලියැවේ!"
 
 #: prefs_manage.php:321
 msgid "You can reset all your settings and restore them to default values."
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 d3ede801a3..4dcc54194b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-04-06 13:06+0200\n"
-"PO-Revision-Date: 2012-04-06 21:04+0200\n"
+"PO-Revision-Date: 2012-04-07 21:06+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: slovenian <sl@li.org>\n"
 "Language: sl\n"
@@ -647,7 +647,7 @@ msgstr "Označi vse"
 #: libraries/replication_gui.lib.php:35 server_databases.php:282
 #: server_privileges.php:754 server_privileges.php:1893 tbl_structure.php:564
 msgid "Uncheck All"
-msgstr "Odznači vse"
+msgstr "Počisti vse"
 
 #: db_structure.php:579
 msgid "Check tables having overhead"
@@ -1045,7 +1045,7 @@ msgstr "Brisanje primarnega ključa/indeksa"
 
 #: js/messages.php:37
 msgid "This operation could take a long time. Proceed anyway?"
-msgstr "Ta operacija lahko traja dolgo časa. Vseeno nadaljujem?"
+msgstr "Operacija lahko traja dolgo časa. Vseeno nadaljujem?"
 
 #: js/messages.php:40
 msgid "Missing value in the form!"
@@ -2399,7 +2399,7 @@ msgstr "Edinstven"
 
 #: libraries/Index.class.php:457 tbl_tracking.php:334
 msgid "Packed"
-msgstr "Stisnjeno"
+msgstr "Stisnjen"
 
 #: libraries/Index.class.php:459 tbl_tracking.php:336
 msgid "Cardinality"
@@ -2488,7 +2488,7 @@ msgstr "Ni nobenih nedavnih tabel"
 msgid ""
 "There is no detailed status information available for this storage engine."
 msgstr ""
-"Za ta skladiščni pogon ni na voljo nobenih podrobnejših informacij o stanju."
+"Za skladiščni pogon ni na voljo nobenih podrobnejših informacij o stanju."
 
 #: libraries/StorageEngine.class.php:341
 #, php-format
@@ -2816,7 +2816,7 @@ msgstr "%s bi morali nadgraditi na različico %s ali novejšo."
 #: libraries/common.lib.php:195
 #, php-format
 msgid "Max: %s%s"
-msgstr "Največja velikost: %s%s"
+msgstr "Največja velikost: %s %s"
 
 #. l10n: Please check that translation actually exists.
 #: libraries/common.lib.php:450
@@ -3183,7 +3183,7 @@ msgstr "Wiki"
 #: libraries/config/FormDisplay.tpl.php:199
 msgid "This setting is disabled, it will not be applied to your configuration"
 msgstr ""
-"Ta nastavitev je onemogočena, zato ne bo uporabljena pri vaši konfiguraciji"
+"Nastavitev je onemogočena, zato ne bo uporabljena pri vaši konfiguraciji"
 
 #: libraries/config/FormDisplay.tpl.php:274
 #, php-format
@@ -3506,13 +3506,13 @@ msgstr "Postavi imena stolpcev v prvo vrstico"
 #: libraries/config/messages.inc.php:250 libraries/import/csv.php:76
 #: libraries/import/ldi.php:42
 msgid "Columns enclosed by"
-msgstr "Stolpci obdani z"
+msgstr "Stolpci so obdani z"
 
 #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:244
 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:81
 #: libraries/import/ldi.php:43
 msgid "Columns escaped by"
-msgstr "Stolpci izognjeni z"
+msgstr "Stolpci so izognjeni z"
 
 #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:85
 #: libraries/config/messages.inc.php:92 libraries/config/messages.inc.php:101
@@ -3530,12 +3530,12 @@ msgstr "Odstrani znake CRLF znotraj stolpcev"
 #: libraries/config/messages.inc.php:255 libraries/import/csv.php:63
 #: libraries/import/ldi.php:41
 msgid "Columns terminated by"
-msgstr "Stolpci zaključeni z"
+msgstr "Stolpci so zaključeni z"
 
 #: libraries/config/messages.inc.php:82 libraries/config/messages.inc.php:242
 #: libraries/import/csv.php:86 libraries/import/ldi.php:44
 msgid "Lines terminated by"
-msgstr "Vrstice zaključene z"
+msgstr "Vrstice so zaključene z"
 
 #: libraries/config/messages.inc.php:84
 msgid "Excel edition"
@@ -4046,8 +4046,8 @@ msgid ""
 "Default format; be aware that this list depends on location (database, "
 "table) and only SQL is always available"
 msgstr ""
-"Privzeta oblika; pomnite, da je seznam odvisen od položaja (podatkovna "
-"zbirka, tabela) in vedno je na voljo samo SQL"
+"Privzeta oblika; pomnite, da je seznam odvisen od položaja (zbirka podatkov, "
+"tabela) in vedno je na voljo samo SQL"
 
 #: libraries/config/messages.inc.php:249
 msgid "Format of imported file"
@@ -4072,7 +4072,7 @@ msgstr "Uvozi denarne enote ($5.00 v 5.00)"
 
 #: libraries/config/messages.inc.php:259
 msgid "Import percentages as proper decimals (12.00% to .12)"
-msgstr "Uvozi odstotke kot ustrezne decimalne vrednosti (12.00% v ,12)"
+msgstr "Uvozi odstotke kot ustrezne decimalne vrednosti (12.00% v .12)"
 
 #: libraries/config/messages.inc.php:260
 msgid "Number of queries to skip from start"
@@ -4298,12 +4298,12 @@ msgstr "Uporabniki ne morejo določiti višje vrednosti"
 #: libraries/config/messages.inc.php:310
 msgid "Maximum number of databases displayed in left frame and database list"
 msgstr ""
-"Največje število podatkovnih zbirk prikazanih v levem okvirju in na seznamu "
+"Največje število zbirk podatkov, prikazanih v levem okvirju in na seznamu "
 "zbirk podatkov"
 
 #: libraries/config/messages.inc.php:311
 msgid "Maximum databases"
-msgstr "Največ podatkovnih zbirk"
+msgstr "Največ zbirk podatkov"
 
 #: libraries/config/messages.inc.php:312
 msgid ""
@@ -4644,7 +4644,7 @@ msgstr "Krmilni gostitelj"
 
 #: libraries/config/messages.inc.php:387
 msgid "Count tables when showing database list"
-msgstr "Preštej tabele med prikazovanjem seznama podatkovnih zbirk"
+msgstr "Preštej tabele med prikazovanjem seznama zbirk podatkov"
 
 #: libraries/config/messages.inc.php:388
 msgid "Count tables"
@@ -6257,8 +6257,8 @@ msgid ""
 "The percentage of garbage in a data log file before it is compacted. This is "
 "a value between 1 and 99. The default is 50."
 msgstr ""
-"Odstotek smeti v dnevniški datoteki, preden je ta stisnjena. Vrednost je med "
-"1 in 99. Privzeto je 50."
+"Odstotek smeti v dnevniški datoteki, preden je stisnjena. Vrednost je med 1 "
+"in 99. Privzeto je 50."
 
 #: libraries/engines/pbxt.lib.php:62
 msgid "Log buffer size"
@@ -6442,7 +6442,7 @@ msgstr "PDF"
 
 #: libraries/export/pdf.php:24
 msgid "(Generates a report containing the data of a single table)"
-msgstr "(Ustvari poročilo, ki vsebuje podatke tabele same)"
+msgstr "(Ustvari poročilo, ki vsebuje podatke ene tabele)"
 
 #: libraries/export/pdf.php:25
 msgid "Report title:"
@@ -6483,7 +6483,7 @@ msgstr ""
 #: libraries/export/sql.php:180
 #, php-format
 msgid "Add %s statement"
-msgstr "Dodaj %s izjavo"
+msgstr "Dodaj izjavo %s"
 
 #: libraries/export/sql.php:152
 msgid "Add statements:"
@@ -6562,8 +6562,8 @@ msgid ""
 "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes "
 "0x616263)</i>"
 msgstr ""
-"Odloži dvojiške stolpce v šestnajstiškem zapisu <i>(na primer, \"abc\" "
-"postane 0x616263)</i>"
+"Odloži dvojiške stolpce v šestnajstiškem zapisu <i>(na primer: \"abc\" postane "
+"0x616263)</i>"
 
 #: libraries/export/sql.php:302
 msgid ""
@@ -6760,12 +6760,12 @@ msgstr "Imena stolpcev"
 
 #: libraries/import/ldi.php:57
 msgid "This plugin does not support compressed imports!"
-msgstr "Ta vtičnik ne podpira stisnjenih uvozov!"
+msgstr "Vtičnik ne podpira stisnjenih uvozov!"
 
 #: libraries/import/ods.php:35
 msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
 msgstr ""
-"Uvozi odstotke kot ustrezne decimalne vrednosti <i>(npr. 12.00% v ,12)</i>"
+"Uvozi odstotke kot ustrezne decimalne vrednosti <i>(npr. 12.00% v .12)</i>"
 
 #: libraries/import/ods.php:36
 msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>"
@@ -7056,7 +7056,7 @@ msgstr "Osveži okvir navigacije"
 
 #: libraries/plugin_interface.lib.php:284
 msgid "This format has no options"
-msgstr "Za to obliko ni možnosti"
+msgstr "Oblika nima nobenih možnosti"
 
 #: libraries/relation.lib.php:76
 msgid "not OK"
@@ -7125,11 +7125,11 @@ msgstr "Hitri koraki za namestitev naprednih funkcij:"
 #: libraries/relation.lib.php:154
 msgid ""
 "Create the needed tables with the <code>examples/create_tables.sql</code>."
-msgstr "Ustvari potrebne tabele s <code>examples/create_tables.sql</code>."
+msgstr "Ustvarite potrebne tabele s <code>examples/create_tables.sql</code>."
 
 #: libraries/relation.lib.php:155
 msgid "Create a pma user and give access to these tables."
-msgstr "Ustvari uporabnika pma in dovoli dostop do teh tabel."
+msgstr "Ustvarite uporabnika pma in mu dodelite dostop do teh tabel."
 
 #: libraries/relation.lib.php:156
 msgid ""
@@ -7694,7 +7694,7 @@ msgstr "Shema zbirke podatkov %s - Stran %s"
 
 #: libraries/schema/Export_Relation_Schema.class.php:200
 msgid "This page does not contain any tables!"
-msgstr "Ta stran ne vsebuje nobenih tabel!"
+msgstr "Stran ne vsebuje nobenih tabel!"
 
 #: libraries/schema/Export_Relation_Schema.class.php:228
 msgid "SCHEMA ERROR: "
@@ -7891,7 +7891,7 @@ msgstr "Izvedi poizvedbo/poizvedbe SQL na strežniku %s"
 #: libraries/sql_query_form.lib.php:213 libraries/sql_query_form.lib.php:235
 #, php-format
 msgid "Run SQL query/queries on database %s"
-msgstr "Izvedi poizvedbo/poizvedbe SQL na podatkovni zbirki %s"
+msgstr "Izvedi poizvedbo/poizvedbe SQL na zbirki podatkov %s"
 
 #: libraries/sql_query_form.lib.php:267 navigation.php:259
 #: setup/frames/index.inc.php:233
@@ -7939,8 +7939,8 @@ msgid ""
 "There seems to be an error in your SQL query. The MySQL server error output "
 "below, if there is any, may also help you in diagnosing the problem"
 msgstr ""
-"Izgleda, da je v poizvedbi SQL prišlo do napake. Če je strežnik MySQL "
-"izpisal napako, vam le-ta lahko pomaga pri odkrivanju težav"
+"Kaže, da je v poizvedbi SQL prišlo do napake. Če je strežnik MySQL izpisal "
+"napako, vam le-ta lahko pomaga pri odkrivanju težav"
 
 #: libraries/sqlparser.lib.php:176
 msgid ""
@@ -8062,8 +8062,8 @@ msgid ""
 msgstr ""
 "Vrednosti za možnosti pretvorbe vnesite v naslednji obliki: 'a', 100, "
 "b,'c'...<br />Če želite med vrednosti vnesti poševnico nazaj (\"\\\") ali "
-"enojni narekovaj (\"'\"), morate pred ta znak postaviti (še eno) poševnico "
-"nazaj (npr. '\\\\xyz' ali 'a\\'b')."
+"enojni narekovaj (\"'\"), morate pred znak postaviti (še eno) poševnico nazaj "
+"(npr. '\\\\xyz' ali 'a\\'b')."
 
 #: libraries/tbl_properties.inc.php:321
 msgid "ENUM or SET data too long?"
@@ -8399,7 +8399,7 @@ msgid ""
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
-"V vaši konfiguraciji PHP ste omogočili mbstring.func_overload. Ta možnost ni "
+"V vaši konfiguraciji PHP ste omogočili mbstring.func_overload. Možnost ni "
 "združljiva s phpMyAdminom in lahko pokvari nekatere podatke!"
 
 #: main.php:284
@@ -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 ""
@@ -8889,7 +8889,7 @@ msgstr "Omogoča ustvarjanje in brisanje shranjenih rutin."
 #: server_privileges.php:94 server_privileges.php:270
 #: server_privileges.php:696
 msgid "Allows creating new databases and tables."
-msgstr "Omogoča ustvarjanje novih podatkovnih zbirk in tabel."
+msgstr "Omogoča ustvarjanje novih zbirk podatkov in tabel."
 
 #: server_privileges.php:95 server_privileges.php:356
 #: server_privileges.php:702
@@ -8924,7 +8924,7 @@ msgstr "Omogoča brisanje podatkov."
 #: server_privileges.php:101 server_privileges.php:274
 #: server_privileges.php:699
 msgid "Allows dropping databases and tables."
-msgstr "Omogoča brisanje podatkovnih zbirk in tabel."
+msgstr "Omogoča brisanje zbirk podatkov in tabel."
 
 #: server_privileges.php:102 server_privileges.php:699
 msgid "Allows dropping tables."
@@ -9028,7 +9028,7 @@ msgstr "Omogoča branje podatkov."
 #: server_privileges.php:120 server_privileges.php:306
 #: server_privileges.php:729
 msgid "Gives access to the complete list of databases."
-msgstr "Omogoča dostop do popolnega spiska podatkovnih zbirk."
+msgstr "Omogoča dostop do popolnega spiska zbirk podatkov."
 
 #: server_privileges.php:121 server_privileges.php:347
 #: server_privileges.php:352 server_privileges.php:701
@@ -9229,7 +9229,7 @@ msgstr "Privilegiji tipični za stolpec"
 
 #: server_privileges.php:2246
 msgid "Add privileges on the following database"
-msgstr "Dodaj privilegije na naslednji podatkovni zbirki"
+msgstr "Dodaj privilegije na naslednji zbirki podatkov"
 
 #: server_privileges.php:2264
 msgid "Wildcards % and _ should be escaped with a \\ to use them literally"
@@ -9272,7 +9272,7 @@ msgstr ""
 
 #: server_privileges.php:2355
 msgid "Database for user"
-msgstr "Podatkovna zbirka za uporabnika"
+msgstr "Zbirka podatkov za uporabnika"
 
 #: server_privileges.php:2357
 msgid "Create database with same name and grant all privileges"
@@ -9336,8 +9336,7 @@ msgstr "Glavni strežnik je uspešno spremenjen v %s"
 
 #: server_replication.php:210
 msgid "This server is configured as master in a replication process."
-msgstr ""
-"Ta strežnik je konfiguriran kot glavni strežnik v postopku podvojevanja."
+msgstr "Strežnik je konfiguriran kot glavni strežnik v postopku podvojevanja."
 
 #: server_replication.php:212 server_status.php:614
 msgid "Show master status"
@@ -9353,8 +9352,8 @@ msgid ""
 "This server is not configured as master in a replication process. Would you "
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
-"Ta strežnik ni konfiguriran kot glavni strežnik v postopku podvojevanja. Ali "
-"ga želite <a href=\"%s\">konfigurirati</a>?"
+"Strežnik ni konfiguriran kot glavni strežnik v postopku podvojevanja. Ga "
+"želite <a href=\"%s\">konfigurirati</a>?"
 
 #: server_replication.php:247
 msgid "Master configuration"
@@ -9368,7 +9367,7 @@ msgid ""
 "ignore all databases by default and allow only certain databases to be "
 "replicated. Please select the mode:"
 msgstr ""
-"Ta strežnik ni konfiguriran kot glavni strežnik v postopku podvojevanja. "
+"Strežnik ni konfiguriran kot glavni strežnik v postopku podvojevanja. "
 "Izbirate lahko med ali podvojevanjem vseh zbirk podatkov in prezrtjem "
 "nekaterih (uporabno, če želite podvojiti večino zbirk podatkov) ali "
 "prezrtjem vseh zbirk podatkov po privzetem in podvojitvijo samo določenih "
@@ -9400,8 +9399,8 @@ msgid ""
 "should see a message informing you, that this server <b>is</b> configured as "
 "master"
 msgstr ""
-"Ko enkrat ponovno zažetene strežnik MySQL, prosimo, kliknite na gumb Pojdi. "
-"Nato bi morali videti sporočilo, ki vam sporoča, da ta strežnik <b>je</b> "
+"Ko enkrat ponovno zaženete strežnik MySQL, prosimo, kliknite na gumb Pojdi. "
+"Nato bi morali videti sporočilo, ki vam sporoča, da <b>je</b> strežnik "
 "konfiguriran kot glavni strežnik"
 
 #: server_replication.php:323
@@ -9486,8 +9485,8 @@ msgid ""
 "This server is not configured as slave in a replication process. Would you "
 "like to <a href=\"%s\">configure</a> it?"
 msgstr ""
-"Ta strežnik ni konfiguriran kot podrejenec v postopku podvojevanja. Ali ga "
-"želite <a href=\"%s\">konfigurirati</a>?"
+"Strežnik ni konfiguriran kot podrejenec v postopku podvojevanja. Ga želite "
+"<a href=\"%s\">konfigurirati</a>?"
 
 #: server_status.php:447
 #, php-format
@@ -9498,7 +9497,7 @@ msgstr "Nit %s je bila prekinjena."
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
-msgstr "phpMyAdmin ni uspel prekiniti teme %s. Verjetno je že prekinjena."
+msgstr "phpMyAdmin ni uspel prekiniti niti %s. Verjetno je že prekinjena."
 
 #: server_status.php:581
 msgid "Handler"
@@ -9622,9 +9621,8 @@ msgid ""
 "calculations and by rule of thumb which may not necessarily apply to your "
 "system."
 msgstr ""
-"Kakor koli, pomnite, da ta sistem nudi priporočila, ki temeljijo na "
-"preprostih računih in splošnih smernicah, katere morda ne ustrezajo vašemu "
-"sistemu."
+"Kakor koli, pomnite, da sistem nudi priporočila, ki temeljijo na preprostih "
+"računih in splošnih smernicah, ki morda ne ustrezajo vašemu sistemu."
 
 #: server_status.php:905
 msgid ""
@@ -9651,7 +9649,7 @@ msgstr ""
 #: server_status.php:929
 #, php-format
 msgid "Questions since startup: %s"
-msgstr "Vprašanja od zagona: %s"
+msgstr "Vprašanj od zagona: %s"
 
 #: server_status.php:965 tbl_printview.php:328 tbl_structure.php:833
 msgid "Statements"
@@ -9853,7 +9851,7 @@ msgid ""
 "The number of requests to read a row based on a key. If this is high, it is "
 "a good indication that your queries and tables are properly indexed."
 msgstr ""
-"Število zahtev za branje vrstice temelječih na ključu. Če je ta vrednost "
+"Število zahtev za branje vrstice, temelječih na ključu. Če je vrednost "
 "visoka, je to dober znak, da so vaše poizvedbe in tabele primerno "
 "indeksirane."
 
@@ -9872,7 +9870,7 @@ msgid ""
 "The number of requests to read the previous row in key order. This read "
 "method is mainly used to optimize ORDER BY ... DESC."
 msgstr ""
-"Število poizvedb za branje prejšnje vrstice v zaporedju ključa. Ta postopek "
+"Število poizvedb za branje prejšnje vrstice v zaporedju ključa. Postopek "
 "branja se uporablja predvsem za optimizacijo ORDER BY ... DESC."
 
 #: server_status.php:1313
@@ -9991,10 +9989,10 @@ msgid ""
 "properly, this value should be small."
 msgstr ""
 "Po navadi pisanje v zalogo medpomnilnika InnoDB poteka v ozadju. Če pa je "
-"potrebno brati ali ustvariti stran in na voljo ni nobene čiste strani, je "
-"potrebno počakati, da se strani najprej izplaknejo. Ta števec šteje primere "
-"teh čakanj. Če je bila velikost zaloge medpomnilnika primerno nastavljena, "
-"bi morala biti ta vrednost majhna."
+"potrebno brati ali ustvariti stran in ni na voljo nobene čiste strani, je "
+"potrebno počakati, da se strani najprej izplaknejo. Števec šteje primere teh "
+"čakanj. Če je bila velikost zaloge medpomnilnika primerno nastavljena, bi "
+"morala biti vrednost majhna."
 
 #: server_status.php:1330
 msgid "The number writes done to the InnoDB buffer pool."
@@ -10268,7 +10266,7 @@ msgid ""
 "decide which queries to remove from the cache."
 msgstr ""
 "Število poizvedb, ki so bile izbrisane iz predpomnilnika, da se sprosti "
-"spomin za predpomnenje novih poizvedb. Ta informacija lahko pomaga pri "
+"spomin za predpomnenje novih poizvedb. Informacija lahko pomaga pri "
 "uravnavanju velikosti predpomnilnika poizvedb. Predpomnilnik poizvedb "
 "uporablja strategijo nedavno najmanj uporabljanih (LRU), da odloči, katere "
 "poizvedbe naj odstrani iz predpomnilnika."
@@ -10298,7 +10296,7 @@ msgid ""
 "The number of joins that do not use indexes. If this value is not 0, you "
 "should carefully check the indexes of your tables."
 msgstr ""
-"Število stikov, ki ne uporabljajo indeksov. Če ta vrednost ni 0, skrbno "
+"Število stikov, ki ne uporabljajo indeksov. Če vrednost ni 0, skrbno "
 "preverite indekse vaših tabel."
 
 #: server_status.php:1388
@@ -10362,7 +10360,7 @@ msgid ""
 "system variable."
 msgstr ""
 "Število prehodov spajanja, ki jih je moral opraviti algoritem razvrščanja. "
-"Če je ta vrednost velika, razmislite o povečanju sistemske spremenljivke "
+"Če je vrednost velika, razmislite o povečanju sistemske spremenljivke "
 "sort_buffer_size."
 
 #: server_status.php:1398
@@ -10400,8 +10398,8 @@ msgid ""
 "raise your thread_cache_size."
 msgstr ""
 "Število niti v predpomnilniku niti. Delež zadetkov predpomnilnika se lahko "
-"izračuna kot Threads_created/Connections. Če je ta vrednost rdeča, povečajte "
-"vaš thread_cache_size."
+"izračuna kot Threads_created/Connections. Če je vrednost obarvana rdeče, "
+"povečajte svoj thread_cache_size."
 
 #: server_status.php:1404
 msgid "The number of currently open connections."
@@ -10646,7 +10644,7 @@ msgstr "Ne morem se povezati s ciljem"
 #: tbl_get_field.php:19
 #, php-format
 msgid "'%s' database does not exist."
-msgstr "Podatkovna zbirka '%s' ne obstaja."
+msgstr "Zbirka podatkov '%s' ne obstaja."
 
 #: server_synchronize.php:294
 msgid "Structure Synchronization"
@@ -10743,8 +10741,8 @@ msgid ""
 "Target database will be completely synchronized with source database. Source "
 "database will remain unchanged."
 msgstr ""
-"Ciljna podatkovna zbirka bo popolnoma sinhronizirana z izvorno podatkovno "
-"zbirko. Izvorna podatkovna zbirka bo ostala nespremenjena."
+"Ciljna zbirka podatkov bo popolnoma sinhronizirana z izvorno zbirko "
+"podatkov. Izvorna zbirka podatkov bo ostala nespremenjena."
 
 #: server_variables.php:73
 msgid "Setting variable failed"
@@ -10948,8 +10946,8 @@ msgid ""
 msgstr ""
 "Ta %smožnost%s naj bo onemogočena, saj omogoča napadalcem, da se z načinom "
 "bruteforce prijavijo v kateri koli strežnik MySQL. Če menite, da je to "
-"potrebno, uporabite %sseznam zaupanih proxyjev%s. Kakor koli, zaščita "
-"temelječa na IP ni zanesljiva, če vaš IP pripada ISP-ju, na katerega je "
+"potrebno, uporabite %sseznam zaupanih proxyjev%s. Kakor koli, zaščita, "
+"temelječa na IP, ni zanesljiva, če vaš IP pripada ISP-ju, na katerega je "
 "povezanih tisoče uporabnikov, vključno z vami."
 
 #: setup/lib/index.lib.php:273
@@ -10976,9 +10974,8 @@ msgid ""
 "This value should be double checked to ensure that this directory is neither "
 "world accessible nor readable or writable by other users on your server."
 msgstr ""
-"Ta vrednost naj bo ponovno preverjena, za zagotovitev, da ta mapa ni "
-"dostopna ne svetu ne na voljo za branje ali pisanje drugim uporabnikom na "
-"vašem strežniku."
+"Vrednost ponovno preverite, da se prepričate, da mapa ni dostopna ne svetu "
+"in ne na voljo za branje ali pisanje drugim uporabnikom na vašem strežniku."
 
 #: setup/lib/index.lib.php:277
 #, php-format
@@ -11160,7 +11157,7 @@ msgstr "in potem"
 
 #: tbl_change.php:1088
 msgid "Go back to previous page"
-msgstr "Nazaj na prejšnjo stran"
+msgstr "Pojdi nazaj na prejšnjo stran"
 
 #: tbl_change.php:1089
 msgid "Insert another new row"
@@ -12217,7 +12214,7 @@ msgid ""
 msgstr ""
 "Predpomnilnik je trenutno %s-%% razdrobljen, pri čemer 100-%% razdrobljenost "
 "pomeni, da je predpomnilnik poizvedb izmeničen vzorec prostih in "
-"uporabljenih blokov. Ta vrednost bi morala biti pod 20 %%."
+"uporabljenih blokov. Vrednost bi morala biti pod 20 %%."
 
 #: libraries/advisory_rules.txt:165
 msgid "Query cache low memory prunes"
@@ -12333,8 +12330,8 @@ msgid ""
 "%s%% of all sorts cause temporary tables, this value should be lower than "
 "10%%."
 msgstr ""
-"%s %% vseh razvrščanj povzroča začasne tabele; ta vrednost bi morala biti "
-"nižja od 10 %%."
+"%s %% vseh razvrščanj povzroča začasne tabele; vrednost bi morala biti nižja "
+"od 10 %%."
 
 #: libraries/advisory_rules.txt:195
 msgid "Rate of sorts that cause temporary tables"
@@ -12345,7 +12342,7 @@ msgstr "Delež razvrščanj, ki povzroča začasne tabele"
 msgid ""
 "Temporary tables average: %s, this value should be less than 1 per hour."
 msgstr ""
-"Povprečje začasnih tabel: %s; ta vrednost bi morala biti manj kot 1 na uro."
+"Povprečje začasnih tabel: %s; vrednost bi morala biti manj kot 1 na uro."
 
 #: libraries/advisory_rules.txt:202
 msgid "Sort rows"
@@ -12391,8 +12388,7 @@ msgstr ""
 #: libraries/advisory_rules.txt:215
 #, php-format
 msgid "Table joins average: %s, this value should be less than 1 per hour"
-msgstr ""
-"Povprečje stikov tabel: %s; ta vrednost bi morala biti manj kot 1 na uro"
+msgstr "Povprečje stikov tabel: %s; vrednost bi morala biti manj kot 1 na uro"
 
 #: libraries/advisory_rules.txt:217
 msgid "Rate of reading first index entry"
@@ -12422,8 +12418,8 @@ msgstr ""
 #, php-format
 msgid "Index scans average: %s, this value should be less than 1 per hour"
 msgstr ""
-"Povprečje pregledovanja indeksov: %s; ta vrednost bi morala biti manj kot 1 "
-"na uro"
+"Povprečje pregledovanja indeksov: %s; vrednost bi morala biti manj kot 1 na "
+"uro"
 
 #: libraries/advisory_rules.txt:224
 msgid "Rate of reading fixed position"
@@ -12449,8 +12445,8 @@ msgid ""
 "Rate of reading fixed position average: %s, this value should be less than 1 "
 "per hour"
 msgstr ""
-"Delež povprečja branja stalnega položaja: %s; ta vrednost bi morala biti "
-"manj kot 1 na uro"
+"Delež povprečja branja stalnega položaja: %s; vrednost bi morala biti manj "
+"kot 1 na uro"
 
 #: libraries/advisory_rules.txt:231
 msgid "Rate of reading next table row"
@@ -12473,7 +12469,7 @@ msgstr ""
 msgid ""
 "Rate of reading next table row: %s, this value should be less than 1 per hour"
 msgstr ""
-"Delež branja naslednje vrstice v tabeli: %s; ta vrednost bi morala biti manj "
+"Delež branja naslednje vrstice v tabeli: %s; vrednost bi morala biti manj "
 "kot 1 na uro"
 
 #: libraries/advisory_rules.txt:239
@@ -12536,8 +12532,8 @@ msgid ""
 "%s%% of all temporary tables are being written to disk, this value should be "
 "below 25%%"
 msgstr ""
-"%s %% vseh začasnih tabel je zapisanih na disk; ta vrednost bi morala biti "
-"pod 25 %%"
+"%s %% vseh začasnih tabel je zapisanih na disk; vrednost bi morala biti pod "
+"25 %%"
 
 #: libraries/advisory_rules.txt:253
 msgid "Temp disk rate"
@@ -12567,8 +12563,8 @@ msgid ""
 "Rate of temporary tables being written to disk: %s, this value should be "
 "less than 1 per hour"
 msgstr ""
-"Delež začasnih tabel, pisanih na disk: %s; ta vrednost bi morala biti manj "
-"kot 1 na uro"
+"Delež začasnih tabel, pisanih na disk: %s; vrednost bi morala biti manj kot "
+"1 na uro"
 
 #: libraries/advisory_rules.txt:273
 msgid "MyISAM key buffer size"
@@ -12618,7 +12614,7 @@ msgstr ""
 msgid ""
 "max %% MyISAM key buffer ever used: %s%%, this value should be above 95%%"
 msgstr ""
-"največji %% kadar koli uporabljenega medpomnilnika ključev MyISAM: %s %%; ta "
+"največji %% kadar koli uporabljenega medpomnilnika ključev MyISAM: %s %%; "
 "vrednost bi morala biti nad 95 %%"
 
 #: libraries/advisory_rules.txt:288
@@ -12629,7 +12625,7 @@ msgstr "Odstotek uporabljenega medpomnilnika ključev MyISAM"
 #, php-format
 msgid "%% MyISAM key buffer used: %s%%, this value should be above 95%%"
 msgstr ""
-"%% uporabljenega medpomnilnika ključev MyISAM: %s %%; ta vrednost bi morala "
+"%% uporabljenega medpomnilnika ključev MyISAM: %s %%; vrednost bi morala "
 "biti nad 95 %%"
 
 #: libraries/advisory_rules.txt:295
@@ -12643,13 +12639,12 @@ msgstr "%% indeksov, ki uporabljajo medpomnilnik ključev MyISAM, je nizek."
 
 #: libraries/advisory_rules.txt:299
 msgid "You may need to increase {key_buffer_size}."
-msgstr "Mord boste morali povečati {key_buffer_size}."
+msgstr "Morda boste morali povečati {key_buffer_size}."
 
 #: libraries/advisory_rules.txt:300
 #, php-format
 msgid "Index reads from memory: %s%%, this value should be above 95%%"
-msgstr ""
-"Branj indeksov iz pomnilnika: %s %%; ta vrednost bi morala biti nad 95 %%"
+msgstr "Branj indeksov iz pomnilnika: %s %%; vrednost bi morala biti nad 95 %%"
 
 #: libraries/advisory_rules.txt:304
 msgid "Rate of table open"
@@ -12670,7 +12665,7 @@ msgstr ""
 #: libraries/advisory_rules.txt:309
 #, php-format
 msgid "Opened table rate: %s, this value should be less than 10 per hour"
-msgstr "Delež odprtih tabel: %s; ta vrednost bi morala biti manj kot 10 na uro"
+msgstr "Delež odprtih tabel: %s; vrednost bi morala biti manj kot 10 na uro"
 
 #: libraries/advisory_rules.txt:311
 msgid "Percentage of used open files limit"
@@ -12709,7 +12704,7 @@ msgstr "Delež odprtih datotek je visok."
 #: libraries/advisory_rules.txt:323
 #, php-format
 msgid "Opened files rate: %s, this value should be less than 5 per hour"
-msgstr "Delež odprtih datotek: %s; ta vrednost bi morala biti pod 5 na uro"
+msgstr "Delež odprtih datotek: %s; vrednost bi morala biti pod 5 na uro"
 
 #: libraries/advisory_rules.txt:325
 #, php-format
@@ -12729,7 +12724,7 @@ msgstr ""
 #: libraries/advisory_rules.txt:330
 #, php-format
 msgid "Immediate table locks: %s%%, this value should be above 95%%"
-msgstr "Takojšnji zaklepi tabel: %s %%; ta vrednost bi morala biti nad 95 %%"
+msgstr "Takojšnji zaklepi tabel: %s %%; vrednost bi morala biti nad 95 %%"
 
 #: libraries/advisory_rules.txt:332
 msgid "Table lock wait rate"
@@ -12739,8 +12734,7 @@ msgstr "Delež čakanja na zaklep tabel"
 #, php-format
 msgid "Table lock wait rate: %s, this value should be less than 1 per hour"
 msgstr ""
-"Delež čakanja na zaklep tabel: %s; ta vrednost bi morala biti manj kot 1 na "
-"uro"
+"Delež čakanja na zaklep tabel: %s; vrednost bi morala biti manj kot 1 na uro"
 
 #: libraries/advisory_rules.txt:339
 msgid "Thread cache"
@@ -12781,8 +12775,7 @@ msgstr "Povečajte {thread_cache_size}."
 #, php-format
 msgid "Thread cache hitrate: %s%%, this value should be above 80%%"
 msgstr ""
-"Delež zadetkov predpomnilnika niti: %s %%; ta vrednost bi morala biti nad 80 "
-"%%"
+"Delež zadetkov predpomnilnika niti: %s %%; vrednost bi morala biti nad 80 %%"
 
 #: libraries/advisory_rules.txt:353
 msgid "Threads that are slow to launch"
@@ -12878,7 +12871,7 @@ msgstr ""
 #: libraries/advisory_rules.txt:381
 #, php-format
 msgid "%s%% of all connections are aborted. This value should be below 1%%"
-msgstr "%s %% vseh povezav je prekinjenih. Ta vrednost bi morala biti pod 1 %%"
+msgstr "%s %% vseh povezav je prekinjenih. Vrednost bi morala biti pod 1 %%"
 
 #: libraries/advisory_rules.txt:383
 msgid "Rate of aborted connections"
@@ -12889,7 +12882,7 @@ msgstr "Delež prekinjenih povezav"
 msgid ""
 "Aborted connections rate is at %s, this value should be less than 1 per hour"
 msgstr ""
-"Delež prekinjenih povezav je %s; ta vrednost bi morala biti manj kot 1 na uro"
+"Delež prekinjenih povezav je %s; vrednost bi morala biti manj kot 1 na uro"
 
 #: libraries/advisory_rules.txt:390
 msgid "Percentage of aborted clients"
@@ -12912,8 +12905,7 @@ msgstr ""
 #: libraries/advisory_rules.txt:395
 #, php-format
 msgid "%s%% of all clients are aborted. This value should be below 2%%"
-msgstr ""
-"%s %% vseh odjemalcev je prekinjenih. Ta vrednost bi morala biti pod 2 %%"
+msgstr "%s %% vseh odjemalcev je prekinjenih. Vrednost bi morala biti pod 2 %%"
 
 #: libraries/advisory_rules.txt:397
 msgid "Rate of aborted clients"
@@ -12923,8 +12915,8 @@ msgstr "Delež prekinjenih objemalcev"
 #, php-format
 msgid "Aborted client rate is at %s, this value should be less than 1 per hour"
 msgstr ""
-"Delež prekinjenih objemalcev je %s; ta vrednost bit morala biti manj kot 1 "
-"na uro"
+"Delež prekinjenih objemalcev je %s; vrednost bi morala biti manj kot 1 na "
+"uro"
 
 #: libraries/advisory_rules.txt:406
 msgid "Is InnoDB disabled?"
@@ -12969,14 +12961,14 @@ msgid ""
 msgstr ""
 "Še posebej na sistemu z veliko pisanji v tabele InnoDB bi morali nastaviti "
 "innodb_log_file_size na 25 %% {innodb_buffer_pool_size}. Kakor koli, večja "
-"je ta vrednost, daljši bo čas obnovitve po zrušitvi zbirke podatkov, zato te "
+"je vrednost, daljši bo čas obnovitve po zrušitvi zbirke podatkov, zato "
 "vrednosti ne nastavite na več kot 256 MiB. Kljub temu pomnite, da vrednosti "
 "te spremenljivke ne morete preprosto spremeniti. Zaustaviti morate strežnik, "
 "odstraniti dnevniške datoteke InnoDB, nastaviti novo vrednost v my.cnf, "
 "zagnati strežnik in nato preveriti dnevnike napak, če je vse potekalo v "
-"redu. Oglejte si tudi <a href=\"http://mysqldatabaseadministration.blogspot."
-"com/2007/01/increase-innodblogfilesize-proper-way.html\">to objavo na blogu</"
-"a>"
+"redu. Oglejte si tudi <a "
+"href=\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-"
+"innodblogfilesize-proper-way.html\">to objavo na blogu</a>"
 
 #: libraries/advisory_rules.txt:418
 #, php-format
@@ -13051,11 +13043,11 @@ msgstr ""
 "zbirk podatkov, ki kot skladiščni pogon uporabljajo samo InnoDB in ne "
 "poganjajo drugih storitev (npr. spletnega strežnika), lahko nastavite to na "
 "do 80 %% vašega pomnilnika, ki je na voljo. Če ni težava v tem, boste morali "
-"pazljivo določiti porabo pomnilnika drugim storitvam in ne-InnoDB-tabelam "
+"pazljivo določiti porabo pomnilnika drugim storitvam in tabelam ne-InnoDB "
 "ter ustrezno nastaviti to spremenljivko. Če je nastavljena previsoko, bo vaš "
-"sistem začel izmenjevati, kar bo občutno zmanjšalo učinkovitost. Oglejte si "
-"tudi <a href=\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-"
-"innodb_buffer_pool_size/\">ta članek</a>"
+"sistem začel z izmenjevanjem, kar bo občutno zmanjšalo učinkovitost. "
+"Oglejte si tudi <a href=\"http://www.mysqlperformanceblog.com/2007/11/03"
+"/choosing-innodb_buffer_pool_size/\">ta članek</a>"
 
 #: libraries/advisory_rules.txt:432
 #, php-format
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/sql.php b/sql.php
index 77e2e81c65..69b4c2447b 100644
--- a/sql.php
+++ b/sql.php
@@ -763,11 +763,9 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
     }
 
     if (isset($GLOBALS['querytime'])) {
-        $_querytime = PMA_Message::notice(__('Query took %01.4f sec'));
+        $_querytime = PMA_Message::notice('(' . __('Query took %01.4f sec') . ')');
         $_querytime->addParam($GLOBALS['querytime']);
-        $message->addMessage('(');
         $message->addMessage($_querytime);
-        $message->addMessage(')');
     }
 
     if ($GLOBALS['is_ajax_request'] == true) {
diff --git a/tbl_create.php b/tbl_create.php
index 55d76ba9a6..ca4b41182b 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -186,8 +186,8 @@ if (isset($_REQUEST['do_save_data'])) {
      . ' (' . $sql_query . ')';
 
     // Adds table type, character set, comments and partition definition
-    if (!empty($_REQUEST['tbl_type']) && ($_REQUEST['tbl_type'] != 'Default')) {
-        $sql_query .= ' ENGINE = ' . $_REQUEST['tbl_type'];
+    if (!empty($_REQUEST['tbl_storage_engine']) && ($_REQUEST['tbl_storage_engine'] != 'Default')) {
+        $sql_query .= ' ENGINE = ' . $_REQUEST['tbl_storage_engine'];
     }
     if (!empty($_REQUEST['tbl_collation'])) {
         $sql_query .= PMA_generateCharsetQueryPart($_REQUEST['tbl_collation']);
diff --git a/tbl_operations.php b/tbl_operations.php
index 61e25c4298..27c3edd6c2 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -52,7 +52,7 @@ require 'libraries/tbl_info.inc.php';
 // define some globals here, for improved syntax in the conditionals
 $is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false;
 // set initial value of these globals, based on the current table engine
-PMA_set_global_variables_for_engine($tbl_type);
+PMA_set_global_variables_for_engine($tbl_storage_engine);
 
 if ($is_aria) {
     // the value for transactional can be implicit
@@ -104,12 +104,12 @@ if (isset($_REQUEST['submitoptions'])) {
       && urldecode($_REQUEST['prev_comment']) !== $_REQUEST['comment']) {
         $table_alters[] = 'COMMENT = \'' . PMA_sqlAddSlashes($_REQUEST['comment']) . '\'';
     }
-    if (! empty($_REQUEST['new_tbl_type'])
-      && strtolower($_REQUEST['new_tbl_type']) !== strtolower($tbl_type)) {
-        $table_alters[] = 'ENGINE = ' . $_REQUEST['new_tbl_type'];
-        $tbl_type = $_REQUEST['new_tbl_type'];
+    if (! empty($_REQUEST['new_tbl_storage_engine'])
+      && strtolower($_REQUEST['new_tbl_storage_engine']) !== strtolower($tbl_storage_engine)) {
+        $table_alters[] = 'ENGINE = ' . $_REQUEST['new_tbl_storage_engine'];
+        $tbl_storage_engine = $_REQUEST['new_tbl_storage_engine'];
         // reset the globals for the new engine
-        PMA_set_global_variables_for_engine($tbl_type);
+        PMA_set_global_variables_for_engine($tbl_storage_engine);
         if ($is_aria) {
             $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1';
             $page_checksum = (isset($page_checksum)) ? $page_checksum : '';
@@ -178,7 +178,7 @@ if (isset($_REQUEST['submitoptions'])) {
             // should not be reported with a Level of Error, so here
             // I just ignore it. But there are other 1478 messages
             // that it's better to show.
-            if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) {
+            if (! ($_REQUEST['new_tbl_storage_engine'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) {
                 $warning_messages[] = $warning['Level'] . ': #' . $warning['Code']
                     . ' ' . $warning['Message'];
             }
@@ -374,7 +374,7 @@ if (strstr($show_comment, '; InnoDB free') === false) {
     <tr><td><?php echo __('Storage Engine'); ?>
             <?php echo PMA_showMySQLDocu('Storage_engines', 'Storage_engines'); ?>
         </td>
-        <td><?php echo PMA_StorageEngine::getHtmlSelect('new_tbl_type', null, $tbl_type); ?>
+        <td><?php echo PMA_StorageEngine::getHtmlSelect('new_tbl_storage_engine', null, $tbl_storage_engine); ?>
         </td>
     </tr>
 
@@ -509,11 +509,11 @@ unset($innodb_engine_plugin, $innodb_plugin_version, $innodb_file_format);
 // does not return a warning
 // (if the table was compressed, it can be seen on the Structure page)
 
-if (isset($possible_row_formats[$tbl_type])) {
+if (isset($possible_row_formats[$tbl_storage_engine])) {
     $current_row_format = strtoupper($showtable['Row_format']);
     echo '<tr><td><label for="new_row_format">ROW_FORMAT</label></td>';
     echo '<td>';
-    echo PMA_generate_html_dropdown('new_row_format', $possible_row_formats[$tbl_type], $current_row_format, 'new_row_format');
+    echo PMA_generate_html_dropdown('new_row_format', $possible_row_formats[$tbl_storage_engine], $current_row_format, 'new_row_format');
     unset($possible_row_formats, $current_row_format);
     echo '</td>';
     echo '</tr>';
@@ -859,21 +859,21 @@ if ($cfgRelation['relwork'] && ! $is_innodb) {
 require 'libraries/footer.inc.php';
 
 
-function PMA_set_global_variables_for_engine($tbl_type)
+function PMA_set_global_variables_for_engine($tbl_storage_engine)
 {
     global $is_myisam_or_aria, $is_innodb, $is_isam, $is_berkeleydb, $is_aria, $is_pbxt;
 
     $is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = $is_aria = $is_pbxt = false;
-    $upper_tbl_type = strtoupper($tbl_type);
+    $upper_tbl_storage_engine = strtoupper($tbl_storage_engine);
 
     //Options that apply to MYISAM usually apply to ARIA
-    $is_myisam_or_aria = ($upper_tbl_type == 'MYISAM' || $upper_tbl_type == 'ARIA' || $upper_tbl_type == 'MARIA');
-    $is_aria = ($upper_tbl_type == 'ARIA');
+    $is_myisam_or_aria = ($upper_tbl_storage_engine == 'MYISAM' || $upper_tbl_storage_engine == 'ARIA' || $upper_tbl_storage_engine == 'MARIA');
+    $is_aria = ($upper_tbl_storage_engine == 'ARIA');
 
-    $is_isam = ($upper_tbl_type == 'ISAM');
-    $is_innodb = ($upper_tbl_type == 'INNODB');
-    $is_berkeleydb = ($upper_tbl_type == 'BERKELEYDB');
-    $is_pbxt = ($upper_tbl_type == 'PBXT');
+    $is_isam = ($upper_tbl_storage_engine == 'ISAM');
+    $is_innodb = ($upper_tbl_storage_engine == 'INNODB');
+    $is_berkeleydb = ($upper_tbl_storage_engine == 'BERKELEYDB');
+    $is_pbxt = ($upper_tbl_storage_engine == 'PBXT');
 }
 
 ?>
diff --git a/tbl_relation.php b/tbl_relation.php
index d2f1c7ac52..80f7e17004 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -132,7 +132,7 @@ $cfgRelation = PMA_getRelationsParam();
 if ($cfgRelation['relwork']) {
     $existrel = PMA_getForeigners($db, $table, '', 'internal');
 }
-if (PMA_foreignkey_supported($tbl_type)) {
+if (PMA_foreignkey_supported($tbl_storage_engine)) {
     $existrel_foreign = PMA_getForeigners($db, $table, '', 'foreign');
 }
 if ($cfgRelation['displaywork']) {
@@ -336,7 +336,7 @@ if ($cfgRelation['displaywork'] && isset($display_field)) {
 if (isset($destination) && $cfgRelation['relwork']) {
     $existrel = PMA_getForeigners($db, $table, '', 'internal');
 }
-if (isset($destination_foreign) && PMA_foreignkey_supported($tbl_type)) {
+if (isset($destination_foreign) && PMA_foreignkey_supported($tbl_storage_engine)) {
     $existrel_foreign = PMA_getForeigners($db, $table, '', 'foreign');
 }
 
@@ -356,13 +356,13 @@ echo PMA_generate_common_hidden_inputs($db, $table);
 
 // relations
 
-if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) {
+if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_storage_engine)) {
     // To choose relations we first need all tables names in current db
     // and if the main table supports foreign keys
     // we use SHOW TABLE STATUS because we need to find other tables of the
     // same engine.
 
-    if (PMA_foreignkey_supported($tbl_type)) {
+    if (PMA_foreignkey_supported($tbl_storage_engine)) {
         $tab_query           = 'SHOW TABLE STATUS FROM ' . PMA_backquote($db);
         // [0] of the row is the name
         // [1] is the type
@@ -383,9 +383,9 @@ if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) {
 
         // if foreign keys are supported, collect all keys from other
         // tables of the same engine
-        if (PMA_foreignkey_supported($tbl_type)
+        if (PMA_foreignkey_supported($tbl_storage_engine)
             && isset($curr_table[1])
-            && strtoupper($curr_table[1]) == $tbl_type
+            && strtoupper($curr_table[1]) == $tbl_storage_engine
         ) {
              // explicitely ask for non-quoted list of indexed columns
              // need to obtain backquoted values to support dots inside values
@@ -412,14 +412,14 @@ if (count($columns) > 0) {
     <?php
     if ($cfgRelation['relwork']) {
         echo '<th>' . __('Internal relation');
-        if (PMA_foreignkey_supported($tbl_type)) {
+        if (PMA_foreignkey_supported($tbl_storage_engine)) {
             echo PMA_showHint(__('An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'));
         }
         echo '</th>';
     }
-    if (PMA_foreignkey_supported($tbl_type)) {
+    if (PMA_foreignkey_supported($tbl_storage_engine)) {
         // this does not have to be translated, it's part of the MySQL syntax
-        echo '<th colspan="2">' . __('Foreign key constraint') . ' (' . $tbl_type . ')';
+        echo '<th colspan="2">' . __('Foreign key constraint') . ' (' . $tbl_storage_engine . ')';
         echo '</th>';
     }
     ?>
@@ -476,7 +476,7 @@ if (count($columns) > 0) {
             <?php
         } // end if (internal relations)
 
-        if (PMA_foreignkey_supported($tbl_type)) {
+        if (PMA_foreignkey_supported($tbl_storage_engine)) {
             echo '<td>';
             if (!empty($save_row[$i]['Key'])) {
                 ?>
diff --git a/tbl_structure.php b/tbl_structure.php
index 6e0c724e36..85b2f3a45e 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -374,7 +374,7 @@ foreach ($fields as $row) {
     </td>
     <td class="replaced_by_more center">
         <?php
-        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || ($primary && $primary->hasColumn($field_name))) {
+        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_storage_engine || ($primary && $primary->hasColumn($field_name))) {
             echo $titles['NoPrimary'] . "\n";
             $primary_enabled = false;
         } else {
@@ -389,7 +389,7 @@ foreach ($fields as $row) {
     </td>
     <td class="replaced_by_more center">
         <?php
-        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type || isset($columns_with_unique_index[$field_name])) {
+        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_storage_engine || isset($columns_with_unique_index[$field_name])) {
             echo $titles['NoUnique'] . "\n";
             $unique_enabled = false;
         } else {
@@ -404,7 +404,7 @@ foreach ($fields as $row) {
     </td>
     <td class="replaced_by_more center">
         <?php
-        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_type) {
+        if ($type == 'text' || $type == 'blob' || 'ARCHIVE' == $tbl_storage_engine) {
             echo $titles['NoIndex'] . "\n";
             $index_enabled = false;
         } else {
@@ -424,7 +424,7 @@ foreach ($fields as $row) {
             'geometry', 'point', 'linestring', 'polygon', 'multipoint',
             'multilinestring', 'multipolygon', 'geomtrycollection'
         );
-        if (! in_array($type, $spatial_types) || 'MYISAM' != $tbl_type) {
+        if (! in_array($type, $spatial_types) || 'MYISAM' != $tbl_storage_engine) {
             echo $titles['NoSpatial'] . "\n";
             $spatial_enabled = false;
         } else {
@@ -439,7 +439,7 @@ foreach ($fields as $row) {
         ?>
     </td>
     <?php
-        if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA' || ($tbl_type == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50604))
+        if (! empty($tbl_storage_engine) && ($tbl_storage_engine == 'MYISAM' || $tbl_storage_engine == 'ARIA' || $tbl_storage_engine == 'MARIA' || ($tbl_storage_engine == 'INNODB' && PMA_MYSQL_INT_VERSION >= 50604))
             // FULLTEXT is possible on TEXT, CHAR and VARCHAR
             && (strpos(' ' . $type, 'text') || strpos(' ' . $type, 'char'))) {
             echo "\n";
@@ -571,16 +571,16 @@ PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_browse', __('Browse
 if (! $tbl_is_view && ! $db_is_information_schema) {
     PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_change', __('Change'), 'b_edit.png', 'change');
     PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_drop', __('Drop'), 'b_drop.png', 'drop');
-    if ('ARCHIVE' != $tbl_type) {
+    if ('ARCHIVE' != $tbl_storage_engine) {
         PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_primary', __('Primary'), 'b_primary.png', 'primary');
         PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_unique', __('Unique'), 'b_unique.png', 'unique');
         PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_index', __('Index'), 'b_index.png', 'index');
     }
 
-    if (! empty($tbl_type) && $tbl_type == 'MYISAM') {
+    if (! empty($tbl_storage_engine) && $tbl_storage_engine == 'MYISAM') {
         PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_spatial', __('Spatial'), 'b_spatial.png', 'spatial');
     }
-    if (! empty($tbl_type) && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA')) {
+    if (! empty($tbl_storage_engine) && ($tbl_storage_engine == 'MYISAM' || $tbl_storage_engine == 'ARIA' || $tbl_storage_engine == 'MARIA')) {
         PMA_buttonOrImage('submit_mult', 'mult_submit', 'submit_mult_fulltext', __('Fulltext'), 'b_ftext.png', 'ftext');
     }
 }
@@ -617,8 +617,8 @@ echo PMA_getIcon('b_print.png', __('Print view'), true);
 if (! $tbl_is_view && ! $db_is_information_schema) {
 
     // if internal relations are available, or foreign keys are supported
-    // ($tbl_type comes from libraries/tbl_info.inc.php)
-    if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_type)) {
+    // ($tbl_storage_engine comes from libraries/tbl_info.inc.php)
+    if ($cfgRelation['relwork'] || PMA_foreignkey_supported($tbl_storage_engine)) {
         ?>
 <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php
         echo PMA_getIcon('b_relations.png', __('Relation view'), true);
@@ -689,7 +689,7 @@ if (count($fields) > 20) {
  * Displays indexes
  */
 
-if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' !=  $tbl_type) {
+if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' !=  $tbl_storage_engine) {
     PMA_generate_slider_effect('indexes', __('Indexes'));
     /**
      * Display indexes
@@ -808,7 +808,7 @@ if ($cfg['ShowStats']) {
             <?php
         }
         // Optimize link if overhead
-        if (isset($free_size) && !PMA_DRIZZLE && ($tbl_type == 'MYISAM' || $tbl_type == 'ARIA' || $tbl_type == 'MARIA' || $tbl_type == 'BDB')) {
+        if (isset($free_size) && !PMA_DRIZZLE && ($tbl_storage_engine == 'MYISAM' || $tbl_storage_engine == 'ARIA' || $tbl_storage_engine == 'MARIA' || $tbl_storage_engine == 'BDB')) {
             ?>
     <tr class="tblFooters">
         <td colspan="3" class="center">
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>