Git January 2012

git@phpmyadmin.net

5 participants
135 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0ALPHA1-895-gd4094ba
by Marc Delisle 25 Jan '12

25 Jan '12

The branch, QA_3_5 has been updated via d4094baa56060e0813e09112fa03b3bbcef69e9a (commit) from 86a64b69a471ba9605a37a41a05f4ba94345b874 (commit) - Log ----------------------------------------------------------------- commit d4094baa56060e0813e09112fa03b3bbcef69e9a Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Jan 25 05:16:42 2012 -0500 3.5.0-beta1 ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index c4f5c96..c3dc159 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.5.0-beta1-dev - Documentation</title> + <title>phpMyAdmin 3.5.0-beta1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.5.0-beta1-dev + 3.5.0-beta1 Documentation </h1> </div> diff --git a/README b/README index c18603b..7e1c4c9 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-beta1-dev +Version 3.5.0-beta1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 67756e4..ba8a7a7 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-beta1-dev'); + $this->set('PMA_VERSION', '3.5.0-beta1'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, created. RELEASE_3_5_0ALPHA1-894-g86a64b6
by Marc Delisle 25 Jan '12

25 Jan '12

The branch, QA_3_5 has been created at 86a64b69a471ba9605a37a41a05f4ba94345b874 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-894-g86a64b6
by Michal Čihař 24 Jan '12

24 Jan '12

The branch, master has been updated via 86a64b69a471ba9605a37a41a05f4ba94345b874 (commit) via 19c778d98dedeee25b1f99c59a769bf378c82cba (commit) via 23b33227b82fb34ecf932242d3ed992c1693e30e (commit) via d384549e0c78d5dd6caadda55516b61828bb7070 (commit) via 75df6d24856e0451efd46fcce22b02376eeba906 (commit) via 32f121da4ad7c954b7db9f7aa24cb6ab4cf9eda1 (commit) via eed85339d06f5774ad8e5380432b89832469c293 (commit) via 971c4173b65094e9bd65a116b92ce0ddd94f07b6 (commit) via e1bc1908ea4a5f948e377ce330554a8d16aefad6 (commit) via bc2aac0201f272e37daf6303a457e2b10a787fbb (commit) from 2cad4eaae881da53a2b6a5dd203efdbe472eaf46 (commit) - Log ----------------------------------------------------------------- commit 86a64b69a471ba9605a37a41a05f4ba94345b874 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:07:31 2012 +0200 Translation update done using Pootle. commit 19c778d98dedeee25b1f99c59a769bf378c82cba Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:07:08 2012 +0200 Translation update done using Pootle. commit 23b33227b82fb34ecf932242d3ed992c1693e30e Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:06:56 2012 +0200 Translation update done using Pootle. commit d384549e0c78d5dd6caadda55516b61828bb7070 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:06:44 2012 +0200 Translation update done using Pootle. commit 75df6d24856e0451efd46fcce22b02376eeba906 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:05:53 2012 +0200 Translation update done using Pootle. commit 32f121da4ad7c954b7db9f7aa24cb6ab4cf9eda1 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:05:38 2012 +0200 Translation update done using Pootle. commit eed85339d06f5774ad8e5380432b89832469c293 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:05:23 2012 +0200 Translation update done using Pootle. commit 971c4173b65094e9bd65a116b92ce0ddd94f07b6 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:05:09 2012 +0200 Translation update done using Pootle. commit e1bc1908ea4a5f948e377ce330554a8d16aefad6 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:04:43 2012 +0200 Translation update done using Pootle. commit bc2aac0201f272e37daf6303a457e2b10a787fbb Author: Michal Čihař <michal(a)cihar.com> Date: Tue Jan 24 21:03:32 2012 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/po/cs.po b/po/cs.po index a6324c5..2d3e10b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-22 04:34-0500\n" -"PO-Revision-Date: 2012-01-24 12:09+0200\n" +"PO-Revision-Date: 2012-01-24 21:07+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -7658,11 +7658,10 @@ msgid "Trigger name" msgstr "Název spouště" #: libraries/rte/rte_triggers.lib.php:326 -#, fuzzy #| msgid "Time" msgctxt "Trigger action time" msgid "Time" -msgstr "Čas" +msgstr "Spouštění" #: libraries/rte/rte_triggers.lib.php:405 msgid "You must provide a trigger name" @@ -12561,6 +12560,8 @@ msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." msgstr "" +"Nastavte {key_buffer_size} podle velikosti vašich klíčů v MyISAM tabulkách. " +"Pro začátek může být třeba 64M dobrá hodnota." #: po/advisory_rules.php:163 msgid "key_buffer_size is 0" @@ -12592,10 +12593,9 @@ msgstr "" "hodnota by měla být nad 95%%." #: po/advisory_rules.php:170 -#, fuzzy #| msgid "Sort buffer size" msgid "Percentage of MyISAM key buffer used" -msgstr "Velikost paměti pro řazení" +msgstr "Procento využití vyrovnávací paměti MyISAM pro klíče" #: po/advisory_rules.php:173 #, php-format @@ -12613,7 +12613,7 @@ msgstr "" #: po/advisory_rules.php:177 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "Mohlo by být potřeba zvýšit {key_buffer_size}." #: po/advisory_rules.php:178 #, php-format @@ -12621,16 +12621,14 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%" msgstr "" #: po/advisory_rules.php:180 -#, fuzzy #| msgid "Create table" msgid "Rate of table open" -msgstr "Vytvořit tabulku" +msgstr "Četnost otevírání tabulek" #: po/advisory_rules.php:181 -#, fuzzy #| msgid "The current number of pending writes." msgid "The rate of opening tables is high." -msgstr "Počet nevyřízených zápisů." +msgstr "Tabulky jsou otevírány příliš často." #: po/advisory_rules.php:182 msgid "" @@ -12772,15 +12770,15 @@ msgstr "" #: po/advisory_rules.php:218 #, php-format msgid "%s thread(s) took longer than %s seconds to start, it should be 0" -msgstr "" +msgstr "%s vláknům trvalo spuštění déle než %s sekund, mělo by to trvat 0" #: po/advisory_rules.php:220 msgid "Slow launch time" -msgstr "" +msgstr "Dlouhá doba spuštění" #: po/advisory_rules.php:221 msgid "Slow_launch_threads is above 2s" -msgstr "" +msgstr "Slow_launch_threads je nad 2s" #: po/advisory_rules.php:222 msgid "" @@ -12935,7 +12933,7 @@ msgstr "Maximální velikost záznamu InnoDB" #: po/advisory_rules.php:261 msgid "The InnoDB log file size is inadequately large." -msgstr "" +msgstr "Velikost záznamového souboru je příliš velká." #: po/advisory_rules.php:262 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-884-g2cad4ea
by Michal Čihař 24 Jan '12

