Merge branch 'master' into rte

2011-07-11 12:30:47 +01:00 · 2011-07-11 12:30:47 +01:00 · eb33912d8d
commit eb33912d8d
parent a4dd7561b0 dacfab6237
21 changed files with 729 additions and 736 deletions
--- a/3
+++ b/3
@ -34,6 +34,8 @@ phpMyAdmin - ChangeLog
 + Show/hide column in table Browse
 - bug #3353856 [AJAX] AJAX dialogs use wrong font-size
 - bug #3354356 [interface] Timepicker does not work in AJAX dialogs
+ AJAX for table Structure Indexes Edit
+ AJAX for table Structure column Change

 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
@ -43,6 +45,7 @@ phpMyAdmin - ChangeLog
 - bug #3353649 [interface] "Create an index on X columns" form not validated
 - bug #3350790 [interface] JS error in Table->Structure->Index->Edit
 - bug #3353811 [interface] Info message has "error" class
+- bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL

 3.4.3.1 (2011-07-02)
 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5
--- a/db_structure.php
+++ b/db_structure.php
@ -13,6 +13,7 @@ require_once './libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
 $GLOBALS['js_include'][] = 'db_structure.js';
 $GLOBALS['js_include'][] = 'tbl_change.js';
+$GLOBALS['js_include'][] = 'jquery/timepicker.js';

 /**
 * Prepares the tables list if the user where not redirected to this script
--- a/js/common.js
+++ b/js/common.js
@ -14,78 +14,6 @@ var querywindow = '';
 */
 var query_to_load = '';

-/**
- * attach a function to object event
- *
- * <code>
- * addEvent(window, 'load', PMA_initPage);
- * </code>
- * @param object or id
- * @param string event type (load, mouseover, focus, ...)
- * @param function to be attached
- */
-function addEvent(obj, type, fn)
-{
-    if (obj.attachEvent) {
-        obj['e' + type + fn] = fn;
-        obj[type + fn] = function() {obj['e' + type + fn](window.event);}
-        obj.attachEvent('on' + type, obj[type + fn]);
-    } else {
-        obj.addEventListener(type, fn, false);
-    }
-}
-
-/**
- * detach/remove a function from an object event
- *
- * @param object or id
- * @param event type (load, mouseover, focus, ...)
- * @param function naem of function to be attached
- */
-function removeEvent(obj, type, fn)
-{
-    if (obj.detachEvent) {
-        obj.detachEvent('on' + type, obj[type + fn]);
-        obj[type + fn] = null;
-    } else {
-        obj.removeEventListener(type, fn, false);
-    }
-}
-
-/**
- * get DOM elements by html class
- *
- * @param string class_name - name of class
- * @param node node - search only sub nodes of this node (optional)
- * @param string tag - search only these tags (optional)
- */
-function getElementsByClassName(class_name, node, tag)
-{
-    var classElements = new Array();
-
-    if (node == null) {
-        node = document;
-    }
-    if (tag == null) {
-        tag = '*';
-    }
-
-    var j = 0, teststr;
-    var els = node.getElementsByTagName(tag);
-    var elsLen = els.length;
-
-    for (i = 0; i < elsLen; i++) {
-        if (els[i].className.indexOf(class_name) != -1) {
-            teststr = "," + els[i].className.split(" ").join(",") + ",";
-            if (teststr.indexOf("," + class_name + ",") != -1) {
-                classElements[j] = els[i];
-                j++;
-            }
-        }
-    }
-    return classElements;
-}
-
 /**
 * sets current selected db
 *
--- a/js/db_structure.js
+++ b/js/db_structure.js
@ -61,12 +61,12 @@ $(document).ready(function() {
    $("td.insert_table a.ajax").live('click', function(event){
        event.preventDefault();
        currrent_insert_table = $(this);
-        var url = $(this).attr("href");
-        if (url.substring(0, 15) == "tbl_change.php?") {
-             url = url.substring(15);
+        var $url = $(this).attr("href");
+        if ($url.substring(0, 15) == "tbl_change.php?") {
+             $url = $url.substring(15);
        }

-       	var div = $('<div id="insert_table_dialog"></div>');
+       	var $div = $('<div id="insert_table_dialog"></div>');
       	var target = "tbl_change.php";

        /**
@ -75,38 +75,43 @@ $(document).ready(function() {
         */
        var button_options = {};
        // in the following function we need to use $(this)
-        button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();}
+        button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}

        var button_options_error = {};
-        button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();}
+        button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();}

        var $msgbox = PMA_ajaxShowMessage();

-        $.get( target , url+"&ajax_request=true" ,  function(data) {
+        $.get( target , $url+"&ajax_request=true" ,  function(data) {
            //in the case of an error, show the error message returned.
            if (data.success != undefined && data.success == false) {
-                div
+                $div
                .append(data.error)
                .dialog({
                    title: PMA_messages['strInsertTable'],
                    height: 230,
                    width: 900,
+                    modal: true,
                    open: PMA_verifyTypeOfAllColumns,
                    buttons : button_options_error
                })// end dialog options
            } else {
-                div
-                .append(data)
-                .dialog({
-                    title: PMA_messages['strInsertTable'],
-                    height: 600,
-                    width: 900,
-                    open: PMA_verifyTypeOfAllColumns,
-                    buttons : button_options
-                })
+                var $dialog = $div
+                    .append(data)
+                    .dialog({
+                        title: PMA_messages['strInsertTable'],
+                        height: 600,
+                        width: 900,
+                        modal: true,
+                        open: PMA_verifyTypeOfAllColumns,
+                        buttons : button_options
+                    });// end dialog options
                //Remove the top menu container from the dialog
-                .find("#topmenucontainer").hide()
-                ; // end dialog options
+                $dialog.find("#topmenucontainer").hide();
+                //Adding the datetime pikers for the dialog
+                $dialog.find('.datefield, .datetimefield').each(function () {
+                       PMA_addDatepicker($(this));
+                });
                $(".insertRowTable").addClass("ajax");
                $("#buttonYes").addClass("ajax");
            }
--- a/js/functions.js
+++ b/js/functions.js
@ -2152,9 +2152,45 @@ function displayMoreTableOpts() {
                }
            });
    }
+
 }
 $(document).ready(initTooltips);

+/**
+ * Ensures indexes names are valid according to their type and, for a primary
+ * key, lock index name to 'PRIMARY'
+ * @param   string   form_id  Variable which parses the form name as
+ *                            the input
+ * @return  boolean  false    if there is no index form, true else
+ */
+function checkIndexName(form_id)
+{
+    if ($("#"+form_id).length == 0) {
+        return false;
+    }
+
+    // Gets the elements pointers
+    var $the_idx_name = $("#input_index_name");
+    var $the_idx_type = $("#select_index_type");
+
+    // Index is a primary key
+    if ($the_idx_type.find("option:selected").attr("value") == 'PRIMARY') {
+        $the_idx_name.attr("value", 'PRIMARY');
+        $the_idx_name.attr("disabled", true);
+    }
+
+    // Other cases
+    else {
+        if ($the_idx_name.attr("value") == 'PRIMARY') {
+            $the_idx_name.attr("value",  '');
+        }
+        $the_idx_name.attr("disabled", false);
+    }
+
+    return true;
+} // end of the 'checkIndexName()' function
+
+
 /* Displays tooltips */
 function initTooltips() {
    // Hide the footnotes from the footer (which are displayed for
--- a/js/indexes.js
+++ b/js/indexes.js
@ -4,45 +4,6 @@
 *
 */

-/**
- * Ensures indexes names are valid according to their type and, for a primary
- * key, lock index name to 'PRIMARY'
- *
- * @return  boolean  false if there is no index form, true else
- */
-function checkIndexName()
-{
-    if (typeof(document.forms['index_frm']) == 'undefined') {
-        return false;
-    }
-
-    // Gets the elements pointers
-    var the_idx_name = document.forms['index_frm'].elements['index[Key_name]'];
-    var the_idx_type = document.forms['index_frm'].elements['index[Index_type]'];
-
-    // Index is a primary key
-    if (the_idx_type.options[0].value == 'PRIMARY' && the_idx_type.options[0].selected) {
-        document.forms['index_frm'].elements['index[Key_name]'].value = 'PRIMARY';
-        if (typeof(the_idx_name.disabled) != 'undefined') {
-            document.forms['index_frm'].elements['index[Key_name]'].disabled = true;
-        }
-    }
-
-    // Other cases
-    else {
-        if (the_idx_name.value == 'PRIMARY') {
-            document.forms['index_frm'].elements['index[Key_name]'].value = '';
-        }
-        if (typeof(the_idx_name.disabled) != 'undefined') {
-            document.forms['index_frm'].elements['index[Key_name]'].disabled = false;
-        }
-    }
-
-    return true;
-} // end of the 'checkIndexName()' function
-
-onload = checkIndexName;
-
 /**
 * Hides/shows the inputs and submits appropriately depending
 * on whether the index type chosen is 'SPATIAL' or not.
@ -56,7 +17,7 @@ function checkIndexType()
    /**
     * @var Object Table header for the size column.
     */
-    $size_header = $('thead tr th:nth-child(2)');
+    $size_header = $('#index_columns thead tr th:nth-child(2)');
    /**
     * @var Object Inputs to specify the columns for the index.
     */
@ -132,7 +93,12 @@ function checkIndexType()
 */
 $(document).ready(function() {
    checkIndexType();
-    $('#select_index_type').bind('change', checkIndexType);
+    checkIndexName("index_frm");
+    $('#select_index_type').live('change', function(event){
+        event.preventDefault();
+        checkIndexType();
+        checkIndexName("index_frm");
+    });
 });

 /**#@- */
--- a/js/sql.js
+++ b/js/sql.js
@ -685,7 +685,10 @@ $(document).ready(function() {
                    })
                } else {
                    $this_field.find('textarea').live('keypress', function(e) {
-                        $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false);
+                        // FF errorneously triggers for modifier keys such as tab (bug #3357837)
+                        if (e.which != 0) {
+                            $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false);
+                        }
                    })
                }

