- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3297-g2a10c7f
by Michal Čihař 08 Jun '11

08 Jun '11

The branch, master has been updated via 2a10c7f4aa968122939dcd60123f9819e6c97efb (commit) via b7fbd9e807e1daa85bf3c7412947826f8f00d77e (commit) via 0e6867b4483a29d1b5b729a787a656b8ecce1a38 (commit) via e17e9b144f21c1e6a941dcb96f4de64a660b1ef4 (commit) via 3ac295d3bd6720484467dfff842bf13572f3bdc8 (commit) from c3b98937da2912ba92c8283313b1f37c4ac64d96 (commit) - Log ----------------------------------------------------------------- commit 2a10c7f4aa968122939dcd60123f9819e6c97efb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:25:31 2011 +0200 Translation update done using Pootle. commit b7fbd9e807e1daa85bf3c7412947826f8f00d77e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:21:06 2011 +0200 Translation update done using Pootle. commit 0e6867b4483a29d1b5b729a787a656b8ecce1a38 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:20:54 2011 +0200 Translation update done using Pootle. commit e17e9b144f21c1e6a941dcb96f4de64a660b1ef4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:20:02 2011 +0200 Translation update done using Pootle. commit 3ac295d3bd6720484467dfff842bf13572f3bdc8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:19:33 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/po/tr.po b/po/tr.po index 87b6ef2..61c405c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-06 18:49+0200\n" +"PO-Revision-Date: 2011-06-08 16:25+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)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" @@ -1024,10 +1024,9 @@ msgstr "Parolalar birbiriyle aynı değil!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Herhangi kullanıcı" +msgstr "Kullanıcı ekle" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1788,10 +1787,9 @@ msgid "Wrong username/password. Access denied." msgstr "Yanlış kullanıcı adı/parola girdiniz. Erişim engellendi." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Yapılandırma kimlik doğrulaması" +msgstr "Oturumu açma kimlik doğrulaması betiği bulunamıyor:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -4200,7 +4198,7 @@ msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" msgstr "" -"[a@http://php.net/manual/function.phpinfo.php]Phpinfo()[/a] çıktısına " +"[a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] çıktısına " "bağlantıyı gösterir" #: libraries/config/messages.inc.php:458 @@ -8023,10 +8021,9 @@ msgid "wildcard" msgstr "joker" #: server_privileges.php:2295 -#, fuzzy #| msgid "New user has been added." msgid "User has been added." -msgstr "Yeni kullanıcı eklendi." +msgstr "Kullanıcı eklendi." #: server_processlist.php:29 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3292-gc3b9893
by Michal Čihař 08 Jun '11

08 Jun '11

