diff --git a/Documentation.html b/Documentation.html
index 33bfa85e27..26673cbc23 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1391,8 +1391,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         is known to cause data corruption when having enabled buffering.</dd>
 
     <dt id="cfg_PersistentConnections">$cfg['PersistentConnections'] boolean</dt>
-    <dd>Whether persistent connections should be used or not (mysql_connect or
-        mysql_pconnect).</dd>
+    <dd>Whether <a href="http://php.net/manual/en/features.persistent-connections.php">persistent connections</a>
+        should be used or not. Works with following extensions:
+        <ul>
+            <li>mysql (<a href="http://php.net/manual/en/function.mysql-pconnect.php">mysql_pconnect</a>),</li>
+            <li>mysqli (requires PHP 5.3.0 or newer, <a href="http://php.net/manual/en/mysqli.persistconns.php">more information</a>).</li>
+        </ul></dd>
 
     <dt id="cfg_ForceSSL">$cfg['ForceSSL'] boolean</dt>
     <dd>Whether to force using https while accessing phpMyAdmin.</dd>
diff --git a/js/functions.js b/js/functions.js
index d7694f441c..bbe00b51d3 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1936,6 +1936,38 @@ $(document).ready(function() {
 
 }, 'top.frame_content'); //end $(document).ready for 'Change Table'
 
+/**
+ * jQuery coding for 'Table operations'.  Used on tbl_operations.php
+ * Attach Ajax Event handlers for Table operations
+ */
+$(document).ready(function() {
+    /**
+     *Ajax action for submitting the "Alter table order by"
+    **/
+    $("#alterTableOrderby.ajax").live('submit', function(event) {
+        event.preventDefault();
+        $form = $(this);
+
+        PMA_prepareForAjaxRequest($form);
+        /*variables which stores the common attributes*/
+        $.post($form.attr('action'), $form.serialize()+"&submitorderby=Go", function(data) {
+            if ($("#sqlqueryresults").length != 0) {
+                $("#sqlqueryresults").remove();
+            }
+            if (data.success == true) {
+                PMA_ajaxShowMessage(data.message);
+                $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
+                $("#sqlqueryresults").html(data.sql_query);
+                $("#result_query .notice").remove();
+                $("#result_query").prepend((data.message));
+            } else {
+                PMA_ajaxShowMessage(data.error);
+            }
+        }) // end $.post()
+    });//end of alterTableOrderby ajax submit
+}, 'top.frame_content'); //end $(document).ready for 'Table operations'
+
+
 /**
  * Attach Ajax event handlers for Drop Database. Moved here from db_structure.js
  * as it was also required on db_create.php
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index 5c98d258b2..e90e0bf795 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -66,15 +66,9 @@ function PMA_auth_set_user()
  */
 function PMA_auth_fails()
 {
-    global $php_errormsg, $cfg;
-
     $conn_error = PMA_DBI_getError();
     if (!$conn_error) {
-        if (isset($php_errormsg)) {
-            $conn_error = $php_errormsg;
-        } else {
-            $conn_error = __('Cannot connect: invalid settings.');
-        }
+        $conn_error = __('Cannot connect: invalid settings.');
     }
 
     // Defines the charset to be used
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index a829faa65c..0a079b26a1 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -238,8 +238,6 @@ function PMA_auth_fails()
             $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']);
         } elseif (PMA_DBI_getError()) {
             $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError());
-        } elseif (isset($php_errormsg)) {
-            $_SESSION['PMA_single_signon_error_message'] = $php_errormsg;
         } else {
             $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server');
         }
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 53cde17982..2b2cf60a9f 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -899,6 +899,11 @@ if (! defined('PMA_MINIMUM_COMMON')) {
             unset($login_without_password_is_forbidden); //Clean up after you!
         }
 
+        // if using TCP socket is not needed
+        if (strtolower($cfg['Server']['connect_type']) == 'tcp') {
+            $cfg['Server']['socket'] = '';
+        }
+
         // Try to connect MySQL with the control user profile (will be used to
         // get the privileges list for the current user but the true user link
         // must be open after this one so it would be default one for all the
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index aa099eb070..64ab026275 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -20,18 +20,28 @@ if (! defined('PMA_MYSQL_CLIENT_API')) {
     unset($client_api);
 }
 
-function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistant=false)
+/**
+ * Helper function for connecting to the database server
+ *
+ * @param   string  $server
+ * @param   string  $user
+ * @param   string  $password
+ * @param   int     $client_flags
+ * @param   boolean $persistent
+ * @return  mixed   false on error or a mysql connection resource on success
+ */
+function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent = false)
 {
     global $cfg;
 
     if (empty($client_flags)) {
-        if ($cfg['PersistentConnections'] || $persistant) {
+        if ($cfg['PersistentConnections'] || $persistent) {
             $link = @mysql_pconnect($server, $user, $password);
         } else {
             $link = @mysql_connect($server, $user, $password);
         }
     } else {
-        if ($cfg['PersistentConnections'] || $persistant) {
+        if ($cfg['PersistentConnections'] || $persistent) {
             $link = @mysql_pconnect($server, $user, $password, $client_flags);
         } else {
             $link = @mysql_connect($server, $user, $password, false, $client_flags);
@@ -40,17 +50,20 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist
 
     return $link;
 }
+
 /**
+ * connects to the database server
+ * 
  * @param   string  $user           mysql user name
  * @param   string  $password       mysql user password
  * @param   boolean $is_controluser
- * @param   array   $server host/port/socket/persistant
+ * @param   array   $server host/port/socket/persistent
  * @param   boolean $auxiliary_connection (when true, don't go back to login if connection fails)
  * @return  mixed   false on error or a mysqli object on success
  */
 function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false)
 {
-    global $cfg, $php_errormsg;
+    global $cfg;
 
     if ($server) {
         $server_port = (empty($server['port']))
@@ -59,9 +72,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
         $server_socket = (empty($server['socket']))
             ? ''
             : ':' . $server['socket'];
-        $server_persistant = (empty($server['persistant']))
-            ? false
-            : true;
     } else {
         $server_port   = (empty($cfg['Server']['port']))
             ? ''
@@ -71,10 +81,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
             : ':' . $cfg['Server']['socket'];
     }
 
-    if (strtolower($cfg['Server']['connect_type']) == 'tcp') {
-        $cfg['Server']['socket'] = '';
-    }
-
     $client_flags = 0;
 
     // always use CLIENT_LOCAL_FILES as defined in mysql_com.h
@@ -101,9 +107,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
         }
     } else {
         if (!isset($server['host'])) {
-            $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistant);
+            $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL);
         } else {
-            $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL, $server_persistant);
+            $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL);
         }
     }
     if (empty($link)) {
@@ -128,11 +134,11 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
 }
 
 /**
- * select a db
+ * selects given database
  *
- * @param string $dbname name of db to select
- * @param resource $link mysql link resource
- * @return boolean success
+ * @param string    $dbname  name of db to select
+ * @param resource  $link    mysql link resource
+ * @return boolean
  */
 function PMA_DBI_select_db($dbname, $link = null)
 {
@@ -149,9 +155,9 @@ function PMA_DBI_select_db($dbname, $link = null)
 /**
  * runs a query and returns the result
  *
- * @param string $query query to run
+ * @param string   $query query to run
  * @param resource $link mysql link resource
- * @param integer $options
+ * @param integer  $options
  * @return mixed
  */
 function PMA_DBI_real_query($query, $link, $options)
@@ -165,15 +171,33 @@ function PMA_DBI_real_query($query, $link, $options)
     }
 }
 
