diff --git a/ChangeLog b/ChangeLog
index 4df55e5fd7..b03cafbb35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/js/functions.js b/js/functions.js
index 9cdb44e751..ae5cdbad8f 100644
--- 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
diff --git a/js/indexes.js b/js/indexes.js
index ef6f877bdd..abbf4d8b49 100644
--- 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");
+    });
 });
 
 /**#@- */
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index d4ef1cdf97..49e3fe08f5 100644
--- 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()
diff --git a/po/ar.po b/po/ar.po
index 77b66a2efb..0eda1043cd 100644
--- 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"
diff --git a/po/br.po b/po/br.po
index dc306905fe..320e8b7898 100644
--- 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 ""
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 7e9bec60f2..39205f24df 100644
--- 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'); ?>
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index b4a1683b97..9acbbcbe8f 100644
--- 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; ?>;
 }
 
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 30714ad1f3..69a3b941e3 100644
--- 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; ?>;
 }
 
diff --git a/themes/pmahomme/img/s_sortable.png b/themes/pmahomme/img/s_sortable.png
index 0a341429eb..9f9950f2c7 100644
Binary files a/themes/pmahomme/img/s_sortable.png and b/themes/pmahomme/img/s_sortable.png differ