The branch, master has been updated via c3b98937da2912ba92c8283313b1f37c4ac64d96 (commit) via 14bbe5d057e363f79434bb5b870e3f38ea87c861 (commit) via 5ea642c69e6c76b51cd5455475e618110be13dbf (commit) via e3d9f792e07ac5c83f7eb9dbc941ca8d00eb7e0e (commit) via af88f0d0622e251910f153d57ecf1b93753232d4 (commit) via 8a08124a580c208551e2df9dfd278f3a93fbb5f6 (commit) via 2ce2823d2608494548d80059390ff45df470816d (commit) via ab01575e896520511110768600c4ceaa7bb2a0df (commit) via 13a0f6d1e157dc7f1985f54c62df20a4f9ce4875 (commit) via 2e0fa178fcf3838e3418a57b5ebec2e2819464a7 (commit) from 6bc5a845f49d1f1b0864f37dceaeaa4b52fefdff (commit) - Log ----------------------------------------------------------------- commit c3b98937da2912ba92c8283313b1f37c4ac64d96 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 12:19:20 2011 +0200 Translation update done using Pootle. commit 14bbe5d057e363f79434bb5b870e3f38ea87c861 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 12:17:03 2011 +0200 Translation update done using Pootle. commit 5ea642c69e6c76b51cd5455475e618110be13dbf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 12:15:52 2011 +0200 Translation update done using Pootle. commit e3d9f792e07ac5c83f7eb9dbc941ca8d00eb7e0e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 12:07:14 2011 +0200 Translation update done using Pootle. commit af88f0d0622e251910f153d57ecf1b93753232d4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 12:05:54 2011 +0200 Translation update done using Pootle. commit 8a08124a580c208551e2df9dfd278f3a93fbb5f6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 12:03:08 2011 +0200 Translation update done using Pootle. commit 2ce2823d2608494548d80059390ff45df470816d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 12:02:45 2011 +0200 Translation update done using Pootle. commit ab01575e896520511110768600c4ceaa7bb2a0df Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:55:45 2011 +0200 Translation update done using Pootle. commit 13a0f6d1e157dc7f1985f54c62df20a4f9ce4875 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:42:19 2011 +0200 Translation update done using Pootle. commit 2e0fa178fcf3838e3418a57b5ebec2e2819464a7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:39:51 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/po/ja.po b/po/ja.po index d495550..7e392a7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-07 12:48+0200\n" +"PO-Revision-Date: 2011-06-08 12:19+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -1025,10 +1025,9 @@ msgstr "パスワードが異なっています!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "すべてのユーザ" +msgstr "ユーザを追加する" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1100,10 +1099,9 @@ msgid "Create Table" msgstr "テーブルを作成" #: js/messages.php:82 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "利用するテーブル" +msgstr "テーブルを挿入する" #: js/messages.php:85 msgid "Searching" @@ -1664,7 +1662,7 @@ msgstr "テーブル %s を %s にリネームしました" #: libraries/Table.class.php:1250 msgid "Could not save table UI preferences" -msgstr "" +msgstr "テーブルにユーザ設定が保存できません" #: libraries/Theme.class.php:160 #, php-format @@ -1792,10 +1790,9 @@ msgstr "" "ユーザ名ないしパスワードが間違っています。<br />アクセスは拒否されました" #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Config 認証" +msgstr "サインオン認証スクリプトが見つかりません：" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -3368,7 +3365,7 @@ msgstr "軽めのタブ" #: libraries/config/messages.inc.php:292 msgid "" "Maximum number of characters shown in any non-numeric column on browse view" -msgstr "ビューに表示される数値でないカラムの表示文字の最大数。" +msgstr "表示ページにおいて数値でないカラムの表示文字の最大数。" #: libraries/config/messages.inc.php:293 msgid "Limit column characters" @@ -4013,7 +4010,6 @@ msgid "Display columns table" msgstr "表示するカラムためのテーブル" #: libraries/config/messages.inc.php:426 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -4021,11 +4017,10 @@ msgid "" "Leave blank for no \"persistent\" tables'UI preferences across sessions, " "suggested: [kbd]pma_table_uiprefs[/kbd]" msgstr "" -"データベースにユーザ設定の保存しない場合は空欄にします。[kbd]pma_config[/" -"kbd] としておくのがいいでしょう。" +"ユーザ設定をセッションを跨いで「永続的に」記憶しない場合は空欄にします。[kbd]pma_table_uiprefs[/kbd] " +"としておくのがいいでしょう。" #: libraries/config/messages.inc.php:427 -#, fuzzy #| msgid "User preferences storage table" msgid "UI preferences table" msgstr "ユーザ設定保存テーブル" @@ -6219,11 +6214,11 @@ msgstr "SQL 履歴" #: libraries/relation.lib.php:143 #| msgid "Persistent connections" msgid "Persistent recently used tables" -msgstr "最近使用したテーブルの永続的な記憶" +msgstr "永続的な『最近使用したテーブル』" #: libraries/relation.lib.php:147 msgid "Persistent tables' UI preferences" -msgstr "" +msgstr "永続的な『テーブルのユーザ設定』" #: libraries/relation.lib.php:155 msgid "User preferences" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3282-g6bc5a84
by Michal Čihař 08 Jun '11

08 Jun '11