+/**
+ * returns array of rows with associative and numeric keys from $result
+ *
+ * @param   resource  $result
+ * @return  array
+ */
 function PMA_DBI_fetch_array($result)
 {
     return mysql_fetch_array($result, MYSQL_BOTH);
 }
 
+/**
+ * returns array of rows with associative keys from $result
+ *
+ * @param   resource  $result
+ * @return  array
+ */
 function PMA_DBI_fetch_assoc($result) {
     return mysql_fetch_array($result, MYSQL_ASSOC);
 }
 
+/**
+ * returns array of rows with numeric keys from $result
+ *
+ * @param   resource  $result
+ * @return  array
+ */
 function PMA_DBI_fetch_row($result)
 {
     return mysql_fetch_array($result, MYSQL_NUM);
@@ -192,17 +216,14 @@ function PMA_DBI_data_seek($result, $offset)
 }
 
 /**
- * Frees the memory associated with the results
+ * Frees memory associated with the result
  *
- * @param result    $result,...     one or more mysql result resources
+ * @param  resource  $result
  */
-function PMA_DBI_free_result()
+function PMA_DBI_free_result($result)
 {
-    foreach (func_get_args() as $result) {
-        if (is_resource($result)
-         && get_resource_type($result) === 'mysql result') {
-            mysql_free_result($result);
-        }
+    if (is_resource($result) && get_resource_type($result) === 'mysql result') {
+        mysql_free_result($result);
     }
 }
 
@@ -337,6 +358,12 @@ function PMA_DBI_getError($link = null)
     return $error;
 }
 
+/**
+ * returns the number of rows returned by last query
+ *
+ * @param   resource    $result
+ * @return  string|ineteger
+ */
 function PMA_DBI_num_rows($result)
 {
     if (!is_bool($result)) {
@@ -346,6 +373,12 @@ function PMA_DBI_num_rows($result)
     }
 }
 