24 Jan '12

The branch, master has been updated via 2cad4eaae881da53a2b6a5dd203efdbe472eaf46 (commit) via 6d2ccdfdf8e2f5bd1d34b0cf6c1031cfb7a4cd46 (commit) from 3a5203e33e529190e7afd875f9bde094f4eee4a2 (commit) - Log ----------------------------------------------------------------- commit 2cad4eaae881da53a2b6a5dd203efdbe472eaf46 Merge: 6d2ccdf 3a5203e Author: Pootle server <pootle(a)cihar.com> Date: Tue Jan 24 18:40:28 2012 +0100 Merge remote-tracking branch 'origin/master' commit 6d2ccdfdf8e2f5bd1d34b0cf6c1031cfb7a4cd46 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 24 12:18:46 2012 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index ac9d2f4..4e33dea 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-22 04:34-0500\n" -"PO-Revision-Date: 2012-01-21 14:01+0200\n" +"PO-Revision-Date: 2012-01-24 12:17+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -7535,7 +7535,7 @@ msgstr "Définition" #: libraries/rte/rte_events.lib.php:471 msgid "On completion preserve" -msgstr "À la fin, préserver" +msgstr "Suite à l'exécution, conserver" #: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:933 #: libraries/rte/rte_triggers.lib.php:360 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_5_0ALPHA1-60-g6bf8d6c
by Marc Delisle 24 Jan '12

24 Jan '12