The branch, master has been updated via 6bc5a845f49d1f1b0864f37dceaeaa4b52fefdff (commit) via 9c3f65436c1ff291e65a7195a5bef5c9cba29c87 (commit) via 4c5cf54bc50e0ce9ab06d0bb441d3662c8b7ef76 (commit) via 7b00fa8a5d6998033f2b89207b4e57aecd1f00a1 (commit) via ebe59195b4bd45aed169352f785742f59d37ab35 (commit) via 00a659ee23f64474e61079f5f854a317ab1b4b47 (commit) via 5d73b2422b83372c32bb1c04e80cf43a6d98372c (commit) via 5558f042df926464f31d3e8d0231b3c076d1c89b (commit) via abb9b31781152b4fc079d482816ba62a7d658cb1 (commit) via dc3391f647a2ea5e15a4eac0189978e6ca286af9 (commit) from 4333f4c55b40b94f2f8208d1751cf6c743317704 (commit) - Log ----------------------------------------------------------------- commit 6bc5a845f49d1f1b0864f37dceaeaa4b52fefdff Author: stoyanster <stoyanster(a)gmail.com> Date: Wed Jun 8 08:42:52 2011 +0200 Translation update done using Pootle. commit 9c3f65436c1ff291e65a7195a5bef5c9cba29c87 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed Jun 8 08:42:32 2011 +0200 Translation update done using Pootle. commit 4c5cf54bc50e0ce9ab06d0bb441d3662c8b7ef76 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed Jun 8 08:42:01 2011 +0200 Translation update done using Pootle. commit 7b00fa8a5d6998033f2b89207b4e57aecd1f00a1 Author: stoyanster <stoyanster(a)gmail.com> Date: Wed Jun 8 08:41:11 2011 +0200 Translation update done using Pootle. commit ebe59195b4bd45aed169352f785742f59d37ab35 Merge: 00a659ee23f64474e61079f5f854a317ab1b4b47 4333f4c55b40b94f2f8208d1751cf6c743317704 Author: Pootle server <pootle(a)cihar.com> Date: Wed Jun 8 08:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 00a659ee23f64474e61079f5f854a317ab1b4b47 Author: u1104003 <u1104003(a)gmail.com> Date: Wed Jun 8 05:26:24 2011 +0200 Translation update done using Pootle. commit 5d73b2422b83372c32bb1c04e80cf43a6d98372c Author: u1104003 <u1104003(a)gmail.com> Date: Wed Jun 8 05:25:01 2011 +0200 Translation update done using Pootle. commit 5558f042df926464f31d3e8d0231b3c076d1c89b Author: u1104003 <u1104003(a)gmail.com> Date: Wed Jun 8 05:24:53 2011 +0200 Translation update done using Pootle. commit abb9b31781152b4fc079d482816ba62a7d658cb1 Author: u1104003 <u1104003(a)gmail.com> Date: Wed Jun 8 05:24:40 2011 +0200 Translation update done using Pootle. commit dc3391f647a2ea5e15a4eac0189978e6ca286af9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Wed Jun 8 05:00:31 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 15 ++++++--------- po/zh_CN.po | 7 +++---- po/zh_TW.po | 13 +++++-------- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/po/bg.po b/po/bg.po index e1ca5ce..af57057 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-07 08:14+0200\n" +"PO-Revision-Date: 2011-06-08 08:42+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1025,10 +1025,9 @@ msgstr "Паролата не е същата!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Всеки потребител" +msgstr "Добавяне потребител" #: js/messages.php:55 msgid "Reloading Privileges" @@ -3558,10 +3557,9 @@ msgid "When browsing tables, the sorting of each table is remembered" msgstr "" #: libraries/config/messages.inc.php:351 -#, fuzzy #| msgid "Rename table to" msgid "Remember table's sorting" -msgstr "Преименуване на таблицата на" +msgstr "Запомняне сортирането на таблицата" #: libraries/config/messages.inc.php:352 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" @@ -6734,7 +6732,7 @@ msgstr "Web сървър" #: main.php:187 msgid "MySQL client version" -msgstr "Версия на клиента за MySQL" +msgstr "Версия на MySQL клиент" #: main.php:189 msgid "PHP extension" @@ -7645,10 +7643,9 @@ msgid "wildcard" msgstr "знак за заместване" #: server_privileges.php:2295 -#, fuzzy #| msgid "New user has been added." msgid "User has been added." -msgstr "Нов потребител беше създаден." +msgstr "Потребител беше добавен." #: server_processlist.php:29 #, php-format diff --git a/po/zh_CN.po b/po/zh_CN.po index c419710..a39e445 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-05-30 05:47+0200\n" +"PO-Revision-Date: 2011-06-08 05:00+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)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" @@ -1006,10 +1006,9 @@ msgstr "两次密码不一致！" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "任意用户" +msgstr "添加用户" #: js/messages.php:55 msgid "Reloading Privileges" diff --git a/po/zh_TW.po b/po/zh_TW.po index 75fe710..d8f6dba 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,13 +3,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-03 09:09+0200\n" -"Last-Translator: <kiange(a)gmail.com>\n" +"PO-Revision-Date: 2011-06-08 05:26+0200\n" +"Last-Translator: <u1104003(a)gmail.com>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -1008,10 +1008,9 @@ msgstr "兩次密碼不一致！" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "任意使用者" +msgstr "新增使用者" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1083,10 +1082,9 @@ msgid "Create Table" msgstr "建立資料表" #: js/messages.php:82 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "使用表" +msgstr "插入資料表" #: js/messages.php:85 msgid "Searching" @@ -3248,7 +3246,6 @@ msgid "Disable this if you want to see all databases at once" msgstr "如果想一次性瀏覽所有資料庫，則停用該選項" #: libraries/config/messages.inc.php:278 -#, fuzzy msgid "Use light version" msgstr "使用輕量級版本" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3272-g4333f4c
by Michal Čihař 08 Jun '11

