Git January 2012

git@phpmyadmin.net

5 participants
135 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-271-gdb22f56
by Marc Delisle 28 Jan '12

28 Jan '12

The branch, master has been updated via db22f56fd2584508bc77cb03922020183ac8bb49 (commit) from 34d01c91073384ab28713fc8a599d5df6978e08e (commit) - Log ----------------------------------------------------------------- commit db22f56fd2584508bc77cb03922020183ac8bb49 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:12:07 2012 -0500 Document MaxRows behavior when a LIMIT clause is present ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 8fafa5f..3389933 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1661,8 +1661,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> "show all (rows)" button in browse mode or not.</dd> <dt id="cfg_MaxRows">$cfg['MaxRows'] integer</dt> - <dd>Number of rows displayed when browsing a result set. If the result set - contains more rows, "Previous" and "Next" links will be shown.</dd> + <dd>Number of rows displayed when browsing a result set and no LIMIT + clause is used. If the result set contains more rows, "Previous" and "Next" links will be shown.</dd> <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt> <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-272-g2877921
by Marc Delisle 28 Jan '12

28 Jan '12

The branch, QA_3_5 has been updated via 28779212196686f44650e362ec0fcfbb23140288 (commit) from 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (commit) - Log ----------------------------------------------------------------- commit 28779212196686f44650e362ec0fcfbb23140288 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:12:07 2012 -0500 Document MaxRows behavior when a LIMIT clause is present ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 49f6ec1..a4841d4 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1661,8 +1661,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> "show all (rows)" button in browse mode or not.</dd> <dt id="cfg_MaxRows">$cfg['MaxRows'] integer</dt> - <dd>Number of rows displayed when browsing a result set. If the result set - contains more rows, "Previous" and "Next" links will be shown.</dd> + <dd>Number of rows displayed when browsing a result set and no LIMIT + clause is used. If the result set contains more rows, "Previous" and "Next" links will be shown.</dd> <dt id="cfg_Order">$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]</dt> <dd>Defines whether columns are displayed in ascending (<tt>ASC</tt>) order, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-271-g52f6015
by Marc Delisle 28 Jan '12

28 Jan '12