The branch, TESTING has been updated via 6bf8d6c83aefa51c99822aa2ef69462cb2deca85 (commit) via 6d58b78a322a8a0fecd5c914d04cb4402cdab910 (commit) via 3c7b233d9c83b501f5e220a6dcba8259b7554a87 (commit) via 5da1aaa0fe7493afecde8ac92a0b561337bf217e (commit) via 346c70d6fd7a6e402e41dfd552f70e3bdaf83323 (commit) via 5d1fa1cc6b9cd6b2a96a67cd79216354a3c3e77f (commit) from 2902ec086b6d8e1158cd869512aa0579aeb6509c (commit) - Log ----------------------------------------------------------------- commit 6bf8d6c83aefa51c99822aa2ef69462cb2deca85 Merge: 2902ec0 6d58b78 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 24 12:33:46 2012 -0500 Merge branch 'MAINT_3_4_10' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 + Documentation.html | 4 +- README | 2 +- libraries/Config.class.php | 2 +- libraries/tbl_replace_fields.inc.php | 8 ++- po/lt.po | 14 +++-- po/ta.po | 23 +++---- po/te.po | 2 +- po/th.po | 106 +++++++++++++++++----------------- tbl_replace.php | 14 ++++- 10 files changed, 98 insertions(+), 79 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5622a1..ebc96e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,8 @@ phpMyAdmin - ChangeLog - bug #3049209 [import] Import from ODS ignores cell that is the same as cell before - bug #3463933 [display] SELECT DISTINCT displays wrong total records found - patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' +- bug #3469254 [edit] Setting data to NULL and drop-downs +- bug #3477063 [edit] Missing set fields and values in generated INSERT query 3.4.9.0 (2011-12-21) - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown diff --git a/Documentation.html b/Documentation.html index 85d19f6..021db02 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.5.0-alpha1 - Documentation</title> + <title>phpMyAdmin 3.4.10-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.5.0-alpha1 + 3.4.10-rc1 Documentation </h1> </div> diff --git a/README b/README index e722ded..f3ced24 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.5.0-alpha1 +Version 3.4.10-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f4a05b5..bd89194 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -98,7 +98,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.5.0-alpha1'); + $this->set('PMA_VERSION', '3.4.10-rc1'); /** * @deprecated */ diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 8e27290..07e2d61 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -59,17 +59,19 @@ if (false !== $possibly_uploaded_val) { } // $key contains the md5() of the fieldname - if (0 === strlen($val) && $type != 'protected') { + if ($type != 'protected' && $type != 'set' && 0 === strlen($val)) { // best way to avoid problems in strict mode (works also in non-strict mode) if (isset($me_auto_increment) && isset($me_auto_increment[$key])) { $val = 'NULL'; } else { $val = "''"; - } + } } elseif ($type == 'set') { if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); - $val = "'" . PMA_sqlAddSlashes($val) . "'"; + $val = "'" . PMA_sqlAddslashes($val) . "'"; + } else { + $val = "''"; } } elseif ($type == 'protected') { // here we are in protected mode (asked in the config) diff --git a/po/lt.po b/po/lt.po index cea9e06..180be49 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3678,11 +3678,13 @@ msgstr "Pratęsta lentelės antraštė" msgid "Label key" msgstr "Pavadinimo raktas" -#: libraries/config/messages.inc.php:100 libraries/config/messages.inc.php:112 -#: libraries/config/messages.inc.php:136 libraries/export/odt.php:324 -#: libraries/tbl_properties.inc.php:135 -msgid "MIME type" -msgstr "MIME tipas" +#: libraries/config/messages.inc.php:324 +msgid "" +"[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " +"DATETIME and TIMESTAMP, ascending order otherwise" +msgstr "" +"[kbd]SMART[/kbd] - t.y. mažėjantis rikiavimas stulpeliams kurių tipai TIME, " +"DATE, DATETIME ir TIMESTAMP, didėjantis kitu atveju" #: libraries/config/messages.inc.php:102 libraries/config/messages.inc.php:114 #: libraries/config/messages.inc.php:138 tbl_relation.php:392 @@ -6547,6 +6549,8 @@ msgstr "PDF" #: libraries/export/pdf.php:24 msgid "(Generates a report containing the data of a single table)" msgstr "" +"Palikite tuščią, kad nebūtų PDF schemos palaikymo, siūlome: [kbd]" +"pma_table_coords[/kbd]" #: libraries/export/pdf.php:25 msgid "Report title:" diff --git a/po/ta.po b/po/ta.po index 4f55e58..d8b326d 100644 --- a/po/ta.po +++ b/po/ta.po @@ -11115,9 +11115,10 @@ msgstr "" msgid "Comment out these two lines if you do not need them." msgstr "" -#: tbl_tracking.php:215 -msgid "SQL statements exported. Please copy the dump or execute it." -msgstr "" +#: server_status.php:516 server_status.php:561 server_status.php:626 +#: server_status.php:687 +msgid "per hour" +msgstr "ஒரு மணி நேரத்திற்கு " #: tbl_tracking.php:246 #, php-format @@ -11145,17 +11146,13 @@ msgstr "" msgid "Show %s with dates from %s to %s by user %s %s" msgstr "" -#: tbl_tracking.php:438 -msgid "Delete tracking data row from report" -msgstr "" - -#: tbl_tracking.php:449 -msgid "No data" -msgstr "தரவு இல்லை" +#: server_status.php:627 +msgid "per minute" +msgstr "ஒரு நிமிடத்திற்கு " -#: tbl_tracking.php:459 tbl_tracking.php:516 -msgid "Date" -msgstr "திகதி" +#: server_status.php:628 +msgid "per second" +msgstr "ஒரு வினாடிக்கு" #: tbl_tracking.php:461 msgid "Data definition statement" diff --git a/po/te.po b/po/te.po index b1a9418..270a8ba 100644 --- a/po/te.po +++ b/po/te.po @@ -86,7 +86,7 @@ msgstr "వెళ్ళు" #: browse_foreigners.php:174 browse_foreigners.php:178 #: libraries/Index.class.php:440 tbl_tracking.php:319 msgid "Keyname" -msgstr "" +msgstr "కీలకపదం" #: browse_foreigners.php:175 browse_foreigners.php:177 #: server_collations.php:54 server_collations.php:66 server_engines.php:55 diff --git a/po/th.po b/po/th.po index 24f4f97..be1d174 100644 --- a/po/th.po +++ b/po/th.po @@ -10168,17 +10168,17 @@ msgstr "" msgid "The total number of data writes." msgstr "" -#: server_status.php:1341 -msgid "The amount of data written so far, in bytes." -msgstr "" +#: server_binlog.php:200 +msgid "Position" +msgstr "ตำแหน่ง" #: server_status.php:1342 msgid "The number of pages that have been written for doublewrite operations." msgstr "" -#: server_status.php:1343 -msgid "The number of doublewrite operations that have been performed." -msgstr "" +#: server_binlog.php:203 +msgid "Original position" +msgstr "ตำแหน่งเริ่มแรก" #: server_status.php:1344 msgid "" @@ -11747,20 +11747,17 @@ msgstr "ชนิดคำค้น" msgid "Tracking data manipulation successfully deleted" msgstr "" -#: tbl_tracking.php:417 -msgid "Tracking statements" -msgstr "" +#: server_synchronize.php:429 server_synchronize.php:872 +msgid "Apply index(s)" +msgstr "ดัชนี" -#: tbl_tracking.php:433 tbl_tracking.php:561 -#, php-format -msgid "Show %s with dates from %s to %s by user %s %s" -msgstr "" +#: server_synchronize.php:430 server_synchronize.php:873 +msgid "Update row(s)" +msgstr "อัพเดทแถว" -#: tbl_tracking.php:438 -#, fuzzy -#| msgid "Delete tracking data for this table" -msgid "Delete tracking data row from report" -msgstr "ลบการติดตามตารางนี้" +#: server_synchronize.php:431 server_synchronize.php:874 +msgid "Insert row(s)" +msgstr "เพิ่มแถว" #: tbl_tracking.php:449 #, fuzzy @@ -11773,13 +11770,13 @@ msgstr "ไม่มีฐานข้อมูล" msgid "Date" msgstr "ข้อมูล" -#: tbl_tracking.php:461 -msgid "Data definition statement" -msgstr "" +#: server_synchronize.php:444 server_synchronize.php:889 +msgid "Apply Selected Changes" +msgstr "ใช้การเปลี่ยนแปลงที่เลือก" -#: tbl_tracking.php:518 -msgid "Data manipulation statement" -msgstr "" +#: server_synchronize.php:446 server_synchronize.php:891 +msgid "Synchronize Databases" +msgstr "ทำให้ฐานข้อมูลเท่ากัน" #: tbl_tracking.php:564 msgid "SQL dump (file download)" @@ -11873,14 +11870,9 @@ msgstr "" msgid "Get more themes!" msgstr "" -#: transformation_overview.php:24 -msgid "Available MIME types" -msgstr "MIME-types ที่มีอยู่" - -#: transformation_overview.php:37 -msgid "" -"MIME types printed in italics do not have a separate transformation function" -msgstr "" +#: setup/frames/index.inc.php:212 +msgid "Display" +msgstr "แสดง" #: transformation_overview.php:42 msgid "Available transformations" @@ -11893,26 +11885,22 @@ msgctxt "for MIME transformation" msgid "Description" msgstr "รายละเอียด" -#: user_password.php:34 -msgid "You don't have sufficient privileges to be here right now!" -msgstr "คุณไม่มีสิทธิที่จะเข้ามาตรงนี้!" - -#: user_password.php:96 -msgid "The profile has been updated." -msgstr "ปรับปรุงโพรไฟล์เรียบร้อยแล้ว" +#: setup/frames/index.inc.php:228 +msgid "Donate" +msgstr "บริจาค" -#: view_create.php:141 -msgid "VIEW name" -msgstr "" +#: setup/frames/servers.inc.php:28 +msgid "Edit server" +msgstr "แก้ไข เครื่องแม่ข่าย" #: view_operations.php:91 #, fuzzy msgid "Rename view to" msgstr "เปลี่ยนชื่อตารางเป็น" -#: po/advisory_rules.php:5 -msgid "Uptime below one day" -msgstr "" +#: setup/lib/form_processing.lib.php:42 +msgid "Warning" +msgstr "คำเตือน" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." @@ -12522,10 +12510,24 @@ msgstr "" #: po/advisory_rules.php:153 #, php-format -msgid "" -"%s%% of all temporary tables are being written to disk, this value should be " -"below 25%%" -msgstr "" +msgid "Table %s has been flushed" +msgstr "ล้างตาราง %s เรียบร้อยแล้ว" + +#: tbl_operations.php:664 +#, fuzzy +#| msgid "Flush the table (\"FLUSH\")" +msgid "Flush the table (FLUSH)" +msgstr "ล้างตาราง (flush)" + +#: tbl_operations.php:673 +#, fuzzy +#| msgid "Dumping data for table" +msgid "Delete data or table" +msgstr "dump ตาราง" + +#: tbl_operations.php:688 +msgid "Empty the table (TRUNCATE)" +msgstr "ลบข้อมูลตาราง (TRUNCATE)" #: po/advisory_rules.php:155 #, fuzzy @@ -12552,9 +12554,9 @@ msgid "" "less than 1 per hour" msgstr "" -#: po/advisory_rules.php:160 -msgid "MyISAM key buffer size" -msgstr "" +#: tbl_operations.php:740 +msgid "Analyze" +msgstr "วิเคราะห์" #: po/advisory_rules.php:161 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." diff --git a/tbl_replace.php b/tbl_replace.php index 60dc7cf..6ba156d 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -223,7 +223,19 @@ foreach ($loop_array as $rownumber => $where_clause) { if ($is_insert && $using_key && isset($me_fields_type) && is_array($me_fields_type) && isset($where_clause)) { $prot_row = PMA_DBI_fetch_single_row('SELECT * FROM ' . PMA_backquote($table) . ' WHERE ' . $where_clause . ';'); } - foreach ($me_fields as $key => $val) { + + // When a select field is nullified, it's not present in $_REQUEST + // so initialize it; this way, the foreach($me_fields) will process it + foreach ($me_fields_name as $key => $val) { + if (! isset($me_fields[$key])) { + $me_fields[$key] = ''; + } + } + + // Iterate in the order of $me_fields_name, not $me_fields, to avoid problems + // when inserting multiple entries + foreach ($me_fields_name as $key => $field_name) { + $val = $me_fields[$key]; // Note: $key is an md5 of the fieldname. The actual fieldname is available in $me_fields_name[$key] hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_10RC1, created. RELEASE_3_4_10RC1
by Marc Delisle 24 Jan '12

