Merge remote branch 'phpmyadmin/master'

2026-10-29 21:24:44 +03:00 · 2011-07-10 08:13:46 +05:30
parent c520c098ad 1962e36e33
commit ea171beebe
19 changed files with 316 additions and 388 deletions
--- a/1
+++ b/1
@@ -34,6 +34,7 @@ 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

 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
--- 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/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/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
@@ -179,6 +179,7 @@ $(document).ready(function() {
                        height: 230,
                        width: 900,
                        open: PMA_verifyTypeOfAllColumns,
+                        modal: true,
                        buttons : button_options_error
                    })// end dialog options
                } else {
@@ -189,6 +190,7 @@ $(document).ready(function() {
                        height: 600,
                        width: 900,
                        open: PMA_verifyTypeOfAllColumns,
+                        modal: true,
                        buttons : button_options
                    })
                    //Remove the top menu container from the dialog
@@ -269,10 +271,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 +287,7 @@ $(document).ready(function() {
                    height: 230,
                    width: 900,
                    open: PMA_verifyTypeOfAllColumns,
+                    modal: true,
                    buttons : button_options_error
                })// end dialog options
            } else {
@@ -295,16 +298,18 @@ $(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()
    });
-
+    
    /**
     *Ajax action for submiting the index form
    **/
@@ -337,8 +342,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 +371,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"

@@ -390,6 +401,6 @@ $(document).ready(function() {
             return false;
        });
    } //end show/hide table index
-
+    

 }) // end $(document).ready()
--- 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/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/bg.po
+++ b/po/bg.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-07-07 14:31+0200\n"
+"PO-Revision-Date: 2011-07-07 16:45+0200\n"
 "Last-Translator:  <stoyanster@gmail.com>\n"
 "Language-Team: bulgarian <bg@li.org>\n"
 "Language: bg\n"
@@ -3359,7 +3359,7 @@ 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"
@@ -5080,11 +5080,11 @@ msgstr "Щракване за сортиране"

 #: libraries/display_tbl.lib.php:419
 msgid "Click to mark/unmark"
-msgstr ""
+msgstr "Щракване за маркиране/отмаркиране"

 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
-msgstr ""
+msgstr "Щракнете стрелката,<br/>за да изберете колони"

 #: libraries/display_tbl.lib.php:431
 #, php-format
@@ -5093,7 +5093,7 @@ msgstr "%d не е валиден номер на ред."

 #: libraries/display_tbl.lib.php:436
 msgid "Start row"
-msgstr ""
+msgstr "Начален ред"

 #: libraries/display_tbl.lib.php:438
 msgid "Number of rows"
@@ -5118,7 +5118,7 @@ msgstr "вертикален"
 #: libraries/display_tbl.lib.php:452
 #, php-format
 msgid "Headers every %s rows"
-msgstr ""
+msgstr "Заглавки всеки %s реда"

 #: libraries/display_tbl.lib.php:546
 msgid "Sort by key"
@@ -5155,7 +5155,7 @@ msgstr "Браузърна трансформация"

 #: libraries/display_tbl.lib.php:650
 msgid "Geometry"
-msgstr ""
+msgstr "Геометрия"

 #: libraries/display_tbl.lib.php:651
 msgid "Well Known Text"
@@ -5209,7 +5209,7 @@ msgstr "Показване на диаграма"

 #: libraries/display_tbl.lib.php:2509
 msgid "Visualize GIS data"
-msgstr ""
+msgstr "Визуализиране на GIS данни"

 #: libraries/display_tbl.lib.php:2529
 msgid "Create view"
@@ -5256,11 +5256,11 @@ msgstr "Весия"

 #: libraries/engines/innodb.lib.php:20
 msgid "Data home directory"
-msgstr ""
+msgstr "Папка с данни"

 #: libraries/engines/innodb.lib.php:21
 msgid "The common part of the directory path for all InnoDB data files."
-msgstr ""
+msgstr "Общата част от пътя до папката с всички InnoDB файлове."

 #: libraries/engines/innodb.lib.php:24
 msgid "Data files"
@@ -5304,11 +5304,11 @@ msgstr "страници"

 #: libraries/engines/innodb.lib.php:170
 msgid "Free pages"
-msgstr ""
+msgstr "Свободни страници"

 #: libraries/engines/innodb.lib.php:176
 msgid "Dirty pages"
-msgstr ""
+msgstr "Мръсни страници"

 #: libraries/engines/innodb.lib.php:182
 msgid "Pages containing data"