08 Jun '11

The branch, master has been updated via 4333f4c55b40b94f2f8208d1751cf6c743317704 (commit) from 420534ea0d2f5e2ebfc0116a40684e1b7a2be5e5 (commit) - Log ----------------------------------------------------------------- commit 4333f4c55b40b94f2f8208d1751cf6c743317704 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jun 8 08:36:28 2011 +0200 Doc for DECLARE ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.data.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 531947f..15fcb58 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -1317,6 +1317,7 @@ $PMA_SQPdata_functions_docs = array( 'DAYOFMONTH' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofmonth'), 'DAYOFWEEK' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofweek'), 'DAYOFYEAR' => array('link' => 'date-and-time-functions','anchor' => 'function_dayofyear'), + 'DECLARE' => array('link' => 'declare', 'anchor' => 'declare'), 'DECODE' => array('link' => 'encryption-functions','anchor' => 'function_decode'), 'DEFAULT' => array('link' => 'miscellaneous-functions','anchor' => 'function_default'), 'DEGREES' => array('link' => 'mathematical-functions','anchor' => 'function_degrees'), hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3271-g420534e
by Michal Čihař 08 Jun '11

08 Jun '11

The branch, master has been updated via 420534ea0d2f5e2ebfc0116a40684e1b7a2be5e5 (commit) from 7db86a94bbc1b8e7906b1442b966e6abc3781040 (commit) - Log ----------------------------------------------------------------- commit 420534ea0d2f5e2ebfc0116a40684e1b7a2be5e5 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jun 8 08:33:47 2011 +0200 Add missing keyword ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.data.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index d1c4b16..531947f 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -426,6 +426,7 @@ $PMA_SQPdata_reserved_word = array ( 'DAY_HOUR', 'DAY_MINUTE', 'DAY_SECOND', + 'DECLARE', 'DEFINER', 'DELAYED', 'DELAY_KEY_WRITE', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3270-g7db86a9
by Piotr Przybylski 08 Jun '11

08 Jun '11

The branch, master has been updated via 7db86a94bbc1b8e7906b1442b966e6abc3781040 (commit) from 31bbba5e76a2007ecb30e1ef5673a52b551813f8 (commit) - Log ----------------------------------------------------------------- commit 7db86a94bbc1b8e7906b1442b966e6abc3781040 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jun 8 00:45:09 2011 +0200 Rename file for consistency with routines and events ----------------------------------------------------------------------- Summary of changes: .../{tbl_triggers.lib.php => tbl_triggers.inc.php} | 0 tbl_structure.php | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) rename libraries/{tbl_triggers.lib.php => tbl_triggers.inc.php} (100%) diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.inc.php similarity index 100% rename from libraries/tbl_triggers.lib.php rename to libraries/tbl_triggers.inc.php diff --git a/tbl_structure.php b/tbl_structure.php index 636150a..21fc51e 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -932,7 +932,7 @@ if ($cfg['ShowStats']) { } // END - Calc Table Space -require './libraries/tbl_triggers.lib.php'; +require './libraries/tbl_triggers.inc.php'; echo '<div class="clearfloat"></div>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3269-g31bbba5
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, master has been updated via 31bbba5e76a2007ecb30e1ef5673a52b551813f8 (commit) via 2d56821c0f1337ae3fec7e845a396e2b0448fdeb (commit) from b5e733a2e34128b7e2a33a1b76c206c5de97584c (commit) - Log ----------------------------------------------------------------- commit 31bbba5e76a2007ecb30e1ef5673a52b551813f8 Merge: b5e733a2e34128b7e2a33a1b76c206c5de97584c 2d56821c0f1337ae3fec7e845a396e2b0448fdeb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 11:44:31 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: js/sql.js | 2 +- libraries/display_tbl.lib.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 39ed84b..3bc4f81 100644 --- a/js/sql.js +++ b/js/sql.js @@ -1152,7 +1152,7 @@ $(document).ready(function() { /** * vertical column marking in horizontal mode when clicking the column header */ - $('.column_heading.pointer').live('click', function() { + $('.column_heading.marker').live('click', function() { PMA_changeClassForColumn($(this), 'marked'); }); }) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 0ffbb9f..5b06b3e 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -877,6 +877,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { $th_class[] = 'pointer'; } + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == true) { + $th_class[] = 'marker'; + } echo ' class="' . implode(' ', $th_class) . '"'; if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-15-g2d56821
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, QA_3_4 has been updated via 2d56821c0f1337ae3fec7e845a396e2b0448fdeb (commit) from 82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: js/sql.js | 2 +- libraries/display_tbl.lib.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 7e8bccf..26075d4 100644 --- a/js/sql.js +++ b/js/sql.js @@ -1152,7 +1152,7 @@ $(document).ready(function() { /** * vertical column marking in horizontal mode when clicking the column header */ - $('.column_heading.pointer').live('click', function() { + $('.column_heading.marker').live('click', function() { PMA_changeClassForColumn($(this), 'marked'); }); }) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c5b46fb..64a0383 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -870,6 +870,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { $th_class[] = 'pointer'; } + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == true) { + $th_class[] = 'marker'; + } echo ' class="' . implode(' ', $th_class) . '"'; if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3267-gb5e733a
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, master has been updated via b5e733a2e34128b7e2a33a1b76c206c5de97584c (commit) via 82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 (commit) from cce59ba0c88109a2ce123416d4166c8d19d28778 (commit) - Log ----------------------------------------------------------------- commit b5e733a2e34128b7e2a33a1b76c206c5de97584c Merge: cce59ba0c88109a2ce123416d4166c8d19d28778 82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jun 7 11:10:18 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 4 ++-- libraries/display_tbl.lib.php | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 014c0c7..565b1d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ - bug #3304544 [parser] master is not a reserved word - bug #3307616 [edit] Inline edit updates multiple duplicate rows - patch #3311539 [edit] Inline edit does not escape backslashes +- bug #3313210 [interface] Columns class sometimes changed for nothing 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index a165e4a..39ed84b 100644 --- a/js/sql.js +++ b/js/sql.js @@ -1145,14 +1145,14 @@ $(document).ready(function() { /** * vertical column highlighting in horizontal mode when hovering over the column header */ - $('.column_heading').live('hover', function() { + $('.column_heading.pointer').live('hover', function() { PMA_changeClassForColumn($(this), 'hover'); }); /** * vertical column marking in horizontal mode when clicking the column header */ - $('.column_heading').live('click', function() { + $('.column_heading.pointer').live('click', function() { PMA_changeClassForColumn($(this), 'marked'); }); }) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a16fc23..0ffbb9f 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -874,6 +874,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $th_class[] = 'condition'; } $th_class[] = 'column_heading'; + if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { + $th_class[] = 'pointer'; + } echo ' class="' . implode(' ', $th_class) . '"'; if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-14-g82ac1e8
by Marc Delisle 07 Jun '11

07 Jun '11

The branch, QA_3_4 has been updated via 82ac1e8028b5ec7d5b95e5cf2a2e47c452dfa5c5 (commit) from 7afbe60f2b612b0ee0d222bad8c4867c7acbebac (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 4 ++-- libraries/display_tbl.lib.php | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fed26b..5b012bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ - bug #3304544 [parser] master is not a reserved word - bug #3307616 [edit] Inline edit updates multiple duplicate rows - patch #3311539 [edit] Inline edit does not escape backslashes +- bug #3313210 [interface] Columns class sometimes changed for nothing 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 73a2b78..7e8bccf 100644 --- a/js/sql.js +++ b/js/sql.js @@ -1145,14 +1145,14 @@ $(document).ready(function() { /** * vertical column highlighting in horizontal mode when hovering over the column header */ - $('.column_heading').live('hover', function() { + $('.column_heading.pointer').live('hover', function() { PMA_changeClassForColumn($(this), 'hover'); }); /** * vertical column marking in horizontal mode when clicking the column header */ - $('.column_heading').live('click', function() { + $('.column_heading.pointer').live('click', function() { PMA_changeClassForColumn($(this), 'marked'); }); }) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c0ab854..c5b46fb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -867,6 +867,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $th_class[] = 'condition'; } $th_class[] = 'column_heading'; + if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) { + $th_class[] = 'pointer'; + } echo ' class="' . implode(' ', $th_class) . '"'; if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') { hooks/post-receive -- phpMyAdmin

1 0