24 Jan '12

The annotated tag, RELEASE_3_4_10RC1 has been created at b32783fd46e79a42abe2d637872c3b9bdb51e0ad (tag) tagging 6d58b78a322a8a0fecd5c914d04cb4402cdab910 (commit) replaces RELEASE_3_4_9 tagged by Marc Delisle on Tue Jan 24 12:33:42 2012 -0500 - Log ----------------------------------------------------------------- Released 3.4.10-rc1 Glenn (1): patch #3458944 copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO' Madhura Jayaratne (3): bug #3049209 [import] Import from ODS ignores cell that is the same as cell before To avoid warnings when strlen() is called on the array containing chosen values for set field bug #3477063 [edit] Missing set fields and values in generated INSERT query Marc Delisle (6): 3.4.10-dev patch #3375984 [export] PHP Array export might generate invalid php code 3.4.9 bug #3463933 [display] SELECT DISTINCT displays wrong total records found bug #3469254 [edit] Setting data to NULL and drop-downs 3.4.10-rc1 Michal Čihař (5): Merge remote branch 'origin/MAINT_3_4_9' into QA_3_4 Update translations from master Merge remote-tracking branch 'origin/MAINT_3_4_9' into QA_3_4 Update translations from master Merge translations from master Rouslan Placella (1): Fixed bug # 3460090 - TextareaAutoSelect feature broken Sven Strickroth (5): fix invalid PHP variable names escape single quotes in column names add backquotes to improve look and feel of output added spaces to improve look and feel of output fixed typo ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-882-g3a5203e
by Marc Delisle 24 Jan '12