@@ -5316,15 +5316,15 @@ msgstr "Страници съдържащи данни"

 #: libraries/engines/innodb.lib.php:188
 msgid "Pages to be flushed"
-msgstr ""
+msgstr "Страници за изчистване"

 #: libraries/engines/innodb.lib.php:194
 msgid "Busy pages"
-msgstr ""
+msgstr "Заети страници"

 #: libraries/engines/innodb.lib.php:203
 msgid "Latched pages"
-msgstr ""
+msgstr "Заключени страници"

 #: libraries/engines/innodb.lib.php:214
 msgid "Buffer Pool Activity"
@@ -5332,27 +5332,27 @@ msgstr ""

 #: libraries/engines/innodb.lib.php:218
 msgid "Read requests"
-msgstr ""
+msgstr "Заявки за четене"

 #: libraries/engines/innodb.lib.php:224
 msgid "Write requests"
-msgstr ""
+msgstr "Заявки за запис"

 #: libraries/engines/innodb.lib.php:230
 msgid "Read misses"
-msgstr ""
+msgstr "Пропуснати прочитания"

 #: libraries/engines/innodb.lib.php:236
 msgid "Write waits"
-msgstr ""
+msgstr "Изчаквания за запис"

 #: libraries/engines/innodb.lib.php:242
 msgid "Read misses in %"
-msgstr ""
+msgstr "Пропуснати прочитания в %"

 #: libraries/engines/innodb.lib.php:250
 msgid "Write waits in %"
-msgstr ""
+msgstr "Изчаквания за запис в %"

 #: libraries/engines/myisam.lib.php:22
 msgid "Data pointer size"
@@ -5479,7 +5479,7 @@ msgstr ""

 #: libraries/engines/pbms.lib.php:60
 msgid "Metadata Headers"
-msgstr ""
+msgstr "Заглавки на метаданните"

 #: libraries/engines/pbms.lib.php:61
 msgid ""
@@ -5508,7 +5508,7 @@ msgstr ""

 #: libraries/engines/pbxt.lib.php:22
 msgid "Index cache size"
-msgstr ""
+msgstr "Размер на буфера за индекси"

 #: libraries/engines/pbxt.lib.php:23
 msgid ""
@@ -5518,7 +5518,7 @@ msgstr ""

 #: libraries/engines/pbxt.lib.php:27
 msgid "Record cache size"
-msgstr ""
+msgstr "Размер на буфера за записи"

 #: libraries/engines/pbxt.lib.php:28
 msgid ""
@@ -5529,7 +5529,7 @@ msgstr ""

 #: libraries/engines/pbxt.lib.php:32
 msgid "Log cache size"
-msgstr ""
+msgstr "Размер на буфера на дневника"

 #: libraries/engines/pbxt.lib.php:33
 msgid ""
@@ -7126,7 +7126,7 @@ msgstr "Принос"

 #: main.php:218
 msgid "Get support"
-msgstr ""
+msgstr "Получаване на помощ"

 #: main.php:219
 msgid "List of changes"
@@ -7727,8 +7727,7 @@ msgstr "Няма ефект в тази версия на MySQL."
 #: server_privileges.php:559
 msgid "Allows reloading server settings and flushing the server's caches."
 msgstr ""
-"Позволява презареждане на сървърните настройки и изчистване на кеша на "
-"сървъра."
+"Позволява презареждане на настройките и изчистване на буфера на сървъра."

 #: server_privileges.php:58 server_privileges.php:208
 #: server_privileges.php:566
@@ -7767,9 +7766,9 @@ msgid ""
 "required for most administrative operations like setting global variables or "
 "killing threads of other users."
 msgstr ""
-"Позволява конектвне, дори ако е достигнат максималния брой на конекциите; "
-"Изисква се за повечето административни операции, като установяване на "
-"глобални променливи или спиране на нишка на други потребители."
+"Позволява връзка, дори ако е достигнат максималния брой на връзка; Изисква "
+"се за повечето административни операции, като установяване на глобални "
+"променливи или спиране на нишка на други потребители."

 #: server_privileges.php:65 server_privileges.php:211
 #: server_privileges.php:549
@@ -8217,7 +8216,7 @@ msgstr ""

 #: server_status.php:264
 msgid "Query cache"
-msgstr "Кеш на заявките"
+msgstr "Буфер за заявки"

 #: server_status.php:265
 msgid "Threads"
@@ -8233,7 +8232,7 @@ msgstr "Забавени вмъквания"

 #: server_status.php:269
 msgid "Key cache"