The branch, QA_3_5 has been updated via 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 (commit) from 34d01c91073384ab28713fc8a599d5df6978e08e (commit) - Log ----------------------------------------------------------------- commit 52f60156cb8ddc5a24fbd7c0a43c856f00391d38 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 28 04:06:37 2012 -0500 Put back correct version in this branch (was lost during commit f196b4804d8e96386a822e68927e2103956a868f) ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 -- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53c143a..08694de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,6 @@ phpMyAdmin - ChangeLog ====================== -3.6.0.0 (not yet released) - 3.5.0.0 (not yet released) + rfe #2021981 [interface] Add support for mass prefix change. + "up to date" message on main page when current version is up to date diff --git a/Documentation.html b/Documentation.html index 8fafa5f..49f6ec1 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.6.0-dev - Documentation</title> + <title>phpMyAdmin 3.5.0-beta2 - 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.6.0-dev + 3.5.0-beta2 Documentation </h1> </div> diff --git a/README b/README index f1ba37a..5e1d40b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.6.0-dev +Version 3.5.0-beta2 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 635a02e..8235d83 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.6.0-dev'); + $this->set('PMA_VERSION', '3.5.0-beta2'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-270-g34d01c9
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, master has been updated via 34d01c91073384ab28713fc8a599d5df6978e08e (commit) via c414374aba8af92f556b5f35b90962ffee012999 (commit) via ca035b4ca596300d2fc51ad00d63cfa72ccc64d6 (commit) via 1d2ce6b4549f11cd7e7f9e8d2592c689a96ff956 (commit) via 945038f564ccfa2d6783c799bd5596f005624702 (commit) via a43c83db4258057a273039f78114161797c191b0 (commit) via 1f1c915482d60932a4d232981f897b85a2d5eb2b (commit) via b8d00c5f02b64e5cd9a5ab21ffa96b432851a348 (commit) via 7bf8d9495f29850f59f235489db8547cfbf78031 (commit) via 649ba9f5b194bcd29da799244601cf26592509da (commit) via d8d42a642b627547e9a93429025b69325caae519 (commit) via 0aecbea9df31c99b854747c5ad42c52bb315af49 (commit) from 90f29bceede052dfaf509600ad11f73bc059c335 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d570530..4b28ad4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-25 17:45+0100\n" -"PO-Revision-Date: 2011-12-29 18:17+0200\n" -"Last-Translator: WillBa <widelan10(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-27 15:50+0200\n" +"Last-Translator: any anonymous user <>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -1541,7 +1541,7 @@ msgstr "Dividido por %s:" #: js/messages.php:172 msgid "Unit" -msgstr "" +msgstr "Unidade" #: js/messages.php:174 msgid "From slow log" @@ -1600,7 +1600,7 @@ msgstr "Analisando..." #, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Explicar SQL" +msgstr "Explicar saída SQL" #: js/messages.php:188 js/messages.php:494 libraries/rte/rte_list.lib.php:62 #: server_status.php:1236 sql.php:897 @@ -1615,7 +1615,7 @@ msgstr "Tempo total:" #, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Perfil" +msgstr "Resultado do Perfil" #: js/messages.php:191 msgctxt "Display format" @@ -1687,7 +1687,7 @@ msgstr "Linhas afetadas:" #, fuzzy msgid "Failed parsing config file. It doesn't seem to be valid JSON code." msgstr "" -"Falha ao processar o arquivo de configuração. Não parece ser código JSON " +"Falha ao processar o arquivo de configuração. Não parece ser um código JSON " "válido" #: js/messages.php:211 @@ -1713,7 +1713,7 @@ msgstr "Analisar a consulta" #: js/messages.php:218 msgid "Advisor system" -msgstr "" +msgstr "Sistema de assessoria" #: js/messages.php:219 msgid "Possible performance issues" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-270-g34d01c9
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, QA_3_5 has been updated via 34d01c91073384ab28713fc8a599d5df6978e08e (commit) via c414374aba8af92f556b5f35b90962ffee012999 (commit) via ca035b4ca596300d2fc51ad00d63cfa72ccc64d6 (commit) via 1d2ce6b4549f11cd7e7f9e8d2592c689a96ff956 (commit) via 945038f564ccfa2d6783c799bd5596f005624702 (commit) via a43c83db4258057a273039f78114161797c191b0 (commit) via 1f1c915482d60932a4d232981f897b85a2d5eb2b (commit) via b8d00c5f02b64e5cd9a5ab21ffa96b432851a348 (commit) via 7bf8d9495f29850f59f235489db8547cfbf78031 (commit) via 649ba9f5b194bcd29da799244601cf26592509da (commit) via d8d42a642b627547e9a93429025b69325caae519 (commit) via 0aecbea9df31c99b854747c5ad42c52bb315af49 (commit) from 90f29bceede052dfaf509600ad11f73bc059c335 (commit) - Log ----------------------------------------------------------------- commit 34d01c91073384ab28713fc8a599d5df6978e08e Merge: 90f29bc c414374 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jan 27 15:01:29 2012 +0100 Merge remote-tracking branch 'pootle/master' into QA_3_5 commit c414374aba8af92f556b5f35b90962ffee012999 Author: any anonymous user <> Date: Fri Jan 27 15:50:55 2012 +0200 Translation update done using Pootle. commit ca035b4ca596300d2fc51ad00d63cfa72ccc64d6 Author: V4g_Br4Ck3r <vag_bracker(a)hotmail.com> Date: Fri Jan 27 15:50:55 2012 +0200 Translation update done using Pootle. commit 1d2ce6b4549f11cd7e7f9e8d2592c689a96ff956 Author: V4g_Br4Ck3r <vag_bracker(a)hotmail.com> Date: Fri Jan 27 15:50:07 2012 +0200 Translation update done using Pootle. commit 945038f564ccfa2d6783c799bd5596f005624702 Author: V4g_Br4Ck3r <vag_bracker(a)hotmail.com> Date: Fri Jan 27 15:50:06 2012 +0200 Translation update done using Pootle. commit a43c83db4258057a273039f78114161797c191b0 Author: V4g_Br4Ck3r <vag_bracker(a)hotmail.com> Date: Fri Jan 27 15:46:06 2012 +0200 Translation update done using Pootle. commit 1f1c915482d60932a4d232981f897b85a2d5eb2b Author: V4g_Br4Ck3r <vag_bracker(a)hotmail.com> Date: Fri Jan 27 15:46:06 2012 +0200 Translation update done using Pootle. commit b8d00c5f02b64e5cd9a5ab21ffa96b432851a348 Merge: 7bf8d94 d4eaf57 Author: Pootle server <pootle(a)cihar.com> Date: Fri Jan 27 14:40:09 2012 +0100 Merge remote-tracking branch 'origin/master' commit 7bf8d9495f29850f59f235489db8547cfbf78031 Author: any anonymous user <> Date: Fri Jan 27 15:32:27 2012 +0200 Translation update done using Pootle. commit 649ba9f5b194bcd29da799244601cf26592509da Author: V4g_Br4Ck3r <vag_bracker(a)hotmail.com> Date: Fri Jan 27 15:32:26 2012 +0200 Translation update done using Pootle. commit d8d42a642b627547e9a93429025b69325caae519 Author: V4g_Br4Ck3r <vag_bracker(a)hotmail.com> Date: Fri Jan 27 15:31:45 2012 +0200 Translation update done using Pootle. commit 0aecbea9df31c99b854747c5ad42c52bb315af49 Merge: 4bd24a9 e64d33b Author: Pootle server <pootle(a)cihar.com> Date: Fri Jan 27 14:15:04 2012 +0100 Merge remote-tracking branch 'origin/master' ----------------------------------------------------------------------- Summary of changes: po/pt_BR.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d570530..4b28ad4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-25 17:45+0100\n" -"PO-Revision-Date: 2011-12-29 18:17+0200\n" -"Last-Translator: WillBa <widelan10(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-27 15:50+0200\n" +"Last-Translator: any anonymous user <>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -1541,7 +1541,7 @@ msgstr "Dividido por %s:" #: js/messages.php:172 msgid "Unit" -msgstr "" +msgstr "Unidade" #: js/messages.php:174 msgid "From slow log" @@ -1600,7 +1600,7 @@ msgstr "Analisando..." #, fuzzy #| msgid "Explain SQL" msgid "Explain output" -msgstr "Explicar SQL" +msgstr "Explicar saída SQL" #: js/messages.php:188 js/messages.php:494 libraries/rte/rte_list.lib.php:62 #: server_status.php:1236 sql.php:897 @@ -1615,7 +1615,7 @@ msgstr "Tempo total:" #, fuzzy #| msgid "Profiling" msgid "Profiling results" -msgstr "Perfil" +msgstr "Resultado do Perfil" #: js/messages.php:191 msgctxt "Display format" @@ -1687,7 +1687,7 @@ msgstr "Linhas afetadas:" #, fuzzy msgid "Failed parsing config file. It doesn't seem to be valid JSON code." msgstr "" -"Falha ao processar o arquivo de configuração. Não parece ser código JSON " +"Falha ao processar o arquivo de configuração. Não parece ser um código JSON " "válido" #: js/messages.php:211 @@ -1713,7 +1713,7 @@ msgstr "Analisar a consulta" #: js/messages.php:218 msgid "Advisor system" -msgstr "" +msgstr "Sistema de assessoria" #: js/messages.php:219 msgid "Possible performance issues" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-258-g90f29bc
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, master has been updated via 90f29bceede052dfaf509600ad11f73bc059c335 (commit) from d4eaf57b88584d0b863b44a50b849014c6d18afc (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: test/classes/PMA_Config_test.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php index 3e48383..31c1886 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/PMA_Config_test.php @@ -69,11 +69,14 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase $this->object->checkOutputCompression(); $this->assertEquals('auto', $this->object->get("OBGzip")); +/* + Disabled as ini_set is quite often not allowed @ini_set('zlib.output_compression', 'Off'); $this->object->checkOutputCompression(); $this->assertFalse($this->object->get("OBGzip")); @ini_set('zlib.output_compression', 'On'); + */ } public function testCheckClient() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-258-g90f29bc
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, QA_3_5 has been updated via 90f29bceede052dfaf509600ad11f73bc059c335 (commit) from d4eaf57b88584d0b863b44a50b849014c6d18afc (commit) - Log ----------------------------------------------------------------- commit 90f29bceede052dfaf509600ad11f73bc059c335 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jan 27 15:01:00 2012 +0100 Avoid using ini_set ----------------------------------------------------------------------- Summary of changes: test/classes/PMA_Config_test.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php index 3e48383..31c1886 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/PMA_Config_test.php @@ -69,11 +69,14 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase $this->object->checkOutputCompression(); $this->assertEquals('auto', $this->object->get("OBGzip")); +/* + Disabled as ini_set is quite often not allowed @ini_set('zlib.output_compression', 'Off'); $this->object->checkOutputCompression(); $this->assertFalse($this->object->get("OBGzip")); @ini_set('zlib.output_compression', 'On'); + */ } public function testCheckClient() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-257-gd4eaf57
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, master has been updated via d4eaf57b88584d0b863b44a50b849014c6d18afc (commit) via 8cef483dfe3452b235f0f18a398b4060f1db39a2 (commit) via 4bd24a9b97d3f723206dd06ee6ebcbcb3078e888 (commit) via 8bd33decfdf80bebdd1a2229517b7314a2eccbc0 (commit) via 760aac415549c1d646b331b91c0dd6d4e5121fb9 (commit) via 71cb4f0a804bce4621071eb187ec8a7550a920ac (commit) via b1577c2b1945670d9bfadbcf0513e36fc7bdfae4 (commit) via 697cbf9c0d9c65ed5c9a46aa0175c8168b967a1f (commit) via 736678caa62ebd16821dab2eaa9b62972cbab729 (commit) via 832192feece91e0813906689dba1e2d0b0e828f4 (commit) via 4c3e985c2dffc27190a591eac8d3484c23473241 (commit) via e8070b5488fbcf9d26e0d2e2fdd68f2123050e2d (commit) via f213940834ddf7b4a431120075ef48c6785cec45 (commit) via d23a10933a0df83d21b2379aacc00b44a1f8335d (commit) via f597c6c5b8e4b12a25b6f7bcade9cba604779427 (commit) via 51ae6e7e4d90ef25287feafdadf2c8f9d7d66bf5 (commit) via a5c32db3091509d9e06f3dd6346055bc8a56be73 (commit) via 1d23dc8747085e5add63b90fdc66c743ac944667 (commit) via a078318ef53b48320dd537870e7a11e20e23c52b (commit) from e64d33bba3b7355f25dbf637de9732367ed8a24e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/cs.po | 45 ++++++++++++++++++------------------- test/classes/PMA_Config_test.php | 4 +- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/po/cs.po b/po/cs.po index 7c39b20..f92afe4 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-25 17:45+0100\n" -"PO-Revision-Date: 2012-01-27 14:58+0200\n" +"PO-Revision-Date: 2012-01-27 15:08+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -806,7 +806,7 @@ msgstr "Sledovat tabulku" #: db_tracking.php:227 msgid "Database Log" -msgstr "Historie databáze" +msgstr "Záznam databáze" #: enum_editor.php:23 js/messages.php:266 #: libraries/rte/rte_routines.lib.php:690 @@ -1495,7 +1495,7 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" -"Nemůžete změnit uvedené proměnné. Prosím přihlašte se jako root nebo " +"Nemůžete změnit uvedené proměnné. Prosím přihlaste se jako root nebo " "kontaktujte vašeho správce databáze." #: js/messages.php:165 @@ -1526,11 +1526,11 @@ msgstr "Jednotka" #: js/messages.php:174 msgid "From slow log" -msgstr "Ze zánamu pomalých dotazů" +msgstr "Ze záznamu pomalých dotazů" #: js/messages.php:175 msgid "From general log" -msgstr "Z obecného zánamu dotazů" +msgstr "Z obecného záznamu dotazů" #: js/messages.php:176 msgid "Analysing & loading logs. This may take a while." @@ -1608,7 +1608,7 @@ msgstr "Graf" #. l10n: A collection of available filters #: js/messages.php:195 msgid "Log table filter options" -msgstr "Nastavení filtrování logovacích tabulek" +msgstr "Nastavení filtrování záznamových tabulek" #. l10n: Filter as in "Start Filtering" #: js/messages.php:197 @@ -4597,9 +4597,9 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] " "support, suggested: [kbd]pma_bookmark[/kbd]" msgstr "" -"Nechte prázdné pro žádnou podporu Leave blank for no [a@http://wiki." -"phpmyadmin.net/pma/bookmark]záložek[/a], výchozí nastavení: [kbd]" -"pma_bookmarks[/kbd]" +"Nechte prázdné pro vypnutí podpory " +"[a@http://wiki.phpmyadmin.net/pma/bookmark]záložek[/a], doporučené " +"nastavení: [kbd]pma_bookmarks[/kbd]" #: libraries/config/messages.inc.php:375 msgid "Bookmark table" @@ -6168,13 +6168,13 @@ msgstr "" #: libraries/engines/pbms.lib.php:30 msgid "Garbage Threshold" -msgstr "Práh velikosti odpadu (garbage)" +msgstr "Hranice odpadu" #: libraries/engines/pbms.lib.php:31 msgid "The percentage of garbage in a repository file before it is compacted." msgstr "" -"Procentuální podíl odpadu (garbage) v souboru datového logu předtím, než je " -"soubor stlačen." +"Procentuální podíl odpadu v souboru datového logu předtím, než je soubor " +"zhuštěn." #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:70 #: server_synchronize.php:1261 @@ -6191,7 +6191,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" -msgstr "Práh velikosti skladiště" +msgstr "Hranice skladiště" #: libraries/engines/pbms.lib.php:41 msgid "" @@ -6216,7 +6216,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:50 msgid "Temp Log Threshold" -msgstr "Práh velikosti dočasného logového souboru" +msgstr "Hranice dočasného záznanového souboru" #: libraries/engines/pbms.lib.php:51 msgid "" @@ -6314,7 +6314,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:37 msgid "Log file threshold" -msgstr "Prahová hodnota logového souboru" +msgstr "Hranice záznamového souboru" #: libraries/engines/pbxt.lib.php:38 msgid "" @@ -6350,7 +6350,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:52 msgid "Data log threshold" -msgstr "Nejvyšší velikost datového logu" +msgstr "Hranice datového záznamu" #: libraries/engines/pbxt.lib.php:53 msgid "" @@ -6366,16 +6366,15 @@ msgstr "" #: libraries/engines/pbxt.lib.php:57 msgid "Garbage threshold" -msgstr "Největší velikost odpadu (garbage)" +msgstr "Hranice odpadu" #: libraries/engines/pbxt.lib.php:58 msgid "" "The percentage of garbage in a data log file before it is compacted. This is " "a value between 1 and 99. The default is 50." msgstr "" -"Procentuální podíl odpadu (garbage) v souboru datového logu předtím, než je " -"soubor stlačen. Tato hodnota se může pohybovat mezi 1 a 99. Výchozí hodnota " -"je 50." +"Procentuální podíl odpadu v souboru datového logu předtím, než je soubor " +"zhuštěn. Tato hodnota se může pohybovat mezi 1 a 99. Výchozí hodnota je 50." #: libraries/engines/pbxt.lib.php:62 msgid "Log buffer size" @@ -7196,7 +7195,7 @@ msgid "" "Please see the documentation on how to update your column_comments table" msgstr "" "Podívejte se prosím do dokumentace, jak aktualizovat tabulku s informacemi " -"o polích (tabulka column_comments)" +"o polích v tabulce column_comments" #: libraries/relation.lib.php:124 libraries/sql_query_form.lib.php:376 msgid "Bookmarked SQL query" @@ -12378,7 +12377,7 @@ msgid "" msgstr "" "Na řazení není nic špatného, ale ujistěte se, že dotazy, které hojně " "využívají řazení používají klíče ve frázi ORDER BY, protože toto zajistí " -"rychlejší řazení." +"rychlejší řazení" #: po/advisory_rules.php:123 #, php-format @@ -12399,7 +12398,7 @@ msgid "" "columns being used in the join conditions will greatly speed up table joins" msgstr "" "To znamená, že spojení tabulek musí často procházet celou tabulku. Přidáním " -"klíčů na sloupce použité při slučování můžete tuto operaci značně urychlit." +"klíčů na sloupce použité při slučování můžete tuto operaci značně urychlit" #: po/advisory_rules.php:128 #, php-format diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php index 991765a..3e48383 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/PMA_Config_test.php @@ -69,11 +69,11 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase $this->object->checkOutputCompression(); $this->assertEquals('auto', $this->object->get("OBGzip")); - ini_set('zlib.output_compression', 'Off'); + @ini_set('zlib.output_compression', 'Off'); $this->object->checkOutputCompression(); $this->assertFalse($this->object->get("OBGzip")); - ini_set('zlib.output_compression', 'On'); + @ini_set('zlib.output_compression', 'On'); } public function testCheckClient() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-257-gd4eaf57
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, QA_3_5 has been updated via d4eaf57b88584d0b863b44a50b849014c6d18afc (commit) from 8cef483dfe3452b235f0f18a398b4060f1db39a2 (commit) - Log ----------------------------------------------------------------- commit d4eaf57b88584d0b863b44a50b849014c6d18afc Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jan 27 14:16:09 2012 +0100 Prevent warnings from ini_set ----------------------------------------------------------------------- Summary of changes: test/classes/PMA_Config_test.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php index 991765a..3e48383 100644 --- a/test/classes/PMA_Config_test.php +++ b/test/classes/PMA_Config_test.php @@ -69,11 +69,11 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase $this->object->checkOutputCompression(); $this->assertEquals('auto', $this->object->get("OBGzip")); - ini_set('zlib.output_compression', 'Off'); + @ini_set('zlib.output_compression', 'Off'); $this->object->checkOutputCompression(); $this->assertFalse($this->object->get("OBGzip")); - ini_set('zlib.output_compression', 'On'); + @ini_set('zlib.output_compression', 'On'); } public function testCheckClient() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-238-ge64d33b
by Michal Čihař 27 Jan '12