--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@ -70,21 +70,8 @@ function daysInFebruary (year){
 //function to convert single digit to double digit
 function fractionReplace(num)
 {
-    num=parseInt(num);
-    var res="00";
-    switch(num)
-    {
-        case 1:res= "01";break;
-        case 2:res= "02";break;
-        case 3:res= "03";break;
-        case 4:res= "04";break;
-        case 5:res= "05";break;
-        case 6:res= "06";break;
-        case 7:res= "07";break;
-        case 8:res= "08";break;
-        case 9:res= "09";break;
-        }
-    return res;
+    num = parseInt(num);
+    return num >= 1 && num <= 9 ? '0' + num : '00';
 }

 /* function to check the validity of date
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@ -153,56 +153,34 @@ $(document).ready(function() {
        event.preventDefault();

        /*Check whether atleast one row is selected for change*/
-        if($("#tablestructure tbody tr").hasClass("marked")){
-            var div = $('<div id="change_column_dialog"></div>');
-
-            /**
-             *  @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();}
+        if ($("#tablestructure tbody tr").hasClass("marked")) {
+            /*Define the action and $url variabls for the post method*/
            var $form = $("#fieldsForm");
-            var $msgbox = PMA_ajaxShowMessage();
-
-            $.get( $form.attr('action') , $form.serialize()+"&ajax_request=true&submit_mult=change" ,  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['strChangeTbl'],
-                        height: 230,
-                        width: 900,
-                        open: PMA_verifyTypeOfAllColumns,
-                        buttons : button_options_error
-                    })// end dialog options
-                } else {
-                    div
-                    .append(data)
-                    .dialog({
-                        title: PMA_messages['strChangeTbl'],
-                        height: 600,
-                        width: 900,
-                        open: PMA_verifyTypeOfAllColumns,
-                        buttons : button_options
-                    })
-                    //Remove the top menu container from the dialog
-                    .find("#topmenucontainer").hide()
-                    ; // end dialog options
-                    $("#append_fields_form input[name=do_save_data]").addClass("ajax");
-                }
-                PMA_ajaxRemoveMessage($msgbox);
-            }) // end $.get()
+            var action = $form.attr('action');
+            var url = $form.serialize()+"&ajax_request=true&submit_mult=change";
+            /*Calling for the changeColumns fucntion*/
+            changeColumns(action,url);
        }  else {
            PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']);
        }
    });

+    /**
+     *Ajax event handler for single column change
+    **/
+    $("#fieldsForm.ajax #tablestructure tbody tr td.edit a").live('click', function(event){
+        event.preventDefault();
+        /*Define the action and $url variabls for the post method*/
+        var action = "tbl_alter.php";
+        var url = $(this).attr('href');
+        if (url.substring(0, 13) == "tbl_alter.php") {
+            url = url.substring(14, url.length);
+        }
+        url = url + "&ajax_request=true";
+        /*Calling for the changeColumns fucntion*/
+        changeColumns(action,url);
+     });
+
    /**
     *Ajax action for submitting the column change form
    **/
@ -269,10 +247,10 @@ $(document).ready(function() {
         */
        var button_options = {};
        // in the following function we need to use $(this)
-        button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();}
+        button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}

        var button_options_error = {};
-        button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();}
+        button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();}
        var $msgbox = PMA_ajaxShowMessage();

        $.get( "tbl_indexes.php" , url ,  function(data) {
@ -285,6 +263,7 @@ $(document).ready(function() {
                    height: 230,
                    width: 900,
                    open: PMA_verifyTypeOfAllColumns,
+                    modal: true,
                    buttons : button_options_error
                })// end dialog options
            } else {
@ -295,11 +274,13 @@ $(document).ready(function() {
                    height: 600,
                    width: 900,
                    open: PMA_verifyTypeOfAllColumns,
+                    modal: true,
                    buttons : button_options
                })
                //Remove the top menu container from the dialog
                .find("#topmenucontainer").hide()
                ; // end dialog options
+                checkIndexName("index_frm");
            }
            PMA_ajaxRemoveMessage($msgbox);
        }) // end $.get()
@ -337,8 +318,14 @@ $(document).ready(function() {
                }

            } else {
-                var temp_div = $("<div id='temp_div'><div>").append(data.error);
-                var error = $(temp_div).find(".error code").addClass("error");
+                if(data.error != undefined) {
+                    var temp_div = $("<div id='temp_div'><div>").append(data.error);
+                    if($(temp_div).find(".error code").length != 0) {
+                        var error = $(temp_div).find(".error code").addClass("error");
+                    } else {
+                        var error = temp_div;
+                    }
+                }
                PMA_ajaxShowMessage(error);
            }

@ -360,7 +347,7 @@ $(document).ready(function() {
        $.post($form.attr('action'), $form.serialize()+"&add_fields=Go", function(data) {
            $("#index_columns").remove();
            var temp_div = $("<div id='temp_div'><div>").append(data);
-            $(temp_div).find("#index_columns").insertAfter("#index_frm fieldset .error");
+            $(temp_div).find("#index_columns").appendTo("#index_edit_fields");
        }) // end $.post()
    }) // end insert table button "Go"

@ -393,3 +380,66 @@ $(document).ready(function() {


 }) // end $(document).ready()
+
+/**
+ * Loads the append_fields_form to the Change dialog allowing users
+ * to change the columns
+ * @param   string	action  Variable which parses the name of the
+ * 							destination file
+ * @param   string	$url    Variable which parses the data for the
+ * 							post action
+ */
+function changeColumns(action,url) {
+    /*Remove the hidden dialogs if there are*/
+    if ($('#change_column_dialog').length != 0) {
+        $('#change_column_dialog').remove();
+    }
+    var div = $('<div id="change_column_dialog"></div>');
+
+    /**
+     *  @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();
+
+    $.get( action , 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['strChangeTbl'],
+                height: 230,
+                width: 900,
+                modal: true,
+                open: PMA_verifyTypeOfAllColumns,
+                buttons : button_options_error
+            })// end dialog options
+        } else {
+            div
+            .append(data)
+            .dialog({
+                title: PMA_messages['strChangeTbl'],
+                height: 600,
+                width: 900,
+                modal: true,
+                open: PMA_verifyTypeOfAllColumns,
+                buttons : button_options
+            })
+            //Remove the top menu container from the dialog
+            .find("#topmenucontainer").hide()
+            ; // end dialog options
+            $("#append_fields_form input[name=do_save_data]").addClass("ajax");
+            /*changed the z-index of the enum editor to allow the edit*/
+            $("#enum_editor").css("z-index", "1100");
+        }
+        PMA_ajaxRemoveMessage($msgbox);
+    }) // end $.get()
+}
+
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@ -336,13 +336,11 @@ class PMA_Table

        $is_timestamp = strpos(strtoupper($type), 'TIMESTAMP') !== false;

-        /**
-         * @todo include db-name
-         */
        $query = PMA_backquote($name) . ' ' . $type;

        if ($length != ''
-            && !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT)$@i', $type)) {
+            && !preg_match('@^(DATE|DATETIME|TIME|TINYBLOB|TINYTEXT|BLOB|TEXT|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT'
+                . '|SERIAL|BOOLEAN)$@i', $type)) {
            $query .= '(' . $length . ')';
        }