-msgstr "Кеш на ключове"
+msgstr "Буфер за ключове"

 #: server_status.php:270
 msgid "Joins"
@@ -8265,7 +8264,7 @@ msgstr ""

 #: server_status.php:303
 msgid "Flush query cache"
-msgstr ""
+msgstr "Изчистване на буфера за заявки"

 #: server_status.php:396
 msgid "Runtime Information"
@@ -8289,11 +8288,11 @@ msgstr "Съдържащ думата:"

 #: server_status.php:467
 msgid "Show only alert values"
-msgstr ""
+msgstr "Само тревожни стойности"

 #: server_status.php:471
 msgid "Filter by category..."
-msgstr ""
+msgstr "Филтър по категория..."

 #: server_status.php:484
 msgid "Related links:"
@@ -8324,12 +8323,12 @@ msgstr "№"
 #: server_status.php:625
 #, php-format
 msgid "Network traffic since startup: %s"
-msgstr ""
+msgstr "Мрежови трафик от включването: %s"

 #: server_status.php:633
 #, php-format
 msgid "This MySQL server has been running for %s. It started up on %s."
-msgstr "Този MySQL сървър работи от %s. Стартиран е на %s."
+msgstr "Този MySQL сървър работи от %s. Включен е на %s."

 #: server_status.php:643
 msgid ""
@@ -8379,7 +8378,7 @@ msgstr "Конекции"

 #: server_status.php:727
 msgid "max. concurrent connections"
-msgstr "максимален брой на едновременните конекции"
+msgstr "максимален брой на едновременните връзки"

 #: server_status.php:734
 msgid "Failed attempts"
@@ -8423,7 +8422,7 @@ msgstr ""

 #: server_status.php:861
 msgid "How many temporary files mysqld has created."
-msgstr "Брой на създадените от mysqld временни файлове."
+msgstr "Броят създадени от mysqld временни файлове."

 #: server_status.php:862
 msgid ""
@@ -8445,7 +8444,7 @@ msgstr ""

 #: server_status.php:865
 msgid "The number of INSERT DELAYED rows written."
-msgstr "Брой на вмъкнатите посредством INSERT DELAYED редове."
+msgstr "Броят вмъкнати посредством INSERT DELAYED редове."

 #: server_status.php:866
 msgid "The number of executed FLUSH statements."
@@ -8700,7 +8699,7 @@ msgstr ""

 #: server_status.php:918
 msgid "The number of rows deleted from InnoDB tables."
-msgstr ""
+msgstr "Броят изтрити редове от InnoDB таблици."

 #: server_status.php:919
 msgid "The number of rows inserted in InnoDB tables."
@@ -8708,7 +8707,7 @@ msgstr "Броят вмъкнати редове в InnoDB таблици."

 #: server_status.php:920
 msgid "The number of rows read from InnoDB tables."
-msgstr ""
+msgstr "Броят прочетени редове от InnoDB таблици."

 #: server_status.php:921
 msgid "The number of rows updated in InnoDB tables."
@@ -8777,15 +8776,15 @@ msgstr ""

 #: server_status.php:933
 msgid "The number of files that are open."
-msgstr "Брой на отворените файлове."
+msgstr "Броят отворени файлове."

 #: server_status.php:934
 msgid "The number of streams that are open (used mainly for logging)."
-msgstr "Брой на отворените потоци (използва се главно за логове)."
+msgstr "Броят отворени потоци (използва се главно за дневници)."

 #: server_status.php:935
 msgid "The number of tables that are open."
-msgstr "Брой на отвотените таблици."
+msgstr "Броят отворени таблици."

 #: server_status.php:936
 msgid ""
@@ -8796,7 +8795,7 @@ msgstr ""

 #: server_status.php:937
 msgid "The amount of free memory for query cache."
-msgstr ""
+msgstr "Количеството свободна памет за буфер за заявки."

 #: server_status.php:938
 msgid "The number of cache hits."
@@ -8804,7 +8803,7 @@ msgstr "Броят попадения в кеш."

 #: server_status.php:939
 msgid "The number of queries added to the cache."
-msgstr ""
+msgstr "Броят заявки добавени към буфера."

 #: server_status.php:940
 msgid ""
@@ -8822,11 +8821,11 @@ msgstr ""

 #: server_status.php:942
 msgid "The number of queries registered in the cache."
-msgstr ""
+msgstr "Броят заявки регистрирани в буфера."

 #: server_status.php:943
 msgid "The total number of blocks in the query cache."
