Git October 2011

git@phpmyadmin.net

6 participants
164 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_6-46-g7fcea70
by Marc Delisle 16 Oct '11

16 Oct '11

The branch, TESTING has been updated via 7fcea707b97d89ef7c74009b135a7f9911b28368 (commit) via 7869e3c3b412d825e040bc5df18c6d0adc28f751 (commit) from 0f0307038ceb24c442d72444e4da8f58fa23969d (commit) - Log ----------------------------------------------------------------- commit 7fcea707b97d89ef7c74009b135a7f9911b28368 Merge: 0f03070 7869e3c Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 16 06:26:49 2011 -0400 Merge branch 'MAINT_3_4_6' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4165a5a..1d45ea9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.6.0 (not yet released) +3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields diff --git a/Documentation.html b/Documentation.html index 645f86e..83d0134 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.6-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.6 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.6-rc1 + 3.4.6 Documentation </h1> </div> diff --git a/README b/README index e94403e..21967fb 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.6-rc1 +Version 3.4.6 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 77da8dd..6bc1d00 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.6-rc1'); + $this->set('PMA_VERSION', '3.4.6'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_6, created. RELEASE_3_4_6
by Marc Delisle 16 Oct '11

16 Oct '11

The annotated tag, RELEASE_3_4_6 has been created at 8adf81c14aa2a2cc87c95de634d8d6b9b53fe23a (tag) tagging 7869e3c3b412d825e040bc5df18c6d0adc28f751 (commit) replaces RELEASE_3_4_6RC1 tagged by Marc Delisle on Sun Oct 16 06:26:48 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.6 Marc Delisle (1): 3.4.6 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-21203-gba2159b
by Marc Delisle 16 Oct '11

16 Oct '11

The branch, master has been updated via ba2159baca78325d9b6f6819e59b5f5546f503cd (commit) via f3f9122c67f0fb795d5906a0b8b05b3b0f088683 (commit) via c6ae934260a6b571784588a32d7323609cbb61f9 (commit) via 7869e3c3b412d825e040bc5df18c6d0adc28f751 (commit) from 2e19a6753f51d7f73e8794af3dc71e65b04dbc6f (commit) - Log ----------------------------------------------------------------- commit ba2159baca78325d9b6f6819e59b5f5546f503cd Merge: 2e19a67 f3f9122 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 16 06:22:18 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a139e6a..d897f63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,7 +60,7 @@ phpMyAdmin - ChangeLog - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF -3.4.6.0 (not yet released) +3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6RC1-18-gf3f9122
by Marc Delisle 16 Oct '11

16 Oct '11