27 Jan '12

The branch, master has been updated via e64d33bba3b7355f25dbf637de9732367ed8a24e (commit) via 3ef4b37f447469b51e3842a26f15e864798354ff (commit) via 9f3e5f46028a5f6e30915f5c547a348b7942ed5c (commit) via fa57bf1b7cd2061ae0bd3c548af7673246e63ecb (commit) via 0a6ae4b26077674e12364d38caa7f469044eb65f (commit) via 24e8aacd051dce33a9db0e44ce1c6c388baaf5b9 (commit) via ced6716d71a2943875912a9875e9073510e0bc84 (commit) via 4301ed2ab948cb90ceb1a6fe3a5cfa055e9ec5d3 (commit) via 61c2348201746bac0c332131683a3938b450df40 (commit) via 8ae4e415546a722d898ed0a3291562f52ded3873 (commit) via 64d4d0e7d2f7e8a51f1a3480eeec1f076765612c (commit) via cf8118c0906d5f3cbb8f2a908042d671eecc2972 (commit) via b2b31f9b892d27174c2b99228ce1bc7a2f4ea39b (commit) via ec1ab93652d9ece93d4bd6a2e437cae99bc06e3d (commit) via a64923acac18759ee90a7acc453aa29814f5f534 (commit) via 39919646625e9d562cfdf01eda82f25f6fc68177 (commit) via 0052f63c632bbcd78de5fec9d5730bfc0a5992c8 (commit) via e4d110b4d489e19380059289bce572fa73d2b2a8 (commit) via e79d0bc1de688b843a7ebc8caea068a9278ddee6 (commit) via 760fe8de1b711b86584a98432c09ddb93beb9b48 (commit) via e66f23fcae4bff5b13a464c980b03fb41d423c0a (commit) via dda8dc59745d90612476bc0d09630b21cd03188c (commit) from a8e38f8cdbe331ba2092c6efa45bfadfca82df11 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/cs.po | 40 +++++++++++++++++++++++++++++++--------- po/ko.po | 28 ++++++++-------------------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/po/cs.po b/po/cs.po index e6cd5ba..7c39b20 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta2\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-25 17:45+0100\n" -"PO-Revision-Date: 2012-01-24 21:07+0200\n" +"PO-Revision-Date: 2012-01-27 14:58+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -12398,11 +12398,15 @@ msgid "" "This means that joins are doing full table scans. Adding indexes for the " "columns being used in the join conditions will greatly speed up table joins" msgstr "" +"To znamená, že spojení tabulek musí často procházet celou tabulku. Přidáním " +"klíčů na sloupce použité při slučování můžete tuto operaci značně urychlit." #: po/advisory_rules.php:128 #, php-format msgid "Table joins average: %s, this value should be less than 1 per hour" msgstr "" +"Průměrně sloučeno tabulek: %s, tato hodnota by měla být menší než 1 za " +"hodinu" #: po/advisory_rules.php:130 msgid "Rate of reading first index entry" @@ -12426,6 +12430,8 @@ msgstr "" #, php-format msgid "Index scans average: %s, this value should be less than 1 per hour" msgstr "" +"Průměrně procházeno klíčů: %s, tato hodnota by měla být menší než 1 za " +"hodinu" #: po/advisory_rules.php:135 msgid "Rate of reading fixed position" @@ -12448,6 +12454,8 @@ msgid "" "Rate of reading fixed position average: %s, this value should be less than 1 " "per hour" msgstr "" +"Četnost čtení na pevné pozici: %s, tato hodnota by měla být menší než 1 za " +"hodinu" #: po/advisory_rules.php:140 msgid "Rate of reading next table row" @@ -12468,6 +12476,8 @@ msgstr "" msgid "" "Rate of reading next table row: %s, this value should be less than 1 per hour" msgstr "" +"Četnost čtení dalšího řádku tabulky: %s, tato hodnota by měla být menší než " +"1 za hodinu" #: po/advisory_rules.php:145 msgid "tmp_table_size vs. max_heap_table_size" @@ -12541,6 +12551,8 @@ msgid "" "Rate of temporary tables being written to disk: %s, this value should be " "less than 1 per hour" msgstr "" +"Četnost dočasného ukládání na disk: %s, tato hodnota by měla být menší než 1 " +"za hodinu" #: po/advisory_rules.php:160 msgid "MyISAM key buffer size" @@ -12633,6 +12645,8 @@ msgstr "" #, php-format msgid "Opened table rate: %s, this value should be less than 10 per hour" msgstr "" +"Četnost otevírání tabulek: %s, tato hodnota by měla být menší než 10 za " +"hodinu" #: po/advisory_rules.php:185 #, fuzzy @@ -12659,10 +12673,9 @@ msgid "" msgstr "" #: po/advisory_rules.php:190 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of open files" -msgstr "Formát importovaného souboru" +msgstr "Četnost otevírání souborů" #: po/advisory_rules.php:191 #, fuzzy @@ -12674,6 +12687,8 @@ msgstr "Počet nevyřízených synchronizací logovacích souborů." #, php-format msgid "Opened files rate: %s, this value should be less than 5 per hour" msgstr "" +"Četnost otevírání souborů: %s, tato hodnota by měla být menší než 5 za " +"hodinu" #: po/advisory_rules.php:195 #, php-format @@ -12697,12 +12712,14 @@ msgstr "" #: po/advisory_rules.php:200 msgid "Table lock wait rate" -msgstr "" +msgstr "Četnost čekání na zámek tabulky" #: po/advisory_rules.php:203 #, php-format msgid "Table lock wait rate: %s, this value should be less than 1 per hour" msgstr "" +"Četnost čekání na zámek tabulky: %s, tato hodnota by měla být menší než 1 za " +"hodinu" #: po/advisory_rules.php:205 #, fuzzy @@ -12746,19 +12763,20 @@ msgstr "" #: po/advisory_rules.php:215 msgid "Threads that are slow to launch" -msgstr "" +msgstr "Vlákna se spouštějí příliš dlouho" #: po/advisory_rules.php:216 -#, fuzzy #| msgid "The number of threads that are not sleeping." msgid "There are too many threads that are slow to launch." -msgstr "Počet vláken, která nespí." +msgstr "Je příliš mnoho vláken, která se spouštějí dlouho." #: po/advisory_rules.php:217 msgid "" "This generally happens in case of general system overload as it is pretty " "simple operations. You might want to monitor your system load carefully." msgstr "" +"K tomuto obvykle dochází v případě přetížení systému, protože se jedná o " +"velmi jednoduchou operaci. Je vhodné podrobně sledovat zatížení systému." #: po/advisory_rules.php:218 #, php-format @@ -12839,6 +12857,8 @@ msgstr "Trvalé připojení" msgid "" "Aborted connections rate is at %s, this value should be less than 1 per hour" msgstr "" +"Četnost přerušených spojení je %s, tato hodnota by měla být menší než 1 za " +"hodinu" #: po/advisory_rules.php:240 msgid "Percentage of aborted clients" @@ -12870,10 +12890,12 @@ msgstr "Formát importovaného souboru" #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" msgstr "" +"Četnost přerušených klientů: %s, tato hodnota by měla být menší než 1 za " +"hodinu" #: po/advisory_rules.php:250 msgid "Is InnoDB disabled?" -msgstr "" +msgstr "InnoDB je vypnuto?" #: po/advisory_rules.php:251 msgid "You do not have InnoDB enabled." @@ -12881,7 +12903,7 @@ msgstr "Máte zakázané InnoDB." #: po/advisory_rules.php:252 msgid "InnoDB is usually the better choice for table engines." -msgstr "" +msgstr "InnoDB je obvykle nejlepší volba úložiště tabulky." #: po/advisory_rules.php:253 msgid "have_innodb is set to 'value'" diff --git a/po/ko.po b/po/ko.po index 3b66495..1405a21 100644 --- a/po/ko.po +++ b/po/ko.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-25 17:45+0100\n" "PO-Revision-Date: 2012-01-27 08:18+0200\n" -"Last-Translator: manyfun <manyfun7(a)gmail.com>\n" +"Last-Translator: minsung kang <manyfun7(a)gmail.com>\n" "Language-Team: korean <ko(a)li.org>\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -806,25 +806,22 @@ msgid "ENUM/SET editor" msgstr "ENUM/SET 수정" #: enum_editor.php:28 js/messages.php:268 -#, fuzzy #| msgid "Values for the column \"%s\"" msgid "Values for a new column" msgstr "새로운 열의 값" #: enum_editor.php:30 js/messages.php:267 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Values for column %s" msgstr "\"%s\" 열의 값" #: enum_editor.php:34 js/messages.php:269 -#, fuzzy #| msgid "Enter each value in a separate field." msgid "Enter each value in a separate field" msgstr "각각의 필드에 값을 입력하세요" #: enum_editor.php:123 -#, fuzzy msgid "Add a value" msgstr "값을 추가" @@ -941,7 +938,6 @@ msgid "Add an inner ring" msgstr "내부 링 추가" #: gis_data_editor.php:266 js/messages.php:322 -#, fuzzy msgid "Polygon" msgstr "폴리곤" @@ -1103,7 +1099,6 @@ msgid "This is not a number!" msgstr "은 숫자가 아닙니다!" #: js/messages.php:46 -#, fuzzy #| msgid "Add index" msgid "Add Index" msgstr "인덱스 추가" @@ -1114,7 +1109,7 @@ msgid "Edit Index" msgstr "인덱스 수정" #: js/messages.php:48 tbl_indexes.php:293 -#, fuzzy, php-format +#, php-format msgid "Add %d column(s) to index" msgstr "인덱스에 %d 열 추가" @@ -1249,7 +1244,6 @@ msgid "Local monitor configuration incompatible" msgstr "호환되지 않는 로컬 모니터 설정입니다." #: js/messages.php:95 -#, fuzzy msgid "" "The chart arrangement configuration in your browsers local storage is not " "compatible anymore to the newer version of the monitor dialog. It is very " @@ -1373,11 +1367,11 @@ msgid "EiB" msgstr "EB" #: js/messages.php:132 -#, fuzzy, php-format +#, php-format #| msgid "%s table" #| msgid_plural "%s tables" msgid "%d table(s)" -msgstr "%s개 테이블 " +msgstr "%d개 테이블 " #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:135 @@ -1480,7 +1474,7 @@ msgstr "로그 출력을 %s로 설정" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:159 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" msgstr "%s 사용가능" @@ -1515,7 +1509,6 @@ msgid "Current settings" msgstr "현재 설정" #: js/messages.php:168 server_status.php:1640 -#, fuzzy #| msgid "Import files" msgid "Chart Title" msgstr "차트 제목" @@ -1606,7 +1599,6 @@ msgid "Profiling results" msgstr "프로파일링" #: js/messages.php:191 -#, fuzzy #| msgid "Table" msgctxt "Display format" msgid "Table" @@ -1686,7 +1678,6 @@ msgstr "" #: libraries/db_links.inc.php:82 libraries/display_import.lib.php:126 #: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89 #: prefs_manage.php:229 server_status.php:1595 setup/frames/menu.inc.php:20 -#, fuzzy msgid "Import" msgstr "가져오기" @@ -1708,7 +1699,6 @@ msgid "Issue" msgstr "" #: js/messages.php:221 -#, fuzzy #| msgid "Documentation" msgid "Recommendation" msgstr "추천" @@ -1836,12 +1826,11 @@ msgid "The definition of a stored function must contain a RETURN statement!" msgstr "저장 함수의 정의는 RETURN문을 포함해야 합니다!" #: js/messages.php:270 -#, fuzzy, php-format +#, php-format msgid "Add %d value(s)" msgstr "%d 값 추가" #: js/messages.php:273 -#, fuzzy msgid "" "Note: If the file contains multiple tables, they will be combined into one" msgstr "참고: 파일에 여러 테이블이 포함되어 있다면, 하나로 결합됩니다." @@ -1891,6 +1880,7 @@ msgid "Zoom Search" msgstr "검색" #: js/messages.php:293 +#, fuzzy msgid "Each point represents a data row." msgstr "각 포인트는 데이터 행을 나타냅니다." @@ -3608,7 +3598,6 @@ msgid "Server name template" msgstr "서버명 템플릿" #: libraries/config/messages.inc.php:89 -#, fuzzy msgid "Table name template" msgstr "파일명 템플릿" @@ -4506,7 +4495,6 @@ msgid "Query window height" msgstr "질의 창" #: libraries/config/messages.inc.php:348 -#, fuzzy #| msgid "Query window" msgid "Query window width (in pixels)" msgstr "질의 창" hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2012