-msgstr ""
+msgstr "Общият брой блокове в буфера за заявки."

 #: server_status.php:944
 msgid "The status of failsafe replication (not yet implemented)."
@@ -8896,7 +8895,7 @@ msgstr ""

 #: server_status.php:957
 msgid "The number of sorted rows."
-msgstr "Брой на сортираните редове."
+msgstr "Броят сортирани редове."

 #: server_status.php:958
 msgid "The number of sorts that were done by scanning the table."
@@ -8953,79 +8952,79 @@ msgstr ""

 #: server_synchronize.php:261
 msgid "Structure Synchronization"
-msgstr ""
+msgstr "Синхронизиране на структурата"

 #: server_synchronize.php:266
 msgid "Data Synchronization"
-msgstr ""
+msgstr "Синхронизиране на данните"

 #: server_synchronize.php:395 server_synchronize.php:834
 msgid "not present"
-msgstr ""
+msgstr "не съществува"

 #: server_synchronize.php:419 server_synchronize.php:862
 msgid "Structure Difference"
-msgstr ""
+msgstr "Структурни различия"

 #: server_synchronize.php:420 server_synchronize.php:863
 msgid "Data Difference"
-msgstr ""
+msgstr "Различия в данните"

 #: server_synchronize.php:425 server_synchronize.php:868
 msgid "Add column(s)"
-msgstr ""
+msgstr "Добавяне на колона(и)"

 #: server_synchronize.php:426 server_synchronize.php:869
 msgid "Remove column(s)"
-msgstr ""
+msgstr "Изтриване на колона(и)"

 #: server_synchronize.php:427 server_synchronize.php:870
 msgid "Alter column(s)"
-msgstr ""
+msgstr "Промяна на колона(и)"

 #: server_synchronize.php:428 server_synchronize.php:871
 msgid "Remove index(s)"
-msgstr ""
+msgstr "Изтриване на индекс(и)"

 #: server_synchronize.php:429 server_synchronize.php:872
 msgid "Apply index(s)"
-msgstr ""
+msgstr "Добавяне на индекс(и)"

 #: server_synchronize.php:430 server_synchronize.php:873
 msgid "Update row(s)"
-msgstr ""
+msgstr "Обновяване на ред(ове)"

 #: server_synchronize.php:431 server_synchronize.php:874
 msgid "Insert row(s)"
-msgstr ""
+msgstr "Вмъкване на ред(ове)"

 #: server_synchronize.php:441 server_synchronize.php:885
 msgid "Would you like to delete all the previous rows from target tables?"
-msgstr ""
+msgstr "Да бъде ли изтрито предишното съдържание на таблиците?"

 #: server_synchronize.php:444 server_synchronize.php:889
 msgid "Apply Selected Changes"
-msgstr ""
+msgstr "Прилагане на избраните промените"

 #: server_synchronize.php:446 server_synchronize.php:891
 msgid "Synchronize Databases"
-msgstr ""
+msgstr "Синхронизиране на БД"

 #: server_synchronize.php:459
 msgid "Selected target tables have been synchronized with source tables."
-msgstr ""
+msgstr "Избраните целеви таблици бяха синхронизирани с изходните."

 #: server_synchronize.php:937
 msgid "Target database has been synchronized with source database"
-msgstr ""
+msgstr "Целевата БД беше синхронизирана с изходната"

 #: server_synchronize.php:998
 msgid "The following queries have been executed:"
-msgstr ""
+msgstr "Следните заявки бяха изпълнени:"

 #: server_synchronize.php:1126
 msgid "Enter manually"
-msgstr ""
+msgstr "Ръчно въвеждане"

 #: server_synchronize.php:1134
 msgid "Current connection"
@@ -9034,11 +9033,11 @@ msgstr "Текуща връзка"
 #: server_synchronize.php:1163
 #, php-format
 msgid "Configuration: %s"
-msgstr ""
+msgstr "Настройка: %s"

 #: server_synchronize.php:1178
 msgid "Socket"
-msgstr ""
+msgstr "Сокет"

 #: server_synchronize.php:1224
 msgid ""
--- 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-08 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,30 +2612,33 @@ 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 ""
@@ -2657,11 +2667,11 @@ msgstr ""

 #: 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 ""
--- a/po/de.po
+++ b/po/de.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-07-03 20:12+0200\n"
+"PO-Revision-Date: 2011-07-08 00:00+0200\n"
 "Last-Translator:  <mrbendig@mrbendig.com>\n"
 "Language-Team: german <de@li.org>\n"
 "Language: de\n"
