Merge remote-tracking branch 'origin/master'

Conflicts: themes/pmahomme/css/theme_right.css.php
2011-05-30 22:46:02 +02:00 · 2011-05-30 22:46:02 +02:00 · b366c76f42
commit b366c76f42
parent 4885b174da b5c1ee6509
42 changed files with 1059 additions and 912 deletions
--- a/.gitignore
+++ b/.gitignore
@ -29,3 +29,5 @@ locale
 sources
 # API documentation
 apidoc
+# Demo server
+revision-info.php
--- a/5
+++ b/5
@ -8,6 +8,9 @@
 + Patch #3256122 [search] Show/hide db search results
 + Patch #3302354 Add gettext wrappers around a message
 + Remove deprecated function PMA_DBI_get_fields
+ rfe #2098927 Remember recent tables
+ rfe #3078542 Remember the last sort order for each table
+ AJAX for Create table in navigation panel

 3.4.2.0 (not yet released)
 - bug #3301249 [interface] Iconic table operations does not remove inline edit label
@ -19,6 +22,8 @@
 - [auth] Fixed error handling for signon auth method.
 - bug #3276001 [core] Avoid caching of index.php.
 - bug #3306958 [interface] Unnecessary Details slider
+- bug #3308476 [interface] "Show all" not persistent after a sort
+- bug #3308072 [auth] Version disclosure to anonymous visitors

 3.4.1.0 (2011-05-20)
 - bug #3301108 [interface] Synchronize and already configured host
--- a/Documentation.html
+++ b/Documentation.html
@ -1077,6 +1077,25 @@ ALTER TABLE `pma_column_comments`
        </ul>
    </dd>

+    <dt id="table_uiprefs">
+        <span id="cfg_Servers_table_uiprefs">$cfg['Servers'][$i]['table_uiprefs']</span> string
+    </dt>
+    <dd>
+        Since release 3.5.0 phpMyAdmin can be configured to remember several things
+        (table sorting
+        <a href="#cfg_RememberSorting" class="configrule">$cfg['RememberSorting']</a>
+        , etc.) for browsing tables.
+        Without configuring the storage, these features still can be used,
+        but the values will disappear after you logout.<br/><br/>
+
+        To allow the usage of these functionality persistently:
+
+        <ul>
+            <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
+            <li>put the table name in <tt>$cfg['Servers'][$i]['table_uiprefs']</tt> (e.g. 'pma_table_uiprefs')</li>
+        </ul>
+    </dd>
+
    <dt id="tracking">
        <span id="cfg_Servers_tracking">$cfg['Servers'][$i]['tracking']</span> string
    </dt>
@ -1934,6 +1953,9 @@ $cfg['TrustedProxies'] =
        each row on a vertical lineup.
    </dd>

+    <dt id="cfg_RememberSorting">$cfg['RememberSorting'] boolean</dt>
+    <dd>If enabled, when browsing tables, the sorting of each table is remembered.</dd>
+
    <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] string</dt>
    <dd>
        The HeaderFlipType can be set to 'auto', 'css' or 'fake'. When using
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@ -53,6 +53,7 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false;
 // $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
 // $cfg['Servers'][$i]['history'] = 'pma_history';
 // $cfg['Servers'][$i]['recent'] = 'pma_recent';
+// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs';
 // $cfg['Servers'][$i]['tracking'] = 'pma_tracking';
 // $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
 // $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
--- a/db_datadict.php
+++ b/db_datadict.php
@ -135,7 +135,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
        $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));
    }

