- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11116-g5efec81
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 5efec81a17ef7e47e60a572513ecff9afdd3d673 (commit) from 9fe1aefb8ab22fdd0d99645492dac4d60a05988d (commit) - Log ----------------------------------------------------------------- commit 5efec81a17ef7e47e60a572513ecff9afdd3d673 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 10:59:50 2011 +0200 Ignore third party js libraries as well Maybe javascript should be ignored completely here? ----------------------------------------------------------------------- Summary of changes: build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml index a6f09da..890b175 100644 --- a/build.xml +++ b/build.xml @@ -61,7 +61,7 @@ <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding test, PHPExcel, tcpdf directories"> <exec executable="phpcs"> <arg line="-v - --ignore=*/PHPExcel/*,*/php-gettext/*,*/tcpdf/* + --ignore=*/PHPExcel/*,*/php-gettext/*,*/tcpdf/*,*/canvg/*,*/codemirror/*,*/highcharts/*,*/openlayers/* --report=checkstyle --report-file=${basedir}/build/logs/checkstyle.xml --standard=PEAR hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11115-g9fe1aef
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 9fe1aefb8ab22fdd0d99645492dac4d60a05988d (commit) via dd0e9396a910872a0bf397343b33a49a308e46c3 (commit) via 50527d9d6b7a42db6b5893263607f59ded131e9a (commit) from 627149dce1c2a68979a2b38745e6c80cc030a21e (commit) - Log ----------------------------------------------------------------- commit 9fe1aefb8ab22fdd0d99645492dac4d60a05988d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 10:24:23 2011 +0200 Add missing setup to PMA_buildActionTitles_test commit dd0e9396a910872a0bf397343b33a49a308e46c3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 10:22:29 2011 +0200 Add missing step to setup phase commit 50527d9d6b7a42db6b5893263607f59ded131e9a Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 21 09:33:16 2011 +0200 Czech translation update ----------------------------------------------------------------------- Summary of changes: po/cs.po | 9 ++++----- .../common/PMA_buildActionTitles_test.php | 7 ++++++- test/libraries/common/PMA_checkParameters_test.php | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/po/cs.po b/po/cs.po index af98b19..3d995eb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ 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-07-21 09:04+0200\n" -"PO-Revision-Date: 2011-07-17 20:07+0200\n" +"PO-Revision-Date: 2011-07-21 09:33+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -21,7 +21,7 @@ msgstr "" #: libraries/display_tbl.lib.php:354 libraries/display_tbl.lib.php:421 #: server_privileges.php:1583 msgid "Show all" -msgstr "Zobrazit vše" +msgstr "Zobrazit vše " #: browse_foreigners.php:70 libraries/common.lib.php:2173 #: libraries/export/pdf.php:135 @@ -1127,10 +1127,9 @@ msgstr "Připojení / Procesů" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 -#, fuzzy #| msgid "Connections since last refresh" msgid "Questions since last refresh" -msgstr "Spojení od posledního obnovaní" +msgstr "Dotazů od poslední aktualizace" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 @@ -1143,7 +1142,7 @@ msgstr "Statistika dotazů" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "Využití CPU" #: js/messages.php:95 msgid "System memory" diff --git a/test/libraries/common/PMA_buildActionTitles_test.php b/test/libraries/common/PMA_buildActionTitles_test.php index 130a972..310bf8f 100644 --- a/test/libraries/common/PMA_buildActionTitles_test.php +++ b/test/libraries/common/PMA_buildActionTitles_test.php @@ -15,6 +15,11 @@ require_once 'libraries/common.lib.php'; class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{ + function setup() + { + $GLOBALS['cfg'] = array('PropertiesIconic' => 'both'); + } + function testBuildActionTitles(){ $titles = array(); @@ -39,4 +44,4 @@ class PMA_buildActionTitles_test extends PHPUnit_Framework_TestCase{ $this->assertEquals($titles, PMA_buildActionTitles()); } -} \ No newline at end of file +} diff --git a/test/libraries/common/PMA_checkParameters_test.php b/test/libraries/common/PMA_checkParameters_test.php index f72b880..b18f498 100644 --- a/test/libraries/common/PMA_checkParameters_test.php +++ b/test/libraries/common/PMA_checkParameters_test.php @@ -20,6 +20,7 @@ class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase { $GLOBALS['PMA_Config'] = new PMA_Config(); $_SESSION['PMA_Theme'] = new PMA_Theme(); + $GLOBALS['cfg'] = array('ReplaceHelpImg' => true); } function testCheckParameterMissing() @@ -43,4 +44,4 @@ class PMA_checkParameters_test extends PHPUnit_Extensions_OutputTestCase $this->expectOutputString(""); PMA_checkParameters(array('db', 'table', 'field', 'sql_query'), false); } -} \ No newline at end of file +} hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11111-g6a89e2c
by Michal Čihař 21 Jul '11

21 Jul '11

The branch, master has been updated via 6a89e2c4888cc2e5debe142da91c845ca3bf4e6d (commit) via 773559c9f56c544d78e93b4e41aea6a7eafbf6f4 (commit) via 55d3a8a4cf1708c0ce3b86e403885f903399c348 (commit) via 51a3e5fdf2c95bf79a397d25cf4ff205e8809a9f (commit) via 1616916d3e9b72cdbbd7f45db4dd8e7ddd67c1f6 (commit) via bd456c7a730d7e096fa30f7542fdbc38327cdaf5 (commit) via b1dddd337798a85bb115f41cb4542f641042a53e (commit) via 4d2ac603658bc8b60f1970c905ba30db27439897 (commit) via e27d9a7baea7e26838c555b0ccb9b3f5fc3deb9a (commit) via 356477df8ec23ca9032aab2c70486e33249daaa0 (commit) via 2c4aaf766324767dc4187ea052543bd4ef9fe537 (commit) via 91dfba2884f599ffce38dec22c3170cee8e18745 (commit) via 5397d14239d29fccf47f53ef666b867178cba99c (commit) via 3e3473170e2fb640d4e90e3664d6adda4fd6dd61 (commit) via 097a5da43a773ed18e8a39bf64f381b27c5d936d (commit) via 88417e6504a9a955bc69230607b6886567fc6281 (commit) via c933153e888a53cd233e9d90907827736d248285 (commit) via 746454a70268f198b2dafa32279cc4d5c848b7a7 (commit) via cf580c9fc2e253622cb2da8483759969df6424c2 (commit) via 29bbe2e5e3aa67b3cf66bc4536353f7156918e53 (commit) via 88f0e4fd730fbb09a0988c3063e5a44006e2252e (commit) via 7a2b4f874e7de83d36de08c462788d95d419b27c (commit) via 9b584bf007185f0283b10168f24a7b1d051b39ce (commit) via 04e7d237e226283168cdd2fb923c5462b38fe7df (commit) via 7276225479324f5e1e1ef0e82d565934f871bd26 (commit) via 2948d31c7898881dda8e7d05abe0c7e5f23b043f (commit) via 519b9c27b30e294f55075b5a70069866f563cfab (commit) via aae5b670233ade7669930abf5665d8b0795ee795 (commit) via dcb935119c54fa4392acd323706318b06244b0b7 (commit) via 76e789cd94cbdb7743be3a6386d2a8138eab74bc (commit) via 11019827b9cf5384cd56c694014998c03daf9bdb (commit) via d51551fcaf5cbdc5c8181cb92a6f0f2219317477 (commit) via 9a0c281477d8d39805d9fc3847b82004d6eb1995 (commit) via df14f76264842074f3763c9369f2968826fc204e (commit) via 58237082c6712ccb19b195efec8e998d7394096b (commit) via 19cf70311d9b86f1af99d963bfedced9d6d4848a (commit) via ec14fea1659ed4a442a0f0b255442d7ac2b782e4 (commit) via 089a094c0a088c2154fe13752b036e897d0f2769 (commit) via 6ca48e853287a5443494297fe5980e6baa5a3a1d (commit) via 8599e52ff37d17cbf98d710dc84c713b1b07c1a4 (commit) via b6f05a9d75046a07e1da350b8f3b9a813e6df1b1 (commit) via a6437e5b5e82f7279e0faac2596f8eea568bd358 (commit) via 3dab7db684c9340e928839337fd14c7e70f7443c (commit) via cbdf0ab1c049ff70a0930117c1cb41a4103239f2 (commit) via 717622a47cc7d305fe09215533f37af3caae30a6 (commit) via 42f8017de9d134d98286f8a65afda28804a6725e (commit) via 622e9db07932d1be2fe265cfbfee4b69fd5f06bf (commit) via 9f8ddcb78bf4d63ad3f0d3a281498dc1b79b7c43 (commit) via cd7f989238abbf141bcb23ae0b9f62390bdf45e6 (commit) via 1446968985d9188de0b8445cb5115c03914477e8 (commit) via e62eb9f6aeac474a21212ef1e9befd7ec1347272 (commit) via b1b343cc6cad5df77e6e45c329a880fc963f9829 (commit) via 000f0bb60a51e66f5b9d3322f6a9798fc8b3e094 (commit) via f6e38d7a57fc7299f4924a65f28eb473a0d826b3 (commit) via b30dc2aa238ac66f7ae4e3821579f84554b318cd (commit) via 9147e0427f00d1c919d5d27dbaf8c21d02d4b9c5 (commit) via 483625facc785ad6adc22ebb3c16ce50819f0dbf (commit) via e31c71b6fe562f4ebd8ca4b38fbc8e5493e57f62 (commit) via 349204da008e3f5359d4c6f607e2764ab3c6e9f6 (commit) via 2d1ed32fd226bf2f2df6dc04aa8606e765aafd19 (commit) via 295302d251e8217d1c18107b74671691e1ec05a8 (commit) via e77f66bfc44d62b767753139a518617753a3d4ee (commit) via 798f2965d32457f0fe6f87f9f39eb62313085f5c (commit) via 75ed038ebe3a3b5685beca9cba97b119e996e5f4 (commit) via cea2dc507ad15db320bf957bf04ff4c4cd08a903 (commit) via 1bf38c26566dab17bc946e5fd78fffbdfa63c7d1 (commit) via e69cf17ae09ecffdafd8418a8239e5f1c7b365bf (commit) via 1097470212bb50f5c843b26ee4c6ccbfe2ceea85 (commit) via 18cdd4ad81294972fa83e38bd4ef175a8a716855 (commit) via c630f210cded49fddc18b50b6f5947fe2800fc8f (commit) via 961265f639aaec6fe94eb4e4f1ffefd5ab31c764 (commit) via b60bf9e0275d1e93a4504cf3b606535cb3369b56 (commit) via 55e217d0568569778120dd52c0429ad4a0e539e6 (commit) via 011d72e9614f2eb3bc244b7c00af403fc3a783c1 (commit) via 067500c6426665758918c0e4294eb0356be0f885 (commit) via 346c8bdeefaa8b5616ebbfd19ca3c4400d9d0aa1 (commit) via 46ae1a2648d70de3f7faa6c2a3f52af462553d66 (commit) via b5f0aac81a430050b6ebb82c0bd83fde4dd10af2 (commit) via 188a555d02ccd1bf86f210b5f7aa0c23104b9451 (commit) via 1564c64108d751a7f0834c3209dfcfb6998d6a12 (commit) via 1721bd27aa6fd68f5a647ca4671c041918ffa6eb (commit) via 22af62e2e11a1015a0e2f4ea8f797aec644e8868 (commit) via 7b23ce3c65e94122a1f51f8dfde9a8069dd9cd07 (commit) via 25deccc8e45498a4a6f4b82efb750f217f5ec16c (commit) via 84267ecaabf629e447607bec78da00c6d651fe14 (commit) via cc81f306ba4f932f9bd2f0287b52295eca980c1e (commit) via 8517e88db2b588ac5aefd6a3f8cf84fb5c2719c5 (commit) via cf0b3680cc4352aa1794d9d66c7068e58947847a (commit) via 7c7f179cb87d1d19bae127b3882cff3878bc3a24 (commit) via fe65a2340f8ce29127a6373f17410481273699af (commit) via 009d416a6af18595db4b15b88006320c6ca4b27f (commit) via 432e341e5f2f196742739059682f5454c1120f25 (commit) via 47b5d011df2b774770f0d7a85a6884a1957d56a3 (commit) via b34749e56f9c31cb4b4cb859c4de284d4c17b324 (commit) via a03ce107d921fe33f51078836b4e3da772d1b08d (commit) via 3c0771538ae5fdfab42450ec1b527660998b2eb7 (commit) via 1d403bbf4fe504661f66f7bd78b43ef8ed21db0d (commit) via 2c106731df1a099f73c69660f444e92feb66ae65 (commit) via 75ac0597c41a0e2509dc41b2354b52f4bf3790ba (commit) via 29676339af9e39a158288429569613c8f7cb9c86 (commit) via 826736079a6b58aef7fec129e7ba3cd781dbe1af (commit) from 167d10385d610ec235d791d9b76da7bfdb008363 (commit) - Log ----------------------------------------------------------------- commit 6a89e2c4888cc2e5debe142da91c845ca3bf4e6d Merge: 773559c9f56c544d78e93b4e41aea6a7eafbf6f4 167d10385d610ec235d791d9b76da7bfdb008363 Author: Pootle server <pootle(a)cihar.com> Date: Thu Jul 21 06:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit 773559c9f56c544d78e93b4e41aea6a7eafbf6f4 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:09:29 2011 +0200 Translation update done using Pootle. commit 55d3a8a4cf1708c0ce3b86e403885f903399c348 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:08:52 2011 +0200 Translation update done using Pootle. commit 51a3e5fdf2c95bf79a397d25cf4ff205e8809a9f Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:08:41 2011 +0200 Translation update done using Pootle. commit 1616916d3e9b72cdbbd7f45db4dd8e7ddd67c1f6 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:08:21 2011 +0200 Translation update done using Pootle. commit bd456c7a730d7e096fa30f7542fdbc38327cdaf5 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:08:01 2011 +0200 Translation update done using Pootle. commit b1dddd337798a85bb115f41cb4542f641042a53e Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:05:56 2011 +0200 Translation update done using Pootle. commit 4d2ac603658bc8b60f1970c905ba30db27439897 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:05:34 2011 +0200 Translation update done using Pootle. commit e27d9a7baea7e26838c555b0ccb9b3f5fc3deb9a Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:05:04 2011 +0200 Translation update done using Pootle. commit 356477df8ec23ca9032aab2c70486e33249daaa0 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:04:03 2011 +0200 Translation update done using Pootle. commit 2c4aaf766324767dc4187ea052543bd4ef9fe537 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:03:18 2011 +0200 Translation update done using Pootle. commit 91dfba2884f599ffce38dec22c3170cee8e18745 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:02:55 2011 +0200 Translation update done using Pootle. commit 5397d14239d29fccf47f53ef666b867178cba99c Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:02:33 2011 +0200 Translation update done using Pootle. commit 3e3473170e2fb640d4e90e3664d6adda4fd6dd61 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:01:46 2011 +0200 Translation update done using Pootle. commit 097a5da43a773ed18e8a39bf64f381b27c5d936d Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:01:11 2011 +0200 Translation update done using Pootle. commit 88417e6504a9a955bc69230607b6886567fc6281 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:00:18 2011 +0200 Translation update done using Pootle. commit c933153e888a53cd233e9d90907827736d248285 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 01:00:09 2011 +0200 Translation update done using Pootle. commit 746454a70268f198b2dafa32279cc4d5c848b7a7 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:59:51 2011 +0200 Translation update done using Pootle. commit cf580c9fc2e253622cb2da8483759969df6424c2 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:59:34 2011 +0200 Translation update done using Pootle. commit 29bbe2e5e3aa67b3cf66bc4536353f7156918e53 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:59:20 2011 +0200 Translation update done using Pootle. commit 88f0e4fd730fbb09a0988c3063e5a44006e2252e Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:58:56 2011 +0200 Translation update done using Pootle. commit 7a2b4f874e7de83d36de08c462788d95d419b27c Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:58:45 2011 +0200 Translation update done using Pootle. commit 9b584bf007185f0283b10168f24a7b1d051b39ce Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:58:33 2011 +0200 Translation update done using Pootle. commit 04e7d237e226283168cdd2fb923c5462b38fe7df Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:58:06 2011 +0200 Translation update done using Pootle. commit 7276225479324f5e1e1ef0e82d565934f871bd26 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:57:49 2011 +0200 Translation update done using Pootle. commit 2948d31c7898881dda8e7d05abe0c7e5f23b043f Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:57:31 2011 +0200 Translation update done using Pootle. commit 519b9c27b30e294f55075b5a70069866f563cfab Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:57:21 2011 +0200 Translation update done using Pootle. commit aae5b670233ade7669930abf5665d8b0795ee795 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:57:12 2011 +0200 Translation update done using Pootle. commit dcb935119c54fa4392acd323706318b06244b0b7 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:56:58 2011 +0200 Translation update done using Pootle. commit 76e789cd94cbdb7743be3a6386d2a8138eab74bc Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:56:45 2011 +0200 Translation update done using Pootle. commit 11019827b9cf5384cd56c694014998c03daf9bdb Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:56:27 2011 +0200 Translation update done using Pootle. commit d51551fcaf5cbdc5c8181cb92a6f0f2219317477 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:54:54 2011 +0200 Translation update done using Pootle. commit 9a0c281477d8d39805d9fc3847b82004d6eb1995 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:54:24 2011 +0200 Translation update done using Pootle. commit df14f76264842074f3763c9369f2968826fc204e Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:51:26 2011 +0200 Translation update done using Pootle. commit 58237082c6712ccb19b195efec8e998d7394096b Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:51:14 2011 +0200 Translation update done using Pootle. commit 19cf70311d9b86f1af99d963bfedced9d6d4848a Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:51:02 2011 +0200 Translation update done using Pootle. commit ec14fea1659ed4a442a0f0b255442d7ac2b782e4 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:50:19 2011 +0200 Translation update done using Pootle. commit 089a094c0a088c2154fe13752b036e897d0f2769 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:49:56 2011 +0200 Translation update done using Pootle. commit 6ca48e853287a5443494297fe5980e6baa5a3a1d Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:36:40 2011 +0200 Translation update done using Pootle. commit 8599e52ff37d17cbf98d710dc84c713b1b07c1a4 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:29:51 2011 +0200 Translation update done using Pootle. commit b6f05a9d75046a07e1da350b8f3b9a813e6df1b1 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:27:53 2011 +0200 Translation update done using Pootle. commit a6437e5b5e82f7279e0faac2596f8eea568bd358 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:22:53 2011 +0200 Translation update done using Pootle. commit 3dab7db684c9340e928839337fd14c7e70f7443c Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:20:20 2011 +0200 Translation update done using Pootle. commit cbdf0ab1c049ff70a0930117c1cb41a4103239f2 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:19:44 2011 +0200 Translation update done using Pootle. commit 717622a47cc7d305fe09215533f37af3caae30a6 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:17:31 2011 +0200 Translation update done using Pootle. commit 42f8017de9d134d98286f8a65afda28804a6725e Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:16:51 2011 +0200 Translation update done using Pootle. commit 622e9db07932d1be2fe265cfbfee4b69fd5f06bf Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:16:31 2011 +0200 Translation update done using Pootle. commit 9f8ddcb78bf4d63ad3f0d3a281498dc1b79b7c43 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:15:54 2011 +0200 Translation update done using Pootle. commit cd7f989238abbf141bcb23ae0b9f62390bdf45e6 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:14:26 2011 +0200 Translation update done using Pootle. commit 1446968985d9188de0b8445cb5115c03914477e8 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:12:36 2011 +0200 Translation update done using Pootle. commit e62eb9f6aeac474a21212ef1e9befd7ec1347272 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:12:08 2011 +0200 Translation update done using Pootle. commit b1b343cc6cad5df77e6e45c329a880fc963f9829 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:11:11 2011 +0200 Translation update done using Pootle. commit 000f0bb60a51e66f5b9d3322f6a9798fc8b3e094 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:09:28 2011 +0200 Translation update done using Pootle. commit f6e38d7a57fc7299f4924a65f28eb473a0d826b3 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:06:32 2011 +0200 Translation update done using Pootle. commit b30dc2aa238ac66f7ae4e3821579f84554b318cd Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:05:32 2011 +0200 Translation update done using Pootle. commit 9147e0427f00d1c919d5d27dbaf8c21d02d4b9c5 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:04:30 2011 +0200 Translation update done using Pootle. commit 483625facc785ad6adc22ebb3c16ce50819f0dbf Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:03:34 2011 +0200 Translation update done using Pootle. commit e31c71b6fe562f4ebd8ca4b38fbc8e5493e57f62 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:03:22 2011 +0200 Translation update done using Pootle. commit 349204da008e3f5359d4c6f607e2764ab3c6e9f6 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:02:19 2011 +0200 Translation update done using Pootle. commit 2d1ed32fd226bf2f2df6dc04aa8606e765aafd19 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:00:31 2011 +0200 Translation update done using Pootle. commit 295302d251e8217d1c18107b74671691e1ec05a8 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Thu Jul 21 00:00:06 2011 +0200 Translation update done using Pootle. commit e77f66bfc44d62b767753139a518617753a3d4ee Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:59:39 2011 +0200 Translation update done using Pootle. commit 798f2965d32457f0fe6f87f9f39eb62313085f5c Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:59:23 2011 +0200 Translation update done using Pootle. commit 75ed038ebe3a3b5685beca9cba97b119e996e5f4 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:58:51 2011 +0200 Translation update done using Pootle. commit cea2dc507ad15db320bf957bf04ff4c4cd08a903 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:58:26 2011 +0200 Translation update done using Pootle. commit 1bf38c26566dab17bc946e5fd78fffbdfa63c7d1 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:57:02 2011 +0200 Translation update done using Pootle. commit e69cf17ae09ecffdafd8418a8239e5f1c7b365bf Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:56:05 2011 +0200 Translation update done using Pootle. commit 1097470212bb50f5c843b26ee4c6ccbfe2ceea85 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:55:53 2011 +0200 Translation update done using Pootle. commit 18cdd4ad81294972fa83e38bd4ef175a8a716855 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:53:56 2011 +0200 Translation update done using Pootle. commit c630f210cded49fddc18b50b6f5947fe2800fc8f Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:53:02 2011 +0200 Translation update done using Pootle. commit 961265f639aaec6fe94eb4e4f1ffefd5ab31c764 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:52:00 2011 +0200 Translation update done using Pootle. commit b60bf9e0275d1e93a4504cf3b606535cb3369b56 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:50:55 2011 +0200 Translation update done using Pootle. commit 55e217d0568569778120dd52c0429ad4a0e539e6 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:50:07 2011 +0200 Translation update done using Pootle. commit 011d72e9614f2eb3bc244b7c00af403fc3a783c1 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:48:08 2011 +0200 Translation update done using Pootle. commit 067500c6426665758918c0e4294eb0356be0f885 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:46:54 2011 +0200 Translation update done using Pootle. commit 346c8bdeefaa8b5616ebbfd19ca3c4400d9d0aa1 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:46:40 2011 +0200 Translation update done using Pootle. commit 46ae1a2648d70de3f7faa6c2a3f52af462553d66 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:46:24 2011 +0200 Translation update done using Pootle. commit b5f0aac81a430050b6ebb82c0bd83fde4dd10af2 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:45:27 2011 +0200 Translation update done using Pootle. commit 188a555d02ccd1bf86f210b5f7aa0c23104b9451 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:44:12 2011 +0200 Translation update done using Pootle. commit 1564c64108d751a7f0834c3209dfcfb6998d6a12 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:44:02 2011 +0200 Translation update done using Pootle. commit 1721bd27aa6fd68f5a647ca4671c041918ffa6eb Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:42:56 2011 +0200 Translation update done using Pootle. commit 22af62e2e11a1015a0e2f4ea8f797aec644e8868 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:42:42 2011 +0200 Translation update done using Pootle. commit 7b23ce3c65e94122a1f51f8dfde9a8069dd9cd07 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:42:02 2011 +0200 Translation update done using Pootle. commit 25deccc8e45498a4a6f4b82efb750f217f5ec16c Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:40:50 2011 +0200 Translation update done using Pootle. commit 84267ecaabf629e447607bec78da00c6d651fe14 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:39:09 2011 +0200 Translation update done using Pootle. commit cc81f306ba4f932f9bd2f0287b52295eca980c1e Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:38:51 2011 +0200 Translation update done using Pootle. commit 8517e88db2b588ac5aefd6a3f8cf84fb5c2719c5 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:37:55 2011 +0200 Translation update done using Pootle. commit cf0b3680cc4352aa1794d9d66c7068e58947847a Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:37:34 2011 +0200 Translation update done using Pootle. commit 7c7f179cb87d1d19bae127b3882cff3878bc3a24 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:35:52 2011 +0200 Translation update done using Pootle. commit fe65a2340f8ce29127a6373f17410481273699af Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:35:09 2011 +0200 Translation update done using Pootle. commit 009d416a6af18595db4b15b88006320c6ca4b27f Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:34:02 2011 +0200 Translation update done using Pootle. commit 432e341e5f2f196742739059682f5454c1120f25 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:33:27 2011 +0200 Translation update done using Pootle. commit 47b5d011df2b774770f0d7a85a6884a1957d56a3 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:32:35 2011 +0200 Translation update done using Pootle. commit b34749e56f9c31cb4b4cb859c4de284d4c17b324 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:30:46 2011 +0200 Translation update done using Pootle. commit a03ce107d921fe33f51078836b4e3da772d1b08d Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:29:10 2011 +0200 Translation update done using Pootle. commit 3c0771538ae5fdfab42450ec1b527660998b2eb7 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:25:58 2011 +0200 Translation update done using Pootle. commit 1d403bbf4fe504661f66f7bd78b43ef8ed21db0d Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:24:25 2011 +0200 Translation update done using Pootle. commit 2c106731df1a099f73c69660f444e92feb66ae65 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:23:57 2011 +0200 Translation update done using Pootle. commit 75ac0597c41a0e2509dc41b2354b52f4bf3790ba Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:22:07 2011 +0200 Translation update done using Pootle. commit 29676339af9e39a158288429569613c8f7cb9c86 Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:21:52 2011 +0200 Translation update done using Pootle. commit 826736079a6b58aef7fec129e7ba3cd781dbe1af Author: Jørgen Thomsen <opensource(a)jth.net> Date: Wed Jul 20 23:21:37 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/da.po | 248 ++++++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 184 insertions(+), 64 deletions(-) diff --git a/po/da.po b/po/da.po index e766374..2f6ac00 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ 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-07-14 18:39+0200\n" -"PO-Revision-Date: 2011-07-20 03:04+0200\n" -"Last-Translator: <opensource(a)jth.net>\n" +"PO-Revision-Date: 2011-07-21 01:09+0200\n" +"Last-Translator: Jørgen Thomsen <opensource(a)jth.net>\n" "Language-Team: danish <da(a)li.org>\n" "Language: da\n" "MIME-Version: 1.0\n" @@ -579,7 +579,7 @@ msgstr "Find:" #: db_search.php:284 db_search.php:285 msgid "Words are separated by a space character (\" \")." -msgstr "Ord adskilles af mellemrums-karakter (\" \")." +msgstr "Ord adskilles af mellemrumstegn (\" \")." #: db_search.php:298 msgid "Inside tables:" @@ -1027,7 +1027,7 @@ msgstr "Intet brugernavn!" #: js/messages.php:54 server_privileges.php:1221 user_password.php:50 msgid "The password is empty!" -msgstr "Der er ikke angivet noget kodeord!" +msgstr "Der er ikke angivet nogen adgangskode" #: js/messages.php:55 server_privileges.php:1219 user_password.php:53 msgid "The passwords aren't the same!" @@ -1181,7 +1181,7 @@ msgstr "Indstillinger" #: js/messages.php:103 #| msgid "Remove database" msgid "Remove chart" -msgstr "Fjern kort" +msgstr "Fjern diagram" #: js/messages.php:104 msgid "Edit labels and series" @@ -1190,7 +1190,7 @@ msgstr "Rediger overskrifter og serier" #: js/messages.php:105 #| msgid "Snap to grid" msgid "Add chart to grid" -msgstr "Snap kort til gitter" +msgstr "Snap diagram til gitter" #: js/messages.php:107 msgid "Please add at least one variable to the series" @@ -1312,7 +1312,7 @@ msgstr "Diagramtitel" #. l10n: As in differential values #: js/messages.php:135 msgid "Differential" -msgstr "" +msgstr "Differentiel" #: js/messages.php:136 #, php-format @@ -2080,9 +2080,9 @@ msgid "" "the administrator of the MySQL server." msgstr "" "phpMyAdmin forsøgte at forbinde til MySQL-serveren, og serveren afviste " -"forbindelsen. Du bør tjekke host, brugernavn og kodeord i config.inc.php og " -"sikre dig at de svarer til den information du har fået af administratoren af " -"MySQL-serveren." +"forbindelsen. Du bør tjekke host, brugernavn og adgangskode i config.inc.php " +"og sikre dig at de svarer til den information du har fået af " +"administratoren af MySQL-serveren." #: libraries/auth/cookie.auth.lib.php:197 msgid "Log in" @@ -2112,7 +2112,7 @@ msgstr "Brugernavn:" #: libraries/auth/cookie.auth.lib.php:220 msgid "Password:" -msgstr "Kodeord:" +msgstr "Adgangskode:" #: libraries/auth/cookie.auth.lib.php:227 msgid "Server Choice" @@ -2127,7 +2127,7 @@ msgstr "Herefter skal cookies være slået til." msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" msgstr "" -"Det er ifølge konfigurationen ikke tilladt at logge ind uden en adgangskkode " +"Det er ifølge konfigurationen ikke tilladt at logge ind uden en adgangskode " "(se AllowNoPassword)" #: libraries/auth/cookie.auth.lib.php:568 @@ -2145,11 +2145,11 @@ msgstr "Kan ikke logge ind på MySQL-serveren" #: libraries/auth/http.auth.lib.php:69 msgid "Wrong username/password. Access denied." -msgstr "Forkert brugernavn/kodeord. Adgang nægtet." +msgstr "Forkert brugernavn/adgangskode. Adgang nægtet." #: libraries/auth/signon.auth.lib.php:87 msgid "Can not find signon authentication script:" -msgstr "Kunne ikke finde skriptet til godkendelse af log ind:" +msgstr "Kunne ikke finde scriptet til autentifikation af log ind:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2159,7 +2159,7 @@ msgstr "Filen %s indeholder ikke noget nøgle-id" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 msgid "Hardware authentication failed" -msgstr "Godkendelse af hardware mislykkedes" +msgstr "Hardwareautentifikation mislykkedes" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" @@ -2703,7 +2703,7 @@ msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" "Aktivering medfører, at brugeren kan tilgå en hvilken som helst MySQL-server " -"fra log ind-siden ved cookie-godkendelse" +"fra log ind-siden ved cookie-autentifikation" #: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" @@ -2733,7 +2733,7 @@ msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" -"Hemmeligt kodeordsudtryk til kryptering af cookies ved [kbd]cookie[/kbd] " +"Hemmeligt adgangskodeudtryk til kryptering af cookies ved [kbd]cookie[/kbd] " "autentifikation" #: libraries/config/messages.inc.php:25 @@ -2999,7 +2999,7 @@ msgstr "Erstat NULL med" #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84 msgid "Remove CRLF characters within columns" -msgstr "Fjern CRLF-karakterer i kolonner" +msgstr "Fjern CRLF-tegn i kolonner" #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:245 #: libraries/config/messages.inc.php:253 libraries/import/csv.php:63 @@ -3338,11 +3338,11 @@ msgstr "Grundlæggende indstillinger" #: libraries/config/messages.inc.php:199 msgid "Authentication" -msgstr "Godkendelse" +msgstr "Autentifikation" #: libraries/config/messages.inc.php:200 msgid "Authentication settings" -msgstr "Indstillinger for godkendelse" +msgstr "Indstillinger for autentifikation" #: libraries/config/messages.inc.php:201 msgid "Server configuration" @@ -3913,6 +3913,9 @@ msgid "" "storage). If disabled, this utilizes JS-routines to display query history " "(lost by window close)." msgstr "" +"Aktiver hvis du ønsker DB-baseret forespørgselshistorik (kræver phpMyAdmin " +"configuration storage). Hvis deaktiveret bruges JS-rutiner til at vise " +"forespørgselshistorik (mistes når vinduet lukkes)." #: libraries/config/messages.inc.php:338 msgid "Permanent query history" @@ -3956,7 +3959,7 @@ msgstr "Vælg hvilke funktioner, der vil blive brugt for tegnsætskonvertering" #: libraries/config/messages.inc.php:349 msgid "Recoding engine" -msgstr "" +msgstr "Omkodningsværktøj" #: libraries/config/messages.inc.php:350 msgid "When browsing tables, the sorting of each table is remembered" @@ -3996,7 +3999,7 @@ msgstr "Lades blank, hvis ikke brugt" #: libraries/config/messages.inc.php:360 msgid "Host authorization order" -msgstr "Host autoriseringsrækkefølge" +msgstr "Host autorisationsrækkefølge" #: libraries/config/messages.inc.php:361 msgid "Leave blank for defaults" @@ -4004,11 +4007,11 @@ msgstr "Lades blank for standardværdi" #: libraries/config/messages.inc.php:362 msgid "Host authorization rules" -msgstr "Host autoriseringsregler" +msgstr "Host autorisationsregler" #: libraries/config/messages.inc.php:363 msgid "Allow logins without a password" -msgstr "Tillad login uden password" +msgstr "Tillad login uden adgangskode" #: libraries/config/messages.inc.php:364 msgid "Allow root login" @@ -4028,6 +4031,9 @@ msgid "" "authentication[/a] (not located in your document root; suggested: /etc/" "swekey.conf)" msgstr "" +"Stien for konfigurationsfilen for [a@http://swekey.com]SweKey hardware " +"autentifikation[/a] (ikke fundet i din dokumentrod; forslag: " +"/etc/swekey.conf)" #: libraries/config/messages.inc.php:368 msgid "SweKey config file" @@ -4084,7 +4090,7 @@ msgstr "Forbindelsestype" #: libraries/config/messages.inc.php:379 msgid "Control user password" -msgstr "Password for kontrolbruger" +msgstr "Adgangskode for kontrolbruger" #: libraries/config/messages.inc.php:380 msgid "" @@ -4173,11 +4179,11 @@ msgstr "Log ud URL" #: libraries/config/messages.inc.php:397 msgid "Try to connect without password" -msgstr "Prøv at forbinde uden password" +msgstr "Prøv at forbinde uden adganskode" #: libraries/config/messages.inc.php:398 msgid "Connect without password" -msgstr "Forbind uden password" +msgstr "Forbind uden adgangskode" #: libraries/config/messages.inc.php:399 msgid "" @@ -4187,6 +4193,11 @@ msgid "" "their names in order and use [kbd]*[/kbd] at the end to show the rest in " "alphabetical order." msgstr "" +"Du kan bruge MySQL jokertegn (% and _), escape dem hvis du vil bruge dem som " +"almindelige tegn, fx brug [kbd]'my\\_db'[/kbd] og ikket [kbd]'my_db'[/kbd]. " +"Ved at bruge denne indstilling kan man sortere databaselisten, indtast blot " +"navnene efter hinanden og brug [kbd]*[/kbd] i slutningen for at vise resten " +"i alfabetisk orden." #: libraries/config/messages.inc.php:400 msgid "Show only listed databases" @@ -4198,7 +4209,7 @@ msgstr "Lades tom hvis du ikke bruger config auth" #: libraries/config/messages.inc.php:402 msgid "Password for config auth" -msgstr "Kodeord for config auth" +msgstr "Adgangskode for config auth" #: libraries/config/messages.inc.php:403 msgid "" @@ -4217,6 +4228,9 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" +"Database brugt til relationer, bogmærker, og PDF funktioner. Se " +"[a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for komplet information. " +"Lades blank ved ingen understøttelse. Forslag: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:406 msgid "Database name" @@ -4335,6 +4349,8 @@ msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." msgstr "" +"Om en DROP DATABASE IF EXISTS kommando skal tilføjes som første linje i " +"loggen når en database oprettes." #: libraries/config/messages.inc.php:429 msgid "Add DROP DATABASE" @@ -4345,6 +4361,8 @@ msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." msgstr "" +"Om en DROP TABLE IF EXISTS kommando skal tilføjes som første linje i loggen " +"når en tabel oprettes." #: libraries/config/messages.inc.php:431 msgid "Add DROP TABLE" @@ -4355,6 +4373,8 @@ msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." msgstr "" +"Om en DROP VIEW IF EXISTS kommando skal tilføjes som første linje i loggen " +"når et view oprettes." #: libraries/config/messages.inc.php:433 msgid "Add DROP VIEW" @@ -4448,24 +4468,24 @@ msgid "" "file; this does not limit the ability to execute the same command directly" msgstr "" "Bemærk, at aktivering af denne har ingen betydning i [kbd]config[/kbd] " -"autentifikationstilstand, fordi kodeordet er fast indlagt i " +"autentifikationstilstand, fordi adgangskoden er fast indlagt i " "konfigurationsfilen; dette begrænser ikke muligheden for at udføre den samme " "kommando direkte" #: libraries/config/messages.inc.php:451 msgid "Show password change form" -msgstr "Vis formular til kodeordsændring" +msgstr "Vis formular til ændring af adgangskode" #: libraries/config/messages.inc.php:452 msgid "Show create database form" msgstr "Vis formular til databaseoprettelse" #: libraries/config/messages.inc.php:453 -#, fuzzy msgid "" "Defines whether or not type display direction option is shown when browsing " "a table" -msgstr "Definerer om display retning indstilling vises, når en tabel gennemses" +msgstr "" +"Definerer om type display retning indstilling vises, når en tabel gennemses" #: libraries/config/messages.inc.php:454 msgid "Show display direction" @@ -4526,6 +4546,8 @@ msgid "" "If tooltips are enabled and a database comment is set, this will flip the " "comment and the real name" msgstr "" +"Hvis tooltips er aktiverede og en databasekommentar er sat, vil dette skifte " +"mellem kommentaren og det virkelige navn" #: libraries/config/messages.inc.php:467 msgid "Display database comment instead of its name" @@ -4538,6 +4560,10 @@ msgid "" "['LeftFrameTableSeparator'] directive, so only the folder is called like the " "alias, the table name itself stays unchanged" msgstr "" +"Når denne sættes til [kbd]nested[/kbd] bruges alias for tabelnavnet kun til " +"at splitte/samle tabellerne i henhold til direktivet " +"$cfg['LeftFrameTableSeparator'], så kun mappen benævnes som aliaset; " +"tabelnavnet selv forbliver uændret." #: libraries/config/messages.inc.php:469 msgid "Display table comment instead of its name" @@ -4569,7 +4595,7 @@ msgstr "Kræver SQL Validator bliver aktiveret" #: server_privileges.php:782 server_privileges.php:793 #: server_privileges.php:1608 server_synchronize.php:1186 msgid "Password" -msgstr "Kodeord" +msgstr "Adgangskode" #: libraries/config/messages.inc.php:480 msgid "" @@ -4669,6 +4695,10 @@ msgid "" "For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: " "HTTP_X_FORWARDED_FOR[/kbd]" msgstr "" +"Indtast proxies som [kbd]IP: trusted HTTP header[/kbd]. Det følgende " +"eksempel angiver, at phpMyAdmin skulle stole på en HTTP_X_FORWARDED_FOR (X" +"-Forwarded-For) header der kommer fra proxy 1.2.3.4:[br][kbd]1.2.3.4: " +"HTTP_X_FORWARDED_FOR[/kbd]" #: libraries/config/messages.inc.php:501 msgid "List of trusted proxies for IP allow/deny" @@ -4841,7 +4871,7 @@ msgstr "Tom phpMyAdmin kontrolbruger ved brug af pmadb" #: libraries/config/validate.lib.php:273 msgid "Empty phpMyAdmin control user password while using pmadb" -msgstr "Tomt phpMyAdmin kodeord for kontrolbruger ved brug af pmadb" +msgstr "Tom phpMyAdmin adgangskode for kontrolbruger ved brug af pmadb" #: libraries/config/validate.lib.php:359 #, php-format @@ -4927,12 +4957,12 @@ msgstr "Detaljer..." #: libraries/display_change_password.lib.php:29 main.php:94 #: user_password.php:105 user_password.php:123 msgid "Change password" -msgstr "Ændre kodeord" +msgstr "Ændre adgangskode" #: libraries/display_change_password.lib.php:34 #: libraries/replication_gui.lib.php:346 server_privileges.php:789 msgid "No Password" -msgstr "Intet kodeord" +msgstr "Ingen adgangskode" #: libraries/display_change_password.lib.php:45 #: libraries/replication_gui.lib.php:354 libraries/replication_gui.lib.php:357 @@ -4942,7 +4972,7 @@ msgstr "Skriv igen" #: libraries/display_change_password.lib.php:51 msgid "Password Hashing" -msgstr "Kodeordshashing" +msgstr "Adgangskodehashing" #: libraries/display_change_password.lib.php:65 #| msgid "MySQL 4.0 compatible" @@ -5151,7 +5181,7 @@ msgstr "" #: libraries/display_export.lib.php:340 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" -msgstr "" +msgstr "Inkodningskonvertering" #: libraries/display_import.lib.php:66 msgid "" @@ -5159,6 +5189,9 @@ msgid "" "this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) " "browsers." msgstr "" +"Filen som uploades er sandsynligvis større enn den maksimalt tilladte " +"størrelse, eller dette er en kendt fejl i webkit-baserede browsere (Safari, " +"Google Chrome, Arora etc.) " #: libraries/display_import.lib.php:76 msgid "The file is being processed, please be patient." @@ -5416,7 +5449,7 @@ msgstr "Udskrift-visning (med fulde tekster)" #: libraries/display_tbl.lib.php:2494 tbl_chart.php:83 #| msgid "Display PDF schema" msgid "Display chart" -msgstr "Vis kort" +msgstr "Vis diagram" #: libraries/display_tbl.lib.php:2509 msgid "Visualize GIS data" @@ -5617,11 +5650,13 @@ msgstr "" #: libraries/engines/pbms.lib.php:30 msgid "Garbage Threshold" -msgstr "" +msgstr "Tærskel for garbage " #: libraries/engines/pbms.lib.php:31 msgid "The percentage of garbage in a repository file before it is compacted." msgstr "" +"Procentdelen af utilgængelige data i en repositoryfil, før den bliver " +"komprimeret." #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:69 #: server_synchronize.php:1174 @@ -5633,10 +5668,12 @@ msgid "" "The port for the PBMS stream-based communications. Setting this value to 0 " "will disable HTTP communication with the daemon." msgstr "" +"Porten for PBMS stream-baseret kommunikation. Sættes denne værdi til 0 vil " +"HTTP-kommunikation med dæmonen deaktiveres. " #: libraries/engines/pbms.lib.php:40 msgid "Repository Threshold" -msgstr "" +msgstr "Tærskel for repository" #: libraries/engines/pbms.lib.php:41 msgid "" @@ -5644,6 +5681,9 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Den maksimale størrelse af en BLOB repositoryfil. Du kan bruge Kb, MB eller " +"GB for at angive værdiens enhed. En værdi i bytes antages, når ingen enhed " +"angives" #: libraries/engines/pbms.lib.php:45 msgid "Temp Blob Timeout" @@ -5654,6 +5694,8 @@ msgid "" "The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed " "after this time, unless they are referenced by a record in the database." msgstr "" +"Timeout i sekunder for midlertidige BLOBs. Uploaded BLOB data fjernes efter " +"denne tid medmindre de refereres af en post i databasen." #: libraries/engines/pbms.lib.php:50 msgid "Temp Log Threshold" @@ -5665,26 +5707,33 @@ msgid "" "indicate the unit of the value. A value in bytes is assumed when no unit is " "specified." msgstr "" +"Den maksimale størrelse af en midlertidig BLOB logfil. Du kan bruge Kb, MB " +"eller GB for at angive værdiens enhed. En værdi i bytes antages, når ingen " +"enhed angives" #: libraries/engines/pbms.lib.php:55 msgid "Max Keep Alive" -msgstr "" +msgstr "Maks. Keep Alive" #: libraries/engines/pbms.lib.php:56 msgid "" "The timeout for inactive connection with the keep-alive flag set. After this " "time the connection will be closed. The time-out is in milliseconds (1/1000)." msgstr "" +"Timeout for inaktive forbindelser med keep-alive flag sat. Efter denne tid " +"vil forbindelsen blive lukket. Timeout er i millisekunder (1/1000)." #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Metadata headers" #: libraries/engines/pbms.lib.php:61 msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" +"En \":\"-adskilt liste af metadata headers brugt til at initialisere tabellen " +"pbms_metadata_header, når en database oprettes." #: libraries/engines/pbms.lib.php:94 #, php-format @@ -5692,6 +5741,8 @@ msgid "" "Documentation and further information about PBMS can be found on %sThe " "PrimeBase Media Streaming home page%s." msgstr "" +"Dokumentation og yderligere information om PBMS kan findes på %sThe " +"PrimeBase Media Streaming hjemmeside%s." #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127 #| msgid "Relations" @@ -5700,11 +5751,11 @@ msgstr "Relaterede links" #: libraries/engines/pbms.lib.php:98 msgid "The PrimeBase Media Streaming Blog by Barry Leslie" -msgstr "" +msgstr "The PrimeBase Media Streaming Blog af Barry Leslie" #: libraries/engines/pbms.lib.php:99 msgid "PrimeBase XT Home Page" -msgstr "" +msgstr "PrimeBase XT hjemmeside" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5715,6 +5766,9 @@ msgid "" "This is the amount of memory allocated to the index cache. Default value is " "32MB. The memory allocated here is used only for caching index pages." msgstr "" +"Dette er mængden af hukommelse allokeret til mellemlageret for indeks. " +"Standardværdien er 32MB. Hukommelsen allokeret her bruges kun til at cache " +"indekssider." #: libraries/engines/pbxt.lib.php:27 msgid "Record cache size" @@ -5726,6 +5780,9 @@ msgid "" "table data. The default value is 32MB. This memory is used to cache changes " "to the handle data (.xtd) and row pointer (.xtr) files." msgstr "" +"Dette er mængden af hukommelse allokeret til mellemlageret for poster brugt " +"til at cache tabeldata. Standardværdien er 32MB. Denne hukommelse bruges til " +"at cache ændringer til handle data (.xtd) og rækkepointer (.xtr) filer." #: libraries/engines/pbxt.lib.php:32 msgid "Log cache size" @@ -5736,6 +5793,8 @@ msgid "" "The amount of memory allocated to the transaction log cache used to cache on " "transaction log data. The default is 16MB." msgstr "" +"Mængden af hukommelse allokeret til mellemlageret for transaktionslogdata. " +"Standard er 16MB" #: libraries/engines/pbxt.lib.php:37 msgid "Log file threshold" @@ -5746,6 +5805,8 @@ msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." msgstr "" +"Størrelsen af en transajktionslog før den ruller over og en ny log oprettes. " +"Standardværdien er 16MB" #: libraries/engines/pbxt.lib.php:42 msgid "Transaction buffer size" @@ -5756,6 +5817,8 @@ msgid "" "The size of the global transaction log buffer (the engine allocates 2 " "buffers of this size). The default is 1MB." msgstr "" +"Størrelsen af den globale transaktionslogbuffer (der allokeres 2 buffere af " +"denne størrelse). Standard er 1MB." #: libraries/engines/pbxt.lib.php:47 msgid "Checkpoint frequency" @@ -5766,6 +5829,8 @@ msgid "" "The amount of data written to the transaction log before a checkpoint is " "performed. The default value is 24MB." msgstr "" +"Mængden af data skrevet til transaktionsloggen før et checkpoint udføres. " +"Standardværdien er 24MB." #: libraries/engines/pbxt.lib.php:52 msgid "Data log threshold" @@ -5778,16 +5843,22 @@ msgid "" "value of this variable can be increased to increase the total amount of data " "that can be stored in the database." msgstr "" +"Den maksimale størrelse af en datalogfil. Standardværdien er 64MB. PBXT kan " +"oprette maksimalt 32000 datalogs, som bruges af alle tabeller. Så værdien af " +"denne variabel kan øges for at øge den totale mængde af data, der kan " +"lagres i databasen." #: libraries/engines/pbxt.lib.php:57 msgid "Garbage threshold" -msgstr "" +msgstr "Tærskel for garbage" #: 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 "" +"Procentdelen af utilgængelige data i en datalogfil før den komprimeres. " +"Dette er en værdi mellem 1 og 99. Standard er 50." #: libraries/engines/pbxt.lib.php:62 msgid "Log buffer size" @@ -5799,26 +5870,28 @@ msgid "" "The engine allocates one buffer per thread, but only if the thread is " "required to write a data log." msgstr "" +"Størrelsen af bufferen for en datalogfil. Standard er 256MB. Der allokeres " +"en buffer per tråd, men kun hvis tråden skal skrive en datalog." #: libraries/engines/pbxt.lib.php:67 msgid "Data file grow size" -msgstr "" +msgstr "Voksestørrelse for datafil" #: libraries/engines/pbxt.lib.php:68 msgid "The grow size of the handle data (.xtd) files." -msgstr "" +msgstr "Voksestørrelsen af handle data filer (.xtd)." #: libraries/engines/pbxt.lib.php:72 msgid "Row file grow size" -msgstr "" +msgstr "Voksestørrelsen af rækkefil" #: libraries/engines/pbxt.lib.php:73 msgid "The grow size of the row pointer (.xtr) files." -msgstr "" +msgstr "Voksestørrelsen af rækkepointerfiler (.xtr)" #: libraries/engines/pbxt.lib.php:77 msgid "Log file count" -msgstr "" +msgstr "Logfilantal" #: libraries/engines/pbxt.lib.php:78 msgid "" @@ -5827,6 +5900,9 @@ msgid "" "will be deleted, otherwise they are renamed and given the next highest " "number." msgstr "" +"Dette er antal transaktionslogfiler (pbxt/system/xlog*.xt), som systemet " +"vedligeholder.Hvis antallet af logs overstiger denne værdi vil gamle logs " +"blive slettede eller er de omdøbt og give det næste højere nummer." #: libraries/engines/pbxt.lib.php:125 #, php-format @@ -5834,6 +5910,8 @@ msgid "" "Documentation and further information about PBXT can be found on the " "%sPrimeBase XT Home Page%s." msgstr "" +"Dokumentation og yderliger information om PBXT kan findes på %sPrimeBase XT " +"hjemmeside%s" #: libraries/engines/pbxt.lib.php:129 msgid "The PrimeBase XT Blog by Paul McCullagh" @@ -5873,7 +5951,7 @@ msgstr "Erstat NULL med:" #: libraries/export/csv.php:29 libraries/export/excel.php:24 msgid "Remove carriage return/line feed characters within columns" -msgstr "Fjern vognretur/linjeskift tegn i kolonnedata" +msgstr "Fjern vognretur/linjeskiftstegn i kolonnedata" #: libraries/export/excel.php:33 #| msgid "Excel edition" @@ -6734,7 +6812,7 @@ msgstr "" #: libraries/replication_gui.lib.php:361 msgid "Generate Password" -msgstr "Generer kodeord" +msgstr "Generer adgangskode" #: libraries/rte/rte_events.lib.php:102 libraries/rte/rte_events.lib.php:107 #: libraries/rte/rte_events.lib.php:130 libraries/rte/rte_routines.lib.php:254 @@ -7139,7 +7217,7 @@ msgstr "Tilføj trigger" #: libraries/rte/rte_words.lib.php:32 #, php-format msgid "Export of trigger %s" -msgstr "" +msgstr "Eksport af trigger %s" #: libraries/rte/rte_words.lib.php:33 #| msgid "Add a new User" @@ -7511,7 +7589,7 @@ msgstr "SLUT RÅ" #: libraries/sqlparser.lib.php:363 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Tilføjede automatisk backtick til enden af forspørgslen!" #: libraries/sqlparser.lib.php:366 msgid "Unclosed quote" @@ -7844,6 +7922,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Dine præferencer vil kun blive gemt for den aktuelle session. At gemme dem " +"permanent kræver %sphpMyAdmin configuration storage%s." #: libraries/user_preferences.lib.php:112 #| msgid "Could not load default configuration from: \"%1$s\"" @@ -7855,6 +7935,8 @@ msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Din browser har phpMyAdmin konfiguration for dette domæne. Vil du importere " +"den for den aktuelle session?" #: libraries/zip_extension.lib.php:25 msgid "No files found inside ZIP archive!" @@ -7941,8 +8023,8 @@ msgid "" "running with this default, is open to intrusion, and you really should fix " "this security hole by setting a password for user 'root'." msgstr "" -"Din konfigurationsfil indeholder indstillinger (root og intet kodeord) som " -"svarer til en standard MySQL-priviligeret brugerkonto. Din MySQL server " +"Din konfigurationsfil indeholder indstillinger (root og ingen adgangskode) " +"som svarer til en standard MySQL-priviligeret brugerkonto. Din MySQL server " "kører med denne standardindstilling, <u>er åben for indtrængen</u>, og du " "opfordres stærkt til at gøre noget ved dette sikkerhedshul." @@ -8671,7 +8753,7 @@ msgstr "Login-information" #: server_privileges.php:784 msgid "Do not change the password" -msgstr "Kodeord må ikke ændres" +msgstr "Adgangskoden må ikke ændres" #: server_privileges.php:817 server_privileges.php:2286 #| msgid "No user(s) found." @@ -8700,7 +8782,7 @@ msgstr "Du har tilbagekaldt privilegierne for %s" #: server_privileges.php:1236 #, php-format msgid "The password for %s was changed successfully." -msgstr "Kodeordet for %s blev korrekt udskiftet." +msgstr "Adgangskoden for %s blev korrekt udskiftet." #: server_privileges.php:1256 #, php-format @@ -10004,6 +10086,10 @@ msgid "" " queries. For the latter you will need to log_output set to 'TABLE' " "and have either the slow_query_log or general_log enabled." msgstr "" +"phpMyAdmin Monitor kan hjælpe dig med at optimere serverkonfigurationen og " +"afsløre tidskrævende\n" +"forespørgsler. For sidstnævnte kræver det at log_output sættes til 'TABLE' " +"og at the slow_query_log eller general_log aktiveres." #: server_status.php:1329 msgid "" @@ -10025,6 +10111,23 @@ msgid "" "small time span.\n" " </p>" msgstr "" +"<b>Brug af monitorenr:</b><br/>\n" +" Når du klikker på 'Start monitor' vil din browser opdatere alle viste " +"diagrammer regelmæssigt.\n" +" Du kan tilføje diagrammer og ændre opdateringsfrekvensen under " +"'Indstilinger', eller fjerne diagrammer\n" +" ved at bruge ikonet cog på det relevante diagram.\n" +"<p>Når du ser en pludselig forøgelse i aktivitet, så vælg det relevante " +"tidsinterval på et diagram ved at holde venstre museknap\n" +" nede og køre hen over diagrammet. Dette vill hente statistik fra logs og " +"hjælpe dig til at finde årsagen\n" +" til aktivitetsforøgelsen.</p>\n" +"<p><b>Please note:</b>\n" +" Enabling the general_log may increase the server load by up to 5-15%. Also " +"be aware that generating statistics out of the logs is a \n" +" very load intensive task, thus it is advisable to select only a small time " +"span.\n" +"</p>" #: server_status.php:1348 #| msgid "Usage" @@ -10245,7 +10348,7 @@ msgid "" "sensitive information, like passwords) is transferred unencrypted!" msgstr "" "Du bruger ikke en sikker forbindelse; alle data (inklusive potentielt følsom " -"information, som kodeord) sendes ukrypteret!" +"information, som adgangskode) sendes ukrypteret!" #: setup/frames/index.inc.php:60 #, php-format @@ -10409,6 +10512,9 @@ msgid "" "so a key was automatically generated for you. It is used to encrypt cookies; " "you don't need to remember it." msgstr "" +"Du havde ikke blowfish secret sat og har aktiveret cookie autentifikation, " +"så en nøgle blev automatisk genereret for dig. Den bruges til at kryptere " +"cookies; du behøver ikke huske den." #: setup/lib/index.lib.php:253 #, php-format @@ -10416,6 +10522,8 @@ msgid "" "%sBzip2 compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" +"%sBzip2 komprimering og dekomprimering%s kræver funktioner (%s) som ikke er " +"tilgængelige på dette system." #: setup/lib/index.lib.php:255 msgid "" @@ -10437,6 +10545,8 @@ msgid "" "%sGZip compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" +"%sGZip komprimering og dekomprimering%s kræver funktioner (%s) som ikke er " +"tilgængelige på dette system." #: setup/lib/index.lib.php:260 #, php-format @@ -10445,6 +10555,9 @@ msgid "" "invalidation if %ssession.gc_maxlifetime%s is lower than its value " "(currently %d)." msgstr "" +"%sLogin cookie gyldighed%s større end 1440 sekunder kan forårsage tilfældig " +"afslutning af session hvis %ssession.gc_maxlifetime%s er mindre end dens " +"værdi (aktuelt %d)." #: setup/lib/index.lib.php:262 #, php-format @@ -10452,6 +10565,9 @@ msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." msgstr "" +"%sLogin cookie validity%s bør højst sættes til 1800 sekunder (30 minutter). " +"Værdier større end 1800 kan udgøre en sikkerhedsrisiko som fx overtagelse af " +"identitet." #: setup/lib/index.lib.php:264 #, php-format @@ -10486,10 +10602,10 @@ msgid "" "http[/kbd]." msgstr "" "Du har sat [kbd]config[/kbd] autentifikation og inkluderet brugernavn og " -"kodeord for auto-login, hvilket er ikke en ønskværdig konfiguration for " +"adgangskode for auto-login, hvilket er ikke en ønskværdig konfiguration for " "produktionssystemer. Enhver som kender eller gætter din phpMyAdmin URL kan " "direkte få adgang til dit phpMyAdmin panel for denne server. Sæt %" -"sauthentication type%s til [kbd]cookie[/kbd] eller [kbd]http[/kbd]." +"sautentifikationtype%s til [kbd]cookie[/kbd] eller [kbd]http[/kbd]." #: setup/lib/index.lib.php:270 #, php-format @@ -10497,6 +10613,8 @@ msgid "" "%sZip compression%s requires functions (%s) which are unavailable on this " "system." msgstr "" +"%sZip komprimering%s kræver funktioner (%s) som ikke er tilgængelige på " +"dette system." #: setup/lib/index.lib.php:272 #, php-format @@ -10504,6 +10622,8 @@ msgid "" "%sZip decompression%s requires functions (%s) which are unavailable on this " "system." msgstr "" +"%sZip dekomprimering%s kræver funktioner (%s) som ikke er tilgængelige på " +"dette system." #: setup/lib/index.lib.php:296 msgid "You should use SSL connections if your web server supports it." @@ -10515,7 +10635,7 @@ msgstr "Du bør bruge mysqli af ydelsesgrunde." #: setup/lib/index.lib.php:331 msgid "You allow for connecting to the server without a password." -msgstr "Du tillader forbindelse til serveren uden password." +msgstr "Du tillader forbindelse til serveren uden adgangskode" #: setup/lib/index.lib.php:351 msgid "Key is too short, it should have at least 8 characters." @@ -11135,7 +11255,7 @@ msgstr "Forespørgselsfejl" #: tbl_tracking.php:399 msgid "Tracking data manipulation successfully deleted" -msgstr "" +msgstr "Manipulerede sporingsdata slettet" #: tbl_tracking.php:411 msgid "Tracking statements" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11010-g167d103
by Madhura Jayaratne 21 Jul '11

21 Jul '11

The branch, master has been updated via 167d10385d610ec235d791d9b76da7bfdb008363 (commit) via 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit) from 75bb94f923ab454fe0db509996793d0164c5e103 (commit) - Log ----------------------------------------------------------------- commit 167d10385d610ec235d791d9b76da7bfdb008363 Merge: 75bb94f923ab454fe0db509996793d0164c5e103 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 08:59:35 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header.inc.php | 5 ++--- sql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d438c06..94861f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button - bug #3363221 [display] Missing Server Parameter on inline sql query +- bug #3367986 [navi] Drop field -> lost active table 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 80763e7..270b421 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -138,10 +138,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { htmlspecialchars($GLOBALS['db']), __('Database'), 's_db.png'); - // if the table is being dropped, $_REQUEST['purge'] is set - // (it always contains "1") + // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div - if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { require_once './libraries/tbl_info.inc.php'; echo $separator; diff --git a/sql.php b/sql.php index 543c115..6d705fc 100644 --- a/sql.php +++ b/sql.php @@ -821,7 +821,7 @@ if (0 == $num_rows || $is_affected) { $goto = PMA_securePath($goto); // Checks for a valid target script $is_db = $is_table = false; - if (isset($_REQUEST['purge'])) { + if (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1') { $table = ''; unset($url_params['table']); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-34-g58b48a3
by Madhura Jayaratne 21 Jul '11

21 Jul '11

The branch, QA_3_4 has been updated via 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit) from 9eba5726bd809ab874fc29360ac6ff351d86335b (commit) - Log ----------------------------------------------------------------- commit 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jul 21 08:55:57 2011 +0530 bug #3367986 [navi] Drop field -> lost active table ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header.inc.php | 5 ++--- sql.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d3e081a..95bb4fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button - bug #3363221 [display] Missing Server Parameter on inline sql query +- bug #3367986 [navi] Drop field -> lost active table 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/libraries/header.inc.php b/libraries/header.inc.php index a23d2fa..9cc2785 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -124,10 +124,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { htmlspecialchars($GLOBALS['db']), __('Database'), 's_db.png'); - // if the table is being dropped, $_REQUEST['purge'] is set - // (it always contains "1") + // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div - if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { require_once './libraries/tbl_info.inc.php'; echo $separator; diff --git a/sql.php b/sql.php index 9b19174..10e472a 100644 --- a/sql.php +++ b/sql.php @@ -760,7 +760,7 @@ if (0 == $num_rows || $is_affected) { $goto = PMA_securePath($goto); // Checks for a valid target script $is_db = $is_table = false; - if (isset($_REQUEST['purge'])) { + if (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1') { $table = ''; unset($url_params['table']); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11008-g75bb94f
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 75bb94f923ab454fe0db509996793d0164c5e103 (commit) from e386d589864d3ca346653429caddf24502526dc8 (commit) - Log ----------------------------------------------------------------- commit 75bb94f923ab454fe0db509996793d0164c5e103 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:52:28 2011 +0200 Fix strings ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 +- server_status.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/messages.php b/js/messages.php index 1345a8e..5b91d79 100644 --- a/js/messages.php +++ b/js/messages.php @@ -128,7 +128,7 @@ $js_messages['strEnableVar'] = __('Enable %s'); $js_messages['strDisableVar'] = __('Disable %s'); /* l10n: %d seconds */ $js_messages['setSetLongQueryTime'] = __('Set long_query_time to %ds'); -$js_messages['strNoSuperUser'] = __('You don\'t have super user rights to change this variables. Please log in as root account or contact your database administrator.'); +$js_messages['strNoSuperUser'] = __('You can\'t change these variables. Please log in as root or contact your database administrator.'); $js_messages['strChangeSettings'] = __('Change settings'); $js_messages['strCurrentSettings'] = __('Current settings'); diff --git a/server_status.php b/server_status.php index 2bdae64..a16896b 100644 --- a/server_status.php +++ b/server_status.php @@ -1332,7 +1332,7 @@ function printMonitor() { <div id="monitorInstructionsDialog" title="<?php echo __('Monitor Instructions'); ?>" style="display:none;"> <?php echo __('The phpMyAdmin Monitor can assist you in optimizing the server configuration and track down time intensive - queries. For the latter you will need to log_output set to \'TABLE\' and have either the slow_query_log or general_log enabled.'); ?> + queries. For the latter you will need to set log_output to \'TABLE\' and have either the slow_query_log or general_log enabled.'); ?> <p></p> <img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage']; ?>ajax_clock_small.gif" alt="Loading"> <div class="ajaxContent"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11007-ge386d58
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via e386d589864d3ca346653429caddf24502526dc8 (commit) from 23c5e3282fb1ce89ec6cdb5004c6f36aedcda2bc (commit) - Log ----------------------------------------------------------------- commit e386d589864d3ca346653429caddf24502526dc8 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:42:50 2011 +0200 $server_db_isLocal - account for IPv6 loopback address Only the most common form ('::1') is recognized ----------------------------------------------------------------------- Summary of changes: server_status.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server_status.php b/server_status.php index 28d6858..2bdae64 100644 --- a/server_status.php +++ b/server_status.php @@ -557,7 +557,8 @@ $server = 1; if(isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']); $server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost' - || $cfg['Servers'][$server]['host'] == '127.0.0.1'; + || $cfg['Servers'][$server]['host'] == '127.0.0.1' + || $cfg['Servers'][$server]['host'] == '::1'; ?> <script type="text/javascript"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11006-g23c5e32
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 23c5e3282fb1ce89ec6cdb5004c6f36aedcda2bc (commit) from 4ee15be98627dcc5e7de721a9fe69d3aabeefd41 (commit) - Log ----------------------------------------------------------------- commit 23c5e3282fb1ce89ec6cdb5004c6f36aedcda2bc Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:38:37 2011 +0200 Code formatting ----------------------------------------------------------------------- Summary of changes: server_status.php | 135 +++++++++++++++++++++++++++++------------------------ 1 files changed, 74 insertions(+), 61 deletions(-) diff --git a/server_status.php b/server_status.php index 004a536..28d6858 100644 --- a/server_status.php +++ b/server_status.php @@ -44,16 +44,18 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { header('Content-Type: text/html; charset=UTF-8'); if (isset($_REQUEST['logging_vars'])) { - if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { + if (isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) { $value = PMA_sqlAddslashes($_REQUEST['varValue']); - if(!is_numeric($value)) $value="'".$value."'"; + if (!is_numeric($value)) $value="'".$value."'"; - if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName'])) - PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value); + if (!preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName'])) + PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = '.$value); } - $loggingVars = PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES WHERE Variable_name IN ("general_log","slow_query_log","long_query_time","log_output")', 0, 1); + $loggingVars = PMA_DBI_fetch_result( + "SHOW GLOBAL VARIABLES WHERE Variable_name IN ( + 'general_log', 'slow_query_log', 'long_query_time', 'log_output')", 0, 1); exit(json_encode($loggingVars)); } @@ -61,7 +63,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { if (isset($_REQUEST['chart_data'])) { switch($_REQUEST['type']) { case 'proc': - $c = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Connections"', 0, 1); + $c = PMA_DBI_fetch_result("SHOW GLOBAL STATUS WHERE Variable_name = 'Connections'", 0, 1); $result = PMA_DBI_query('SHOW PROCESSLIST'); $num_procs = PMA_DBI_num_rows($result); @@ -74,7 +76,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); case 'queries': - $queries = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name LIKE "Com_%" OR Variable_name="Questions" AND Value>0', 0, 1); + $queries = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions') + AND Value > 0'", 0, 1); cleanDeprecated($queries); // admin commands are not queries unset($queries['Com_admin_commands']); @@ -91,7 +96,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); case 'traffic': - $traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1); + $traffic = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name = 'Bytes_received' + OR Variable_name = 'Bytes_sent'", 0, 1); $ret = array( 'x' => microtime(true)*1000, @@ -102,16 +110,16 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($ret)); case 'chartgrid': - $ret = json_decode($_REQUEST['requiredData'],true); - $statusVars = Array(); + $ret = json_decode($_REQUEST['requiredData'], true); + $statusVars = array(); $sysinfo = $cpuload = $memory = 0; - foreach($ret as $chart_id=>$chartNodes) { - foreach($chartNodes as $node_id=>$node) { - switch($node['dataType']) { + foreach ($ret as $chart_id => $chartNodes) { + foreach ($chartNodes as $node_id => $node) { + switch ($node['dataType']) { case 'statusvar': // Some white list filtering - if(! preg_match('/[^a-zA-Z_]+/',$node['name'])) + if (!preg_match('/[^a-zA-Z_]+/',$node['name'])) $statusVars[] = $node['name']; break; @@ -121,14 +129,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; case 'cpu': - if(! $sysinfo) { + if (!$sysinfo) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if(! $cpuload) + if (!$cpuload) $cpuload = $sysinfo->loadavg(); - if(PHP_OS == 'Linux') { + if (PHP_OS == 'Linux') { $ret[$chart_id][$node_id]['idle'] = $cpuload['idle']; $ret[$chart_id][$node_id]['busy'] = $cpuload['busy']; } else @@ -137,11 +145,11 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { break; case 'memory': - if(! $sysinfo) { + if (!$sysinfo) { require_once('libraries/sysinfo.lib.php'); $sysinfo = getSysInfo(); } - if(! $memory) + if (!$memory) $memory = $sysinfo->memory(); $ret[$chart_id][$node_id]['y'] = $memory[$node['name']]; @@ -150,11 +158,13 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } } - $vars = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="' . implode('" OR Variable_name="',$statusVars) . '"', 0, 1); + $vars = PMA_DBI_fetch_result( + "SHOW GLOBAL STATUS + WHERE Variable_name='" . implode("' OR Variable_name='", $statusVars) . "'", 0, 1); - foreach($ret as $chart_id=>$chartNodes) { - foreach($chartNodes as $node_id=>$node) { - if($node['dataType'] == 'statusvar') + foreach ($ret as $chart_id => $chartNodes) { + foreach ($chartNodes as $node_id => $node) { + if ($node['dataType'] == 'statusvar') $ret[$chart_id][$node_id]['y'] = $vars[$node['name']]; } } @@ -165,11 +175,11 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } } - if(isset($_REQUEST['log_data'])) { + if (isset($_REQUEST['log_data'])) { $start = intval($_REQUEST['time_start']); $end = intval($_REQUEST['time_end']); - if($_REQUEST['type'] == 'slow') { + if ($_REQUEST['type'] == 'slow') { $q = 'SELECT SUM(query_time) AS TIME(query_time), SUM(lock_time) as lock_time, '. 'SUM(rows_sent) AS rows_sent, SUM(rows_examined) AS rows_examined, sql_text, COUNT(sql_text) AS \'#\' '. 'FROM `mysql`.`slow_log` WHERE event_time > FROM_UNIXTIME('.$start.') '. @@ -177,7 +187,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { $result = PMA_DBI_try_query($q); - $return = array( 'rows' => array(), 'sum' => array()); + $return = array('rows' => array(), 'sum' => array()); $type = ''; while ($row = PMA_DBI_fetch_assoc($result)) { @@ -193,14 +203,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { exit(json_encode($return)); } - if($_REQUEST['type'] == 'general') { + if ($_REQUEST['type'] == 'general') { $q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' FROM `mysql`.`general_log` WHERE command_type=\'Query\' '. 'AND event_time > FROM_UNIXTIME('.$start.') AND event_time < FROM_UNIXTIME('.$end.') '. 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' GROUP by argument'; // HAVING count > 1'; $result = PMA_DBI_try_query($q); - $return = array( 'rows' => array(), 'sum' => array()); + $return = array('rows' => array(), 'sum' => array()); $type = ''; $insertTables = array(); $insertTablesFirst = -1; @@ -231,9 +241,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { } // Cut off big selects, but append byte count therefor - if(strlen($row['argument']) > 180) + if (strlen($row['argument']) > 180) { $row['argument'] = substr($row['argument'],0,160) . '... [' . PMA_formatByteDown(strlen($row['argument']), 2).']'; + } } $return['rows'][] = $row; $i++; @@ -325,43 +336,44 @@ cleanDeprecated($server_status); */ // Key_buffer_fraction if (isset($server_status['Key_blocks_unused']) - && isset($server_variables['key_cache_block_size']) - && isset($server_variables['key_buffer_size'])) { + && isset($server_variables['key_cache_block_size']) + && isset($server_variables['key_buffer_size'])) { $server_status['Key_buffer_fraction_%'] = 100 - - $server_status['Key_blocks_unused'] - * $server_variables['key_cache_block_size'] - / $server_variables['key_buffer_size'] - * 100; -} elseif ( - isset($server_status['Key_blocks_used']) - && isset($server_variables['key_buffer_size'])) { + - $server_status['Key_blocks_unused'] + * $server_variables['key_cache_block_size'] + / $server_variables['key_buffer_size'] + * 100; +} elseif (isset($server_status['Key_blocks_used']) + && isset($server_variables['key_buffer_size'])) { $server_status['Key_buffer_fraction_%'] = $server_status['Key_blocks_used'] - * 1024 - / $server_variables['key_buffer_size']; + * 1024 + / $server_variables['key_buffer_size']; } // Ratio for key read/write if (isset($server_status['Key_writes']) - && isset($server_status['Key_write_requests']) - && $server_status['Key_write_requests'] > 0) - $server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests']; + && isset($server_status['Key_write_requests']) + && $server_status['Key_write_requests'] > 0) { + $server_status['Key_write_ratio_%'] = 100 * $server_status['Key_writes'] / $server_status['Key_write_requests']; +} if (isset($server_status['Key_reads']) - && isset($server_status['Key_read_requests']) - && $server_status['Key_read_requests'] > 0) - $server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests']; + && isset($server_status['Key_read_requests']) + && $server_status['Key_read_requests'] > 0) { + $server_status['Key_read_ratio_%'] = 100 * $server_status['Key_reads'] / $server_status['Key_read_requests']; +} // Threads_cache_hitrate if (isset($server_status['Threads_created']) - && isset($server_status['Connections']) - && $server_status['Connections'] > 0) { + && isset($server_status['Connections']) + && $server_status['Connections'] > 0) { $server_status['Threads_cache_hitrate_%'] = 100 - - $server_status['Threads_created'] - / $server_status['Connections'] - * 100; + - $server_status['Threads_created'] + / $server_status['Connections'] + * 100; } // Format Uptime_since_flush_status : show as days, hours, minutes, seconds @@ -450,23 +462,23 @@ $links['table'][__('Flush (close) all tables')] = $PMA_PHP_SELF . '?flush=TABLES&' . PMA_generate_common_url(); $links['table'][__('Show open tables')] = 'sql.php?sql_query=' . urlencode('SHOW OPEN TABLES') . - '&goto=server_status.php&' . PMA_generate_common_url(); + '&goto=server_status.php&' . PMA_generate_common_url(); if ($server_master_status) { - $links['repl'][__('Show slave hosts')] - = 'sql.php?sql_query=' . urlencode('SHOW SLAVE HOSTS') . - '&goto=server_status.php&' . PMA_generate_common_url(); - $links['repl'][__('Show master status')] = '#replication_master'; + $links['repl'][__('Show slave hosts')] + = 'sql.php?sql_query=' . urlencode('SHOW SLAVE HOSTS') . + '&goto=server_status.php&' . PMA_generate_common_url(); + $links['repl'][__('Show master status')] = '#replication_master'; } if ($server_slave_status) { - $links['repl'][__('Show slave status')] = '#replication_slave'; + $links['repl'][__('Show slave status')] = '#replication_slave'; } $links['repl']['doc'] = 'replication'; $links['qcache'][__('Flush query cache')] = $PMA_PHP_SELF . '?flush=' . urlencode('QUERY CACHE') . '&' . - PMA_generate_common_url(); + PMA_generate_common_url(); $links['qcache']['doc'] = 'query_cache'; //$links['threads'][__('Show processes')] @@ -483,7 +495,7 @@ $links['innodb'][__('Variables')] = 'server_engines.php?engine=InnoDB&' . PMA_generate_common_url(); $links['innodb'][__('InnoDB Status')] = 'server_engines.php?engine=InnoDB&page=Status&' . - PMA_generate_common_url(); + PMA_generate_common_url(); $links['innodb']['doc'] = 'innodb'; @@ -1453,6 +1465,8 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, /** * cleanup of some deprecated values + * + * @param array &$server_status */ function cleanDeprecated(&$server_status) { $deprecated = array( @@ -1462,8 +1476,7 @@ function cleanDeprecated(&$server_status) { ); foreach ($deprecated as $old => $new) { - if (isset($server_status[$old]) - && isset($server_status[$new])) { + if (isset($server_status[$old]) && isset($server_status[$new])) { unset($server_status[$old]); } } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11005-g4ee15be
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 4ee15be98627dcc5e7de721a9fe69d3aabeefd41 (commit) via 6deed1fd2e0905c055f3f4b1c9da752fda6369f7 (commit) via b202936282dc7949dd5888ae3462999d6f4a999b (commit) from 7e27edbb6d15e0cbac446de4b7083568dbf20210 (commit) - Log ----------------------------------------------------------------- commit 4ee15be98627dcc5e7de721a9fe69d3aabeefd41 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:10:38 2011 +0200 PMA_lookForUse - require whitespace after USE commit 6deed1fd2e0905c055f3f4b1c9da752fda6369f7 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:08:04 2011 +0200 Change NULL to null commit b202936282dc7949dd5888ae3462999d6f4a999b Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 18:03:58 2011 +0200 Unify function comments ----------------------------------------------------------------------- Summary of changes: libraries/File.class.php | 8 +++--- libraries/Table.class.php | 2 +- libraries/blobstreaming.lib.php | 2 +- libraries/database_interface.lib.php | 2 +- libraries/import.lib.php | 50 ++++++++++++++------------------- libraries/import/csv.php | 6 ++-- libraries/import/ods.php | 4 +- libraries/import/xls.php | 4 +- libraries/import/xlsx.php | 4 +- libraries/import/xml.php | 12 ++++---- libraries/plugin_interface.lib.php | 2 +- tbl_change.php | 2 +- 12 files changed, 45 insertions(+), 53 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index c2d5dad..553cc2d 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -73,7 +73,7 @@ class PMA_File /** * @staticvar string most recent BLOB repository reference */ - static $_recent_bs_reference = NULL; + static $_recent_bs_reference = null; /** * constructor @@ -254,7 +254,7 @@ class PMA_File $tmp_file_type = $file['type']; if (! $tmp_file_type) { - $tmp_file_type = NULL; + $tmp_file_type = null; } if (! $bs_db || ! $bs_table) { @@ -384,7 +384,7 @@ class PMA_File } if (! $tmp_file_type) { - $tmp_file_type = NULL; + $tmp_file_type = null; } if (! $bs_db || !$bs_table) { @@ -828,7 +828,7 @@ class PMA_File static function getRecentBLOBReference() { $ref = PMA_File::$_recent_bs_reference; - PMA_File::$_recent_bs_reference = NULL; + PMA_File::$_recent_bs_reference = null; return $ref; } diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 83e67fd..66ceaea 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1370,7 +1370,7 @@ class PMA_Table * @param string $table_create_time Needed for PROP_COLUMN_ORDER and PROP_COLUMN_VISIB * @return boolean|PMA_Message */ - public function setUiProp($property, $value, $table_create_time = NULL) + public function setUiProp($property, $value, $table_create_time = null) { if (! isset($this->uiprefs)) { $this->loadUiPrefs(); diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php index cd1e5d4..301403c 100644 --- a/libraries/blobstreaming.lib.php +++ b/libraries/blobstreaming.lib.php @@ -179,7 +179,7 @@ function checkBLOBStreamingPlugins() $PMA_Config->set('FILEINFO_EXISTS', false); // check if PECL's fileinfo library exist - $finfo = NULL; + $finfo = null; if (function_exists("finfo_open")) { $finfo = finfo_open(FILEINFO_MIME); diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index ca50600..a43a4af 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -472,7 +472,7 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals $each_tables[$table_name]['TABLE_COMMENT'] =& $each_tables[$table_name]['Comment']; if (strtoupper($each_tables[$table_name]['Comment']) === 'VIEW' - && $each_tables[$table_name]['Engine'] == NULL) { + && $each_tables[$table_name]['Engine'] == null) { $each_tables[$table_name]['TABLE_TYPE'] = 'VIEW'; } else { /** diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 5b8af20..79b4ade 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -44,7 +44,7 @@ function PMA_checkTimeout() /** * Detects what compression filse uses * - * @param string filename to check + * @param string $filepath filename to check * @return string MIME type of compression, none for none * @access public */ @@ -73,9 +73,9 @@ function PMA_detectCompression($filepath) * Runs query inside import buffer. This is needed to allow displaying * of last SELECT, SHOW or HANDLER results and similar nice stuff. * - * @param string query to run - * @param string query to display, this might be commented - * @param bool whether to use control user for queries + * @param string $sql query to run + * @param string $full query to display, this might be commented + * @param bool $controluser whether to use control user for queries * @access public */ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) @@ -207,17 +207,17 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) /** * Looks for the presence of USE to possibly change current db * - * @param string buffer to examine - * @param string current db - * @param boolean reload + * @param string $buffer buffer to examine + * @param string $db current db + * @param bool $reload reload * @return array (current or new db, whether to reload) * @access public */ function PMA_lookForUse($buffer, $db, $reload) { - if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) { + if (preg_match('@^[\s]*USE[[:space:]]+([\S]+)@i', $buffer, $match)) { $db = trim($match[1]); - $db = trim($db,';'); // for example, USE abc; + $db = trim($db, ';'); // for example, USE abc; $reload = true; } return(array($db, $reload)); @@ -227,8 +227,7 @@ function PMA_lookForUse($buffer, $db, $reload) /** * Returns next part of imported file/buffer * - * @param integer size of buffer to read (this is maximal size - * function will return) + * @param int $size size of buffer to read (this is maximal size function will return) * @return string part of file/buffer * @access public */ @@ -436,7 +435,6 @@ define("SIZES", 1); /** * Obtains the precision (total # of digits) from a size of type decimal * - * * @access public * * @param string $last_cumulative_size @@ -449,7 +447,6 @@ function PMA_getM($last_cumulative_size) { /** * Obtains the scale (# of digits to the right of the decimal point) from a size of type decimal * - * * @access public * * @param string $last_cumulative_size @@ -462,7 +459,6 @@ function PMA_getD($last_cumulative_size) { /** * Obtains the decimal size of a given cell * - * * @access public * * @param string &$cell @@ -482,7 +478,6 @@ function PMA_getDecimalSize(&$cell) { /** * Obtains the size of the given cell * - * * @todo Handle the error cases more elegantly * * @access public @@ -696,7 +691,6 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * Determines what MySQL type a cell is * - * * @access public * * @param int $last_cumulative_type Last cumulative column type (VARCHAR or INT or BIGINT or DECIMAL or NONE) @@ -710,7 +704,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { */ if (! strcmp('NULL', $cell)) { - if ($last_cumulative_type === NULL || $last_cumulative_type == NONE) { + if ($last_cumulative_type === null || $last_cumulative_type == NONE) { return NONE; } else { return $last_cumulative_type; @@ -733,7 +727,6 @@ function PMA_detectType($last_cumulative_type, &$cell) { /** * Determines if the column types are int, decimal, or string * - * * @link http://wiki.phpmyadmin.net/pma/Import * * @todo Handle the error case more elegantly @@ -823,25 +816,24 @@ function PMA_analyzeTable(&$table) { } /* Needed to quell the beast that is PMA_Message */ -$import_notice = NULL; +$import_notice = null; /** * Builds and executes SQL statements to create the database and tables * as necessary, as well as insert all the data. * - * * @link http://wiki.phpmyadmin.net/pma/Import * * @access public * - * @param string $db_name Name of the database - * @param array &$tables Array of tables for the specified database - * @param array &$analyses = NULL Analyses of the tables - * @param array &$additional_sql = NULL Additional SQL statements to be executed - * @param array $options = NULL Associative array of options + * @param string $db_name Name of the database + * @param array &$tables Array of tables for the specified database + * @param array &$analyses Analyses of the tables + * @param array &$additional_sql Additional SQL statements to be executed + * @param array $options Associative array of options * @return void */ -function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = NULL, $options = NULL) { +function PMA_buildSQL($db_name, &$tables, &$analyses = null, &$additional_sql = null, $options = null) { /* Take care of the options */ if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) { $collation = $options['db_collation']; @@ -884,7 +876,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = unset($sql); /* Run the $additional_sql statements supplied by the caller plug-in */ - if ($additional_sql != NULL) { + if ($additional_sql != null) { /* Clean the SQL first */ $additional_sql_len = count($additional_sql); @@ -910,7 +902,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } } - if ($analyses != NULL) { + if ($analyses != null) { $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint"); /* TODO: Do more checking here to make sure they really are matched */ @@ -975,7 +967,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $tempSQLStr .= "("; for ($k = 0; $k < $num_cols; ++$k) { - if ($analyses != NULL) { + if ($analyses != null) { $is_varchar = ($analyses[$i][TYPES][$col_count] === VARCHAR); } else { $is_varchar = !is_numeric($tables[$i][ROWS][$j][$k]); diff --git a/libraries/import/csv.php b/libraries/import/csv.php index 7735598..a0b3348 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -258,7 +258,7 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) { // Need to strip trailing enclosing char? if ($need_end && $ch == $csv_enclosed) { if ($finished && $i == $len - 1) { - $ch = NULL; + $ch = null; } elseif ($i == $len - 1) { $i = $fallbacki; $ch = $buffer[$i]; @@ -417,11 +417,11 @@ if ($analyze) { $options = array('create_db' => false); } else { $db_name = 'CSV_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ - $create = NULL; + $create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 7f850c6..79a920b 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -275,11 +275,11 @@ if (strlen($db)) { $options = array('create_db' => false); } else { $db_name = 'ODS_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ -$create = NULL; +$create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/xls.php b/libraries/import/xls.php index 78cdef5..4db0a28 100644 --- a/libraries/import/xls.php +++ b/libraries/import/xls.php @@ -130,11 +130,11 @@ if (strlen($db)) { $options = array('create_db' => false); } else { $db_name = 'XLS_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ -$create = NULL; +$create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php index 33308c6..08d151c 100644 --- a/libraries/import/xlsx.php +++ b/libraries/import/xlsx.php @@ -130,11 +130,11 @@ if (strlen($db)) { $options = array('create_db' => false); } else { $db_name = 'XLSX_DB'; - $options = NULL; + $options = null; } /* Non-applicable parameters */ -$create = NULL; +$create = null; /* Created and execute necessary SQL statements from data */ PMA_buildSQL($db_name, $tables, $analyses, $create, $options); diff --git a/libraries/import/xml.php b/libraries/import/xml.php index db9ba6e..17479f5 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -119,14 +119,14 @@ if ($db_attr instanceof SimpleXMLElement) { */ $db_attr = $xml->children()->attributes(); $db_name = (string)$db_attr['name']; - $collation = NULL; - $charset = NULL; + $collation = null; + $charset = null; } /** * The XML was malformed */ -if ($db_name === NULL) { +if ($db_name === null) { PMA_Message::error(__('The XML file specified was either malformed or incomplete. Please correct the issue and try again.'))->display(); unset($xml); $GLOBALS['finished'] = false; @@ -259,9 +259,9 @@ if ($data_present) { * to maintain PMA_buildSQL() call integrity */ if (! isset($analyses)) { - $analyses = NULL; + $analyses = null; if (! $struct_present) { - $create = NULL; + $create = null; } } } @@ -286,7 +286,7 @@ if (strlen($db)) { $db_name = $db; $options = array('create_db' => false); } else { - if ($db_name === NULL) { + if ($db_name === null) { $db_name = 'XML_DB'; } diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 74e72c3..ea6869a 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -138,7 +138,7 @@ function PMA_pluginIsActive($section, $opt, $val) * @param string $cfgname name of config value, if none same as $name * @return string html select tag */ -function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL) +function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null) { if (! isset($cfgname)) { $cfgname = $name; diff --git a/tbl_change.php b/tbl_change.php index 7d5bba3..63f0d56 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -505,7 +505,7 @@ foreach ($rows as $row_id => $vrow) { //when copying row, it is useful to empty auto-increment column to prevent duplicate key error if (isset($default_action) && $default_action === 'insert') { if ($field['Key'] === 'PRI' && strpos($field['Extra'], 'auto_increment') !== false) { - $data = $special_chars_encoded = $special_chars = NULL; + $data = $special_chars_encoded = $special_chars = null; } } // If a timestamp field value is not included in an update hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11002-g7e27edb
by Piotr Przybylski 20 Jul '11

20 Jul '11

The branch, master has been updated via 7e27edbb6d15e0cbac446de4b7083568dbf20210 (commit) from b857e9580757a84132fc8ccd820a549115af7e2d (commit) - Log ----------------------------------------------------------------- commit 7e27edbb6d15e0cbac446de4b7083568dbf20210 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jul 20 16:57:07 2011 +0200 Hide warnings that may arise from ini_set('memory_limit', ...) and set_time_limit when used in safe_mode ----------------------------------------------------------------------- Summary of changes: bs_disp_as_mime_type.php | 2 +- libraries/import/ods.php | 4 ++-- libraries/import/xls.php | 4 ++-- libraries/import/xlsx.php | 4 ++-- libraries/import/xml.php | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php index 03a8c8b..9ec0ec5 100644 --- a/bs_disp_as_mime_type.php +++ b/bs_disp_as_mime_type.php @@ -13,7 +13,7 @@ require_once './libraries/common.inc.php'; PMA_checkParameters(array('reference', 'c_type')); // Increase time limit, because fetching blob might take some time -set_time_limit(0); +@set_time_limit(0); $reference = $_REQUEST['reference']; /* diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 29952f9..7f850c6 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -35,8 +35,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); +@ini_set('memory_limit', '128M'); +@set_time_limit(120); $i = 0; $len = 0; diff --git a/libraries/import/xls.php b/libraries/import/xls.php index f7e3d33..78cdef5 100644 --- a/libraries/import/xls.php +++ b/libraries/import/xls.php @@ -31,8 +31,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '256M'); -set_time_limit(120); +@ini_set('memory_limit', '256M'); +@set_time_limit(120); /* Append the PHPExcel directory to the include path variable */ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/'); diff --git a/libraries/import/xlsx.php b/libraries/import/xlsx.php index 2b5f628..33308c6 100644 --- a/libraries/import/xlsx.php +++ b/libraries/import/xlsx.php @@ -31,8 +31,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '256M'); -set_time_limit(120); +@ini_set('memory_limit', '256M'); +@set_time_limit(120); /* Append the PHPExcel directory to the include path variable */ set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/'); diff --git a/libraries/import/xml.php b/libraries/import/xml.php index 8fe45d8..db9ba6e 100644 --- a/libraries/import/xml.php +++ b/libraries/import/xml.php @@ -28,8 +28,8 @@ if (isset($plugin_list)) { return; } -ini_set('memory_limit', '128M'); -set_time_limit(120); +@ini_set('memory_limit', '128M'); +@set_time_limit(120); $i = 0; $len = 0; hooks/post-receive -- phpMyAdmin

1 0