@@ -1293,16 +1293,14 @@ msgid "Insert Table"
 msgstr "Tabelle einfügen"

 #: js/messages.php:113
-#, fuzzy
 #| msgid "Add index"
 msgid "Hide indexes"
-msgstr "Index hinzufügen"
+msgstr "Indexes verbergen"

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

 #: js/messages.php:117
 msgid "Searching"
@@ -4348,12 +4346,13 @@ msgid ""
 "Defines whether or not type display direction option is shown when browsing "
 "a table"
 msgstr ""
+"Legt fest, ob die Typen-Anzeige-Richtungs-Option gezeigt wird, beim "
+"durchsuchen einer Tabelle"

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

 #: libraries/config/messages.inc.php:455
 msgid ""
@@ -5324,6 +5323,8 @@ msgstr "Klicken zum aus- bzw. abwählen"
 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
 msgstr ""
+"Den Pfeil des AUfklappsmenüs anklicken<br />um die Sichtbarkeit der Spalte "
+"umzustellen"

 #: libraries/display_tbl.lib.php:431
 #, php-format
@@ -5331,22 +5332,19 @@ msgid "%d is not valid row number."
 msgstr "%d ist keine gültige Zeilennummer."

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

 #: libraries/display_tbl.lib.php:438
-#, fuzzy
 #| msgid "Number of rows:"
 msgid "Number of rows"
-msgstr "Anzahl der Zeilen:"
+msgstr "Anzahl der Datensätze:"

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

 #: libraries/display_tbl.lib.php:445
 msgid "horizontal"
@@ -5363,7 +5361,7 @@ msgstr "nebeneinander"
 #: libraries/display_tbl.lib.php:452
 #, php-format
 msgid "Headers every %s rows"
-msgstr ""
+msgstr "Kopfzeilen alle %s Datensätze"

 #: libraries/display_tbl.lib.php:546
 msgid "Sort by key"
--- a/po/es.po
+++ b/po/es.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-07 15:16+0200\n"
-"PO-Revision-Date: 2011-06-28 22:53+0200\n"
+"PO-Revision-Date: 2011-07-07 16:22+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
 "Language: es\n"
@@ -1295,16 +1295,14 @@ msgid "Insert Table"
 msgstr "Insertar tablas"

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

 #: js/messages.php:114
-#, fuzzy
 #| msgid "Show grid"
 msgid "Show indexes"
-msgstr "Mostrar la cuadrícula"
+msgstr "Mostrar índices"

 #: js/messages.php:117
 msgid "Searching"
@@ -4377,12 +4375,13 @@ msgid ""
 "Defines whether or not type display direction option is shown when browsing "
 "a table"
 msgstr ""
+"Define si se muestra la opción sobre el tipo de dirección de la "
+"visualización al examinar una tabla"

 #: libraries/config/messages.inc.php:454
-#, fuzzy
 #| msgid "Default display direction"
 msgid "Show display direction"
-msgstr "Dirección por defecto de la visualización"
+msgstr "Mostrar dirección de visualización"

 #: libraries/config/messages.inc.php:455
 msgid ""
@@ -5363,6 +5362,8 @@ msgstr "Pulsar para marcar/desmarcar"
 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
 msgstr ""
+"Pulsa la flecha de la lista desplegable <br />para conmutar la visibilidad "
+"de la columna"

 #: libraries/display_tbl.lib.php:431
 #, php-format
@@ -5370,22 +5371,19 @@ msgid "%d is not valid row number."
 msgstr "%d no es un número de fila válido."

 #: libraries/display_tbl.lib.php:436
-#, fuzzy
 #| msgid "Textarea rows"
 msgid "Start row"
-msgstr "Filas para áreas de texto"
+msgstr "Fila de inicio"

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

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

 #: libraries/display_tbl.lib.php:445
 msgid "horizontal"
@@ -5402,7 +5400,7 @@ msgstr "vertical"
 #: libraries/display_tbl.lib.php:452
 #, php-format
 msgid "Headers every %s rows"
-msgstr ""
+msgstr "Cabeceras cada %s filas"

 #: libraries/display_tbl.lib.php:546
 msgid "Sort by key"
--- a/po/sv.po
+++ b/po/sv.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-25 01:19+0200\n"
+"PO-Revision-Date: 2011-07-07 21:24+0200\n"
 "Last-Translator:  <stefan@inkopsforum.se>\n"
 "Language-Team: swedish <sv@li.org>\n"
 "Language: sv\n"