-    // Check if we can use Relations (Mike Beck)
+    // Check if we can use Relations
    if (!empty($cfgRelation['relation'])) {
        // Find which tables are related with the current one and write it in
        // an array
--- a/db_qbe.php
+++ b/db_qbe.php
@ -686,7 +686,6 @@ if (!empty($qry_select)) {
 // 2. FROM

 // Create LEFT JOINS out of Relations
-// Code originally by Mike Beck <mike.beck@ibmiller.de>
 // If we can use Relations we could make some left joins.
 // First find out if relations are available in this database.

--- a/js/config.js
+++ b/js/config.js
@ -1,3 +1,4 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 * Functions used in configuration forms and on user preferences pages
 */
@ -14,9 +15,9 @@ var PMA_messages = {};
 * @param {Element} field
 */
 function getFieldType(field) {
-	field = $(field);
-    var tagName = field.attr('tagName');
-	if (tagName == 'INPUT') {
+    field = $(field);
+    var tagName = field.prop('tagName');
+    if (tagName == 'INPUT') {
        return field.attr('type');
    } else if (tagName == 'SELECT') {
        return 'select';
@ -40,7 +41,7 @@ function getFieldType(field) {
 * @param {String|Boolean}  [value]
 */
 function setFieldValue(field, field_type, value) {
-	field = $(field);
+    field = $(field);
    switch (field_type) {
        case 'text':
            field.attr('value', (value != undefined ? value : field.attr('defaultValue')));
@ -50,14 +51,14 @@ function setFieldValue(field, field_type, value) {
            break;
        case 'select':
            var options = field.attr('options');
-        	var i, imax = options.length;
+            var i, imax = options.length;
            if (value == undefined) {
                for (i = 0; i < imax; i++) {
-                	options[i].selected = options[i].defaultSelected;
+                    options[i].selected = options[i].defaultSelected;
                }
            } else {
                for (i = 0; i < imax; i++) {
-                	options[i].selected = (value.indexOf(options[i].value) != -1);
+                    options[i].selected = (value.indexOf(options[i].value) != -1);
                }
            }
            break;
@ -78,14 +79,14 @@ function setFieldValue(field, field_type, value) {
 * @type Boolean|String|String[]
 */
 function getFieldValue(field, field_type) {
-	field = $(field);
+    field = $(field);
    switch (field_type) {
        case 'text':
-            return field.attr('value');
+            return field.prop('value');
        case 'checkbox':
-            return field.attr('checked');
+            return field.prop('checked');
        case 'select':
-        	var options = field.attr('options');
+            var options = field.prop('options');
            var i, imax = options.length, items = [];
            for (i = 0; i < imax; i++) {
                if (options[i].selected) {
@ -354,7 +355,7 @@ function displayErrors(error_list) {
 * @param {Object}  errors
 */
 function validate_fieldset(fieldset, isKeyUp, errors) {
-	fieldset = $(fieldset);
+    fieldset = $(fieldset);
    if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') {
        var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]);
        for (var field_id in fieldset_errors) {
@ -377,8 +378,8 @@ function validate_fieldset(fieldset, isKeyUp, errors) {
 * @param {Object}  errors
 */
 function validate_field(field, isKeyUp, errors) {
-	field = $(field);
-	var field_id = field.attr('id');
+    field = $(field);
+    var field_id = field.attr('id');
    errors[field_id] = [];
    var functions = getFieldValidators(field_id, isKeyUp);
    for (var i = 0; i < functions.length; i++) {
@ -389,7 +390,7 @@ function validate_field(field, isKeyUp, errors) {
        var result = functions[i][0].apply(field[0], args);
        if (result !== true) {
            if (typeof result == 'string') {
-            	result = [result];
+                result = [result];
            }
            $.merge(errors[field_id], result);
        }
@ -403,7 +404,7 @@ function validate_field(field, isKeyUp, errors) {
 * @param {boolean} isKeyUp
 */
 function validate_field_and_fieldset(field, isKeyUp) {
-	field = $(field);
+    field = $(field);
    var errors = {};
    validate_field(field, isKeyUp, errors);
    validate_fieldset(field.closest('fieldset'), isKeyUp, errors);
@ -416,7 +417,7 @@ function validate_field_and_fieldset(field, isKeyUp) {
 * @param {Element} field
 */
 function markField(field) {
-	field = $(field);
+    field = $(field);
    var type = getFieldType(field);
    var isDefault = checkFieldDefault(field, type);

@ -439,7 +440,7 @@ function setRestoreDefaultBtn(field, display) {

 $(function() {
    // register validators and mark custom values
-	var elements = $('input[id], select[id], textarea[id]');
+    var elements = $('input[id], select[id], textarea[id]');
    $('input[id], select[id], textarea[id]').each(function(){
        markField(this);
        var el = $(this);
@ -450,35 +451,35 @@ $(function() {
        var tagName = el.attr('tagName');
        // text fields can be validated after each change
        if (tagName == 'INPUT' && el.attr('type') == 'text') {
-        	el.keyup(function() {
+            el.keyup(function() {
                validate_field_and_fieldset(el, true);
                markField(el);
            });
        }
        // disable textarea spellcheck
        if (tagName == 'TEXTAREA') {
-        	el.attr('spellcheck', false);
+           el.attr('spellcheck', false);
        }
    });

-	// check whether we've refreshed a page and browser remembered modified
-	// form values
-	var check_page_refresh = $('#check_page_refresh');
-	if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') {
-		// run all field validators
-		var errors = {};
-		for (var i = 0; i < elements.length; i++) {
-			validate_field(elements[i], false, errors);
-		}
-		// run all fieldset validators
-		$('fieldset').each(function(){
-			validate_fieldset(this, false, errors);
-		});
+    // check whether we've refreshed a page and browser remembered modified
+    // form values
+    var check_page_refresh = $('#check_page_refresh');
+    if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') {
+        // run all field validators
+        var errors = {};
+        for (var i = 0; i < elements.length; i++) {
+            validate_field(elements[i], false, errors);
+        }
+        // run all fieldset validators
+        $('fieldset').each(function(){
+            validate_fieldset(this, false, errors);
+        });

-		displayErrors(errors);
-	} else if (check_page_refresh) {
-		check_page_refresh.val('1');
-	}
+        displayErrors(errors);
+    } else if (check_page_refresh) {
+        check_page_refresh.val('1');
+    }
 });

 //
--- a/js/functions.js
+++ b/js/functions.js
@ -1309,6 +1309,53 @@ function PMA_showNoticeForEnum(selectElement) {
    }
 }

+/**
+ * Generates a dialog box to pop up the create_table form
+ */
+function PMA_createTableDialog( div, url , target){
+     /**
+     *  @var    button_options  Object that stores the options passed to jQueryUI
+     *                          dialog
+     */
+     var button_options = {};
+     // in the following function we need to use $(this)
+     button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();}
+
+     var button_options_error = {};
+     button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();}
+
+     var $msgbox = PMA_ajaxShowMessage();
+
+     $.get( target , url ,  function(data) {
+         //in the case of an error, show the error message returned.
+         if (data.success != undefined && data.success == false) {
+             div
+             .append(data.error)
+             .dialog({
+                 title: PMA_messages['strCreateTable'],
+                 height: 230,
+                 width: 900,
+                 open: PMA_verifyTypeOfAllColumns,
+                 buttons : button_options_error
+             })// end dialog options
+             //remove the redundant [Back] link in the error message.
+             .find('fieldset').remove();
+         } else {
+             div
+             .append(data)
+             .dialog({
+                 title: PMA_messages['strCreateTable'],
+                 height: 600,
+                 width: 900,
+                 open: PMA_verifyTypeOfAllColumns,
+                 buttons : button_options
+             }); // end dialog options
+         }
+         PMA_ajaxRemoveMessage($msgbox);
+     }) // end $.get()
+
+}
+
 /**
 * jQuery function that uses jQueryUI's dialogs to confirm with user. Does not
 *  return a jQuery object yet and hence cannot be chained
@ -1403,7 +1450,7 @@ jQuery.fn.PMA_sort_table = function(text_selector) {
 */
 $(document).ready(function() {

-    /**
+     /**
     * Attach event handler to the submit action of the create table minimal form
     * and retrieve the full table form and display it in a dialog
     *
@ -1412,50 +1459,15 @@ $(document).ready(function() {
    $("#create_table_form_minimal.ajax").live('submit', function(event) {
        event.preventDefault();
        $form = $(this);
-
-        /* @todo Validate this form! */
-
-        /**
-         *  @var    button_options  Object that stores the options passed to jQueryUI
-         *                          dialog
-         */
-        var button_options = {};
-        // in the following function we need to use $(this)
-        button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
-
-        var button_options_error = {};
-        button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();}
-
-        var $msgbox = PMA_ajaxShowMessage();
        PMA_prepareForAjaxRequest($form);

-        $.get($form.attr('action'), $form.serialize(), function(data) {
-            //in the case of an error, show the error message returned.
-            if (data.success != undefined && data.success == false) {
-                $('<div id="create_table_dialog"></div>')
-                .append(data.error)
-                .dialog({
-                    title: PMA_messages['strCreateTable'],
-                    height: 230,
-                    width: 900,
-                    open: PMA_verifyTypeOfAllColumns,
-                    buttons : button_options_error
-                })// end dialog options
-                //remove the redundant [Back] link in the error message.
-                .find('fieldset').remove();
-            } else {
-                $('<div id="create_table_dialog"></div>')
-                .append(data)
-                .dialog({
-                    title: PMA_messages['strCreateTable'],
-                    height: 600,
-                    width: 900,
-                    open: PMA_verifyTypeOfAllColumns,
-                    buttons : button_options
-                }); // end dialog options
-            }
-            PMA_ajaxRemoveMessage($msgbox);
-        }) // end $.get()
+        /*variables which stores the common attributes*/
+        var url = $form.serialize();
+        var action = $form.attr('action');
+        var div =  $('<div id="create_table_dialog"></div>');
+
+        /*Calling to the createTableDialog function*/
+        PMA_createTableDialog(div, url, action);

        // empty table name and number of columns from the minimal form
        $form.find('input[name=table],input[name=num_fields]').val('');
@ -2289,9 +2301,13 @@ $(document).ready(function() {
            }
        });

-        $('#update_recent_tables').ready(function() {
+    $('#update_recent_tables').ready(function() {
+        if (window.parent.frame_navigation != undefined
+            && window.parent.frame_navigation.PMA_reloadRecentTable != undefined)
+        {
            window.parent.frame_navigation.PMA_reloadRecentTable();
-        });
+        }
+    });

 }) // end of $(document).ready()

--- a/js/navigation.js
+++ b/js/navigation.js
@ -202,4 +202,22 @@ $(document).ready(function(){
            window.parent.refreshMain($('#LeftDefaultTabTable')[0].value);
        }
    });
-});
+
+    /* Create table */
+    $('#newtable a.ajax').click(function(event){
+        event.preventDefault();
+       	/*Getting the url */
+        var url = $('#newtable a').attr("href");
+        if (url.substring(0, 15) == "tbl_create.php?") {
+             url = url.substring(15);
+        }
+       	url = url +"&num_fields=&ajax_request=true";
+       	/*Creating a div on the frame_content frame */
+       	var div = parent.frame_content.$('<div id="create_table_dialog"></div>');
+       	var target = "tbl_create.php";
+
+       	/*Calling to the createTableDialog function*/
+       	PMA_createTableDialog(div , url , target);
+    });//end of create new table
+});//end of document get ready
+
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@ -11,6 +11,10 @@
 */
 class PMA_Table
 {
+    /**
+     * UI preferences property: sorted column
+     */
+    const PROP_SORTED_COLUMN = 'sorted_col';

    static $cache = array();

@ -39,6 +43,11 @@ class PMA_Table
     */
    var $settings = array();

+    /**
+     * @var array UI preferences
+     */
+    var $uiprefs;
+
    /**
     * @var array errors occured
     */
@ -1185,5 +1194,142 @@ class PMA_Table

        return $return;
    }
+
+    /**
+     * Return UI preferences for this table from phpMyAdmin database.
+     *
+     * @uses PMA_query_as_controluser()
+     * @uses PMA_DBI_fetch_array()
+     * @uses json_decode()
+     *
+     * @return array
+     */
+    protected function getUiPrefsFromDb()
+    {
+        $pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) .".".
+                     PMA_backquote($GLOBALS['cfg']['Server']['table_uiprefs']);
+
+        // Read from phpMyAdmin database
+        $sql_query =
+        " SELECT `prefs` FROM " . $pma_table .
+        " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'" .
+        " AND `db_name` = '" . $this->db_name . "'" .
+        " AND `table_name` = '" . $this->name . "'";
+
+        $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query));
+        if (isset($row[0])) {
+            return json_decode($row[0], true);
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Save this table's UI preferences into phpMyAdmin database.
+     *
+     * @uses PMA_DBI_try_query()
+     * @uses json_decode()
+     * @uses PMA_Message
+     *
+     * @return true|PMA_Message
+     */
+    protected function saveUiPrefsToDb()
+    {
+        $pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) .".".
+                     PMA_backquote($GLOBALS['cfg']['Server']['table_uiprefs']);
+
+        $username = $GLOBALS['cfg']['Server']['user'];
+        $sql_query =
+        " REPLACE INTO " . $pma_table .
+        " VALUES ('" . $username . "', '" . $this->db_name . "', '" .
+                       $this->name . "', '" . PMA_sqlAddslashes(json_encode($this->uiprefs)) . "')";
+
+        $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']);
+
+        if (!$success) {
+            $message = PMA_Message::error(__('Could not save table UI preferences'));
+            $message->addMessage('<br /><br />');
+            $message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink'])));
+            return $message;
+        }
+        return true;
+    }
+
+    /**
+     * Loads the UI preferences for this table.
+     * If pmadb and table_uiprefs is set, it will load the UI preferences from
+     * phpMyAdmin database.
+     *
+     * @uses getUiPrefsFromDb()
+     */
+    protected function loadUiPrefs()
+    {
+        // set session variable if it's still undefined
+        if (! isset($_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name])) {
+            $_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name] =
+                    // check whether we can get from pmadb
+                    (strlen($GLOBALS['cfg']['Server']['pmadb'])
+                     && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) ?
+                    $this->getUiPrefsFromDb() : array();
+        }
+        $this->uiprefs =& $_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name];
+    }
+
+    /**
+     * Get UI preferences array for this table.
+     * If pmadb and table_uiprefs is set, it will get the UI preferences from
+     * phpMyAdmin database.
+     *
+     * @return array
+     */
+    public function getUiPrefs()
+    {
+        if (! isset($this->uiprefs)) {
+            $this->loadUiPrefs();
+        }
+        return $this->uiprefs;
+    }
+
+    /**
+     * Get a property from UI preferences.
+     * Return false if the property is not found.
+     * Available property:
+     * - PROP_SORTED_COLUMN
+     *
+     * @uses loadUiPrefs()
+     *
+     * @param string $property
+     * @return mixed
+     */
+    public function getUiProp($property)
+    {
+        if (! isset($this->uiprefs)) {
+            $this->loadUiPrefs();
+        }
+        return isset($this->uiprefs[$property]) ? $this->uiprefs[$property] : false;
+    }
+
+    /**
+     * Set a property from UI preferences.
+     * If pmadb and table_uiprefs is set, it will save the UI preferences to
+     * phpMyAdmin database.
+     *
+     * @param string $property
+     * @param mixed $value
+     * @return true|PMA_Message
+     */
+    public function setUiProp($property, $value)
+    {
+        if (! isset($this->uiprefs)) {
+            $this->loadUiPrefs();
+        }
+        $this->uiprefs[$property] = $value;
+        // check if pmadb is set
+        if (strlen($GLOBALS['cfg']['Server']['pmadb'])
+                && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) {
+            return $this->saveUiprefsToDb();
+        }
+        return true;
+    }
 }
 ?>
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@ -169,6 +169,7 @@ function PMA_auth()
    /* HTML header; do not show here the PMA version to improve security */
    $page_title = 'phpMyAdmin ';
    require './libraries/header_meta_style.inc.php';
+    // if $page_title is set, this script uses it as the title:
    require './libraries/header_scripts.inc.php';
    ?>
 <script type="text/javascript">
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@ -540,6 +540,7 @@ $_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], '');
 */
 $GLOBALS['js_include'] = array();
 $GLOBALS['js_include'][] = 'jquery/jquery-1.6.1.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
 $GLOBALS['js_include'][] = 'update-location.js';

 /**
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@ -812,9 +812,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
 *                              or array of it
 * @param   boolean  $do_it     a flag to bypass this function (used by dump
 *                              functions)
- * @return  mixed    the "backquoted" database, table or field name if the
- *                   current MySQL release is >= 3.23.6, the original one
- *                   else
+ * @return  mixed    the "backquoted" database, table or field name
 * @access  public
 */
 function PMA_backquote($a_name, $do_it = true)
@ -1090,10 +1088,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
            $edit_link = 'server_sql.php';
        }

-        // Want to have the query explained (Mike Beck 2002-05-22)
+        // Want to have the query explained
        // but only explain a SELECT (that has not been explained)
        /* SQL-Parser-Analyzer */
        $explain_link = '';
+        $is_select = false;
        if (! empty($cfg['SQLQuery']['Explain']) && ! $query_too_big) {
            $explain_params = $url_params;
            // Detect if we are validating as well
@ -1101,7 +1100,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
            if (! empty($GLOBALS['validatequery'])) {
                $explain_params['validatequery'] = 1;
            }
-            $is_select = false;
            if (preg_match('@^SELECT[[:space:]]+@i', $sql_query)) {
                $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
                $_message = __('Explain SQL');
@ -1137,7 +1135,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
        $url_qpart = PMA_generate_common_url($url_params);

        // Also we would like to get the SQL formed in some nice
-        // php-code (Mike Beck 2002-05-22)
+        // php-code
        if (! empty($cfg['SQLQuery']['ShowAsPHP']) && ! $query_too_big) {
            $php_params = $url_params;

--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@ -345,6 +345,13 @@ $cfg['Servers'][$i]['designer_coords'] = '';
 */
 $cfg['Servers'][$i]['recent'] = '';

+/**
+ * table to store UI preferences for tables
+ *   - leave blank for no "persistent" UI preferences
+ *     SUGGESTED: 'pma_table_uiprefs'
+ */
+$cfg['Servers'][$i]['table_uiprefs'] = '';
+
 /**
 * table to store SQL tracking
 *   - leave blank for no SQL tracking
@ -2264,6 +2271,13 @@ $cfg['ModifyDeleteAtRight'] = false;
 */
 $cfg['DefaultDisplay'] = 'horizontal';

+/**
+ * remember the last way a table sorted
+ *
+ * @global string $cfg['RememberSorting']
+ */
+$cfg['RememberSorting'] = true;
+
 /**
 * default display direction for altering/creating columns (tbl_properties)
 * (horizontal|vertical|<number>)
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@ -346,6 +346,8 @@ $strConfigQueryWindowWidth_desc = __('Query window width (in pixels)');
 $strConfigQueryWindowWidth_name = __('Query window width');
 $strConfigRecodingEngine_desc = __('Select which functions will be used for character set conversion');
 $strConfigRecodingEngine_name = __('Recoding engine');
+$strConfigRememberSorting_desc = __('When browsing tables, the sorting of each table is remembered');
+$strConfigRememberSorting_name = __('Remember table\'s sorting');
 $strConfigRepeatCells_desc = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature');
 $strConfigRepeatCells_name = __('Repeat headers');
 $strConfigReplaceHelpImg_desc = __('Show help button instead of Documentation text');
@ -420,6 +422,8 @@ $strConfigServers_table_coords_desc = __('Leave blank for no PDF schema support,
 $strConfigServers_table_coords_name = __('PDF schema: table coordinates');
 $strConfigServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]');
 $strConfigServers_table_info_name = __('Display columns table');
+$strConfigServers_table_uiprefs_desc = __('Leave blank for no "persistent" tables\'UI preferences across sessions, suggested: [kbd]pma_table_uiprefs[/kbd]');
+$strConfigServers_table_uiprefs_name = __('UI preferences table');
 $strConfigServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.');
 $strConfigServers_tracking_add_drop_database_name = __('Add DROP DATABASE');
 $strConfigServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.');
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@ -74,6 +74,7 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
    'column_info' => 'pma_column_info',
    'history' => 'pma_history',
    'recent' => 'pma_recent',
+    'table_uiprefs' => 'pma_table_uiprefs',
    'tracking' => 'pma_tracking',
    'table_coords' => 'pma_table_coords',
    'pdf_pages' => 'pma_pdf_pages',
@ -200,7 +201,8 @@ $forms['Main_frame']['Browse'] = array(
    'LimitChars',
    'ModifyDeleteAtLeft',
    'ModifyDeleteAtRight',
-    'DefaultDisplay');
+    'DefaultDisplay',
+    'RememberSorting');
 $forms['Main_frame']['Edit'] = array(
    'ProtectBinary',
    'ShowFunctionFields',
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@ -111,7 +111,8 @@ $forms['Main_frame']['Browse'] = array(
    'LimitChars',
    'ModifyDeleteAtLeft',
    'ModifyDeleteAtRight',
-    'DefaultDisplay');
+    'DefaultDisplay',
+    'RememberSorting');
 $forms['Main_frame']['Edit'] = array(
    'ProtectBinary',
    'ShowFunctionFields',
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@ -445,6 +445,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
    global $sql_query, $num_rows;
    global $vertical_display, $highlight_columns;

+    // required to generate sort links that will remember whether the 
+    // "Show all" button has been clicked
+    $sql_md5 = md5($GLOBALS['sql_query']);
+    $session_max_rows = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'];
+
    if ($analyzed_sql == '') {
        $analyzed_sql = array();
    }
@ -820,9 +825,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                $sorted_sql_query = $unsorted_sql_query . $sort_order;
            }
            $_url_params = array(
-                'db'        => $db,
-                'table'     => $table,
-                'sql_query' => $sorted_sql_query,
+                'db'                => $db,
+                'table'             => $table,
+                'sql_query'         => $sorted_sql_query,
+                'session_max_rows'  => $session_max_rows
            );
            $order_url  = 'sql.php' . PMA_generate_common_url($_url_params);

--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@ -210,7 +210,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
    $result      = PMA_DBI_query($local_query);
    $fields_cnt  = PMA_DBI_num_rows($result);

-    // Check if we can use Relations (Mike Beck)
+    // Check if we can use Relations
    if ($do_relation && ! empty($cfgRelation['relation'])) {
        // Find which tables are related with the current one and write it in
        // an array
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@ -330,7 +330,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
    $result      = PMA_DBI_query($local_query);
    $fields_cnt  = PMA_DBI_num_rows($result);

-    // Check if we can use Relations (Mike Beck)
+    // Check if we can use Relations
    if ($do_relation && !empty($cfgRelation['relation'])) {
        // Find which tables are related with the current one and write it in
        // an array
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@ -265,7 +265,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
    $result      = PMA_DBI_query($local_query);
    $fields_cnt  = PMA_DBI_num_rows($result);

-    // Check if we can use Relations (Mike Beck)
+    // Check if we can use Relations
    if ($do_relation && !empty($cfgRelation['relation'])) {
        // Find which tables are related with the current one and write it in
        // an array
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@ -777,7 +777,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false,  $do_mim

    $schema_create = '';

-    // Check if we can use Relations (Mike Beck)
+    // Check if we can use Relations
    if ($do_relation && !empty($cfgRelation['relation'])) {
        // Find which tables are related with the current one and write it in
        // an array
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@ -192,7 +192,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
    $result      = PMA_DBI_query($local_query);
    $fields_cnt  = PMA_DBI_num_rows($result);

-    // Check if we can use Relations (Mike Beck)
+    // Check if we can use Relations
    if ($do_relation && ! empty($cfgRelation['relation'])) {
        // Find which tables are related with the current one and write it in
        // an array
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@ -18,13 +18,17 @@ require_once './libraries/common.inc.php';
 if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
    echo PMA_includeJS('cross_framing_protection.js');
 }
-// generate title
-$title = PMA_expandUserString(
+// generate title (unless we already have $page_title, from cookie auth)
+if (! isset($page_title)) {
+    $title = PMA_expandUserString(
            !empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] :
            (!empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] :
            (!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] :
            $GLOBALS['cfg']['TitleDefault']))
-            );
+        );
+} else {
+    $title = $page_title;
+}
 // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0;
 $is_superuser    = function_exists('PMA_isSuperuser') && PMA_isSuperuser();

--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@ -142,6 +142,10 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)

    PMA_printDiagMessageForFeature(__('Persistent recently used tables'), 'recentwork', $messages);

+    PMA_printDiagMessageForParameter('table_uiprefs', isset($cfgRelation['table_uiprefs']), $messages, 'table_uiprefs');
+
+    PMA_printDiagMessageForFeature(__('Persistent tables\' UI preferences'), 'uiprefswork', $messages);
+
    PMA_printDiagMessageForParameter('tracking', isset($cfgRelation['tracking']), $messages, 'tracking');

    PMA_printDiagMessageForFeature(__('Tracking'), 'trackingwork', $messages);
@ -225,6 +229,7 @@ function PMA__getRelationsParam()
    $cfgRelation['mimework']    = false;
    $cfgRelation['historywork'] = false;
    $cfgRelation['recentwork']  = false;
+    $cfgRelation['uiprefswork'] = false;
    $cfgRelation['trackingwork'] = false;
    $cfgRelation['designerwork'] = false;
    $cfgRelation['userconfigwork'] = false;
@ -278,6 +283,8 @@ function PMA__getRelationsParam()
            $cfgRelation['history'] = $curr_table[0];
        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['recent']) {
            $cfgRelation['recent'] = $curr_table[0];
+        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['table_uiprefs']) {
+            $cfgRelation['table_uiprefs'] = $curr_table[0];
        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['tracking']) {
            $cfgRelation['tracking'] = $curr_table[0];
        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['userconfig']) {
@ -292,9 +299,11 @@ function PMA__getRelationsParam()
                $cfgRelation['displaywork'] = true;
        }
    }
+    
    if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) {
        $cfgRelation['pdfwork']     = true;
    }
+
    if (isset($cfgRelation['column_info'])) {
        $cfgRelation['commwork']    = true;

@ -336,6 +345,10 @@ function PMA__getRelationsParam()
        $cfgRelation['recentwork']      = true;
    }

+    if (isset($cfgRelation['table_uiprefs'])) {
+        $cfgRelation['uiprefswork']     = true;
+    }
+
    if (isset($cfgRelation['tracking'])) {
        $cfgRelation['trackingwork']     = true;
    }
@ -357,9 +370,9 @@ function PMA__getRelationsParam()
    if ($cfgRelation['relwork'] && $cfgRelation['displaywork']
     && $cfgRelation['pdfwork'] && $cfgRelation['commwork']
     && $cfgRelation['mimework'] && $cfgRelation['historywork']
-     && $cfgRelation['recentwork'] && $cfgRelation['trackingwork']
-     && $cfgRelation['userconfigwork'] && $cfgRelation['bookmarkwork']
-     && $cfgRelation['designerwork']) {
+     && $cfgRelation['recentwork'] && $cfgRelation['uiprefswork']
+     && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork']
+     && $cfgRelation['bookmarkwork'] && $cfgRelation['designerwork']) {
        $cfgRelation['allworks'] = true;
    }

--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@ -1064,7 +1064,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
        $pdf->SetFontSize(14);
        $pdf->SetLineWidth(0.2);
        $pdf->SetDisplayMode('fullpage');
-        // Get the name of this pdfpage to use as filename (Mike Beck)
+        // Get the name of this pdfpage to use as filename
        $_name_sql = 'SELECT page_descr FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages'])
                    . ' WHERE page_nr = ' . $pageNumber;
        $_name_rs = PMA_query_as_controluser($_name_sql);
@ -1189,7 +1189,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
             */
            $result = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE);
            $fields_cnt = PMA_DBI_num_rows($result);
-            // Check if we can use Relations (Mike Beck)
+            // Check if we can use Relations
            if (!empty($cfgRelation['relation'])) {
                // Find which tables are related with the current one and write it in
                // an array
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@ -613,14 +613,22 @@ unset($_form_params);
 if ($action == 'tbl_create.php') {
    ?>
    <table>
-    <tr valign="top">
-        <th><?php echo __('Table name'); ?>:&nbsp;</th>
-    </tr>
-    <tr><td><input type="text" name="table" size="40" maxlength="80"
+        <tr valign="top">
+            <th><?php echo __('Table name'); ?>:&nbsp;</th>
+        </tr>
+        <tr><td><input type="text" name="table" size="40" maxlength="80"
                value="<?php echo (isset($_REQUEST['table']) ? htmlspecialchars($_REQUEST['table']) : ''); ?>"
                class="textfield" />
-        </td>
-    </tr>
+            </td>
+            <td>
+                <?php if ($action == 'tbl_create.php' || $action == 'tbl_addfield.php') { ?>
+                <?php echo sprintf(__('Add %s column(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?>
+                <input type="submit" name="submit_num_fields" value="<?php echo __('Go'); ?>"
+                    onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)"
+                />
+                <?php } ?>
+            </td>
+        </tr>
    </table>
    <?php
 }
@ -775,15 +783,6 @@ if ($action == 'tbl_create.php') {

 <fieldset class="tblFooters">
    <input type="submit" name="do_save_data" value="<?php echo __('Save'); ?>" />
-<?php if ($action == 'tbl_create.php' || $action == 'tbl_addfield.php') { ?>
-    <?php echo __('Or'); ?>
-    <?php echo sprintf(__('Add %s column(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?>
-    <input type="submit" name="submit_num_fields"
-        value="<?php echo __('Go'); ?>"
-<?php /*        onclick="if (addField()) return false;" */ ?>
-        onclick="return checkFormElementInRange(this.form, 'added_fields', '<?php echo str_replace('\'', '\\\'', __('You have to add at least one column.')); ?>', 1)"
-        />
-<?php } ?>
 </fieldset>
 <div id="properties_message"></div>
 </form>
--- a/navigation.php
+++ b/navigation.php
@ -137,8 +137,10 @@ require_once './libraries/header_http.inc.php';
    <link rel="stylesheet" type="text/css"
        href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
    <script src="./js/jquery/jquery-1.6.1.js" type="text/javascript"></script>
+    <script src="./js/jquery/jquery-ui-1.8.custom.js" type="text/javascript"></script>
    <script type="text/javascript" src="js/navigation.js"></script>
    <script type="text/javascript" src="js/functions.js"></script>
+    <script type="text/javascript" src="js/messages.php"></script>
    <script type="text/javascript">
    // <![CDATA[
    var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png';
@ -322,7 +324,9 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
    }
    unset($table_list);
    if ($db != 'information_schema') {
-        echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '">'
+        $class = '';
+        $GLOBALS['cfg']['AjaxEnable'] ? $class="ajax" : '';
+        echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '"  class="'.$class .'" >'
            .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />'
            . _pgettext('short form', 'Create table') . '</a></li></ul>';
    }
--- a/po/bg.po
+++ b/po/bg.po
@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-19 08:30+0200\n"
+"PO-Revision-Date: 2011-05-28 14:02+0200\n"
 "Last-Translator:  <stoyanster@gmail.com>\n"
 "Language-Team: bulgarian <bg@li.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"

@ -1763,7 +1763,7 @@ msgstr "Грешно име/парола. Достъп отказан."
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #, php-format
 msgid "File %s does not contain any key id"
-msgstr ""
+msgstr "Файлът %s не съдържа идентификатор на ключ"

 #: libraries/auth/swekey/swekey.auth.lib.php:157
 #: libraries/auth/swekey/swekey.auth.lib.php:180
@ -2034,7 +2034,7 @@ msgstr ""

 #: libraries/common.lib.php:1334 libraries/common.lib.php:1350
 msgid "Profiling"
-msgstr ""
+msgstr "Профилиране"

 #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27
 #: server_processlist.php:70
@ -2157,7 +2157,7 @@ msgstr "Разглеждане на компютъра:"
 #: libraries/common.lib.php:2979
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
-msgstr ""
+msgstr "Избор от директорията за качване <b>%s</b>:"

 #: libraries/common.lib.php:2991 libraries/sql_query_form.lib.php:501
 #: tbl_change.php:962
@ -2221,21 +2221,21 @@ msgstr "разширени INSERT-и"

 #: libraries/config.values.php:121
 msgid "both of the above"
-msgstr ""
+msgstr "и двете по-горе"

 #: libraries/config.values.php:122
 msgid "neither of the above"
-msgstr ""
+msgstr "никое от горните"

 #: libraries/config/FormDisplay.class.php:83
 #: libraries/config/validate.lib.php:422
 msgid "Not a positive number"
-msgstr ""
+msgstr "Не е положително число"

 #: libraries/config/FormDisplay.class.php:84
 #: libraries/config/validate.lib.php:435
 msgid "Not a non-negative number"
-msgstr ""
+msgstr "Не е неотрицателно число"

 #: libraries/config/FormDisplay.class.php:85
 #: libraries/config/validate.lib.php:409
@ -2295,7 +2295,7 @@ msgstr "най-много %s"

 #: libraries/config/FormDisplay.tpl.php:173
 msgid "This setting is disabled, it will not be applied to your configuration"
-msgstr ""
+msgstr "Тази настройка е изключена, тя няма да влияе на конфигурацията"

 #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89
 #: libraries/relation.lib.php:96 pmd_relation_new.php:68
@ -2310,11 +2310,11 @@ msgstr "Стойност: %s"
 #: libraries/config/FormDisplay.tpl.php:253
 #: libraries/config/messages.inc.php:350
 msgid "Restore default value"
-msgstr ""
+msgstr "Стойност по подразбиране"

 #: libraries/config/FormDisplay.tpl.php:269
 msgid "Allow users to customize this value"
-msgstr ""
+msgstr "Позволение на потребители да променят стойността"

 #: libraries/config/FormDisplay.tpl.php:333
 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320
@ -2324,7 +2324,7 @@ msgstr "Изчистване"

 #: libraries/config/messages.inc.php:17
 msgid "Improves efficiency of screen refresh"
-msgstr ""
+msgstr "Подобрява ефективността при презареждане на екрана"

 #: libraries/config/messages.inc.php:18
 msgid "Enable Ajax"
@ -2352,7 +2352,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:23
 msgid "Show &quot;Drop database&quot; link to normal users"
-msgstr ""
+msgstr "Показване връзката &quot;Изтриване БД&quot; на обикновени потребители"

 #: libraries/config/messages.inc.php:24
 msgid ""
@ -2362,11 +2362,11 @@ msgstr ""

 #: libraries/config/messages.inc.php:25
 msgid "Blowfish secret"
-msgstr ""
+msgstr "Тайна Blowfish фраза"

 #: libraries/config/messages.inc.php:26
 msgid "Highlight selected rows"
-msgstr ""
+msgstr "Изпъкване избрани редове"

 #: libraries/config/messages.inc.php:27
 msgid "Row marker"
@ -2374,7 +2374,7 @@ msgstr "Маркер на ред"

 #: libraries/config/messages.inc.php:28
 msgid "Highlight row pointed by the mouse cursor"
-msgstr ""
+msgstr "Изпъкване редовете, посочени с мишка"

 #: libraries/config/messages.inc.php:29
 msgid "Highlight pointer"
@ -2399,27 +2399,27 @@ msgstr ""

 #: libraries/config/messages.inc.php:33
 msgid "CHAR columns editing"
-msgstr ""
+msgstr "Редакция на CHAR колони"

 #: libraries/config/messages.inc.php:34
 msgid "Number of columns for CHAR/VARCHAR textareas"
-msgstr ""
+msgstr "Брой колони за CHAR/VARCHAR текстови полета"

 #: libraries/config/messages.inc.php:35
 msgid "CHAR textarea columns"
-msgstr ""
+msgstr "Колони за CHAR текство поле"

 #: libraries/config/messages.inc.php:36
 msgid "Number of rows for CHAR/VARCHAR textareas"
-msgstr ""
+msgstr "Брой редове за CHAR/VARCHAR текстови полета"

 #: libraries/config/messages.inc.php:37
 msgid "CHAR textarea rows"
-msgstr ""
+msgstr "Редове за CHAR текство поле"

 #: libraries/config/messages.inc.php:38
 msgid "Check config file permissions"
-msgstr ""
+msgstr "Проверка на правата върху конфигурационния файл"

 #: libraries/config/messages.inc.php:39
 msgid ""
@ -4381,10 +4381,9 @@ msgstr "MySQL 4.0 съвместимо"

 #: libraries/display_create_database.lib.php:21
 #: libraries/display_create_database.lib.php:39
-#, fuzzy
 #| msgid "Create new database"
 msgid "Create database"
-msgstr "Създаване нова БД"
+msgstr "Създаване БД"

 #: libraries/display_create_database.lib.php:33
 msgid "Create"
@ -5834,11 +5833,11 @@ msgstr "Позволено"
 #: libraries/relation.lib.php:95 libraries/relation.lib.php:107
 #: pmd_relation_new.php:68
 msgid "General relation features"
-msgstr "Общи възможности на релациите"
+msgstr "Общи свойства на релациите"

 #: libraries/relation.lib.php:111
 msgid "Display Features"
-msgstr "Покажи възможностите"
+msgstr "Показване свойства"

 #: libraries/relation.lib.php:117
 msgid "Creation of PDFs"
@ -5869,7 +5868,7 @@ msgstr ""

 #: libraries/relation.lib.php:151
 msgid "Quick steps to setup advanced features:"
-msgstr ""
+msgstr "Лесни стъпки за настройка на разширените свойства:"

 #: libraries/relation.lib.php:153
 msgid ""
@ -6656,7 +6655,7 @@ msgstr ""

 #: main.php:216
 msgid "Official Homepage"
-msgstr "Официална страница на phpMyAdmin"
+msgstr "Официална страница"

 #: main.php:217
 msgid "Contribute"
@ -6994,7 +6993,7 @@ msgstr ""

 #: prefs_manage.php:258 prefs_manage.php:312
 msgid "This feature is not supported by your web browser"
-msgstr ""
+msgstr "Тази функционалност не се поддържа от вашия браузър"

 #: prefs_manage.php:263
 msgid "Merge with current configuration"
@ -9151,11 +9150,11 @@ msgstr ""

 #: tbl_operations.php:692
 msgid "Empty the table (TRUNCATE)"
-msgstr ""
+msgstr "Изпразване на таблицата (TRUNCATE)"

 #: tbl_operations.php:712
 msgid "Delete the table (DROP)"
-msgstr "Изтриване на таблица (DROP)"
+msgstr "Изтриване на таблицата (DROP)"

 #: tbl_operations.php:733
 msgid "Partition maintenance"
--- a/po/hu.po
+++ b/po/hu.po
@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-19 22:30+0200\n"
-"Last-Translator: Róbert Nagy <vrnagy@gmail.com>\n"
+"PO-Revision-Date: 2011-05-27 18:52+0200\n"
+"Last-Translator:  <slygyor@gmail.com>\n"
 "Language-Team: hungarian <hu@li.org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
@ -17,7 +17,7 @@ msgstr ""
 #: browse_foreigners.php:35 browse_foreigners.php:53
 #: libraries/display_tbl.lib.php:341 server_privileges.php:1583
 msgid "Show all"
-msgstr "Összes"
+msgstr "Összes mutatása"

 #: browse_foreigners.php:70 libraries/common.lib.php:2332
 #: libraries/display_tbl.lib.php:321 libraries/export/pdf.php:133
@ -709,19 +709,17 @@ msgstr "Tábla elemzése"

 #: db_structure.php:521
 msgid "Add prefix to table"
-msgstr ""
+msgstr "Előtag hozzáadása a táblához"

 #: db_structure.php:523 libraries/mult_submits.inc.php:246
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Replace table prefix"
-msgstr "A táblaadatok lecserélése fájlra"
+msgstr "Tábla előtagjának lecserélése"

 #: db_structure.php:525 libraries/mult_submits.inc.php:246
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Copy table with prefix"
-msgstr "A táblaadatok lecserélése fájlra"
+msgstr "Tábla másolása előtaggal"

 #: db_structure.php:574 libraries/schema/User_Schema.class.php:387
 msgid "Data Dictionary"
@ -972,10 +970,9 @@ msgid "You are about to DESTROY a complete database!"
 msgstr "Ön a teljes adatbázis MEGSEMMISÍTÉSÉRE készül!"

 #: js/messages.php:32
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to DESTROY a complete table!"
-msgstr "Ön a teljes adatbázis MEGSEMMISÍTÉSÉRE készül!"
+msgstr "Ön a teljes tábla MEGSEMMISÍTÉSÉRE készül!"

 #: js/messages.php:33
 #, fuzzy
@ -1073,7 +1070,7 @@ msgstr "Kérés feldolgozása"

 #: js/messages.php:67 libraries/import/ods.php:80
 msgid "Error in Processing Request"
-msgstr "Kérés feldolgozása sikertelen"
+msgstr "Hiba a kérés feldolgozásában"

 #: js/messages.php:68
 msgid "Dropping Column"
@ -1145,6 +1142,7 @@ msgstr "%s törlése"
 msgid ""
 "Note: If the file contains multiple tables, they will be combined into one"
 msgstr ""
+"Megjegyzés: Ha a fájl több táblát tartalmaz, akkor azok egyesítve lesznek"

 #: js/messages.php:93
 msgid "Hide query box"
@ -1214,6 +1212,8 @@ msgid ""
 "You haven't saved the changes in the layout. They will be lost if you don't "
 "save them.Do you want to continue?"
 msgstr ""
+"Nem mentette a változtatásokat az elrendezésben. Mentés nélkül ezek el "
+"fognak veszni. Így is folytatni szeretné?"

 #: js/messages.php:115
 msgid "Add an option for column "
@ -1250,10 +1250,9 @@ msgid ", latest stable version:"
 msgstr ", utolsó stabil verzió:"

 #: js/messages.php:129
-#, fuzzy
 #| msgid "Jump to database"
 msgid "up to date"
-msgstr "Adatbázisra ugrás"
+msgstr "friss"

 #. l10n: Display text for calendar close link
 #: js/messages.php:147
@ -1981,7 +1980,7 @@ msgstr "Frissítenie kell %s %s vagy újabb verzióra."
 #: libraries/common.lib.php:142
 #, php-format
 msgid "Max: %s%s"
-msgstr "Legnagyobb méret: %s%s"
+msgstr "Max: %s%s"

 #. l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation.
 #: libraries/common.lib.php:404
@ -2059,10 +2058,9 @@ msgid "Inline edit of this query"
 msgstr "lekérdezés inline szerkesztése"

 #: libraries/common.lib.php:1267
-#, fuzzy
 #| msgid "Engines"
 msgid "Inline"
-msgstr "Motorok"
+msgstr "Belső"

 #: libraries/common.lib.php:1334 libraries/common.lib.php:1350
 msgid "Profiling"
@ -3542,14 +3540,13 @@ msgid ""
 "Structure page if any of the required tables for the phpMyAdmin "
 "configuration storage could not be found"
 msgstr ""
-"Letiltja az alapértelmezett figyelmeztetést az adatbázis részleteinél, ha a "
-"phpMyAdmin konfigurációs  tárolóhoz tartozó adatbázistáblák közül valamelyik "
-"nem található"
+"Letiltja az alapértelmezett figyelmeztetést, mely az adatbázis részletek "
+"Struktúra oldalon jelenik meg, ha a phpMyAdmin konfiguráció tároló táblák "
+"valamelyike nem található"

 #: libraries/config/messages.inc.php:328
-#, fuzzy
 msgid "Missing phpMyAdmin configuration storage tables"
-msgstr "Hiányzó táblák a phpMyAdmin konfigurációs tárolóhoz"
+msgstr "Hiányzó phpMyAdmin konfiguráció tároló táblák"

 #: libraries/config/messages.inc.php:330
 msgid "Iconic table operations"
@ -3964,7 +3961,6 @@ msgid "PDF schema: table coordinates"
 msgstr "PDF-séma: table coordinates"

 #: libraries/config/messages.inc.php:416
-#, fuzzy
 #| msgid ""
 #| "Table to describe the display fields, leave blank for no support; "
 #| "suggested: [kbd]pma_table_info[/kbd]"
@ -3972,57 +3968,61 @@ msgid ""
 "Table to describe the display columns, leave blank for no support; "
 "suggested: [kbd]pma_table_info[/kbd]"
 msgstr ""
-"A megjelenítendő mezők táblája, hagyja üresen, ha ne támogassa; "
-"alapértelmezés: [kbd]pma_table_info[/kbd]"
+"Tábla a megjelenített oszlopok leírásához, hagyja üresen, ha nem kíván "
+"megadni leírást; javasolt: [kbd]pma_table_info[/kbd]"

 #: libraries/config/messages.inc.php:417
-#, fuzzy
 #| msgid "Display fields table"
 msgid "Display columns table"
-msgstr "Megjelenítendő mezők táblája"
+msgstr "Oszlopok tábla megjelenítése"

 #: libraries/config/messages.inc.php:418
 msgid ""
 "Whether a DROP DATABASE IF EXISTS statement will be added as first line to "
 "the log when creating a database."
 msgstr ""
+"DROP DATABASE IF EXISTS utasítás hozzá lesz adva a napló első sora ként az "
+"adatbázis létrehozása során."

 #: libraries/config/messages.inc.php:419
 msgid "Add DROP DATABASE"
-msgstr ""
+msgstr "DROP DATABASE hozzáadása"

 #: libraries/config/messages.inc.php:420
 msgid ""
 "Whether a DROP TABLE IF EXISTS statement will be added as first line to the "
 "log when creating a table."
 msgstr ""
+"DROP TABLE IF EXISTS utasítás hozzá lesz adva a napló első sora ként a tábla "
+"létrehozása során."

 #: libraries/config/messages.inc.php:421
 msgid "Add DROP TABLE"
-msgstr ""
+msgstr "DROP TABLE hozzáadása"

 #: libraries/config/messages.inc.php:422
 msgid ""
 "Whether a DROP VIEW IF EXISTS statement will be added as first line to the "
 "log when creating a view."
 msgstr ""
+"DROP VIEW IF EXISTS utasítás hozzá lesz adva a napló első sora ként a nézet "
+"létrehozása során."

 #: libraries/config/messages.inc.php:423
 msgid "Add DROP VIEW"
-msgstr ""
+msgstr "DROP VIEW hozzáadása"

 #: libraries/config/messages.inc.php:424
 msgid "Defines the list of statements the auto-creation uses for new versions."
 msgstr ""
+"Állítások listájának definiálása az új verziójú automata-létrehozások során."

 #: libraries/config/messages.inc.php:425
-#, fuzzy
 #| msgid "Statements"
 msgid "Statements to track"
-msgstr "Utasítások"
+msgstr "Utasítások követésre"

 #: libraries/config/messages.inc.php:426
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history"
 #| "[/kbd]"
@ -4031,10 +4031,9 @@ msgid ""
 "kbd]"
 msgstr ""
 "Hagyja üresen, ha nincs szükség az SQL-lekérdezések előzményeinek "
-"támogatására, alapértelmezés: [kbd]pma_history[/kbd]"
+"támogatására, javasolt: [kbd]pma_history[/kbd]"

 #: libraries/config/messages.inc.php:427
-#, fuzzy
 #| msgid "SQL query history table"
 msgid "SQL query tracking table"
 msgstr "SQL-lekérdezések előzményeinek táblája"
@ -4046,13 +4045,11 @@ msgid ""
 msgstr ""

 #: libraries/config/messages.inc.php:429
-#, fuzzy
 #| msgid "Automatic recovery mode"
 msgid "Automatically create versions"
-msgstr "Automatikus helyreállítási mód"
+msgstr "Verziók automatikus létrehozása"

 #: libraries/config/messages.inc.php:430
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query history support, suggested: [kbd]pma_history"
 #| "[/kbd]"
@ -4060,8 +4057,8 @@ msgid ""
 "Leave blank for no user preferences storage in database, suggested: [kbd]"
 "pma_config[/kbd]"
 msgstr ""
-"Hagyja üresen, ha nincs szükség az SQL-lekérdezések előzményeinek "
-"támogatására, alapértelmezés: [kbd]pma_history[/kbd]"
+"Hagyja üresen, ha nincs szükség a felhasználói beállítások tárolására az "
+"adatbázisban, javaslat: [kbd]pma_history[/kbd]"

 #: libraries/config/messages.inc.php:431
 msgid "User preferences storage table"
@ -4133,10 +4130,9 @@ msgid ""
 msgstr ""

 #: libraries/config/messages.inc.php:444
-#, fuzzy
 #| msgid "Show open tables"
 msgid "Show field types"
-msgstr "Nyitott táblák megjelenítése"
+msgstr "Mező típusok mutatása"

 #: libraries/config/messages.inc.php:445
 msgid "Display the function fields in edit/insert mode"
@ -4227,7 +4223,7 @@ msgstr "A zárolt táblák kihagyása"

 #: libraries/config/messages.inc.php:465
 msgid "Requires SQL Validator to be enabled"
-msgstr ""
+msgstr "Szükséges az SQL Validator engedélyezése"

 #: libraries/config/messages.inc.php:467
 #: libraries/display_change_password.lib.php:40
@ -4247,19 +4243,20 @@ msgstr ""

 #: libraries/config/messages.inc.php:469
 msgid "Enable SQL Validator"
-msgstr ""
+msgstr "SQL Validator engedélyezése"

 #: libraries/config/messages.inc.php:470
 msgid ""
 "If you have a custom username, specify it here (defaults to [kbd]anonymous[/"
 "kbd])"
 msgstr ""
+"Ha Önnek egyedi felhasználóneve van, itt megnevezheti (alapértelmezett: "
+"[kbd]anonymous[/kbd])"

 #: libraries/config/messages.inc.php:471 tbl_tracking.php:454
 #: tbl_tracking.php:511
-#, fuzzy
 msgid "Username"
-msgstr "Felhasználónév:"
+msgstr "Felhasználónév"

 #: libraries/config/messages.inc.php:472
 msgid ""
@ -4275,11 +4272,11 @@ msgstr "Új adatbázisnév javasolása"

 #: libraries/config/messages.inc.php:474
 msgid "A warning is displayed on the main page if Suhosin is detected"
-msgstr ""
+msgstr "Figyelmeztetés megjelenítése a főoldalon, Suhosin észlelésekor"

 #: libraries/config/messages.inc.php:475
 msgid "Suhosin warning"
-msgstr ""
+msgstr "Suhosin figyelmeztetés"

 #: libraries/config/messages.inc.php:476
 msgid ""
@ -4288,10 +4285,9 @@ msgid ""
 msgstr ""

 #: libraries/config/messages.inc.php:477
-#, fuzzy
 #| msgid "CHAR textarea columns"
 msgid "Textarea columns"
-msgstr "CHAR szövegterület oszlopai"
+msgstr "Szövegterület oszlopai"

 #: libraries/config/messages.inc.php:478
 msgid ""
@ -4300,32 +4296,30 @@ msgid ""
 msgstr ""

 #: libraries/config/messages.inc.php:479
-#, fuzzy
 #| msgid "CHAR textarea rows"
 msgid "Textarea rows"
-msgstr "CHAR szövegterület sorai"
+msgstr "Szövegterület sorai"

 #: libraries/config/messages.inc.php:480
 msgid "Title of browser window when a database is selected"
-msgstr ""
+msgstr "A böngésző ablak címe, ha ki van választva egy adatbázis"

 #: libraries/config/messages.inc.php:482
 msgid "Title of browser window when nothing is selected"
-msgstr ""
+msgstr "A böngésző ablak címe, ha semmi sincs kiválasztva"

 #: libraries/config/messages.inc.php:483
-#, fuzzy
 #| msgid "Default table tab"
 msgid "Default title"
-msgstr "Alapértelmezett tábla fül"
+msgstr "Alapértelmezett cím"

 #: libraries/config/messages.inc.php:484
 msgid "Title of browser window when a server is selected"
-msgstr ""
+msgstr "A böngésző ablak címe, ha ki van választva egy szerver"

 #: libraries/config/messages.inc.php:486
 msgid "Title of browser window when a table is selected"
-msgstr ""
+msgstr "A böngésző ablak címe, ha ki van választva egy tábla"

 #: libraries/config/messages.inc.php:488
 msgid ""
@ -4412,28 +4406,24 @@ msgid "ZIP"
 msgstr "ZIP"

 #: libraries/config/setup.forms.php:41
-#, fuzzy
 #| msgid "Host authentication order"
 msgid "Config authentication"
-msgstr "Az állomás hitelesítési sorrendje"
+msgstr "Beállítás hitelesítés"

 #: libraries/config/setup.forms.php:45
-#, fuzzy
 #| msgid "Host authentication order"
 msgid "Cookie authentication"
-msgstr "Az állomás hitelesítési sorrendje"
+msgstr "Cookie hitelesítés"

 #: libraries/config/setup.forms.php:48
-#, fuzzy
 #| msgid "Host authentication order"
 msgid "HTTP authentication"
-msgstr "Az állomás hitelesítési sorrendje"
+msgstr "HTTP hitelesítés"

 #: libraries/config/setup.forms.php:51
-#, fuzzy
 #| msgid "Host authentication order"
 msgid "Signon authentication"
-msgstr "Az állomás hitelesítési sorrendje"
+msgstr "Signon hitelesítés"

 #: libraries/config/setup.forms.php:240
 #: libraries/config/user_preferences.forms.php:144 libraries/import/ldi.php:34
@ -4445,14 +4435,14 @@ msgstr "CSV a LOAD DATA használatával"
 #: libraries/config/user_preferences.forms.php:245 libraries/export/xls.php:17
 #: libraries/import/xls.php:20
 msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
+msgstr "Excel 97-2003 XLS Workbook"

 #: libraries/config/setup.forms.php:252 libraries/config/setup.forms.php:347
 #: libraries/config/user_preferences.forms.php:155
 #: libraries/config/user_preferences.forms.php:249
 #: libraries/export/xlsx.php:17 libraries/import/xlsx.php:20
 msgid "Excel 2007 XLSX Workbook"
-msgstr ""
+msgstr "Excel 2007 XLSX Workbook"

 #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:356
 #: libraries/config/user_preferences.forms.php:158
@ -4464,14 +4454,13 @@ msgstr "Open Document munkafüzet"
 #: libraries/config/setup.forms.php:262
 #: libraries/config/user_preferences.forms.php:165
 msgid "Quick"
-msgstr ""
+msgstr "Quick"

 #: libraries/config/setup.forms.php:266
 #: libraries/config/user_preferences.forms.php:169
-#, fuzzy
 #| msgid "Custom color"
 msgid "Custom"
-msgstr "Egyéni szín"
+msgstr "Egyedi"

 #: libraries/config/setup.forms.php:287
 #: libraries/config/user_preferences.forms.php:189
@ -4540,7 +4529,7 @@ msgstr "en"
 #: libraries/core.lib.php:278
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
-msgstr ""
+msgstr "A %s kiterjesztés hiányzik. Kérem ellenőrizze a PHP beállításokat."

 #: libraries/db_events.inc.php:14 libraries/db_events.inc.php:16
 #: libraries/export/sql.php:493
@ -4561,7 +4550,7 @@ msgstr "Üresnek tűnik az adatbázis!"
 #: libraries/db_links.inc.php:66 libraries/relation.lib.php:143
 #: libraries/tbl_links.inc.php:90
 msgid "Tracking"
-msgstr ""
+msgstr "Követés"

 #: libraries/db_links.inc.php:71
 msgid "Query"
@ -4633,17 +4622,15 @@ msgid "Password Hashing"
 msgstr "Jelszó kivonatolása"

 #: libraries/display_change_password.lib.php:65
-#, fuzzy
 #| msgid "MySQL&nbsp;4.0 compatible"
 msgid "MySQL 4.0 compatible"
-msgstr "MySQL&nbsp;4.0 kompatibilis"
+msgstr "MySQL 4.0 kompatibilis"

 #: libraries/display_create_database.lib.php:21
 #: libraries/display_create_database.lib.php:39
-#, fuzzy
 #| msgid "Create new database"
 msgid "Create database"
-msgstr "Új adatbázis létrehozása"
+msgstr "Adatbázis létrehozása"

 #: libraries/display_create_database.lib.php:33
 msgid "Create"
@ -4660,10 +4647,9 @@ msgid "Create table on database %s"
 msgstr "Új tábla létrehozása a(z) %s adatbázisban"

 #: libraries/display_create_table.lib.php:55
-#, fuzzy
 #| msgid "Number of fields"
 msgid "Number of columns"
-msgstr "Mezők száma"
+msgstr "Oszlopok száma"

 #: libraries/display_export.lib.php:35
 msgid "Could not load export plugins, please check your installation!"
@ -4672,70 +4658,63 @@ msgstr ""
 "telepítését!"

 #: libraries/display_export.lib.php:87
-#, fuzzy
 #| msgid "Allows locking tables for the current thread."
 msgid "Exporting databases from the current server"
-msgstr "A jelenlegi szálon engedélyezi a táblák blokkolását."
+msgstr "Adatbázisok exportálása a jelenlegi szerverről"

 #: libraries/display_export.lib.php:89
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create table on database %s"
 msgid "Exporting tables from \"%s\" database"
-msgstr "Új tábla létrehozása a(z) %s adatbázisban"
+msgstr "Táblák exportálása a \"%s\" adatbázisból"

 #: libraries/display_export.lib.php:91
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create table on database %s"
 msgid "Exporting rows from \"%s\" table"
-msgstr "Új tábla létrehozása a(z) %s adatbázisban"
+msgstr "Sorok exportálása a \"%s\" táblából"

 #: libraries/display_export.lib.php:97
-#, fuzzy
 #| msgid "Export type"
 msgid "Export Method:"
-msgstr "Exportálás típusa"
+msgstr "Exportálás módszere:"

 #: libraries/display_export.lib.php:113
 msgid "Quick - display only the minimal options"
-msgstr ""
+msgstr "Gyors - csak minimális opció megjelenítése"

 #: libraries/display_export.lib.php:129
-#, fuzzy
 #| msgid "Customize default export options"
 msgid "Custom - display all possible options"
-msgstr "Az exportálás alapértelmezett beállításainak testreszabása"
+msgstr "Egyedi - minden lehetséges opció megjelenítése"

 #: libraries/display_export.lib.php:137
-#, fuzzy
 #| msgid "Databases"
 msgid "Database(s):"
-msgstr "Adatbázisok"
+msgstr "Adatbázis(ok):"

 #: libraries/display_export.lib.php:139
-#, fuzzy
 #| msgid "Tables"
 msgid "Table(s):"
-msgstr "Táblák"
+msgstr "Táblá(k):"

 #: libraries/display_export.lib.php:149
-#, fuzzy
 #| msgid "Rows"
 msgid "Rows:"
-msgstr "sor"
+msgstr "Sorok:"

 #: libraries/display_export.lib.php:157
 msgid "Dump some row(s)"
 msgstr ""

 #: libraries/display_export.lib.php:159
-#, fuzzy
 #| msgid "Number of fields"
 msgid "Number of rows:"
-msgstr "Mezők száma"
+msgstr "Sorok száma:"

 #: libraries/display_export.lib.php:162
 msgid "Row to begin at:"
-msgstr ""
+msgstr "Ettől a sortól kezdve:"

 #: libraries/display_export.lib.php:173
 msgid "Dump all rows"
@ -4743,37 +4722,35 @@ msgstr ""

 #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202
 msgid "Output:"
-msgstr ""
+msgstr "Kimenet:"

 #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save on server in %s directory"
 msgid "Save on server in the directory <b>%s</b>"
-msgstr "Mentés a szerver %s könyvtárában"
+msgstr "Mentés a szerver <b>%s</b> könyvtárába"

 #: libraries/display_export.lib.php:206
-#, fuzzy
 #| msgid "Save as file"
 msgid "Save output to a file"
-msgstr "Mentés fájlként"
+msgstr "A kimenet mentése fájlként"

 #: libraries/display_export.lib.php:227
-#, fuzzy
 #| msgid "File name template"
 msgid "File name template:"
-msgstr "Fájlnévsablon"
+msgstr "Fájlnévsablon:"

 #: libraries/display_export.lib.php:229
 msgid "@SERVER@ will become the server name"
-msgstr ""
+msgstr "@SERVER@ lesz a szerver neve"

 #: libraries/display_export.lib.php:231
 msgid ", @DATABASE@ will become the database name"
-msgstr ""
+msgstr ", @DATABASE@ lesz az adatbázis neve"

 #: libraries/display_export.lib.php:233
 msgid ", @TABLE@ will become the table name"
-msgstr ""
+msgstr ", @TABLE@ lesz a tábla neve"

 #: libraries/display_export.lib.php:237
 #, fuzzy, php-format
@ -4792,7 +4769,7 @@ msgstr ""

 #: libraries/display_export.lib.php:275
 msgid "use this for future exports"
-msgstr ""
+msgstr "használja ezt a későbbi exportálásokhoz"

 #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188
 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:517
@ -4800,10 +4777,9 @@ msgid "Character set of the file:"
 msgstr "A fájl karakterkészlete:"

 #: libraries/display_export.lib.php:309
-#, fuzzy
 #| msgid "Compression"
 msgid "Compression:"
-msgstr "Tömörítés"
+msgstr "Tömörítés:"

 #: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:512
 #: libraries/export/sql.php:945 libraries/tbl_properties.inc.php:578
@ -4812,41 +4788,35 @@ msgid "None"
 msgstr "Nincs"

 #: libraries/display_export.lib.php:313
-#, fuzzy
 #| msgid "\"zipped\""
 msgid "zipped"
-msgstr "\"zip tömörítés\""
+msgstr "zip-elve"

 #: libraries/display_export.lib.php:315
-#, fuzzy
 #| msgid "\"gzipped\""
 msgid "gzipped"
-msgstr "\"gzip tömörítés\""
+msgstr "gzip-elve"

 #: libraries/display_export.lib.php:317
-#, fuzzy
 #| msgid "\"bzipped\""
 msgid "bzipped"
-msgstr "\"bzip tömörítés\""
+msgstr "bzip-elve"

 #: libraries/display_export.lib.php:326
-#, fuzzy
 #| msgid "Save as file"
 msgid "View output as text"
-msgstr "Mentés fájlként"
+msgstr "A kimenet megtekintése szövegként"

 #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:37
-#, fuzzy
 #| msgid "Format"
 msgid "Format:"
-msgstr "Formátum"
+msgstr "Formátum:"

 #: libraries/display_export.lib.php:336
-#, fuzzy
 #| msgid "Transformation options"
 msgid "Format-specific options:"
-msgstr "Átalakítás beállításai"
+msgstr "Formátum specifikus opciók:"

 #: libraries/display_export.lib.php:337
 msgid ""
@ -9756,10 +9726,9 @@ msgid "Showing SQL query"
 msgstr "Megjelenítés SQL lekérdezésként"

 #: sql.php:622
-#, fuzzy
 #| msgid "Validate SQL"
 msgid "Validated SQL"
-msgstr "SQL érvényesítése"
+msgstr "Érvényes SQL"

 #: sql.php:897
 #, php-format
@ -9803,12 +9772,11 @@ msgstr "Beszúrás új sorként"

 #: tbl_change.php:1059
 msgid "Insert as new row and ignore errors"
-msgstr ""
+msgstr "Új sor beillesztése és a hibák figyelmen kívül hagyása"

 #: tbl_change.php:1060
-#, fuzzy
 msgid "Show insert query"
-msgstr "Megjelenítés SQL lekérdezésként"
+msgstr "Beillesztő lekérdezés megjelenítése"

 #: tbl_change.php:1071
 msgid "and then"
@ -9838,10 +9806,10 @@ msgstr ""
 "léphet."

 #: tbl_change.php:1137
-#, fuzzy, php-format
+#, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
-msgstr "Beszúrás újrakezdése %s sorral"
+msgstr "Beszúrás folytatása a(z) %s sorokkal"

 #: tbl_chart.php:56
 #| msgid "The privileges were reloaded successfully."
@ -9887,44 +9855,40 @@ msgid "Legend margins"
 msgstr ""

 #: tbl_chart.php:134
-#, fuzzy
 #| msgid "Mar"
 msgid "Bar"
-msgstr "márc."
+msgstr "Sáv"

 #: tbl_chart.php:135
 msgid "Line"
-msgstr ""
+msgstr "Vonal"

 #: tbl_chart.php:136
 msgid "Radar"
-msgstr ""
+msgstr "Radar"

 #: tbl_chart.php:138
-#, fuzzy
 #| msgid "PiB"
 msgid "Pie"
-msgstr "PB"
+msgstr "Torta"

 #: tbl_chart.php:144
-#, fuzzy
 #| msgid "Query type"
 msgid "Bar type"
-msgstr "Lekérdezés típusa"
+msgstr "Sáv típusa"

 #: tbl_chart.php:146
-#, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
-msgstr "Csomagolt"
+msgstr "Halmozott"

 #: tbl_chart.php:147
 msgid "Multi"
-msgstr ""
+msgstr "Többszörös"

 #: tbl_chart.php:152
 msgid "Continuous image"
-msgstr ""
+msgstr "Folyamatos kép"

 #: tbl_chart.php:155
 msgid ""
@ -10069,16 +10033,14 @@ msgid "Table %s has been flushed"
 msgstr "A(z) %s tábla kiírása megtörtént"

 #: tbl_operations.php:668
-#, fuzzy
 #| msgid "Flush the table (\"FLUSH\")"
 msgid "Flush the table (FLUSH)"
-msgstr "Tábla kiírása (\"FLUSH\")"
+msgstr "Tábla kiöblítése (FLUSH)"

 #: tbl_operations.php:677
-#, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
-msgstr "A tábla adatainak kiíratása"
+msgstr "Adat vagy tábla törlése"

 #: tbl_operations.php:692
 msgid "Empty the table (TRUNCATE)"
@ -10139,7 +10101,7 @@ msgstr "Méret"

 #: tbl_printview.php:338 tbl_structure.php:782
 msgid "Effective"
-msgstr "Hatályos"
+msgstr "Hatásos"

 #: tbl_printview.php:363 tbl_structure.php:820
 msgid "Row Statistics"
@ -10173,10 +10135,9 @@ msgstr ""
 "az adattípusokat)"

 #: tbl_relation.php:402
-#, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
-msgstr "Belső kapcsolatok"
+msgstr "Belső kapcsolat"

 #: tbl_relation.php:404
 msgid ""
@ -10201,10 +10162,9 @@ msgstr ""
 "Egy \"példa szerinti lekérdezés\" végrehajtása (karakterhelyettesítő: \"%\")"

 #: tbl_select.php:233
-#, fuzzy
 #| msgid "Select fields (at least one):"
 msgid "Select columns (at least one):"
-msgstr "Válasszon mezőket (legalább egyet):"
+msgstr "Válasszon oszlopokat (legalább egyet):"

 #: tbl_select.php:251
 msgid "Add search conditions (body of the \"where\" clause):"
@ -10224,7 +10184,7 @@ msgstr "A különböző értékek tallózása"

 #: tbl_structure.php:166 tbl_structure.php:167
 msgid "Add primary key"
-msgstr ""
+msgstr "Elsődleges kuly hozzáadása"

 #: tbl_structure.php:168 tbl_structure.php:169
 msgid "Add index"
@ -10236,20 +10196,19 @@ msgstr "Elsődleges kulcs hozzáadása"

 #: tbl_structure.php:172 tbl_structure.php:173
 msgid "Add FULLTEXT index"
-msgstr ""
+msgstr "FULLTEXT index hozzáadása"

 #: tbl_structure.php:385
-#, fuzzy
 #| msgid "None"
 msgctxt "None for default"
 msgid "None"
 msgstr "Nincs"

 #: tbl_structure.php:398
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %s has been dropped"
 msgid "Column %s has been dropped"
-msgstr "A(z) %s tábla eldobása megtörtént"
+msgstr "A(z) %s oszlop eldobása megtörtént"

 #: tbl_structure.php:409 tbl_structure.php:483
 #, php-format
@ -10263,10 +10222,9 @@ msgid "An index has been added on %s"
 msgstr "Az index hozzáadása a(z) %s mezőn megtörtént"

 #: tbl_structure.php:471
-#, fuzzy
 #| msgid "Show versions"
 msgid "Show more actions"
-msgstr "Verziók megjelenítése"
+msgstr "Több tevékenység mutatása"

 #: tbl_structure.php:600 tbl_structure.php:602
 msgid "Relation view"
@ -10277,10 +10235,9 @@ msgid "Propose table structure"
 msgstr "Táblaszerkezet ajánlása"

 #: tbl_structure.php:634
-#, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
-msgstr "%s mező hozzáadása"
+msgstr "Oszlop hozzáadása"

 #: tbl_structure.php:648
 msgid "At End of Table"
@ -10296,10 +10253,10 @@ msgid "After %s"
 msgstr "%s után"

 #: tbl_structure.php:689
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create an index on&nbsp;%s&nbsp;columns"
 msgid "Create an index on &nbsp;%s&nbsp;columns"
-msgstr "Index készítése a(z) %s. oszlopon"
+msgstr "Index készítése a(z) &nbsp;%s&nbsp;oszlopokon"

 #: tbl_structure.php:851
 msgid "partitioned"
@ -10353,10 +10310,9 @@ msgid "Tracking data definition successfully deleted"
 msgstr ""

 #: tbl_tracking.php:384 tbl_tracking.php:401
-#, fuzzy
 #| msgid "Gather errors"
 msgid "Query error"
-msgstr "Hibák összegyűjtése"
+msgstr "Lekérdezési hiba"

 #: tbl_tracking.php:399
 msgid "Tracking data manipulation successfully deleted"
@ -10364,7 +10320,7 @@ msgstr ""

 #: tbl_tracking.php:411
 msgid "Tracking statements"
-msgstr ""
+msgstr "Nyomkövetési utasítások"

 #: tbl_tracking.php:427 tbl_tracking.php:555
 #, php-format
@ -10372,16 +10328,14 @@ msgid "Show %s with dates from %s to %s by user %s %s"
 msgstr ""

 #: tbl_tracking.php:432
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data row from report"
-msgstr "Tábla nyomkövetési adatainak törlése."
+msgstr "Nyomkövetési adat sor törlése a jelentésből"

 #: tbl_tracking.php:443
-#, fuzzy
 #| msgid "No databases"
 msgid "No data"
-msgstr "Nincs adatbázis"
+msgstr "Nincs adat"

 #: tbl_tracking.php:453 tbl_tracking.php:510
 msgid "Date"
@ -10389,19 +10343,19 @@ msgstr "Dátum"

 #: tbl_tracking.php:455
 msgid "Data definition statement"
-msgstr ""
+msgstr "Adat definiáló utasítás"

 #: tbl_tracking.php:512
 msgid "Data manipulation statement"
-msgstr ""
+msgstr "Adat manipuláló utasítás"

 #: tbl_tracking.php:558
 msgid "SQL dump (file download)"
-msgstr ""
+msgstr "SQL dump (fájl letöltés)"

 #: tbl_tracking.php:559
 msgid "SQL dump"
-msgstr ""
+msgstr "SQL dump"

 #: tbl_tracking.php:560
 msgid "This option will replace your table and contained data."
--- a/po/it.po
+++ b/po/it.po
@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-04-05 14:27+0200\n"
-"Last-Translator: <rebeluca@gmail.com>\n"
+"PO-Revision-Date: 2011-05-25 22:43+0200\n"
+"Last-Translator: Rouslan Placella <rouslan@placella.com>\n"
 "Language-Team: italian <it@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"

@ -709,22 +709,19 @@ msgid "Analyze table"
 msgstr "Analizza tabella"

 #: db_structure.php:521
-#, fuzzy
 #| msgid "Go to table"
 msgid "Add prefix to table"
-msgstr "Vai alla tabella"
+msgstr "Aggiungi prefisso alla tabella"

 #: db_structure.php:523 libraries/mult_submits.inc.php:246
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Replace table prefix"
-msgstr "Sostituisci i dati della tabella col file"
+msgstr "Sostituisci il prefisso della tabella"

 #: db_structure.php:525 libraries/mult_submits.inc.php:246
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Copy table with prefix"
-msgstr "Sostituisci i dati della tabella col file"
+msgstr "Copia tabella col prefisso"

 #: db_structure.php:574 libraries/schema/User_Schema.class.php:387
 msgid "Data Dictionary"
@ -977,16 +974,14 @@ msgid "You are about to DESTROY a complete database!"
 msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intero database!"

 #: js/messages.php:32
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to DESTROY a complete table!"
-msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intero database!"
+msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intera tabella!"

 #: js/messages.php:33
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to TRUNCATE a complete table!"
-msgstr "Si sta per DISTRUGGERE COMPLETAMENTE un intero database!"
+msgstr "Si sta per DISTRUGGERE COMPLETAMENTE il contenuto della tabella!"

 #: js/messages.php:34
 msgid "Dropping Event"
@ -1124,33 +1119,31 @@ msgid "Searching"
 msgstr "Ricerca in corso"

 #: js/messages.php:84
-#, fuzzy
 #| msgid "Hide search criteria"
 msgid "Hide search results"
-msgstr "Nascondi criteri di ricerca"
+msgstr "Nascondi i risultati della ricerca"

 #: js/messages.php:85
-#, fuzzy
 #| msgid "Show search criteria"
 msgid "Show search results"
-msgstr "Mostra criteri di ricerca"
+msgstr "Mostra i risultati della ricerca"

 #: js/messages.php:86
-#, fuzzy
 #| msgid "Browse"
 msgid "Browsing"
-msgstr "Mostra"
+msgstr "Navigazione"

 #: js/messages.php:87
-#, fuzzy
 #| msgid "Deleting %s"
 msgid "Deleting"
-msgstr "Cancellazione in corso di %s"
+msgstr "Cancellazione"

 #: js/messages.php:90
 msgid ""
 "Note: If the file contains multiple tables, they will be combined into one"
 msgstr ""
+"Nota: Se il file contiene piú di una tabella, i dati saranno combinati in un "
+"unica tabella"

 #: js/messages.php:93
 msgid "Hide query box"
@ -1220,6 +1213,8 @@ msgid ""
 "You haven't saved the changes in the layout. They will be lost if you don't "
 "save them.Do you want to continue?"
 msgstr ""
+"Non hai salvato i cambiamenti della disposizione. Questi cambiamenti saranno "
+"persi se non li salvi. Vuoi procedere?"

 #: js/messages.php:115
 msgid "Add an option for column "
@ -1256,10 +1251,9 @@ msgid ", latest stable version:"
 msgstr ", versione stabile piú recente:"

 #: js/messages.php:129
-#, fuzzy
 #| msgid "Jump to database"
 msgid "up to date"
-msgstr "Vai al database"
+msgstr "aggiornata"

 #. l10n: Display text for calendar close link
 #: js/messages.php:147
@ -4642,7 +4636,6 @@ msgstr "Compatibile con MySQL 4.0"

 #: libraries/display_create_database.lib.php:21
 #: libraries/display_create_database.lib.php:39
-#, fuzzy
 #| msgid "Create new database"
 msgid "Create database"
 msgstr "Crea un nuovo database"
@ -5976,14 +5969,13 @@ msgid "Convert to Kana"
 msgstr "Converti a Kana"

 #: libraries/mult_submits.inc.php:249
-#, fuzzy
 #| msgid "Fr"
 msgid "From"
-msgstr "Ve"
+msgstr "Da"

 #: libraries/mult_submits.inc.php:252
 msgid "To"
-msgstr ""
+msgstr "A"

 #: libraries/mult_submits.inc.php:257 libraries/mult_submits.inc.php:271
 #: libraries/sql_query_form.lib.php:440
@ -5992,13 +5984,12 @@ msgstr "Invia"

 #: libraries/mult_submits.inc.php:263
 msgid "Add table prefix"
-msgstr ""
+msgstr "Aggiungi un prefisso alla tabella"

 #: libraries/mult_submits.inc.php:266
-#, fuzzy
 #| msgid "Add index"
 msgid "Add prefix"
-msgstr "Aggiungi indice"
+msgstr "Aggiungi prefisso"

 #: libraries/mult_submits.inc.php:477 tbl_replace.php:331
 msgid "No change"
@ -8056,10 +8047,10 @@ msgid "Unable to change master"
 msgstr "Impossibile modificare il master"

 #: server_replication.php:72
-#, fuzzy, php-format
+#, php-format
 #| msgid "Master server changed succesfully to %s"
 msgid "Master server changed successfully to %s"
-msgstr "Il server master modificato a %s con successo"
+msgstr "Il server master modificato con successo a %s"

 #: server_replication.php:180
 msgid "This server is configured as master in a replication process."
@ -9228,16 +9219,18 @@ msgid "Insecure connection"
 msgstr "Connessione non sicura"

 #: setup/frames/index.inc.php:92
-#, fuzzy
 #| msgid "Configuration storage"
 msgid "Configuration saved."
-msgstr "Configurazione di memorizzazione"
+msgstr "Configurazione salvata."

 #: setup/frames/index.inc.php:93
 msgid ""
 "Configuration saved to file config/config.inc.php in phpMyAdmin top level "
 "directory, copy it to top level one and delete directory config to use it."
 msgstr ""
+"Configurazione salvata nel file config/config.inc.php nella cartella "
+"principale di phpMyAdmin, copialo alla cartella principale a rimuovi la "
+"cartella config per utilizzarlo."

 #: setup/frames/index.inc.php:100 setup/frames/menu.inc.php:15
 msgid "Overview"
@ -10102,22 +10095,21 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Versione %s del snapshot (codice SQL)"

 #: tbl_tracking.php:382
-#, fuzzy
 #| msgid "Track these data definition statements:"
 msgid "Tracking data definition successfully deleted"
-msgstr "Monitora le istuzioni delle definizioni dei dati:"
+msgstr "Le definizioni dei dati di monitoraggio eliminati con successo"

 #: tbl_tracking.php:384 tbl_tracking.php:401
 #, fuzzy
 #| msgid "Gather errors"
 msgid "Query error"
-msgstr "Accumula gli errori"
+msgstr "Errore della query"

 #: tbl_tracking.php:399
 #, fuzzy
 #| msgid "Track these data manipulation statements:"
 msgid "Tracking data manipulation successfully deleted"
-msgstr "Monitora le istuzioni delle manipulazioni dei dati:"
+msgstr "Le manipolazioni dei dati di monitoraggio eliminati con successo"

 #: tbl_tracking.php:411
 msgid "Tracking statements"
@ -10135,10 +10127,9 @@ msgid "Delete tracking data row from report"
 msgstr "Cancella dati di tracciamento per questa tabella"

 #: tbl_tracking.php:443
-#, fuzzy
 #| msgid "No databases"
 msgid "No data"
-msgstr "Nessun database"
+msgstr "Nessun dato"

 #: tbl_tracking.php:453 tbl_tracking.php:510
 msgid "Date"
--- a/po/ja.po
+++ b/po/ja.po
@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-17 12:37+0200\n"
+"PO-Revision-Date: 2011-05-29 07:59+0200\n"
 "Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"

@ -1114,16 +1114,14 @@ msgid "Show search results"
 msgstr "検索結果を表示する"

 #: js/messages.php:86
-#, fuzzy
 #| msgid "Browse"
 msgid "Browsing"
-msgstr "表示"
+msgstr "表示中"

 #: js/messages.php:87
-#, fuzzy
 #| msgid "Deleting %s"
 msgid "Deleting"
-msgstr "%s を削除中です"
+msgstr "削除中"

 #: js/messages.php:90
 msgid ""
@ -1876,7 +1874,7 @@ msgstr "レプリケーションしている"
 #: libraries/build_html_for_db.lib.php:150
 #, php-format
 msgid "Check privileges for database &quot;%s&quot;."
-msgstr "データベース &quot;%s&quot; の特権を確認してください"
+msgstr "データベース &quot;%s&quot; の特権を確認する"

 #: libraries/build_html_for_db.lib.php:153
 msgid "Check Privileges"
@ -2789,11 +2787,11 @@ msgstr "外部キー制限"

 #: libraries/config/messages.inc.php:151
 msgid "Browse mode"
-msgstr "表示モード"
+msgstr "閲覧モード"

 #: libraries/config/messages.inc.php:152
 msgid "Customize browse mode"
-msgstr "表示モードの詳細設定"
+msgstr "閲覧モードの詳細設定"

 #: libraries/config/messages.inc.php:154 libraries/config/messages.inc.php:156
 #: libraries/config/messages.inc.php:173 libraries/config/messages.inc.php:184
@ -3239,8 +3237,7 @@ msgstr "データベースツリーの区切り"
 msgid ""
 "Only light version; display databases in a tree (determined by the separator "
 "defined below)"
-msgstr ""
-"軽快版のみ。下の項目で定義する区切りが合った場合、ツリー表示になります。"
+msgstr "軽快モードのみ。下の項目で定義する区切りが合った場合、ツリー表示になります。"

 #: libraries/config/messages.inc.php:273
 msgid "Display databases in a tree"
@ -3252,7 +3249,7 @@ msgstr "全てのデータベースを同時に閲覧したい場合は、これ

 #: libraries/config/messages.inc.php:275
 msgid "Use light version"
-msgstr "軽快版を使用する"
+msgstr "軽快モードを使用する"

 #: libraries/config/messages.inc.php:276
 msgid "Maximum table tree depth"
@ -4556,10 +4553,9 @@ msgstr "MySQL 4.0 互換"

 #: libraries/display_create_database.lib.php:21
 #: libraries/display_create_database.lib.php:39
-#, fuzzy
 #| msgid "Create new database"
 msgid "Create database"
-msgstr "新規データベースを作成する"
+msgstr "データベースを作成する"

 #: libraries/display_create_database.lib.php:33
 msgid "Create"
--- 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-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-22 20:33+0200\n"
+"PO-Revision-Date: 2011-05-30 10:55+0200\n"
 "Last-Translator: Martin Lacina <martin@whistler.sk>\n"
 "Language-Team: slovak <sk@li.org>\n"
 "Language: sk\n"
@ -3810,6 +3810,11 @@ msgid ""
 "their names in order and use [kbd]*[/kbd] at the end to show the rest in "
 "alphabetical order."
 msgstr ""
+"Môžete použiť nahradzujúce znaky (% a _). Pokiaľ ich potrebujete použiť v "
+"ich pôvodnom význame, vložte spätné lomítko \\ pred, napríklad  "
+"[kbd]'moja\\_db'[/kbd] namiesto [kbd]'moja_db'[/kbd]. Použitím tejto voľby "
+"môžete ovplyvniť triedenie databáz v zozname. Stačí na konci zoznamu uviesť "
+"[kbd]*[/kbd] na konci pre zobrazenie ostatných v abecednom poradí."

 #: libraries/config/messages.inc.php:394
 msgid "Show only listed databases"
@ -3840,6 +3845,9 @@ msgid ""
 "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for "
 "no support. Suggested: [kbd]phpmyadmin[/kbd]"
 msgstr ""
+"Databáza použitá pre ralácie, záložky a PDF možností. Pre kompletný popis "
+"viď [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a]. Ak ponecháte prázdne, "
+"bude táto možnosť vypnutá. Doporučená hodnota: [kbd]phpmyadmin[/kbd]"

 #: libraries/config/messages.inc.php:400
 msgid "Database name"
@ -3923,6 +3931,8 @@ msgid ""
 "Table to describe the display columns, leave blank for no support; "
 "suggested: [kbd]pma_table_info[/kbd]"
 msgstr ""
+"Tabuľka obsahujúca popisy polí. Nechajte prázdnu pre vypnutie tejto funkcie. "
+"Odporúčaná hodnota: [kbd]pma_table_info[/kbd]"

 #: libraries/config/messages.inc.php:417
 msgid "Display columns table"
@ -4003,6 +4013,8 @@ msgid ""
 "Leave blank for no user preferences storage in database, suggested: [kbd]"
 "pma_config[/kbd]"
 msgstr ""
+"Nechajte prázdne pre vypnutie možnosti ukladania užívateľských nastavení v "
+"databáze. Odporúčaná hodnota: [kbd]pma_config[/kbd]"

 #: libraries/config/messages.inc.php:431
 msgid "User preferences storage table"
@ -4017,6 +4029,8 @@ msgid ""
 "Disable if you know that your pma_* tables are up to date. This prevents "
 "compatibility checks and thereby increases performance"
 msgstr ""
+"Vypnite, pokiaľ viete, že vaše pma_* tabuľky sú aktuálne. Tým zabránite "
+"kontrolám kompatibility a urýchlite zabrazovanie stránok."

 #: libraries/config/messages.inc.php:435
 msgid "Verbose check"
--- a/po/sl.po
+++ b/po/sl.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-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-19 16:18+0200\n"
+"PO-Revision-Date: 2011-05-27 22:35+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: slovenian <sl@li.org>\n"
 "Language: sl\n"
@ -6927,7 +6927,7 @@ msgid ""
 "Your preferences will be saved for current session only. Storing them "
 "permanently requires %sphpMyAdmin configuration storage%s."
 msgstr ""
-"Vaše nstavitve bodo shranjene samo za trenutno sejo. Njihova trajna hramba "
+"Vaše nastavitve bodo shranjene samo za trenutno sejo. Njihova trajna hramba "
 "zahteva %shrambo konfiguracije phpMyAdmin%s."

 #: libraries/user_preferences.lib.php:142
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-06 03:13+0200\n"
+"PO-Revision-Date: 2011-05-30 05:47+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN@li.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"

@ -698,22 +698,19 @@ msgid "Analyze table"
 msgstr "分析表"

 #: db_structure.php:521
-#, fuzzy
 #| msgid "Go to table"
 msgid "Add prefix to table"
-msgstr "转到数据表"
+msgstr "添加表前缀"

 #: db_structure.php:523 libraries/mult_submits.inc.php:246
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Replace table prefix"
-msgstr "将表的数据用此文件替换"
+msgstr "修改表前缀"

 #: db_structure.php:525 libraries/mult_submits.inc.php:246
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Copy table with prefix"
-msgstr "将表的数据用此文件替换"
+msgstr "复制表为新前缀"

 #: db_structure.php:574 libraries/schema/User_Schema.class.php:387
 msgid "Data Dictionary"
@ -951,16 +948,14 @@ msgid "You are about to DESTROY a complete database!"
 msgstr "您将要删除一个完整的数据库！"

 #: js/messages.php:32
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to DESTROY a complete table!"
-msgstr "您将要删除一个完整的数据库！"
+msgstr "您将要删除一个完整的数据表！"

 #: js/messages.php:33
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to TRUNCATE a complete table!"
-msgstr "您将要删除一个完整的数据库！"
+msgstr "您将要清空一个完整的数据表！"

 #: js/messages.php:34
 msgid "Dropping Event"
@ -1097,28 +1092,24 @@ msgid "Searching"
 msgstr "正在搜索"

 #: js/messages.php:84
-#, fuzzy
 #| msgid "Hide search criteria"
 msgid "Hide search results"
-msgstr "隐藏搜索条件"
+msgstr "隐藏搜索结果"

 #: js/messages.php:85
-#, fuzzy
 #| msgid "Show search criteria"
 msgid "Show search results"
-msgstr "显示搜索条件"
+msgstr "显示搜索结果"

 #: js/messages.php:86
-#, fuzzy
 #| msgid "Browse"
 msgid "Browsing"
-msgstr "浏览"
+msgstr "正在浏览"

 #: js/messages.php:87
-#, fuzzy
 #| msgid "Deleting %s"
 msgid "Deleting"
-msgstr "正在删除 %s"
+msgstr "正在删除"

 #: js/messages.php:90
 msgid ""
@ -1192,7 +1183,7 @@ msgstr "选择要显示的字段"
 msgid ""
 "You haven't saved the changes in the layout. They will be lost if you don't "
 "save them.Do you want to continue?"
-msgstr ""
+msgstr "尚未保存当前布局。如果继续将会丢失本次的修改。是否继续？"

 #: js/messages.php:115
 msgid "Add an option for column "
@ -4443,7 +4434,6 @@ msgstr "MySQL 4.0 兼容"

 #: libraries/display_create_database.lib.php:21
 #: libraries/display_create_database.lib.php:39
-#, fuzzy
 #| msgid "Create new database"
 msgid "Create database"
 msgstr "新建数据库"
@ -5693,14 +5683,13 @@ msgid "Convert to Kana"
 msgstr "转换为假名"

 #: libraries/mult_submits.inc.php:249
-#, fuzzy
 #| msgid "Fr"
 msgid "From"
-msgstr "五"
+msgstr "从"

 #: libraries/mult_submits.inc.php:252
 msgid "To"
-msgstr ""
+msgstr "到"

 #: libraries/mult_submits.inc.php:257 libraries/mult_submits.inc.php:271
 #: libraries/sql_query_form.lib.php:440
@ -5709,13 +5698,12 @@ msgstr "提交"

 #: libraries/mult_submits.inc.php:263
 msgid "Add table prefix"
-msgstr ""
+msgstr "添加表前缀"

 #: libraries/mult_submits.inc.php:266
-#, fuzzy
 #| msgid "Add index"
 msgid "Add prefix"
-msgstr "添加索引"
+msgstr "添加前缀"

 #: libraries/mult_submits.inc.php:477 tbl_replace.php:331
 msgid "No change"
@ -7678,10 +7666,10 @@ msgid "Unable to change master"
 msgstr "无法修改主服务器"

 #: server_replication.php:72
-#, fuzzy, php-format
+#, php-format
 #| msgid "Master server changed succesfully to %s"
 msgid "Master server changed successfully to %s"
-msgstr "成功修改主服务器为 %s"
+msgstr "已成功修改主服务器到 %s"

 #: server_replication.php:180
 msgid "This server is configured as master in a replication process."
@ -8747,16 +8735,15 @@ msgid "Insecure connection"
 msgstr "非安全连接"

 #: setup/frames/index.inc.php:92
-#, fuzzy
 #| msgid "Configuration storage"
 msgid "Configuration saved."
-msgstr "高级功能"
+msgstr "配置已保存。"

 #: setup/frames/index.inc.php:93
 msgid ""
 "Configuration saved to file config/config.inc.php in phpMyAdmin top level "
 "directory, copy it to top level one and delete directory config to use it."
-msgstr ""
+msgstr "配置已保存到 config/config.inc.php 文件，请将其复制到 phpMyAdmin 根目录并删除 config 文件夹。"

 #: setup/frames/index.inc.php:100 setup/frames/menu.inc.php:15
 msgid "Overview"
@ -9580,22 +9567,19 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "版本 %s 的快照 (SQL 代码)"

 #: tbl_tracking.php:382
-#, fuzzy
 #| msgid "Track these data definition statements:"
 msgid "Tracking data definition successfully deleted"
-msgstr "追踪下列数据定义语句:"
+msgstr "追踪数据定义删除成功"

 #: tbl_tracking.php:384 tbl_tracking.php:401
-#, fuzzy
 #| msgid "Gather errors"
 msgid "Query error"
-msgstr "收集错误"
+msgstr "查询错误"

 #: tbl_tracking.php:399
-#, fuzzy
 #| msgid "Track these data manipulation statements:"
 msgid "Tracking data manipulation successfully deleted"
-msgstr "追踪下列数据操作语句:"
+msgstr "追踪数据操作删除成功"

 #: tbl_tracking.php:411
 msgid "Tracking statements"
@ -9607,16 +9591,14 @@ msgid "Show %s with dates from %s to %s by user %s %s"
 msgstr "显示自 %2$s 起至 %3$s 用户 %4$s 执行的 %1$s %5$s"

 #: tbl_tracking.php:432
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data row from report"
-msgstr "删除追踪数据"
+msgstr "从报告中删除追踪数据"

 #: tbl_tracking.php:443
-#, fuzzy
 #| msgid "No databases"
 msgid "No data"
-msgstr "无数据库"
+msgstr "无数据"

 #: tbl_tracking.php:453 tbl_tracking.php:510
 msgid "Date"
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@ -117,6 +117,21 @@ CREATE TABLE IF NOT EXISTS `pma_recent` (

 -- --------------------------------------------------------

+--
+-- Table structure for table `pma_table_uiprefs`
+--
+
+CREATE TABLE IF NOT EXISTS `pma_table_uiprefs` (
+  `username` varchar(64) COLLATE utf8_bin NOT NULL,
+  `db_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `table_name` varchar(64) COLLATE utf8_bin NOT NULL,
+  `prefs` blob NOT NULL,
+  PRIMARY KEY (`username`,`db_name`,`table_name`)
+) ENGINE=MyISAM COMMENT='tables'' UI preferences'
+  DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+-- --------------------------------------------------------
+
 -- 
 -- Table structure for table `pma_relation`
 -- 
--- a/server_databases.php
+++ b/server_databases.php
@ -197,7 +197,11 @@ if ($databases_count > 0) {

    $odd_row = true;
    foreach ($databases as $current) {
-        echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n";
+        $tr_class = $odd_row ? 'odd' : 'even';
+        if ($current['SCHEMA_NAME'] == 'mysql' || $current['SCHEMA_NAME'] == 'information_schema') {
+            $tr_class .= ' noclick';
+        }
+        echo '<tr class="' . $tr_class . '">' . "\n";
        $odd_row = ! $odd_row;

        list($column_order, $generated_html) = PMA_buildHtmlForDb($current, $is_superuser, (isset($checkall) ? $checkall : ''), $url_query, $column_order, $replication_types, $replication_info);
--- a/sql.php
+++ b/sql.php
@ -356,6 +356,31 @@ if ($is_select) { // see line 141
    $is_maint    = true;
 }

+// Handle remembered sorting order, only for single table query
+if ($GLOBALS['cfg']['RememberSorting']
+ && basename($GLOBALS['PMA_PHP_SELF']) == 'sql.php'
+ && ! ($is_count || $is_export || $is_func || $is_analyse)
+ && isset($analyzed_sql[0]['queryflags']['select_from'])
+ && count($analyzed_sql[0]['table_ref']) == 1
+ ) {
+    $pmatable = new PMA_Table($table, $db);
+    if (empty($analyzed_sql[0]['order_by_clause'])) {
+        $sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN);
+        if ($sorted_col) {
+            // retrieve the remembered sorting order for current table
+            $sql_order_to_append = ' ORDER BY ' . $sorted_col . ' ';
+            $sql_query = $analyzed_sql[0]['section_before_limit'] . $sql_order_to_append . $analyzed_sql[0]['section_after_limit'];
+
+            // update the $analyzed_sql
+            $analyzed_sql[0]['section_before_limit'] .= $sql_order_to_append;
+            $analyzed_sql[0]['order_by_clause'] = $sorted_col;
+        }
+    } else {
+        // store the remembered table into session
+        $pmatable->setUiProp(PMA_Table::PROP_SORTED_COLUMN, $analyzed_sql[0]['order_by_clause']);
+    }
+}
+
 // Do append a "LIMIT" clause?
 if ((! $cfg['ShowAll'] || $_SESSION['tmp_user_values']['max_rows'] != 'all')
 && ! ($is_count || $is_export || $is_func || $is_analyse)
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@ -15,7 +15,7 @@ require_once './libraries/tbl_common.php';

 // Get fields and stores their name/type
 $fields = array();
-foreach (PMA_DBI_get_columns($db, $table) as $row) {
+foreach (PMA_DBI_get_columns_full($db, $table) as $row) {
    if (preg_match('@^(set|enum)\((.+)\)$@i', $row['Type'], $tmp)) {
        $tmp[2]         = substr(preg_replace('@([^,])\'\'@', '\\1\\\'',
            ',' . $tmp[2]), 1);
--- a/tbl_printview.php
+++ b/tbl_printview.php
@ -114,7 +114,7 @@ foreach ($the_tables as $key => $table) {
        0, 1);
    $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table));

-    // Check if we can use Relations (Mike Beck)
+    // Check if we can use Relations
    // Find which tables are related with the current one and write it in
    // an array
    $res_rel  = PMA_getForeigners($db, $table);
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@ -1210,16 +1210,6 @@ div#serverstatus table tbody td.descr a,
 div#serverstatus table .tblFooters a {
    white-space: nowrap;
 }
-div#serverstatus div.statuslinks a:before,
-div#serverstatus div#sectionlinks a:before,
-div#serverstatus table tbody td.descr a:before,
-div#serverstatus table .tblFooters a:before {
-}
-div#serverstatus div.statuslinks a:after,
-div#serverstatus div#sectionlinks a:after,
-div#serverstatus table tbody td.descr a:after,
-div#serverstatus table .tblFooters a:after {
-}
 /* end serverstatus */

 /* querywindow */
@ -1286,28 +1276,27 @@ div#querywindowcontainer fieldset {
    border-radius:5px;
    -webkit-border-radius:5px;
    -moz-border-radius:5px;
-
-    box-shadow:0px 1px 1px #fff inset;
+	box-shadow:0px 1px 1px #fff inset;
    -webkit-box-shadow:0px 1px 1px #fff inset;
    -moz-box-shadow:0px 1px 1px #fff inset;
-
 }
 #sectionlinks a, .statuslinks a{
    font-size:0.88em;
    font-weight:bold;
    text-shadow: 0px 1px 0px #fff;
    line-height:35px;
-    margin-left:7px;
-    border: 1px solid #aaa;
-    padding: 5px 10px;
-    color: #111;
-    text-decoration: none;
-    background: #ddd;
-    border-radius: 20px;
-    -webkit-border-radius: 20px;
-    -moz-border-radius: 20px;
-    box-shadow: 1px 1px 2px rgba(0,0,0,.5);
-    /*
+	margin-left:7px;
+	border: 1px solid #aaa;
+	padding: 5px 10px;
+	color: #111;
+	text-decoration: none;
+	background: #ddd;
+    white-space: nowrap;
+	border-radius: 20px;
+	-webkit-border-radius: 20px;
+	-moz-border-radius: 20px;
+	box-shadow: 1px 1px 2px rgba(0,0,0,.5);
+	/*
    -webkit-box-shadow: 1px 1px 2px rgba(0,0,0,.5);
    -moz-box-shadow: 1px 1px 2px rgba(0,0,0,.5);
    text-shadow: #fff 0px 1px 0px;