The branch, QA_3_4 has been updated via f3f9122c67f0fb795d5906a0b8b05b3b0f088683 (commit) via c6ae934260a6b571784588a32d7323609cbb61f9 (commit) via 7869e3c3b412d825e040bc5df18c6d0adc28f751 (commit) from 77ad710d08eed759b9404e069e8dd6c1ea9f802f (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a79eebf..ee79c35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ phpMyAdmin - ChangeLog - bug #3420229 [doc] Missing documentation section - bug #3423725 [pdf] Broken PDF file when exporting database to PDF -3.4.6.0 (not yet released) +3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_6, updated. RELEASE_3_4_6RC1-1-g7869e3c
by Marc Delisle 16 Oct '11

16 Oct '11

The branch, MAINT_3_4_6 has been updated via 7869e3c3b412d825e040bc5df18c6d0adc28f751 (commit) from ca597dc423f3eebcca95ff33b088a03e39109115 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9fc16d..7d9e6d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.6.0 (not yet released) +3.4.6.0 (2011-10-16) - patch #3404173 InnoDB comment display with tooltips/aliases - bug #3404886 [navi] Edit SQL statement after error - bug #3403165 [interface] Collation not displayed for long enum fields diff --git a/Documentation.html b/Documentation.html index 645f86e..83d0134 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.6-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.6 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.6-rc1 + 3.4.6 Documentation </h1> </div> diff --git a/README b/README index e94403e..21967fb 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.6-rc1 +Version 3.4.6 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 77da8dd..6bc1d00 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.6-rc1'); + $this->set('PMA_VERSION', '3.4.6'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-21199-g2e19a67
by Michal Čihař 16 Oct '11

16 Oct '11

The branch, master has been updated via 2e19a6753f51d7f73e8794af3dc71e65b04dbc6f (commit) via 32674f52ae18038c6b8b75039999a4be4d0eb7d4 (commit) via 83b46e57bfeb407863ad5f5c2fd7c66f329c4f6a (commit) via 611cefbe0ac131a5f5bba2c84586f2de134d1ab1 (commit) via bb8d3df3ba9521fcae3cbc1df3a8e11e1b91d93e (commit) via b41773a4c95f61bc1d5bb0b232a611128f346724 (commit) via 36f9524f4c6c0796a8fb1deed9f4cd4d0b14e0b2 (commit) via 78b81e7588378b810bd481ffb98813e6c9c240f9 (commit) via 6fd01e932c5265d91fc44754002eb170af74184c (commit) via a1e844eaee3d1dc8052d01b383847402fa581850 (commit) via 2975ca5900f39a3f37715687cd9f6b5b2bddf82c (commit) via 06a3bc4ff533e018e2ab75bee3f0c2106745a99d (commit) via c74f8be9a7a2200bdba55e622b477225ddb64024 (commit) via 4df13ec575d485f548b760c640a1eec155e58934 (commit) via cd217a3c30fb7716a04d69226f6ede84cd7d30e3 (commit) via 70ff9ae113f2e316879fcabde5ef5e1becb8a4f3 (commit) via 8accb9f84b99c61a9aa4158bdf685393303c5506 (commit) via 8b3232ddc40d6043e9123f803ca7df30665bc8b1 (commit) via c7d0e68609e94083582200d7ebdb5ec043347122 (commit) via 620fea3f05b362cfd05249cbd3a2c8c7d37c2404 (commit) via 16c0fe9c7d5665d64e79bac8f9466552233aaebc (commit) via 66fb2064726f4b99640ff611f564ff1356671f85 (commit) via 5a86ae43068b3f8c3f8cdb1d0eb43e71999bae0d (commit) via a9e4c1ca58a54d8b30a8aab6a5634bcc8e17ef80 (commit) via bde069f08038a53cfa7bf6c1b27d6f1bbc1faef7 (commit) via 74e9604b7244c88a75cd5f5af5164258e19017df (commit) via ad6ea14d4330aed0881112597511e9e8f462b840 (commit) via e170a168b82fbcdd6d1345014bbe4b75ba933aa8 (commit) via ca0cc1ce238d7a9c015f59ee310fe45fa246143b (commit) via 96ca07efcf9d5ec188de69e4a0e406b8e55d36ea (commit) via fed56e940e44a5c3d596db06588c9601d7bbb1ee (commit) via a83fbd70817b4dac6f2ebe4767c2919b93af8a8a (commit) via c0b20dbb0598231228bcac2f2e2bf0bbc2059b54 (commit) via f8a00bae15c34f45e010fad8c21a5735b6ddfd79 (commit) via 09cb786f6cf6135aaf7c2f4ea9bdc39aceb1052e (commit) via 7de71fd16afcde0168485d14dcfc67175f8b3d97 (commit) via 1b3bb2ecb0cce07e05bb5d611ad1f4fa9730f727 (commit) via 6846d5895111c4e3497c27c75bdea783331e187c (commit) via af0ef1f868fd005de20b6a91169f58070e7dc5c5 (commit) via 10828fa13ec5e89f59c782de6db99d103f0980b8 (commit) via 948ed655f9718e1b07ea36fdc12c495ad2d00ad6 (commit) via c6594ec039a57c34a92cbcedc33c9a9218346b24 (commit) via d4356de168866846315cef9f4a3a941ec8290bca (commit) via 894c9913744cb5f36281562e32f5b9e86a8d876d (commit) via 03f72a79ba5d9d8101419cca9850423a9d912f46 (commit) via f8b88af7ae8285f87893c452ea7e8b587cc21291 (commit) via 072304b14a2e9c7988407c0a1972844234dbf624 (commit) via 99963304973d53768e3bf9b300e73476ebf7c06f (commit) via 27c8cef87632f10f5f5f7ad7ae8ed7e141847985 (commit) via c524aead4fac33be800bc24f1a23798ee37a21e7 (commit) via fafbc11251783a361e611cb4ad03ff37c6a75e1a (commit) via b517932879d70f3c623857f74754a9f7ea7d8c78 (commit) via e0e16cf0a2424a79f24901543c66e1d15661af56 (commit) via 8164db45337d677970687de8369f40e7807c9527 (commit) via 1296b29f295c74fe729868c6cc9de954c4a06935 (commit) via 33fe48a40aee844109001747278e04dd6a866a83 (commit) via e7eda0b98779edfd9b6aa0d279c703ec906e957a (commit) via 1ec06caf747809d2c7c30afa99e3dc8cfbe12d48 (commit) via 00d0d2c7e55170aa6326395003722c1e0e574019 (commit) via 11d6a83848f8c59177954add45ab8b223817edee (commit) via c5096ea04c281b7cf0ad8e79b8294067f2e98f39 (commit) via 66d7a45ed10bee3948ac2b620f2e6d2213a45bfd (commit) via c86a8a2d972eb3855bd91c5a8c57884a41c95572 (commit) via a7cb71b681e81021f4e85141736c47220f471293 (commit) via a0c9eafa1bb2c3d254ad433fa31f1b3537b550e7 (commit) via 2f2eb585b049f61c37c976cc991eb5ccc15046e4 (commit) via 8068c36f11ac692186ae092a1c6b91fbc3a15f68 (commit) via 7996ed303036e69447370ac18d0ab4e34926e91f (commit) via fe3aeae0b3be5413a57d483585030082c7dd6929 (commit) via dcdc491e4ce5a9f80445ee7bc09d579728ce8e91 (commit) via 008097601d9861692e152537765a75d438acbce7 (commit) via d750b24fbd41eec35342edd974a94be7d64816cd (commit) via 3e9a6147cb537cff807ad544b4d0f2a4a28ca0e6 (commit) via ecf6822d6bfba7f92c5210a0eb8821710dd8c8ad (commit) via d3045f9978fb913e7ae0cfc44ba25e2ac1bf1360 (commit) via e99885fe464f994bbb7e445db762528ef6f3da6f (commit) via 22a3bcb24002fee1e8ae12c213809994e557e615 (commit) via ad504f9d84bb428fb168e19eeb593ec4533d7360 (commit) via 4d795607f0e134cfa20cc0e46bc9dbf3eb5fc721 (commit) via 22aa0fdcebbe8e3030dfd3d548ea798b36174f85 (commit) via 2570a0fe70b2419592051a680f19340c6c631f9c (commit) via 8042e08c034897a793651a8cd310fe107809d889 (commit) via 5ce8ad04d953a43e153f39c53274ad4bb2986a69 (commit) via 94be82ef466a31193f15e43cea7bf5b2fdea2875 (commit) via b81f868da6f34bbba937ab4a7dbbaf27a8cf98e5 (commit) via c4fc4ab344cd12d384af947430d0895467845699 (commit) via ad734b28fd8a7a5ef430b9928819509777750052 (commit) via 56f7b0e2138742025aae1e5f25d69ca8ad6f175e (commit) via ca6527fd9ef60882a55845404da5d603652d5d10 (commit) via 08b9be70e6ef872bba18d31bb27d19093196741a (commit) via b043d70dad27140aa8ab529e614d01e4bbad2b1f (commit) via 9c6d0e0aae12a6a1eff2b1081bd75f62d09c29e1 (commit) via e864bcdd38cb431f6adb936e9cd4977a67ae1f23 (commit) via 9f219d3858da63b0e78d6af74669ca35e77ab533 (commit) via 1298295493d7c76a7768bd0c3527c44fadd1e318 (commit) via 5c03249b75f3a5362139831e79209eec1b4a8b1c (commit) via 64b738ddeda6e72f00bfad6d2a70630bfb640bc7 (commit) via 7414ac035e76831a46a10067784438a3c87e61a4 (commit) via 49b9df6f8f4b7cc4cdcf220f3605a7c3b136ac10 (commit) via 96d929c627c926d1b2a5bf8ed98d44876529e9ca (commit) via 8c4d9ca5499fb86cba1cd7b42f89bf7f990a72ea (commit) via 673263ebe4c934e882b1b96242e8342062870757 (commit) via a1e3624d4e3c618ba0bc9e58ce5056a271df5846 (commit) via 0df36d6ab9f8d131d02019e83f1a6d04c94ee3c1 (commit) via 374a25dff6ac6748d6a27943a9d55ff9e1e10a36 (commit) via ff02a14c33138240b92a1841fcd3c9ef4bd4fec9 (commit) via 45a681b71ab18c96da96160f67956b4ef42c6ff9 (commit) via 3ccb303cd11a3b678d3f25c932fc72ecdbd8dee1 (commit) via 9fdd1f3da4fb08c73c99fca46020c4b834b9034a (commit) from 4d16994ffe7f59770cfc7a1e6ee59827596d78b7 (commit) - Log ----------------------------------------------------------------- commit 2e19a6753f51d7f73e8794af3dc71e65b04dbc6f Author: Domen <dbc334(a)gmail.com> Date: Sat Oct 15 22:29:48 2011 +0200 Translation update done using Pootle. commit 32674f52ae18038c6b8b75039999a4be4d0eb7d4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:17:33 2011 +0200 Translation update done using Pootle. commit 83b46e57bfeb407863ad5f5c2fd7c66f329c4f6a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:16:44 2011 +0200 Translation update done using Pootle. commit 611cefbe0ac131a5f5bba2c84586f2de134d1ab1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:16:27 2011 +0200 Translation update done using Pootle. commit bb8d3df3ba9521fcae3cbc1df3a8e11e1b91d93e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:14:06 2011 +0200 Translation update done using Pootle. commit b41773a4c95f61bc1d5bb0b232a611128f346724 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:12:53 2011 +0200 Translation update done using Pootle. commit 36f9524f4c6c0796a8fb1deed9f4cd4d0b14e0b2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:12:17 2011 +0200 Translation update done using Pootle. commit 78b81e7588378b810bd481ffb98813e6c9c240f9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:11:58 2011 +0200 Translation update done using Pootle. commit 6fd01e932c5265d91fc44754002eb170af74184c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:11:28 2011 +0200 Translation update done using Pootle. commit a1e844eaee3d1dc8052d01b383847402fa581850 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:10:49 2011 +0200 Translation update done using Pootle. commit 2975ca5900f39a3f37715687cd9f6b5b2bddf82c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:09:50 2011 +0200 Translation update done using Pootle. commit 06a3bc4ff533e018e2ab75bee3f0c2106745a99d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:09:37 2011 +0200 Translation update done using Pootle. commit c74f8be9a7a2200bdba55e622b477225ddb64024 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:08:03 2011 +0200 Translation update done using Pootle. commit 4df13ec575d485f548b760c640a1eec155e58934 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:07:27 2011 +0200 Translation update done using Pootle. commit cd217a3c30fb7716a04d69226f6ede84cd7d30e3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:06:52 2011 +0200 Translation update done using Pootle. commit 70ff9ae113f2e316879fcabde5ef5e1becb8a4f3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:06:39 2011 +0200 Translation update done using Pootle. commit 8accb9f84b99c61a9aa4158bdf685393303c5506 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:06:23 2011 +0200 Translation update done using Pootle. commit 8b3232ddc40d6043e9123f803ca7df30665bc8b1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 20:03:00 2011 +0200 Translation update done using Pootle. commit c7d0e68609e94083582200d7ebdb5ec043347122 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:59:01 2011 +0200 Translation update done using Pootle. commit 620fea3f05b362cfd05249cbd3a2c8c7d37c2404 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:58:20 2011 +0200 Translation update done using Pootle. commit 16c0fe9c7d5665d64e79bac8f9466552233aaebc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:58:02 2011 +0200 Translation update done using Pootle. commit 66fb2064726f4b99640ff611f564ff1356671f85 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:57:36 2011 +0200 Translation update done using Pootle. commit 5a86ae43068b3f8c3f8cdb1d0eb43e71999bae0d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:56:20 2011 +0200 Translation update done using Pootle. commit a9e4c1ca58a54d8b30a8aab6a5634bcc8e17ef80 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:52:30 2011 +0200 Translation update done using Pootle. commit bde069f08038a53cfa7bf6c1b27d6f1bbc1faef7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:50:11 2011 +0200 Translation update done using Pootle. commit 74e9604b7244c88a75cd5f5af5164258e19017df Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:48:10 2011 +0200 Translation update done using Pootle. commit ad6ea14d4330aed0881112597511e9e8f462b840 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:47:36 2011 +0200 Translation update done using Pootle. commit e170a168b82fbcdd6d1345014bbe4b75ba933aa8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:47:16 2011 +0200 Translation update done using Pootle. commit ca0cc1ce238d7a9c015f59ee310fe45fa246143b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:47:05 2011 +0200 Translation update done using Pootle. commit 96ca07efcf9d5ec188de69e4a0e406b8e55d36ea Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:46:26 2011 +0200 Translation update done using Pootle. commit fed56e940e44a5c3d596db06588c9601d7bbb1ee Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:44:47 2011 +0200 Translation update done using Pootle. commit a83fbd70817b4dac6f2ebe4767c2919b93af8a8a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:43:41 2011 +0200 Translation update done using Pootle. commit c0b20dbb0598231228bcac2f2e2bf0bbc2059b54 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:40:39 2011 +0200 Translation update done using Pootle. commit f8a00bae15c34f45e010fad8c21a5735b6ddfd79 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:34:08 2011 +0200 Translation update done using Pootle. commit 09cb786f6cf6135aaf7c2f4ea9bdc39aceb1052e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:32:47 2011 +0200 Translation update done using Pootle. commit 7de71fd16afcde0168485d14dcfc67175f8b3d97 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:32:16 2011 +0200 Translation update done using Pootle. commit 1b3bb2ecb0cce07e05bb5d611ad1f4fa9730f727 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sat Oct 15 19:31:01 2011 +0200 Translation update done using Pootle. commit 6846d5895111c4e3497c27c75bdea783331e187c Merge: af0ef1f 4d16994 Author: Pootle server <pootle(a)cihar.com> Date: Sat Oct 15 14:40:12 2011 +0200 Merge remote-tracking branch 'origin/master' commit af0ef1f868fd005de20b6a91169f58070e7dc5c5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Oct 15 13:22:26 2011 +0200 Translation update done using Pootle. commit 10828fa13ec5e89f59c782de6db99d103f0980b8 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:20:56 2011 +0200 Translation update done using Pootle. commit 948ed655f9718e1b07ea36fdc12c495ad2d00ad6 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:20:30 2011 +0200 Translation update done using Pootle. commit c6594ec039a57c34a92cbcedc33c9a9218346b24 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:19:42 2011 +0200 Translation update done using Pootle. commit d4356de168866846315cef9f4a3a941ec8290bca Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:19:26 2011 +0200 Translation update done using Pootle. commit 894c9913744cb5f36281562e32f5b9e86a8d876d Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:11:37 2011 +0200 Translation update done using Pootle. commit 03f72a79ba5d9d8101419cca9850423a9d912f46 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:10:42 2011 +0200 Translation update done using Pootle. commit f8b88af7ae8285f87893c452ea7e8b587cc21291 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:09:57 2011 +0200 Translation update done using Pootle. commit 072304b14a2e9c7988407c0a1972844234dbf624 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:09:17 2011 +0200 Translation update done using Pootle. commit 99963304973d53768e3bf9b300e73476ebf7c06f Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:08:56 2011 +0200 Translation update done using Pootle. commit 27c8cef87632f10f5f5f7ad7ae8ed7e141847985 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:08:16 2011 +0200 Translation update done using Pootle. commit c524aead4fac33be800bc24f1a23798ee37a21e7 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:07:46 2011 +0200 Translation update done using Pootle. commit fafbc11251783a361e611cb4ad03ff37c6a75e1a Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:07:26 2011 +0200 Translation update done using Pootle. commit b517932879d70f3c623857f74754a9f7ea7d8c78 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:06:19 2011 +0200 Translation update done using Pootle. commit e0e16cf0a2424a79f24901543c66e1d15661af56 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:06:00 2011 +0200 Translation update done using Pootle. commit 8164db45337d677970687de8369f40e7807c9527 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:05:54 2011 +0200 Translation update done using Pootle. commit 1296b29f295c74fe729868c6cc9de954c4a06935 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:05:36 2011 +0200 Translation update done using Pootle. commit 33fe48a40aee844109001747278e04dd6a866a83 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:05:17 2011 +0200 Translation update done using Pootle. commit e7eda0b98779edfd9b6aa0d279c703ec906e957a Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:01:02 2011 +0200 Translation update done using Pootle. commit 1ec06caf747809d2c7c30afa99e3dc8cfbe12d48 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 11:00:24 2011 +0200 Translation update done using Pootle. commit 00d0d2c7e55170aa6326395003722c1e0e574019 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:47:08 2011 +0200 Translation update done using Pootle. commit 11d6a83848f8c59177954add45ab8b223817edee Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:44:10 2011 +0200 Translation update done using Pootle. commit c5096ea04c281b7cf0ad8e79b8294067f2e98f39 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:40:05 2011 +0200 Translation update done using Pootle. commit 66d7a45ed10bee3948ac2b620f2e6d2213a45bfd Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:39:36 2011 +0200 Translation update done using Pootle. commit c86a8a2d972eb3855bd91c5a8c57884a41c95572 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:39:03 2011 +0200 Translation update done using Pootle. commit a7cb71b681e81021f4e85141736c47220f471293 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:38:32 2011 +0200 Translation update done using Pootle. commit a0c9eafa1bb2c3d254ad433fa31f1b3537b550e7 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:37:51 2011 +0200 Translation update done using Pootle. commit 2f2eb585b049f61c37c976cc991eb5ccc15046e4 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:36:59 2011 +0200 Translation update done using Pootle. commit 8068c36f11ac692186ae092a1c6b91fbc3a15f68 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:36:08 2011 +0200 Translation update done using Pootle. commit 7996ed303036e69447370ac18d0ab4e34926e91f Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:35:35 2011 +0200 Translation update done using Pootle. commit fe3aeae0b3be5413a57d483585030082c7dd6929 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:35:03 2011 +0200 Translation update done using Pootle. commit dcdc491e4ce5a9f80445ee7bc09d579728ce8e91 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:34:37 2011 +0200 Translation update done using Pootle. commit 008097601d9861692e152537765a75d438acbce7 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:33:42 2011 +0200 Translation update done using Pootle. commit d750b24fbd41eec35342edd974a94be7d64816cd Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:33:02 2011 +0200 Translation update done using Pootle. commit 3e9a6147cb537cff807ad544b4d0f2a4a28ca0e6 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:32:08 2011 +0200 Translation update done using Pootle. commit ecf6822d6bfba7f92c5210a0eb8821710dd8c8ad Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:31:43 2011 +0200 Translation update done using Pootle. commit d3045f9978fb913e7ae0cfc44ba25e2ac1bf1360 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:31:04 2011 +0200 Translation update done using Pootle. commit e99885fe464f994bbb7e445db762528ef6f3da6f Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:29:46 2011 +0200 Translation update done using Pootle. commit 22a3bcb24002fee1e8ae12c213809994e557e615 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:27:11 2011 +0200 Translation update done using Pootle. commit ad504f9d84bb428fb168e19eeb593ec4533d7360 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:26:50 2011 +0200 Translation update done using Pootle. commit 4d795607f0e134cfa20cc0e46bc9dbf3eb5fc721 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:26:28 2011 +0200 Translation update done using Pootle. commit 22aa0fdcebbe8e3030dfd3d548ea798b36174f85 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:25:23 2011 +0200 Translation update done using Pootle. commit 2570a0fe70b2419592051a680f19340c6c631f9c Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:20:22 2011 +0200 Translation update done using Pootle. commit 8042e08c034897a793651a8cd310fe107809d889 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:19:47 2011 +0200 Translation update done using Pootle. commit 5ce8ad04d953a43e153f39c53274ad4bb2986a69 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:19:28 2011 +0200 Translation update done using Pootle. commit 94be82ef466a31193f15e43cea7bf5b2fdea2875 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:18:47 2011 +0200 Translation update done using Pootle. commit b81f868da6f34bbba937ab4a7dbbaf27a8cf98e5 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:17:27 2011 +0200 Translation update done using Pootle. commit c4fc4ab344cd12d384af947430d0895467845699 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:16:41 2011 +0200 Translation update done using Pootle. commit ad734b28fd8a7a5ef430b9928819509777750052 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:15:29 2011 +0200 Translation update done using Pootle. commit 56f7b0e2138742025aae1e5f25d69ca8ad6f175e Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:14:41 2011 +0200 Translation update done using Pootle. commit ca6527fd9ef60882a55845404da5d603652d5d10 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:14:02 2011 +0200 Translation update done using Pootle. commit 08b9be70e6ef872bba18d31bb27d19093196741a Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:11:05 2011 +0200 Translation update done using Pootle. commit b043d70dad27140aa8ab529e614d01e4bbad2b1f Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:07:00 2011 +0200 Translation update done using Pootle. commit 9c6d0e0aae12a6a1eff2b1081bd75f62d09c29e1 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:06:02 2011 +0200 Translation update done using Pootle. commit e864bcdd38cb431f6adb936e9cd4977a67ae1f23 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:05:09 2011 +0200 Translation update done using Pootle. commit 9f219d3858da63b0e78d6af74669ca35e77ab533 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:04:28 2011 +0200 Translation update done using Pootle. commit 1298295493d7c76a7768bd0c3527c44fadd1e318 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:04:02 2011 +0200 Translation update done using Pootle. commit 5c03249b75f3a5362139831e79209eec1b4a8b1c Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:03:43 2011 +0200 Translation update done using Pootle. commit 64b738ddeda6e72f00bfad6d2a70630bfb640bc7 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:02:02 2011 +0200 Translation update done using Pootle. commit 7414ac035e76831a46a10067784438a3c87e61a4 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:01:36 2011 +0200 Translation update done using Pootle. commit 49b9df6f8f4b7cc4cdcf220f3605a7c3b136ac10 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:01:01 2011 +0200 Translation update done using Pootle. commit 96d929c627c926d1b2a5bf8ed98d44876529e9ca Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 10:00:21 2011 +0200 Translation update done using Pootle. commit 8c4d9ca5499fb86cba1cd7b42f89bf7f990a72ea Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 09:59:55 2011 +0200 Translation update done using Pootle. commit 673263ebe4c934e882b1b96242e8342062870757 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 09:59:00 2011 +0200 Translation update done using Pootle. commit a1e3624d4e3c618ba0bc9e58ce5056a271df5846 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 09:58:05 2011 +0200 Translation update done using Pootle. commit 0df36d6ab9f8d131d02019e83f1a6d04c94ee3c1 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 09:57:10 2011 +0200 Translation update done using Pootle. commit 374a25dff6ac6748d6a27943a9d55ff9e1e10a36 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 09:56:03 2011 +0200 Translation update done using Pootle. commit ff02a14c33138240b92a1841fcd3c9ef4bd4fec9 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 09:55:27 2011 +0200 Translation update done using Pootle. commit 45a681b71ab18c96da96160f67956b4ef42c6ff9 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Sat Oct 15 09:53:48 2011 +0200 Translation update done using Pootle. commit 3ccb303cd11a3b678d3f25c932fc72ecdbd8dee1 Merge: 9fdd1f3 e9fee99 Author: Pootle server <pootle(a)cihar.com> Date: Fri Oct 14 20:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 9fdd1f3da4fb08c73c99fca46020c4b834b9034a Merge: fa606f5 915b24d Author: Pootle server <pootle(a)cihar.com> Date: Fri Oct 14 18:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' ----------------------------------------------------------------------- Summary of changes: po/pl.po | 97 ++++++++++++++++++++++++++++++------------------------------- po/ru.po | 94 +++++++++++++++++++++++++++--------------------------------- po/si.po | 6 ++-- po/sl.po | 9 ++--- 4 files changed, 97 insertions(+), 109 deletions(-) diff --git a/po/pl.po b/po/pl.po index 9386539..716bcc3 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,7 +4,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-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-10-13 13:40+0200\n" +"PO-Revision-Date: 2011-10-15 11:20+0200\n" "Last-Translator: Stanisław Krukowski <stankruk(a)neostrada.pl>\n" "Language-Team: polish <pl(a)li.org>\n" "Language: pl\n" @@ -35,7 +35,7 @@ msgid "" "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" -"Docelowe okno przeglądarki nie mogło być zaktualizowane. Być może zamknięto " +"Nie można zaktualizować docelowego okna przeglądarki. Być może zamknięto " "okno nadrzędne lub ustawienia zabezpieczeń przeglądarki są tak " "skonfigurowane, że blokują aktualizacje pomiędzy oknami." @@ -119,8 +119,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" -"Plik %s nie jest dostępny w tym systemie, prosimy odwiedzić www.phpmyadmin." -"net, aby uzyskać więcej informacji." +"Plik %s nie jest dostępny w tym systemie. Więcej informacji na stronie: " +"<strong>www.phpmyadmin.net</strong>" #: db_create.php:60 #, php-format @@ -455,7 +455,7 @@ msgstr "Kryteria" #: db_qbe.php:375 db_qbe.php:457 db_qbe.php:549 db_qbe.php:580 msgid "Ins" -msgstr "Dodaj" +msgstr "Wprowadź" #: db_qbe.php:379 db_qbe.php:461 db_qbe.php:546 db_qbe.php:577 msgid "And" @@ -494,7 +494,7 @@ msgstr "Użyj tabel" #: db_qbe.php:662 #, php-format msgid "SQL query on database <b>%s</b>:" -msgstr "Zapytanie SQL dla bazy danych <b>%s</b>:" +msgstr "Zapytanie SQL do bazy danych <b>%s</b>:" #: db_qbe.php:955 libraries/common.lib.php:1214 msgid "Submit Query" @@ -526,7 +526,7 @@ msgstr "jako wyrażenie regularne" #: db_search.php:208 #, php-format msgid "Search results for \"<i>%s</i>\" %s:" -msgstr "Szukaj w rezultatach dla \"<i>%s</i>\" %s:" +msgstr "Szukaj rezultatów do \"<i>%s</i>\" %s:" #: db_search.php:226 #, php-format @@ -545,7 +545,7 @@ msgstr "Przeglądaj" #: db_search.php:238 #, php-format msgid "Delete the matches for the %s table?" -msgstr "Usunąć trafienia dla tabeli %s?" +msgstr "Usunąć trafienia do tabeli %s?" #: db_search.php:238 libraries/display_tbl.lib.php:1416 #: libraries/display_tbl.lib.php:2463 @@ -573,7 +573,7 @@ msgstr "Szukaj w bazie danych" #: db_search.php:276 msgid "Words or values to search for (wildcard: \"%\"):" -msgstr "Szukane słowa lub wartości dla (symbol wieloznaczny: \"%\"):" +msgstr "Szukane słowa lub wartości do (symbol wieloznaczny: \"%\"):" #: db_search.php:281 msgid "Find:" @@ -645,7 +645,7 @@ msgstr "Suma" #: db_structure.php:505 libraries/StorageEngine.class.php:331 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "%s to domyślny mechanizm składowania tego serwera MySQL." +msgstr "%s to domyślny silnik przechowywania na tym serwerze MySQL." #: db_structure.php:534 db_structure.php:551 db_structure.php:552 #: libraries/display_tbl.lib.php:2488 libraries/display_tbl.lib.php:2493 @@ -668,8 +668,9 @@ msgid "Uncheck All" msgstr "Usuń zaznaczenie" #: db_structure.php:546 +#, fuzzy msgid "Check tables having overhead" -msgstr "Zaznacz nieoptymalne" +msgstr "Zaznacz tabele niezoptymalizowane" #: db_structure.php:554 libraries/common.lib.php:3313 #: libraries/common.lib.php:3314 libraries/config/messages.inc.php:162 @@ -689,7 +690,7 @@ msgstr "Widok do druku" #: db_structure.php:560 libraries/common.lib.php:3309 #: libraries/common.lib.php:3310 msgid "Empty" -msgstr "Wyczyść" +msgstr "Opróżnij" #: db_structure.php:562 db_tracking.php:104 libraries/Index.class.php:482 #: libraries/common.lib.php:3307 libraries/common.lib.php:3308 @@ -733,7 +734,7 @@ msgstr "Słownik danych" #: db_tracking.php:79 msgid "Tracked tables" -msgstr "Monitorowane tabele" +msgstr "Tabele monitorowane" #: db_tracking.php:84 libraries/config/messages.inc.php:496 #: libraries/export/htmlword.php:78 libraries/export/latex.php:151 @@ -800,7 +801,7 @@ msgstr "Migawka struktury" #: db_tracking.php:181 msgid "Untracked tables" -msgstr "Niemonitorowane tabele" +msgstr "Tabele niemonitorowane" #: db_tracking.php:199 tbl_structure.php:638 msgid "Track table" @@ -825,7 +826,7 @@ msgstr "+ Zacznij wprowadzanie od nowa i dodaj nową wartość" #: enum_editor.php:67 gis_data_editor.php:317 msgid "Output" -msgstr "Wyjście" +msgstr "Wynik" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" @@ -853,7 +854,7 @@ msgstr "Brak miejsca na zapis pliku %s." msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" -"Plik %s już istnieje na serwerze, zmień nazwę pliku lub zaznacz opcję " +"Plik %s już na serwerze istnieje. Zmień nazwę pliku lub zaznacz opcję " "nadpisywania plików." #: export.php:311 export.php:315 @@ -868,13 +869,13 @@ msgstr "Zrzut został zapisany do pliku %s." #: file_echo.php:21 msgid "Invalid export type" -msgstr "Nieprawidłowy typ eksportu" +msgstr "Nieważny typ eksportu" #: gis_data_editor.php:84 #, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Wartość dla kolumny \"%s\"" +msgstr "Wartość do kolumny \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" @@ -918,7 +919,7 @@ msgstr "Dodaj punkt" #: gis_data_editor.php:220 js/messages.php:291 #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Linestring" +msgstr "Linia (linestring)" #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:295 msgid "Outer Ring" @@ -931,7 +932,7 @@ msgstr "Pierścień wewnętrzny" #: gis_data_editor.php:252 #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Dodaj linestring" +msgstr "Dodaj linię (linestring)" #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:297 #| msgid "Add a new User" @@ -940,12 +941,12 @@ msgstr "Dodaj pierścień wewnętrzny" #: gis_data_editor.php:266 js/messages.php:292 msgid "Polygon" -msgstr "Wielokąt" +msgstr "Obrys" #: gis_data_editor.php:306 js/messages.php:298 #| msgid "Add %s field(s)" msgid "Add a polygon" -msgstr "Dodaj wielokąt" +msgstr "Dodaj obrys" #: gis_data_editor.php:310 #| msgid "Add a new server" @@ -967,11 +968,11 @@ msgid "" "s for ways to workaround this limit." msgstr "" "Prawdopodobnie próbowano przesłać na serwer zbyt duży plik. Aby poznać " -"sposoby obejścia tego problemu, proszę zapoznać się z %sdokumenacją%s." +"sposoby obejścia tego problemu, proszę zapoznać się z %sdokumenacja%s." #: import.php:170 import.php:419 msgid "Showing bookmark" -msgstr "Wyświetlanie zakładki" +msgstr "Pokazywanie zakładki" #: import.php:180 import.php:415 msgid "The bookmark has been deleted." @@ -1001,7 +1002,7 @@ msgid "" "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" "Nie otrzymano żadnych danych do importu. Powód: nie została wysłana nazwa " -"pliku, albo plik był zbyt duży (maksymalny dopuszczalny rozmiar pliku " +"pliku, albo plik był zbyt duży (maksymalny, dopuszczalny rozmiar pliku " "określa się w konfiguracji PHP). Zobacz: " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." @@ -1013,7 +1014,7 @@ msgstr "" #: import.php:390 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "Nie udało się załadować wtyczek importu, proszę sprawdzić instalację!" +msgstr "Nie udało się wczytać wtyczek importu, proszę sprawdzić instalację!" #: import.php:421 sql.php:928 #, php-format @@ -1074,7 +1075,7 @@ msgstr "Zdania \"DROP DATABASE\" są wyłączone." #: js/messages.php:32 libraries/mult_submits.inc.php:282 sql.php:348 msgid "Do you really want to " -msgstr "Czy na pewno chcesz, aby usunąć? " +msgstr "Czy na pewno chcesz, aby ...?" #: js/messages.php:33 libraries/mult_submits.inc.php:282 sql.php:333 msgid "You are about to DESTROY a complete database!" @@ -1090,7 +1091,7 @@ msgstr "Masz zamiar WYCZYŚCIĆ całą tabelę!" #: js/messages.php:37 msgid "Deleting tracking data" -msgstr "Usuwanie danych śledzenia" +msgstr "Usuwanie danych monitorowania" #: js/messages.php:38 msgid "Dropping Primary Key/Index" @@ -1098,7 +1099,7 @@ msgstr "Usuwanie klucza podstawowego/indeksu" #: js/messages.php:39 msgid "This operation could take a long time. Proceed anyway?" -msgstr "Ta operacja może długo potrwać. Czy mimo to kontynuować?" +msgstr "Ta operacja może długo potrwać. Czy pomimo to kontynuować?" #: js/messages.php:42 msgid "You are about to DISABLE a BLOB Repository!" @@ -1107,7 +1108,9 @@ msgstr "Masz zamiar WYŁĄCZYĆ repozytorium BLOB!" #: js/messages.php:43 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "Czy na pewno wyłączyć wszystkie odwołania do BLOBów z bazy danych %s?" +msgstr "" +"Czy na pewno wyłączyć wszystkie odwołania do repozytoriów BLOB z bazy danych " +"%s?" #: js/messages.php:46 msgid "Missing value in the form!" @@ -1125,19 +1128,19 @@ msgstr "Całkowita liczba:" #: js/messages.php:54 msgid "The host name is empty!" -msgstr "Brak nazwy hosta!" +msgstr "Nazwa hosta jest pusta!" #: js/messages.php:55 msgid "The user name is empty!" -msgstr "Brak nazwy użytkownika!" +msgstr "Nazwa użytkownika jest pusta!" #: js/messages.php:56 server_privileges.php:1314 user_password.php:50 msgid "The password is empty!" -msgstr "Brak hasła!" +msgstr "Hasło jest puste!" #: js/messages.php:57 server_privileges.php:1312 user_password.php:53 msgid "The passwords aren't the same!" -msgstr "Hasła nie są identyczne!" +msgstr "Hasła nie są takie same!" #: js/messages.php:58 server_privileges.php:1769 server_privileges.php:1793 #: server_privileges.php:2205 server_privileges.php:2404 @@ -1168,20 +1171,18 @@ msgid "Edit" msgstr "Edytuj" #: js/messages.php:65 server_status.php:794 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Wybór serwera" +msgstr "Wykres ruchu na serwerze "na żywo"" #: js/messages.php:66 server_status.php:797 msgid "Live conn./process chart" -msgstr "" +msgstr "Wykres połączenia/procesy "na żywo"" #: js/messages.php:67 server_status.php:815 -#, fuzzy #| msgid "SQL Query box" msgid "Live query chart" -msgstr "Okno zapytania SQL" +msgstr "Wykres zapytań "na żywo"" #: js/messages.php:69 msgid "Static data" @@ -1193,7 +1194,7 @@ msgstr "Dane statyczne" #: server_status.php:1115 server_status.php:1176 tbl_printview.php:315 #: tbl_structure.php:802 msgid "Total" -msgstr "Sumarycznie" +msgstr "Ogółem" #. l10n: Other, small valued, queries #: js/messages.php:73 server_status.php:594 server_status.php:1013 @@ -1212,21 +1213,20 @@ msgstr "." #: js/messages.php:79 msgid "KiB sent since last refresh" -msgstr "" +msgstr "Przesłane KiB od chwili ostatniego odświeżenia" #: js/messages.php:80 msgid "KiB received since last refresh" -msgstr "" +msgstr "Otrzymane KiB od chwili ostatniego odświeżenia" #: js/messages.php:81 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic (in KiB)" -msgstr "Wybór serwera" +msgstr "Ruch na serwerze (w KiB)" #: js/messages.php:82 msgid "Connections since last refresh" -msgstr "" +msgstr "Połączenia od chwili ostatniego odświeżenia" #: js/messages.php:83 js/messages.php:121 server_status.php:1224 msgid "Processes" @@ -1239,22 +1239,21 @@ msgstr "Połączenia / Procesy" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:86 msgid "Questions since last refresh" -msgstr "" +msgstr "Pytania od ostatniego odświeżenia" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:88 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Pytania (zdania wykonane za pomocą serwera)" #: js/messages.php:90 server_status.php:776 msgid "Query statistics" msgstr "Statystyki zapytań" #: js/messages.php:93 -#, fuzzy #| msgid "Cannot load or save configuration" msgid "Local monitor configuration incompatible" -msgstr "Nie udało się załadować lub zapisać konfiguracji" +msgstr "Niekompatybilny lokalny monitor konfiguracji" #: js/messages.php:94 msgid "" diff --git a/po/ru.po b/po/ru.po index 356c290..8b6f635 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-10-02 18:59+0200\n" +"PO-Revision-Date: 2011-10-15 20:17+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" @@ -10587,94 +10587,85 @@ msgstr "" "таблицу, когда мониторинг больше не требуется." #: server_status.php:1637 -#, fuzzy #| msgid "Remove database" msgid "Preset chart" -msgstr "Удалить базу данных" +msgstr "Заготовки графиков" #: server_status.php:1641 -#, fuzzy #| msgid "All status variables" msgid "Status variable(s)" -msgstr "Все переменные состояния" +msgstr "Переменные состояния" #: server_status.php:1643 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "Выберите таблицы" +msgstr "Выберите серии:" #: server_status.php:1645 msgid "Commonly monitored" -msgstr "" +msgstr "Частый мониторинг" #: server_status.php:1660 -#, fuzzy #| msgid "You must provide a routine name" msgid "or type variable name:" -msgstr "Необходимо задать имя процедуры" +msgstr "или задайте имя переменной:" #: server_status.php:1664 msgid "Display as differential value" -msgstr "" +msgstr "Отобразить в виде значения разницы" #: server_status.php:1666 msgid "Apply a divisor" -msgstr "" +msgstr "Применить делитель" #: server_status.php:1673 msgid "Append unit to data values" -msgstr "" +msgstr "Добавить к значениям единицу измерения" #: server_status.php:1679 -#, fuzzy #| msgid "Add a trigger" msgid "Add this series" -msgstr "Добавить триггер" +msgstr "Добавить данные серии" #: server_status.php:1681 msgid "Clear series" -msgstr "" +msgstr "Очистить серии" #: server_status.php:1684 -#, fuzzy #| msgid "Series:" msgid "Series in Chart:" -msgstr "Серии:" +msgstr "Серии в графике:" #: server_status.php:1697 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "Показывать статистику" +msgstr "Статистика журналов" #: server_status.php:1698 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "Выберите страницу" +msgstr "Выбранный диапазон времени:" #: server_status.php:1703 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Выполнять только выражения SELECT,INSERT,UPDATE и DELETE" #: server_status.php:1708 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "Для лучшей группировки, удалить данные переменной в запросах INSERT" #: server_status.php:1713 msgid "Choose from which log you want the statistics to be generated from." -msgstr "" +msgstr "Выберите из какого журнала должна генерироваться статистика." #: server_status.php:1715 msgid "Results are grouped by query text." -msgstr "" +msgstr "Результаты сгруппированы по тексту запроса." #: server_status.php:1720 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Тип запроса" +msgstr "Анализ запроса" #: server_status.php:1760 #, php-format @@ -10775,7 +10766,6 @@ msgid "Target database has been synchronized with source database" msgstr "Целевая база данных была синхронизирована с базой данных источника" #: server_synchronize.php:1046 -#, fuzzy #| msgid "Issued queries" msgid "Executed queries" msgstr "Выполнено запросов" @@ -10828,6 +10818,8 @@ msgstr "Скачать" #: setup/frames/form.inc.php:25 msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgstr "" +"Некорректно задан набор форм, проверьте массив $formsets в файле " +"setup/frames/form.inc.php" #: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" @@ -10941,7 +10933,7 @@ msgstr "Добавить новый сервер" #: setup/index.php:22 msgid "Wrong GET file attribute value" -msgstr "" +msgstr "Недопустимое значение атрибута файла в GET" #: setup/lib/form_processing.lib.php:43 msgid "Warning" @@ -11161,10 +11153,9 @@ msgid "Key should contain letters, numbers [em]and[/em] special characters." msgstr "Ключ должен содержать символы алфавита, цифры [em]и[/em] знаки." #: setup/validate.php:22 -#, fuzzy #| msgid "No data" msgid "Wrong data" -msgstr "Нет данных" +msgstr "Ошибочные данные" #: sql.php:103 tbl_change.php:262 tbl_select.php:28 tbl_zoom_select.php:58 msgid "Browse foreign values" @@ -11381,10 +11372,9 @@ msgid "No index parts defined!" msgstr "Части индекса не определены!" #: tbl_indexes.php:169 -#, fuzzy #| msgid "Create a new index" msgid "Create an index" -msgstr "Создать новый индекс" +msgstr "Создать индекс" #: tbl_indexes.php:171 msgid "Modify an index" @@ -11566,7 +11556,7 @@ msgstr "Размер строки" #: tbl_printview.php:388 tbl_structure.php:904 msgid "Next autoindex" -msgstr "" +msgstr "Следующий автоматический индекс" #: tbl_relation.php:271 #, php-format @@ -11664,10 +11654,9 @@ msgid "Show more actions" msgstr "Показать больше операций" #: tbl_structure.php:606 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "Версия для печати" +msgstr "Редактировать представление" #: tbl_structure.php:623 msgid "Relation view" @@ -11851,36 +11840,34 @@ msgid "Create version" msgstr "Создать версию" #: tbl_zoom_select.php:135 -#, fuzzy #| msgid "Do a \"query by example\" (wildcard: \"%\")" msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" -msgstr "Выполнить \"запрос по образцу\" (групповой символ: \"%\")" +msgstr "" +"Выполнить \"запрос по образцу\" (символ шаблона: \"%\") для двух различных " +"столбцов" #: tbl_zoom_select.php:145 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Скрыть параметры поиска" +msgstr "Добавочный критерий поиска" #: tbl_zoom_select.php:276 msgid "Use this column to label each point" -msgstr "" +msgstr "Использовать данное поле для обозначения каждой точки" #: tbl_zoom_select.php:296 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Максимальное количество строк" +msgstr "Максимальное количество строк для построения" #: tbl_zoom_select.php:410 msgid "Browse/Edit the points" -msgstr "" +msgstr "Обзор/Редакция точек" #: tbl_zoom_select.php:417 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Выделенный пользователь" +msgstr "Как использовать" #: themes.php:28 msgid "Get more themes!" @@ -11923,28 +11910,31 @@ msgstr "Переименовать представление в" #: po/advisory_rules.php:5 msgid "Uptime below one day" -msgstr "" +msgstr "Сервер работает менее суток" #: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." msgstr "" +"Сервер работает менее одного дня, настройки производительности могут быть не " +"достаточно точны." #: po/advisory_rules.php:7 msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Для получения более точных средних значений, рекомендуется, перед запуском " +"анализатора, дать проработать серверу более одного дня" #: po/advisory_rules.php:8 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "Сервер работает только %s" #: po/advisory_rules.php:10 -#, fuzzy #| msgid "Versions" msgid "Questions below 1,000" -msgstr "Версии" +msgstr "Запросов менее 1,000" #: po/advisory_rules.php:11 msgid "" diff --git a/po/si.po b/po/si.po index bb06b7a..35dd947 100644 --- a/po/si.po +++ b/po/si.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-09-21 08:44+0200\n" +"PO-Revision-Date: 2011-10-15 13:22+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" +"Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: si\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -5656,7 +5656,7 @@ msgstr "සිරස්" #: libraries/display_tbl.lib.php:444 #, php-format msgid "Headers every %s rows" -msgstr "" +msgstr "ශීර්ෂක, පේළි %s කට වරක් " #: libraries/display_tbl.lib.php:547 msgid "Sort by key" diff --git a/po/sl.po b/po/sl.po index 222e5a9..fb7acb4 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,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-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-10-06 18:47+0200\n" +"PO-Revision-Date: 2011-10-15 22:29+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" @@ -12505,7 +12505,6 @@ msgid "Temp disk rate" msgstr "Delež začasnih tabel na disku" #: po/advisory_rules.php:157 -#, fuzzy #| msgid "" #| "Increasing {max_heap_table_size} and {tmp_table_size} might help. However " #| "some temporary tables are always being written to disk, independent of " @@ -12523,13 +12522,13 @@ msgid "" "mentioned in the <a href=\\\"http://dev.mysql.com/doc/refman/5.5/en/internal-" "temporary-tables.html\\\">MySQL Documentation</a>" msgstr "" -"Povečanje {max_heap_table_size} in {tmp_table_size} bo morda pomagalo.Kljub " +"Povečanje {max_heap_table_size} in {tmp_table_size} bo morda pomagalo. Kljub " "temu so nekatere začasne tabele vedno zapisane na disk, neodvisno od " "vrednosti teh spremenljivk. Da se tega znebite, boste morali preoblikovati " "vaše poizvedbe in se tako izogniti tem pogojem (znotraj začasne tabele: " "prisotnost stolpca BLOB ali TEXT ali prisotnost stolpca, večjega od 512 " -"bajtov), kot je omenjeno v <a href=\\\"http://dev.mysql.com/doc/refman/5.5/" -"en/internal-temporary-tables.html\\\">dokumentaciji MySQL</a>" +"bajtov), kot je omenjeno v <a href=\\\"http://dev.mysql.com/doc/refman/5.5/en" +"/internal-temporary-tables.html\\\">dokumentaciji MySQL</a>" #: po/advisory_rules.php:158 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-21090-g4d16994
by Madhura Jayaratne 15 Oct '11

15 Oct '11

The branch, master has been updated via 4d16994ffe7f59770cfc7a1e6ee59827596d78b7 (commit) via a478b8164d199e214859ff2a8057ea4bfaf0c5b5 (commit) from e9fee995e366fc6153469a94b3ee7878da0f0547 (commit) - Log ----------------------------------------------------------------- commit 4d16994ffe7f59770cfc7a1e6ee59827596d78b7 Merge: a478b81 e9fee99 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Oct 15 16:26:25 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit a478b8164d199e214859ff2a8057ea4bfaf0c5b5 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Oct 15 16:23:31 2011 +0530 bug #3299486 [prettyprint] Order By in a query containing comment character ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06894fd..a139e6a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog + Support Drizzle database - bug #3356456 [interface] Interface problems for queries having LIMIT clauses + [interface] Remove DefaultPropDisplay feature +- bug #3299486 [prettyprint] Order By in a query containing comment character 3.4.7.0 (not yet released) - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 45cda6c..5515d5c 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -928,9 +928,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ // It still might be a column name of a view. See bug #3383711 // Check is_orgname. if (strpos($name_to_use_in_sort, '(') !== false && ! $is_orgname) { - $sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' '; + $sort_order = "\n" . 'ORDER BY ' . $name_to_use_in_sort . ' '; } else { - $sort_order = ' ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' '; + $sort_order = "\n" . 'ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' '; } unset($name_to_use_in_sort); unset($is_orgname); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-21088-ge9fee99
by Michal Čihař 14 Oct '11

14 Oct '11

The branch, master has been updated via e9fee995e366fc6153469a94b3ee7878da0f0547 (commit) via fa606f5af0e47f9aafb0ddfbf3a839bda58f1a08 (commit) via 48ce66bb9342f3cf1af85bbdfb30ff34951b8cf3 (commit) via 1925711fcc5219332c9ec20b321b8b0d96711bb1 (commit) via 17515d3235ef8a37799c273e33e2617145b6edd0 (commit) via 24408250d61504502b7d55adb20cf561305fea5a (commit) via 5184f92dfb2f4ac0a5583cda5c327a9b2918f719 (commit) via b89113d2b8eddf8cbba58d40d0eaa17b99efaf0c (commit) via 4735e9b4b93e2c3e4c3fd6aa0dfff3caf87f72c4 (commit) via d3d301a1c321e8d938297866b7605ada8fac4a5d (commit) via ab2823e8cc46d40eb723e6e5f9e7ab16768776a9 (commit) via 0f638fd838db7b1c4f85e659d3a92fd102a03ac2 (commit) via d7509f280465f8ccbe23d1626c2b50f1225311b7 (commit) via 868341c80a4425a51d89182cbb41a01aa47253d3 (commit) via 04df58d836fcbb72de96ef63cd080724b7afe68d (commit) via 5530c9a88e0c394af6899bc7e5c013524df79c32 (commit) via 5c4c4df535db0fd96f0a11bc9a150a84ce052c9b (commit) via d01c4175b3ac9fcc55bc8c328c3964d86207cf4c (commit) via b9b96150eae4d1d32b3b9f12a498382906432dc5 (commit) via b2e5c18457a525ade876ae32982c1f0336d542e3 (commit) via c3022adafd2b770346fc1e1facc2b2fe8232ba5b (commit) via 75f2e5ef92ac73a2227935d7ee98cc5c8e1264bc (commit) via 3d750847304fee5921e08dcb33a4d6681e05d78b (commit) via f2e3a5b6342b89733fda60d50713d7064c6ec58f (commit) via 2fd4ac0e539011171dbdeda59abbdb6d9e5a97b0 (commit) via 2c1fdc6fcaee20a65abbbb4206701bd1df5ad0cb (commit) via b0e1418e773d688acb37781aca6f2126165a7d17 (commit) via dea64cff4c50f00df74a05869db50e825d8ae4c1 (commit) via 59a79f8f4aa55e9b37ffa2fc681d16395c2046ab (commit) via c891934f7954cc55ec183d72b1be3a256e237b4b (commit) via fb63b2d7dd4d551948067631d2bfbe1cd69f1ada (commit) via 0d38505024b6cb88eb1ef7933fd8aa1c5544e004 (commit) via c974bede0186063fabb79953cc4ff480f4404f7d (commit) via 4f388b72f45e5e6ca3b2f93e1aea3abe53f38318 (commit) via 0562292fd81e617ea1c6955acc0d846963dcc90e (commit) via fa93b2ea48fa35dcbd2aee131057bc68d7e99e08 (commit) via d9a620466b2c56103da5210279525354e198ed07 (commit) via 8967cc67f9545e601236abe95d5d890222502b27 (commit) via 5710ed321797112cf5f432951309a774a519df04 (commit) via edada8a823f25fabb0b27f8139fe56396b3d52b5 (commit) via 6f2636d774089541302b097be8316f34115ff9c7 (commit) via 89fc15234f6d4bba6f2aebabaa80610133f90941 (commit) via afb1752afd3e44a9d034b3c746e6ce0f9e20ff3b (commit) via 957e07a0258a7334123193cbbeae748904d6a791 (commit) via b2b350f97d03d7f8676e791e7d2a4ac2c04d2b4e (commit) via f56148659a8bafcacfe3ab8d9a87a04f2623a5b3 (commit) via 75d75639354034d9b291c056161ed44d412c3365 (commit) via 81ee0b0426fe654a96c1281c32e5aa288eab439b (commit) via 902068f768f931bb594fc61c46df6ce451a82d07 (commit) via fd2cf5fa6b91b44ab7476b6da3bc268023c8a4e6 (commit) via 705ab83fb06a1b9392db9a0b23e19f8f7aac615f (commit) via fd8439e7adf8fc090ce82a701c9c0677025141e3 (commit) via b4f26a4ba06b09dd6c0ea17052f493cbd22886e9 (commit) via 43c52262af9cbeadb9c67aa209156a986d4c35d4 (commit) via 4df8c9a9eb054a01b65707b07289c4e65a937827 (commit) via 8c6cb05b1941c46d23047ec46c49ed7dc38b6863 (commit) via 629e43775ea38a612b2a0fa388c4bea77e1d7a1a (commit) via 757edc9739c96afb91445a5370aa9f05522c0121 (commit) via 76ba38a21aa4f00ab4ef4c478bd6b1c0f7b688f2 (commit) via d6359e72d483739c154ecdcc7c34257bffe2761c (commit) via 4fd9255abce9ce36a59e41394396cd686e20a755 (commit) via 19aa76a5cc2d20955128194c91c2b77243b61b2c (commit) via c082b1573a5f79dcdd666cd9ed66bd31d815c5f4 (commit) via 6d42104553d109407b1cd05515b7c70a072146c0 (commit) via b53e5bad5cad7a6ba36ec1546174408f0395fa13 (commit) via eb8990b834acb5b3d82c9741765abbf43ddd0490 (commit) via 4630a9bc3f05010f57da8b1e858963caee2170aa (commit) via 84abc5d4afcc64f9f7f8df40776faf2252a79136 (commit) via 23031e1b95b9f6a41f5ede83e7dbd2f0ddfc8ec9 (commit) via b87ced9455ab2a39f27cf6a8bac377760799daf0 (commit) via 7a0b02d28b44ef7fddc82a3c149d5ccf6c4574fb (commit) via 8e82c71a2c203eb7e68a14cf5b057e5f9e03bd10 (commit) via f295f5ae12c359c33abc04aacd6dea8229fddad6 (commit) via fb955eabe5a4e75e5fd759109d8aa7c8849049f5 (commit) via 011097a1894b79201638ff7493ecc4d61c3f2d2a (commit) via 08139cad745fe048ffc65a52a2aa8cceb8dcef8d (commit) via 33c3a62b52328624d646971ab4fb7c3738ae31f2 (commit) via 4a1abb60ca38f529f0e5a9daf56bc8c6e56f9e66 (commit) via c205892b04ca46a893ce50516b4c70c1d475bb42 (commit) via ba79ee8775f61aedfb443b268a9428dc32fcdb01 (commit) via 0313e8028b6646a24ae13bf5628e0ae71fa19af8 (commit) via 796f29c4d73cb78c221f7d9a43e31ad80aeaf63b (commit) via 20f90f79292d937b7a60e7daa11ebe6f14906f09 (commit) via e79b47210f788ff9efd323af46ba25d9cee31de0 (commit) via 67c8390c5007208ba16a1ed40bc367b03ea0df2c (commit) via 0a78eef0e069fcec42fa5469f1f2b46035f258eb (commit) via 08087bd2fca74778a34d46f238db012edff48668 (commit) via d7521da6ce547fefdc8e2245a8ceb769a005956f (commit) via a6848acfc136e9aea0e87d2c72fd8ca458fbd756 (commit) via be1365cac7a804095d74861cc5ded2276e601e89 (commit) via 5aeda1b04afa9cd5820175a364a76bee646574d7 (commit) via 0e19d56fbd00e8569098b3c07feb8f4fe3eaddaf (commit) via 1eefcc1b96d808a6b51b9b19e8d70ce94a3068a6 (commit) via 47af2da1dcc47ff40de146e0a7d51485ef693334 (commit) via 71f099a481386438152150881a18bc39858edc14 (commit) via d8be72c507ca92a632e8de9436a736e34e97614e (commit) via b568e713f97a0ccec7b6ac6acf300927bfeb9b30 (commit) via ffeaae17874405921269677397da5892c5e17b83 (commit) via 4eb1b70bd489f137da068979fd6fb9c61ccb2c45 (commit) via 98bb2c2cb832fc2d411c2e6b523c3a82abf5c34d (commit) from 915b24df79f39c3213ff828c08e1bdf955f9ab0d (commit) - Log ----------------------------------------------------------------- commit e9fee995e366fc6153469a94b3ee7878da0f0547 Merge: 915b24d fa606f5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Oct 14 18:39:49 2011 +0200 Merge remote-tracking branch 'pootle/master' commit fa606f5af0e47f9aafb0ddfbf3a839bda58f1a08 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:46:44 2011 +0200 Translation update done using Pootle. commit 48ce66bb9342f3cf1af85bbdfb30ff34951b8cf3 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:39:41 2011 +0200 Translation update done using Pootle. commit 1925711fcc5219332c9ec20b321b8b0d96711bb1 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:39:05 2011 +0200 Translation update done using Pootle. commit 17515d3235ef8a37799c273e33e2617145b6edd0 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:36:36 2011 +0200 Translation update done using Pootle. commit 24408250d61504502b7d55adb20cf561305fea5a Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:36:25 2011 +0200 Translation update done using Pootle. commit 5184f92dfb2f4ac0a5583cda5c327a9b2918f719 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:35:23 2011 +0200 Translation update done using Pootle. commit b89113d2b8eddf8cbba58d40d0eaa17b99efaf0c Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:14:48 2011 +0200 Translation update done using Pootle. commit 4735e9b4b93e2c3e4c3fd6aa0dfff3caf87f72c4 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:13:59 2011 +0200 Translation update done using Pootle. commit d3d301a1c321e8d938297866b7605ada8fac4a5d Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 14 16:12:51 2011 +0200 Translation update done using Pootle. commit ab2823e8cc46d40eb723e6e5f9e7ab16768776a9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 14 12:30:04 2011 +0200 Translation update done using Pootle. commit 0f638fd838db7b1c4f85e659d3a92fd102a03ac2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 14 12:29:36 2011 +0200 Translation update done using Pootle. commit d7509f280465f8ccbe23d1626c2b50f1225311b7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 14 12:29:06 2011 +0200 Translation update done using Pootle. commit 868341c80a4425a51d89182cbb41a01aa47253d3 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 14 12:28:43 2011 +0200 Translation update done using Pootle. commit 04df58d836fcbb72de96ef63cd080724b7afe68d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 14 12:28:09 2011 +0200 Translation update done using Pootle. commit 5530c9a88e0c394af6899bc7e5c013524df79c32 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Fri Oct 14 12:27:17 2011 +0200 Translation update done using Pootle. commit 5c4c4df535db0fd96f0a11bc9a150a84ce052c9b Merge: d01c417 e03dcf7 Author: Pootle server <pootle(a)cihar.com> Date: Fri Oct 14 00:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit d01c4175b3ac9fcc55bc8c328c3964d86207cf4c Merge: b9b9615 137a70e Author: Pootle server <pootle(a)cihar.com> Date: Thu Oct 13 20:40:14 2011 +0200 Merge remote-tracking branch 'origin/master' commit b9b96150eae4d1d32b3b9f12a498382906432dc5 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:20:52 2011 +0200 Translation update done using Pootle. commit b2e5c18457a525ade876ae32982c1f0336d542e3 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:19:45 2011 +0200 Translation update done using Pootle. commit c3022adafd2b770346fc1e1facc2b2fe8232ba5b Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:19:00 2011 +0200 Translation update done using Pootle. commit 75f2e5ef92ac73a2227935d7ee98cc5c8e1264bc Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:18:33 2011 +0200 Translation update done using Pootle. commit 3d750847304fee5921e08dcb33a4d6681e05d78b Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:18:14 2011 +0200 Translation update done using Pootle. commit f2e3a5b6342b89733fda60d50713d7064c6ec58f Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:18:02 2011 +0200 Translation update done using Pootle. commit 2fd4ac0e539011171dbdeda59abbdb6d9e5a97b0 Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:17:51 2011 +0200 Translation update done using Pootle. commit 2c1fdc6fcaee20a65abbbb4206701bd1df5ad0cb Author: Fulup <fulup.jakez(a)ofis-bzh.org> Date: Thu Oct 13 17:17:41 2011 +0200 Translation update done using Pootle. commit b0e1418e773d688acb37781aca6f2126165a7d17 Merge: dea64cf 52871d9 Author: Pootle server <pootle(a)cihar.com> Date: Thu Oct 13 14:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit dea64cff4c50f00df74a05869db50e825d8ae4c1 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:40:33 2011 +0200 Translation update done using Pootle. commit 59a79f8f4aa55e9b37ffa2fc681d16395c2046ab Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:40:06 2011 +0200 Translation update done using Pootle. commit c891934f7954cc55ec183d72b1be3a256e237b4b Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:39:40 2011 +0200 Translation update done using Pootle. commit fb63b2d7dd4d551948067631d2bfbe1cd69f1ada Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:39:11 2011 +0200 Translation update done using Pootle. commit 0d38505024b6cb88eb1ef7933fd8aa1c5544e004 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:35:59 2011 +0200 Translation update done using Pootle. commit c974bede0186063fabb79953cc4ff480f4404f7d Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:35:11 2011 +0200 Translation update done using Pootle. commit 4f388b72f45e5e6ca3b2f93e1aea3abe53f38318 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:34:14 2011 +0200 Translation update done using Pootle. commit 0562292fd81e617ea1c6955acc0d846963dcc90e Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:33:05 2011 +0200 Translation update done using Pootle. commit fa93b2ea48fa35dcbd2aee131057bc68d7e99e08 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:32:45 2011 +0200 Translation update done using Pootle. commit d9a620466b2c56103da5210279525354e198ed07 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:32:00 2011 +0200 Translation update done using Pootle. commit 8967cc67f9545e601236abe95d5d890222502b27 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:30:01 2011 +0200 Translation update done using Pootle. commit 5710ed321797112cf5f432951309a774a519df04 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:29:46 2011 +0200 Translation update done using Pootle. commit edada8a823f25fabb0b27f8139fe56396b3d52b5 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:29:03 2011 +0200 Translation update done using Pootle. commit 6f2636d774089541302b097be8316f34115ff9c7 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:28:31 2011 +0200 Translation update done using Pootle. commit 89fc15234f6d4bba6f2aebabaa80610133f90941 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:27:53 2011 +0200 Translation update done using Pootle. commit afb1752afd3e44a9d034b3c746e6ce0f9e20ff3b Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:26:25 2011 +0200 Translation update done using Pootle. commit 957e07a0258a7334123193cbbeae748904d6a791 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:24:04 2011 +0200 Translation update done using Pootle. commit b2b350f97d03d7f8676e791e7d2a4ac2c04d2b4e Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:23:29 2011 +0200 Translation update done using Pootle. commit f56148659a8bafcacfe3ab8d9a87a04f2623a5b3 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:22:47 2011 +0200 Translation update done using Pootle. commit 75d75639354034d9b291c056161ed44d412c3365 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:21:32 2011 +0200 Translation update done using Pootle. commit 81ee0b0426fe654a96c1281c32e5aa288eab439b Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:20:03 2011 +0200 Translation update done using Pootle. commit 902068f768f931bb594fc61c46df6ce451a82d07 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:17:59 2011 +0200 Translation update done using Pootle. commit fd2cf5fa6b91b44ab7476b6da3bc268023c8a4e6 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:17:23 2011 +0200 Translation update done using Pootle. commit 705ab83fb06a1b9392db9a0b23e19f8f7aac615f Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:16:55 2011 +0200 Translation update done using Pootle. commit fd8439e7adf8fc090ce82a701c9c0677025141e3 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:16:34 2011 +0200 Translation update done using Pootle. commit b4f26a4ba06b09dd6c0ea17052f493cbd22886e9 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:15:56 2011 +0200 Translation update done using Pootle. commit 43c52262af9cbeadb9c67aa209156a986d4c35d4 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:15:24 2011 +0200 Translation update done using Pootle. commit 4df8c9a9eb054a01b65707b07289c4e65a937827 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:14:57 2011 +0200 Translation update done using Pootle. commit 8c6cb05b1941c46d23047ec46c49ed7dc38b6863 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:13:29 2011 +0200 Translation update done using Pootle. commit 629e43775ea38a612b2a0fa388c4bea77e1d7a1a Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:11:37 2011 +0200 Translation update done using Pootle. commit 757edc9739c96afb91445a5370aa9f05522c0121 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:11:19 2011 +0200 Translation update done using Pootle. commit 76ba38a21aa4f00ab4ef4c478bd6b1c0f7b688f2 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:10:59 2011 +0200 Translation update done using Pootle. commit d6359e72d483739c154ecdcc7c34257bffe2761c Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:10:25 2011 +0200 Translation update done using Pootle. commit 4fd9255abce9ce36a59e41394396cd686e20a755 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:10:10 2011 +0200 Translation update done using Pootle. commit 19aa76a5cc2d20955128194c91c2b77243b61b2c Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:09:42 2011 +0200 Translation update done using Pootle. commit c082b1573a5f79dcdd666cd9ed66bd31d815c5f4 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:09:13 2011 +0200 Translation update done using Pootle. commit 6d42104553d109407b1cd05515b7c70a072146c0 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:08:56 2011 +0200 Translation update done using Pootle. commit b53e5bad5cad7a6ba36ec1546174408f0395fa13 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:08:32 2011 +0200 Translation update done using Pootle. commit eb8990b834acb5b3d82c9741765abbf43ddd0490 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:05:09 2011 +0200 Translation update done using Pootle. commit 4630a9bc3f05010f57da8b1e858963caee2170aa Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:04:46 2011 +0200 Translation update done using Pootle. commit 84abc5d4afcc64f9f7f8df40776faf2252a79136 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:04:26 2011 +0200 Translation update done using Pootle. commit 23031e1b95b9f6a41f5ede83e7dbd2f0ddfc8ec9 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:04:15 2011 +0200 Translation update done using Pootle. commit b87ced9455ab2a39f27cf6a8bac377760799daf0 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:04:05 2011 +0200 Translation update done using Pootle. commit 7a0b02d28b44ef7fddc82a3c149d5ccf6c4574fb Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:03:52 2011 +0200 Translation update done using Pootle. commit 8e82c71a2c203eb7e68a14cf5b057e5f9e03bd10 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:03:34 2011 +0200 Translation update done using Pootle. commit f295f5ae12c359c33abc04aacd6dea8229fddad6 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:03:20 2011 +0200 Translation update done using Pootle. commit fb955eabe5a4e75e5fd759109d8aa7c8849049f5 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:02:33 2011 +0200 Translation update done using Pootle. commit 011097a1894b79201638ff7493ecc4d61c3f2d2a Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:02:12 2011 +0200 Translation update done using Pootle. commit 08139cad745fe048ffc65a52a2aa8cceb8dcef8d Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:02:01 2011 +0200 Translation update done using Pootle. commit 33c3a62b52328624d646971ab4fb7c3738ae31f2 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:01:37 2011 +0200 Translation update done using Pootle. commit 4a1abb60ca38f529f0e5a9daf56bc8c6e56f9e66 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:01:24 2011 +0200 Translation update done using Pootle. commit c205892b04ca46a893ce50516b4c70c1d475bb42 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 13:00:51 2011 +0200 Translation update done using Pootle. commit ba79ee8775f61aedfb443b268a9428dc32fcdb01 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:56:51 2011 +0200 Translation update done using Pootle. commit 0313e8028b6646a24ae13bf5628e0ae71fa19af8 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:56:31 2011 +0200 Translation update done using Pootle. commit 796f29c4d73cb78c221f7d9a43e31ad80aeaf63b Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:56:05 2011 +0200 Translation update done using Pootle. commit 20f90f79292d937b7a60e7daa11ebe6f14906f09 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:55:22 2011 +0200 Translation update done using Pootle. commit e79b47210f788ff9efd323af46ba25d9cee31de0 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:54:28 2011 +0200 Translation update done using Pootle. commit 67c8390c5007208ba16a1ed40bc367b03ea0df2c Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:52:53 2011 +0200 Translation update done using Pootle. commit 0a78eef0e069fcec42fa5469f1f2b46035f258eb Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:52:02 2011 +0200 Translation update done using Pootle. commit 08087bd2fca74778a34d46f238db012edff48668 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:50:36 2011 +0200 Translation update done using Pootle. commit d7521da6ce547fefdc8e2245a8ceb769a005956f Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:49:36 2011 +0200 Translation update done using Pootle. commit a6848acfc136e9aea0e87d2c72fd8ca458fbd756 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:49:10 2011 +0200 Translation update done using Pootle. commit be1365cac7a804095d74861cc5ded2276e601e89 Author: Stanisław Krukowski <stankruk(a)neostrada.pl> Date: Thu Oct 13 12:45:57 2011 +0200 Translation update done using Pootle. commit 5aeda1b04afa9cd5820175a364a76bee646574d7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:33:07 2011 +0200 Translation update done using Pootle. commit 0e19d56fbd00e8569098b3c07feb8f4fe3eaddaf Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:32:29 2011 +0200 Translation update done using Pootle. commit 1eefcc1b96d808a6b51b9b19e8d70ce94a3068a6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:31:58 2011 +0200 Translation update done using Pootle. commit 47af2da1dcc47ff40de146e0a7d51485ef693334 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:26:33 2011 +0200 Translation update done using Pootle. commit 71f099a481386438152150881a18bc39858edc14 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:18:30 2011 +0200 Translation update done using Pootle. commit d8be72c507ca92a632e8de9436a736e34e97614e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:17:52 2011 +0200 Translation update done using Pootle. commit b568e713f97a0ccec7b6ac6acf300927bfeb9b30 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:13:45 2011 +0200 Translation update done using Pootle. commit ffeaae17874405921269677397da5892c5e17b83 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:12:23 2011 +0200 Translation update done using Pootle. commit 4eb1b70bd489f137da068979fd6fb9c61ccb2c45 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:09:41 2011 +0200 Translation update done using Pootle. commit 98bb2c2cb832fc2d411c2e6b523c3a82abf5c34d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Thu Oct 13 12:00:38 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/br.po | 25 +++++------- po/fr.po | 23 +++++++---- po/ja.po | 59 +++++++++++++---------------- po/pl.po | 127 +++++++++++++++++++++++++++++-------------------------------- 4 files changed, 113 insertions(+), 121 deletions(-) diff --git a/po/br.po b/po/br.po index 9a89fc6..b9a459b 100644 --- a/po/br.po +++ b/po/br.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-08-22 20:10+0200\n" +"PO-Revision-Date: 2011-10-13 17:20+0200\n" "Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" +"Language: br\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: br\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.0.5\n" @@ -831,7 +831,7 @@ msgstr "Eilañ an talvoudoù ha pegañ anezho er vaezienn \"Ment/Talvoudoù\"" #: export.php:29 msgid "Bad type!" -msgstr "" +msgstr "Seurt faziek !" #: export.php:77 msgid "Selected export type has to be saved in file!" @@ -839,7 +839,7 @@ msgstr "Ret eo enrollañ an diuzadenn ezporzhiañ en ur restr !" #: export.php:106 msgid "Bad parameters!" -msgstr "" +msgstr "Arventennoù fall !" #: export.php:166 export.php:191 export.php:652 #, php-format @@ -865,10 +865,9 @@ msgid "Dump has been saved to file %s." msgstr "Enrollet eo bet ar restr ezporzhiañ e%s." #: file_echo.php:21 -#, fuzzy #| msgid "Export type" msgid "Invalid export type" -msgstr "Seurt ezporzhiadenn" +msgstr "Seurt ezporzhiadenn direizh" #: gis_data_editor.php:84 #, php-format @@ -904,10 +903,10 @@ msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:290 -#, fuzzy, php-format +#, php-format #| msgid "Point" msgid "Point %d" -msgstr "Poent" +msgstr "Poent %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:296 @@ -920,7 +919,7 @@ msgstr "Aradennad linennoù" #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:295 msgid "Outer Ring" -msgstr "" +msgstr "Kelc'h diavaez" #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:294 msgid "Inner Ring" @@ -1002,7 +1001,7 @@ msgstr "" #: import.php:366 msgid "" "Cannot convert file's character set without character set conversion library" -msgstr "" +msgstr "Dibosupl amdreiñ an arouezennoù hep levraoueg amdreiñ" #: import.php:390 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -1237,10 +1236,9 @@ msgid "Query statistics" msgstr "Stadegoù war ar rekedoù" #: js/messages.php:93 -#, fuzzy #| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" -msgstr "Dibosupl lenn ar restr keluniañ" +msgstr "N'eo ket kenglotus kefluniadur lec'hel an evezhiañ" #: js/messages.php:94 msgid "" @@ -1526,10 +1524,9 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:173 -#, fuzzy #| msgid "Tables display options" msgid "Log table filter options" -msgstr "Dibarzhioù diskwel an taolennoù" +msgstr "Dibarzhioù silañ taolenn ar marilhoù" # verb pe ak. ? #. l10n: Filter as in "Start Filtering" diff --git a/po/fr.po b/po/fr.po index f40e9f0..6c8a55c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,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-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-10-11 18:29+0200\n" +"PO-Revision-Date: 2011-10-14 16:46+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "Language: fr\n" @@ -12674,10 +12674,11 @@ msgid "Max %% MyISAM key buffer ever used" msgstr "Pourcentage maximum du tampon de clés MyISAM qui a été utilisé" #: po/advisory_rules.php:166 po/advisory_rules.php:171 -#, fuzzy, php-format +#, php-format #| msgid "Sort buffer size" msgid "MyISAM key buffer (index cache) %% used is low." -msgstr "Taille de la mémoire tampon" +msgstr "" +"Le pourcentage de la mémoire tampon utilisée pour les clés MyISAM est bas." #: po/advisory_rules.php:167 po/advisory_rules.php:172 msgid "" @@ -12685,35 +12686,41 @@ msgid "" "tables to see if indexes have been removed, or examine queries and " "expectations about what indexes are being used." msgstr "" +"Diminuez la taille de {key_buffer_size}, examinez vos table pour voir si " +"les index ont été enlevés, ou examinez les requêtes pour voir quels index " +"sont utilisés." #: po/advisory_rules.php:168 #, php-format msgid "max %% MyISAM key buffer ever used: %s, this value should be above 95%%" msgstr "" +"Le %% maximum de mémoire tampon pour les clés MyISAM utilisé est de %s, " +"cette valeur devrait dépasser 95%%." #: po/advisory_rules.php:170 -#, fuzzy #| msgid "Sort buffer size" msgid "Percentage of MyISAM key buffer used" -msgstr "Taille de la mémoire tampon" +msgstr "Pourcentage de la mémoire tampon des clés MyISAM utilisée" #: po/advisory_rules.php:173 #, php-format msgid "%% MyISAM key buffer used: %s, this value should be above 95%%" msgstr "" +"%% de mémoire tampon pour les clés MyISAM utilisée : %s, cette valeur " +"devrait être au-dessus de 95%%" #: po/advisory_rules.php:175 msgid "Percentage of index reads from memory" -msgstr "" +msgstr "Pourcentage des lectures d'index depuis la mémoire" #: po/advisory_rules.php:176 #, php-format msgid "The %% of indexes that use the MyISAM key buffer is low." -msgstr "" +msgstr "Le %% des index qui utilisent la mémoire tampon MySQL est bas." #: po/advisory_rules.php:177 msgid "You may need to increase {key_buffer_size}." -msgstr "" +msgstr "Veuillez augmenter {key_buffer_size}." #: po/advisory_rules.php:178 #, php-format diff --git a/po/ja.po b/po/ja.po index e9fedfe..0a63e55 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-09-28 12:29+0200\n" +"PO-Revision-Date: 2011-10-14 12:30+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -4125,10 +4125,8 @@ msgid "" "only occurs for the current server. Setting this to FALSE makes it easy to " "forget to log out from other servers when connected to multiple servers." msgstr "" -"チェックした場合、ログアウト時に全てのサーバのクッキーを削除します。チェック" -"を外した場合は、現在のサーバに対してだけログアウトが行われます。このチェック" -"を外しておくと、複数のサーバに接続している時、他のサーバからのログアウト作業" -"を忘れやすくなります。" +"チェックした場合、ログアウト時に全てのサーバのクッキーを削除します。チェックを外した場合は、現在のサーバに対してだけログアウトが行われます。このチェック" +"を外すと、複数のサーバに接続している時、他のサーバからのログアウト作業を忘れやすくなります。" #: libraries/config/messages.inc.php:293 msgid "Delete all cookies on logout" @@ -12237,8 +12235,7 @@ msgid "" "This means that joins are doing full table scans. Adding indexes for the " "columns being used in the join conditions will greatly speed up table joins" msgstr "" -"これは結合において、テーブルが全スキャンされていることを示しています。結合条" -"件にあったカラムにインデックスを追加することで、テーブル結合のスピードは大幅" +"これは結合において、テーブルが全スキャンされていることを示しています。結合条件に合ったカラムにインデックスを追加することで、テーブル結合のスピードは大幅" "に上がるでしょう。" #: po/advisory_rules.php:128 @@ -12264,13 +12261,10 @@ msgid "" "scans. Other than that full index scans can only be reduced by rewriting " "queries." msgstr "" -"これは、通常、インデックスの全スキャンが頻繁に行われていることを示していま" -"す。インデックスの全スキャンはテーブルのスキャンよりは速いですが、大きなテー" -"ブルでは CPU リソースを多く必要とします。このテーブルに対して UPDATE や " -"DELETE が多く行われたまたは行われているのであれば、「OPTIMIZE TABLE」を実行す" -"ることでインデックスの全スキャンの量の減少やスキャンスピードの上昇が見込める" -"かもしれません。他に、インデックスの全スキャンは、クエリを書き換えることでも" -"減少させることが可能です。" +"これは、通常、インデックスの全スキャンが頻繁に行われていることを示しています。インデックスの全スキャンはテーブルのスキャンよりは速いですが、大きなテーブ" +"ルでは CPU リソースを多く必要とします。このテーブルに対して UPDATE や DELETE " +"が多く行われたまたは行われているのであれば、「OPTIMIZE TABLE」を実行することでインデックスの全スキャンの減少やスキャンスピードの上昇が見込" +"めるかもしれません。また、インデックスの全スキャンは、クエリを書き換えることでも減少させることが可能です。" #: po/advisory_rules.php:133 #, php-format @@ -12398,15 +12392,13 @@ msgid "" msgstr "" #: po/advisory_rules.php:158 -#, fuzzy, php-format +#, php-format #| msgid "" #| "Temporary tables average: %s, this value should be less than 1 per hour." msgid "" "Rate of temporary tables being written to disk: %s, this value should be " "less than 1 per hour" -msgstr "" -"一時テーブル使用率の平均：%s。この値は、1 時間当たり 1 未満がいいと言われてい" -"ます。" +msgstr "ディスク書き込みを伴う一時テーブル割合：%s。この値は、1 時間当たり 1 未満がいいと言われています。" #: po/advisory_rules.php:160 msgid "MyISAM key buffer size" @@ -12542,34 +12534,33 @@ msgstr "" "ファイルを開く割合：%s。この値は、1 時間当たり 5 未満がいいと言われています。" #: po/advisory_rules.php:195 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Immediate table locks %%" -msgstr "データベース %s にテーブルを作成する" +msgstr "速やかに行われたテーブルロックの比率" #: po/advisory_rules.php:196 po/advisory_rules.php:201 -#, fuzzy #| msgid "The number of times that a table lock was acquired immediately." msgid "Too many table locks were not granted immediately." -msgstr "テーブルロックをすぐに取得できた回数" +msgstr "テーブルロック要求をしても速やかに取得できないことが多いです。" #: po/advisory_rules.php:197 po/advisory_rules.php:202 msgid "Optimize queries and/or use InnoDB to reduce lock wait." -msgstr "" +msgstr "最適化もしくは InnoDB のロック待ち時間の減少、のいずれかもしくは両方を行ってください。" #: po/advisory_rules.php:198 #, php-format msgid "Immediate table locks: %s%%, this value should be above 95%%" -msgstr "" +msgstr "速やかに行われたテーブルロック: %s%%。この値は、95%% 以上がいいと言われています。" #: po/advisory_rules.php:200 msgid "Table lock wait rate" -msgstr "" +msgstr "テーブルロックの待つ割合" #: po/advisory_rules.php:203 #, php-format msgid "Table lock wait rate: %s, this value should be less than 1 per hour" -msgstr "" +msgstr "テーブルロックの待つ割合: %s。この値は、1 時間当たり 1 未満がいいと言われています。" #: po/advisory_rules.php:205 msgid "Thread cache" @@ -12691,6 +12682,9 @@ msgid "" "source-of-aborted_connects/\\\">This article</a> might help you track down " "the source." msgstr "" +"接続は中断されたというのは、一般的に、認証できなかった場合のことです。<a " +"href=\\\"http://www.mysqlperformanceblog.com/2008/08/23/how-to-track-down-the-" +"source-of-aborted_connects/\\\">この記事</a>は、原因を突き止めるのに参考になるかもしれません。" #: po/advisory_rules.php:233 #, php-format @@ -12721,7 +12715,7 @@ msgstr "クライアントによって中断された比率" #: po/advisory_rules.php:241 po/advisory_rules.php:246 msgid "Too many clients are aborted." -msgstr "" +msgstr "中断されたクライアントが多いです。" #: po/advisory_rules.php:242 po/advisory_rules.php:247 msgid "" @@ -12729,22 +12723,23 @@ msgid "" "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" +"クライアントによって中断されたというのは、一般的に、MySQL への接続が適切に閉じられなかった場合のことです。ネットワークの問題もしくはデータベースへ" +"の接続を適切に閉じていないコードが原因と考えられます。ネットワークとコードを確認してください。" #: po/advisory_rules.php:243 #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" -msgstr "" +msgstr "全クライアントの内 %s%% が中断されています。この値は、2%% 未満がいいと言われています。" #: po/advisory_rules.php:245 -#, fuzzy #| msgid "Format of imported file" msgid "Rate of aborted clients" -msgstr "インポートするファイルの形式" +msgstr "中断されたクライアントの割合" #: po/advisory_rules.php:248 #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" -msgstr "" +msgstr "中断されたクライアントの割合: %s。この値は、1 時間当たり 1 未満がいいと言われています。" #: po/advisory_rules.php:250 msgid "Is InnoDB disabled?" diff --git a/po/pl.po b/po/pl.po index dbade94..9386539 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,7 +4,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-10-08 06:43-0400\n" -"PO-Revision-Date: 2011-10-11 11:16+0200\n" +"PO-Revision-Date: 2011-10-13 13:40+0200\n" "Last-Translator: Stanisław Krukowski <stankruk(a)neostrada.pl>\n" "Language-Team: polish <pl(a)li.org>\n" "Language: pl\n" @@ -659,7 +659,7 @@ msgstr "Z zaznaczeniem:" #: server_databases.php:266 server_privileges.php:682 #: server_privileges.php:1759 tbl_structure.php:560 msgid "Check All" -msgstr "Zaznacz wszystko" +msgstr "Zaznacz wszystkie" #: db_structure.php:541 libraries/display_tbl.lib.php:2484 #: libraries/replication_gui.lib.php:35 server_databases.php:268 @@ -720,13 +720,12 @@ msgstr "Dodaj prefiks do tabeli" #: db_structure.php:576 libraries/mult_submits.inc.php:251 msgid "Replace table prefix" -msgstr "Zmień prefiks tabeli" +msgstr "Zamień prefiks tabeli" #: db_structure.php:578 libraries/mult_submits.inc.php:251 -#, fuzzy #| msgid "Replace table data with file" msgid "Copy table with prefix" -msgstr "Zamiana danych tabeli z plikiem" +msgstr "Kopiuj tabelę z prefiksem" #: db_structure.php:615 libraries/schema/User_Schema.class.php:422 msgid "Data Dictionary" @@ -809,7 +808,7 @@ msgstr "Monitoruj tabelę" #: db_tracking.php:225 msgid "Database Log" -msgstr "Log bazy danych" +msgstr "Dziennik bazy danych" #: enum_editor.php:21 libraries/tbl_properties.inc.php:719 #, php-format @@ -818,11 +817,11 @@ msgstr "Wartości dla kolumny \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:720 msgid "Enter each value in a separate field." -msgstr "Wprowadź wartości w osobnych polach" +msgstr "Wprowadź każdą wartość do osobnego pola" #: enum_editor.php:57 msgid "+ Restart insertion and add a new value" -msgstr "+ Zacznij od nowa i dodaj nową wartość" +msgstr "+ Zacznij wprowadzanie od nowa i dodaj nową wartość" #: enum_editor.php:67 gis_data_editor.php:317 msgid "Output" @@ -834,15 +833,15 @@ msgstr "Kopiuj i wklej połączone wartości do pola \"Długości/Wartości\"" #: export.php:29 msgid "Bad type!" -msgstr "Niewłaściwy typ" +msgstr "Typ nieprawidłowy!" #: export.php:77 msgid "Selected export type has to be saved in file!" -msgstr "Wybrany typ eksportu musi być zapisany do pliku" +msgstr "Wybrany typ eksportu musi być zapisany do pliku!" #: export.php:106 msgid "Bad parameters!" -msgstr "Niewłaściwe parametry" +msgstr "Parametry nieprawidłowe!" #: export.php:166 export.php:191 export.php:652 #, php-format @@ -869,101 +868,97 @@ msgstr "Zrzut został zapisany do pliku %s." #: file_echo.php:21 msgid "Invalid export type" -msgstr "Niewłaściwy rodzaj eksportu" +msgstr "Nieprawidłowy typ eksportu" #: gis_data_editor.php:84 -#, fuzzy, php-format +#, php-format #| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" -msgstr "Wartości dla kolumny \"%s\"" +msgstr "Wartość dla kolumny \"%s\"" #: gis_data_editor.php:113 tbl_gis_visualization.php:172 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "Użyj OpenStreetMaps jako warstwy podstawowej" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:293 #: libraries/display_tbl.lib.php:685 msgid "Geometry" -msgstr "" +msgstr "Geometria" #: gis_data_editor.php:172 js/messages.php:289 msgid "Point" -msgstr "" +msgstr "Punkt" #: gis_data_editor.php:173 gis_data_editor.php:197 gis_data_editor.php:245 #: gis_data_editor.php:297 js/messages.php:287 msgid "X" -msgstr "" +msgstr "X" #: gis_data_editor.php:175 gis_data_editor.php:199 gis_data_editor.php:247 #: gis_data_editor.php:299 js/messages.php:288 msgid "Y" -msgstr "" +msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:290 #, php-format msgid "Point %d" -msgstr "" +msgstr "Punkt %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:296 -#, fuzzy #| msgid "Apply index(s)" msgid "Add a point" -msgstr "Dołącz indeks(y)" +msgstr "Dodaj punkt" #: gis_data_editor.php:220 js/messages.php:291 -#, fuzzy #| msgid "Lines terminated by" msgid "Linestring" -msgstr "Linie zakończone przez" +msgstr "Linestring" #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:295 msgid "Outer Ring" -msgstr "" +msgstr "Pierścień zewnętrzny" #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:294 msgid "Inner Ring" -msgstr "" +msgstr "Pierścień wewnętrzny" #: gis_data_editor.php:252 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Dodaj nowego użytkownika" +msgstr "Dodaj linestring" #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:297 -#, fuzzy #| msgid "Add a new User" msgid "Add an inner ring" -msgstr "Dodaj nowego użytkownika" +msgstr "Dodaj pierścień wewnętrzny" #: gis_data_editor.php:266 js/messages.php:292 msgid "Polygon" -msgstr "" +msgstr "Wielokąt" #: gis_data_editor.php:306 js/messages.php:298 -#, fuzzy #| msgid "Add %s field(s)" msgid "Add a polygon" -msgstr "Dodaj %s pól" +msgstr "Dodaj wielokąt" #: gis_data_editor.php:310 -#, fuzzy #| msgid "Add a new server" msgid "Add geometry" -msgstr "Dodaj nowy serwer" +msgstr "Dodaj geometrię" #: gis_data_editor.php:318 msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" +"Wybierz \"GeomFromText\" z kolumny \"Function\" i wklej poniżej napisu do pola " +"\"Value\"." #: import.php:57 #, php-format @@ -971,21 +966,21 @@ msgid "" "You probably tried to upload too large file. Please refer to %sdocumentation%" "s for ways to workaround this limit." msgstr "" -"Prawdopodobnie próbowano wrzucić duży plik. Aby poznać sposoby obejścia tego " -"limitu, proszę zapoznać się z %sdokumenacją%s." +"Prawdopodobnie próbowano przesłać na serwer zbyt duży plik. Aby poznać " +"sposoby obejścia tego problemu, proszę zapoznać się z %sdokumenacją%s." #: import.php:170 import.php:419 msgid "Showing bookmark" -msgstr "Pokaz zapamiętanego zapytania" +msgstr "Wyświetlanie zakładki" #: import.php:180 import.php:415 msgid "The bookmark has been deleted." -msgstr "Zapamiętane zapytanie SQL zostało usunięte." +msgstr "Zakładka została usunięta." #: import.php:291 import.php:344 libraries/File.class.php:457 #: libraries/File.class.php:540 msgid "File could not be read" -msgstr "Nie można odczytać pliku" +msgstr "Plik nie mógł być odczytany." #: import.php:299 import.php:308 import.php:327 import.php:336 #: libraries/File.class.php:610 libraries/File.class.php:618 @@ -995,8 +990,9 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" -"Próbowano wczytać plik z nieobsługiwanym typem kompresji (%s). Albo jego " -"obsługa nie została zaimplementowana albo została konfiguracyjnie wyłączona." +"Próbowano wczytać plik z nieobsługiwanym typem kompresji (%s). Powód: " +"obsługa tego pliku nie została zaimplementowana, albo została wyłączona " +"przez konfigurację." #: import.php:349 msgid "" @@ -1004,24 +1000,25 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" -"Nie otrzymano żadnych danych do importu. Albo nie została wysłana nazwa " +"Nie otrzymano żadnych danych do importu. Powód: nie została wysłana nazwa " "pliku, albo plik był zbyt duży (maksymalny dopuszczalny rozmiar pliku " -"określa się w konfiguracji PHP). Patrz: [a@./Documentation." -"html#faq1_16@Documentation]FAQ 1.16[/a]." +"określa się w konfiguracji PHP). Zobacz: " +"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." #: import.php:366 msgid "" "Cannot convert file's character set without character set conversion library" msgstr "" +"Nie można przekonwertować zestawu znaków bez biblioteki konwersji znaków" #: import.php:390 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" -msgstr "Nie udało się załadować modułów importu, proszę sprawdzić instalację!" +msgstr "Nie udało się załadować wtyczek importu, proszę sprawdzić instalację!" #: import.php:421 sql.php:928 #, php-format msgid "Bookmark %s created" -msgstr "Zapytanie %s zostało zapamiętane" +msgstr "Zakładka %s została utworzona" #: import.php:427 import.php:433 #, php-format @@ -1033,17 +1030,17 @@ msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." msgstr "" -"Limit czasu wykonania skryptu minął; aby ukończyć import, proszę przedłożyć " -"ten sam plik a import zostanie wznowiony." +"Limit czasu wykonania skryptu minął. Aby ukończyć import, proszę ponownie " +"wczytać ten sam plik." #: import.php:444 msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." msgstr "" -"Jednakże, podczas ostatniego uruchomienia nie zostały przetworzone żadne " -"dane, co zwykle oznacza, że phpMyAdmin nie będzie w stanie ukończyć tego " -"importu bez zwiększenia limitów czasowych PHP." +"Podczas ostatniego uruchomienia nie zostały przetworzone żadne dane, co " +"zwykle oznacza, że phpMyAdmin nie będzie mógł ukończyć importu bez " +"zwiększenia limitów czasowych PHP." #: import.php:472 libraries/Message.class.php:175 #: libraries/display_tbl.lib.php:2383 libraries/rte/rte_routines.lib.php:1197 @@ -1055,13 +1052,12 @@ msgstr "Zapytanie SQL zostało wykonane pomyślnie" #: import_status.php:29 libraries/common.lib.php:702 #: libraries/schema/Export_Relation_Schema.class.php:237 user_password.php:109 msgid "Back" -msgstr "Powrót" +msgstr "Wstecz" #: index.php:164 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser." msgstr "" -"phpMyAdmin jest bardziej przyjazny w przeglądarkach <b>obsługujących ramki</" -"b>" +"phpMyAdmin jest bardziej przyjazny w przeglądarkach z <b>obsługą ramek</b>" #: js/messages.php:27 libraries/server_synchronize.lib.php:1329 #: libraries/server_synchronize.lib.php:1338 @@ -1074,11 +1070,11 @@ msgstr "Kliknij, aby usunąć zaznaczenie" #: js/messages.php:29 libraries/import.lib.php:103 sql.php:247 msgid "\"DROP DATABASE\" statements are disabled." -msgstr "Polecenie \"DROP DATABASE\" jest zablokowane." +msgstr "Zdania \"DROP DATABASE\" są wyłączone." #: js/messages.php:32 libraries/mult_submits.inc.php:282 sql.php:348 msgid "Do you really want to " -msgstr "Czy na pewno wykonać " +msgstr "Czy na pewno chcesz, aby usunąć? " #: js/messages.php:33 libraries/mult_submits.inc.php:282 sql.php:333 msgid "You are about to DESTROY a complete database!" @@ -1106,7 +1102,7 @@ msgstr "Ta operacja może długo potrwać. Czy mimo to kontynuować?" #: js/messages.php:42 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "Masz zamiar WYŁĄCZYĆ repozytorium BLOBów!" +msgstr "Masz zamiar WYŁĄCZYĆ repozytorium BLOB!" #: js/messages.php:43 #, php-format @@ -1115,7 +1111,7 @@ msgstr "Czy na pewno wyłączyć wszystkie odwołania do BLOBów z bazy danych % #: js/messages.php:46 msgid "Missing value in the form!" -msgstr "Brakująca wartość w formularzu!" +msgstr "W formularzu brakuje wartości!" #: js/messages.php:47 msgid "This is not a number!" @@ -1123,10 +1119,9 @@ msgstr "To nie jest liczba!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Liczba plików dziennika" +msgstr "Całkowita liczba:" #: js/messages.php:54 msgid "The host name is empty!" @@ -1138,7 +1133,7 @@ msgstr "Brak nazwy użytkownika!" #: js/messages.php:56 server_privileges.php:1314 user_password.php:50 msgid "The password is empty!" -msgstr "Puste hasło!" +msgstr "Brak hasła!" #: js/messages.php:57 server_privileges.php:1312 user_password.php:53 msgid "The passwords aren't the same!" @@ -1146,20 +1141,18 @@ msgstr "Hasła nie są identyczne!" #: js/messages.php:58 server_privileges.php:1769 server_privileges.php:1793 #: server_privileges.php:2205 server_privileges.php:2404 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Dowolny użytkownik" +msgstr "Dodaj użytkownika" #: js/messages.php:59 msgid "Reloading Privileges" msgstr "Przeładowanie uprawnień" #: js/messages.php:60 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Usuń zaznaczonych użytkowników" +msgstr "Usuwanie zaznaczonych użytkowników" #: js/messages.php:61 js/messages.php:130 libraries/tbl_properties.inc.php:718 #: tbl_tracking.php:235 tbl_tracking.php:400 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20988-g915b24d
by Madhura Jayaratne 14 Oct '11

14 Oct '11

The branch, master has been updated via 915b24df79f39c3213ff828c08e1bdf955f9ab0d (commit) via acf2a3b472cc468f6120a4b70aeb98095b013e30 (commit) via 77ad710d08eed759b9404e069e8dd6c1ea9f802f (commit) from e03dcf766976fe6dfffb75d4aa3c8cf2f76acffa (commit) - Log ----------------------------------------------------------------- commit 915b24df79f39c3213ff828c08e1bdf955f9ab0d Merge: acf2a3b e03dcf7 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Oct 14 20:32:38 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit acf2a3b472cc468f6120a4b70aeb98095b013e30 Merge: 52871d9 77ad710 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Oct 14 20:21:09 2011 +0530 Merge branch 'QA_3_4' Conflicts: libraries/export/pdf.php ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1ae966..06894fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog - bug [view] View renaming did not work - bug [navi] Wrong icon for view (MySQL 5.5) - bug #3420229 [doc] Missing documentation section +- bug #3423725 [pdf] Broken PDF file when exporting database to PDF 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_6RC1-15-g77ad710
by Madhura Jayaratne 14 Oct '11

14 Oct '11

The branch, QA_3_4 has been updated via 77ad710d08eed759b9404e069e8dd6c1ea9f802f (commit) from 4a99b6a4942c02d0b1121650dc9f93fb83a42dac (commit) - Log ----------------------------------------------------------------- commit 77ad710d08eed759b9404e069e8dd6c1ea9f802f Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Oct 14 20:17:25 2011 +0530 bug #3423725 [pdf] Broken PDF file when exporting database to PDF ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/export/pdf.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cc2e3c..a79eebf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug [view] View renaming did not work - bug [navi] Wrong icon for view (MySQL 5.5) - bug #3420229 [doc] Missing documentation section +- bug #3423725 [pdf] Broken PDF file when exporting database to PDF 3.4.6.0 (not yet released) - patch #3404173 InnoDB comment display with tooltips/aliases diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php index 431df0d..786b1d1 100644 --- a/libraries/export/pdf.php +++ b/libraries/export/pdf.php @@ -129,7 +129,7 @@ class PMA_PDF extends TCPDF if (!isset($this->footerset[$this->page])) { $this->SetY(-15); //Page number - $this->setFooterFont(PMA_PDF_FONT, '', 14); + $this->SetFont(PMA_PDF_FONT, '', 14); $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' . $this->getAliasNbPages(), 'T', 0, 'C'); // set footerset hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git October 2011