--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@ -253,7 +253,13 @@ function PMA_getPHPDocLink($target) {
 */
 function PMA_warnMissingExtension($extension, $fatal = false, $extra = '')
 {
-    $message = sprintf(__('The %s extension is missing. Please check your PHP configuration.'),
+    /* Gettext does not have to be loaded yet here */
+    if (function_exists('__')) {
+        $message = __('The %s extension is missing. Please check your PHP configuration.');
+    } else {
+        $message = 'The %s extension is missing. Please check your PHP configuration.';
+    }
+    $message = sprintf($message,
        '[a@' . PMA_getPHPDocLink('book.' . $extension . '.php') . '@Documentation][em]' . $extension . '[/em][/a]');
    if ($extra != '') {
        $message .= ' ' . $extra;
--- a/po/ar.po
+++ b/po/ar.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-06-27 03:38+0200\n"
+"PO-Revision-Date: 2011-07-09 03:43+0200\n"
 "Last-Translator: Abdullah Al-Saedi <abdullah.10@windowslive.com>\n"
 "Language-Team: arabic <ar@li.org>\n"
 "Language: ar\n"
@ -82,7 +82,6 @@ msgstr "تنفيذ"

 #: browse_foreigners.php:169 browse_foreigners.php:173
 #: libraries/Index.class.php:431 tbl_tracking.php:313
-#, fuzzy
 msgid "Keyname"
 msgstr "اسم المفتاح"

@ -406,16 +405,16 @@ msgid "Last check"
 msgstr "التحقق الأخير"

 #: db_printview.php:220 db_structure.php:432
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s table(s)"
 msgid "%s table"
 msgid_plural "%s tables"
 msgstr[0] "%s  جدول (جداول)"
 msgstr[1] "%s  جدول (جداول)"
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[2] "%s  جدول (جداول)"
+msgstr[3] "%s  جدول (جداول)"
+msgstr[4] "%s  جدول (جداول)"
+msgstr[5] "%s  جدول (جداول)"

 #: db_qbe.php:41
 msgid "You have to choose at least one column to display"
@ -512,15 +511,15 @@ msgid "Your SQL query has been executed successfully"
 msgstr "تم تنفيذ إستعلام SQL  بنجاح"

 #: db_routines.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "%d row affected by the last statement inside the procedure"
 msgid_plural "%d rows affected by the last statement inside the procedure"
 msgstr[0] "%d تأثر بالإجراء الأخير"
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
+msgstr[1] "%d تأثر بالإجراء الأخير"
+msgstr[2] "%d تأثر بالإجراء الأخير"
+msgstr[3] "%d تأثر بالإجراء الأخير"
+msgstr[4] "%d تأثر بالإجراء الأخير"
+msgstr[5] "%d تأثر بالإجراء الأخير"

 #: db_routines.php:168
 #, php-format
@ -3183,54 +3182,52 @@ msgstr ""

 #: libraries/config/messages.inc.php:206
 msgid "Changes tracking"
-msgstr ""
+msgstr "تعقب التغيرات"

 #: libraries/config/messages.inc.php:207
 msgid ""
 "Tracking of changes made in database. Requires the phpMyAdmin configuration "
 "storage."
-msgstr ""
+msgstr "تعقب التغيرات الحاصلة على قاعدة البيانات."

 #: libraries/config/messages.inc.php:208
 msgid "Customize export options"
-msgstr ""
+msgstr "تخصيص خيارات التصدير"

 #: libraries/config/messages.inc.php:210
 msgid "Customize import defaults"
-msgstr ""
+msgstr "تخصيص خيارات الإستيراد"

 #: libraries/config/messages.inc.php:211
 msgid "Customize navigation frame"
-msgstr ""
+msgstr "تخصيص اطار التصفح"

 #: libraries/config/messages.inc.php:212
 msgid "Customize main frame"
-msgstr ""
+msgstr "تخصيص الإطار الرئيسي"

 #: libraries/config/messages.inc.php:213 libraries/config/messages.inc.php:218
 #: setup/frames/menu.inc.php:17
 msgid "SQL queries"
-msgstr ""
+msgstr "إستعلام SQL"

 #: libraries/config/messages.inc.php:215
 msgid "SQL Query box"
-msgstr ""
+msgstr "صندوق إستعلام SQL"

 #: libraries/config/messages.inc.php:216
 msgid "Customize links shown in SQL Query boxes"
-msgstr ""
+msgstr "تخصيص الروابط الموجودة في صندوق إستعلام SQL"

 #: libraries/config/messages.inc.php:219
-#, fuzzy
 #| msgid "Server variables and settings"
 msgid "SQL queries settings"
-msgstr "متغيرات وإعدادات الخادم"
+msgstr "إعدادات إستعلامات SQL"

 #: libraries/config/messages.inc.php:220
-#, fuzzy
 #| msgid "SQL history"
 msgid "SQL Validator"
-msgstr "نصوص SQL سابقة"
+msgstr "مدقق SQL"

 #: libraries/config/messages.inc.php:221
 msgid ""
@ -3242,69 +3239,70 @@ msgstr ""

 #: libraries/config/messages.inc.php:222
 msgid "Startup"
-msgstr ""
+msgstr "بدء التشغيل"

 #: libraries/config/messages.inc.php:223
 msgid "Customize startup page"
-msgstr ""
+msgstr "تخصيص صفحة بدء التشغيل"

 #: libraries/config/messages.inc.php:224
 msgid "Tabs"
-msgstr ""
+msgstr "التبويبات"

 #: libraries/config/messages.inc.php:225
 msgid "Choose how you want tabs to work"
-msgstr ""
+msgstr "إختر الطريقة التي تعمل بها التبويبات"

 #: libraries/config/messages.inc.php:226
-#, fuzzy
 #| msgid "Use text field"
 msgid "Text fields"
-msgstr "استخدم حقل نص"
+msgstr "حقول نصية"

 #: libraries/config/messages.inc.php:227
-#, fuzzy
 #| msgid "Use text field"
 msgid "Customize text input fields"
-msgstr "استخدم حقل نص"
+msgstr "تخصيص حقول الإدخال النصية"

 #: libraries/config/messages.inc.php:228 libraries/export/texytext.php:18
 msgid "Texy! text"
-msgstr ""
+msgstr "نص"

 #: libraries/config/messages.inc.php:230
-#, fuzzy
 #| msgid "Warning"
 msgid "Warnings"
-msgstr "تحذير"
+msgstr "تحذيرات"

 #: libraries/config/messages.inc.php:231
 msgid "Disable some of the warnings shown by phpMyAdmin"
-msgstr ""
+msgstr "إلغاء عرض بعض التحذيرات في phpMyAdmin"

 #: libraries/config/messages.inc.php:232
 msgid ""
 "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import "
 "and export operations"
 msgstr ""
+"تفعيل ضغط [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] لعمليات التصدير "
+"والإستيراد"

 #: libraries/config/messages.inc.php:233
 msgid "GZip"
-msgstr ""
+msgstr "GZip"

 #: libraries/config/messages.inc.php:234
 msgid "Extra parameters for iconv"
-msgstr ""
+msgstr "مدخلات إضافية لـ iconv"

 #: libraries/config/messages.inc.php:235
 msgid ""
 "If enabled, phpMyAdmin continues computing multiple-statement queries even "
 "if one of the queries failed"
 msgstr ""
+"إذا كان مفعل , فإن phpMyAdmin  سوف تستمر في تنفيذ الإستعلامات المتعددة حتى "
+"لو فشل بعضها"

 #: libraries/config/messages.inc.php:236
 msgid "Ignore multiple statement errors"
-msgstr ""
+msgstr "تجاهل أخطاء الجمل المتعددة"

 #: libraries/config/messages.inc.php:237
 msgid ""
@ -3315,12 +3313,12 @@ msgstr ""

 #: libraries/config/messages.inc.php:238
 msgid "Partial import: allow interrupt"
-msgstr ""
+msgstr "الإستيراد الجزئي: السماح بالمقاطعة"

 #: libraries/config/messages.inc.php:243 libraries/config/messages.inc.php:250
 #: libraries/import/csv.php:27 libraries/import/ldi.php:40
 msgid "Do not abort on INSERT error"
-msgstr ""
+msgstr "لاتحبط عندما يكون الخطأ في جمل الإدخال INSERT"

 #: libraries/config/messages.inc.php:244 libraries/config/messages.inc.php:252
 #: libraries/import/csv.php:26 libraries/import/ldi.php:39
@ -3332,83 +3330,83 @@ msgid ""
 "Default format; be aware that this list depends on location (database, "
 "table) and only SQL is always available"
 msgstr ""
+"الهيئة الإفتراضي ; كن مدرك بأن هذه القائمة تعتمد على مكان (قاعدة البيانات "
+"والجدول)"

 #: libraries/config/messages.inc.php:247
 msgid "Format of imported file"
-msgstr ""
+msgstr "هيئة الملفات المستوردة"

 #: libraries/config/messages.inc.php:251 libraries/import/ldi.php:46
 msgid "Use LOCAL keyword"
-msgstr ""
+msgstr "إستعمل الجملة LOCAL"

 #: libraries/config/messages.inc.php:254 libraries/config/messages.inc.php:262
 #: libraries/config/messages.inc.php:263
-#, fuzzy
 #| msgid "Put fields names in the first row"
 msgid "Column names in first row"
-msgstr "ضع أسماء الحقول في السطر الأول"
+msgstr "ضع أسماء الصفوف في السطر الأول"

 #: libraries/config/messages.inc.php:255 libraries/import/ods.php:27
 msgid "Do not import empty rows"
-msgstr ""
+msgstr "لاتستورد صفوف فارغة"

 #: libraries/config/messages.inc.php:256
 msgid "Import currencies ($5.00 to 5.00)"
-msgstr ""
+msgstr "عملات الإستيراد ($5.00 إلى 5.00)"

 #: libraries/config/messages.inc.php:257
 msgid "Import percentages as proper decimals (12.00% to .12)"
-msgstr ""
+msgstr "النسبة المئوية للإستيراد كرقم عشري (12.00% إلى .12)"

 #: libraries/config/messages.inc.php:258
 msgid "Number of queries to skip from start"
-msgstr ""
+msgstr "عدد الإستعلامات التي يتخطاها من البداية"

 #: libraries/config/messages.inc.php:259
 msgid "Partial import: skip queries"
-msgstr ""
+msgstr "إستيراد جزئي: تخطي الإستعلامات"

 #: libraries/config/messages.inc.php:261
-#, fuzzy
 #| msgid "Add AUTO_INCREMENT value"
 msgid "Do not use AUTO_INCREMENT for zero values"
-msgstr "أضف قيمة AUTO_INCREMENT"
+msgstr "لاتستعمل AUTO_INCREMENT للقيم الصفرية"

 #: libraries/config/messages.inc.php:264
 msgid "Initial state for sliders"
-msgstr ""
+msgstr "الحالة الأولية"

 #: libraries/config/messages.inc.php:265
 msgid "How many rows can be inserted at one time"
-msgstr ""
+msgstr "كم عدد الصفوف التي يمكن إدخالها مرة واحدة"

 #: libraries/config/messages.inc.php:266
 msgid "Number of inserted rows"
-msgstr ""
+msgstr "عدد الصفوف المدخلة"

 #: libraries/config/messages.inc.php:267
 msgid "Target for quick access icon"
-msgstr ""
+msgstr "الهدف لإيقونة الوصول السريع"

 #: libraries/config/messages.inc.php:268
 msgid "Show logo in left frame"
-msgstr ""
+msgstr "عرض الشعار في الإطار الأيسر"

 #: libraries/config/messages.inc.php:269
 msgid "Display logo"
-msgstr ""
+msgstr "عرض الشعار"

 #: libraries/config/messages.inc.php:270
 msgid "Display server choice at the top of the left frame"
-msgstr ""
+msgstr "عرض إختيار الخادم في الجزء العلوي من الإطار الأيسر"

 #: libraries/config/messages.inc.php:271
 msgid "Display servers selection"
-msgstr ""
+msgstr "عرض إختيار الخوادم"

 #: libraries/config/messages.inc.php:272
 msgid "Minimum number of tables to display the table filter box"
-msgstr ""
+msgstr "اقل عدد جداول تعرض في صندوق تصفية الجداول"

 #: libraries/config/messages.inc.php:273
 msgid "String that separates databases into different tree levels"
@ -3416,7 +3414,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:274
 msgid "Database tree separator"
-msgstr ""
+msgstr "فاصل شجرة قاعدة البيانات"

 #: libraries/config/messages.inc.php:275
 msgid ""
@ -3426,19 +3424,19 @@ msgstr ""

 #: libraries/config/messages.inc.php:276
 msgid "Display databases in a tree"
-msgstr ""
+msgstr "عرض قواعد البيانات في شجرة"

 #: libraries/config/messages.inc.php:277
 msgid "Disable this if you want to see all databases at once"
-msgstr ""
+msgstr "تعطيل هذا إذا كنت تريد رؤية قواعد البيانات كلٌ على حدا"

 #: libraries/config/messages.inc.php:278
 msgid "Use light version"
-msgstr ""
+msgstr "إستخدم نسخة light"

 #: libraries/config/messages.inc.php:279
 msgid "Maximum table tree depth"
-msgstr ""
+msgstr "أقصى عمق لشجرة الجدول"

 #: libraries/config/messages.inc.php:280
 msgid "String that separates tables into different tree levels"
@ -3446,43 +3444,44 @@ msgstr ""

 #: libraries/config/messages.inc.php:281
 msgid "Table tree separator"
-msgstr ""
+msgstr "فاصل شجرة الجدول"

 #: libraries/config/messages.inc.php:282
 msgid "URL where logo in the navigation frame will point to"
-msgstr ""
+msgstr "إعمل رابط للمكان الذي يشير اليه الشعار"

 #: libraries/config/messages.inc.php:283
 msgid "Logo link URL"
-msgstr ""
+msgstr "رابط الشعار"

 #: libraries/config/messages.inc.php:284
 msgid ""
 "Open the linked page in the main window ([kbd]main[/kbd]) or in a new one "
 "([kbd]new[/kbd])"
 msgstr ""
+"فتح الصفحة المرتبطة في النافذة الرئيسية ([kbd]main[/kbd]) أو في نافذة جديدة "
+"([kbd]new[/kbd])"

 #: libraries/config/messages.inc.php:285
 msgid "Logo link target"
-msgstr ""
+msgstr "هدف رابط الشعار"

 #: libraries/config/messages.inc.php:286
 msgid "Highlight server under the mouse cursor"
-msgstr ""
+msgstr "توضيح الخادم تحت مؤشر الفأرة"

 #: libraries/config/messages.inc.php:287
 msgid "Enable highlighting"
-msgstr ""
+msgstr "تفعيل التوضيح (highlighting)"

 #: libraries/config/messages.inc.php:288
 msgid "Maximum number of recently used tables; set 0 to disable"
-msgstr ""
+msgstr "أكبر عدد للجداول المستعملة مؤخراً ; ضع 0 للتعطيل"

 #: libraries/config/messages.inc.php:289
-#, fuzzy
 #| msgid "Analyze table"
 msgid "Recently used tables"
-msgstr "تحليل الجدول"
+msgstr "الجداول المستعملة مؤخراً"

 #: libraries/config/messages.inc.php:290
 msgid "Use less graphically intense tabs"
@ -3499,7 +3498,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:293
 msgid "Limit column characters"
-msgstr ""
+msgstr "حد أحرف العمود"

 #: libraries/config/messages.inc.php:294
 msgid ""
@ -3510,17 +3509,17 @@ msgstr ""

 #: libraries/config/messages.inc.php:295
 msgid "Delete all cookies on logout"
-msgstr ""
+msgstr "حذف كل الكوكيز عند الخروج"

 #: libraries/config/messages.inc.php:296
 msgid ""
 "Define whether the previous login should be recalled or not in cookie "
 "authentication mode"
-msgstr ""
+msgstr "تعريف ما إذا كان سوف يتذكر تسجيل الدخول الأخير من تحقق الكوكيز أم لا"

 #: libraries/config/messages.inc.php:297
 msgid "Recall user name"
-msgstr ""
+msgstr "تذكر إسم المستخدم"

 #: libraries/config/messages.inc.php:298
 msgid ""
@ -3536,15 +3535,15 @@ msgstr ""

 #: libraries/config/messages.inc.php:300
 msgid "Define how long (in seconds) a login cookie is valid"
-msgstr ""
+msgstr "تحديد كم المدة التي يبقى فيها الكوكيز"

 #: libraries/config/messages.inc.php:301
 msgid "Login cookie validity"
-msgstr ""
+msgstr "صلاحية دخول الكوكيز"

 #: libraries/config/messages.inc.php:302
 msgid "Double size of textarea for LONGTEXT columns"
-msgstr ""
+msgstr "مضاعفة حجم مربع النص لأعمدة LONGTEXT"

 #: libraries/config/messages.inc.php:303
 msgid "Bigger textarea for LONGTEXT"
--- a/po/br.po
+++ b/po/br.po
@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-07-02 22:10+0200\n"
+"PO-Revision-Date: 2011-07-10 19:45+0200\n"
 "Last-Translator:  <fulup.jakez@ofis-bzh.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: br\n"
@ -1292,16 +1292,14 @@ msgid "Insert Table"
 msgstr "Ensoc'hañ un daolenn"

 #: js/messages.php:113
-#, fuzzy
 #| msgid "Indexes"
 msgid "Hide indexes"
-msgstr "Menegerioù"
+msgstr "Kuzhat menegerioù"

 #: js/messages.php:114
-#, fuzzy
 #| msgid "Indexes"
 msgid "Show indexes"
-msgstr "Menegerioù"
+msgstr "Diskouez menegerioù"

 #: js/messages.php:117
 msgid "Searching"
@ -2554,50 +2552,59 @@ msgid ""
 "inside a frame, and is a potential [strong]security hole[/strong] allowing "
 "cross-frame scripting attacks"
 msgstr ""
+"Gweredekaat kement-mañ a aotre ur bajenn zo en un domani disheñvel da "
+"c'hervel phpMyAdmin e diabarzh ur framm, ar pezh a ya d'ober un "
+"[strong]toull surentez[/strong] posupl evit tagadennoù skript etre frammoù"

 #: libraries/config/messages.inc.php:22
 msgid "Allow third party framing"
-msgstr ""
+msgstr "Aotren ar frammoù a-berzh tud all"

 #: libraries/config/messages.inc.php:23
 msgid "Show &quot;Drop database&quot; link to normal users"
 msgstr ""
+"Diskouez al liamm evit &quot;Skarzhañ un diaz roadennoù&quot; d'an "
+"implijerien voutin"

 #: libraries/config/messages.inc.php:24
 msgid ""
 "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] "
 "authentication"
 msgstr ""
+"Ger-tremen implijet evit enrinegañ toupinoù pa vez gwiriekaet dre "
+"[kbd]cookie[/kbd]"

 #: libraries/config/messages.inc.php:25
 msgid "Blowfish secret"
-msgstr ""
+msgstr "Kevrin Blow fish"

 #: libraries/config/messages.inc.php:26
 msgid "Highlight selected rows"
-msgstr ""
+msgstr "Lakaat al linennoù dibabet da skediñ"

 #: libraries/config/messages.inc.php:27
 msgid "Row marker"
-msgstr ""
+msgstr "Merker linennoù"

 #: libraries/config/messages.inc.php:28
 msgid "Highlight row pointed by the mouse cursor"
-msgstr ""
+msgstr "Lakaat al linenn a vuk al logodenn daveti da usskediñ"

 #: libraries/config/messages.inc.php:29
 msgid "Highlight pointer"
-msgstr ""
+msgstr "Lakaat ar reti da usskediñ"

 #: libraries/config/messages.inc.php:30
 msgid ""
 "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for "
 "import and export operations"
 msgstr ""
+"Aotren ar gwaskañ [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] evit an "
+"oberiadennoù enporzhiañ hag ezporzhiañ"

 #: libraries/config/messages.inc.php:31
 msgid "Bzip2"
-msgstr ""
+msgstr "Bzip2"

 #: libraries/config/messages.inc.php:32
 msgid ""
@ -2605,182 +2612,196 @@ msgid ""
 "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/"
 "kbd] - allows newlines in columns"
 msgstr ""
+"Spisaat peseurt doare kontrolloù kemmañ a zleer ober ganto evit ar bannoù "
+"CHAR ha VARCHAR; [kbd]input[/kbd] - a dalvez da grennañ ar vent, "
+"[kbd]textarea[/kbd] - a aotren lakaat linennoù nevez er bannoù"

 #: libraries/config/messages.inc.php:33
 msgid "CHAR columns editing"
-msgstr ""
+msgstr "Kemmañ ar bannoù CHAR"

 #: libraries/config/messages.inc.php:34
 msgid "Number of columns for CHAR/VARCHAR textareas"
-msgstr ""
+msgstr "Niver a vannoù evit an takadoù skrid CHAR/VARCHAR"

 #: libraries/config/messages.inc.php:35
 msgid "CHAR textarea columns"
-msgstr ""
+msgstr "Bannoù evit an takadoù skrid CHAR"

 #: libraries/config/messages.inc.php:36
 msgid "Number of rows for CHAR/VARCHAR textareas"
-msgstr ""
+msgstr "Niver a linennoù evit an takadoù skrid CHAR/VARCHAR"

 #: libraries/config/messages.inc.php:37
 msgid "CHAR textarea rows"
-msgstr ""
+msgstr "Linennoù evit an takadoù skrid CHAR"

 #: libraries/config/messages.inc.php:38
 msgid "Check config file permissions"
-msgstr ""
+msgstr "Gwiriañ aotreoù ar restr gefluniañ"

 #: libraries/config/messages.inc.php:39
 msgid ""
 "Compress gzip/bzip2 exports on the fly without the need for much memory; if "
 "you encounter problems with created gzip/bzip2 files disable this feature"
 msgstr ""
+"Gwaskañ a ra an ezporzhiadennoù gzip/bzip2 war ar prim hep sunañ nemeur a "
+"vemor; Mar bez kudennoù gant ar restroù gzip/bzip2 krouet, diweredekait an "
+"dibarzh."

 #: libraries/config/messages.inc.php:40
 msgid "Compress on the fly"
-msgstr ""
+msgstr "Gwaskañ war ar prim"

 #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25
 #: setup/frames/index.inc.php:165
 msgid "Configuration file"
-msgstr ""
+msgstr "Restr gefluniañ"

 #: libraries/config/messages.inc.php:42
 msgid ""
 "Whether a warning (&quot;Are your really sure...&quot;) should be displayed "
 "when you're about to lose data"
 msgstr ""
+"Ur gemennadenn (&quot;Ha sur oc'h...&quot;) a zlefe dont war wel pa vezer "
+"war-nes koll roadennoù."

 #: libraries/config/messages.inc.php:43
 msgid "Confirm DROP queries"
-msgstr ""
+msgstr "Kadarnaat ar rekedoù diverkañ DROP"

 #: libraries/config/messages.inc.php:44
 msgid "Debug SQL"
-msgstr ""
+msgstr "Dizreinañ SQL"

 #: libraries/config/messages.inc.php:45
 msgid "Default display direction"
-msgstr ""
+msgstr "Talvoud dre ziouer durc'hadur an diskwel"

 #: libraries/config/messages.inc.php:46
 msgid ""
 "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates "
 "maximum number for which vertical model is used"
 msgstr ""
+"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] pe un niver a verk an talvoud "
+"brasañ a vo implijet ar mod a-serzh evitañ"

 #: libraries/config/messages.inc.php:47
 msgid "Display direction for altering/creating columns"
-msgstr ""
+msgstr "Durc'hadur an diskwel evit kemmañ/krouiñ bannoù"

 #: libraries/config/messages.inc.php:48
 msgid "Tab that is displayed when entering a database"
-msgstr ""
+msgstr "Ivinell diskouezet pa'z eer tre en un diaz roadennoù"

 #: libraries/config/messages.inc.php:49
 msgid "Default database tab"
-msgstr ""
+msgstr "Ivinell dre ziouer evit un diaz roadennoù"

 #: libraries/config/messages.inc.php:50
 msgid "Tab that is displayed when entering a server"
-msgstr ""
+msgstr "Ivinell diskouezet pa'z eer tre en ur servijer"

 #: libraries/config/messages.inc.php:51
 msgid "Default server tab"
-msgstr ""
+msgstr "Ivinell dre ziouer evit ar servijer"

 #: libraries/config/messages.inc.php:52
 msgid "Tab that is displayed when entering a table"
-msgstr ""
+msgstr "Ivinell diskouezet pa'z eer tre en un daolenn"

 #: libraries/config/messages.inc.php:53
 msgid "Default table tab"
-msgstr ""
+msgstr "Ivinell dre ziouer evit an taolennoù"

 #: libraries/config/messages.inc.php:54
 msgid "Show binary contents as HEX by default"
-msgstr ""
+msgstr "Diskouez an endalc'had binarel en HEX (eizhdekvedennoù) dre ziouer"

 #: libraries/config/messages.inc.php:55 libraries/display_tbl.lib.php:637
 msgid "Show binary contents as HEX"
-msgstr ""
+msgstr "Diskouez an endalc'had binarel en HEX (eizhdekvedennoù)"

 #: libraries/config/messages.inc.php:56
 msgid "Show database listing as a list instead of a drop down"
-msgstr ""
+msgstr "Diskouez roll an diazoù roadennoù e-lec'h ul lañser desachañ"

 #: libraries/config/messages.inc.php:57
 msgid "Display databases as a list"
-msgstr ""
+msgstr "Diskouez a ra an diazoù roadennoù e stumm ur roll"

 #: libraries/config/messages.inc.php:58
 msgid "Show server listing as a list instead of a drop down"
-msgstr ""
+msgstr "Diskouez roll ar servijerioù e-lec'h ur roll desachañ"

 #: libraries/config/messages.inc.php:59
 msgid "Display servers as a list"
-msgstr ""
+msgstr "Diskouez a ra ar servijerioù e stumm ur roll"

 #: libraries/config/messages.inc.php:60
 msgid ""
 "Disable the table maintenance mass operations, like optimizing or repairing "
 "the selected tables of a database."
 msgstr ""
+"Diweredekaat an oberiadennoù trezalc'h a-vras, evel gwellekaat pe kempenn "
+"taolennoù diuzet un diaz roadennoù."

 #: libraries/config/messages.inc.php:61
 msgid "Disable multi table maintenance"
-msgstr ""
+msgstr "Diweredekaat trezalc'h an taolennoù lies."

 #: libraries/config/messages.inc.php:62
 msgid "Edit SQL queries in popup window"
-msgstr ""
+msgstr "Aozañ ar rekedoù SQL en ur prenestr difoupañ"

 #: libraries/config/messages.inc.php:63
 msgid "Edit in window"
-msgstr ""
+msgstr "Aozañ en ur prenestr"

 #: libraries/config/messages.inc.php:64
 msgid "Display errors"
-msgstr ""
+msgstr "Diskouez ar fazioù"

 #: libraries/config/messages.inc.php:65
 msgid "Gather errors"
-msgstr ""
+msgstr "Dastum ar fazioù"

 #: libraries/config/messages.inc.php:66
 msgid "Show icons for warning, error and information messages"
-msgstr ""
+msgstr "Diskouez an arlunioù evit ar c'hemennoù diwall, faziañ ha titouriñ"

 #: libraries/config/messages.inc.php:67
 msgid "Iconic errors"
-msgstr ""
+msgstr "Arlunioù evit ar fazioù"

 #: libraries/config/messages.inc.php:68
 msgid ""
 "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no "
 "limit)"
 msgstr ""
+"Niver a eilennoù lakaet evit seveniñ ar skriptoù ([kbd]0[/kbd] a dalvez hep "
+"bevenn)"

 #: libraries/config/messages.inc.php:69
 msgid "Maximum execution time"
-msgstr ""
+msgstr "Pad seveniñ hirañ"

 #: libraries/config/messages.inc.php:70 prefs_manage.php:299
 msgid "Save as file"
-msgstr ""
+msgstr "Enrollañ evel restr"

 #: libraries/config/messages.inc.php:71 libraries/config/messages.inc.php:239
 msgid "Character set of the file"
-msgstr ""
+msgstr "Strobad arouezennoù ar restr"

 #: libraries/config/messages.inc.php:72 libraries/config/messages.inc.php:88
 #: tbl_gis_visualization.php:210 tbl_printview.php:373 tbl_structure.php:870
 msgid "Format"
-msgstr ""
+msgstr "Furmad"

 #: libraries/config/messages.inc.php:73
 msgid "Compression"
-msgstr ""
+msgstr "Gwaskadur"

 #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:81
 #: libraries/config/messages.inc.php:89 libraries/config/messages.inc.php:93
@ -2792,13 +2813,13 @@ msgstr ""
 #: libraries/export/odt.php:58 libraries/export/texytext.php:28
 #: libraries/export/xls.php:25 libraries/export/xlsx.php:25
 msgid "Put columns names in the first row"
-msgstr ""
+msgstr "Diskouez anvioù ar bannoù diouzhtu el linenn gentañ"

 #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:241
 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:76
 #: libraries/import/ldi.php:42
 msgid "Columns enclosed by"
-msgstr ""
+msgstr "Bannoù gronnet gant"

 #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:242
 #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81
--- a/po/de.po
+++ b/po/de.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-06-27 15:25+0200\n"
+"PO-Revision-Date: 2011-07-09 16:40+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: english-gb <en_GB@li.org>\n"
 "Language: en_GB\n"
@ -1280,16 +1280,14 @@ msgid "Insert Table"
 msgstr "Insert Table"

 #: js/messages.php:113
-#, fuzzy
 #| msgid "Add index"
 msgid "Hide indexes"
-msgstr "Add index"
+msgstr "Hide indexes"

 #: js/messages.php:114
-#, fuzzy
 #| msgid "Show grid"
 msgid "Show indexes"
-msgstr "Show grid"
+msgstr "Show indexes"

 #: js/messages.php:117
 msgid "Searching"
@ -4298,12 +4296,13 @@ msgid ""
 "Defines whether or not type display direction option is shown when browsing "
 "a table"
 msgstr ""
+"Defines whether or not type display direction option is shown when browsing "
+"a table"

 #: libraries/config/messages.inc.php:454
-#, fuzzy
 #| msgid "Default display direction"
 msgid "Show display direction"
-msgstr "Default display direction"
+msgstr "Show display direction"

 #: libraries/config/messages.inc.php:455
 msgid ""
@ -5258,7 +5257,7 @@ msgstr "Click to mark/unmark"

 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
-msgstr ""
+msgstr "Click the drop-down arrow<br />to toggle column's visibility"

 #: libraries/display_tbl.lib.php:431
 #, php-format
@ -5266,22 +5265,19 @@ msgid "%d is not valid row number."
 msgstr "%d is not valid row number."

 #: libraries/display_tbl.lib.php:436
-#, fuzzy
 #| msgid "Textarea rows"
 msgid "Start row"
-msgstr "Textarea rows"
+msgstr "Start row"

 #: libraries/display_tbl.lib.php:438
-#, fuzzy
 #| msgid "Number of rows:"
 msgid "Number of rows"
-msgstr "Number of rows:"
+msgstr "Number of rows"

 #: libraries/display_tbl.lib.php:443
-#, fuzzy
 #| msgid "More"
 msgid "Mode"
-msgstr "More"
+msgstr "Mode"

 #: libraries/display_tbl.lib.php:445
 msgid "horizontal"
@ -5298,7 +5294,7 @@ msgstr "vertical"
 #: libraries/display_tbl.lib.php:452
 #, php-format
 msgid "Headers every %s rows"
-msgstr ""
+msgstr "Headers every %s rows"

 #: libraries/display_tbl.lib.php:546
 msgid "Sort by key"
--- a/po/fr.po
+++ b/po/fr.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-06-27 15:26+0200\n"
+"PO-Revision-Date: 2011-07-09 20:07+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: french <fr@li.org>\n"
 "Language: fr\n"
@ -1296,16 +1296,14 @@ msgid "Insert Table"
 msgstr "Insérer dans la table"

 #: js/messages.php:113
-#, fuzzy
 #| msgid "Add index"
 msgid "Hide indexes"
-msgstr "Ajouter un index"
+msgstr "Cacher les index"

 #: js/messages.php:114
-#, fuzzy
 #| msgid "Show grid"
 msgid "Show indexes"
-msgstr "Grille"
+msgstr "Montrer les index"

 #: js/messages.php:117
 msgid "Searching"
@ -1919,7 +1917,7 @@ msgstr "Connexion impossible: paramètres incorrects."
 #: libraries/auth/cookie.auth.lib.php:172 libraries/auth/http.auth.lib.php:64
 #, php-format
 msgid "Welcome to %s"
-msgstr "Bienvenue sur %s"
+msgstr "Bienvenue dans %s"

 #: libraries/auth/config.auth.lib.php:106
 #, php-format
@ -4347,12 +4345,13 @@ msgid ""
 "Defines whether or not type display direction option is shown when browsing "
 "a table"
 msgstr ""
+"Définit si l'option de direction d'affichage est montrée lorsqu'on affiche "
+"le contenu d'une table"

 #: libraries/config/messages.inc.php:454
-#, fuzzy
 #| msgid "Default display direction"
 msgid "Show display direction"
-msgstr "Valeur par défaut de la direction de l'affichage"
+msgstr "Montrer le sélecteur de direction de l'affichage"

 #: libraries/config/messages.inc.php:455
 msgid ""
@ -5318,7 +5317,7 @@ msgstr "Cliquer pour marquer/enlever les marques"

 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
-msgstr ""
+msgstr "Cliquer sur la flèche<br />pour gérer l'affichage des colonnes"

 #: libraries/display_tbl.lib.php:431
 #, php-format
@ -5326,22 +5325,19 @@ msgid "%d is not valid row number."
 msgstr "%d n'est pas un numéro de ligne valable."

 #: libraries/display_tbl.lib.php:436
-#, fuzzy
 #| msgid "Textarea rows"
 msgid "Start row"
-msgstr "Taille verticale pour une zone de texte"
+msgstr "Ligne de départ"

 #: libraries/display_tbl.lib.php:438
-#, fuzzy
 #| msgid "Number of rows:"
 msgid "Number of rows"
 msgstr "Nombre de lignes"

 #: libraries/display_tbl.lib.php:443
-#, fuzzy
 #| msgid "More"
 msgid "Mode"
-msgstr "plus"
+msgstr "Mode"

 #: libraries/display_tbl.lib.php:445
 msgid "horizontal"
@ -5358,7 +5354,7 @@ msgstr "vertical"
 #: libraries/display_tbl.lib.php:452
 #, php-format
 msgid "Headers every %s rows"
-msgstr ""
+msgstr "En-têtes à intervalle de %s lignes"

 #: libraries/display_tbl.lib.php:546
 msgid "Sort by key"
--- a/po/pt_BR.po
+++ b/po/pt_BR.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-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-07-05 15:06+0200\n"
-"Last-Translator:  <vitorpc.18@gmail.com>\n"
+"PO-Revision-Date: 2011-07-11 04:42+0200\n"
+"Last-Translator:  <erickdeoliveiraleal@gmail.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@ -247,6 +247,7 @@ msgstr "Ver o esquema do Banco de Dados"

 #: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48
 #: export.php:371 navigation.php:299
+#, fuzzy
 msgid "No tables found in database."
 msgstr "Nenhuma tabela encontrada no Banco de Dados"

@ -595,6 +596,10 @@ msgid ""
 "handling multi queries. <b>The execution of some stored routines may fail!</"
 "b> Please use the improved 'mysqli' extension to avoid any problems."
 msgstr ""
+"Você está usando  extensão 'mysql' obsoleta do PHP, que não é capaz de lidar "
+"com multi consultas. <b.>A execução de algumas rotinas de armazenamento "
+"podem falhar!</b> Por favor, use a extensão melhorada 'mysqli' para evitar "
+"quaisquer problemas."

 #: db_search.php:30 libraries/auth/config.auth.lib.php:83
 #: libraries/auth/config.auth.lib.php:102
@ -1154,7 +1159,7 @@ msgstr "Gráfico de tráfego em tempo real"

 #: js/messages.php:65 server_status.php:423
 msgid "Live conn./process chart"
-msgstr ""
+msgstr "Quadro conn./process em tempo real"

 #: js/messages.php:66 server_status.php:445
 msgid "Live query chart"
@ -1321,6 +1326,7 @@ msgstr "Apagando %s"
 #: js/messages.php:124
 msgid "The definition of a stored function must contain a RETURN statement!"
 msgstr ""
+"A definição de uma função armazenada deve conter uma instrução de RETURN!"

 #: js/messages.php:125
 #, fuzzy
@ -1920,7 +1926,7 @@ msgstr "Encontrado caminho inválido para o tema %s!"

 #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40
 msgid "Theme"
-msgstr ""
+msgstr "Tema"

 #: libraries/auth/config.auth.lib.php:76
 msgid "Cannot connect: invalid settings."
@ -1971,7 +1977,7 @@ msgstr "Você pode digitar a url/IP e a porta separados por um espaço."

 #: libraries/auth/cookie.auth.lib.php:211
 msgid "Server:"
-msgstr "Servidor"
+msgstr "Servidor:"

 #: libraries/auth/cookie.auth.lib.php:216
 msgid "Username:"
@ -2015,7 +2021,7 @@ msgstr "Usuário ou senha incorreta. Acesso negado."

 #: libraries/auth/signon.auth.lib.php:87
 msgid "Can not find signon authentication script:"
-msgstr "Não é possível encontrar o script de autenticação de logon"
+msgstr "Não é possível encontrar o script de autenticação de logon:"

 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #, php-format
@ -2132,6 +2138,8 @@ msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
 msgstr ""
+"Isso geralmente significa que há um erro de sintaxe, por favor cheque "
+"qualquer erro mostrado abaixo."

 #: libraries/common.inc.php:595
 #, fuzzy, php-format
@ -2143,7 +2151,9 @@ msgstr "Não foi possível carregar configuração padrão de: \"%1$s\""
 msgid ""
 "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your "
 "configuration file!"
-msgstr "A variável <tt>$cfg['PmaAbsoluteUri']</tt> deve ser setada"
+msgstr ""
+"A diretriz<tt>$cfg['PmaAbsoluteUri']</tt> deve ser estabelecida no seu "
+"arquivo de configuração!"

 #: libraries/common.inc.php:630
 #, fuzzy, php-format
@ -2212,7 +2222,7 @@ msgstr "consulta SQL"

 #: libraries/common.lib.php:1031
 msgid "Failed to connect to SQL validator!"
-msgstr "Falha ao conectar ao validador SQL"
+msgstr "Falha ao conectar ao validador SQL!"

 #: libraries/common.lib.php:1072 libraries/config/messages.inc.php:474
 msgid "Explain SQL"
@ -2366,8 +2376,7 @@ msgstr "Selecionar a partir do diretório de upload do servidor <b>%s</b>:"
 #: libraries/common.lib.php:2814 libraries/sql_query_form.lib.php:447
 #: tbl_change.php:887
 msgid "The directory you set for upload work cannot be reached"
-msgstr ""
-"O diretório que você especificou para subir arquivos não foi encontrado."
+msgstr "O diretório que você especificou para subir arquivos não foi encontrado"

 #: libraries/common.lib.php:2822
 msgid "There are no files to upload"
@ -2375,7 +2384,7 @@ msgstr "Não existem arquivos para fazer upload"

 #: libraries/common.lib.php:2849 libraries/common.lib.php:2850
 msgid "Execute"
-msgstr ""
+msgstr "Executar"

 #: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
@ -2434,7 +2443,7 @@ msgstr "Personalizada - exibir todas as opções possíveis para configurar"

 #: libraries/config.values.php:102
 msgid "Custom - like above, but without the quick/custom choice"
-msgstr "Personalizada - como acima, mas sem a escolha rápida/personalizada."
+msgstr "Personalizada - como acima, mas sem a escolha rápida/personalizada"

 #: libraries/config.values.php:120
 #, fuzzy
@ -2454,7 +2463,7 @@ msgstr "ambos acima"

 #: libraries/config.values.php:123
 msgid "neither of the above"
-msgstr "nenhuma das acima."
+msgstr "nenhuma das acima"

 #: libraries/config/FormDisplay.class.php:83
 #: libraries/config/validate.lib.php:412
@ -2587,33 +2596,35 @@ msgstr "Permitir elaboração de terceiros"

 #: libraries/config/messages.inc.php:23
 msgid "Show &quot;Drop database&quot; link to normal users"
-msgstr ""
+msgstr "Exibir link &quot;Apagar banco de dados&quot; para usuários normais"

 #: libraries/config/messages.inc.php:24
 msgid ""
 "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] "
 "authentication"
 msgstr ""
+"Frase secreta utilizada para encriptar cookies na autenticação por "
+"[kbd]cookie[/kbd]"

 #: libraries/config/messages.inc.php:25
 msgid "Blowfish secret"
-msgstr ""
+msgstr "Segredo Blowfish"

 #: libraries/config/messages.inc.php:26
 msgid "Highlight selected rows"
-msgstr ""
+msgstr "Destacar linhas selecionadas"

 #: libraries/config/messages.inc.php:27
 msgid "Row marker"
-msgstr ""
+msgstr "Marcador de linha"

 #: libraries/config/messages.inc.php:28
 msgid "Highlight row pointed by the mouse cursor"
-msgstr ""
+msgstr "Destacar linha apontada pelo cursor do mouse"

 #: libraries/config/messages.inc.php:29
 msgid "Highlight pointer"
-msgstr ""
+msgstr "Destacar apontador"

 #: libraries/config/messages.inc.php:30
 msgid ""
@ -2623,7 +2634,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:31
 msgid "Bzip2"
-msgstr ""
+msgstr "Bzip2"

 #: libraries/config/messages.inc.php:32
 msgid ""
@ -2631,14 +2642,17 @@ msgid ""
 "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/"
 "kbd] - allows newlines in columns"
 msgstr ""
+"Define que tipo de controles de edição devem ser utilizados pelas colunas "
+"CHAR e VARCHAR; [kbd]input[/kbd] - permite limitar o tamanho do campo, "
+"[kbd]textarea[/kbd] - permite quebra de linhas em colunas"

 #: libraries/config/messages.inc.php:33
 msgid "CHAR columns editing"
-msgstr ""
+msgstr "Edição de colunas CHAR"

 #: libraries/config/messages.inc.php:34
 msgid "Number of columns for CHAR/VARCHAR textareas"
-msgstr ""
+msgstr "Número de colunas para caixas de texto CHAR/VARCHAR"

 #: libraries/config/messages.inc.php:35
 msgid "CHAR textarea columns"
@ -2962,10 +2976,9 @@ msgid "SQL compatibility mode"
 msgstr "Modo de compatibilidade SQL"

 #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176
-#, fuzzy
 #| msgid "<code>@TABLE@</code>"
 msgid "<code>CREATE TABLE</code> options:"
-msgstr "<code>@TABLE@</code>"
+msgstr "<code>CRIAR TABELA</code> opções:"

 #: libraries/config/messages.inc.php:123
 msgid "Creation/Update/Check dates"
@ -3174,10 +3187,9 @@ msgid "Settings that didn't fit enywhere else"
 msgstr ""

 #: libraries/config/messages.inc.php:192
-#, fuzzy
 #| msgid "Page number:"
 msgid "Page titles"
-msgstr "Numero da página:"
+msgstr "Títulos das páginas"

 #: libraries/config/messages.inc.php:193
 msgid ""
@ -3213,14 +3225,12 @@ msgid "Basic settings"
 msgstr "Configurações básicas"

 #: libraries/config/messages.inc.php:199
-#, fuzzy
 msgid "Authentication"
-msgstr "Autenticando..."
+msgstr "Autenticação"

 #: libraries/config/messages.inc.php:200
-#, fuzzy
 msgid "Authentication settings"
-msgstr "Autenticando..."
+msgstr "Configurações de autenticação"

 #: libraries/config/messages.inc.php:201
 msgid "Server configuration"
@ -3477,10 +3487,9 @@ msgid "Display servers selection"
 msgstr ""

 #: libraries/config/messages.inc.php:272
-#, fuzzy
 #| msgid "The number of tables that are open."
 msgid "Minimum number of tables to display the table filter box"
-msgstr "O número de tabelas que estão abertas."
+msgstr "Número mínimo de tabelas para mostrar a caixa de filtro de tabelas"

 #: libraries/config/messages.inc.php:273
 msgid "String that separates databases into different tree levels"
@ -3897,9 +3906,8 @@ msgid "SweKey config file"
 msgstr ""

 #: libraries/config/messages.inc.php:369
-#, fuzzy
 msgid "Authentication method to use"
-msgstr "Autenticando..."
+msgstr "Método de autenticação para usar"

 #: libraries/config/messages.inc.php:370 setup/frames/index.inc.php:126
 msgid "Authentication type"
@ -4701,10 +4709,9 @@ msgid "Events"
 msgstr "Eventos"

 #: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no events to display."
-msgstr "Não existem arquivos para fazer upload"
+msgstr "Não existem eventos para serem mostrados"

 #: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:661
 #: libraries/db_routines.lib.php:807 libraries/db_routines.lib.php:1156
@ -4770,10 +4777,9 @@ msgid "Triggers"
 msgstr "Gatilhos"

 #: libraries/db_routines.lib.php:630
-#, fuzzy
 #| msgid "Details..."
 msgid "Details"
-msgstr "Detalhes..."
+msgstr "Detalhes"

 #: libraries/db_routines.lib.php:633
 #, fuzzy
@ -4912,10 +4918,9 @@ msgid "You must provide a routine definition."
 msgstr ""

 #: libraries/db_routines.lib.php:1151
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no routines to display."
-msgstr "Não existem arquivos para fazer upload"
+msgstr "Não existem rotinas para mostrar."

 #: libraries/db_routines.lib.php:1192
 #, fuzzy
@ -4924,10 +4929,9 @@ msgid "Add routine"
 msgstr "Adicionar índice"

 #: libraries/db_routines.lib.php:1195
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a new routine"
-msgstr "Você não tem direitos suficientes para estar aqui agora!"
+msgstr "Você não tem direitos suficientes para criar uma nova rotina"

 #: libraries/db_structure.lib.php:43 libraries/display_tbl.lib.php:2084
 msgid ""
@ -5012,10 +5016,9 @@ msgid "Could not load export plugins, please check your installation!"
 msgstr "Não pode carregar exportação dos plugins, verifique sua instalação!"

 #: libraries/display_export.lib.php:80
-#, fuzzy
 #| msgid "Allows locking tables for the current thread."
 msgid "Exporting databases from the current server"
-msgstr "Permitir bloquear tabelas para a processo atual."
+msgstr "Exportar bancos de dados do servidor atual"

 #: libraries/display_export.lib.php:82
 #, fuzzy, php-format
@ -5033,7 +5036,7 @@ msgstr "Criar nova tabela no Banco de Dados %s"
 #, fuzzy
 #| msgid "Export type"
 msgid "Export Method:"
-msgstr "Tipo de exportação"
+msgstr "Método de exportação:"

 #: libraries/display_export.lib.php:106
 msgid "Quick - display only the minimal options"
@ -5061,10 +5064,9 @@ msgid "Dump some row(s)"
 msgstr ""

 #: libraries/display_export.lib.php:152
-#, fuzzy
 #| msgid "Number of fields"
 msgid "Number of rows:"
-msgstr "Número de arquivos"
+msgstr "Número de linhas:"

 #: libraries/display_export.lib.php:155
 msgid "Row to begin at:"
@ -5091,10 +5093,9 @@ msgid "Save output to a file"
 msgstr "Enviado"

 #: libraries/display_export.lib.php:220
-#, fuzzy
 #| msgid "File name template"
 msgid "File name template:"
-msgstr "Nome do arquivo do modelo"
+msgstr "Nome do arquivo do modelo:"

 #: libraries/display_export.lib.php:222
 msgid "@SERVER@ will become the server name"
@ -5130,13 +5131,12 @@ msgstr ""
 #: libraries/display_export.lib.php:274 libraries/display_import.lib.php:188
 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:463
 msgid "Character set of the file:"
-msgstr "Conjunto de caracteres do arquivo"
+msgstr "Conjunto de caracteres do arquivo:"

 #: libraries/display_export.lib.php:304
-#, fuzzy
 #| msgid "Compression"
 msgid "Compression:"
-msgstr "Compressão"
+msgstr "Compressão:"

 #: libraries/display_export.lib.php:306 libraries/display_tbl.lib.php:564
 #: libraries/export/sql.php:1058 libraries/tbl_properties.inc.php:562
@ -5170,16 +5170,14 @@ msgstr "Enviado"

 #: libraries/display_export.lib.php:326 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:38
-#, fuzzy
 #| msgid "Format"
 msgid "Format:"
-msgstr "Formato"
+msgstr "Formato:"

 #: libraries/display_export.lib.php:331
-#, fuzzy
 #| msgid "Transformation options"
 msgid "Format-specific options:"
-msgstr "Opções de transformação"
+msgstr "Opções de formato especifico:"

 #: libraries/display_export.lib.php:332
 msgid ""
@ -5188,9 +5186,8 @@ msgid ""
 msgstr ""

 #: libraries/display_export.lib.php:340 libraries/display_import.lib.php:260
-#, fuzzy
 msgid "Encoding Conversion:"
-msgstr "Versão do cliente MySQL"
+msgstr "Codificação de conversão:"

 #: libraries/display_import.lib.php:66
 msgid ""
@ -5226,10 +5223,9 @@ msgid "Importing into the table \"%s\""
 msgstr "Sem bases"

 #: libraries/display_import.lib.php:139
-#, fuzzy
 #| msgid "File to import"
 msgid "File to Import:"
-msgstr "Arquivo para importar"
+msgstr "Arquivo para importar:"

 #: libraries/display_import.lib.php:156
 #, php-format
@ -5247,10 +5243,9 @@ msgid "File uploads are not allowed on this server."
 msgstr "Não é permitido subir arquivos neste servidor."

 #: libraries/display_import.lib.php:208
-#, fuzzy
 #| msgid "Partial import"
 msgid "Partial Import:"
-msgstr "Importação parcial"
+msgstr "Importação parcial:"

 #: libraries/display_import.lib.php:214
 #, php-format
@ -5261,7 +5256,6 @@ msgstr ""
 "continuar na posição %d."

 #: libraries/display_import.lib.php:221
-#, fuzzy
 #| msgid ""
 #| "Allow the interruption of an import in case the script detects it is "
 #| "close to the PHP timeout limit. This might be good way to import large "
@ -5276,10 +5270,9 @@ msgstr ""
 "grandes, entretanto isso pode interromper as transações."

 #: libraries/display_import.lib.php:228
-#, fuzzy
 #| msgid "Number of records (queries) to skip from start"
 msgid "Number of rows to skip, starting from the first row:"
-msgstr "Número de registros (consultas) ignoradas no início"
+msgstr "Número de registros para pular, iniciando da primeira linha:"

 #: libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
@ -5475,13 +5468,13 @@ msgstr ""
 #, fuzzy, php-format
 #| msgid "No valid image path for theme %s found!"
 msgid "No trigger with name %s found"
-msgstr "Encontrado caminho inválido para imagens para o tema %s!"
+msgstr "Nenhum trigger com o nome %s encontrado"

 #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no triggers to display."
-msgstr "Não existem arquivos para fazer upload"
+msgstr "Não existem triggers para mostrar"

 #: libraries/display_triggers.inc.php:77 server_status.php:800 sql.php:943
 msgid "Time"
@ -5916,47 +5909,42 @@ msgid "The PrimeBase Media Streaming (PBMS) home page"
 msgstr ""

 #: libraries/export/csv.php:24 libraries/import/csv.php:28
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Columns separated with:"
-msgstr "Linhas terminadas por"
+msgstr "Colunas separadas com:"

 #: libraries/export/csv.php:25 libraries/import/csv.php:29
-#, fuzzy
 #| msgid "Fields enclosed by"
 msgid "Columns enclosed with:"
-msgstr "Campos delimitados por"
+msgstr "Colunas delimitadas por:"

 #: libraries/export/csv.php:26 libraries/import/csv.php:30
 #, fuzzy
 #| msgid "Fields escaped by"
 msgid "Columns escaped with:"
-msgstr "Campos contornados por"
+msgstr "Campos pulados por:"

 #: libraries/export/csv.php:27 libraries/import/csv.php:31
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Lines terminated with:"
-msgstr "Linhas terminadas por"
+msgstr "Linhas terminadas com:"

 #: libraries/export/csv.php:28 libraries/export/excel.php:23
 #: libraries/export/htmlword.php:29 libraries/export/latex.php:80
 #: libraries/export/ods.php:24 libraries/export/odt.php:60
 #: libraries/export/xls.php:24 libraries/export/xlsx.php:24
-#, fuzzy
 #| msgid "Replace NULL by"
 msgid "Replace NULL with:"
-msgstr "Substituir NULL por"
+msgstr "Substituir NULL com:"

 #: libraries/export/csv.php:29 libraries/export/excel.php:24
 msgid "Remove carriage return/line feed characters within columns"
 msgstr ""

 #: libraries/export/excel.php:33
-#, fuzzy
 #| msgid "Excel edition"
 msgid "Excel edition:"
-msgstr "Edição do Excel"
+msgstr "Edição do Excel:"

 #: libraries/export/htmlword.php:28 libraries/export/latex.php:70
 #: libraries/export/odt.php:56 libraries/export/sql.php:208
@ -6062,10 +6050,9 @@ msgid "(Generates a report containing the data of a single table)"
 msgstr "(Gerado um relatório contendo dados da tabela simples)"

 #: libraries/export/pdf.php:25
-#, fuzzy
 #| msgid "Report title"
 msgid "Report title:"
-msgstr "Título do Relatório"
+msgstr "Título do Relatório:"

 #: libraries/export/php_array.php:18
 msgid "PHP array"
@ -6081,7 +6068,9 @@ msgstr ""
 #, fuzzy
 #| msgid "Add custom comment into header (\\n splits lines)"
 msgid "Additional custom header comment (\\n splits lines):"
-msgstr "Adicionar comentário pessoal no cabeçalho (\\n quebra linhas)"
+msgstr ""
+"Adicionar comentário pessoal no cabeçalho (\n"
+" quebra linhas)"

 #: libraries/export/sql.php:48
 msgid ""
@ -6102,10 +6091,9 @@ msgid "Add %s statement"
 msgstr "Comandos"

 #: libraries/export/sql.php:145
-#, fuzzy
 #| msgid "Statements"
 msgid "Add statements:"
-msgstr "Comandos"
+msgstr "Adicionar instruções:"

 #: libraries/export/sql.php:197
 msgid ""
@ -6348,7 +6336,6 @@ msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>"
 msgstr ""

 #: libraries/import/sql.php:33
-#, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "Modo de compatibilidade SQL"
@ -6411,7 +6398,7 @@ msgstr "Conjunto de caracteres"
 #: libraries/mysql_charsets.lib.php:198 libraries/mysql_charsets.lib.php:399
 #: tbl_change.php:556
 msgid "Binary"
-msgstr " Binário "
+msgstr " Binário"

 #: libraries/mysql_charsets.lib.php:210
 msgid "Bulgarian"
@ -6850,7 +6837,6 @@ msgid "Create a page"
 msgstr "Criar uma nova página"

 #: libraries/schema/User_Schema.class.php:95
-#, fuzzy
 #| msgid "Page number:"
 msgid "Page name"
 msgstr "Numero da página:"
@ -6907,7 +6893,7 @@ msgstr "Mostrar dimensão das tabelas"

 #: libraries/schema/User_Schema.class.php:380
 msgid "Display all tables with the same width"
-msgstr "mostrar todas as tabelas com o mesmo tamanho?"
+msgstr "Mostrar todas as tabelas com o mesmo tamanho"

 #: libraries/schema/User_Schema.class.php:385
 msgid "Only show keys"
@ -7272,7 +7258,6 @@ msgid "+ Add a value"
 msgstr "+ Adicionar um valor"

 #: libraries/transformations/application_octetstream__download.inc.php:9
-#, fuzzy
 #| msgid ""
 #| "Displays a link to download the binary data of the field. You can use the "
 #| "first option to specify the filename, or use the second option as the "
@ -7284,10 +7269,11 @@ msgid ""
 "of a column which contains the filename. If you use the second option, you "
 "need to set the first option to the empty string."
 msgstr ""
-"Mostrar o link para baixar os dados binários do campo. Primeira opção é o "
-"nome do arquivo binário. Segunda opção é um possível nome de campo de uma "
-"linha da tabela que contém o nome do arquivo. Se você usar a segunda opção "
-"precisa colocar na primeira opção uma string em branco"
+"Mostrar um link para baixar os dados binários da coluna. Você pode usar a "
+"primeira opção para especificar o nome do arquivo, ou usar a segunda opção "
+"como o nome de uma coluna que contém o nome do arquivo. Se você usar a "
+"segunda opção, você precisará primeiro de configurar a primeira opção para a "
+"string vazia."

 #: libraries/transformations/application_octetstream__hex.inc.php:9
 msgid ""
@ -7304,8 +7290,8 @@ msgid ""
 "Displays a clickable thumbnail. The options are the maximum width and height "
 "in pixels. The original aspect ratio is preserved."
 msgstr ""
-"Mostrar uma miniatura clicável; opções: largura,altura em pixels (mantém a "
-"proporção original)"
+"Mostrar uma miniatura clicável; As opções são a largura e altura máxima em "
+"pixels."

 #: libraries/transformations/image_jpeg__link.inc.php:9
 msgid "Displays a link to download this image."
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@ -108,6 +108,10 @@ if (isset($_REQUEST['do_save_data'])) {
        require './tbl_structure.php';
        exit;
    } else {
+        if( $GLOBALS['is_ajax_request'] == true) {
+            $extra_data['error'] = $error;
+            PMA_ajaxResponse($error,false);
+        }
        $error->display();
    }
 } // end builds the new index
@ -158,7 +162,7 @@ if (isset($_REQUEST['create_index'])) {

 echo PMA_generate_common_hidden_inputs($form_params);
 ?>
-<fieldset>
+<fieldset id="index_edit_fields">
    <legend>
 <?php
 if (isset($_REQUEST['create_index'])) {
@ -179,7 +183,7 @@ PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b>

 <div class="formelement">
 <label for="select_index_type"><?php echo __('Index type:'); ?></label>
-<select name="index[Index_type]" id="select_index_type" onchange="return checkIndexName()">
+<select name="index[Index_type]" id="select_index_type" >
    <?php echo $index->generateIndexSelector(); ?>
 </select>
 <?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?>
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@ -969,15 +969,12 @@ h3#serverstatusqueries span {
    display:inline;
 }

-table#serverstatusqueriesdetails th img.sortableIcon, table#serverstatusvariables th img.sortableIcon {
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png);
-}
-table#serverstatusqueriesdetails th.headerSortUp img.sortableIcon, table#serverstatusvariables th.headerSortUp img.sortableIcon {
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
-}
-table#serverstatusqueriesdetails th.headerSortDown img.sortableIcon, table#serverstatusvariables th.headerSortDown img.sortableIcon {
+th.headerSortUp img.sortableIcon, th.headerSortUp img.sortableIcon {
    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_desc.png);
 }
