[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA1-50-ge58d32f
Michal Čihař
nijel at users.sourceforge.net
Tue Nov 23 10:41:08 CET 2010
The branch, master has been updated
via e58d32fddfea2971d1fed4a3587ad387359f864e (commit)
via 753c436521e8beb545fdc329d379e8fa68044d80 (commit)
via 0f6af345ab5c7819b2555f47741cf3b0a91c374b (commit)
via 96b488609319c98b2bb862b0f6b7f55f426d8e6a (commit)
via e3e719674c99e66c311d935680b0612197a06974 (commit)
via 0c3c4c8c4b4c6073a0aa86fcc14c3cdb43d37160 (commit)
via d2a3e3f8bf70aa7daf02e076d1fad6cbb28d1554 (commit)
via a441552fd382cf36787b95031d8681475a508802 (commit)
via 5362dfb15e71ff097404d57092426ea9bd123079 (commit)
via db5c5c3aa0e5ee64eb73b10bdba203efb5bb5326 (commit)
via 11593b1c6fc1ce98cb588d306070627b90474a61 (commit)
via fb8d5c02af3a3867bcc4851eb1069697c854c96e (commit)
via 80e5a2e7ba369f2075abac1687291f045398a8fa (commit)
via df0789087ef52a25bfd79cdb2184c677155e92a5 (commit)
via 9c212e7c68d139a0a6dca96d0f0a2bb0c6f1be95 (commit)
via bb70d09869404e7ebb5566fcbb62f9a145af24da (commit)
via 25877a78d13d8dc5b0c092e0c2f105347de37807 (commit)
via a066204326b08e397b44a2d4ddad74391c73bc2e (commit)
via faddc6de0dcf4b290af8689a48cbc5eee54b06d8 (commit)
via af99344a4171ca0c5ec20e885266b90cb622ea49 (commit)
via 277a2300362854e5c017e9e9708cb2867f8631b2 (commit)
via 2d9f2796d129e3b5f0440514e33a183bbccdd91e (commit)
via 70fbac0c37cfe1f9cd9cfacc3a13c5902a6241e3 (commit)
via 361784dec2edcddc726779770e8fa2aba829da2c (commit)
via 2574c009daa65fdb0b79d22b3936f9b44353e24b (commit)
via 670209ba5390a3ce7d199315b1c8bebb777fedb4 (commit)
via 58bd49327d3c8cb64edacbbe61d91112349fdc20 (commit)
via 44364aae1bf51847744b53dfc773ad0415efba6b (commit)
via 0985f7dfb96d28f9a43d4b5b103f66fd067d525b (commit)
via 105633ecd4c320295eb383dda50577724a0dbdcd (commit)
via 1be7e974693f6c10676c611abebed00d06dad3fe (commit)
via 782beabb6a07f7ac3bead982b71794080107f25f (commit)
via 55ff409acb025596d83f41bdd4a304a9bfcfe5e7 (commit)
via 0e2daffa730ef115a7e8998338c40ee0927ae608 (commit)
via 82848aaf44d812063554ab2f8e7b40c860a4aac9 (commit)
via ce798ce3eaecc7108c6770ee1d3690f27b87e0ee (commit)
via 00efd8bd58a2e1522443102bc99f305f28a1226c (commit)
via 98217bba0f4403414103aa0913702bda0a754dac (commit)
via 4576ac8a70fafba7e28b9554467d1f2d11a35e8e (commit)
via 97ccf0623761a85c2f040988d24d965237a72198 (commit)
via e97c9517022e84331397adf9764b4ad2cc18c16e (commit)
via e244c4456d03b86b7e0f821e0dafe75456d58011 (commit)
via d9ce4e187cc0b7ab6ec167f5df03a2703a66dd25 (commit)
via 21cdd0fcfa3ee6f2271e59215c8c6c50238c47cc (commit)
via 38bdb4e081195bfc8923a679a216f9daa96f965d (commit)
via 4acbe32b6016ed880cb0327294cdbc9c2313e570 (commit)
via 2906f3a11719c19200a1f2bd7bb3992938783f90 (commit)
via 59216f9353ee1c34bfbf018c722ba27a7de288d1 (commit)
via 5467e3832d5f7a1a0f1c31aac7d8e92f73cec742 (commit)
via 3a6a6c6c203f3ffaea3f8023da99db72afb9eb87 (commit)
from 9c8514fb97dca0a02293344847e47927e0002463 (commit)
- Log -----------------------------------------------------------------
commit e58d32fddfea2971d1fed4a3587ad387359f864e
Merge: 753c436521e8beb545fdc329d379e8fa68044d80 105633ecd4c320295eb383dda50577724a0dbdcd
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Nov 23 10:38:08 2010 +0100
Merge remote branch 'pootle/master'
commit 753c436521e8beb545fdc329d379e8fa68044d80
Merge: 70fbac0c37cfe1f9cd9cfacc3a13c5902a6241e3 0f6af345ab5c7819b2555f47741cf3b0a91c374b
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Nov 23 10:38:01 2010 +0100
Merge branch 'QA_3_4'
commit 70fbac0c37cfe1f9cd9cfacc3a13c5902a6241e3
Merge: 9c8514fb97dca0a02293344847e47927e0002463 361784dec2edcddc726779770e8fa2aba829da2c
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Nov 23 10:32:29 2010 +0100
Merge branch 'QA_3_4'
commit 105633ecd4c320295eb383dda50577724a0dbdcd
Merge: 55ff409acb025596d83f41bdd4a304a9bfcfe5e7 9c8514fb97dca0a02293344847e47927e0002463
Author: Pootle server <pootle at cihar.com>
Date: Mon Nov 22 20:40:08 2010 +0100
Merge remote branch 'origin/master'
commit 55ff409acb025596d83f41bdd4a304a9bfcfe5e7
Author: shanyan baishui <Siramizu at gmail.com>
Date: Mon Nov 22 09:26:00 2010 +0200
Translation update done using Pootle.
commit 0e2daffa730ef115a7e8998338c40ee0927ae608
Author: shanyan baishui <Siramizu at gmail.com>
Date: Mon Nov 22 09:22:40 2010 +0200
Translation update done using Pootle.
commit 82848aaf44d812063554ab2f8e7b40c860a4aac9
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:13:20 2010 +0200
Translation update done using Pootle.
commit ce798ce3eaecc7108c6770ee1d3690f27b87e0ee
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:13:02 2010 +0200
Translation update done using Pootle.
commit 00efd8bd58a2e1522443102bc99f305f28a1226c
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:12:46 2010 +0200
Translation update done using Pootle.
commit 98217bba0f4403414103aa0913702bda0a754dac
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:12:24 2010 +0200
Translation update done using Pootle.
commit 4576ac8a70fafba7e28b9554467d1f2d11a35e8e
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:11:50 2010 +0200
Translation update done using Pootle.
commit 97ccf0623761a85c2f040988d24d965237a72198
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:11:33 2010 +0200
Translation update done using Pootle.
commit e97c9517022e84331397adf9764b4ad2cc18c16e
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:11:10 2010 +0200
Translation update done using Pootle.
commit e244c4456d03b86b7e0f821e0dafe75456d58011
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:10:58 2010 +0200
Translation update done using Pootle.
commit d9ce4e187cc0b7ab6ec167f5df03a2703a66dd25
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:10:39 2010 +0200
Translation update done using Pootle.
commit 21cdd0fcfa3ee6f2271e59215c8c6c50238c47cc
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:10:08 2010 +0200
Translation update done using Pootle.
commit 38bdb4e081195bfc8923a679a216f9daa96f965d
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:09:46 2010 +0200
Translation update done using Pootle.
commit 4acbe32b6016ed880cb0327294cdbc9c2313e570
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:09:10 2010 +0200
Translation update done using Pootle.
commit 2906f3a11719c19200a1f2bd7bb3992938783f90
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:07:52 2010 +0200
Translation update done using Pootle.
commit 59216f9353ee1c34bfbf018c722ba27a7de288d1
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:07:25 2010 +0200
Translation update done using Pootle.
commit 5467e3832d5f7a1a0f1c31aac7d8e92f73cec742
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:06:49 2010 +0200
Translation update done using Pootle.
commit 3a6a6c6c203f3ffaea3f8023da99db72afb9eb87
Author: Burak Yavuz <hitowerdigit at hotmail.com>
Date: Sun Nov 21 20:06:37 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 2 +-
js/jquery/timepicker.js | 4 +-
js/sql.js | 4 +-
js/tbl_change.js | 8 ++--
po/tr.po | 41 +++++++++--------------
po/zh_CN.po | 11 +++---
scripts/compress-js | 4 ++-
scripts/google-javascript-compiler/compiler.jar | Bin 4337904 -> 3939454 bytes
8 files changed, 33 insertions(+), 41 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index d29c421..ef0cf1f 100644
--- a/js/functions.js
+++ b/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") {
diff --git a/js/jquery/timepicker.js b/js/jquery/timepicker.js
index ea927fd..4d1845e 100644
--- a/js/jquery/timepicker.js
+++ b/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'
});
/**
diff --git a/js/sql.js b/js/sql.js
index ab3bd94..57cb761 100644
--- a/js/sql.js
+++ b/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);
});
}
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 14fd11a..dc1632a 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -11,10 +11,10 @@
/**
* Modify from controls when the "NULL" checkbox is selected
*
- * @param string the MySQL field type
- * @param string the urlencoded field name - OBSOLETE
- * @param string the md5 hashed field name
- * @param string the multi_edit row sequence number
+ * @param theType string the MySQL field type
+ * @param urlField string the urlencoded field name - OBSOLETE
+ * @param md5Field string the md5 hashed field name
+ * @param multi_edit string the multi_edit row sequence number
*
* @return boolean always true
*/
diff --git a/po/tr.po b/po/tr.po
index cdc00a3..077d3a2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at 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 at hotmail.com>\n"
"Language-Team: turkish <tr at 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ı "
-"gerekir."
+"İzlenen değişiklikler veritabanında yapıldı. phpMyAdmin yapılandırma "
+"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 ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 42a3346..948bdae 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at 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 at gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN at 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 ""
diff --git a/scripts/compress-js b/scripts/compress-js
index 0646527..ea43782 100755
--- a/scripts/compress-js
+++ b/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
diff --git a/scripts/google-javascript-compiler/compiler.jar b/scripts/google-javascript-compiler/compiler.jar
index c087e92..4dfa5ad 100644
Binary files a/scripts/google-javascript-compiler/compiler.jar and b/scripts/google-javascript-compiler/compiler.jar differ
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list