Merge branch 'MAINT_3_4_0' into QA_3_4

js/functions.js

@@ -520,7 +520,7 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
             }
         }
         //The table row css is being adjusted. Class "odd" for odd rows and "even" for even rows should be maintained.
-        for(index; index < table_rows.length; index++)
+        for(index = 0; index < table_rows.length; index++)
         {
             row_class_element = table_rows[index].getAttribute('class');
             if (row_class_element == "even") {

js/jquery/timepicker.js

@@ -30,12 +30,12 @@ $.extend($.datepicker._defaults, {
     'altTimeField': '', // Selector for an alternate field to store time into
     'hourText': 'Hour',
     'minuteText': 'Minute',
-    'secondText': 'Second',
+    'secondText': 'Second'
 });
 $.extend($.datepicker.regional[''], {
     'hourText': 'Hour',
     'minuteText': 'Minute',
-    'secondText': 'Second',
+    'secondText': 'Second'
 });
 
 /**

js/sql.js

@@ -689,14 +689,14 @@ $(document).ready(function() {
 /**
  * Starting from some th, change the class of all td under it
  */
-function PMA_changeClassForColumn($this_th, class) {
+function PMA_changeClassForColumn($this_th, klass) {
     // index 0 is the th containing the big T
     var th_index = $this_th.index();
     // .eq() is zero-based
     th_index--;
     var $tr_with_data = $this_th.closest('table').find('tbody tr ').has('td.data_inline_edit');
     $tr_with_data.each(function() {
-        $(this).find('td.data_inline_edit:eq('+th_index+')').toggleClass(class);
+        $(this).find('td.data_inline_edit:eq('+th_index+')').toggleClass(klass);
     });
 }
 

js/tbl_change.js

@@ -11,10 +11,10 @@
 /**
  * Modify from controls when the "NULL" checkbox is selected
  *
- * @param   string   the MySQL field type
+ * @param   theType     string   the MySQL field type
- * @param   string   the urlencoded field name - OBSOLETE
+ * @param   urlField    string   the urlencoded field name - OBSOLETE
- * @param   string   the md5 hashed field name
+ * @param   md5Field    string   the md5 hashed field name
- * @param   string   the multi_edit row sequence number
+ * @param   multi_edit  string   the multi_edit row sequence number
  *
  * @return  boolean  always true
  */

po/tr.po

@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-11-20 07:34-0500\n"
-"PO-Revision-Date: 2010-11-15 19:47+0200\n"
+"PO-Revision-Date: 2010-11-21 20:13+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -409,11 +409,11 @@ msgstr "Görüntülemek için en az bir sütun seçmelisiniz"
 
 #: db_qbe.php:182
 msgid "Switch to"
-msgstr ""
+msgstr "Şuna değiştir"
 
 #: db_qbe.php:186
 msgid "visual builder"
-msgstr ""
+msgstr "görsel yaratıcı"
 
 #: db_qbe.php:219 libraries/db_structure.lib.php:95
 #: libraries/display_tbl.lib.php:860
@@ -1100,7 +1100,7 @@ msgstr "Göstermek için sütun seçin"
 
 #: js/messages.php:98
 msgid "Add an option for column "
-msgstr ""
+msgstr "Sütun için bir seçenek ekle"
 
 #: js/messages.php:101
 msgid "Generate password"
@@ -2869,15 +2869,14 @@ msgid "Changes tracking"
 msgstr "Değişiklikleri izleme"
 
 #: libraries/config/messages.inc.php:202
-#, fuzzy
 #| msgid ""
 #| "Tracking of changes made in database. Requires configured PMA database."
 msgid ""
 "Tracking of changes made in database. Requires the phpMyAdmin configuration "
 "storage."
 msgstr ""
-"İzlenen değişiklikler veritabanında yapıldı. Yapılandırılmış PMA veritabanı "
+"İzlenen değişiklikler veritabanında yapıldı. phpMyAdmin yapılandırma "
-"gerekir."
+"depolaması gerekir."
 
 #: libraries/config/messages.inc.php:203
 msgid "Customize export options"
@@ -6949,10 +6948,9 @@ msgid "Import/Export coordinates for PDF schema"
 msgstr "PDF şeması için düzenlemeleri içe/dışa aktar"
 
 #: pmd_general.php:122
-#, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
-msgstr "Sorguyu Gönder"
+msgstr "Sorgu Yarat"
 
 #: pmd_general.php:127
 msgid "Move Menu"
@@ -6975,42 +6973,36 @@ msgid "Delete relation"
 msgstr "Bağlantıyı sil"
 
 #: pmd_general.php:462 pmd_general.php:521
-#, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
-msgstr "Bağlantı silindi"
+msgstr "Bağlantı işletici"
 
 #: pmd_general.php:472 pmd_general.php:531 pmd_general.php:654
 #: pmd_general.php:771
-#, fuzzy
 #| msgid "Export"
 msgid "Except"
-msgstr "Dışa Aktar"
+msgstr "Hariç"
 
 #: pmd_general.php:478 pmd_general.php:537 pmd_general.php:660
 #: pmd_general.php:777
-#, fuzzy
 #| msgid "in query"
 msgid "subquery"
-msgstr "sorgu içerisinde"
+msgstr "alt sorgu"
 
 #: pmd_general.php:482 pmd_general.php:578
-#, fuzzy
 #| msgid "Rename view to"
 msgid "Rename to"
-msgstr "Görünümü yeniden şuna adlandır"
+msgstr "Yeniden şuna adlandır"
 
 #: pmd_general.php:484 pmd_general.php:583
-#, fuzzy
 #| msgid "User name"
 msgid "New name"
-msgstr "Kullanıcı Adı"
+msgstr "Yeni ad"
 
 #: pmd_general.php:487 pmd_general.php:702
-#, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
-msgstr "Oluştur"
+msgstr "Topla"
 
 #: pmd_general.php:489 pmd_general.php:509 pmd_general.php:631
 #: pmd_general.php:644 pmd_general.php:707 pmd_general.php:761
@@ -7019,14 +7011,13 @@ msgid "Operator"
 msgstr "İşletici"
 
 #: pmd_general.php:812
-#, fuzzy
 #| msgid "Table options"
 msgid "Active options"
-msgstr "Tablo seçenekleri"
+msgstr "Aktif seçenekler"
 
 #: pmd_help.php:26
 msgid "To select relation, click :"
-msgstr "Bağlantıyı seçmek için buraya tıklayın :"
+msgstr "Bağlantı seçmek için buraya tıklayın :"
 
 #: pmd_help.php:28
 msgid ""

po/zh_CN.po

@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-11-20 07:34-0500\n"
-"PO-Revision-Date: 2010-11-04 05:16+0200\n"
+"PO-Revision-Date: 2010-11-22 09:26+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN@li.org>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -2817,13 +2817,12 @@ msgid "Changes tracking"
 msgstr "修改追踪"
 
 #: libraries/config/messages.inc.php:202
-#, fuzzy
 #| msgid ""
 #| "Tracking of changes made in database. Requires configured PMA database."
 msgid ""
 "Tracking of changes made in database. Requires the phpMyAdmin configuration "
 "storage."
-msgstr "追踪数据库的修改。需要设置 PMA 数据库。"
+msgstr "追踪数据库的修改。需要 phpMyAdmin 高级功能。"
 
 #: libraries/config/messages.inc.php:203
 msgid "Customize export options"
@@ -6578,14 +6577,14 @@ msgstr ""
 "好，请立即删除该文件夹。"
 
 #: main.php:304
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage has been deactivated. To find out "
 #| "why click %shere%s."
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. To find out why click %shere%s."
-msgstr "phpMyAdmin 高级功能尚未激活。要查出原因，请点击%s此处%s。"
+msgstr "phpMyAdmin 高级功能未全部设置，部分功能不可用。要查出原因请%s点这里%s。"
 
 #: main.php:319
 msgid ""

scripts/compress-js

@@ -1,7 +1,9 @@
 #!/bin/sh
 
+set -e
+
 for file in `find js -name '*.js' -not -name '*min.js'` ; do
     mkdir -p sources/`dirname $file`
     mv $file sources/$file
-    java -jar ./scripts/google-javascript-compiler/compiler.jar --js sources/$file --js_output_file $file --compilation_level ADVANCED_OPTIMIZATIONS
+    java -jar ./scripts/google-javascript-compiler/compiler.jar --js sources/$file --js_output_file $file
 done