@@ -1281,16 +1281,14 @@ msgid "Insert Table"
 msgstr "Lägg till en tabell"

 #: js/messages.php:113
-#, fuzzy
 #| msgid "Add index"
 msgid "Hide indexes"
-msgstr "Lägg till index"
+msgstr "Dölj index"

 #: js/messages.php:114
-#, fuzzy
 #| msgid "Show grid"
 msgid "Show indexes"
-msgstr "Visa rutnät"
+msgstr "Visa index"

 #: js/messages.php:117
 msgid "Searching"
@@ -4307,12 +4305,13 @@ msgid ""
 "Defines whether or not type display direction option is shown when browsing "
 "a table"
 msgstr ""
+"Definierar oavsett om typ display riktning alternativ visas när du bläddrar "
+"en tabell"

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

 #: libraries/config/messages.inc.php:455
 msgid ""
@@ -5266,7 +5265,7 @@ msgstr "Klicka för att markera/avmarkera"

 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
-msgstr ""
+msgstr "Klicka på pilen <br /> för att växla kolumnens synlighet"

 #: libraries/display_tbl.lib.php:431
 #, php-format
@@ -5274,22 +5273,19 @@ msgid "%d is not valid row number."
 msgstr "%d är inte ett giltigt radnummer."

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

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

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

 #: libraries/display_tbl.lib.php:445
 msgid "horizontal"
@@ -5306,7 +5302,7 @@ msgstr "vertikal"
 #: libraries/display_tbl.lib.php:452
 #, php-format
 msgid "Headers every %s rows"
-msgstr ""
+msgstr "Sidhuvud var %s rad"

 #: libraries/display_tbl.lib.php:546
 msgid "Sort by key"
@@ -7201,10 +7197,9 @@ msgid "PARTITION definition"
 msgstr "Partitionsdefinition"

 #: libraries/tbl_properties.inc.php:779
-#, fuzzy
 #| msgid "+ Add a new value"
 msgid "+ Add a value"
-msgstr "+ Lägg till ett nytt värde"
+msgstr "+ Lägg till ett värde"

 #: libraries/transformations/application_octetstream__download.inc.php:9
 msgid ""
--- a/po/tr.po
+++ b/po/tr.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-28 18:31+0200\n"
+"PO-Revision-Date: 2011-07-07 19:23+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
 "Language: tr\n"
@@ -1281,16 +1281,14 @@ msgid "Insert Table"
 msgstr "Tablo Ekle"

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

 #: js/messages.php:114
-#, fuzzy
 #| msgid "Show grid"
 msgid "Show indexes"
-msgstr "Izgara göster"
+msgstr "İndeksleri göster"

 #: js/messages.php:117
 msgid "Searching"
@@ -4326,12 +4324,13 @@ msgid ""
 "Defines whether or not type display direction option is shown when browsing "
 "a table"
 msgstr ""
+"Tabloya gözatılırken görüntüleme talimatı seçeneği doldurulsada "
+"doldurulmasada gösterilmesini tanımlar"

 #: libraries/config/messages.inc.php:454
-#, fuzzy
 #| msgid "Default display direction"
 msgid "Show display direction"
-msgstr "Varsayılan görüntü talimatı"
+msgstr "Görüntüleme talimatını göster"

 #: libraries/config/messages.inc.php:455
 msgid ""
@@ -5298,6 +5297,7 @@ msgstr "İşaretlemek/işareti kaldırmak için tıklayın"
 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
 msgstr ""
+"Sütunların görünürlüğünü değiştirmek<br />için aşağı açılır okuna tıklayın"

 #: libraries/display_tbl.lib.php:431
 #, php-format
@@ -5305,22 +5305,19 @@ msgid "%d is not valid row number."
 msgstr "%d geçerli bir satır sayısı değil."

 #: libraries/display_tbl.lib.php:436
-#, fuzzy
 #| msgid "Textarea rows"
 msgid "Start row"
-msgstr "Metin alanı satırları"
+msgstr "Başlangıç satırı"

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

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

 #: libraries/display_tbl.lib.php:445
 msgid "horizontal"
@@ -5337,7 +5334,7 @@ msgstr "dikey"
 #: libraries/display_tbl.lib.php:452
 #, php-format
 msgid "Headers every %s rows"
-msgstr ""
+msgstr "Her %s satırda bir başlıklar"

 #: libraries/display_tbl.lib.php:546
 msgid "Sort by key"
--- 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