diff --git a/db_structure.php b/db_structure.php
index 9424391ee0..4b36a556af 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -453,7 +453,7 @@ foreach ($tables as $keyname => $each_table) {
     ?>"
     id="row_tbl_<?php echo $i; ?>">
     <td class="center">
-        <input type="checkbox" name="selected_tbl[]"
+        <input type="checkbox" name="selected_tbl[]" class="checkall"
             value="<?php echo htmlspecialchars($each_table['TABLE_NAME']); ?>"
             id="checkbox_tbl_<?php echo $i; ?>"<?php echo $checked; ?> /></td>
     <th><?php echo $browse_table_label; ?>
@@ -675,13 +675,8 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db);
 ?>
 <img class="selectallarrow" src="<?php echo $pmaThemeImage .'arrow_'.$text_dir.'.png'; ?>"
     width="38" height="22" alt="<?php echo __('With selected:'); ?>" />
-<a href="<?php echo $checkall_url; ?>&amp;checkall=1"
-    onclick="if (markAllRows('tablesForm')) return false;">
-    <?php echo __('Check All'); ?></a>
-/
-<a href="<?php echo $checkall_url; ?>"
-    onclick="if (unMarkAllRows('tablesForm')) return false;">
-    <?php echo __('Uncheck All'); ?></a>
+<input type="checkbox" id="checkall" title="<?php echo __('Check All'); ?>" />
+<label for="checkall"><?php echo __('Check All'); ?></label>
 <?php if ($overhead_check != '') { ?>
 /
 <a href="#" onclick="unMarkAllRows('tablesForm');
diff --git a/import_status.php b/import_status.php
index b544748b9d..d056c3e1d4 100644
--- a/import_status.php
+++ b/import_status.php
@@ -24,60 +24,33 @@ if (version_compare(PHP_VERSION, '5.4.0', '>=')
     && ini_get('session.upload_progress.enabled')
 ) {
 
-    if (!isset($_POST['session_upload_progress'])) {
-        $sessionupload = array();
-        $prefix = ini_get('session.upload_progress.prefix');
+    $sessionupload = array();
+    $prefix = ini_get('session.upload_progress.prefix');
 
-        session_start();
-        foreach ($_SESSION as $key => $value) {
-            // only copy session-prefixed data
-            if (substr($key, 0, strlen($prefix)) == $prefix) {
-                $sessionupload[$key] = $value;
-            }
+    session_start();
+    foreach ($_SESSION as $key => $value) {
+        // only copy session-prefixed data
+        if (substr($key, 0, strlen($prefix)) == $prefix) {
+            $sessionupload[$key] = $value;
         }
-
-        // perform internal self-request
-        $url = 'http' .
-            ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 's' : '') .
-            '://' . $_SERVER['HTTP_HOST'] .
-            $_SERVER['REQUEST_URI'];
-
-        if (!function_exists('curl_exec') || !function_exists('getallheaders')) {
-            die();
-        }
-        $headers = @getallheaders();
-        if (!isset($headers['Cookie'])) {
-            die();
-        }
-        $ch = curl_init($url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt(
-            $ch, CURLOPT_POSTFIELDS,
-            'session_upload_progress=' . rawurlencode(serialize($sessionupload))
-        );
-        curl_setopt($ch, CURLOPT_COOKIE, $headers['Cookie']);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 3);
-
-        // to avoid problems with self-signed certs
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-
-        // show the result of the internal request
-        echo @curl_exec($ch);
-        die();
     }
+    // PMA will kill all variables, so let's use a constant
+    define('SESSIONUPLOAD', serialize($sessionupload));
+    session_write_close();
+
+    session_name('phpMyAdmin');
+    session_id($_COOKIE['phpMyAdmin']);
 }
 
+define('PMA_MINIMUM_COMMON', 1);
+
 require_once 'libraries/common.inc.php';
 require_once 'libraries/display_import_ajax.lib.php';
 
-if (isset($_POST['session_upload_progress'])) {
-    // this is the internal request response
-    // restore sessionupload from the POSTed data (see above),
-    // then write sessionupload back into the loaded session
+if (defined('SESSIONUPLOAD')) {
+    // write sessionupload back into the loaded PMA session
 
-    $sessionupload = unserialize($_POST['session_upload_progress']);
+    $sessionupload = unserialize(SESSIONUPLOAD);
     foreach ($sessionupload as $key => $value) {
         $_SESSION[$key] = $value;
     }
diff --git a/js/functions.js b/js/functions.js
index 570b93c808..b4b629e109 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -558,7 +558,7 @@ $(function() {
                 var checked = $checkbox.prop('checked');
                 if (!$(e.target).is(':checkbox, label')) {
                     checked = !checked;
-                    $checkbox.prop('checked', checked);
+                    $checkbox.prop('checked', checked).trigger('change');
                 }
                 if (checked) {
                     $tr.addClass('marked');
@@ -593,7 +593,8 @@ $(function() {
                     .slice(start, end + 1)
                     .removeClass('marked')
                     .find(':checkbox')
-                    .prop('checked', false);
+                    .prop('checked', false)
+                    .trigger('change');
             }
 
             // handle new shift click
@@ -609,7 +610,8 @@ $(function() {
                 .slice(start, end + 1)
                 .addClass('marked')
                 .find(':checkbox')
-                .prop('checked', true);
+                .prop('checked', true)
+                .trigger('change');
 
             // remember the last shift clicked row
             last_shift_clicked_row = curr_row;
@@ -617,7 +619,7 @@ $(function() {
     });
 
     addDateTimePicker();
-   
+
     /**
      * Add attribute to text boxes for iOS devices (based on bugID: 3508912)
      */
@@ -669,6 +671,7 @@ function markAllRows(container_id)
 {
 
     $("#" + container_id).find("input:checkbox:enabled").prop('checked', true)
+    .trigger("change")
     .parents("tr").addClass("marked");
     return true;
 }
@@ -683,6 +686,7 @@ function unMarkAllRows(container_id)
 {
 
     $("#" + container_id).find("input:checkbox:enabled").prop('checked', false)
+    .trigger("change")
     .parents("tr").removeClass("marked");
     return true;
 }
@@ -1879,7 +1883,7 @@ function PMA_createProfilingChartJqplot(target, data)
             seriesDefaults: {
                 renderer: $.jqplot.PieRenderer,
                 rendererOptions: {
-                    showDataLabels:  true 
+                    showDataLabels:  true
                 }
             },
             legend: {
@@ -3782,6 +3786,33 @@ $(document).ready(function () {
     }); // end $.live()
 });
 
+/**
+ * Watches checkboxes in a form to set the checkall box accordingly
+ */
+var checkboxes_sel = "input.checkall:checkbox:enabled";
+$(checkboxes_sel).live("change", function () {
+    var $form = $(this.form);
+    // total number of checkboxes in current form
+    var total_boxes = $form.find(checkboxes_sel).length;
+    // number of checkboxes checked in current form
+    var checked_boxes = $form.find(checkboxes_sel + ":checked").length;
+    var $checkall = $form.find("input#checkall");
+    if (total_boxes == checked_boxes) {
+        $checkall.prop({checked: true, indeterminate: false});
+    }
+    else if (checked_boxes > 0) {
+        $checkall.prop({checked: true, indeterminate: true});
+    }
+    else {
+        $checkall.prop({checked: false, indeterminate: false});
+    }
+});
+$("input#checkall").live("change", function() {
+    var is_checked = $(this).is(":checked");
+    $(this.form).find(checkboxes_sel).prop("checked", is_checked)
+    .parents("tr").toggleClass("marked", is_checked);
+});
+
 /**
  * Toggles row colors of a set of 'tr' elements starting from a given element
  *
diff --git a/js/server_databases.js b/js/server_databases.js
index abf31b2caf..caf59554b4 100644
--- a/js/server_databases.js
+++ b/js/server_databases.js
@@ -30,7 +30,8 @@ $(function() {
          * @var selected_dbs Array containing the names of the checked databases
          */
         var selected_dbs = [];
-        $form.find('input:checkbox:checked').each(function () {
+        // loop over all checked checkboxes, except the #checkall checkbox
+        $form.find('input:checkbox:checked:not(#checkall)').each(function () {
             $(this).closest('tr').addClass('removeMe');
             selected_dbs[selected_dbs.length] = 'DROP DATABASE `' + escapeHtml($(this).val()) + '`;';
         });
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index cad6eff80b..01d47aa670 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -12,7 +12,7 @@ if (! defined('PHPMYADMIN')) {
 /**
  * Load vendor configuration.
  */
-require './libraries/vendor_config.php';
+require_once './libraries/vendor_config.php';
 
 /**
  * Configuration class
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 4e86431c1b..2d0fb66dd4 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -4220,34 +4220,8 @@ class PMA_DisplayResults
             'sql_query' => $this->_sql_query,
             'goto'      => $this->_goto,
         );
-        $uncheckall_url = 'sql.php' . PMA_generate_common_url($_url_params);
 
-        $_url_params['checkall'] = '1';
-        $checkall_url = 'sql.php' . PMA_generate_common_url($_url_params);
 
-        if ($_SESSION['tmp_user_values']['disp_direction'] == self::DISP_DIR_VERTICAL) {
-
-            $checkall_params['onclick']
-                = 'if (setCheckboxes(\'resultsForm\', true)) return false;';
-            $uncheckall_params['onclick']
-                = 'if (setCheckboxes(\'resultsForm\', false)) return false;';
-
-        } else {
-
-            $checkall_params['onclick']
-                = 'if (markAllRows(\'resultsForm\')) return false;';
-            $uncheckall_params['onclick']
-                = 'if (unMarkAllRows(\'resultsForm\')) return false;';
-
-        }
-
-        $checkall_link = PMA_linkOrButton(
-            $checkall_url, __('Check All'), $checkall_params, false
-        );
-
-        $uncheckall_link = PMA_linkOrButton(
-            $uncheckall_url, __('Uncheck All'), $uncheckall_params, false
-        );
 
         if ($_SESSION['tmp_user_values']['disp_direction'] != self::DISP_DIR_VERTICAL) {
 
@@ -4257,10 +4231,9 @@ class PMA_DisplayResults
                 . ' alt="' . __('With selected:') . '" />';
         }
 
-        $links_html .= $checkall_link . "\n"
-            . ' / ' . "\n"
-            . $uncheckall_link . "\n"
-            . '<i>' . __('With selected:') . '</i>' . "\n";
+        $links_html .= '<input type="checkbox" id="checkall" title="' . __('Check All') . '" /> '
+            . '<label for="checkall">' . __('Check All') . '</label> '
+            . '<i style="margin-left: 2em">' . __('With selected:') . '</i>' . "\n";
 
         $links_html .= PMA_getButtonOrImage(
             'submit_mult', 'mult_submit', 'submit_mult_change',
@@ -4496,13 +4469,13 @@ class PMA_DisplayResults
      * @param string $transform_options  transformation parameters
      * @param string $default_function   default transformation function
      * @param object $meta               the meta-information about this field
-     * @param array  $url_params         parameters that should go to the 
+     * @param array  $url_params         parameters that should go to the
      *                                   download link
      *
      * @return mixed  string or float
-     * 
+     *
      * @access  private
-     * 
+     *
      * @see     _getDataCellForBlobColumns(), _getDataCellForGeometryColumns(),
      *          _getDataCellForNonNumericAndNonBlobColumns(),
      *          _getSortedColumnMessage()
@@ -4581,12 +4554,12 @@ class PMA_DisplayResults
      * @param bool   $is_field_truncated whether the field is truncated
      *
      * @return string  formatted data
-     * 
+     *
      * @access  private
-     * 
+     *
      * @see     _getDataCellForNumericColumns(), _getDataCellForGeometryColumns(),
      *          _getDataCellForNonNumericAndNonBlobColumns(),
-     *          
+     *
      */
     private function _getRowData(
         $class, $condition_field, $analyzed_sql, $meta, $map, $data,
@@ -4754,9 +4727,9 @@ class PMA_DisplayResults
      * @param string $class             css classes for the td element
      *
      * @return string  the generated HTML
-     * 
+     *
      * @access  private
-     * 
+     *
      * @see     _getTableBody(), _getCheckboxAndLinks()
      */
     private function _getCheckboxForMultiRowSubmissions(
@@ -4777,7 +4750,7 @@ class PMA_DisplayResults
                 . '<input type="checkbox" id="id_rows_to_delete'
                 . $row_no . $id_suffix
                 . '" name="rows_to_delete[' . $row_no . ']"'
-                . ' class="multi_checkbox"'
+                . ' class="multi_checkbox checkall"'
                 . ' value="' . $where_clause_html . '" '
                 . (isset($GLOBALS['checkall'])
                     ? 'checked="checked"'
@@ -4803,9 +4776,9 @@ class PMA_DisplayResults
      * @param string $where_clause_html url encoded where clause
      *
      * @return string  the generated HTML
-     * 
+     *
      * @access  private
-     * 
+     *
      * @see     _getTableBody(), _getCheckboxAndLinks()
      */
     private function _getEditLink(
@@ -4843,9 +4816,9 @@ class PMA_DisplayResults
      * @param string $class             css classes for the td element
      *
      * @return string  the generated HTML
-     * 
+     *
      * @access  private
-     * 
+     *
      * @see     _getTableBody(), _getCheckboxAndLinks()
      */
     private function _getCopyLink(
@@ -4888,9 +4861,9 @@ class PMA_DisplayResults
      * @param string $class   css classes for the td element
      *
      * @return string  the generated HTML
-     * 
+     *
      * @access  private
-     * 
+     *
      * @see     _getTableBody(), _getCheckboxAndLinks()
      */
     private function _getDeleteLink($del_url, $del_str, $js_conf, $class)
@@ -4937,9 +4910,9 @@ class PMA_DisplayResults
      * @param string $js_conf           text for the JS confirmation
      *
      * @return string  the generated HTML
-     * 
+     *
      * @access  private
-     * 
+     *
      * @see     _getPlacedLinks()
      */
     private function _getCheckboxAndLinks(
@@ -4995,6 +4968,6 @@ class PMA_DisplayResults
         return $ret;
 
     } // end of the '_getCheckboxAndLinks()' function
-    
+
 }
 ?>
diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php
index 7ba4069615..fa264996b9 100644
--- a/libraries/Footer.class.php
+++ b/libraries/Footer.class.php
@@ -106,7 +106,7 @@ class PMA_Footer
 
             // set current db, table and sql query in the querywindow
             $query = '';
-            if (strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+            if (isset($GLOBALS['sql_query']) && strlen($GLOBALS['sql_query']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
                 $query = PMA_escapeJsString($GLOBALS['sql_query']);
             }
             $this->_scripts->addCode("
diff --git a/libraries/Header.class.php b/libraries/Header.class.php
index ddad908901..d61dda9fa2 100644
--- a/libraries/Header.class.php
+++ b/libraries/Header.class.php
@@ -335,7 +335,7 @@ class PMA_Header
          */
         $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT';
         /* Prevent against ClickJacking by allowing frames only from same origin */
-        if (! $GLOBALS['cfg']['AllowThirdPartyFraming']) {
+        if (! $GLOBALS['cfg']['AllowThirdPartyFraming'] && ! defined('TESTSUITE')) {
             header(
                 'X-Frame-Options: SAMEORIGIN'
             );
@@ -351,7 +351,7 @@ class PMA_Header
             );
         }
         PMA_noCacheHeader();
-        if (! defined('IS_TRANSFORMATION_WRAPPER')) {
+        if (! defined('IS_TRANSFORMATION_WRAPPER') && ! defined('TESTSUITE')) {
             // Define the charset to be used
             header('Content-Type: text/html; charset=utf-8');
         }
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 6ea20bec35..8a6624e989 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -21,50 +21,50 @@ class PMA_Index
      *
      * @var array
      */
-    protected static $_registry = array();
+    private static $_registry = array();
 
     /**
      * @var string The name of the schema
      */
-    protected $_schema = '';
+    private $_schema = '';
 
     /**
      * @var string The name of the table
      */
-    protected $_table = '';
+    private $_table = '';
 
     /**
      * @var string The name of the index
      */
-    protected $_name = '';
+    private $_name = '';
 
     /**
      * Columns in index
      *
      * @var array
      */
-    protected $_columns = array();
+    private $_columns = array();
 
     /**
      * The index method used (BTREE, SPATIAL, FULLTEXT, HASH, RTREE).
      *
      * @var string
      */
-    protected $_type = '';
+    private $_type = '';
 
     /**
      * The index choice (PRIMARY, UNIQUE, INDEX, SPATIAL, FULLTEXT)
      *
      * @var string
      */
-    protected $_choice = '';
+    private $_choice = '';
 
     /**
      * Various remarks.
      *
      * @var string
      */
-    protected $_remarks = '';
+    private $_remarks = '';
 
     /**
      * Any comment provided for the index with a COMMENT attribute when the
@@ -72,19 +72,19 @@ class PMA_Index
      *
      * @var string
      */
-    protected $_comment = '';
+    private $_comment = '';
 
     /**
      * @var integer 0 if the index cannot contain duplicates, 1 if it can.
      */
-    protected $_non_unique = 0;
+    private $_non_unique = 0;
 
     /**
      * Indicates how the key is packed. NULL if it is not.
      *
      * @var string
      */
-    protected $_packed = null;
+    private $_packed = null;
 
     /**
      * Constructor
@@ -157,7 +157,7 @@ class PMA_Index
      *
      * @return boolean whether loading was successful
      */
-    static protected function _loadIndexes($table, $schema)
+    static private function _loadIndexes($table, $schema)
     {
         if (isset(PMA_Index::$_registry[$schema][$table])) {
             return true;
@@ -202,7 +202,8 @@ class PMA_Index
             // $columns[names][]
             // $columns[sub_parts][]
             foreach ($columns['names'] as $key => $name) {
-                $sub_part = isset($columns['sub_parts'][$key]) ? $columns['sub_parts'][$key] : '';
+                $sub_part = isset($columns['sub_parts'][$key])
+                    ? $columns['sub_parts'][$key] : '';
                 $_columns[] = array(
                     'Column_name'   => $name,
                     'Sub_part'      => $sub_part,
@@ -433,7 +434,10 @@ class PMA_Index
         if (! $print_mode) {
             $r  = '<fieldset>';
             $r .= '<legend id="index_header">' . __('Indexes');
-            $r .= PMA_showMySQLDocu('optimization', 'optimizing-database-structure');
+            $r .= PMA_showMySQLDocu(
+                'optimization',
+                'optimizing-database-structure'
+            );
             $r .= '</legend>';
             $r .= $no_indexes;
             if (count($indexes) < 1) {
@@ -481,23 +485,37 @@ class PMA_Index
                     $r .= ' ajax';
                 }
                 $r .= '" ' . $row_span . '>'
-                   . '    <a href="tbl_indexes.php' . PMA_generate_common_url($this_params)
+                   . '    <a href="tbl_indexes.php'
+                   . PMA_generate_common_url($this_params)
                    . '">' . PMA_getIcon('b_edit.png', __('Edit')) . '</a>'
                    . '</td>' . "\n";
 
                 $this_params = $GLOBALS['url_params'];
                 if ($index->getName() == 'PRIMARY') {
-                    $this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY;';
-                    $this_params['message_to_show'] = __('The primary key has been dropped');
-                    $js_msg      = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP PRIMARY KEY');
+                    $this_params['sql_query'] = 'ALTER TABLE '
+                        . PMA_backquote($table) . ' DROP PRIMARY KEY;';
+                    $this_params['message_to_show']
+                        = __('The primary key has been dropped');
+                    $js_msg = PMA_jsFormat(
+                        'ALTER TABLE ' . $table . ' DROP PRIMARY KEY'
+                    );
                 } else {
-                    $this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP INDEX ' . PMA_backquote($index->getName()) . ';';
-                    $this_params['message_to_show'] = sprintf(__('Index %s has been dropped'), $index->getName());
-                    $js_msg      = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP INDEX ' . $index->getName()) . ';';
+                    $this_params['sql_query'] = 'ALTER TABLE '
+                        . PMA_backquote($table) . ' DROP INDEX '
+                        . PMA_backquote($index->getName()) . ';';
+                    $this_params['message_to_show'] = sprintf(
+                        __('Index %s has been dropped'),
+                        $index->getName()
+                    );
+                    $js_msg = PMA_jsFormat(
+                        'ALTER TABLE ' . $table . ' DROP INDEX '
+                        . $index->getName() . ';'
+                    );
                 }
 
                 $r .= '<td ' . $row_span . '>';
-                $r .= '<input type="hidden" class="drop_primary_key_index_msg" value="' . $js_msg . '" />';
+                $r .= '<input type="hidden" class="drop_primary_key_index_msg"'
+                    . ' value="' . $js_msg . '" />';
                 $r .= '    <a ';
                 if ($GLOBALS['cfg']['AjaxEnable']) {
                     $r .= 'class="drop_primary_key_index_anchor" ';
@@ -509,11 +527,17 @@ class PMA_Index
             }
 
             if (! $print_mode) {
-                $r .= '<th ' . $row_span . '>' . htmlspecialchars($index->getName()) . '</th>';
+                $r .= '<th ' . $row_span . '>'
+                    . htmlspecialchars($index->getName())
+                    . '</th>';
             } else {
-                $r .= '<td ' . $row_span . '>' . htmlspecialchars($index->getName()) . '</td>';
+                $r .= '<td ' . $row_span . '>'
+                    . htmlspecialchars($index->getName())
+                    . '</td>';
             }
-            $r .= '<td ' . $row_span . '>' . htmlspecialchars($index->getType()) . '</td>';
+            $r .= '<td ' . $row_span . '>'
+                . htmlspecialchars($index->getType())
+                . '</td>';
             $r .= '<td ' . $row_span . '>' . $index->isUnique(true) . '</td>';
             $r .= '<td ' . $row_span . '>' . $index->isPacked(true) . '</td>';
 
@@ -526,9 +550,15 @@ class PMA_Index
                     $r .= ' (' . $column->getSubPart() . ')';
                 }
                 $r .= '</td>';
-                $r .= '<td>' . htmlspecialchars($column->getCardinality()) . '</td>';
-                $r .= '<td>' . htmlspecialchars($column->getCollation()) . '</td>';
-                $r .= '<td>' . htmlspecialchars($column->getNull(true)) . '</td>';
+                $r .= '<td>'
+                    . htmlspecialchars($column->getCardinality())
+                    . '</td>';
+                $r .= '<td>'
+                    . htmlspecialchars($column->getCollation())
+                    . '</td>';
+                $r .= '<td>'
+                    . htmlspecialchars($column->getNull(true))
+                    . '</td>';
 
                 if ($column->getSeqInIndex() == 1) {
                     $r .= '<td ' . $row_span . '>'
@@ -595,7 +625,9 @@ class PMA_Index
                 // did not find any difference
                 // so it makes no sense to have this two equal indexes
 
-                $message = PMA_Message::notice(__('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.'));
+                $message = PMA_Message::notice(
+                    __('The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.')
+                );
                 $message->addParam($each_index->getName());
                 $message->addParam($while_index->getName());
                 $output .= $message->getDisplay();
@@ -617,17 +649,18 @@ class PMA_Index_Column
     /**
      * @var string The column name
      */
-    protected $_name = '';
+    private $_name = '';
 
     /**
      * @var integer The column sequence number in the index, starting with 1.
      */
-    protected $_seq_in_index = 1;
+    private $_seq_in_index = 1;
 
     /**
-     * @var string How the column is sorted in the index. “A” (Ascending) or NULL (Not sorted)
+     * @var string How the column is sorted in the index. “A” (Ascending) or
+     * NULL (Not sorted)
      */
-    protected $_collation = null;
+    private $_collation = null;
 
     /**
      * The number of indexed characters if the column is only partly indexed,
@@ -635,7 +668,7 @@ class PMA_Index_Column
      *
      * @var integer
      */
-    protected $_sub_part = null;
+    private $_sub_part = null;
 
     /**
      * Contains YES if the column may contain NULL.
@@ -643,7 +676,7 @@ class PMA_Index_Column
      *
      * @var string
      */
-    protected $_null = '';
+    private $_null = '';
 
     /**
      * An estimate of the number of unique values in the index. This is updated
@@ -654,7 +687,7 @@ class PMA_Index_Column
      *
      * @var integer
      */
-    protected $_cardinality = null;
+    private $_cardinality = null;
 
     public function __construct($params = array())
     {
diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php
index 782e7d0686..69e12aeb9c 100644
--- a/libraries/OutputBuffering.class.php
+++ b/libraries/OutputBuffering.class.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * 
+ *
  *
  * @package PhpMyAdmin
  */
@@ -10,7 +10,7 @@ if (! defined('PHPMYADMIN')) {
 }
 
 /**
- * 
+ *
  *
  * @package PhpMyAdmin
  */
@@ -85,7 +85,9 @@ class PMA_OutputBuffering
                 ob_start('ob_gzhandler');
             }
             ob_start();
-            header('X-ob_mode: ' . $this->_mode);
+            if (! defined('TESTSUITE')) {
+                header('X-ob_mode: ' . $this->_mode);
+            }
             register_shutdown_function('PMA_OutputBuffering::stop');
             $this->_on = true;
         }
diff --git a/libraries/build_html_for_db.lib.php b/libraries/build_html_for_db.lib.php
index 12aa55d07f..12a163173c 100644
--- a/libraries/build_html_for_db.lib.php
+++ b/libraries/build_html_for_db.lib.php
@@ -79,7 +79,7 @@ function PMA_buildHtmlForDb(
     $out = '';
     if ($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) {
         $out .= '<td class="tool">';
-        $out .= '<input type="checkbox" name="selected_dbs[]" '
+        $out .= '<input type="checkbox" name="selected_dbs[]" class="checkall" '
             . 'title="' . htmlspecialchars($current['SCHEMA_NAME']) . '" '
             . 'value="' . htmlspecialchars($current['SCHEMA_NAME']) . '" ';
 
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index b83614cccb..790523ecc8 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -575,6 +575,9 @@ function PMA_sendHeaderLocation($uri, $use_refresh = false)
  */
 function PMA_noCacheHeader()
 {
+    if (defined('TESTSUITE')) {
+        return;
+    }
     // rfc2616 - Section 14.21
     header('Expires: ' . date(DATE_RFC1123));
     // HTTP/1.1
diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php
index e0180a2b2e..d17e7b133c 100644
--- a/libraries/display_import_ajax.lib.php
+++ b/libraries/display_import_ajax.lib.php
@@ -83,8 +83,6 @@ function PMA_import_uploadprogressCheck()
 
 /**
   * Checks if PHP 5.4 session upload-progress feature is available.
-  * Due to a bug in PHP 5.4's session upload feature (see /import_status.php),
-  * we need to check for cURL support.
   *
   * @return boolean true if PHP 5.4 session upload-progress is available,
   *                 false if it is not
@@ -93,7 +91,6 @@ function PMA_import_sessionCheck()
 {
     if (PMA_PHP_INT_VERSION < 50400
         || ! ini_get('session.upload_progress.enabled')
-        || ! function_exists('curl_exec')
     ) {
         return false;
     }
diff --git a/po/de.po b/po/de.po
index 3a282691c5..8771c08a0d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-06-18 10:54+0200\n"
-"PO-Revision-Date: 2012-06-06 19:43+0200\n"
+"PO-Revision-Date: 2012-06-24 16:15+0200\n"
 "Last-Translator: J. M. <me@mynetx.net>\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -1122,7 +1122,7 @@ msgstr "Die ausgewählten Benutzer werden gelöscht"
 #: js/messages.php:58 js/messages.php:137 tbl_tracking.php:281
 #: tbl_tracking.php:473
 msgid "Close"
-msgstr "Schliessen"
+msgstr "Schließen"
 
 #: js/messages.php:61 js/messages.php:284
 #: libraries/DisplayResults.class.php:2547 libraries/Index.class.php:485
diff --git a/po/fi.po b/po/fi.po
index a7413589de..41e79eb00a 100644
--- a/po/fi.po
+++ b/po/fi.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-06-18 10:54+0200\n"
-"PO-Revision-Date: 2012-05-21 20:39+0200\n"
+"PO-Revision-Date: 2012-06-24 00:18+0200\n"
 "Last-Translator: Jukka Penttinen <tikkakalja@hotmail.com>\n"
 "Language-Team: finnish <fi@li.org>\n"
 "Language: fi\n"
@@ -1531,7 +1531,7 @@ msgstr "Siirry lokitauluun"
 
 #: js/messages.php:180
 msgid "No data found"
-msgstr "Tieotoa ei löytynyt"
+msgstr "Tietoa ei löydy"
 
 #: js/messages.php:181
 msgid "Log analysed, but no data found in this time span."
@@ -1651,11 +1651,11 @@ msgstr "Tuonti"
 
 #: js/messages.php:213
 msgid "Import monitor configuration"
-msgstr "Tuo seurantamääritys"
+msgstr "Tuo seuranta-asetukset"
 
 #: js/messages.php:214
 msgid "Please select the file you want to import"
-msgstr "Valitse tiedosto jonka haluat tuoda"
+msgstr "Valitse tuotava tiedosto"
 
 #: js/messages.php:216
 msgid "Analyse Query"
@@ -1890,10 +1890,9 @@ msgid "To zoom in, select a section of the plot with the mouse."
 msgstr ""
 
 #: js/messages.php:306
-#, fuzzy
 #| msgid "Click reset zoom link to come back to original state."
 msgid "Click reset zoom button to come back to original state."
-msgstr "Palaa alkuperäiseen tilaan napsauttamalla zoomauksen nollauslinkkiä."
+msgstr "Palaa alkuperäiseen tilaan napsauttamalla nollaa zoomaus painikeeta."
 
 #: js/messages.php:308
 msgid "Click a data point to view and possibly edit the data row."
@@ -2395,16 +2394,14 @@ msgid "Font size"
 msgstr "Fonttikoko"
 
 #: libraries/DisplayResults.class.php:472
-#, fuzzy
 #| msgid "Save directory"
 msgid "Save edited data"
-msgstr "Tallennushakemisto"
+msgstr "Tallenna muokatut tiedot"
 
 #: libraries/DisplayResults.class.php:478
-#, fuzzy
 #| msgid "CHAR textarea columns"
 msgid "Restore column order"
-msgstr "CHAR-tekstikentän sarakkeet"
+msgstr "Palauta sarakkeiden järjestys"
 
 #: libraries/DisplayResults.class.php:546 libraries/common.lib.php:2556
 #: libraries/common.lib.php:2560
@@ -2431,22 +2428,19 @@ msgid "End"
 msgstr "Viimeinen sivu"
 
 #: libraries/DisplayResults.class.php:673
-#, fuzzy
 #| msgid "Start"
 msgid "Start row"
-msgstr "Käynnistä"
+msgstr "Aloitusrivi"
 
 #: libraries/DisplayResults.class.php:677
-#, fuzzy
 #| msgid "Number of fields"
 msgid "Number of rows"
-msgstr "Kenttien määrä"
+msgstr "Rivien määrä"
 
 #: libraries/DisplayResults.class.php:686
-#, fuzzy
 #| msgid "More"
 msgid "Mode"
-msgstr "Lisää"
+msgstr "Tila"
 
 #: libraries/DisplayResults.class.php:688
 msgid "horizontal"
@@ -2461,10 +2455,10 @@ msgid "vertical"
 msgstr "pystysuorassa"
 
 #: libraries/DisplayResults.class.php:702
-#, fuzzy, php-format
+#, php-format
 #| msgid "Execute bookmarked query"
 msgid "Headers every %s rows"
-msgstr "Suorita kysely kirjanmerkeistä"
+msgstr "Otsikot joka %s rivi"
 
 #: libraries/DisplayResults.class.php:1180
 msgid "Sort by key"
@@ -2490,14 +2484,12 @@ msgstr "Valinnat"
 
 #: libraries/DisplayResults.class.php:1329
 #: libraries/DisplayResults.class.php:1435
-#, fuzzy
 #| msgid "Partial Texts"
 msgid "Partial texts"
-msgstr "Lyhennetyt tekstit"
+msgstr "Osittaiset tekstit"
 
 #: libraries/DisplayResults.class.php:1330
 #: libraries/DisplayResults.class.php:1439
-#, fuzzy
 #| msgid "Full Texts"
 msgid "Full texts"
 msgstr "Koko tekstit"
@@ -2526,10 +2518,9 @@ msgid "Show binary contents as HEX"
 msgstr "Näytä binaarisisältö heksamuodossa"
 
 #: libraries/DisplayResults.class.php:1378
-#, fuzzy
 #| msgid "Browser transformation"
 msgid "Hide browser transformation"
-msgstr "Selaimen muunnos (transformation)"
+msgstr "piilota webselaimen muunnos"
 
 #: libraries/DisplayResults.class.php:1387
 msgid "Well Known Text"
@@ -2972,19 +2963,16 @@ msgid "Value"
 msgstr "Arvo"
 
 #: libraries/TableSearch.class.php:205
-#, fuzzy
 #| msgid "Search"
 msgid "Table Search"
-msgstr "Etsi"
+msgstr "Taulu haku"
 
 #: libraries/TableSearch.class.php:234 libraries/insert_edit.lib.php:1208
-#, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
-msgstr "Lisää rivi"
+msgstr "Muokkaa/lisää"
 
 #: libraries/TableSearch.class.php:739
-#, fuzzy
 #| msgid "Select fields (at least one):"
 msgid "Select columns (at least one):"
 msgstr "Valitse sarakkeet (vähintään yksi):"
@@ -3006,10 +2994,9 @@ msgid "Use this column to label each point"
 msgstr ""
 
 #: libraries/TableSearch.class.php:834
-#, fuzzy
 #| msgid "Maximum number of rows to display"
 msgid "Maximum rows to plot"
-msgstr "Näytettävien rivien enimmäismäärä"
+msgstr "Tulostettavien rivien enimmäismäärä"
 
 #: libraries/TableSearch.class.php:861 libraries/TableSearch.class.php:1139
 #: sql.php:143 tbl_change.php:211
@@ -3017,16 +3004,15 @@ msgid "Browse foreign values"
 msgstr "Selaa viitearvoja"
 
 #: libraries/TableSearch.class.php:947
-#, fuzzy
 #| msgid "Hide search criteria"
 msgid "Additional search criteria"
-msgstr "Piilota hakusanat"
+msgstr "Tarkempi haku"
 
 #: libraries/TableSearch.class.php:1084
-#, fuzzy
 #| msgid "Do a \"query by example\" (wildcard: \"%\")"
 msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Suorita mallin mukainen kysely (jokerimerkki: \"%\")"
+msgstr ""
+"Suorita mallin mukainen kysely (jokerimerkki: \"%\") kahteen eri sarakkeeseen"
 
 #: libraries/TableSearch.class.php:1088
 msgid "Do a \"query by example\" (wildcard: \"%\")"
@@ -3037,16 +3023,14 @@ msgid "Browse/Edit the points"
 msgstr ""
 
 #: libraries/TableSearch.class.php:1155
-#, fuzzy
 #| msgid "Control user"
 msgid "How to use"
-msgstr "Hallintakäyttäjä"
+msgstr "Kuinka käytetään"
 
 #: libraries/TableSearch.class.php:1160
-#, fuzzy
 #| msgid "Reset"
 msgid "Reset zoom"
-msgstr "Palauta"
+msgstr "Palauta zoomaus"
 
 #: libraries/Theme.class.php:169
 #, php-format
@@ -5605,8 +5589,8 @@ msgid ""
 "Leave blank for no \"persistent\" tables'UI preferences across sessions, "
 "suggested: [kbd]pma_table_uiprefs[/kbd]"
 msgstr ""
-"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: [kbd]"
-"pma_history[/kbd]"
+"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: "
+"[kbd]pma_table_uiprefs[/kbd]"
 
 #: libraries/config/messages.inc.php:436
 msgid "UI preferences table"
@@ -5734,10 +5718,9 @@ msgid "Show or hide a column displaying the Creation timestamp for all tables"
 msgstr ""
 
 #: libraries/config/messages.inc.php:461
-#, fuzzy
 #| msgid "Show versions"
 msgid "Show Creation timestamp"
-msgstr "Näytä versiot"
+msgstr "Näytä luonnin aikaleima"
 
 #: libraries/config/messages.inc.php:462
 msgid ""
@@ -5754,10 +5737,9 @@ msgid ""
 msgstr ""
 
 #: libraries/config/messages.inc.php:465
-#, fuzzy
 #| msgid "Show master status"
 msgid "Show Last check timestamp"
-msgstr "Näytä isäntäpalvelimen tila"
+msgstr "Näytä viimeisin tarkastus aikaleima"
 
 #: libraries/config/messages.inc.php:466
 msgid ""
@@ -6250,52 +6232,44 @@ msgid "Exporting rows from \"%s\" table"
 msgstr "Tuo rivejä taulusta %s"
 
 #: libraries/display_export.lib.php:95
-#, fuzzy
 #| msgid "Export type"
 msgid "Export Method:"
-msgstr "Vientityyppi"
+msgstr "Vientitapa:"
 
 #: libraries/display_export.lib.php:111
-#, fuzzy
 #| msgid "Quick - display only the minimal options to configure"
 msgid "Quick - display only the minimal options"
-msgstr "Nopea asetusten määritys - näytä asetuksia mahdollisimman vähän"
+msgstr "Nopea - näytä vain vähän vaihtoehtoja"
 
 #: libraries/display_export.lib.php:127
-#, fuzzy
 #| msgid "Custom - display all possible options to configure"
 msgid "Custom - display all possible options"
-msgstr "Mukautettu - näytä kaikki mahdolliset asetukset"
+msgstr "Mukautettu - näytä kaikki mahdolliset vaihtoehdot"
 
 #: libraries/display_export.lib.php:135
-#, fuzzy
 #| msgid "Databases"
 msgid "Database(s):"
-msgstr "Tietokannat"
+msgstr "Tietokanta(-kannat):"
 
 #: libraries/display_export.lib.php:137
-#, fuzzy
 #| msgid "Tables"
 msgid "Table(s):"
-msgstr "Taulut"
+msgstr "Taulu(t):"
 
 #: libraries/display_export.lib.php:147
-#, fuzzy
 #| msgid "Rows"
 msgid "Rows:"
-msgstr "Kpl rivejä"
+msgstr "Rivit:"
 
 #: libraries/display_export.lib.php:155
-#, fuzzy
 #| msgid "Dump all rows"
 msgid "Dump some row(s)"
-msgstr "Vedosta kaikki rivit"
+msgstr "Vedosta rivi/rivejä"
 
 #: libraries/display_export.lib.php:157
-#, fuzzy
 #| msgid "Number of fields"
 msgid "Number of rows:"
-msgstr "Kenttien määrä"
+msgstr "Rivien määrä:"
 
 #: libraries/display_export.lib.php:160
 msgid "Row to begin at:"
@@ -6310,22 +6284,20 @@ msgid "Output:"
 msgstr ""
 
 #: libraries/display_export.lib.php:186 libraries/display_export.lib.php:212
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save on server in %s directory"
 msgid "Save on server in the directory <b>%s</b>"
-msgstr "Tallenna palvelimelle hakemistoon %s"
+msgstr "Tallenna palvelimelle hakemistoon <b>%s</b>"
 
 #: libraries/display_export.lib.php:204
-#, fuzzy
 #| msgid "Save as file"
 msgid "Save output to a file"
-msgstr "Tallenna tiedostoon"
+msgstr "Tallenna tulos tiedostoon"
 
 #: libraries/display_export.lib.php:225
-#, fuzzy
 #| msgid "File name template"
 msgid "File name template:"
-msgstr "Tiedostonimen pohja"
+msgstr "Tiedostonimen pohja:"
 
 #: libraries/display_export.lib.php:227
 msgid "@SERVER@ will become the server name"
@@ -6340,7 +6312,7 @@ msgid ", @TABLE@ will become the table name"
 msgstr ""
 
 #: libraries/display_export.lib.php:235
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "alue is interpreted using %1$sstrftime%2$s, so you can use time matting "
 #| "ings. Additionally the following transformations will pen: %3$s. Other t "
@@ -6350,9 +6322,9 @@ msgid ""
 "formatting strings. Additionally the following transformations will happen: "
 "%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
 msgstr ""
-"Tämä arvo on %1$sstrftime%2$s-funktion mukainen, joten "
-"ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat "
-"muutokset: %3$s. Muu teksti pysyy alkuperäisenä."
+"Tämä arvo on tukittu %1$sstrftime%2$s mukaan, joten voi käyttää "
+"ajanmuodostostusmerkkijonoja. Lisäksi tapahtuu seuraavat muutokset: %3$s. "
+"Muu teksti pysyy alkuperäisenä. Katso lisätietoja %4$sFAQ%5$s."
 
 #: libraries/display_export.lib.php:285
 msgid "use this for future exports"
@@ -6364,10 +6336,9 @@ msgid "Character set of the file:"
 msgstr "Tiedoston merkistö:"
 
 #: libraries/display_export.lib.php:321
-#, fuzzy
 #| msgid "Compression"
 msgid "Compression:"
-msgstr "Pakkaus"
+msgstr "Pakkaus:"
 
 #: libraries/display_export.lib.php:325
 msgid "zipped"
@@ -6382,23 +6353,20 @@ msgid "bzipped"
 msgstr "BZIP-pakattu"
 
 #: libraries/display_export.lib.php:338
-#, fuzzy
 #| msgid "Save as file"
 msgid "View output as text"
-msgstr "Tallenna tiedostoon"
+msgstr "Näytä tulos tekstinä"
 
 #: libraries/display_export.lib.php:343 libraries/display_import.lib.php:296
 #: libraries/export/codegen.php:56
-#, fuzzy
 #| msgid "Format"
 msgid "Format:"
-msgstr "Muoto"
+msgstr "Muoto:"
 
 #: libraries/display_export.lib.php:348
-#, fuzzy
 #| msgid "Transformation options"
 msgid "Format-specific options:"
-msgstr "Muunnosvaihtoehdot"
+msgstr "Muotoiluvaihtoehdot:"
 
 #: libraries/display_export.lib.php:349
 msgid ""
@@ -6407,10 +6375,9 @@ msgid ""
 msgstr ""
 
 #: libraries/display_export.lib.php:357 libraries/display_import.lib.php:311
-#, fuzzy
 #| msgid "Recoding engine"
 msgid "Encoding Conversion:"
-msgstr "Merkistön uudelleenkoodaus"
+msgstr "Merkistön uudelleenkoodaus:"
 
 #: libraries/display_git_revision.lib.php:56
 #, php-format
@@ -6453,10 +6420,9 @@ msgid "%s of %s"
 msgstr ""
 
 #: libraries/display_import.lib.php:78
-#, fuzzy
 #| msgid "Format of imported file"
 msgid "Uploading your import file..."
-msgstr "Tuotavan tiedoston muoto"
+msgstr "Lataa tuontitiedostoa..."
 
 #: libraries/display_import.lib.php:86
 #, php-format
@@ -6484,28 +6450,26 @@ msgstr ""
 "saatavilla."
 
 #: libraries/display_import.lib.php:178
-#, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "Importing into the current server"
-msgstr "MySQL-palvelimelle ei voitu kirjautua"
+msgstr "Tuonti nykyiselle palvalimelle"
 
 #: libraries/display_import.lib.php:180
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to database"
 msgid "Importing into the database \"%s\""
-msgstr "Siirry tietokantaan"
+msgstr "Tuonti tietokantaan \"%s\""
 
 #: libraries/display_import.lib.php:182
-#, fuzzy, php-format
+#, php-format
 #| msgid "Go to database"
 msgid "Importing into the table \"%s\""
-msgstr "Siirry tietokantaan"
+msgstr "Tuonti tauluun \"%s\""
 
 #: libraries/display_import.lib.php:188
-#, fuzzy
 #| msgid "File to import"
 msgid "File to Import:"
-msgstr "Tuotava tiedosto"
+msgstr "Tuotava tiedosto:"
 
 #: libraries/display_import.lib.php:205
 #, php-format
@@ -6523,10 +6487,9 @@ msgid "File uploads are not allowed on this server."
 msgstr "Tällä palvelimella ei ole sallittu tiedostojen lähetystä."
 
 #: libraries/display_import.lib.php:260
-#, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
-msgstr "Osittainen tuonti"
+msgstr "Osittainen tuonti:"
 
 #: libraries/display_import.lib.php:266
 #, php-format
@@ -6537,7 +6500,6 @@ msgstr ""
 "uudestaan, jatkamme kohdasta %d."
 
 #: libraries/display_import.lib.php:273
-#, fuzzy
 #| msgid ""
 #| "the interruption of an import in case the script detects it is se to the  "
 #| "timeout limit. This might be good way to import large es, however it "
@@ -6547,15 +6509,14 @@ msgid ""
 "to the PHP timeout limit. <i>(This might be good way to import large files, "
 "however it can break transactions.)</i>"
 msgstr ""
-"Anna tuonnin keskeytyä, mikäli skripti huomaa ylittävänsä aikarajoituksen. "
-"Tätä kannattaa käyttää tuotaessa suuria tiedostoja; se voi kuitenkin "
-"aiheuttaa häiriöitä transaktioihin."
+"Mahdollistaa tuonnin keskeytyksen, mikäli skripti päättyy PHP:n "
+"aikarajoituksen. <i>(Tätä kannattaa käyttää tuotaessa suuria tiedostoja, se "
+"voi kuitenkin aiheuttaa häiriöitä transaktioihin.)</i>"
 
 #: libraries/display_import.lib.php:280
-#, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
-msgstr "Alusta ohitettavien tietueiden (kyselyjen) määrä"
+msgstr "Ohitettavien rivien määrä, aloitus ensimmäisestä rivistä:"
 
 #: libraries/display_import.lib.php:302
 msgid "Format-Specific Options:"
@@ -6905,20 +6866,18 @@ msgid ""
 msgstr ""
 
 #: libraries/engines/pbxt.lib.php:133
-#, fuzzy
 #| msgid "Relations"
 msgid "Related Links"
-msgstr "Relaatiot"
+msgstr "Riippuvuudet"
 
 #: libraries/engines/pbxt.lib.php:135
 msgid "The PrimeBase XT Blog by Paul McCullagh"
 msgstr ""
 
 #: libraries/export/csv.php:34 libraries/import/csv.php:46
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Columns separated with:"
-msgstr "Rivien erotinmerkki"
+msgstr "Sarakkeiden erotin:"
 
 #: libraries/export/csv.php:39 libraries/import/csv.php:53
 #, fuzzy
@@ -6933,38 +6892,33 @@ msgid "Columns escaped with:"
 msgstr "Koodinvaihtomerkki"
 
 #: libraries/export/csv.php:49 libraries/import/csv.php:67
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Lines terminated with:"
-msgstr "Rivien erotinmerkki"
+msgstr "Rivien lopetusmerkki:"
 
 #: libraries/export/csv.php:54 libraries/export/excel.php:33
 #: libraries/export/htmlword.php:56 libraries/export/latex.php:150
 #: libraries/export/ods.php:34 libraries/export/odt.php:98
-#, fuzzy
 #| msgid "Replace NULL by"
 msgid "Replace NULL with:"
-msgstr "Korvaa NULL-merkki tällä:"
+msgstr "Korvaa NULL-merkki:"
 
 #: libraries/export/csv.php:60 libraries/export/excel.php:39
-#, fuzzy
 #| msgid "Remove CRLF characters within fields"
 msgid "Remove carriage return/line feed characters within columns"
-msgstr "Poista kentistä CRLF-merkit"
+msgstr "Poista sarakkeista CR/LF-merkit"
 
 #: libraries/export/excel.php:54
-#, fuzzy
 #| msgid "Excel edition"
 msgid "Excel edition:"
-msgstr "Excel-muokkaus"
+msgstr "Excel-muotoilu:"
 
 #: libraries/export/htmlword.php:50 libraries/export/latex.php:121
 #: libraries/export/odt.php:87 libraries/export/sql.php:269
 #: libraries/export/texytext.php:47 libraries/export/xml.php:83
-#, fuzzy
 #| msgid "Databases display options"
 msgid "Data dump options"
-msgstr "Tietokantojen näyttöasetukset"
+msgstr "Tiedon vedostusasetukset"
 
 #: libraries/export/htmlword.php:170 libraries/export/odt.php:224
 #: libraries/export/sql.php:1536 libraries/export/texytext.php:152
@@ -6981,10 +6935,9 @@ msgstr "Tapahtuma"
 #: libraries/export/texytext.php:410 libraries/rte/rte_events.lib.php:469
 #: libraries/rte/rte_routines.lib.php:927
 #: libraries/rte/rte_triggers.lib.php:362
-#, fuzzy
 #| msgid "Description"
 msgid "Definition"
-msgstr "Kuvaus"
+msgstr "Määritys"
 
 #: libraries/export/htmlword.php:518 libraries/export/odt.php:615
 #: libraries/export/sql.php:1308 libraries/export/texytext.php:471
@@ -7002,46 +6955,40 @@ msgid "Stand-in structure for view"
 msgstr "Näkymän vararakenne"
 
 #: libraries/export/latex.php:14
-#, fuzzy
 #| msgid "Content of table __TABLE__"
 msgid "Content of table @TABLE@"
-msgstr "Taulun __TABLE__ sisältö"
+msgstr "Taulun @TABLE@ sisältö"
 
 #: libraries/export/latex.php:15
 msgid "(continued)"
 msgstr "(jatkuu)"
 
 #: libraries/export/latex.php:16
-#, fuzzy
 #| msgid "Structure of table __TABLE__"
 msgid "Structure of table @TABLE@"
-msgstr "Taulun __TABLE__ rakenne"
+msgstr "Taulun @TABLE@ rakenne"
 
 #: libraries/export/latex.php:72 libraries/export/odt.php:56
 #: libraries/export/sql.php:171
-#, fuzzy
 #| msgid "Transformation options"
 msgid "Object creation options"
-msgstr "Muunnosvaihtoehdot"
+msgstr "Objektin luontivaihtoehdot"
 
 #: libraries/export/latex.php:84 libraries/export/latex.php:138
-#, fuzzy
 #| msgid "Table caption"
 msgid "Table caption (continued)"
-msgstr "Taulun otsikko"
+msgstr "Taulun otsikko (jatkuu)"
 
 #: libraries/export/latex.php:97 libraries/export/odt.php:63
 #: libraries/export/sql.php:68
-#, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Display foreign key relationships"
-msgstr "Älä tarkista viiteavaimia"
+msgstr "Näytä viiteavaimien suhteet"
 
 #: libraries/export/latex.php:103 libraries/export/odt.php:69
-#, fuzzy
 #| msgid "Displaying Column Comments"
 msgid "Display comments"
-msgstr "Sarakkeiden kommentit näkyvissä"
+msgstr "Näytä kommentit"
 
 #: libraries/export/latex.php:109 libraries/export/odt.php:75
 #: libraries/export/sql.php:75
@@ -7078,10 +7025,9 @@ msgid "MediaWiki Table"
 msgstr "MediaWiki-taulu"
 
 #: libraries/export/mediawiki.php:53
-#, fuzzy
 #| msgid "Export contents"
 msgid "Export table names"
-msgstr "Vie sisällöt"
+msgstr "Vie taulujen nimet"
 
 #: libraries/export/mediawiki.php:60
 msgid "Export table headers"
@@ -7110,10 +7056,9 @@ msgid ""
 msgstr ""
 
 #: libraries/export/sql.php:54
-#, fuzzy
 #| msgid "Add custom comment into header (\\n splits lines)"
 msgid "Additional custom header comment (\\n splits lines):"
-msgstr "Lisää oma kommentti otsikkoon (\\n on rivinvaihto)"
+msgstr "Lisää oma kommentti otsikkoon (\\n on rivinvaihto):"
 
 #: libraries/export/sql.php:60
 msgid ""
@@ -7128,16 +7073,15 @@ msgstr ""
 
 #: libraries/export/sql.php:136 libraries/export/sql.php:204
 #: libraries/export/sql.php:212
-#, fuzzy, php-format
+#, php-format
 #| msgid "Statements"
 msgid "Add %s statement"
-msgstr "Tieto"
+msgstr "Lisää %s lauseke"
 
 #: libraries/export/sql.php:181
-#, fuzzy
 #| msgid "Statements"
 msgid "Add statements:"
-msgstr "Tieto"
+msgstr "Lisää lausekkeet:"
 
 #: libraries/export/sql.php:253
 msgid ""
@@ -7246,20 +7190,18 @@ msgid "Object creation options (all are recommended)"
 msgstr ""
 
 #: libraries/export/xml.php:72
-#, fuzzy
 #| msgid "View"
 msgid "Views"
-msgstr "Näkymä"
+msgstr "Näkymät"
 
 #: libraries/export/xml.php:88
 msgid "Export contents"
 msgstr "Vie sisällöt"
 
 #: libraries/gis_visualization.lib.php:135
-#, fuzzy
 #| msgid "No data found for the chart."
 msgid "No data found for GIS visualization."
-msgstr "Kaaviolle ei ole tietoja."
+msgstr "GIS visualisoinnille ei ole tietoja."
 
 #: libraries/import.lib.php:170 libraries/insert_edit.lib.php:128
 #: libraries/rte/rte_routines.lib.php:1258 sql.php:828 tbl_get_field.php:36
diff --git a/po/ko.po b/po/ko.po
index 441b379581..47aa908c2d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-06-18 10:54+0200\n"
-"PO-Revision-Date: 2012-06-22 04:47+0200\n"
-"Last-Translator: Hyun-Sung Yun <bemax38@gmail.com>\n"
+"PO-Revision-Date: 2012-06-25 10:59+0200\n"
+"Last-Translator: Gyu-sun Youm <omniavinco@gmail.com>\n"
 "Language-Team: korean <ko@li.org>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@ msgstr "데이터베이스 %1$s가 생성되었습니다."
 
 #: db_datadict.php:49 db_operations.php:407
 msgid "Database comment: "
-msgstr "데이터베이스 설명:"
+msgstr "데이터베이스 설명: "
 
 #: db_datadict.php:154 libraries/schema/Pdf_Relation_Schema.class.php:1317
 #: libraries/tbl_properties.inc.php:814 tbl_operations.php:375
@@ -207,7 +207,7 @@ msgstr "설명"
 #: tbl_structure.php:346 tbl_tracking.php:327 tbl_tracking.php:382
 #: tbl_tracking.php:387
 msgid "No"
-msgstr "아니오 "
+msgstr "아니오"
 
 #: db_datadict.php:235 js/messages.php:250 libraries/Index.class.php:360
 #: libraries/Index.class.php:385 libraries/Index.class.php:704
diff --git a/po/si.po b/po/si.po
index 4b656d41a1..35e9edd24c 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-06-18 10:54+0200\n"
-"PO-Revision-Date: 2012-05-11 19:33+0200\n"
+"PO-Revision-Date: 2012-06-24 15:15+0200\n"
 "Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
 "Language-Team: sinhala <si@li.org>\n"
 "Language: si\n"
@@ -1871,11 +1871,11 @@ msgstr "ලක්ෂ්‍යයක් මතින් ගමන් කරන 
 
 #: js/messages.php:304
 msgid "To zoom in, select a section of the plot with the mouse."
-msgstr ""
+msgstr "තුළු සූමකරණය සඳහා ප්‍රස්ථාරයේ කොටසක් මූසිකය ආධාරයෙන් තෝරන්න."
 
 #: js/messages.php:306
 msgid "Click reset zoom button to come back to original state."
-msgstr ""
+msgstr "පෙර තත්ත්වයට පැමිණීම සඳහා සූමකරණය ප්‍රතිසකසන බොත්තම ක්ලික් කරන්න."
 
 #: js/messages.php:308
 msgid "Click a data point to view and possibly edit the data row."
@@ -2323,22 +2323,24 @@ msgstr "'%s' රීතිය සඳහා පෙළ සැකසීම අසම
 msgid ""
 "Invalid rule declaration on line %1$s, expected line %2$s of previous rule"
 msgstr ""
+"%1$s පේළියේ වැරදි රීති අර්ථ දැක්වීමකි, පෙර රීතියේ %2$s වන පේළිය බලාපොරොත්තු "
+"විය"
 
 #: libraries/Advisor.class.php:378
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid format of CSV input on line %d."
 msgid "Invalid rule declaration on line %s"
-msgstr "CSV ආනයනයේ %d පේළියේ වැරදි ආකෘතියක්."
+msgstr "%s වන පේළියේ වැරදි රීති අර්ථදැක්වීමකි"
 
 #: libraries/Advisor.class.php:386
 #, php-format
 msgid "Unexpected characters on line %s"
-msgstr ""
+msgstr "%s වන පේළියේ අනපේක්ෂිත අනුලකුණකි"
 
 #: libraries/Advisor.class.php:400
 #, php-format
 msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\""
-msgstr ""
+msgstr "%1$s වන පේළියේ අනපේක්ෂිත අනුලකුණකි. ටැබයක් අපේක්ෂිත නමුත් \"%2$s\" හමුවිය"
 
 #: libraries/Advisor.class.php:425 server_status.php:958
 msgid "per second"
@@ -2427,7 +2429,7 @@ msgid "vertical"
 msgstr "සිරස්"
 
 #: libraries/DisplayResults.class.php:702
-#, fuzzy, php-format
+#, php-format
 #| msgid "Headers every %s rows"
 msgid "Headers every %s rows"
 msgstr "ශීර්ෂක, පේළි %s කට වරක්"
@@ -2727,7 +2729,7 @@ msgstr "ප්‍රේරක"
 
 #: libraries/Menu.class.php:316 libraries/Menu.class.php:317
 msgid "Table seems to be empty!"
-msgstr ""
+msgstr "වගුව හිස් ය!"
 
 #: libraries/Menu.class.php:344 libraries/Menu.class.php:345
 #: libraries/Menu.class.php:346
@@ -2983,10 +2985,9 @@ msgid "How to use"
 msgstr "භාවිතා කරන අයුරු"
 
 #: libraries/TableSearch.class.php:1160
-#, fuzzy
 #| msgid "Reset"
 msgid "Reset zoom"
-msgstr "ප්‍රතිසකසන්න"
+msgstr "සූමය ප්‍රතිසකසන්න"
 
 #: libraries/Theme.class.php:169
 #, php-format
@@ -3280,28 +3281,25 @@ msgstr "ඕනෑම වර්ගයක ජ්‍යාමිතීන් එක
 #: libraries/Types.class.php:623 libraries/Types.class.php:973
 msgctxt "numeric types"
 msgid "Numeric"
-msgstr ""
+msgstr "සංඛ්‍යාත්මක"
 
 #: libraries/Types.class.php:642 libraries/Types.class.php:976
-#, fuzzy
 #| msgid "Create an index"
 msgctxt "date and time types"
 msgid "Date and time"
-msgstr "නව සූචියක් සාදන්න"
+msgstr "දිනය සහ වේලාව"
 
 #: libraries/Types.class.php:651 libraries/Types.class.php:979
-#, fuzzy
 #| msgid "Linestring"
 msgctxt "string types"
 msgid "String"
-msgstr "රේඛාව"
+msgstr "පෙළ"
 
 #: libraries/Types.class.php:672
-#, fuzzy
 #| msgid "Spatial"
 msgctxt "spatial types"
 msgid "Spatial"
-msgstr "ජ්‍යාමිතික"
+msgstr "අවකාශීය"
 
 #: libraries/Types.class.php:707
 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647"
@@ -3392,7 +3390,7 @@ msgstr "mcrypt හි Blowfish භාවිතා කිරීම අසමත
 
 #: libraries/auth/cookie.auth.lib.php:139
 msgid "Your session has expired. Please login again."
-msgstr ""
+msgstr "ඔබගේ සැසිය කල් ඉකුත් වී ඇත. නැවත ඇතුළු වන්න."
 
 #: libraries/auth/cookie.auth.lib.php:227
 msgid "Log in"
@@ -4819,10 +4817,9 @@ msgid "Minimum number of tables to display the table filter box"
 msgstr "වගු පෙරහන් කවුළුව පෙන්වීමට අවම වශයෙන් තිබිය යුතු වගු ගණන"
 
 #: libraries/config/messages.inc.php:281
-#, fuzzy
 #| msgid "Minimum number of tables to display the table filter box"
 msgid "Minimum number of databases to display the database filter box"
-msgstr "වගු පෙරහන් කවුළුව පෙන්වීමට අවම වශයෙන් තිබිය යුතු වගු ගණන"
+msgstr "දත්තගබඩා පෙරහන් කවුළුව පෙන්වීමට අවම වශයෙන් තිබිය යුතු දත්තගබඩා ගණන"
 
 #: libraries/config/messages.inc.php:282
 msgid "String that separates databases into different tree levels"
@@ -6290,9 +6287,8 @@ msgstr ""
 "තෝරාගත් ආකෘතිය සඳහා විකල්ප භාවිතා කිරීමට පහලට යන්න. අනෙකුත් ආකෘති සඳහා විකල්ප නොසලකන්න."
 
 #: libraries/display_export.lib.php:357 libraries/display_import.lib.php:311
-#, fuzzy
 msgid "Encoding Conversion:"
-msgstr "MySQL සේවාදායකයාගේ සංස්කරණය"
+msgstr "කේතීකරණ පරිවර්තනය:"
 
 #: libraries/display_git_revision.lib.php:56
 #, php-format
@@ -7165,10 +7161,10 @@ msgid "This plugin does not support compressed imports!"
 msgstr "මෙම පේණුව හැකිළු ආනයන සඳහා සහාය නොදක්වයි!"
 
 #: libraries/import/mediawiki.php:246
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid format of CSV input on line %d."
 msgid "Invalid format of mediawiki input on line: <br />%s."
-msgstr "CSV ආනයනයේ %d පේළියේ වැරදි ආකෘතියක්."
+msgstr "Mediawiki ආනයනයේ වැරදි ආකෘතියකි, පේළිය: <br />%s."
 
 #: libraries/import/ods.php:49
 msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
@@ -8441,10 +8437,9 @@ msgid "Index"
 msgstr "සූචිය"
 
 #: libraries/tbl_properties.inc.php:121
-#, fuzzy
 #| msgid "Remove column(s)"
 msgid "Move column"
-msgstr "පේළි(යක්) ඉවත් කරන්න"
+msgstr "පේළිය ගෙනයන්න"
 
 #: libraries/tbl_properties.inc.php:130
 #, php-format
@@ -8497,7 +8492,7 @@ msgid "first"
 msgstr ""
 
 #: libraries/tbl_properties.inc.php:599
-#, fuzzy, php-format
+#, php-format
 #| msgid "After %s"
 msgid "after %s"
 msgstr "%s ට පසු"
@@ -8847,10 +8842,9 @@ msgid "No databases"
 msgstr "දත්තගබඩා නොමැත"
 
 #: navigation.php:170
-#, fuzzy
 #| msgid "Filter tables by name"
 msgid "Filter databases by name"
-msgstr "වගු නමින් පෙරහන්න"
+msgstr "දත්තගබඩා නමින් පෙරහන්න"
 
 #: navigation.php:239
 msgid "Filter tables by name"
@@ -10298,18 +10292,12 @@ msgid "The amount of data written so far, in bytes."
 msgstr "මේ දක්වා ලියැවුණු දත්ත ප්‍රමාණය, බයිට වලින්."
 
 #: server_status.php:1364
-#, fuzzy
 msgid "The number of pages that have been written for doublewrite operations."
-msgstr ""
-"The number of doublewrite writes that have been performed and the number of "
-"pages that have been written for this purpose."
+msgstr "ද්විත්ව-ලිවීම් මෙහෙයුම් සඳහා ලියැවුණු පිටු ගණන."
 
 #: server_status.php:1365
-#, fuzzy
 msgid "The number of doublewrite operations that have been performed."
-msgstr ""
-"The number of doublewrite writes that have been performed and the number of "
-"pages that have been written for this purpose."
+msgstr "සිදු කෙරුණු ද්විත්ව-ලිවීම් මෙහෙයුම් ගණන."
 
 #: server_status.php:1366
 msgid ""
@@ -10416,10 +10404,9 @@ msgid ""
 msgstr ""
 
 #: server_status.php:1389
-#, fuzzy
 #| msgid "Format of imported file"
 msgid "Percentage of used key cache (calculated value)"
-msgstr "ආනයනය කරන ලද ගොනුවේ ආකෘතිය"
+msgstr "යතුරු කෑෂයේ භාවිතා කරන ලද ප්‍රතිශතය (ගණනය කරන ලද අගයකි)"
 
 #: server_status.php:1390
 msgid "The number of requests to read a key block from the cache."
@@ -11303,10 +11290,9 @@ msgid "Table %1$s has been altered successfully"
 msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි"
 
 #: tbl_alter.php:131
-#, fuzzy
 #| msgid "The selected users have been deleted successfully."
 msgid "The columns have been moved successfully."
-msgstr "තෝරාගත් භාවිතා කරන්නන් සාර්ථකව ඉවත් කරන ලදි."
+msgstr "තීර සාර්ථකව ගෙන යන ලදි."
 
 #: tbl_chart.php:83
 msgctxt "Chart type"
@@ -11924,10 +11910,9 @@ msgid "The uptime is only %s"
 msgstr ""
 
 #: libraries/advisory_rules.txt:56
-#, fuzzy
 #| msgid "Versions"
 msgid "Questions below 1,000"
-msgstr "අනුවාද"
+msgstr "ප්‍රශ්න ගණන 1,000 ට වඩා අඩුය"
 
 #: libraries/advisory_rules.txt:59
 msgid ""
@@ -11942,10 +11927,10 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:61
-#, fuzzy, php-format
+#, php-format
 #| msgid "Current connection"
 msgid "Current amount of Questions: %s"
-msgstr "වත්මන් සම්බන්දතාව"
+msgstr "වත්මන් ප්‍රශ්න ගණන: %s"
 
 #: libraries/advisory_rules.txt:63
 msgid "Percentage of slow queries"
@@ -12000,7 +11985,7 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:82
-#, fuzzy, php-format
+#, php-format
 #| msgid "long_query_time is set to %d second(s)."
 msgid "long_query_time is currently set to %ds."
 msgstr "long_query_time තත්පර %d කට සිටුවා ඇත."
@@ -12010,10 +11995,9 @@ msgid "Slow query logging"
 msgstr "මන්දගාමී විමසුම් ලොගගත කිරීම"
 
 #: libraries/advisory_rules.txt:87
-#, fuzzy
 #| msgid "slow_query_log is enabled."
 msgid "The slow query log is disabled."
-msgstr "slow_query_log සක්‍රීය යි."
+msgstr "වැඩි කාලයක් ගන්න විමසුම් සටහන් කරනා ලොගය අක්‍රීය යි."
 
 #: libraries/advisory_rules.txt:88
 msgid ""
@@ -12022,10 +12006,9 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:89
-#, fuzzy
 #| msgid "long_query_time is set to %d second(s)."
 msgid "log_slow_queries is set to 'OFF'"
-msgstr "long_query_time තත්පර %d කට සිටුවා ඇත."
+msgstr "log_slow_queries, 'OFF'(අක්‍රීය) වෙත පිහිටුවා ඇත"
 
 #: libraries/advisory_rules.txt:93
 #, fuzzy
@@ -12068,10 +12051,9 @@ msgid "Version less than 5.5.8 (the first GA release of 5.5)."
 msgstr ""
 
 #: libraries/advisory_rules.txt:111
-#, fuzzy
 #| msgid "You should upgrade to %s %s or later."
 msgid "You should upgrade, to a stable version of MySQL 5.5"
-msgstr "You should upgrade to %s %s or later."
+msgstr "ඔබ MySQL 5.5 හි ස්ථාවර අනුවාදයක් වෙත යාවත්කාලීන කල යුතුය"
 
 #: libraries/advisory_rules.txt:114 libraries/advisory_rules.txt:121
 #: libraries/advisory_rules.txt:128
@@ -12115,10 +12097,9 @@ msgid "Version string (%s) matches Drizzle versioning scheme"
 msgstr ""
 
 #: libraries/advisory_rules.txt:135
-#, fuzzy
 #| msgid "MySQL charset"
 msgid "MySQL Architecture"
-msgstr "MySQL අක්ෂර කට්ටලය"
+msgstr "MySQL නිර්මිතය"
 
 #: libraries/advisory_rules.txt:138
 msgid "MySQL is not compiled as a 64-bit package."
@@ -12161,10 +12142,9 @@ msgid "Query caching method"
 msgstr "විමසුම් කෑෂ්ගත කරන ක්‍රමය"
 
 #: libraries/advisory_rules.txt:156
-#, fuzzy
 #| msgid "Query caching method"
 msgid "Suboptimal caching method."
-msgstr "විමසුම් කෑෂ්ගත කරන ක්‍රමය"
+msgstr "කෑෂ්ගත කරන ක්‍රමය ප්‍රශස්ත නැත."
 
 #: libraries/advisory_rules.txt:157
 msgid ""
@@ -12297,10 +12277,10 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:193
-#, fuzzy, php-format
+#, php-format
 #| msgid "Current version: %s"
 msgid "Current query cache size: %s"
-msgstr "වත්මන් අනුවාදය: %s"
+msgstr "වත්මන් විමසුම් කෑෂයේ ප්‍රමාණය: %s"
 
 #: libraries/advisory_rules.txt:195
 msgid "Query cache min result size"
diff --git a/server_databases.php b/server_databases.php
index 9f05460127..4e60e14da4 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -292,11 +292,9 @@ if ($databases_count > 0) {
     if ($is_superuser || $cfg['AllowUserDropDatabase']) {
         $common_url_query = PMA_generate_common_url(array('sort_by' => $sort_by, 'sort_order' => $sort_order, 'dbstats' => $dbstats));
         echo '<img class="selectallarrow" src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" width="38" height="22" alt="' . __('With selected:') . '" />' . "\n"
-           . '<a href="server_databases.php' . $common_url_query . '&amp;checkall=1" onclick="if (markAllRows(\'tabledatabases\')) return false;">' . "\n"
-           . '    ' . __('Check All') . '</a> / ' . "\n"
-           . '<a href="server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
-           . '    ' . __('Uncheck All') . '</a>' . "\n"
-           . '<i>' . __('With selected:') . '</i>' . "\n";
+           . '<input type="checkbox" id="checkall" title="' . __('Check All') . '" /> '
+           . '<label for="checkall">' . __('Check All') . '</label> '
+           . '<i style="margin-left: 2em">' . __('With selected:') . '</i>' . "\n";
         echo PMA_getButtonOrImage('drop_selected_dbs', 'mult_submit' . ($cfg['AjaxEnable'] ? ' ajax' : ''), 'drop_selected_dbs', __('Drop'), 'b_deltbl.png');
     }
 
diff --git a/server_privileges.php b/server_privileges.php
index 4b302af73e..74cce6e2d4 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1879,7 +1879,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                     foreach ($user as $host) {
                         $index_checkbox++;
                         echo '        <tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
-                           . '            <td><input type="checkbox" name="selected_usr[]" id="checkbox_sel_users_'
+                           . '            <td><input type="checkbox" class="checkall" name="selected_usr[]" id="checkbox_sel_users_'
                             . $index_checkbox . '" value="'
                             . htmlspecialchars($host['User'] . '&amp;#27;' . $host['Host'])
                             . '"'
@@ -1928,14 +1928,9 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
                    .' src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png"'
                    .' width="38" height="22"'
                    .' alt="' . __('With selected:') . '" />' . "\n"
-                   .'<a href="server_privileges.php?' . $GLOBALS['url_query'] .  '&amp;checkall=1"'
-                   .' onclick="if (markAllRows(\'usersForm\')) return false;">'
-                   . __('Check All') . '</a>' . "\n"
-                   .'/' . "\n"
-                   .'<a href="server_privileges.php?' . $GLOBALS['url_query'] .  '"'
-                   .' onclick="if (unMarkAllRows(\'usersForm\')) return false;">'
-                   . __('Uncheck All') . '</a>' . "\n"
-                   .'<i>' . __('With selected:') . '</i>' . "\n";
+                   .'<input type="checkbox" id="checkall" title="' . __('Check All') . '" /> '
+                   .'<label for="checkall">' . __('Check All') . '</label> '
+                   .'<i style="margin-left: 2em">' . __('With selected:') . '</i>' . "\n";
 
                 echo PMA_getButtonOrImage(
                         'submit_mult', 'mult_submit', 'submit_mult_export',
diff --git a/tbl_operations.php b/tbl_operations.php
index e2d1e25319..86993edec0 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -231,7 +231,7 @@ if (isset($result) && empty($message_to_show)) {
         $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error'));
         // $result should exist, regardless of $_message
         $_type = $result ? 'success' : 'error';
-        if ($GLOBALS['ajax_request'] == true) {
+        if (isset($GLOBALS['ajax_request']) && $GLOBALS['ajax_request'] == true) {
             $response = PMA_Response::getInstance();
             $response->isSuccess($_message->isSuccess());
             $response->addJSON('message', $_message);
diff --git a/tbl_structure.php b/tbl_structure.php
index 8ccc21782d..7ffb4b4782 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -334,7 +334,7 @@ foreach ($fields as $row) {
     ?>
 <tr class="<?php echo $odd_row ? 'odd': 'even'; $odd_row = !$odd_row; ?>">
     <td class="center">
-        <input type="checkbox" name="selected_fld[]" value="<?php echo htmlspecialchars($row['Field']); ?>" id="checkbox_row_<?php echo $rownum; ?>" <?php echo $checked; ?> />
+        <input type="checkbox" class="checkall" name="selected_fld[]" value="<?php echo htmlspecialchars($row['Field']); ?>" id="checkbox_row_<?php echo $rownum; ?>" <?php echo $checked; ?> />
     </td>
     <td class="right">
         <?php echo $rownum; ?>
@@ -559,15 +559,10 @@ $checkall_url = 'tbl_structure.php?' . PMA_generate_common_url($db, $table);
 
 <img class="selectallarrow" src="<?php echo $pmaThemeImage . 'arrow_' . $text_dir . '.png'; ?>"
     width="38" height="22" alt="<?php echo __('With selected:'); ?>" />
-<a href="<?php echo $checkall_url; ?>&amp;checkall=1"
-    onclick="if (markAllRows('fieldsForm')) return false;">
-    <?php echo __('Check All'); ?></a>
-/
-<a href="<?php echo $checkall_url; ?>"
-    onclick="if (unMarkAllRows('fieldsForm')) return false;">
-    <?php echo __('Uncheck All'); ?></a>
+<input type="checkbox" id="checkall" title="' . __('Check All') . '" />
+<label for="checkall"><?php echo __('Check All'); ?></label>
 
-<i><?php echo __('With selected:'); ?></i>
+<i style="margin-left: 2em"><?php echo __('With selected:'); ?></i>
 
 <?php
 echo PMA_getButtonOrImage(
diff --git a/test/libraries/core/PMA_fatalError_test.php b/test/libraries/core/PMA_fatalError_test.php
index dc4777f15d..d50ec533f7 100644
--- a/test/libraries/core/PMA_fatalError_test.php
+++ b/test/libraries/core/PMA_fatalError_test.php
@@ -12,15 +12,38 @@
 /*
  * Include to test.
  */
-require_once 'libraries/select_lang.lib.php';
+require_once 'libraries/vendor_config.php';
 require_once 'libraries/core.lib.php';
+require_once 'libraries/common.lib.php';
+require_once 'libraries/js_escape.lib.php';
+require_once 'libraries/select_lang.lib.php';
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/Config.class.php';
-require_once 'libraries/vendor_config.php';
+require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/Table.class.php';
 require_once 'libraries/php-gettext/gettext.inc';
 
 class PMA_fatalError_test extends PHPUnit_Framework_TestCase
 {
+    public function setup()
+    {
+        $GLOBALS['PMA_Config'] = new PMA_Config();
+        $GLOBALS['PMA_Config']->enableBc();
+        $GLOBALS['cfg']['Server'] = array(
+            'host' => 'host',
+            'verbose' => 'verbose',
+        );
+        $GLOBALS['cfg']['OBGzip'] = false;
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+        $_SESSION[' PMA_token '] = 'token';
+        $GLOBALS['pmaThemeImage'] = 'theme/';
+        $GLOBALS['pmaThemePath'] = $_SESSION['PMA_Theme']->getPath();
+        $GLOBALS['server'] = 1;
+        $GLOBALS['db'] = '';
+        $GLOBALS['table'] = '';
+    }
+
     public function testFatalErrorMessage()
     {
         $this->expectOutputRegex("/FatalError!/");
@@ -42,4 +65,4 @@ class PMA_fatalError_test extends PHPUnit_Framework_TestCase
         PMA_fatalError($message, $params);
     }
 
-}
\ No newline at end of file
+}