+th.headerSortDown img.sortableIcon, th.headerSortDown img.sortableIcon {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
+}

 .statuslinks {
    float: <?php echo $right; ?>;
@ -993,7 +990,7 @@ div#serverStatusTabs {
    margin-top:1em;
 }

-div#serverstatus table caption a.top {
+caption a.top {
    float: <?php echo $right; ?>;
 }

--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@ -1175,12 +1175,15 @@ h3#serverstatusqueries span {
    display:inline;
 }

-table#serverstatusqueriesdetails th.headerSortUp img.sortableIcon, table#serverstatusvariables th.headerSortUp img.sortableIcon {
-    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
+th img.sortableIcon, th img.sortableIcon {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png);
 }
-table#serverstatusqueriesdetails th.headerSortDown img.sortableIcon, table#serverstatusvariables th.headerSortDown img.sortableIcon {
+th.headerSortUp img.sortableIcon, th.headerSortUp img.sortableIcon {
    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_desc.png);
 }
+th.headerSortDown img.sortableIcon, th.headerSortDown img.sortableIcon {
+    background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
+}

 .statuslinks {
    float: <?php echo $right; ?>;
@ -1196,7 +1199,7 @@ div#serverStatusTabs {
    margin-top:1em;
 }

-div#serverstatus table caption a.top {
+caption a.top {
    float: <?php echo $right; ?>;
 }

--- a/themes/pmahomme/img/s_sortable.png
+++ b/themes/pmahomme/img/s_sortable.png