+/**
+ * returns last inserted auto_increment id for given $link or $GLOBALS['userlink']
+ *
+ * @param   resource $link   the mysql object
+ * @return  string|ineteger
+ */
 function PMA_DBI_insert_id($link = null)
 {
     if (empty($link)) {
@@ -366,9 +399,9 @@ function PMA_DBI_insert_id($link = null)
 /**
  * returns the number of rows affected by last query
  *
- * @param   object mysql   $link   the mysql object
- * @param   boolean        $get_from_cache
- * @return  string integer
+ * @param   resource   $link   the mysql object
+ * @param   boolean    $get_from_cache
+ * @return  string|integer
  */
 function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
 {
@@ -388,7 +421,11 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
 }
 
 /**
+ * returns metainfo for fields in $result
+ *
  * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals)
+ * @param   resource    $result
+ * @return  array  meta info for fields in $result
  */
 function PMA_DBI_get_fields_meta($result)
 {
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 0cd7c2f6dd..535b8253c5 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -43,6 +43,34 @@ if (! defined('MYSQLI_TYPE_BIT')) {
     define('MYSQLI_TYPE_BIT', 16);
 }
 
+/**
+ * Helper function for connecting to the database server
+ *
+ * @param   mysqli  $link
+ * @param   string  $host
+ * @param   string  $user
+ * @param   string  $password
+ * @param   string  $dbname
+ * @param   int     $server_port
+ * @param   string  $server_socket
+ * @param   int     $client_flags
+ * @param   boolean $persistent
+ * @return  boolean
+ */
+function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags = null, $persistent = false)
+{
+    global $cfg;
+
+    if ($cfg['PersistentConnections'] || $persistent) {
+        $host = 'p:' . $host;
+    }
+    if ($client_flags === null) {
+        return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket);
+    } else {
+        return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags);
+    }
+}
+
 /**
  * connects to the database server
  *
@@ -55,6 +83,8 @@ if (! defined('MYSQLI_TYPE_BIT')) {
  */
 function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false)
 {
+    global $cfg;
+
     if ($server) {
         $server_port   = (empty($server['port']))
             ? false
@@ -66,17 +96,12 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
             ? 'localhost'
             : $server['host'];
     } else {
-        $server_port   = (empty($GLOBALS['cfg']['Server']['port']))
+        $server_port   = (empty($cfg['Server']['port']))
             ? false
-            : (int) $GLOBALS['cfg']['Server']['port'];
-        $server_socket = (empty($GLOBALS['cfg']['Server']['socket']))
+            : (int) $cfg['Server']['port'];
+        $server_socket = (empty($cfg['Server']['socket']))
             ? null
-            : $GLOBALS['cfg']['Server']['socket'];
-    }
-
-
-    if (strtolower($GLOBALS['cfg']['Server']['connect_type']) == 'tcp') {
-        $GLOBALS['cfg']['Server']['socket'] = '';
+            : $cfg['Server']['socket'];
     }
 
     // NULL enables connection to the default socket
@@ -88,23 +113,23 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
     $client_flags = 0;
 
     /* Optionally compress connection */
-    if ($GLOBALS['cfg']['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS')) {
+    if ($cfg['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS')) {
         $client_flags |= MYSQLI_CLIENT_COMPRESS;
     }
 
     /* Optionally enable SSL */
-    if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) {
+    if ($cfg['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) {
         $client_flags |= MYSQLI_CLIENT_SSL;
     }
 
     if (!$server) {
-        $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags);
+        $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags);
         // Retry with empty password if we're allowed to
-        if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) {
-            $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags);
+        if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) {
+            $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags);
         }
     } else {
-        $return_value = @mysqli_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket);
+        $return_value = @PMA_DBI_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket);
     }
 
     if ($return_value == false) {
@@ -131,9 +156,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu
 /**
  * selects given database
  *
- * @param   string          $dbname database name to select
- * @param   object mysqli   $link   the mysqli object
- * @return  boolean         true or false
+ * @param string  $dbname  database name to select
+ * @param mysqli  $link    the mysqli object
+ * @return boolean
  */
 function PMA_DBI_select_db($dbname, $link = null)
 {
@@ -150,10 +175,10 @@ function PMA_DBI_select_db($dbname, $link = null)
 /**
  * runs a query and returns the result
  *
- * @param   string          $query      query to execute
- * @param   object mysqli   $link       mysqli object
- * @param   integer         $options
- * @return  mixed           true, false or result object
+ * @param   string   $query      query to execute
+ * @param   mysqli   $link       mysqli object
+ * @param   integer  $options
+ * @return  mysqli_result|boolean
  */
 function PMA_DBI_real_query($query, $link, $options)
 {
@@ -171,8 +196,8 @@ function PMA_DBI_real_query($query, $link, $options)
 /**
  * returns array of rows with associative and numeric keys from $result
  *
- * @param   object mysqli result    $result
- * @return  array                   result rows
+ * @param   mysqli_result  $result
+ * @return  array
  */
 function PMA_DBI_fetch_array($result)
 {
@@ -182,8 +207,8 @@ function PMA_DBI_fetch_array($result)
 /**
  * returns array of rows with associative keys from $result
  *
- * @param   object mysqli result    $result
- * @return  array                   result rows
+ * @param   mysqli_result  $result
+ * @return  array
  */
 function PMA_DBI_fetch_assoc($result)
 {
@@ -193,8 +218,8 @@ function PMA_DBI_fetch_assoc($result)
 /**
  * returns array of rows with numeric keys from $result
  *
- * @param   object mysqli result    $result
- * @return  array                   result rows
+ * @param   mysqli_result  $result
+ * @return  array
  */
 function PMA_DBI_fetch_row($result)
 {
@@ -214,23 +239,21 @@ function PMA_DBI_data_seek($result, $offset)
 }
 
 /**
- * Frees the memory associated with the results
+ * Frees memory associated with the result
  *
- * @param   result  $result,...     one or more mysql result resources
+ * @param  mysqli_result  $result
  */
-function PMA_DBI_free_result()
+function PMA_DBI_free_result($result)
 {
-    foreach (func_get_args() as $result) {
-        if ($result instanceof mysqli_result) {
-            mysqli_free_result($result);
-        }
+    if ($result instanceof mysqli_result) {
+        mysqli_free_result($result);
     }
 }
 
 /**
  * Check if there are any more query results from a multi query
  *
- * @param   object mysqli   $link   the mysqli object
+ * @param   mysqli   $link   the mysqli object
  * @return  boolean         true or false
  */
 function PMA_DBI_more_results($link = null) {
@@ -247,7 +270,7 @@ function PMA_DBI_more_results($link = null) {
 /**
  * Prepare next result from multi_query
  *
- * @param   object mysqli   $link   the mysqli object
+ * @param   mysqli   $link   the mysqli object
  * @return  boolean         true or false
  */
 function PMA_DBI_next_result($link = null) {
@@ -356,8 +379,10 @@ function PMA_DBI_getError($link = null)
 }
 
 /**
+ * returns the number of rows returned by last query
  *
- * @param   object mysqli result    $result
+ * @param   mysqli_result    $result
+ * @return  string|ineteger
  */
 function PMA_DBI_num_rows($result)
 {
@@ -372,10 +397,10 @@ function PMA_DBI_num_rows($result)
 /**
  * returns last inserted auto_increment id for given $link or $GLOBALS['userlink']
  *
- * @param   object mysqli   $link   the mysqli object
- * @return  string ineteger
+ * @param   mysqli   $link   the mysqli object
+ * @return  string|ineteger
  */
-function PMA_DBI_insert_id($link = '')
+function PMA_DBI_insert_id($link = null)
 {
     if (empty($link)) {
         if (isset($GLOBALS['userlink'])) {
@@ -396,9 +421,9 @@ function PMA_DBI_insert_id($link = '')
 /**
  * returns the number of rows affected by last query
  *
- * @param   object mysqli   $link   the mysqli object
- * @param   boolean         $get_from_cache
- * @return  string integer
+ * @param   mysqli   $link   the mysqli object
+ * @param   boolean  $get_from_cache
+ * @return  string|integer
  */
 function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
 {
@@ -420,8 +445,8 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true)
  * returns metainfo for fields in $result
  *
  * @todo preserve orignal flags value
- * @param   object mysqli result    $result
- * @return  array                   meta info for fields in $result
+ * @param   mysqli_result    $result
+ * @return  array  meta info for fields in $result
  */
 function PMA_DBI_get_fields_meta($result)
 {
@@ -499,8 +524,8 @@ function PMA_DBI_get_fields_meta($result)
 /**
  * return number of fields in given $result
  *
- * @param   object mysqli result    $result
- * @return  integer                 field count
+ * @param   mysqli_result    $result
+ * @return  integer  field count
  */
 function PMA_DBI_num_fields($result)
 {
@@ -510,9 +535,9 @@ function PMA_DBI_num_fields($result)
 /**
  * returns the length of the given field $i in $result
  *
- * @param   object mysqli result    $result
- * @param   integer                 $i      field
- * @return  integer                 length of field
+ * @param   mysqli_result    $result
+ * @param   integer          $i      field
+ * @return  integer  length of field
  */
 function PMA_DBI_field_len($result, $i)
 {
@@ -522,9 +547,9 @@ function PMA_DBI_field_len($result, $i)
 /**
  * returns name of $i. field in $result
  *
- * @param   object mysqli result    $result
- * @param   integer                 $i      field
- * @return  string                  name of $i. field in $result
+ * @param   mysqli_result    $result
+ * @param   integer          $i      field
+ * @return  string  name of $i. field in $result
  */
 function PMA_DBI_field_name($result, $i)
 {
@@ -534,9 +559,9 @@ function PMA_DBI_field_name($result, $i)
 /**
  * returns concatenated string of human readable field flags
  *
- * @param   object mysqli result    $result
- * @param   integer                 $i      field
- * @return  string                  field flags
+ * @param   mysqli_result    $result
+ * @param   integer          $i      field
+ * @return  string  field flags
  */
 function PMA_DBI_field_flags($result, $i)
 {
diff --git a/po/el.po b/po/el.po
index 561be746b3..ca875f06c5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-25 11:36+0200\n"
-"PO-Revision-Date: 2011-07-20 11:01+0200\n"
+"PO-Revision-Date: 2011-07-26 18:41+0200\n"
 "Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
 "Language-Team: greek <el@li.org>\n"
 "Language: el\n"
@@ -1206,7 +1206,6 @@ msgid "Pause monitor"
 msgstr "Παύση εποπτείας"
 
 #: js/messages.php:114
-#, fuzzy
 #| msgid "general_log and slow_query_log is enabled."
 msgid "general_log and slow_query_log are enabled."
 msgstr "Το general_log και το slow_query_log είναι ενεργοποιημένα."
@@ -1220,7 +1219,6 @@ msgid "slow_query_log is enabled."
 msgstr "Το slow_query_log είναι ενεργοποιημένα."
 
 #: js/messages.php:117
-#, fuzzy
 #| msgid "slow_query_log and general_log is disabled."
 msgid "slow_query_log and general_log are disabled."
 msgstr "Το slow_query_log και το general_log είναι απενεργοποιημένα."
@@ -1283,7 +1281,6 @@ msgid "Set long_query_time to %ds"
 msgstr "Ορισμός του long_query_time σε %dδ"
 
 #: js/messages.php:131
-#, fuzzy
 #| msgid ""
 #| "You don't have super user rights to change this variables. Please log in "
 #| "as root account or contact your database administrator."
@@ -1365,10 +1362,9 @@ msgstr ""
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
-msgstr "Φίλτρο"
+msgstr "Φίλτρα"
 
 #. l10n: Filter as in "Start Filtering"
 #: js/messages.php:153 navigation.php:270
@@ -1377,23 +1373,22 @@ msgstr "Φίλτρο"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Φιλτράρισμα ερωτημάτων ανά λέξη/κανονική έκφραση:"
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE statements"
 msgstr ""
+"Ομαδοποίηση ερωτημάτων, αγνοώντας τα δεδομένα μεταβλητής στις δηλώσεις WHERE"
 
 #: js/messages.php:156
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "Αριθμός εισαχθέντων γραμμών"
+msgstr "Άθροισμα ομαδοποιημένων γραμμών"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "Σύνολο"
+msgstr "Σύνολο:"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1531,10 +1526,9 @@ msgid "Change"
 msgstr "Αλλαγή"
 
 #: js/messages.php:208
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "Μέγιστος χρόνος εκτέλεσης"
+msgstr "Χρόνος εκτέλεσης ερωτήματος"
 
 #: js/messages.php:211
 msgid "Hide search criteria"
@@ -1550,10 +1544,9 @@ msgid "Ignore"
 msgstr "Παράληψη"
 
 #: js/messages.php:218
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
-msgstr "Προσθήκη στήλης"
+msgstr "Προσθήκη στηλών"
 
 #: js/messages.php:221
 msgid "Select referenced key"
@@ -1870,13 +1863,12 @@ msgstr "Μέγεθος γραμματοσειράς"
 
 #: libraries/File.class.php:220
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "Το αρχείο δεν ήταν αρχείο αποστολής."
 
 #: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
-msgstr "Άγνωστο σφάλμα στην αποστολή αρχείου."
+msgstr "Άγνωστο σφάλμα κατά την αποστολή αρχείου."
 
 #: libraries/File.class.php:277
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1922,11 +1914,11 @@ msgstr ""
 
 #: libraries/File.class.php:507
 msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Σφάλμα κατά τη μετακίνηση αρχείου αποστολής."
 
 #: libraries/File.class.php:515
 msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Αδύνατη η ανάγνωση (μετακίνηση) του αρχείου αποστολής."
 
 #: libraries/Index.class.php:418 tbl_relation.php:526
 msgid "No index defined!"
@@ -2482,10 +2474,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s μέρες, %s ώρες, %s λεπτά %s δευτερόλεπτα"
 
 #: libraries/common.lib.php:1856
-#, fuzzy
 #| msgid "Routine parameters"
 msgid "Missing parameter:"
-msgstr "Παράμετροι ρουτίνας"
+msgstr "Απολεσθείσα παράμετρος:"
 
 #: libraries/common.lib.php:2162 libraries/common.lib.php:2165
 #: libraries/display_tbl.lib.php:299
@@ -6317,10 +6308,9 @@ msgid ""
 msgstr "Οι ακόλουθες δομές δημιουργήθηκαν ή αλλάχτηκαν. Εδώ μπορείτε να:"
 
 #: libraries/import.lib.php:1069
-#, fuzzy
 #| msgid "View a structure`s contents by clicking on its name"
 msgid "View a structure's contents by clicking on its name"
-msgstr "Δείτε τα περιεχόμενα δομής πατώντας στο όνομα"
+msgstr "Προβολή των περιεχομένων δομής πατώντας στο όνομά της"
 
 #: libraries/import.lib.php:1070
 msgid ""
@@ -6328,10 +6318,9 @@ msgid ""
 msgstr "Αλλάξτε τις ρυθμίσεις πατώντας τον αντίστοιχο σύνδεσμο «Επιλογές»"
 
 #: libraries/import.lib.php:1071
-#, fuzzy
 #| msgid "Edit its structure by following the \"Structure\" link"
 msgid "Edit structure by following the \"Structure\" link"
-msgstr "Επεξεργαστεί τη δομή από τον σύνδεσμο «Δομή»"
+msgstr "Επεξεργαστείτε τη δομή πατώντας τον σύνδεσμο «Δομή»"
 
 #: libraries/import.lib.php:1074
 msgid "Go to database"
@@ -10042,7 +10031,6 @@ msgid "Monitor Instructions"
 msgstr "Οδηγίες Εποπτείας"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -10059,11 +10047,13 @@ msgid ""
 msgstr ""
 "Η Εποπτεία phpMyAdmin μπορεί να σας βοηθήσει να βελτιστοποιήσετε τη ρύθμιση "
 "του διακομιστή και να καταγράφει χρονοβόρα\n"
-"        ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output "
-"σε «TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log."
+"ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output σε "
+"«TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log. "
+"Σημειώστε, ωστόσο, ότι το\n"
+"general_log παράγει πολλά δεδομένα και αυξάνει τη χρήση πόρων του διακομιστή "
+"μέχρι και 15%"
 
 #: server_status.php:1373
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -10107,14 +10097,7 @@ msgstr ""
 "        αριστερό πλήκτρο του ποντικιού και μετακινηθείτε μέσα στο διάγραμμα. "
 "Αυτό θα φορτώσει τα απαιτούμενα στατιστικά από τις καταγραφές βοηθόντας να "
 "βρείτε τι προκάλεσε αυτή\n"
-"        την έντονη δραστηριότητα.</p>\n"
-"        <p><b>Σημειώστε:</b>\n"
-"        Ενεργοποιώντας το general_log ίσως αυξήσει τη φόρτωση του διακομιστή "
-"μεταξύ 5-15%. Επίσης, έχετε υπόψη ότι η δημιουργία στατιστικών από τις "
-"καταγραφές είναι μια \n"
-"        πολύ απαιτητική σε πόρους εργασία, έτσι σας προτείνουμε να επιλέξετε "
-"μια μικρή επέκταση χρόνου.\n"
-"        </p>"
+"        την έντονη δραστηριότητα.</p>"
 
 #: server_status.php:1383
 msgid ""
@@ -10126,6 +10109,13 @@ msgid ""
 "not required any more.\n"
 "        "
 msgstr ""
+"<b>Σημειώστε:</b>\n"
+"        Η ενεργοποίηση του general_log μπορεί να αυξήσει τη χρήση των πόρων "
+"του συστήματος κατά 5-15%. Επίσης, λάβετε υπόψη ότι η δημιουργία στατιστικών "
+"από τις καταγραφές είναι μια εργασία που απαιτεί έντονη χρήση πόρων, για "
+"αυτό σας προτείνεται να χρησιμοποιήσετε μικρό χρονικό όριο και να "
+"απενεργοποιήσετε το general_log και να αδειάσετε τον πίνακά του μόλις η "
+"εποπτεία δεν είναι πλέον απαραίτητη.        "
 
 #: server_status.php:1396
 msgid "CPU Usage"
@@ -10193,11 +10183,13 @@ msgstr "Επιλεγμένο εύρος χρόνου:"
 
 #: server_status.php:1465
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "Λήψη μόνο των δηλώσεων SELECT,INSERT,UPDATE και DELETE"
 
 #: server_status.php:1470
 msgid "Remove variable data in INSERT statements for better grouping"
 msgstr ""
+"Απομάκρυνση δεδομένων μεταβλητών στις δηλώσεις INSERT για καλύτερη "
+"ομαδοποιήση"
 
 #: server_status.php:1473
 msgid ""
@@ -10208,10 +10200,9 @@ msgstr ""
 "αποτελέσματα ομοδοποιούνται ανά κείμενο ερωτήματος."
 
 #: server_status.php:1476
-#, fuzzy
 #| msgid "Query type"
 msgid "Query analyzer"
-msgstr "Τύπος ερωτήματος"
+msgstr "Αναλυτής ερωτήματος"
 
 #: server_status.php:1512
 #, php-format
diff --git a/po/es.po b/po/es.po
index c12474488f..af4cbe2fbe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-25 11:36+0200\n"
-"PO-Revision-Date: 2011-07-19 22:29+0200\n"
+"PO-Revision-Date: 2011-07-27 16:54+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
 "Language: es\n"
@@ -1212,7 +1212,6 @@ msgid "Pause monitor"
 msgstr "Pausar monitorización"
 
 #: js/messages.php:114
-#, fuzzy
 #| msgid "general_log and slow_query_log is enabled."
 msgid "general_log and slow_query_log are enabled."
 msgstr "«general_log» y «slow_query_log» activos."
@@ -1226,7 +1225,6 @@ msgid "slow_query_log is enabled."
 msgstr "«slow_query_log» activo."
 
 #: js/messages.php:117
-#, fuzzy
 #| msgid "slow_query_log and general_log is disabled."
 msgid "slow_query_log and general_log are disabled."
 msgstr "«slow_query_log» y «general_log» desactivados."
@@ -1288,7 +1286,6 @@ msgid "Set long_query_time to %ds"
 msgstr "Definir «long_query_time» a %ds"
 
 #: js/messages.php:131
-#, fuzzy
 #| msgid ""
 #| "You don't have super user rights to change this variables. Please log in "
 #| "as root account or contact your database administrator."
@@ -1296,9 +1293,8 @@ msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
-"No posee permisos de superusuario para cambiar estas variables. Por favor "
-"inicie sesión con la cuenta root o contacte a su administrador de base de "
-"datos."
+"No posee permisos para cambiar estas variables. Por favor inicie sesión con "
+"la cuenta root o contacte a su administrador de base de datos."
 
 #: js/messages.php:132
 msgid "Change settings"
@@ -1370,10 +1366,9 @@ msgstr ""
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
-msgstr "Filtrar"
+msgstr "Filtros"
 
 #. l10n: Filter as in "Start Filtering"
 #: js/messages.php:153 navigation.php:270
@@ -1382,23 +1377,21 @@ msgstr "Filtrar"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Filtrar consultas por palabra/expresión regular:"
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE statements"
-msgstr ""
+msgstr "Agrupar consultas, ignorando datos variables en sentencias WHERE"
 
 #: js/messages.php:156
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "Número de filas insertadas"
+msgstr "Suma de filas agrupadas:"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "Total"
+msgstr "Total:"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1537,10 +1530,9 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: js/messages.php:208
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "Tiempo máximo de ejecución"
+msgstr "Tiempo de ejecución de la consulta"
 
 #: js/messages.php:211
 msgid "Hide search criteria"
@@ -1556,10 +1548,9 @@ msgid "Ignore"
 msgstr "Ignorar"
 
 #: js/messages.php:218
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
-msgstr "Añadir columna"
+msgstr "Agregar columnas"
 
 #: js/messages.php:221
 msgid "Select referenced key"
@@ -1876,13 +1867,12 @@ msgstr "Tamaño de fuente"
 
 #: libraries/File.class.php:220
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "El archivo no era un archivo subido."
 
 #: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
-msgstr "Error desconocido al subir el archivo."
+msgstr "Error desconocido durante subida."
 
 #: libraries/File.class.php:277
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1928,11 +1918,11 @@ msgstr ""
 
 #: libraries/File.class.php:507
 msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Error al mover el archivo subido."
 
 #: libraries/File.class.php:515
 msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "No se puede leer el archivo subido (y movido)."
 
 #: libraries/Index.class.php:418 tbl_relation.php:526
 msgid "No index defined!"
@@ -2490,10 +2480,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s días, %s horas, %s minutos y %s segundos"
 
 #: libraries/common.lib.php:1856
-#, fuzzy
 #| msgid "Routine parameters"
 msgid "Missing parameter:"
-msgstr "Parámetros de rutina"
+msgstr "Parámetro faltante:"
 
 #: libraries/common.lib.php:2162 libraries/common.lib.php:2165
 #: libraries/display_tbl.lib.php:299
@@ -6349,10 +6338,9 @@ msgid ""
 msgstr "Las siguientes estructureas fueron creadas o alteradas. Puedes:"
 
 #: libraries/import.lib.php:1069
-#, fuzzy
 #| msgid "View a structure`s contents by clicking on its name"
 msgid "View a structure's contents by clicking on its name"
-msgstr "Ver los contenidos de una estructura pulsando en su nombre"
+msgstr "Puede ver los contenidos de una estructura pulsando en su nombre"
 
 #: libraries/import.lib.php:1070
 msgid ""
@@ -6362,10 +6350,9 @@ msgstr ""
 "correspondiente"
 
 #: libraries/import.lib.php:1071
-#, fuzzy
 #| msgid "Edit its structure by following the \"Structure\" link"
 msgid "Edit structure by following the \"Structure\" link"
-msgstr "Edite su estructura siguiendo el enlace \"Estructura\""
+msgstr "Edite la estructura siguiendo el enlace \"Estructura\""
 
 #: libraries/import.lib.php:1074
 msgid "Go to database"
@@ -10079,7 +10066,6 @@ msgid "Monitor Instructions"
 msgstr "Instrucciones de monitorización"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -10096,11 +10082,12 @@ msgid ""
 msgstr ""
 "El monitorizador de phpMyAdmin puede asistir en la optimización de la "
 "configuración del servidor y rastrear consultas que toman mucho tiempo. Para "
-"esto último va a necesitar que «log_output» esté definido como 'TABLE' y "
-"tener activado «slow_query_log» o «general_log»."
+"esto último necesitará que «log_output» esté definido como 'TABLE' y tener "
+"activado «slow_query_log» o «general_log». Note, sin embargo, que "
+"«general_log» produce mucha información y aumenta la carga en el servidor "
+"hasta en un 15%"
 
 #: server_status.php:1373
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -10141,14 +10128,7 @@ msgstr ""
 "<p>Cuando vea un pico repentino de actividad, seleccione el intervalo de "
 "tiempo relevante en el gráfico manteniendo pulsado el botón izquierdo y "
 "arrastrando sobre el gráfico. Esto cargará las estadísticas de los "
-"registros, lo que lo ayudará a encontrar la causa del pico de actividad.</"
-"p>\n"
-"<p><b>Notar que:</b>\n"
-"Activar «general_log» puede aumentar la carga en el servidor hast un 5-15%. "
-"También esté al tanto que generar estadísticas de los registros es una tarea "
-"muy intensiva por lo que se recomienda seleccionar un período de tiempo lo "
-"más pequeño posible.\n"
-"</p>"
+"registros, lo que lo ayudará a encontrar la causa del pico de actividad.</p>"
 
 #: server_status.php:1383
 msgid ""
@@ -10160,6 +10140,13 @@ msgid ""
 "not required any more.\n"
 "        "
 msgstr ""
+"<b>Notar que:</b>\n"
+"Activar «general_log» puede aumentar la carga en el servidor hasta un 5-15%. "
+"También esté al tanto que generar estadísticas de los registros es una "
+"tarea muy intensiva por lo que se recomienda seleccionar un período de "
+"tiempo lo más pequeño posible y desactivar «general_log» y vaciar sus tablas "
+"una vez que ya no se necesite monitorizar.\n"
+"        "
 
 #: server_status.php:1396
 msgid "CPU Usage"
@@ -10227,11 +10214,11 @@ msgstr "Rango de tiempo seleccionado:"
 
 #: server_status.php:1465
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "Sólo recuperar sentencias SELECT, INSERT, UPDATE y DELETE"
 
 #: server_status.php:1470
 msgid "Remove variable data in INSERT statements for better grouping"
-msgstr ""
+msgstr "Eliminar datos variables en sentencias INSERT para mejor agrupación"
 
 #: server_status.php:1473
 msgid ""
@@ -10242,10 +10229,9 @@ msgstr ""
 "se agruparán por el texto de la consulta."
 
 #: server_status.php:1476
-#, fuzzy
 #| msgid "Query type"
 msgid "Query analyzer"
-msgstr "Tipo de consulta"
+msgstr "Analizador de consultas"
 
 #: server_status.php:1512
 #, php-format
diff --git a/po/ja.po b/po/ja.po
index ef9c015a57..c38e202a70 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-25 11:36+0200\n"
-"PO-Revision-Date: 2011-07-24 04:22+0200\n"
+"PO-Revision-Date: 2011-07-27 12:14+0200\n"
 "Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
 "Language: ja\n"
@@ -1118,15 +1118,14 @@ msgstr "接続／プロセス"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
-#, fuzzy
 #| msgid "Connections since last refresh"
 msgid "Questions since last refresh"
-msgstr "更新間隔中の接続数"
+msgstr "更新間隔中の問い合わせ数"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "問い合わせ数（サーバで実行された命令文）"
 
 #: js/messages.php:91 server_status.php:617
 msgid "Query statistics"
@@ -1158,10 +1157,9 @@ msgstr "平均負荷"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
-#, fuzzy
 #| msgid "Suggestions:"
 msgid "Questions"
-msgstr "提案："
+msgstr "問い合わせ"
 
 #: js/messages.php:103 server_status.php:894
 msgid "Traffic"
@@ -1186,7 +1184,7 @@ msgstr "モニタリンググラフを追加する"
 
 #: js/messages.php:109
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "少なくとも１つの系列を追加してください"
 
 #: js/messages.php:110 libraries/display_export.lib.php:306
 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052
@@ -1244,7 +1242,7 @@ msgstr ""
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
-msgstr ""
+msgstr "以下の設定は、グローバルに適用され、サーバの再起動時にはデフォルトにリセットされます。"
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:124
@@ -1255,17 +1253,17 @@ msgstr "出力をファイルに保存する"
 
 #. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:126
-#, fuzzy, php-format
+#, php-format
 #| msgid "Enabled"
 msgid "Enable %s"
-msgstr "有効"
+msgstr "%s を有効にする"
 
 #. l10n: Disable in this context means setting a status variable to OFF
 #: js/messages.php:128
-#, fuzzy, php-format
+#, php-format
 #| msgid "Disabled"
 msgid "Disable %s"
-msgstr "無効"
+msgstr "%s を無効にする"
 
 #. l10n: %d seconds
 #: js/messages.php:130
@@ -1277,19 +1275,17 @@ msgstr ""
 msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
-msgstr ""
+msgstr "これらの変数を変更することはできません。root でログインするか、データベース管理者に連絡してください。"
 
 #: js/messages.php:132
-#, fuzzy
 #| msgid "Manage your settings"
 msgid "Change settings"
-msgstr "ユーザ設定の管理"
+msgstr "設定の変更"
 
 #: js/messages.php:133
-#, fuzzy
 #| msgid "More settings"
 msgid "Current settings"
-msgstr "詳細設定"
+msgstr "現在の設定"
 
 #: js/messages.php:135 server_status.php:1393
 msgid "Chart Title"
@@ -1349,7 +1345,6 @@ msgstr ""
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
 msgstr "フィルタ"
@@ -1535,7 +1530,6 @@ msgid "Ignore"
 msgstr "無視"
 
 #: js/messages.php:218
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
 msgstr "カラムを追加する"
@@ -1855,13 +1849,12 @@ msgstr "フォントサイズ"
 
 #: libraries/File.class.php:220
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "アップロードされたファイルではありません。"
 
 #: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
-msgstr "ファイルのアップロード中に予期しないエラーが発生しました。"
+msgstr "アップロード中に予期しないエラーが発生しました。"
 
 #: libraries/File.class.php:277
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -2455,10 +2448,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s 日 %s 時間 %s 分 %s 秒"
 
 #: libraries/common.lib.php:1856
-#, fuzzy
 #| msgid "Routine parameters"
 msgid "Missing parameter:"
-msgstr "ルーチンのパラメータ"
+msgstr "パラメータがありません："
 
 #: libraries/common.lib.php:2162 libraries/common.lib.php:2165
 #: libraries/display_tbl.lib.php:299
@@ -6932,7 +6924,7 @@ msgstr "ルーチンタイプが不正です: \"%s\""
 
 #: libraries/rte/rte_routines.lib.php:268
 msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
+msgstr "申し訳ありませんが、削除されたルーチンの復元に失敗しました。"
 
 #: libraries/rte/rte_routines.lib.php:273
 #, php-format
@@ -7058,7 +7050,7 @@ msgstr "関数"
 
 #: libraries/rte/rte_triggers.lib.php:89
 msgid "Sorry, we failed to restore the dropped trigger."
-msgstr ""
+msgstr "申し訳ありませんが、削除されたトリガの復元に失敗しました。"
 
 #: libraries/rte/rte_triggers.lib.php:94
 #, php-format
@@ -9041,10 +9033,10 @@ msgstr "関連リンク"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: server_status.php:738
-#, fuzzy, php-format
+#, php-format
 #| msgid "Network traffic since startup: %s"
 msgid "Questions since startup: %s"
-msgstr "起動以後のネットワークトラフィック：%s"
+msgstr "起動以後の問い合わせ数：%s"
 
 #: server_status.php:744 server_status.php:779 server_status.php:895
 #: server_status.php:940
@@ -9074,10 +9066,10 @@ msgid "Network traffic since startup: %s"
 msgstr "起動以後のネットワークトラフィック：%s"
 
 #: server_status.php:852
-#, fuzzy, php-format
+#, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "この MySQL サーバの稼働時間: %s (起動時刻: %s)"
+msgstr "この MySQL サーバの稼働時間: %1$s (起動時刻: %2$s)"
 
 #: server_status.php:862
 msgid ""
@@ -9843,6 +9835,9 @@ msgid ""
 "        general_log produces a lot of data and increases server load by up "
 "to 15%"
 msgstr ""
+"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output "
+"を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log "
+"を大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。"
 
 #: server_status.php:1373
 msgid ""
@@ -10858,7 +10853,7 @@ msgstr "カラムを選択してください (最低 1 つ)"
 
 #: tbl_select.php:278
 msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "または 検索条件 (WHERE 節の内容) を追加してください"
+msgstr "検索条件 (WHERE 節の内容) を追加してください"
 
 #: tbl_select.php:285
 msgid "Number of rows per page"
diff --git a/po/sk.po b/po/sk.po
index 99677c066a..caf7e4e5d4 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-25 11:36+0200\n"
-"PO-Revision-Date: 2011-07-14 15:30+0200\n"
+"PO-Revision-Date: 2011-07-27 15:32+0200\n"
 "Last-Translator: Martin Lacina <martin@whistler.sk>\n"
 "Language-Team: slovak <sk@li.org>\n"
 "Language: sk\n"
@@ -1131,7 +1131,7 @@ msgstr "Spojení od posledného obnovenia"
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Dopyty (príkazy vykonané na serveri)"
 
 #: js/messages.php:91 server_status.php:617
 msgid "Query statistics"
@@ -1139,15 +1139,15 @@ msgstr "Štatistika dopytov"
 
 #: js/messages.php:94
 msgid "System CPU Usage"
-msgstr ""
+msgstr "Využitie CPU"
 
 #: js/messages.php:95
 msgid "System memory"
-msgstr ""
+msgstr "Systémová pamäť"
 
 #: js/messages.php:96
 msgid "System swap"
-msgstr ""
+msgstr "Stránkovacia oblasť"
 
 #: js/messages.php:97 libraries/common.lib.php:1274 server_status.php:1433
 msgid "MiB"
@@ -1159,14 +1159,13 @@ msgstr "KiB"
 
 #: js/messages.php:100
 msgid "Average load"
-msgstr ""
+msgstr "Priemerné vyťaženie"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
-#, fuzzy
 #| msgid "Versions"
 msgid "Questions"
-msgstr "Verzia"
+msgstr "Dopyty"
 
 #: js/messages.php:103 server_status.php:894
 msgid "Traffic"
@@ -1178,22 +1177,21 @@ msgid "Settings"
 msgstr "Nastavenia"
 
 #: js/messages.php:105
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "Odstrániť databázu"
+msgstr "Odstrániť graf"
 
 #: js/messages.php:106
 msgid "Edit labels and series"
-msgstr ""
+msgstr "Upraviť popisy a série"
 
 #: js/messages.php:107
 msgid "Add chart to grid"
-msgstr ""
+msgstr "Pridať graf do mriežky"
 
 #: js/messages.php:109
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "Pridajte prosím aspoň jednu hodnotu do série"
 
 #: js/messages.php:110 libraries/display_export.lib.php:306
 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052
@@ -1212,19 +1210,19 @@ msgstr ""
 
 #: js/messages.php:114
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log a slow_query_log sú povolené."
 
 #: js/messages.php:115
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log je povolený."
 
 #: js/messages.php:116
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log je povolený."
 
 #: js/messages.php:117
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log a general_log sú zakázané."
 
 #: js/messages.php:118
 msgid "log_output is not set to TABLE."
@@ -5305,20 +5303,18 @@ msgid "%d is not valid row number."
 msgstr "%d nie je platné číslo riadku."
 
 #: libraries/display_tbl.lib.php:433
-#, fuzzy
 #| msgid "Start"
 msgid "Start row"
-msgstr "Štart"
+msgstr "Prvý riadok"
 
 #: libraries/display_tbl.lib.php:435
 msgid "Number of rows"
 msgstr "Počet riadkov"
 
 #: libraries/display_tbl.lib.php:440
-#, fuzzy
 #| msgid "More"
 msgid "Mode"
-msgstr "Viac"
+msgstr "Režim"
 
 #: libraries/display_tbl.lib.php:442
 msgid "horizontal"
@@ -5448,9 +5444,8 @@ msgid "Visualize GIS data"
 msgstr "Zobraziť GIS data"
 
 #: libraries/display_tbl.lib.php:2526
-#, fuzzy
 msgid "Create view"
-msgstr "Vytvoriť relaciu"
+msgstr "Vytvoriť pohľad"
 
 #: libraries/display_tbl.lib.php:2626
 msgid "Link not found"
@@ -5704,7 +5699,7 @@ msgstr ""
 
 #: libraries/engines/pbms.lib.php:60
 msgid "Metadata Headers"
-msgstr ""
+msgstr "Hlavičky metadát"
 
 #: libraries/engines/pbms.lib.php:61
 msgid ""
@@ -5733,13 +5728,16 @@ msgstr ""
 
 #: libraries/engines/pbxt.lib.php:22
 msgid "Index cache size"
-msgstr ""
+msgstr "Veľkosť vyrovnávacej pamäte indexu"
 
 #: libraries/engines/pbxt.lib.php:23
 msgid ""
 "This is the amount of memory allocated to the index cache. Default value is "
 "32MB. The memory allocated here is used only for caching index pages."
 msgstr ""
+"Množstvo pamäte vyhradenej pre vyrovnávaciu pamät indexu. Štandardná hodnota "
+"je 32MB. Pamät tu priradená je použitá výhradne pre vyrovnávaciu pamäť "
+"indexových stránok."
 
 #: libraries/engines/pbxt.lib.php:27
 msgid "Record cache size"
@@ -5771,6 +5769,8 @@ msgid ""
 "The size of a transaction log before rollover, and a new log is created. The "
 "default value is 16MB."
 msgstr ""
+"Maximálna veľkosť transakčného logu pred jeho pretočením a vytvorením "
+"nového. Štandardná hodnota je 16MB."
 
 #: libraries/engines/pbxt.lib.php:42
 msgid "Transaction buffer size"
diff --git a/tbl_operations.php b/tbl_operations.php
index 11021ba2b1..3481fd1cd6 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -216,25 +216,34 @@ if ($reread_info) {
 unset($reread_info);
 
 /**
- * Displays top menu links
+ * Displays top menu links in non ajax requests
  */
-require_once './libraries/tbl_links.inc.php';
-
+if (!isset($_REQUEST['ajax_request'])) {
+    require_once './libraries/tbl_links.inc.php';
+}
 if (isset($result) && empty($message_to_show)) {
     // set to success by default, because result set could be empty
     // (for example, a table rename)
     $_type = 'success';
     if (empty($_message)) {
-        $_message = $result ? __('Your SQL query has been executed successfully') : __('Error');
+        $_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['is_ajax_request'] == true) {
+            $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+            PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data);
+        }
     }
     if (! empty($warning_messages)) {
         $_message = new PMA_Message;
         $_message->addMessages($warning_messages);
         $_message->isError(true);
+        if ( $GLOBALS['is_ajax_request'] == true) {
+            PMA_ajaxResponse($_message, false);
+        }
         unset($warning_messages);
     }
+
     PMA_showMessage($_message, $sql_query, $_type);
     unset($_message, $_type);
 }
@@ -258,7 +267,7 @@ unset($local_query);
 ?>
 <!-- Order the table -->
 <div class="operations_half_width">
-<form method="post" action="tbl_operations.php">
+<form method="post" id="alterTableOrderby" action="tbl_operations.php" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>>
 <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?>
 <fieldset id="fieldset_table_order">
     <legend><?php echo __('Alter table order by'); ?></legend>
diff --git a/tbl_select.php b/tbl_select.php
index 52e8b93fb1..c6b0a35332 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -19,6 +19,7 @@ require_once './libraries/mysql_charsets.lib.php';
 $GLOBALS['js_include'][] = 'makegrid.js';
 $GLOBALS['js_include'][] = 'sql.js';
 $GLOBALS['js_include'][] = 'tbl_select.js';
+$GLOBALS['js_include'][] = 'tbl_change.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
 $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 if ($GLOBALS['cfg']['PropertiesIconic'] == true) {