24 Jan '12

The branch, master has been updated via 3a5203e33e529190e7afd875f9bde094f4eee4a2 (commit) from 845e1f8378550d2e6f69eff60fdf159bad1f8d3a (commit) - Log ----------------------------------------------------------------- commit 3a5203e33e529190e7afd875f9bde094f4eee4a2 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 24 12:28:57 2012 -0500 Maybe 3.4.11 ? ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29cdd12..08694de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,6 +71,8 @@ phpMyAdmin - ChangeLog - patch #3472899 [export] Fixed CSV escape for the export - patch #3475424 [import] Fixed CSV escape for the import +3.4.11.0 (not yet released) + 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken - patch #3375984 [export] PHP Array export might generate invalid php code hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_9-21-gbadc93d
by Marc Delisle 24 Jan '12

24 Jan '12

The branch, QA_3_4 has been updated via badc93d5d4eb2dcd02f6898e13977dafe11425db (commit) from 3c7b233d9c83b501f5e220a6dcba8259b7554a87 (commit) - Log ----------------------------------------------------------------- commit badc93d5d4eb2dcd02f6898e13977dafe11425db Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 24 12:28:06 2012 -0500 Maybe 3.4.11 ? ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a61a573..4e20e33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.4.11.0 (not yet released) + 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken - patch #3375984 [export] PHP Array export might generate invalid php code diff --git a/Documentation.html b/Documentation.html index 671c0fd..8731708 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.10-dev - Documentation</title> + <title>phpMyAdmin 3.4.11-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.10-dev + 3.4.11-dev Documentation </h1> </div> diff --git a/README b/README index 68e7c99..aa9c279 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.10-dev +Version 3.4.11-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 090ee6a..f6d6c63 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.10-dev'); + $this->set('PMA_VERSION', '3.4.11-dev'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_10, updated. RELEASE_3_4_9-21-g6d58b78
by Marc Delisle 24 Jan '12

24 Jan '12

The branch, MAINT_3_4_10 has been updated via 6d58b78a322a8a0fecd5c914d04cb4402cdab910 (commit) from 3c7b233d9c83b501f5e220a6dcba8259b7554a87 (commit) - Log ----------------------------------------------------------------- commit 6d58b78a322a8a0fecd5c914d04cb4402cdab910 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Jan 24 12:25:51 2012 -0500 3.4.10-rc1 ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 671c0fd..1d57595 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.10-dev - Documentation</title> + <title>phpMyAdmin 3.4.10-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.10-dev + 3.4.10-rc1 Documentation </h1> </div> diff --git a/README b/README index 68e7c99..77c11da 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.10-dev +Version 3.4.10-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 090ee6a..ad0ecda 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.10-dev'); + $this->set('PMA_VERSION', '3.4.10-rc1'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_10, created. RELEASE_3_4_9-20-g3c7b233
by Marc Delisle 24 Jan '12

24 Jan '12

The branch, MAINT_3_4_10 has been created at 3c7b233d9c83b501f5e220a6dcba8259b7554a87 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2012