- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-11038-g9c8514f
by Marc Delisle 22 Nov '10

22 Nov '10

The branch, master has been updated via 9c8514fb97dca0a02293344847e47927e0002463 (commit) from 95ca09282ff6126ae9ffe7e143101c3d154f2e51 (commit) - Log ----------------------------------------------------------------- commit 9c8514fb97dca0a02293344847e47927e0002463 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Nov 22 13:23:08 2010 -0500 3.5.0-dev ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a10389..f79ed3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.5.0.0 (not yet released) + 3.4.0.0 (not yet released) + rfe #2890226 [view] Enable VIEW rename + rfe #838637 [privileges] Export a user's privileges diff --git a/Documentation.html b/Documentation.html index f6235e7..3479ad2 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.0-dev - Documentation</title> + <title>phpMyAdmin 3.5.0-dev - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-dev + 3.5.0-dev Documentation </h1> </div> diff --git a/README b/README index 7b92968..fccd68b 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. -Version 3.4.0-dev +Version 3.5.0-dev ----------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 16fe5a1..4c2f281 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.0-dev'); + $this->set('PMA_VERSION', '3.5.0-dev'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 537824c..c2ba840 100644 --- a/translators.html +++ b/translators.html @@ -10,7 +10,7 @@ <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.0-dev - Official translators</title> + <title>phpMyAdmin 3.5.0-dev - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.0-dev + 3.5.0-dev official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, created. RELEASE_3_3_8-11037-g95ca092
by Marc Delisle 22 Nov '10

22 Nov '10

The branch, MAINT_3_4_0 has been created at 95ca09282ff6126ae9ffe7e143101c3d154f2e51 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, created. RELEASE_3_3_8-11037-g95ca092
by Marc Delisle 22 Nov '10

22 Nov '10

The branch, QA_3_4 has been created at 95ca09282ff6126ae9ffe7e143101c3d154f2e51 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-11037-g95ca092
by Michal Čihař 21 Nov '10

21 Nov '10

The branch, master has been updated via 95ca09282ff6126ae9ffe7e143101c3d154f2e51 (commit) via c6934b20ca656d51b2ff60012a4f4395b7deee50 (commit) via 44cf2ab214dbe0236e8603ddccca565ac7f37f36 (commit) via 7e0c37201bcf2497880efe5e69f07f30a80712ef (commit) via 403e0e1b82eb87a61879001dd4d5ce210342bc7a (commit) via f13b0505bd9f92db2e12014490c7213e27fc84dc (commit) via 9b37048f54c8ef1a1db6d4234cee2e5f4da78995 (commit) via 321ba7b41f5d5bd15c5b24175731f2f002bc1c02 (commit) via 05a66082c4b7ac5d0f87e2e72f4342cbfca48aa2 (commit) via a9cde4a47fab99cd67aa2e2c5e2597ee3421d189 (commit) via e66ac20805de7b4606e3fe9f12aa0da9a8604a23 (commit) via af1335c22de8ce0b43ec3ca963d004ef87d6cf72 (commit) via 179070820f5e3a79eca72e0b128f455b32b8833c (commit) via 266a5a9127a9fc709ead5db16da9c89b3a7b5ebb (commit) via 5cca06ab45e83873d310f33e78108d9c8a1251a1 (commit) via a25f8174c927758f41529e386548dec5f0a8e95c (commit) via 7df20df7423983fdf5ad1f280d7a141dba2d2741 (commit) via e377ff4f6ea779feb190f38d8a6c41e26eec5dc1 (commit) via 689ec15a6a4753ade489f24832d88c4cc7248622 (commit) via 2bd398a91d3c3d2490ec42f597fb2ad4672be226 (commit) via ca5626693cff9ef9533c790b95611ad18cfa62ed (commit) via 0f52571462fe2cae9d27d5cff53170b939a206ea (commit) via a54b5dcfb24c1ddc88938518846f38b6c39714ca (commit) via a3f65eb73d465e2470f750b03558574d76278a4f (commit) via c7c89143c492aa2e094aabf8fe146bdca1f6350b (commit) via dbbcdfd94f152f68ab9faa80abfb7152597c71da (commit) via 6fc32c088aea22d9161ed5ae08f63708e75f853e (commit) via 98060097984853726a3070b5319f048d3d8d4bca (commit) via 113ccd5a1fa91e6c9d89b5f0d1b451e33c948613 (commit) via 47ad5c11c950536625093e3bfc0e0f0cc8efb26c (commit) via 9a42cd08a8b4b97a224455844f4d05b15ceac0fa (commit) via fcd62984090e1c24cdf4cc9b11d7a0488f04bbd5 (commit) via 19ab04d25a54856a6565b3444e656975eaf3628d (commit) via 0fe9b0ab0b985d8e5120ee4c721a739aec2ca7c4 (commit) via 4d1689347cd8b4d49a1d8c19ef7f3d67bdc08c08 (commit) via 48cbf573adc4dd9a0138143a0cb4dc434380e75c (commit) via 76dade4fc4a067f8d79cd8d3c3621a6486034e27 (commit) via 27407f079d43faae72895abffddc53e197a72e40 (commit) via 1c1992b06bf10fe089729328d02dbd68069c4884 (commit) via 14302c3868ced0609a938906ff4f7818db798736 (commit) via 71ac46992fff7cce4690a20d4025ecafcaa54aa1 (commit) via 9842d5011bcba72bc877ea320e8532658b82d10f (commit) via 11edf7ceeab6a3f08f51b3dcce2fed647f8bcd72 (commit) via 2296eca4ebac95e1f3c9744a2635d990c9668a66 (commit) via bdc29cb355e513d57bcb6de66bfb6c27e6c7c6bb (commit) via 9b0ced2f7adcbb3800880e5cd967fb69c5ea1379 (commit) via fa5af36b7fbe9693592eaeddaa94cb08e267a6de (commit) via 59a7b47f868fe6c508c4f870d7163e90980a8d0c (commit) via 0930e4ce9b0343bcddb61bbb96206dd2a6e38e20 (commit) via 846e9b2ec1f534f760c849e16639fd97ee921f73 (commit) via 16481380b67fba6d6d73a6cc71343352bf73b054 (commit) via e077aafad0e211ca549bf55d9c176150395cf7f0 (commit) via 02bf2547476ef4408b1debc5958b27f40bcd38dc (commit) via 5e661de8c2137d464b79a256263b72d841a5ce45 (commit) via 5fb80e20a7a016bb7d7e8cf09397bbc37e8444ea (commit) via f66eafb19c89993eeb74ae1a500c347b029619c9 (commit) via 259b7dc028f3112601d62f5adf818a04d2ebfba0 (commit) via 34552878425156717df3898dba40164007f87548 (commit) via f3d7e64f57c4f505aa88c6e4a661b8650af120df (commit) via 3d7e370ee54278bfe3558d7b210cf79a2bc75356 (commit) via a414fe19df66d4f41925fdcbd06df434bb6d5f47 (commit) from 18f6882f89d0f5327e358a7bcdb61fb847aea2ff (commit) - Log ----------------------------------------------------------------- commit 95ca09282ff6126ae9ffe7e143101c3d154f2e51 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Nov 21 10:10:20 2010 +0100 Czech translation update. commit c6934b20ca656d51b2ff60012a4f4395b7deee50 Merge: 18f6882f89d0f5327e358a7bcdb61fb847aea2ff 44cf2ab214dbe0236e8603ddccca565ac7f37f36 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Nov 21 10:07:53 2010 +0100 Merge remote branch 'pootle/master' Conflicts: po/fr.po po/lt.po commit 44cf2ab214dbe0236e8603ddccca565ac7f37f36 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:55 2010 +0200 Translation update done using Pootle. commit 7e0c37201bcf2497880efe5e69f07f30a80712ef Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:47 2010 +0200 Translation update done using Pootle. commit 403e0e1b82eb87a61879001dd4d5ce210342bc7a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:39 2010 +0200 Translation update done using Pootle. commit f13b0505bd9f92db2e12014490c7213e27fc84dc Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:31 2010 +0200 Translation update done using Pootle. commit 9b37048f54c8ef1a1db6d4234cee2e5f4da78995 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:25 2010 +0200 Translation update done using Pootle. commit 321ba7b41f5d5bd15c5b24175731f2f002bc1c02 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:15 2010 +0200 Translation update done using Pootle. commit 05a66082c4b7ac5d0f87e2e72f4342cbfca48aa2 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:09 2010 +0200 Translation update done using Pootle. commit a9cde4a47fab99cd67aa2e2c5e2597ee3421d189 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:21:01 2010 +0200 Translation update done using Pootle. commit e66ac20805de7b4606e3fe9f12aa0da9a8604a23 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:20:50 2010 +0200 Translation update done using Pootle. commit af1335c22de8ce0b43ec3ca963d004ef87d6cf72 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 14:20:04 2010 +0200 Translation update done using Pootle. commit 179070820f5e3a79eca72e0b128f455b32b8833c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:31:14 2010 +0200 Translation update done using Pootle. commit 266a5a9127a9fc709ead5db16da9c89b3a7b5ebb Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:31:07 2010 +0200 Translation update done using Pootle. commit 5cca06ab45e83873d310f33e78108d9c8a1251a1 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:30:27 2010 +0200 Translation update done using Pootle. commit a25f8174c927758f41529e386548dec5f0a8e95c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:29:54 2010 +0200 Translation update done using Pootle. commit 7df20df7423983fdf5ad1f280d7a141dba2d2741 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:29:32 2010 +0200 Translation update done using Pootle. commit e377ff4f6ea779feb190f38d8a6c41e26eec5dc1 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:28:53 2010 +0200 Translation update done using Pootle. commit 689ec15a6a4753ade489f24832d88c4cc7248622 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:28:41 2010 +0200 Translation update done using Pootle. commit 2bd398a91d3c3d2490ec42f597fb2ad4672be226 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:27:41 2010 +0200 Translation update done using Pootle. commit ca5626693cff9ef9533c790b95611ad18cfa62ed Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:27:07 2010 +0200 Translation update done using Pootle. commit 0f52571462fe2cae9d27d5cff53170b939a206ea Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:26:52 2010 +0200 Translation update done using Pootle. commit a54b5dcfb24c1ddc88938518846f38b6c39714ca Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:26:18 2010 +0200 Translation update done using Pootle. commit a3f65eb73d465e2470f750b03558574d76278a4f Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:24:07 2010 +0200 Translation update done using Pootle. commit c7c89143c492aa2e094aabf8fe146bdca1f6350b Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:20:15 2010 +0200 Translation update done using Pootle. commit dbbcdfd94f152f68ab9faa80abfb7152597c71da Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:19:20 2010 +0200 Translation update done using Pootle. commit 6fc32c088aea22d9161ed5ae08f63708e75f853e Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:15:37 2010 +0200 Translation update done using Pootle. commit 98060097984853726a3070b5319f048d3d8d4bca Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:15:17 2010 +0200 Translation update done using Pootle. commit 113ccd5a1fa91e6c9d89b5f0d1b451e33c948613 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:15:02 2010 +0200 Translation update done using Pootle. commit 47ad5c11c950536625093e3bfc0e0f0cc8efb26c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:14:42 2010 +0200 Translation update done using Pootle. commit 9a42cd08a8b4b97a224455844f4d05b15ceac0fa Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:14:11 2010 +0200 Translation update done using Pootle. commit fcd62984090e1c24cdf4cc9b11d7a0488f04bbd5 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:13:03 2010 +0200 Translation update done using Pootle. commit 19ab04d25a54856a6565b3444e656975eaf3628d Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:12:52 2010 +0200 Translation update done using Pootle. commit 0fe9b0ab0b985d8e5120ee4c721a739aec2ca7c4 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 21:07:13 2010 +0200 Translation update done using Pootle. commit 4d1689347cd8b4d49a1d8c19ef7f3d67bdc08c08 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:30:14 2010 +0200 Translation update done using Pootle. commit 48cbf573adc4dd9a0138143a0cb4dc434380e75c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:26:38 2010 +0200 Translation update done using Pootle. commit 76dade4fc4a067f8d79cd8d3c3621a6486034e27 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:26:35 2010 +0200 Translation update done using Pootle. commit 27407f079d43faae72895abffddc53e197a72e40 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:26:26 2010 +0200 Translation update done using Pootle. commit 1c1992b06bf10fe089729328d02dbd68069c4884 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:22:45 2010 +0200 Translation update done using Pootle. commit 14302c3868ced0609a938906ff4f7818db798736 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:22:30 2010 +0200 Translation update done using Pootle. commit 71ac46992fff7cce4690a20d4025ecafcaa54aa1 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:22:22 2010 +0200 Translation update done using Pootle. commit 9842d5011bcba72bc877ea320e8532658b82d10f Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:22:18 2010 +0200 Translation update done using Pootle. commit 11edf7ceeab6a3f08f51b3dcce2fed647f8bcd72 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:22:12 2010 +0200 Translation update done using Pootle. commit 2296eca4ebac95e1f3c9744a2635d990c9668a66 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:22:10 2010 +0200 Translation update done using Pootle. commit bdc29cb355e513d57bcb6de66bfb6c27e6c7c6bb Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:22:05 2010 +0200 Translation update done using Pootle. commit 9b0ced2f7adcbb3800880e5cd967fb69c5ea1379 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:21:51 2010 +0200 Translation update done using Pootle. commit fa5af36b7fbe9693592eaeddaa94cb08e267a6de Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:21:48 2010 +0200 Translation update done using Pootle. commit 59a7b47f868fe6c508c4f870d7163e90980a8d0c Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:21:43 2010 +0200 Translation update done using Pootle. commit 0930e4ce9b0343bcddb61bbb96206dd2a6e38e20 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:21:40 2010 +0200 Translation update done using Pootle. commit 846e9b2ec1f534f760c849e16639fd97ee921f73 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:21:38 2010 +0200 Translation update done using Pootle. commit 16481380b67fba6d6d73a6cc71343352bf73b054 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:21:35 2010 +0200 Translation update done using Pootle. commit e077aafad0e211ca549bf55d9c176150395cf7f0 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:21:31 2010 +0200 Translation update done using Pootle. commit 02bf2547476ef4408b1debc5958b27f40bcd38dc Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:20:56 2010 +0200 Translation update done using Pootle. commit 5e661de8c2137d464b79a256263b72d841a5ce45 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:19:42 2010 +0200 Translation update done using Pootle. commit 5fb80e20a7a016bb7d7e8cf09397bbc37e8444ea Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:19:36 2010 +0200 Translation update done using Pootle. commit f66eafb19c89993eeb74ae1a500c347b029619c9 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:19:06 2010 +0200 Translation update done using Pootle. commit 259b7dc028f3112601d62f5adf818a04d2ebfba0 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:18:02 2010 +0200 Translation update done using Pootle. commit 34552878425156717df3898dba40164007f87548 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:16:58 2010 +0200 Translation update done using Pootle. commit f3d7e64f57c4f505aa88c6e4a661b8650af120df Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:16:49 2010 +0200 Translation update done using Pootle. commit 3d7e370ee54278bfe3558d7b210cf79a2bc75356 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:16:28 2010 +0200 Translation update done using Pootle. commit a414fe19df66d4f41925fdcbd06df434bb6d5f47 Author: edgaras.janusauskas <edgaras.janusauskas(a)gmail.com> Date: Fri Nov 19 20:16:16 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 72 +++++++++++++++++--------------------- po/fr.po | 27 +++++++------- po/lt.po | 118 +++++++++++++++++++++++++------------------------------------ 3 files changed, 93 insertions(+), 124 deletions(-) diff --git a/po/cs.po b/po/cs.po index cfee576..5ebfa5a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-11-12 14:26+0100\n" +"PO-Revision-Date: 2010-11-21 10:10+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -414,11 +414,11 @@ msgstr "Musíte zvolit alespoň jedno pole, které chcete zobrazit" #: db_qbe.php:182 msgid "Switch to" -msgstr "" +msgstr "Přepnou na" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "vizuální návrhář" #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 @@ -612,8 +612,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1940 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -835,8 +835,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1107,7 +1107,7 @@ msgstr "Zvolte která pole zobrazit" #: js/messages.php:98 msgid "Add an option for column " -msgstr "" +msgstr "Přidat paramer pro sloupec" #: js/messages.php:101 msgid "Generate password" @@ -1593,8 +1593,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -2876,14 +2876,14 @@ msgid "Changes tracking" msgstr "Sledování změn" #: libraries/config/messages.inc.php:202 -#, fuzzy #| msgid "" #| "Tracking of changes made in database. Requires configured PMA database." msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" -"Sledování změn provedených v databazí. Vyžaduje nastavenou databázi PMA." +"Sledování změn provedených v databazí. Vyžaduje nastavené úložiště nastavení " +"phpMyAdmina." #: libraries/config/messages.inc.php:203 msgid "Customize export options" @@ -4513,8 +4513,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6433,8 +6433,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6475,8 +6475,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -6908,10 +6908,9 @@ msgid "Import/Export coordinates for PDF schema" msgstr "Import/Export souřadnic pro PDF schéma" #: pmd_general.php:122 -#, fuzzy #| msgid "Submit Query" msgid "Build Query" -msgstr "Provést dotaz" +msgstr "Vytvořit dotaz" #: pmd_general.php:127 msgid "Move Menu" @@ -6934,42 +6933,36 @@ msgid "Delete relation" msgstr "Odstranit relaci" #: pmd_general.php:462 pmd_general.php:521 -#, fuzzy #| msgid "Relation deleted" msgid "Relation operator" -msgstr "Relace smazána" +msgstr "Relační operátor" #: pmd_general.php:472 pmd_general.php:531 pmd_general.php:654 #: pmd_general.php:771 -#, fuzzy #| msgid "Export" msgid "Except" -msgstr "Export" +msgstr "Kromě" #: pmd_general.php:478 pmd_general.php:537 pmd_general.php:660 #: pmd_general.php:777 -#, fuzzy #| msgid "in query" msgid "subquery" -msgstr "v dotazu" +msgstr "poddotaz" #: pmd_general.php:482 pmd_general.php:578 -#, fuzzy #| msgid "Rename view to" msgid "Rename to" -msgstr "Přejmenovat pohled na" +msgstr "Přejmenovat na" #: pmd_general.php:484 pmd_general.php:583 -#, fuzzy #| msgid "User name" msgid "New name" -msgstr "Jméno uživatele" +msgstr "Nové jméno" #: pmd_general.php:487 pmd_general.php:702 -#, fuzzy #| msgid "Create" msgid "Aggregate" -msgstr "Vytvořit" +msgstr "Sloučit" #: pmd_general.php:489 pmd_general.php:509 pmd_general.php:631 #: pmd_general.php:644 pmd_general.php:707 pmd_general.php:761 @@ -6978,10 +6971,9 @@ msgid "Operator" msgstr "Operátor" #: pmd_general.php:812 -#, fuzzy #| msgid "Table options" msgid "Active options" -msgstr "Parametry tabulky" +msgstr "Zapnuté parametry" #: pmd_help.php:26 msgid "To select relation, click :" @@ -7094,8 +7086,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7547,8 +7539,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9025,8 +9017,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." diff --git a/po/fr.po b/po/fr.po index fa00e68..d1804dc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-11-19 13:02+0200\n" +"PO-Revision-Date: 2010-11-20 14:21+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "MIME-Version: 1.0\n" @@ -336,7 +336,7 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"Le stockage des configurations phpMyAdmin a été désactivé. Pour une analyse " +"Le stockage de configurations phpMyAdmin a été désactivé. Pour une analyse " "du problème, cliquez %sici%s." #: db_operations.php:581 @@ -2879,7 +2879,7 @@ msgstr "Entrez les paramètres de connexion au serveur" #: libraries/config/messages.inc.php:199 msgid "Configuration storage" -msgstr "Stockage de configuration" +msgstr "Stockage de configurations" #: libraries/config/messages.inc.php:200 msgid "" @@ -2887,24 +2887,23 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" -"Configurez le stockage de configuration phpMyAdmin pour activer des " -"fonctionnalités additionnelles, voir [a(a)Documentation.html#linked-tables]" -"phpMyAdmin configuration storage[/a] dans la documentation" +"Configurez le stockage de configurations phpMyAdmin pour activer des " +"fonctionnalités additionnelles, voir [a(a)Documentation.html#linked-" +"tables]phpMyAdmin configuration storage[/a] dans la documentation" #: libraries/config/messages.inc.php:201 msgid "Changes tracking" msgstr "Suivi des changements" #: libraries/config/messages.inc.php:202 -#, fuzzy #| msgid "" #| "Tracking of changes made in database. Requires configured PMA database." msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" -"Suivi des changements faits dans la base de données. Requiert de configurer " -"les fonctions avancées (pmadb)." +"Suivi des changements faits dans la base de données. Requiert le stockage de " +"configurations phpMyAdmin." #: libraries/config/messages.inc.php:203 msgid "Customize export options" @@ -3402,11 +3401,11 @@ msgid "" "configuration storage could not be found" msgstr "" "Désactiver l'avertissement affiché sur la page Structure de bases de données " -"si l'une des tables du stockage de configuration phpMyAdmin est manquante" +"si l'une des tables du stockage de configurations phpMyAdmin est manquante" #: libraries/config/messages.inc.php:325 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "Tables manquantes pour le stockage de configuration phpMyAdmin" +msgstr "Tables manquantes pour le stockage de configurations phpMyAdmin" #: libraries/config/messages.inc.php:327 msgid "Iconic table operations" @@ -3427,7 +3426,7 @@ msgid "" "(lost by window close)." msgstr "" "Activer si vous désirez un historique permanent (nécessite le stockage de " -"configuration phpMyAdmin. Si désactivé, utilise Javascript pour afficher un " +"configurations phpMyAdmin. Si désactivé, utilise Javascript pour afficher un " "historique temporaire (sera perdu à la fermeture de la fenêtre)." #: libraries/config/messages.inc.php:331 @@ -6714,7 +6713,7 @@ msgid "" "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" "Vos préférences seront sauvegardées pour la session courante seulement. Un " -"stockage permanent requiert l'installation de %sstockage de configuration " +"stockage permanent requiert l'installation de %sstockage de configurations " "phpMyAdmin%s." #: libraries/user_preferences.lib.php:141 @@ -6880,7 +6879,7 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." msgstr "" -"Le stockage des configurations phpMyAdmin n'est pas complètement configuré, " +"Le stockage de configurations phpMyAdmin n'est pas complètement configuré, " "certaines fonctionnalités ont été désactivée. Pour en connaître la raison, " "cliquez %sici%s." diff --git a/po/lt.po b/po/lt.po index 244ccf1..a677535 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-20 07:34-0500\n" -"PO-Revision-Date: 2010-11-17 21:02+0200\n" +"PO-Revision-Date: 2010-11-19 21:31+0200\n" "Last-Translator: <edgaras.janusauskas(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" +"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: lt\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" "100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" @@ -450,7 +450,7 @@ msgstr "Įterpiant" #: db_qbe.php:376 db_qbe.php:458 db_qbe.php:543 db_qbe.php:574 msgid "And" -msgstr "IR" +msgstr "Ir" #: db_qbe.php:385 db_qbe.php:466 db_qbe.php:548 db_qbe.php:579 msgid "Del" @@ -930,7 +930,7 @@ msgstr "„DROP DATABASE“ komandos įvykdyti negalima." #: js/messages.php:30 libraries/mult_submits.inc.php:258 sql.php:254 msgid "Do you really want to " -msgstr "Ar TIKRAI norite " +msgstr "Ar tikrai norite " #: js/messages.php:31 libraries/mult_submits.inc.php:258 sql.php:239 msgid "You are about to DESTROY a complete database!" @@ -998,7 +998,6 @@ msgid "Create User" msgstr "Sukurti naudotoją" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" msgstr "Perkraunamos privilegijos" @@ -1072,16 +1071,14 @@ msgid "Searching" msgstr "Ieškoma" #: js/messages.php:84 -#, fuzzy #| msgid "SQL Query box" msgid "Hide query box" -msgstr "SQL užklausos langelis" +msgstr "Slėpti užklausos laukelį" #: js/messages.php:85 -#, fuzzy #| msgid "SQL Query box" msgid "Show query box" -msgstr "SQL užklausos langelis" +msgstr "Rodyti užklausos laukelį" #: js/messages.php:86 msgid "Inline Edit" @@ -1094,7 +1091,7 @@ msgstr "Ignoruoti" #: js/messages.php:92 msgid "Select referenced key" -msgstr "" +msgstr "Pasirinkite siejamą raktą" #: js/messages.php:93 msgid "Select Foreign Key" @@ -1121,7 +1118,6 @@ msgid "Generate" msgstr "Generuoti" #: js/messages.php:103 -#, fuzzy #| msgid "Change password" msgid "Change Password" msgstr "Pakeisti slaptažodį" @@ -1293,107 +1289,98 @@ msgstr "Šeštadienis" #. l10n: Short week day name #: js/messages.php:175 libraries/common.lib.php:1570 msgid "Sun" -msgstr "Sekmadienis" +msgstr "Sek" #. l10n: Short week day name #: js/messages.php:177 libraries/common.lib.php:1572 msgid "Mon" -msgstr "Pirmadienis" +msgstr "Pir" #. l10n: Short week day name #: js/messages.php:179 libraries/common.lib.php:1574 msgid "Tue" -msgstr "Antradienis" +msgstr "Ant" #. l10n: Short week day name #: js/messages.php:181 libraries/common.lib.php:1576 msgid "Wed" -msgstr "Trečiadienis" +msgstr "Tre" #. l10n: Short week day name #: js/messages.php:183 libraries/common.lib.php:1578 msgid "Thu" -msgstr "Ketvirtadienis" +msgstr "Ket" #. l10n: Short week day name #: js/messages.php:185 libraries/common.lib.php:1580 msgid "Fri" -msgstr "Penktadienis" +msgstr "Pen" #. l10n: Short week day name #: js/messages.php:187 libraries/common.lib.php:1582 msgid "Sat" -msgstr "Šeštadienis" +msgstr "Šeš" #. l10n: Minimal week day name #: js/messages.php:191 -#, fuzzy #| msgid "Sun" msgid "Su" -msgstr "Sekmadienis" +msgstr "Sk" #. l10n: Minimal week day name #: js/messages.php:193 -#, fuzzy #| msgid "Mon" msgid "Mo" -msgstr "Pirmadienis" +msgstr "Pr" #. l10n: Minimal week day name #: js/messages.php:195 -#, fuzzy #| msgid "Tue" msgid "Tu" -msgstr "Antradienis" +msgstr "An" #. l10n: Minimal week day name #: js/messages.php:197 -#, fuzzy #| msgid "Wed" msgid "We" -msgstr "Trečiadienis" +msgstr "Tr" #. l10n: Minimal week day name #: js/messages.php:199 -#, fuzzy #| msgid "Thu" msgid "Th" -msgstr "Ketvirtadienis" +msgstr "Kt" #. l10n: Minimal week day name #: js/messages.php:201 -#, fuzzy #| msgid "Fri" msgid "Fr" -msgstr "Penktadienis" +msgstr "Pn" #. l10n: Minimal week day name #: js/messages.php:203 -#, fuzzy #| msgid "Sat" msgid "Sa" -msgstr "Šeštadienis" +msgstr "Št" #. l10n: Column header for week of the year in calendar #: js/messages.php:205 -#, fuzzy #| msgid "Wiki" msgid "Wk" -msgstr "Wiki" +msgstr "Sav." #: js/messages.php:207 msgid "Hour" -msgstr "valanda" +msgstr "Valanda" #: js/messages.php:208 msgid "Minute" -msgstr "minutė" +msgstr "Minutė" #: js/messages.php:209 -#, fuzzy #| msgid "per second" msgid "Second" -msgstr "per sekundę" +msgstr "Sekundės" #: libraries/Config.class.php:1190 tbl_chart.php:159 msgid "Font size" @@ -1682,8 +1669,8 @@ msgstr "" #, php-format msgid "No activity within %s seconds; please log in again" msgstr "" -"Daugiau nei %s sekundžių nebuvo atlikta jokių veiksmų. Prašau prisijungti iš " -"naujo." +"Daugiau nei %s sekundžių nebuvo atlikta jokių veiksmų, prašome prisijungti " +"iš naujo" #: libraries/auth/cookie.auth.lib.php:653 #: libraries/auth/cookie.auth.lib.php:655 @@ -1914,10 +1901,9 @@ msgid "MySQL said: " msgstr "MySQL atsakymas: " #: libraries/common.lib.php:1078 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "Nepavyko prisijungti prie MySQL serverio" +msgstr "Nepavyko prisijungti prie SQL tikrintuvo!" #: libraries/common.lib.php:1119 libraries/config/messages.inc.php:459 msgid "Explain SQL" @@ -2191,7 +2177,7 @@ msgstr "eksportavimas neveiks, nerasta funkcija (%s)" #: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL tikrintuvas išjungtas" #: libraries/config/FormDisplay.class.php:764 msgid "SOAP extension not found" @@ -2240,12 +2226,11 @@ msgid "Reset" msgstr "Atstatyti į pradinę būseną" #: libraries/config/messages.inc.php:17 -#, fuzzy msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" "Jeigu įjungta naudotojas gali įvesti bet kokį MySQL serverį prisijungimo " -"formoje slapukų identifikavime" +"formoje su slapukų autentifikacija" #: libraries/config/messages.inc.php:18 msgid "Allow login to any MySQL server" @@ -2325,19 +2310,19 @@ msgstr "CHAR stulpelių redagavimas" #: libraries/config/messages.inc.php:32 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Stulpelių skaičius CHAR/VARCHAR tekstiniuose laukeliuose" #: libraries/config/messages.inc.php:33 msgid "CHAR textarea columns" -msgstr "" +msgstr "CHAR tekstinio laukelio stulpelių skaičius" #: libraries/config/messages.inc.php:34 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Eilučių skaičius CHAR/VARCHAR tekstiniuose laukeliuose" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea rows" -msgstr "" +msgstr "CHAR tekstinio laukelio eilučių skaičius" #: libraries/config/messages.inc.php:36 msgid "Check config file permissions" @@ -2353,7 +2338,7 @@ msgstr "" #: libraries/config/messages.inc.php:38 msgid "Compress on the fly" -msgstr "" +msgstr "Glaudinti" #: libraries/config/messages.inc.php:39 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:153 @@ -2385,6 +2370,8 @@ msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] arba skaičius, kuris nurodo " +"maksimalų skaičių, kada naudojamas vertikalusis režimas" #: libraries/config/messages.inc.php:45 msgid "Display direction for altering/creating columns" @@ -2509,15 +2496,14 @@ msgstr "Stulpelių pavadinimus įrašyti pirmame įraše (eilutėje)" #: libraries/config/messages.inc.php:243 libraries/import/csv.php:73 #: libraries/import/ldi.php:41 msgid "Columns enclosed by" -msgstr "Laukų reikšmės apskliaustos" +msgstr "Stulpeliai apskliausti" #: libraries/config/messages.inc.php:72 libraries/config/messages.inc.php:237 #: libraries/config/messages.inc.php:244 libraries/import/csv.php:77 #: libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" -msgstr "Laukų reikšmės baigiasi simboliu" +msgstr "Prieš stulpelių spec. simbolius" #: libraries/config/messages.inc.php:73 libraries/config/messages.inc.php:79 #: libraries/config/messages.inc.php:86 libraries/config/messages.inc.php:95 @@ -2632,7 +2618,6 @@ msgid "Creation/Update/Check dates" msgstr "Sukūrimo/atnaujinimo/tikrinimo datos" #: libraries/config/messages.inc.php:120 -#, fuzzy msgid "Use delayed inserts" msgstr "Naudoti užlaikytus įterpimus" @@ -2645,9 +2630,8 @@ msgid "Use hexadecimal for BLOB" msgstr "Naudoti šešioliktainę BLOB'ui" #: libraries/config/messages.inc.php:126 -#, fuzzy msgid "Use ignore inserts" -msgstr "Naudoti užlaikytus įterpimus" +msgstr "Naudoti ignoruojamuosius įterpimus" #: libraries/config/messages.inc.php:128 libraries/export/sql.php:163 msgid "Maximal length of created query" @@ -2812,10 +2796,9 @@ msgid "Microsoft Office" msgstr "Microsoft Office" #: libraries/config/messages.inc.php:183 -#, fuzzy #| msgid "Open Document Text" msgid "Open Document" -msgstr "Open Document rašyklė" +msgstr "Open Document" #: libraries/config/messages.inc.php:185 msgid "Other core settings" @@ -2947,10 +2930,9 @@ msgid "SQL queries settings" msgstr "SQL užklausų nustatymai" #: libraries/config/messages.inc.php:215 -#, fuzzy #| msgid "SQL history" msgid "SQL Validator" -msgstr "SQL užklausų istorija" +msgstr "SQL tikrintuvas" #: libraries/config/messages.inc.php:216 msgid "" @@ -2986,7 +2968,7 @@ msgstr "Adaptuoti teksto įvedimo laukelius" #: libraries/config/messages.inc.php:223 libraries/export/texytext.php:17 msgid "Texy! text" -msgstr "" +msgstr "Texy! tekstas" #: libraries/config/messages.inc.php:225 msgid "Warnings" @@ -3076,17 +3058,14 @@ msgid "Do not import empty rows" msgstr "Neimportuoti tuščių eilučių (įrašų)" #: libraries/config/messages.inc.php:251 -#, fuzzy #| msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>" msgid "Import currencies ($5.00 to 5.00)" -msgstr "Importuoti valiutas <i>(pavyzdžiui. $5.00 į 5.00)</i>" +msgstr "Importuoti valiutas ($5.00 kaip 5.00)" #: libraries/config/messages.inc.php:252 -#, fuzzy #| msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>" msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" -"Importuoti procentus kaip dešimtainius <i>(pavyzdžiui. 12.00% į .12)</i>" +msgstr "Importuoti procentus kaip dešimtainius (12.00% kaip .12)" #: libraries/config/messages.inc.php:253 #, fuzzy @@ -3099,10 +3078,9 @@ msgid "Partial import: skip queries" msgstr "Dalinis importas: praleisti užklausas" #: libraries/config/messages.inc.php:256 -#, fuzzy #| msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "Nenaudokite <code>AUTO_INCREMENT</code> nulinėms reikšmėms" +msgstr "Nenaudoti AUTO_INCREMENT nulinėms reikšmėms" #: libraries/config/messages.inc.php:259 msgid "Initial state for sliders" @@ -6269,7 +6247,7 @@ msgstr "Peržiūra" #: libraries/sql_query_form.lib.php:487 prefs_manage.php:241 msgid "Location of the text file" -msgstr "Tekstiniai SQL užklausų failai" +msgstr "Tekstinio failo vieta" #: libraries/sql_query_form.lib.php:499 tbl_change.php:928 msgid "web server upload directory" @@ -9116,7 +9094,7 @@ msgstr "" #: tbl_change.php:1112 #, php-format msgid "Continue insertion with %s rows" -msgstr "" +msgstr "Tęstį įterpimą su %s eilučių" #: tbl_chart.php:56 msgid "Chart generated successfully." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10976-g18f6882
by Marc Delisle 20 Nov '10

20 Nov '10

The branch, master has been updated via 18f6882f89d0f5327e358a7bcdb61fb847aea2ff (commit) from 72121200042ff2f1fbca11c941e9ff98aabe1c46 (commit) - Log ----------------------------------------------------------------- commit 18f6882f89d0f5327e358a7bcdb61fb847aea2ff Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 07:43:06 2010 -0500 do not show visual builder anchor if js is not enabled ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 2 +- js/functions.js | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index d2df637..f4f4e85 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -177,7 +177,7 @@ function showColumnSelectCell($columns, $column_number, $selected = '') $tab['link'] .= $tab['fragment']; } ?> -<div class="notice"> +<div id="visual_builder_anchor" class="notice hide"> <span id="footnote_1"> <?php echo __('Switch to'); ?> <form action="<?php echo $tab_designer['link'] ?>" method="post"> diff --git a/js/functions.js b/js/functions.js index 01db2e6..d29c421 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2392,15 +2392,21 @@ $(document).ready(function() { ); }) // end of $(document).ready() for vertical pointer -/** - * Vertical marker - */ $(document).ready(function() { + /** + * Vertical marker + */ $('.vmarker').live('click', function(e) { var $this_td = $(this); var row_num = PMA_getRowNumber($this_td.attr('class')); // for all td of the same vertical row, toggle the marked class $('.vmarker').filter('.row_' + row_num).toggleClass('marked'); }); -}) // end of $(document).ready() for vertical marker + + /** + * Reveal visual builder anchor + */ + + $('#visual_builder_anchor').show(); +}) // end of $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10975-g7212120
by Marc Delisle 20 Nov '10

20 Nov '10

The branch, master has been updated via 72121200042ff2f1fbca11c941e9ff98aabe1c46 (commit) from 13fe8b98e2cca49f099642ae01dff09db9a2fe3a (commit) - Log ----------------------------------------------------------------- commit 72121200042ff2f1fbca11c941e9ff98aabe1c46 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 07:34:27 2010 -0500 refresh .po files ----------------------------------------------------------------------- Summary of changes: po/af.po | 10 +++++++++- po/ar.po | 10 +++++++++- po/az.po | 10 +++++++++- po/be.po | 10 +++++++++- po/be(a)latin.po | 10 +++++++++- po/bg.po | 10 +++++++++- po/bn.po | 10 +++++++++- po/bs.po | 10 +++++++++- po/ca.po | 10 +++++++++- po/cs.po | 10 +++++++++- po/cy.po | 10 +++++++++- po/da.po | 10 +++++++++- po/de.po | 10 +++++++++- po/el.po | 10 +++++++++- po/en_GB.po | 10 +++++++++- po/es.po | 10 +++++++++- po/et.po | 10 +++++++++- po/eu.po | 10 +++++++++- po/fa.po | 10 +++++++++- po/fi.po | 10 +++++++++- po/fr.po | 10 +++++++++- po/gl.po | 10 +++++++++- po/he.po | 10 +++++++++- po/hi.po | 10 +++++++++- po/hr.po | 10 +++++++++- po/hu.po | 10 +++++++++- po/id.po | 10 +++++++++- po/it.po | 10 +++++++++- po/ja.po | 10 +++++++++- po/ka.po | 10 +++++++++- po/ko.po | 10 +++++++++- po/lt.po | 10 +++++++++- po/lv.po | 10 +++++++++- po/mk.po | 10 +++++++++- po/mn.po | 10 +++++++++- po/ms.po | 10 +++++++++- po/nb.po | 10 +++++++++- po/nl.po | 10 +++++++++- po/phpmyadmin.pot | 10 +++++++++- po/pl.po | 10 +++++++++- po/pt.po | 10 +++++++++- po/pt_BR.po | 10 +++++++++- po/ro.po | 10 +++++++++- po/ru.po | 10 +++++++++- po/si.po | 10 +++++++++- po/sk.po | 10 +++++++++- po/sl.po | 10 +++++++++- po/sq.po | 10 +++++++++- po/sr.po | 10 +++++++++- po/sr(a)latin.po | 10 +++++++++- po/sv.po | 10 +++++++++- po/ta.po | 10 +++++++++- po/te.po | 10 +++++++++- po/th.po | 10 +++++++++- po/tr.po | 10 +++++++++- po/tt.po | 10 +++++++++- po/ug.po | 10 +++++++++- po/uk.po | 10 +++++++++- po/ur.po | 10 +++++++++- po/uz.po | 10 +++++++++- po/uz(a)latin.po | 10 +++++++++- po/zh_CN.po | 10 +++++++++- po/zh_TW.po | 10 +++++++++- 63 files changed, 567 insertions(+), 63 deletions(-) diff --git a/po/af.po b/po/af.po index 8737aa6..50c1a49 100644 --- a/po/af.po +++ b/po/af.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: afrikaans <af(a)li.org>\n" @@ -422,6 +422,14 @@ msgstr "Jou SQL-navraag is suksesvol uitgevoer" msgid "You have to choose at least one column to display" msgstr "Jy moet ten minste een Kolom kies om te vertoon" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ar.po b/po/ar.po index 74abf57..4d085fe 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-05-29 14:16+0200\n" "Last-Translator: Ahmed <aa.mahdawy.10(a)gmail.com>\n" "Language-Team: arabic <ar(a)li.org>\n" @@ -420,6 +420,14 @@ msgstr "الخاص بك تم تنفيذه بنجاح SQL-استعلام" msgid "You have to choose at least one column to display" msgstr "عليك اختيار عمود واحد على الأقل للعرض" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/az.po b/po/az.po index 44cc984..9d37402 100644 --- a/po/az.po +++ b/po/az.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" @@ -419,6 +419,14 @@ msgstr "SQL sorğunuz müveffeqiyyetle icra edilmişdir" msgid "You have to choose at least one column to display" msgstr "Gösterilmesi üçün en az bir sütun seçmelisiniz" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/be.po b/po/be.po index 9a7c40b..06d3a5c 100644 --- a/po/be.po +++ b/po/be.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic <be(a)li.org>\n" @@ -420,6 +420,14 @@ msgstr "Ваш SQL-запыт быў пасьпяхова выкананы" msgid "You have to choose at least one column to display" msgstr "Вам неабходна выбраць прынамсі адну калёнку для адлюстраваньня" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 13dffcf..b68f0b4 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: belarusian_latin <be@latin@li.org>\n" @@ -424,6 +424,14 @@ msgstr "Vaš SQL-zapyt byŭ paśpiachova vykanany" msgid "You have to choose at least one column to display" msgstr "Vam nieabchodna vybrać prynamsi adnu kalonku dla adlustravańnia" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/bg.po b/po/bg.po index 57be1f5..2d57f5b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-06-11 17:28+0200\n" "Last-Translator: <stanprog(a)stanprog.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" @@ -419,6 +419,14 @@ msgstr "SQL заявката беше изпълнена успешно" msgid "You have to choose at least one column to display" msgstr "Трябва да изберете поне една Колона за показване" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/bn.po b/po/bn.po index cb53d60..1c3479d 100644 --- a/po/bn.po +++ b/po/bn.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" "Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n" "Language-Team: bangla <bn(a)li.org>\n" @@ -419,6 +419,14 @@ msgstr "Your SQL query has been executed successfully" msgid "You have to choose at least one column to display" msgstr "আপনাকে প্রদর্শন করার জন্য কমপক্ষে একটি কলাম নির্দিষ্ট করতে হবে" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/bs.po b/po/bs.po index 20b7483..9bdaa9f 100644 --- a/po/bs.po +++ b/po/bs.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "Vaš SQL upit je uspešno izvršen" msgid "You have to choose at least one column to display" msgstr "Morate izabrati bar jednu kolonu za prikaz" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ca.po b/po/ca.po index eb3a930..7507218 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: catalan <ca(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "La vostra comanda SQL ha estat executada amb èxit" msgid "You have to choose at least one column to display" msgstr "Has de triar al menys una columna per mostrar" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/cs.po b/po/cs.po index 1349d63..cfee576 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-12 14:26+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" @@ -412,6 +412,14 @@ msgstr "Váš SQL-dotaz byl úspěšně vykonán" msgid "You have to choose at least one column to display" msgstr "Musíte zvolit alespoň jedno pole, které chcete zobrazit" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/cy.po b/po/cy.po index 8d83e75..354d2d6 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" "Last-Translator: <ardavies(a)tiscali.co.uk>\n" "Language-Team: Welsh <cy(a)li.org>\n" @@ -422,6 +422,14 @@ msgstr "Cafodd eich ymholiad SQL ei gweithredu'n llwyddiannus" msgid "You have to choose at least one column to display" msgstr "Mae'n rhaid dewis o leiaf un golofn i'w dangos" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/da.po b/po/da.po index 6b6d7d8..8031dcc 100644 --- a/po/da.po +++ b/po/da.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-21 14:55+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: danish <da(a)li.org>\n" @@ -422,6 +422,14 @@ msgstr "Din SQL-forespørgsel blev udført korrekt" msgid "You have to choose at least one column to display" msgstr "Du skal vælge mindst en kolonne der skal vises" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/de.po b/po/de.po index 9bde3f0..7ed8e62 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-09-16 12:10+0200\n" "Last-Translator: <sven-cihar.com(a)incase.de>\n" "Language-Team: german <de(a)li.org>\n" @@ -410,6 +410,14 @@ msgstr "Ihr SQL-Befehl wurde erfolgreich ausgeführt." msgid "You have to choose at least one column to display" msgstr "Bitte wählen Sie mindestens eine anzuzeigende Spalte" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/el.po b/po/el.po index a02187d..8a4e4e2 100644 --- a/po/el.po +++ b/po/el.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-09-06 11:51+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" @@ -413,6 +413,14 @@ msgstr "Η SQL εντολή σας εκτελέσθηκε επιτυχώς" msgid "You have to choose at least one column to display" msgstr "Πρέπει να επιλέξετε τουλάχιστον μία στήλη για εμφάνιση" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/en_GB.po b/po/en_GB.po index 1cc42fd..32ec713 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-19 13:06+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" @@ -408,6 +408,14 @@ msgstr "Your SQL query has been executed successfully" msgid "You have to choose at least one column to display" msgstr "You have to choose at least one column to display" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/es.po b/po/es.po index 5ec00fe..a695771 100644 --- a/po/es.po +++ b/po/es.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 11:23+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: spanish <es(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "Su consulta se ejecutó con éxito" msgid "You have to choose at least one column to display" msgstr "Debe elegir al menos una columna para mostrar" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/et.po b/po/et.po index 8b19b8f..bee3b5a 100644 --- a/po/et.po +++ b/po/et.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" @@ -418,6 +418,14 @@ msgstr "Teie SQL päring täideti edukalt" msgid "You have to choose at least one column to display" msgstr "Te peate valima vähemalt ühe veeru kuvamiseks" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/eu.po b/po/eu.po index 821ed63..c9f7ca3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: basque <eu(a)li.org>\n" @@ -422,6 +422,14 @@ msgstr "Zure SQL-kontsula arrakastaz burutu da" msgid "You have to choose at least one column to display" msgstr "Gutxienez bistaratzeko Zutabe bat hautatu duzu." +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/fa.po b/po/fa.po index 62c9671..00e0211 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" "Last-Translator: <ahmad_usa2007(a)yahoo.com>\n" "Language-Team: persian <fa(a)li.org>\n" @@ -419,6 +419,14 @@ msgstr "پرس و جوي SQL شما با موفقيت اجرا گرديد" msgid "You have to choose at least one column to display" msgstr "شما حذاقل بايد يك ستون را براي نمايش انتخاب نماييد" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/fi.po b/po/fi.po index 10c7a4e..2741814 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-04-30 18:08+0200\n" "Last-Translator: <kajouni(a)gmail.com>\n" "Language-Team: finnish <fi(a)li.org>\n" @@ -422,6 +422,14 @@ msgstr "SQL-kyselyn suoritus onnistui" msgid "You have to choose at least one column to display" msgstr "Valitse vähintään yksi sarake" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/fr.po b/po/fr.po index bde444e..fa00e68 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-19 13:02+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" @@ -409,6 +409,14 @@ msgstr "Votre requête SQL a été exécutée avec succès" msgid "You have to choose at least one column to display" msgstr "Vous devez choisir au moins une colonne à afficher" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/gl.po b/po/gl.po index 544be57..f797b59 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: galician <gl(a)li.org>\n" @@ -423,6 +423,14 @@ msgstr "A seu orde de SQL executouse sen problemas" msgid "You have to choose at least one column to display" msgstr "Ten que escoller polo menos unha columna para mostrar" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/he.po b/po/he.po index 438b4ce..a1084eb 100644 --- a/po/he.po +++ b/po/he.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hebrew <he(a)li.org>\n" @@ -414,6 +414,14 @@ msgstr "שאילתת SQL שלך בוצעה בהצלחה" msgid "You have to choose at least one column to display" msgstr "עליך לבחור לפחות עמודה אחת לתצוגה" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/hi.po b/po/hi.po index 2b0f20e..ff3c011 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-05-21 05:48+0200\n" "Last-Translator: <u4663530(a)anu.edu.au>\n" "Language-Team: hindi <hi(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "आपकी SQL कुएरी सफलता के साथ पू msgid "You have to choose at least one column to display" msgstr "आपको कम से कम एक स्तंभ प्रदर्शित करने के लिए चयन करना है." +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/hr.po b/po/hr.po index 89a554a..e6797f1 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: croatian <hr(a)li.org>\n" @@ -422,6 +422,14 @@ msgstr "Vaš SQL upit uspješno je izvršen" msgid "You have to choose at least one column to display" msgstr "Morate odabrati najmanje jedan stupac za prikazivanje" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/hu.po b/po/hu.po index 8c7851c..a18940d 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-09-14 20:45+0200\n" "Last-Translator: KAMI <kami911(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "Az SQL-lekérdezés végrehajtása sikerült" msgid "You have to choose at least one column to display" msgstr "Ki kell legalább egy megjelenítendő oszlopot választania" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/id.po b/po/id.po index 49eb8f3..afe9ca3 100644 --- a/po/id.po +++ b/po/id.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-09-16 05:35+0200\n" "Last-Translator: Azhari Harahap <azhari.harahap(a)yahoo.com>\n" "Language-Team: indonesian <id(a)li.org>\n" @@ -418,6 +418,14 @@ msgstr "Sukses menjalankan perintah SQL" msgid "You have to choose at least one column to display" msgstr "Sekurang-kurangnya satu kolom harus dipilih untuk ditampilkan" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/it.po b/po/it.po index fffdbd8..6af8910 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-09-24 10:00+0200\n" "Last-Translator: Giovanni Uccio <giovanni.uccio(a)gmail.com>\n" "Language-Team: italian <it(a)li.org>\n" @@ -410,6 +410,14 @@ msgstr "La query è stata eseguita con successo" msgid "You have to choose at least one column to display" msgstr "Devi scegliere almeno una Colonna da mostrare" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ja.po b/po/ja.po index e824be1..d63e971 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 11:22+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: japanese <jp(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "SQL は正常に実行されました" msgid "You have to choose at least one column to display" msgstr "最低ひとつは表示するカラムを選択してください" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ka.po b/po/ka.po index 7e47e62..753bc5f 100644 --- a/po/ka.po +++ b/po/ka.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" @@ -420,6 +420,14 @@ msgstr "Your SQL query has been executed successfully" msgid "You have to choose at least one column to display" msgstr "You have to choose at least one column to display" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ko.po b/po/ko.po index f49c601..5adb8fa 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" "Last-Translator: <cihar(a)nvyu.net>\n" "Language-Team: korean <ko(a)li.org>\n" @@ -414,6 +414,14 @@ msgstr "SQL 질의가 바르게 실행되었습니다." msgid "You have to choose at least one column to display" msgstr "출력하려면 적어도 1개 이상의 열(칼럼)을 선택해야 합니다." +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/lt.po b/po/lt.po index f6144e7..244ccf1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-17 21:02+0200\n" "Last-Translator: <edgaras.janusauskas(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" @@ -408,6 +408,14 @@ msgstr "Jūsų SQL užklausa sėkmingai įvykdyta" msgid "You have to choose at least one column to display" msgstr "Pasirinkite bent vieną stulpelį išvedimui" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/lv.po b/po/lv.po index ebd32e2..744e254 100644 --- a/po/lv.po +++ b/po/lv.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" @@ -418,6 +418,14 @@ msgstr "Jūsu SQL vaicājums tika veiksmīgi izpildīts" msgid "You have to choose at least one column to display" msgstr "Izvēlieties vismaz vienu kolonnu attēlošanai" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/mk.po b/po/mk.po index e7ea405..f99e7ff 100644 --- a/po/mk.po +++ b/po/mk.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: macedonian_cyrillic <mk(a)li.org>\n" @@ -418,6 +418,14 @@ msgstr "Вашиот SQL упит успешно е извршен" msgid "You have to choose at least one column to display" msgstr "Морате да изберете барем една колона за приказ" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/mn.po b/po/mn.po index 1c1463f..6ab3180 100644 --- a/po/mn.po +++ b/po/mn.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" @@ -418,6 +418,14 @@ msgstr "Таны SQL-асуулт амжилттай ажиллав" msgid "You have to choose at least one column to display" msgstr "Харуулахын тулд ядаж нэг багана сонго" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ms.po b/po/ms.po index 236dc09..affd679 100644 --- a/po/ms.po +++ b/po/ms.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" @@ -420,6 +420,14 @@ msgstr "Kueri-SQL anda telah dilaksanakan dengan jaya" msgid "You have to choose at least one column to display" msgstr "Anda mesti pilih sekurang-kurangnya satu Kolum untuk dipapar" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/nb.po b/po/nb.po index ca2225f..bd11e46 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-09-15 13:26+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" @@ -406,6 +406,14 @@ msgstr "Kommandoen/spørringen er utført" msgid "You have to choose at least one column to display" msgstr "Du må velge minst en kolonne for visning" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/nl.po b/po/nl.po index f1941a6..5c78748 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-08-27 12:34+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" @@ -420,6 +420,14 @@ msgstr "Uw SQL-query is succesvol uitgevoerd." msgid "You have to choose at least one column to display" msgstr "Er moet ten minste 1 weer te geven kolom worden gekozen" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index 06cdb76..f118231 100644 --- a/po/phpmyadmin.pot +++ b/po/phpmyadmin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -406,6 +406,14 @@ msgstr "" msgid "You have to choose at least one column to display" msgstr "" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/pl.po b/po/pl.po index 25e46e3..b23d373 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-09-27 23:53+0200\n" "Last-Translator: Jarosław Głowacki <glowacki(a)europa.pl>\n" "Language-Team: polish <pl(a)li.org>\n" @@ -419,6 +419,14 @@ msgstr "Zapytanie SQL zostało wykonane pomyślnie" msgid "You have to choose at least one column to display" msgstr "Należy wybrać przynajmniej jedną kolumnę do wyświetlenia" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/pt.po b/po/pt.po index 1b4cbf5..3e85f0f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:23+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: portuguese <pt(a)li.org>\n" @@ -420,6 +420,14 @@ msgstr "O seu comando SQL foi executado com sucesso" msgid "You have to choose at least one column to display" msgstr "Tem que escolher pelo menos uma coluna para mostrar" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/pt_BR.po b/po/pt_BR.po index fa05316..ab332d4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-10-21 05:02+0200\n" "Last-Translator: <fabiobucior(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" @@ -416,6 +416,14 @@ msgstr "Seu comando SQL foi executado com sucesso" msgid "You have to choose at least one column to display" msgstr "Deve escolher pelo menos uma coluna para exibir" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ro.po b/po/ro.po index dcbda6d..7339dcf 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: romanian <ro(a)li.org>\n" @@ -423,6 +423,14 @@ msgstr "Comanda dumneavoastră SQL a fost executată cu succes" msgid "You have to choose at least one column to display" msgstr "Trebuie să alegeți cel puțin o coloană pentru a putea afișa" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ru.po b/po/ru.po index 974b2d1..e5910d0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:27+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: russian <ru(a)li.org>\n" @@ -425,6 +425,14 @@ msgid "You have to choose at least one column to display" msgstr "" "Для выполнения запроса, должен быть выбран отображаемый столбец/столбцы." +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/si.po b/po/si.po index 12a8686..63ddaba 100644 --- a/po/si.po +++ b/po/si.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: sinhala <si(a)li.org>\n" @@ -419,6 +419,14 @@ msgstr "ඔබගේ SQL විමසුම සාර්ථකව ක්‍ර msgid "You have to choose at least one column to display" msgstr "පෙන්වීම සඳහා අවම වශයෙන් එක් තීරයක්වත් තෝරාගත යුතුයි" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/sk.po b/po/sk.po index c0f9e0f..fcdd1d2 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: slovak <sk(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "SQL dopyt bol úspešne vykonaný" msgid "You have to choose at least one column to display" msgstr "Zvolte prosím aspoň jeden stĺpec, ktorý chcete zobraziť" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/sl.po b/po/sl.po index ebcd4f0..e0019f2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-03 01:25+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" @@ -410,6 +410,14 @@ msgstr "Poizvedba SQL je bila uspešno izvedena" msgid "You have to choose at least one column to display" msgstr "Za prikaz morate izbrati morate vsaj en stolpec" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/sq.po b/po/sq.po index b21c5e7..491a230 100644 --- a/po/sq.po +++ b/po/sq.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: albanian <sq(a)li.org>\n" @@ -419,6 +419,14 @@ msgstr "Query SQL u zbatua me sukses" msgid "You have to choose at least one column to display" msgstr "Zgjidh të paktën një kollonë për të shfaqur" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/sr.po b/po/sr.po index 312a725..062ae89 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-30 23:47+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: serbian_cyrillic <sr(a)li.org>\n" @@ -423,6 +423,14 @@ msgstr "Ваш SQL упит је успешно извршен" msgid "You have to choose at least one column to display" msgstr "Морате изабрати бар једну колону за приказ" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index fab7f6b..f6abc80 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-08-30 19:31+0200\n" "Last-Translator: Vladimir Tošić <vtosic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" @@ -420,6 +420,14 @@ msgstr "Vaš SQL upit je uspešno izvršen" msgid "You have to choose at least one column to display" msgstr "Morate izabrati bar jednu kolonu za prikaz" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/sv.po b/po/sv.po index e5bfde4..c52d94a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-21 14:48+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: swedish <sv(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "Din SQL-fråga utfördes korrekt" msgid "You have to choose at least one column to display" msgstr "Du måste välja minst en kolumn som ska visas" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ta.po b/po/ta.po index da869bd..336b554 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" "Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n" "Language-Team: Tamil <ta(a)li.org>\n" @@ -406,6 +406,14 @@ msgstr "" msgid "You have to choose at least one column to display" msgstr "" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/te.po b/po/te.po index e9e1ec3..a3443a3 100644 --- a/po/te.po +++ b/po/te.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-05-26 14:20+0200\n" "Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" @@ -416,6 +416,14 @@ msgstr "" msgid "You have to choose at least one column to display" msgstr "" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + # మొదటి అనువాదము #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 diff --git a/po/th.po b/po/th.po index e6b89db..965b5e4 100644 --- a/po/th.po +++ b/po/th.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai <th(a)li.org>\n" @@ -417,6 +417,14 @@ msgstr "ทำคำค้นเสร็จเรียบร้อยแล้ msgid "You have to choose at least one column to display" msgstr "ต้องเลือกให้แสดงอย่างน้อยหนึ่งคอลัมน์" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/tr.po b/po/tr.po index b0797dd..cdc00a3 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-15 19:47+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" @@ -407,6 +407,14 @@ msgstr "SQL sorgunuz başarılı olarak çalıştırıldı" msgid "You have to choose at least one column to display" msgstr "Görüntülemek için en az bir sütun seçmelisiniz" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/tt.po b/po/tt.po index ab312ca..430a8db 100644 --- a/po/tt.po +++ b/po/tt.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: tatarish <tt(a)li.org>\n" @@ -418,6 +418,14 @@ msgstr "SQL-sorawıñ uñışlı eşkärtelde" msgid "You have to choose at least one column to display" msgstr "You have to choose at least one Column to display" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ug.po b/po/ug.po index 12890c4..3b9b836 100644 --- a/po/ug.po +++ b/po/ug.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" @@ -411,6 +411,14 @@ msgstr "SQL بۇيرىقى غەلبىلىك بىجىرىلدى" msgid "You have to choose at least one column to display" msgstr "بۇنى بىجىرىش ئۈچۈن مەزمۇن تاللانغان بولۇشى كېرەك" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/uk.po b/po/uk.po index 4584d3e..5a77359 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-27 23:41+0200\n" "Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n" "Language-Team: ukrainian <uk(a)li.org>\n" @@ -415,6 +415,14 @@ msgstr "Ваш SQL-запит було успішно виконано" msgid "You have to choose at least one column to display" msgstr "Необхідно вибрати принаймі один Стовпчик для показу" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/ur.po b/po/ur.po index 917788e..2d81684 100644 --- a/po/ur.po +++ b/po/ur.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-05-14 12:35+0200\n" "Last-Translator: <monymirza(a)gmail.com>\n" "Language-Team: Urdu <ur(a)li.org>\n" @@ -423,6 +423,14 @@ msgstr "Your SQL query has been executed successfully" msgid "You have to choose at least one column to display" msgstr "آپ کو کم از کم ایک کالم چننا ہو گا ڈسپے کیلئے۔" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/uz.po b/po/uz.po index 964f328..873cb2e 100644 --- a/po/uz.po +++ b/po/uz.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_cyrillic <uz(a)li.org>\n" @@ -421,6 +421,14 @@ msgstr "SQL сўрови муваффақиятли бажарилди" msgid "You have to choose at least one column to display" msgstr "Сўровни бажариш учун, майдон/майдонлар танланган бўлиши керак." +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index cd04960..1789c3b 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_latin <uz@latin@li.org>\n" @@ -422,6 +422,14 @@ msgstr "SQL so‘rovi muvaffaqiyatli bajarildi" msgid "You have to choose at least one column to display" msgstr "So‘rovni bajarish uchun, maydon/maydonlar tanlangan bo‘lishi kerak." +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/zh_CN.po b/po/zh_CN.po index ed28d80..42a3346 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-04 05:16+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" @@ -404,6 +404,14 @@ msgstr "您的 SQL 语句已成功运行" msgid "You have to choose at least one column to display" msgstr "您最少要选择显示一列" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6f6d410..2124f89 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2010-11-19 13:22-0500\n" +"POT-Creation-Date: 2010-11-20 07:34-0500\n" "PO-Revision-Date: 2010-11-05 14:13+0200\n" "Last-Translator: <terrytsai123(a)hotmail.com>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" @@ -411,6 +411,14 @@ msgstr "您的SQL語法已順利執行" msgid "You have to choose at least one column to display" msgstr "您需要選擇最少顯示一行欄位" +#: db_qbe.php:182 +msgid "Switch to" +msgstr "" + +#: db_qbe.php:186 +msgid "visual builder" +msgstr "" + #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 msgid "Sort" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10974-g13fe8b9
by Marc Delisle 20 Nov '10

20 Nov '10

The branch, master has been updated via 13fe8b98e2cca49f099642ae01dff09db9a2fe3a (commit) from 04222c416f1df510756f774a9a9841d7b943d671 (commit) - Log ----------------------------------------------------------------- commit 13fe8b98e2cca49f099642ae01dff09db9a2fe3a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Nov 20 07:33:15 2010 -0500 these should be translatable ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index daaba0d..d2df637 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -179,11 +179,11 @@ function showColumnSelectCell($columns, $column_number, $selected = '') ?> <div class="notice"> <span id="footnote_1"> - Switch to +<?php echo __('Switch to'); ?> <form action="<?php echo $tab_designer['link'] ?>" method="post"> <input type="submit" style="background-color:#FFD; border-width:0; color:#00F; font-size: 15px;cursor: pointer" name="query" onmouseover="this.style.color='#F00';" - value="visual builder" onmouseout="this.style.color='#00F'"/></span> + value="<?php echo __('visual builder'); ?>" onmouseout="this.style.color='#00F'"/></span> </form> </div> <form action="db_qbe.php" method="post"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10972-g3b74d9b
by Marc Delisle 19 Nov '10

19 Nov '10

The branch, master has been updated via 3b74d9ba019f6e1904699d5355e5e9c597896dcb (commit) via d09e630af2fff492d6b75fea40da37547eeba63d (commit) via 9dd406c0455089b6a5b285ec73e4f2d675216376 (commit) via e3bb1f875969280e9a2bdf991b21fc808b8eaa55 (commit) via eb83a062bd91c9ed206f27017f49e5042748c310 (commit) via 369b5d00f8474d2e82e371e565edf1891ca8bfc5 (commit) via e6bb88117f61466b24ac79b36ad1f27da1168bd1 (commit) via 638cee4decf831773cefabe50edd750da430e371 (commit) via 5dce476c4ce706790143852220591c4a9655eef1 (commit) via 5fce10df15de80ddf8db3ed68911401dc03c142f (commit) via 0d58ceb962650535343d4774d3c7f0e470bfd1c1 (commit) via 64f1f5a0ea81c363f1a0d4454984ef3fb21bc7cf (commit) via 10daf4da1b2a5354d7433cd8fc6f44fd6104c8dc (commit) via 55c310a24d3afa14dee4bf4c599843e31ed3f5c4 (commit) via 2c03eb298655b264b8f6acb3341030a70ee77a91 (commit) via 1cf156c91361e0f6b0f2767c7f35b0b1ae42e469 (commit) via de28609ff984b3e3314f749893729bf88fddaf97 (commit) via 80cca8f6b32da2bd3c38e48d12aedf37218b285e (commit) via 8a672bad12d08013ba3242ba457e790a49bbfe00 (commit) via 7e37b2cdb37bcc1c64ef726986e6e3efc8b25145 (commit) via f3d9b75c3503d87aff57d02feef7736bbbca98de (commit) via bc910761d6cd48a40c91bb8af38ae9402ad18c63 (commit) via 2c80a5023bb8d7b21e5f2f955e5a70ae6119deb4 (commit) via ca3a49dfcff833168de8584cdd659ca6cc01b5d0 (commit) via dea405cfc3379c8e8e91e4b2446c63fdee16c8c0 (commit) via 12af64757baf59b9b00c4895cc3a9dc7902a567b (commit) via 58a2724c315f49f34ce503fc168b2a594e256a14 (commit) via d8af30ca5c2fc0e726eaee986757db9bb79f474f (commit) via 701b93f3520d39cbca9a0be09eea06619fe2b0d1 (commit) via c3eb6f389bfb84eebe6d2bfe27c45091af31eefd (commit) via d14a5a8dc0cef4bfccb9065b1a435bb4e23b981c (commit) from 20e460fc50adeaa3da3da28b54b2361c577f11c6 (commit) - Log ----------------------------------------------------------------- commit 3b74d9ba019f6e1904699d5355e5e9c597896dcb Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:07:49 2010 -0500 credits commit d09e630af2fff492d6b75fea40da37547eeba63d Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:02:41 2010 -0500 improve message and make it translatable commit 9dd406c0455089b6a5b285ec73e4f2d675216376 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 12:52:10 2010 -0500 capitalize keywords; make other strings translatable commit e3bb1f875969280e9a2bdf991b21fc808b8eaa55 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 12:21:43 2010 -0500 wrong target to execute the query; missing parameters commit eb83a062bd91c9ed206f27017f49e5042748c310 Merge: 20e460fc50adeaa3da3da28b54b2361c577f11c6 369b5d00f8474d2e82e371e565edf1891ca8bfc5 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 12:17:33 2010 -0500 Merge remote branch 'ankitg/master' commit 369b5d00f8474d2e82e371e565edf1891ca8bfc5 Author: ankitg <ankitatbits(a)gmail.com> Date: Tue Aug 17 00:23:57 2010 +0530 minor bugsfixed documentation added commit e6bb88117f61466b24ac79b36ad1f27da1168bd1 Author: ankitg <ankitatbits(a)gmail.com> Date: Thu Aug 12 05:20:44 2010 +0530 from and having clause added with auto left joins commit 638cee4decf831773cefabe50edd750da430e371 Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jul 28 12:00:46 2010 +0530 where orderby groupby clauses commit 5dce476c4ce706790143852220591c4a9655eef1 Author: ankitg <ankitatbits(a)gmail.com> Date: Thu Jul 15 01:08:19 2010 +0530 bugs fixed commit 5fce10df15de80ddf8db3ed68911401dc03c142f Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jul 14 04:16:25 2010 +0530 query window commit 0d58ceb962650535343d4774d3c7f0e470bfd1c1 Author: ankitg <ankitatbits(a)gmail.com> Date: Mon Jul 12 08:25:46 2010 +0530 Select part of Query builder complete with rename and aggregate operators commit 64f1f5a0ea81c363f1a0d4454984ef3fb21bc7cf Author: ankitg <ankitatbits(a)gmail.com> Date: Fri Jul 9 03:33:14 2010 +0530 store selected columns info commit 10daf4da1b2a5354d7433cd8fc6f44fd6104c8dc Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jul 7 00:31:53 2010 +0530 some changes plus comments added commit 55c310a24d3afa14dee4bf4c599843e31ed3f5c4 Merge: 1cf156c91361e0f6b0f2767c7f35b0b1ae42e469 2c03eb298655b264b8f6acb3341030a70ee77a91 Author: ankitg <ankitatbits(a)gmail.com> Date: Fri Jul 2 12:11:27 2010 +0530 Merge branch 'visualbuilder' commit 2c03eb298655b264b8f6acb3341030a70ee77a91 Author: ankitg <ankitatbits(a)gmail.com> Date: Fri Jul 2 12:10:56 2010 +0530 new features in history tab commit 1cf156c91361e0f6b0f2767c7f35b0b1ae42e469 Merge: 80cca8f6b32da2bd3c38e48d12aedf37218b285e de28609ff984b3e3314f749893729bf88fddaf97 Author: ankitg <ankitatbits(a)gmail.com> Date: Sat Jun 26 16:42:59 2010 +0530 Merge branch 'visualbuilder' commit de28609ff984b3e3314f749893729bf88fddaf97 Author: ankitg <ankitatbits(a)gmail.com> Date: Sat Jun 26 16:42:29 2010 +0530 history tab changes commit 80cca8f6b32da2bd3c38e48d12aedf37218b285e Merge: 7e37b2cdb37bcc1c64ef726986e6e3efc8b25145 8a672bad12d08013ba3242ba457e790a49bbfe00 Author: ankitg <ankitatbits(a)gmail.com> Date: Fri Jun 25 09:46:33 2010 +0530 Merge branch 'visualbuilder' commit 8a672bad12d08013ba3242ba457e790a49bbfe00 Author: ankitg <ankitatbits(a)gmail.com> Date: Fri Jun 25 09:46:08 2010 +0530 history tab few changes commit 7e37b2cdb37bcc1c64ef726986e6e3efc8b25145 Merge: ca3a49dfcff833168de8584cdd659ca6cc01b5d0 f3d9b75c3503d87aff57d02feef7736bbbca98de Author: ankitg <ankitatbits(a)gmail.com> Date: Fri Jun 25 09:33:40 2010 +0530 Merge branch 'visualbuilder' commit f3d9b75c3503d87aff57d02feef7736bbbca98de Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jun 23 11:39:52 2010 +0530 initalized h_tabs commit bc910761d6cd48a40c91bb8af38ae9402ad18c63 Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jun 23 11:19:23 2010 +0530 .js file added for history commit 2c80a5023bb8d7b21e5f2f955e5a70ae6119deb4 Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jun 23 11:15:16 2010 +0530 added new images for history commit ca3a49dfcff833168de8584cdd659ca6cc01b5d0 Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jun 23 11:01:48 2010 +0530 .js file for history tab operatoins commit dea405cfc3379c8e8e91e4b2446c63fdee16c8c0 Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jun 23 10:49:15 2010 +0530 CSS for history tab commit 12af64757baf59b9b00c4895cc3a9dc7902a567b Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jun 9 22:53:13 2010 +0530 options added in designer commit 58a2724c315f49f34ce503fc168b2a594e256a14 Author: ankitg <ankitatbits(a)gmail.com> Date: Wed Jun 9 22:49:29 2010 +0530 link in query tab commit d8af30ca5c2fc0e726eaee986757db9bb79f474f Merge: 701b93f3520d39cbca9a0be09eea06619fe2b0d1 b5b75a4bf19214431b528dbc52ec7510db901cf6 Author: ankitg <ankitatbits(a)gmail.com> Date: Tue Jun 8 12:43:28 2010 +0530 Merge git://repo.or.cz/phpmyadmin commit 701b93f3520d39cbca9a0be09eea06619fe2b0d1 Merge: c3eb6f389bfb84eebe6d2bfe27c45091af31eefd 7a9dd2bcd25e68253e327d93fce65d1735c016d4 Author: ankitg <ankitatbits(a)gmail.com> Date: Sat Jun 5 13:11:18 2010 +0530 Merge git://repo.or.cz/phpmyadmin commit c3eb6f389bfb84eebe6d2bfe27c45091af31eefd Merge: 667dc8417702c4f13783e4e51c18f80c1afe5b32 d14a5a8dc0cef4bfccb9065b1a435bb4e23b981c Author: ankitg <ankitatbits(a)gmail.com> Date: Tue May 25 22:26:37 2010 +0530 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/ankitg commit d14a5a8dc0cef4bfccb9065b1a435bb4e23b981c Author: ankitg <ankitatbits(a)gmail.com> Date: Sat May 22 15:30:59 2010 +0530 first commit ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +- Documentation.html | 6 + db_qbe.php | 23 + js/messages.php | 3 + .../img/b_chart.png => pmd/images/and_icon.png | Bin 3118 -> 3539 bytes pmd/images/or_icon.png | Bin 0 -> 50345 bytes pmd/images/query_builder.png | Bin 0 -> 49112 bytes pmd/scripts/history.js | 765 ++++++++++++++++++++ pmd/scripts/move.js | 182 +++++- pmd/styles/default/images/minus.png | Bin 0 -> 48703 bytes pmd/styles/default/images/plus.png | Bin 0 -> 48663 bytes pmd/styles/default/style1.css | 203 ++++++ pmd_common.php | 6 +- pmd_general.php | 450 +++++++++++- 14 files changed, 1630 insertions(+), 15 deletions(-) copy themes/original/img/b_chart.png => pmd/images/and_icon.png (75%) create mode 100644 pmd/images/or_icon.png create mode 100644 pmd/images/query_builder.png create mode 100644 pmd/scripts/history.js create mode 100644 pmd/styles/default/images/minus.png create mode 100644 pmd/styles/default/images/plus.png create mode 100644 readme diff --git a/ChangeLog b/ChangeLog index 73375bf..0a10389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,12 +113,13 @@ - bug #3056610 [interface] Removed modification options for information_schema + patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau - [core] Force generating of new session on login -- rfe #1105678 [interface] Drop page-break-before as it is useless for smaller ++ rfe #1105678 [interface] Drop page-break-before as it is useless for smaller tables. -- rfe #2956556 [interface] Allow to wrap enum values. ++ rfe #2956556 [interface] Allow to wrap enum values. - bug #1669459 [interface] Do not automatically mark PDF schema rows to delete - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. -- rfe #3111455 [interface] Column highlighting and marking in table view ++ rfe #3111455 [interface] Column highlighting and marking in table view ++ Visual query builder 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/Documentation.html b/Documentation.html index e96044b..f6235e7 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4834,6 +4834,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA <li>BLOBstreaming support with PBMS PHP extension</li> </ul></li> +<li>Ankit Gupta (Google Summer of Code 2010) +<ul> + <li>Visual query builder</li> +</ul></li> + + </ul> <p> diff --git a/db_qbe.php b/db_qbe.php index a8aeb42..daaba0d 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -163,6 +163,29 @@ function showColumnSelectCell($columns, $column_number, $selected = '') } ?> +<?php if (!empty($tab_designer['link'])) { + $tab_designer['link'] = htmlentities($tab_designer['link']); + $tab_designer['link'] = $tab_designer['link'] . PMA_generate_common_url($url_params); + if (! empty($tab_designer['args'])) { + foreach ($tab_designer['args'] as $param => $value) { + $tab_designer['link'] .= PMA_get_arg_separator('html') . urlencode($param) . '=' + . urlencode($value); + } + } + } + if (! empty($tab['fragment'])) { + $tab['link'] .= $tab['fragment']; + } +?> +<div class="notice"> + <span id="footnote_1"> + Switch to + <form action="<?php echo $tab_designer['link'] ?>" method="post"> + <input type="submit" style="background-color:#FFD; border-width:0; color:#00F; + font-size: 15px;cursor: pointer" name="query" onmouseover="this.style.color='#F00';" + value="visual builder" onmouseout="this.style.color='#00F'"/></span> + </form> +</div> <form action="db_qbe.php" method="post"> <fieldset> <table class="data" style="width: 100%;"> diff --git a/js/messages.php b/js/messages.php index c034d74..761f810 100644 --- a/js/messages.php +++ b/js/messages.php @@ -94,6 +94,9 @@ $js_messages['strSelectForeignKey'] = __('Select Foreign Key'); $js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); $js_messages['strChangeDisplay'] = __('Choose column to display'); +/* Visual query builder (pmd/scripts/move.js) */ +$js_messages['strAddOption'] = __('Add an option for column '); + /* password generation */ $js_messages['strGeneratePassword'] = __('Generate password'); $js_messages['strGenerate'] = __('Generate'); diff --git a/themes/original/img/b_chart.png b/pmd/images/and_icon.png similarity index 75% copy from themes/original/img/b_chart.png copy to pmd/images/and_icon.png index 388ec30..bb51726 100644 Binary files a/themes/original/img/b_chart.png and b/pmd/images/and_icon.png differ diff --git a/pmd/images/or_icon.png b/pmd/images/or_icon.png new file mode 100644 index 0000000..fa76f3b Binary files /dev/null and b/pmd/images/or_icon.png differ diff --git a/pmd/images/query_builder.png b/pmd/images/query_builder.png new file mode 100644 index 0000000..6d0f554 Binary files /dev/null and b/pmd/images/query_builder.png differ diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js new file mode 100644 index 0000000..ace5bae --- /dev/null +++ b/pmd/scripts/history.js @@ -0,0 +1,765 @@ +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @fileoverview function used in this file builds history tab and generates query. + * + * @requires jQuery + * @requires moves.js + * @version $Id$ + */ + +var history_array = []; // Global array to store history objects +var select_field = []; // Global array to store informaation for columns which are used in select clause +var g_index; + +/** + * function for panel, hides and shows toggle_container <div>,which is for history elements uses {@link JQuery}. + * + * @param index has value 1 or 0,decides wheter to hide toggle_container on load. +**/ + +function panel(index) { + if (!index) { + $(".toggle_container").hide(); + } + $("h2.tiger").click(function(){ + $(this).toggleClass("active").next().slideToggle("slow"); + }); +} + +/** + * Sorts history_array[] first,using table name as the key and then generates the HTML code for history tab, + * clubbing all objects of same tables together + * This function is called whenever changes are made in history_array[] + * + * @uses and_or() + * @uses history_edit() + * @uses history_delete() + * + * @param {int} init starting index of unsorted array + * @param {int} final last index of unsorted array + * +**/ + +function display(init,final) { + var str,i,j,k,sto; + // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. + for (i = init;i < final;i++) { + sto = history_array[i]; + var temp = history_array[i].get_tab() ;//+ '.' + history_array[i].get_obj_no(); for Self JOINS + for(j = 0;j < i;j++){ + if(temp > (history_array[j].get_tab())) {//+ '.' + history_array[j].get_obj_no())) { //for Self JOINS + for(k = i;k > j;k--) { + history_array[k] = history_array[k-1]; + } + history_array[j] = sto; + break; + } + } + } + // this part generates HTML code for history tab.adds delete,edit,and/or and detail features with objects. + str =''; // string to store Html code for history tab + for ( var i=0; i < history_array.length; i++){ + var temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN + str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>'; + str += '<div class="toggle_container">\n'; + while((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) { + str +='<div class="block"> <table width ="250">'; + str += '<thead><tr><td>'; + if(history_array[i].get_and_or()){ + str +='<img src="pmd/images/or_icon.png" onclick="and_or('+i+')" title="OR"/></td>'; + } + else { + str +='<img src="pmd/images/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>'; + } + str +='<td style="padding-left: 5px;" align="right"><img src="./themes/original/img/b_sbrowse.png" title="column name"/></td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name(); + if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") { + str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; + } + else { + str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img src="themes/original/img/b_edit.png" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; + } + i++; + if(i >= history_array.length) { + break; + } + str += '</table></div><br/>'; + } + i--; + str += '</div><br/>'; + } + return str; +} + +/** + * To change And/Or relation in history tab + * + * @uses panel() + * + * @param {int} index of history_array where change is to be made + * +**/ + +function and_or(index) { + if (history_array[index].get_and_or()) { + history_array[index].set_and_or(0); + } + else { + history_array[index].set_and_or(1); + } + var existingDiv = document.getElementById('ab'); + existingDiv.innerHTML = display(0,0); + panel(1); +} + +/** + * To display details of obects(where,rename,Having,aggregate,groupby,orderby,having) + * + * @param index index of history_array where change is to be made + * +**/ + +function detail (index) { + var type = history_array[index].get_type(); + var str; + if (type == "Where") { + str = 'Where ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery(); + } + if (type == "Rename") { + str = 'Rename ' + history_array[index].get_column_name() + ' To ' + history_array[index].get_obj().getrename_to(); + } + if (type == "Aggregate") { + str = 'Select ' + history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )'; + } + if (type == "GroupBy") { + str = 'GroupBy ' + history_array[index].get_column_name() ; + } + if (type == "OrderBy") { + str = 'OrderBy ' + history_array[index].get_column_name() ; + } + if (type == "Having") { + str = 'Having '; + if (history_array[index].get_obj().get_operator() != 'None') { + str += history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )'; + str += history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery(); + } + else { + str = 'Having ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery(); + } + } + return str; +} + +/** + * Deletes entry in history_array + * + * @uses panel() + * @uses display() + * @param index index of history_array[] which is to be deleted + * +**/ + +function history_delete(index) { + for(var k =0 ;k < from_array.length;k++){ + if(from_array[k] == history_array[index].get_tab()){ + from_array.splice(k,1); + break; + } + } + history_array.splice(index,1); + var existingDiv = document.getElementById('ab'); + existingDiv.innerHTML = display(0,0); + panel(1); +} + +/** + * To show where,rename,aggregate,having forms to edit a object + * + * @param{int} index index of history_array where change is to be made + * +**/ + +function history_edit(index) { + g_index = index; + var type = history_array[index].get_type(); + if (type == "Where") { + document.getElementById('eQuery').value = history_array[index].get_obj().getquery(); + document.getElementById('erel_opt').value = history_array[index].get_obj().getrelation_operator(); + document.getElementById('query_where').style.left = '530px'; + document.getElementById('query_where').style.top = '130px'; + document.getElementById('query_where').style.position = 'absolute'; + document.getElementById('query_where').style.zIndex = '9'; + document.getElementById('query_where').style.visibility = 'visible'; + } + if (type == "Having") { + document.getElementById('hQuery').value = history_array[index].get_obj().getquery(); + document.getElementById('hrel_opt').value = history_array[index].get_obj().getrelation_operator(); + document.getElementById('hoperator').value = history_array[index].get_obj().get_operator(); + document.getElementById('query_having').style.left = '530px'; + document.getElementById('query_having').style.top = '130px'; + document.getElementById('query_having').style.position = 'absolute'; + document.getElementById('query_having').style.zIndex = '9'; + document.getElementById('query_having').style.visibility = 'visible'; + } + if (type == "Rename") { + document.getElementById('query_rename_to').style.left = '530px'; + document.getElementById('query_rename_to').style.top = '130px'; + document.getElementById('query_rename_to').style.position = 'absolute'; + document.getElementById('query_rename_to').style.zIndex = '9'; + document.getElementById('query_rename_to').style.visibility = 'visible'; + } + if (type == "Aggregate") { + document.getElementById('query_Aggregate').style.left = '530px'; + document.getElementById('query_Aggregate').style.top = '130px'; + document.getElementById('query_Aggregate').style.position = 'absolute'; + document.getElementById('query_Aggregate').style.zIndex = '9'; + document.getElementById('query_Aggregate').style.visibility = 'visible'; + } +} + +/** + * Make changes in history_array when Edit button is clicked + * checks for the type of object and then sets the new value + * @uses panel() + * @uses display() + * + * @param index index of history_array where change is to be made +**/ + +function edit(type) { + if (type == "Rename") { + if (document.getElementById('e_rename').value != "") { + history_array[g_index].get_obj().setrename_to(document.getElementById('e_rename').value); + document.getElementById('e_rename').value = ""; + } + document.getElementById('query_rename_to').style.visibility = 'hidden'; + } + if (type == "Aggregate") { + if (document.getElementById('e_operator').value != '---') { + history_array[g_index].get_obj().set_operator(document.getElementById('e_operator').value); + document.getElementById('e_operator').value = '---'; + } + document.getElementById('query_Aggregate').style.visibility = 'hidden'; + } + if (type == "Where") { + if (document.getElementById('erel_opt').value != '--' && document.getElementById('eQuery').value !="") { + history_array[g_index].get_obj().setquery(document.getElementById('eQuery').value); + history_array[g_index].get_obj().setrelation_operator(document.getElementById('erel_opt').value); + } + document.getElementById('query_where').style.visibility = 'hidden'; + } + if (type == "Having") { + if (document.getElementById('hrel_opt').value != '--' && document.getElementById('hQuery').value !="") { + history_array[g_index].get_obj().setquery(document.getElementById('hQuery').value); + history_array[g_index].get_obj().setrelation_operator(document.getElementById('hrel_opt').value); + history_array[g_index].get_obj().set_operator(document.getElementById('hoperator').value); + } + document.getElementById('query_having').style.visibility = 'hidden'; + } + var existingDiv = document.getElementById('ab'); + existingDiv.innerHTML = display(0,0); + panel(1); +} + +/** + * history object closure + * + * @param ncolumn_name name of the column on which conditions are put + * @param nobj object details(where,rename,orderby,groupby,aggregate) + * @param ntab table name of the column on which conditions are applied + * @param nobj_no object no used for inner join + * @param ntype type of object + * +**/ + +function history(ncolumn_name,nobj,ntab,nobj_no,ntype) { + var and_or; + var obj; + var tab; + var column_name; + var obj_no; + var type; + this.set_column_name = function (ncolumn_name) { + column_name = ncolumn_name; + }; + this.get_column_name = function() { + return column_name; + }; + this.set_and_or = function(nand_or) { + and_or = nand_or; + }; + this.get_and_or = function() { + return and_or; + } + this.get_relation = function() { + return and_or; + }; + this.set_obj = function(nobj) { + obj = nobj; + }; + this.get_obj = function() { + return obj; + }; + this.set_tab = function(ntab) { + tab = ntab; + }; + this.get_tab = function() { + return tab; + }; + this.set_obj_no = function(nobj_no) { + obj_no = nobj_no; + }; + this.get_obj_no = function() { + return obj_no; + }; + this.set_type = function(ntype) { + type = ntype; + } + this.get_type = function() { + return type; + } + this.set_obj_no(nobj_no); + this.set_tab(ntab); + this.set_and_or(0); + this.set_obj(nobj); + this.set_column_name(ncolumn_name); + this.set_type(ntype); +}; + +/** + * where object closure, makes an object with all information of where + * + * @param nrelation_operator type of relation operator to be applied + * @param nquery stores value of value/sub-query + * +**/ + + +var where = function (nrelation_operator,nquery) { + var relation_operator; + var query; + this.setrelation_operator = function(nrelation_operator) { + relation_operator = nrelation_operator; + }; + this.setquery = function(nquery) { + query = nquery; + }; + this.getquery = function() { + return query; + }; + this.getrelation_operator = function() { + return relation_operator; + }; + this.setquery(nquery); + this.setrelation_operator(nrelation_operator); +}; + + +/** + * Having object closure, makes an object with all information of where + * + * @param nrelation_operator type of relation operator to be applied + * @param nquery stores value of value/sub-query + * +**/ + +var having = function (nrelation_operator,nquery,noperator) { + var relation_operator; + var query; + var operator; + this.set_operator = function(noperator) { + operator = noperator; + }; + this.setrelation_operator = function(nrelation_operator) { + relation_operator = nrelation_operator; + }; + this.setquery = function(nquery) { + query = nquery; + }; + this.getquery = function() { + return query; + }; + this.getrelation_operator = function() { + return relation_operator; + }; + this.get_operator = function() { + return operator; + }; + this.setquery(nquery); + this.setrelation_operator(nrelation_operator); + this.set_operator(noperator); +}; + +/** + * rename object closure,makes an object with all information of rename + * + * @param nrename_to new name information + * +**/ + +var rename = function(nrename_to) { + var rename_to; + this.setrename_to = function(nrename_to) { + rename_to = nrename_to; + }; + this.getrename_to =function() { + return rename_to; + }; + this.setrename_to(nrename_to); +}; + +/** + * aggregate object closure + * + * @param noperator aggregte operator + * +**/ + +var aggregate = function(noperator) { + var operator; + this.set_operator = function(noperator) { + operator = noperator; + }; + this.get_operator = function() { + return operator; + }; + this.set_operator(noperator); +}; + +/** + * This function returns unique element from an array + * + * @param arraName array from which duplicate elem are to be removed. + * @return unique array + */ + +function unique(arrayName) { + var newArray=new Array(); + label:for(var i=0; i<arrayName.length;i++ ) + { + for(var j=0; j<newArray.length;j++ ) + { + if(newArray[j]==arrayName[i]) + continue label; + } + newArray[newArray.length] = arrayName[i]; + } + return newArray; +} + +/** + * This function takes in array and a value as input and returns 1 if values is present in array + * else returns -1 + * + * @param arrayName array + * @param value value which is to be searched in the array + */ + +function found(arrayName,value) { + for(var i=0; i<arrayName.length; i++) { + if(arrayName[i] == value) { return 1;} + } + return -1; +} + +/** + * This function is the main function for query building. + * uses history object details for this. + * + * @ uses query_where() + * @ uses query_groupby() + * @ uses query_having() + * @ uses query_orderby() + * + * @param formtitle title for the form + * @param fadin + */ + +function build_query(formtitle, fadin) { + var q_select = "SELECT "; + var temp; + for(i = 0;i < select_field.length; i++) { + temp = check_aggregate(select_field[i]); + if (temp != "") { + q_select += temp; + temp = check_rename(select_field[i]); + q_select += temp + ","; + } + else { + temp = check_rename(select_field[i]); + q_select += select_field[i] + temp +","; + } + } + q_select = q_select.substring(0,q_select.length - 1); + q_select += " FROM " + query_from(); + if(query_where() != "") { + q_select +="\n WHERE"; + q_select += query_where(); + } + if(query_groupby() != "") { q_select += "\nGROUP BY " + query_groupby(); } + if(query_having() != "") { q_select += "\nHAVING " + query_having(); } + if(query_orderby() != "") { q_select += "\nORDER BY " + query_orderby(); } + var box = document.getElementById('box'); + document.getElementById('filter').style.display='block'; + var btitle = document.getElementById('boxtitle'); + btitle.innerHTML = 'SELECT';//formtitle; + if(fadin){ + gradient("box", 0); + fadein("box"); + } + else{ + box.style.display='block'; + } + document.getElementById('textSqlquery').innerHTML = q_select; +} + /** + * This function builds from clause of query + * makes automatic joins. + * + * @uses unique + * @uses add_array + * @uses remove_array + * + */ + + +function query_from() { + var i =0; + var tab_left = []; + var tab_used = []; + var t_tab_used = []; + var t_tab_left = []; + var temp; + var query = ""; + var quer = ""; + var parts = []; + var t_array = []; + t_array = from_array; + var K = 0; + for(i; i < history_array.length ; i++) { + from_array.push(history_array[i].get_tab()); + } + from_array = unique( from_array ); + tab_left = from_array; + temp = tab_left.shift(); + quer = temp; + tab_used.push(temp); + // if master table (key2) matches with tab used get all keys and check if tab_left matches + //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . + for( i =0; i<2 ; i++) { + for (K in contr){ + for (key in contr[K]){// contr name + for (key2 in contr[K][key]){// table name + parts = key2.split("."); + if(found(tab_used,parts[1]) > 0) { + for (key3 in contr[K][key][key2]) { + parts1 = contr[K][key][key2][key3][0].split("."); + if(found(tab_left,parts1[1]) > 0) { + query += "\n" + 'LEFT JOIN '; + query += '`' + parts1[0] + '`.`' + parts1[1] + '` ON ' ; + query += '`' + parts[1] +'`.`' + key3 + '` = '; + query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` '; + t_tab_left.push(parts1[1]); + } + } + } + } + } + } + K = 0; + t_tab_left = unique (t_tab_left); + tab_used = add_array(t_tab_left,tab_used); + tab_left = remove_array(t_tab_left,tab_left); + t_tab_left = []; + for (K in contr) { + for (key in contr[K]) { + for (key2 in contr[K][key]){// table name + parts = key2.split("."); + if(found(tab_left,parts[1]) > 0){ + for (key3 in contr[K][key][key2]){ + parts1 = contr[K][key][key2][key3][0].split("."); + if(found(tab_used,parts1[1]) > 0) { + query += "\n" + 'LEFT JOIN '; + query += '`' + parts[0] + '`.`' + parts[1] + '` ON ' ; + query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = '; + query += '`' + parts[1] + '`.`' + key3 + '` '; + t_tab_left.push(parts[1]); + } + } + } + } + } + } + t_tab_left = unique (t_tab_left); + tab_used = add_array(t_tab_left,tab_used); + tab_left = remove_array(t_tab_left,tab_left); + t_tab_left = []; + } + for (k in tab_left) { + quer += " , `" + tab_left[k] + "`"; + } + query = quer + query; + from_array = t_array; + return query; +} + /* document.write(key3+";"); //master_field + document.write(contr[K][key][key2][key3][0]+";"); // foreign_table + document.write(contr[K][key][key2][key3][1]+";"); //forieign_feild */ +/** + * This function concatenates two array + * + * @params add array elements of which are pushed in + * @params arr array in which elemnets are added + */ +function add_array(add,arr){ + for( var i=0; i<add.length; i++){ + arr.push(add[i]); + } + return arr; +} + +/* This fucntion removes all elements present in one array from the other. + * + * @params rem array from which each element is removed from other array. + * @params arr array from which elements are removed. + * + */ +function remove_array(rem,arr){ + for(var i=0; i<rem.length; i++){ + for(var j=0; j<arr.length; j++) + if(rem[i] == arr[j]) { arr.splice(j,1); } + } + return arr; +} + +/** + * This function builds the groupby clause from history object + * + */ + +function query_groupby() { + var i = 0; + var str = ""; + for(i; i < history_array.length;i++) { + if(history_array[i].get_type() == "GroupBy") { str +=history_array[i].get_column_name() + ", ";} + } + str = str.substr(0,str.length -1); + return str; +} + +/** + * This function builds the Having clause from the history object. + * + */ + +function query_having() { + var i = 0; + var and = "("; + for(i; i < history_array.length;i++) { + if(history_array[i].get_type() == "Having") { + if (history_array[i].get_obj().get_operator() != 'None') { + and += history_array[i].get_obj().get_operator() + "(" + history_array[i].get_column_name() + " ) " + history_array[i].get_obj().getrelation_operator(); + and += " " + history_array[i].get_obj().getquery() + ", " ; + } + else { + and += history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", "; + } + } + } + if (and =="(") { and = "" ;} + else { and = and.substr(0,and.length -2) + ")";} + return and; +} + + +/** + * This function builds the orderby clause from the history object. + * + */ + +function query_orderby() { + var i = 0; + var str = "" ; + for(i; i < history_array.length;i++) { + if(history_array[i].get_type() == "OrderBy") { str += history_array[i].get_column_name() + " , "; } + } + str = str.substr(0,str.length -1); + return str; +} + + +/** + * This function builds the Where clause from the history object. + * + */ + +function query_where(){ + var i = 0; + var and = "("; + var or = "("; + for(i; i < history_array.length;i++) { + if(history_array[i].get_type() == "Where") { + if(history_array[i].get_and_or() == 0) { + and += "( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() +" " + history_array[i].get_obj().getquery() + ")"; and += " AND "; + } + else { + or +="( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() +")"; + or +=" OR " ; + } + } + } + if ( or != "(") { or = or.substring(0,(or.length - 4 )) + ")"; } + else { or = "" ;} + if (and !="(") {and = and.substring(0,(and.length - 5)) + ")"; } + else {and = "" ;} + if ( or != "" ) { and = and + " OR " + or + " )"; } + return and; +} + +function check_aggregate(id_this) { + var i = 0; + for(i;i < history_array.length;i++) { + var temp = '`' + history_array[i].get_tab() + '`.`' +history_array[i].get_column_name() +'`'; + if(temp == id_this && history_array[i].get_type() == "Aggregate") { + return history_array[i].get_obj().get_operator() + '(' + id_this +')'; + } + } + return ""; +} + +function check_rename(id_this) { + var i = 0; + for (i;i < history_array.length;i++) { + var temp = '`' + history_array[i].get_tab() + '`.`' +history_array[i].get_column_name() +'`'; + if(temp == id_this && history_array[i].get_type() == "Rename") { + return " AS `" + history_array[i].get_obj().getrename_to() +"`"; + } + } + return ""; +} + +function gradient(id, level) +{ + var box = document.getElementById(id); + box.style.opacity = level; + box.style.MozOpacity = level; + box.style.KhtmlOpacity = level; + box.style.filter = "alpha(opacity=" + level * 100 + ")"; + box.style.display="block"; + return; +} + + +function fadein(id) +{ + var level = 0; + while(level <= 1){ + setTimeout( "gradient('" + id + "'," + level + ")", (level* 1000) + 10); + level += 0.01; + } +} + +function closebox() +{ + document.getElementById('box').style.display='none'; + document.getElementById('filter').style.display='none'; +} diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js index 93180cb..b2f99ee 100644 --- a/pmd/scripts/move.js +++ b/pmd/scripts/move.js @@ -32,6 +32,8 @@ var timeoutID; var layer_menu_cur_click = 0; var step = 10; var old_class; +var from_array = []; +var downer; //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ @@ -620,7 +622,6 @@ function Small_tab(t, re_load) var id = document.getElementById('id_tbody_' + t); var id_this = document.getElementById('id_hide_tbody_' + t); var id_t = document.getElementById(t); - id_t.style.width = id_t.offsetWidth + 'px'; if (id_this.innerHTML == "v") { //---CROSS @@ -646,7 +647,6 @@ function Select_tab(t) //---------- var id_t = document.getElementById(t); window.scrollTo(parseInt(id_t.style.left) - 300, parseInt(id_t.style.top) - 300); - setTimeout(function(){document.getElementById('id_zag_' + t).className = 'tab_zag';}, 800); } //------------------------------------------------------------------------------ @@ -964,3 +964,181 @@ function getColorByTarget( target ) return color; } + +function Click_option(id_this,column_name,table_name) +{ + var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1); + document.getElementById(id_this).style.left = left + 'px'; + // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10; + document.getElementById(id_this).style.top = (screen.height / 4) + 'px'; + document.getElementById(id_this).style.visibility = "visible"; + document.getElementById('option_col_name').innerHTML = '<strong>' + PMA_messages['strAddOption'] +'"' +column_name+ '"</strong>'; + col_name = column_name; + tab_name = table_name; +} + +function Close_option() +{ + document.getElementById('pmd_optionse').style.visibility = "hidden"; +} + +function Select_all(id_this,owner) +{ + var parent= document.form1; + downer =owner; + var i; + var tab = []; + for(i = 0; i < parent.elements.length; i++) { + if (parent.elements[i].type == "checkbox" && parent.elements[i].id.substring(0,(9 + id_this.length)) == 'select_' + id_this + '._') { + if(document.getElementById('select_all_' + id_this).checked == true) { + parent.elements[i].checked = true; + parent.elements[i].disabled = true; + var temp = '`' + id_this.substring(owner.length +1) + '`.*'; + } + else { + parent.elements[i].checked = false; + parent.elements[i].disabled = false; + } + } + } + if(document.getElementById('select_all_' + id_this).checked == true) { + select_field.push('`' + id_this.substring(owner.length +1) + '`.*'); + tab = id_this.split("."); + from_array.push(tab[1]); + } + else { + for (i =0; i < select_field.length; i++) { + if (select_field[i] == ('`' + id_this.substring(owner.length +1) + '`.*')) { + select_field.splice(i,1); + } + } + for(k =0 ;k < from_array.length;k++){ + if(from_array[k] == id_this){ + from_array.splice(k,1); + break; + } + } + } + Re_load(); +} + +function Table_onover(id_this,val,buil) +{ + if(!val) { + document.getElementById("id_zag_" + id_this).className="tab_zag_2"; + if(buil) { + document.getElementById("id_zag_" + id_this + "_2").className="tab_zag_2"; + } + } + else { + document.getElementById("id_zag_" + id_this).className="tab_zag"; + if(buil) { + document.getElementById("id_zag_" + id_this + "_2").className="tab_zag"; + } + } +} + +/* This function stores selected column information in select_field[] + * In case column is checked it add else it deletes + * + */ +function store_column(id_this,owner,col) { + var i = 0; + var k = 0; + if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked == true) { + select_field.push('`' + id_this + '`.`' + col +'`'); + from_array.push(id_this); + } + else { + for(i; i < select_field.length ;i++) { + if (select_field[i] == ('`' + id_this + '`.`' + col +'`')) { + select_field.splice(i,1); + break; + } + } + for(k =0 ;k < from_array.length;k++){ + if(from_array[k] == id_this){ + from_array.splice(k,1); + break; + } + } + } +} + +/** + * This function builds object and adds them to history_array + * first it does a few checks on each object, then makes an object(where,rename,groupby,aggregate,orderby) + * then a new history object is made and finally all these history objects are addded to history_array[] + * + * @uses where() + * @uses history() + * @uses aggregate() + * @uses rename() + * @uses panel() + * @uses display() +**/ + +function add_object() { + var rel = document.getElementById('rel_opt'); + var sum = 0; + var init = history_array.length; + if (rel.value != '--') { + if (document.getElementById('Query').value == "") { + document.getElementById('hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('hint').style.visibility = "visible"; + return; + } + var p = document.getElementById('Query'); + var where_obj = new where(rel.value,p.value);//make where object + history_array.push(new history(col_name,where_obj,tab_name,h_tabs[downer + '.' + tab_name],"Where")); + sum = sum + 1; + rel.value = '--'; + p.value = ""; + } + if (document.getElementById('new_name').value !="") { + var rename_obj = new rename(document.getElementById('new_name').value);//make Rename object + history_array.push(new history(col_name,rename_obj,tab_name,h_tabs[downer + '.' + tab_name],"Rename")); + sum = sum + 1; + document.getElementById('new_name').value = "" ; + } + if (document.getElementById('operator').value != '---') { + var aggregate_obj = new aggregate(document.getElementById('operator').value) ; + history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[downer + '.' + tab_name],"Aggregate")); + sum = sum + 1; + document.getElementById('operator').value = '---'; + //make aggregate operator + } + if (document.getElementById('groupby').checked == true ) { + history_array.push(new history(col_name,'GroupBy',tab_name,h_tabs[downer + '.' +tab_name],"GroupBy")); + sum = sum + 1; + document.getElementById('groupby').checked = false; + //make groupby + } + if (document.getElementById('h_rel_opt').value != '--') { + if (document.getElementById('having').value == "") { + document.getElementById('hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('hint').style.visibility = "visible"; + return; + } + var p = document.getElementById('having'); + var where_obj = new having(document.getElementById('h_rel_opt').value,p.value,document.getElementById('h_operator').value);//make where object + history_array.push(new history(col_name,where_obj,tab_name,h_tabs[downer + '.' + tab_name],"Having")); + sum = sum + 1; + document.getElementById('h_rel_opt').value = '--'; + document.getElementById('h_operator').value = '---'; + p.value = ""; //make having + } + if (document.getElementById('orderby').checked == true) { + history_array.push(new history(col_name,'OrderBy',tab_name,h_tabs[downer + '.' + tab_name],"OrderBy")); + sum = sum + 1; + document.getElementById('orderby').checked = false; + //make orderby + } + document.getElementById('hint').innerHTML = sum + "object created" ; + document.getElementById('hint').style.visibility = "visible"; + //output sum new objects created + var existingDiv = document.getElementById('ab'); + existingDiv.innerHTML = display(init,history_array.length); + Close_option(); + panel(0); +} diff --git a/pmd/styles/default/images/minus.png b/pmd/styles/default/images/minus.png new file mode 100644 index 0000000..cf72f39 Binary files /dev/null and b/pmd/styles/default/images/minus.png differ diff --git a/pmd/styles/default/images/plus.png b/pmd/styles/default/images/plus.png new file mode 100644 index 0000000..ebcd27d Binary files /dev/null and b/pmd/styles/default/images/plus.png differ diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css index 129c8d3..eb3d690 100644 --- a/pmd/styles/default/style1.css +++ b/pmd/styles/default/style1.css @@ -146,6 +146,23 @@ form { color: #888888; } +.option_tab { + padding-left: 2px; + padding-right: 2px; + width: 5px; +} + +.select_all { + vertical-align: top; + padding-left: 2px; + padding-right: 2px; + cursor: default; + width: 1px; + color: #000000; + background-image: url(images/Header.png); + background-repeat: repeat-x; +} + .small_tab { vertical-align: top; background-color: #0064ea; @@ -371,9 +388,195 @@ a.M_butt:hover { width: 153px; } +#pmd_optionse { + position: absolute; + left: 636px; + top: 85px; + z-index: 1000; + width: 153px; +} + #layer_menu_sizer { background-image: url(../../images/resize.png); cursor: nw-resize; width: 16px; height: 16px; } + +.panel { +position: fixed; +top: 50px; +right: 0; +display: none; +background: #FFF; +border:1px solid #F5F5F5; +width: 350 px; +height: auto; +padding: 30px 170px 30px 30px; +color:#FFF; +z-index:99; +} + +a.trigger{ +position: fixed; +text-decoration: none; +top: 60px; right: 0; +font-size: 16px; +font-family: verdana, helvetica, arial, sans-serif; +color:#fff; +padding: 10px 40px 10px 15px; +font-weight: 700; +background:#333333 url(images/plus.png) 85% 55% no-repeat; +border:1px solid #444444; +display: block; +} + +a.trigger:hover{ +position: fixed; +text-decoration: none; +top: 60px; right: 0; +font-size: 16px; +font-family: verdana, helvetica, arial, sans-serif; +color:#080808; +padding: 10px 40px 10px 15px; +font-weight: 700; +background:#fff696 url(images/plus.png) 85% 55% no-repeat; +border:1px solid #999; +display: block; +} + +a.active.trigger { +background:#222222 url(images/minus.png) 85% 55% no-repeat; +z-index:999; +} + +a.active.trigger:hover { +background:#fff696 url(images/minus.png) 85% 55% no-repeat; +z-index:999; +} + +h2.tiger{ + background-repeat: repeat-x; + padding: 1px; + font-weight: bold; + font-size:14px; + padding: 50 20 50 20px; + margin: 0 0 5px 0; + width: 250px; + float: left; + color : #333; + text-align: center; +} + +h2.tiger a { + background-image: url(images/Header.png); + text-align: center; + text-decoration: none; + color : #333; + display: block; +} + +h2.tiger a:hover { + color: #000; + background-image: url(images/Header_Linked.png); +} + +h2.active { + background-image: url(images/Header.png); + background-repeat: repeat-x; + padding: 1px; + background-position: left bottom; +} + +.toggle_container { + margin: 0 0 5px; + padding: 0; + border-top: 1px solid #d6d6d6; + background: #FFF ; + width: 250px; + overflow: hidden; + font-size: 1.2em; + clear: both; +} + +.toggle_container .block { + background-color: #DBE4E8; + padding:40 15 40 15px; /*--Padding of Container--*/ + border:1px solid #999; + color:#000; +} + +.history_table { + text-align: center; + background-color: #9999CC; +} + +.history_table2 { + text-align: center; + background-color: #DBE4E8; +} + +#filter { + display: none; + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + background-color: #CCA; + z-index:10; + opacity:0.5; + filter: alpha(opacity=50); +} + +#box { + display: none; + position: absolute; + top: 20%; + left: 30%; + width: 500px; + height: 220px; + padding: 48px; + margin:0; + border: 1px solid black; + background-color: white; + z-index:101; + overflow: visible; +} + +#boxtitle { + position:absolute; + float:center; + top:0; + left:0; + width:593px; + height:20px; + padding:0; + padding-top:4px; + left-padding:8px; + margin:0; + border-bottom:4px solid #3CF; + background-color: #D0DCE0; //#09c; + color:black; + font-weight:bold; + padding-left: 2px; + font-family:"Times New Roman", Times, serif; + font-size:16px; + text-align:left; +} + +#tblfooter { + background-color: D3DCE3; + float: right; + padding-top:10px; + color: black; + font-weight: normal; +} + +input.btn { + color:#333; + font: bold 84%'trebuchet ms',helvetica,sans-serif; + background-color: #D0DCE0; +} + + diff --git a/pmd_common.php b/pmd_common.php index 2cb2213..df8fdf2 100644 --- a/pmd_common.php +++ b/pmd_common.php @@ -237,11 +237,13 @@ function get_script_tabs() $script_tabs = '<script type="text/javascript">' . "\n" . '// <![CDATA[' . "\n" . - 'var j_tabs = new Array();' . "\n"; + 'var j_tabs = new Array();' . "\n" . + 'var h_tabs = new Array();' . "\n" ; for ($i = 0, $cnt = count($GLOBALS['PMD']['TABLE_NAME']); $i < $cnt; $i++) { $script_tabs .= "j_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = '" . (PMA_foreignkey_supported($GLOBALS['PMD']['TABLE_TYPE'][$i]) ? '1' : '0') . "';\n"; - } + $script_tabs .="h_tabs['" . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . "'] = 1;"."\n" ; + } $script_tabs .= '// ]]>' . "\n" . '</script>' . "\n"; diff --git a/pmd_general.php b/pmd_general.php index 90ed0a8..eb2e445 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -27,6 +27,7 @@ $hidden = "hidden"; <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" /> <title>Designer</title> + <script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script> <script type="text/javascript"> // <![CDATA[ <?php @@ -34,8 +35,18 @@ echo ' var server = "' . PMA_escapeJsString($server) . '"; var db = "' . PMA_escapeJsString($db) . '"; var token = "' . PMA_escapeJsString($token) . '";'; + echo "\n"; + if($_REQUEST['query']) { + echo ' + $(document).ready(function(){ + $(".trigger").click(function(){ + $(".panel").toggle("fast"); + $(this).toggleClass("active"); + return false; + }); + });'; + } ?> - // ]]> </script> <?php @@ -47,7 +58,8 @@ require_once './libraries/header_scripts.inc.php'; ?> <script src="js/messages.php<?php echo PMA_generate_common_url($params); ?>" type="text/javascript"></script> <script src="pmd/scripts/ajax.js" type="text/javascript"></script> - <script src="pmd/scripts/move.js" type="text/javascript"></script> + <script src="pmd/scripts/history.js" type="text/javascript"></script> + <script src="pmd/scripts/move.js" type="text/javascript"></script>  @@ -98,11 +110,18 @@ echo $script_tabs . $script_contr . $script_display_field; class="M_butt" target="_self" ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="pmd/images/bottom.png" /></a><img class="M_bord" src="pmd/images/bord.png" alt="" - /><a href="javascript:PDF_save();" onmousedown="return false;" + /><a href="javascript:PDF_save();" onmousedown="return false;" class="M_butt" target="_self" ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" - title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a> - <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));" + title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a + > + <?php if($_REQUEST['query']){ + echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" + class="M_butt" target="_self">'; + echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; + echo __('Build Query'); + echo '"/></a>'; }?> + <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));" onmousedown="return false;" class="M_butt last" target="_self"> <img src="pmd/images/2rightarrow_m.png" id="key_Left_Right" alt=">" title="<?php echo __('Move Menu'); ?>" /></a> @@ -187,6 +206,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { "> <thead> <tr> + <?php + if(isset($_REQUEST['query'])) { + echo '<td class="select_all">'; + echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" '; + echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" '; + echo 'onclick="Select_all(\''. htmlspecialchars($t_n_url) .'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\')"></td>'; + }?> <td class="small_tab" onmouseover="this.className='small_tab2';" onmouseout="this.className='small_tab';" id="id_hide_tbody_<?php echo $t_n_url ?>" @@ -204,15 +230,21 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');"> <img src="pmd/images/exec_small.png" alt="" /></td> <td nowrap="nowrap" id="id_zag_<?php echo $t_n_url ?>" class="tab_zag" - onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');" - onmouseover="this.className = 'tab_zag_2'" - onmouseout="this.className = 'tab_zag'"> + onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"/ + onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )" + onmouseout="Table_onover('<?php echo $t_n_url ?>',1,<?php echo (isset($_REQUEST['query']) ? 1 : 0 )?>)"> <span class='owner'> <?php echo $GLOBALS['PMD_OUT']["OWNER"][$i]; echo '.</span>'; echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; ?></td> + <?php + if(isset($_REQUEST['query'])) { + echo '<td class="tab_zag" onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)" id="id_zag_'.htmlspecialchars($t_n_url).'_2"'; + echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"'; + echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">'; + }?> </tr> </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" @@ -243,6 +275,14 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { echo (isset($tables_all_keys[$t_n.".".$tab_column[$t_n]["COLUMN_NAME"][$j]]) ? 1 : 0); } ?>)"> + <?php + if(isset($_REQUEST['query'])) { + echo '<td class="select_all">'; + echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; + echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'._'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; + echo 'style="margin: 0px;" title="select_'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" '; + echo 'onclick="store_column(\''.urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]).'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\')"></td>'; + }?> <td width="10px" colspan="3" id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>"> <div style="white-space:nowrap"> @@ -276,6 +316,14 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { ?> </div> </td> + <?php + if(isset($_REQUEST['query'])) { + //$temp = $GLOBALS['PMD_OUT']["OWNER"][$i].'.'.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]; + echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"'; + echo 'onmouseout="this.className=\'small_tab_pref\';"'; + echo 'onclick="Click_option(\'pmd_optionse\',\''.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.$GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i].'\')" >'; + echo '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> '; + } ?> </tr> <?php } @@ -390,6 +438,392 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tr> </tbody> </table> + +<table id="pmd_optionse" style="visibility:<?php echo $hidden ?>;" + width="5%" border="0" cellpadding="0" cellspacing="0"> +<tbody> +<tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> +</tr> +<tr> + <td class="frams8"></td> + <td class="input_tab"> + <table width="168" border="0" align="center" cellpadding="2" cellspacing="0"> + <thead> + <tr> + <td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td> + </tr> + </thead> + <tbody id="where"> + <tr><td align="center" nowrap="nowrap"><b>WHERE</b></td></tr> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td> + <td width="102"><select name="rel_opt" id="rel_opt"> + <option value="--" selected="selected"> -- </option> + <option value="=" > = </option> + <option value=">"> > </option> + <option value="<"> < </option> + <option value=">="> >= </option> + <option value="<="> <= </option> + <option value="NOT"> NOT </option> + <option value="IN"> IN </option> + <option value="EXCEPT"> <?php echo __('Except'); ?> </option> + <option value="NOT IN"> NOT IN </option> + </select> + </td> + </tr> + <tr> + <td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td> + <td><textarea id="Query" value="" cols="18"></textarea> + </td> + </tr> + <tr><td align="center" nowrap="nowrap"><b><?php echo __('Rename to'); ?></b></td></tr> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td> + <td width="102"><input type="text" value="" id="new_name"/></td> + </tr> + <tr><td align="center" nowrap="nowrap"><b><?php echo __('Aggregate'); ?></b></td></tr> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> + <td width="102"><select name="operator" id="operator"> + <option value="---" selected="selected">---</option> + <option value="sum" > SUM </option> + <option value="min"> MIN </option> + <option value="max"> MAX </option> + <option value="avg"> AVG </option> + <option value="count"> COUNT </option> + </select> + </td></tr> + <tr> + <td nowrap="nowrap" width="58" align="center"><b>GROUP BY</b></td> + <td><input type="checkbox" value="groupby" id="groupby"/></td> + </tr> + <tr> + <td nowrap="nowrap" width="58" align="center"><b>ORDER BY</b></td> + <td><input type="checkbox" value="orderby" id="orderby"/></td> + </tr> + <tr><td align="center" nowrap="nowrap"><b>HAVING</b></td></tr> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> + <td width="102"><select name="h_operator" id="h_operator"> + <option value="---" selected="selected">---</option> + <option value="None" > <?php echo __('None'); ?> </option> + <option value="sum" > SUM </option> + <option value="min"> MIN </option> + <option value="max"> MAX </option> + <option value="avg"> AVG </option> + <option value="count"> COUNT </option> + </select> + </td></tr> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Relation operator'); ?></td> + <td width="102"><select name="h_rel_opt" id="h_rel_opt"> + <option value="--" selected="selected"> -- </option> + <option value="=" > = </option> + <option value=">"> > </option> + <option value="<"> < </option> + <option value=">="> >= </option> + <option value="<="> <= </option> + <option value="NOT"> NOT </option> + <option value="IN"> IN </option> + <option value="EXCEPT"> <?php echo __('Except'); ?> </option> + <option value="NOT IN"> NOT IN </option> + </select> + </td> + </tr> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Value'); ?>/<br/><?php echo __('subquery'); ?></td> + <td width="102"><textarea id="having" value="" cols="18"></textarea></td> + </tr> + </tbody> + <tbody> + <tr> + <td colspan="2" align="center" nowrap="nowrap"> + <input type="button" class="butt" name="Button" + value="<?php echo __('OK'); ?>" onclick="add_object()" /> + <input type="button" class="butt" name="Button" + value="<?php echo __('Cancel'); ?>" + onclick="Close_option()" /> + </td> + </tr> + </tbody> + </table> + </td> + <td class="frams6"></td> +</tr> +<tr> + <td class="frams4"><div class="bor"></div></td> + <td class="frams7"></td> + <td class="frams3"></td> +</tr> +</tbody> +</table> + +<table id="query_rename_to" style="visibility:<?php echo $hidden ?>;" + width="5%" border="0" cellpadding="0" cellspacing="0"> +<tbody> +<tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> +</tr> +<tr> + <td class="frams8"></td> + <td class="input_tab"> + <table width="168" border="0" align="center" cellpadding="2" cellspacing="0"> + <thead> + <tr> + <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Rename to'); ?></strong></td> + </tr> + </thead> + <tbody id="rename_to"> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('New name'); ?></td> + <td width="102"> + <input type="text" value="" id="e_rename"/> + </td> + </tr> + </tbody> + <tbody> + <tr> + <td colspan="2" align="center" nowrap="nowrap"> + <input type="button" class="butt" name="Button" + value="<?php echo __('OK'); ?>" onclick="edit('Rename')" /> + <input type="button" class="butt" name="Button" + value="<?php echo __('Cancel'); ?>" + onclick="document.getElementById('query_rename_to').style.visibility = 'hidden';" /> + </td> + </tr> + </tbody> + </table> + </td> + <td class="frams6"></td> +</tr> +<tr> + <td class="frams4"><div class="bor"></div></td> + <td class="frams7"></td> + <td class="frams3"></td> +</tr> +</tbody> +</table> + +<table id="query_having" style="visibility:<?php echo $hidden ?>;" + width="5%" border="0" cellpadding="0" cellspacing="0"> +<tbody> + <tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> + </tr> +<tr> + <td class="frams8"></td> + <td class="input_tab"> + <table width="168" border="0" align="center" cellpadding="2" cellspacing="0"> + <thead> + <tr> + <td colspan="2" align="center" nowrap="nowrap"><strong>HAVING</strong></td> + </tr> + </thead> + <tbody id="rename_to"> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> + <td width="102"><select name="hoperator" id="hoperator"> + <option value="---" selected="selected">---</option> + <option value="None" > None </option> + <option value="sum" > SUM </option> + <option value="min"> MIN </option> + <option value="max"> MAX </option> + <option value="avg"> AVG </option> + <option value="count"> COUNT </option> + </select> + </td></tr> + <tr> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> + <td width="102"><select name="hrel_opt" id="hrel_opt"> + <option value="--" selected="selected"> -- </option> + <option value="=" > = </option> + <option value=">"> > </option> + <option value="<"> < </option> + <option value=">="> >= </option> + <option value="<="> <= </option> + <option value="NOT"> NOT </option> + <option value="IN"> IN </option> + <option value="EXCEPT"> <?php echo __('Except'); ?> </option> + <option value="NOT IN"> NOT IN </option> + </select> + </td> + </tr> + <tr> + <td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td> + <td><textarea id="hQuery" value="" cols="18"></textarea> + </td> + </tr> + </tbody> + <tbody> + <tr> + <td colspan="2" align="center" nowrap="nowrap"> + <input type="button" class="butt" name="Button" + value="<?php echo __('OK'); ?>" onclick="edit('Having')" /> + <input type="button" class="butt" name="Button" + value="<?php echo __('Cancel'); ?>" + onclick="document.getElementById('query_having').style.visibility = 'hidden';" /> + </td> + </tr> + </tbody> + </table> + </td> + <td class="frams6"></td> +</tr> +<tr> + <td class="frams4"><div class="bor"></div></td> + <td class="frams7"></td> + <td class="frams3"></td> +</tr> +</tbody> +</table> + +<table id="query_Aggregate" style="visibility:<?php echo $hidden ?>;" + width="5%" border="0" cellpadding="0" cellspacing="0"> +<tbody> +<tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> +</tr> +<tr> + <td class="frams8"></td> + <td class="input_tab"> + <table width="168" border="0" align="center" cellpadding="2" cellspacing="0"> + <thead> + <tr> + <td colspan="2" align="center" nowrap="nowrap"><strong><?php echo __('Aggregate'); ?></strong></td> + </tr> + </thead> + <tbody> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> + <td width="102"> + <select name="operator" id="e_operator"> + <option value="---" selected="selected">---</option> + <option value="sum" > SUM </option> + <option value="min"> MIN </option> + <option value="max"> MAX </option> + <option value="avg"> AVG </option> + <option value="avg"> COUNT </option> + </select> + </td></tr> + </tbody> + <tbody> + <tr> + <td colspan="2" align="center" nowrap="nowrap"> + <input type="button" class="butt" name="Button" + value="<?php echo __('OK'); ?>" onclick="edit('Aggregate')" /> + <input type="button" class="butt" name="Button" + value="<?php echo __('Cancel'); ?>" + onclick="document.getElementById('query_Aggregate').style.visibility = 'hidden';" /> + </td> + </tr> + </tbody> + </table> + </td> + <td class="frams6"></td> +</tr> +<tr> + <td class="frams4"><div class="bor"></div></td> + <td class="frams7"></td> + <td class="frams3"></td> +</tr> +</tbody> +</table> + +<table id="query_where" style="visibility:<?php echo $hidden ?>;" + width="5%" border="0" cellpadding="0" cellspacing="0"> +<tbody> + <tr> + <td class="frams1" width="10px"></td> + <td class="frams5" width="99%" ></td> + <td class="frams2" width="10px"><div class="bor"></div></td> + </tr> +<tr> + <td class="frams8"></td> + <td class="input_tab"> + <table width="168" border="0" align="center" cellpadding="2" cellspacing="0"> + <thead> + <tr> + <td colspan="2" align="center" nowrap="nowrap"><strong>WHERE</strong></td> + </tr> + </thead> + <tbody id="rename_to"> + <tr> + <td width="58" nowrap="nowrap"><?php echo __('Operator'); ?></td> + <td width="102"><select name="erel_opt" id="erel_opt"> + <option value="--" selected="selected"> -- </option> + <option value="=" > = </option> + <option value=">"> > </option> + <option value="<"> < </option> + <option value=">="> >= </option> + <option value="<="> <= </option> + <option value="NOT"> NOT </option> + <option value="IN"> IN </option> + <option value="EXCEPT"> <?php echo __('Except'); ?> </option> + <option value="NOT IN"> NOT IN </option> + </select> + </td> + </tr> + <tr> + <td nowrap="nowrap"><?php echo __('Value'); ?>/<br /><?php echo __('subquery'); ?></td> + <td><textarea id="eQuery" value="" cols="18"></textarea> + </td> + </tr> + </tbody> + <tbody> + <tr> + <td colspan="2" align="center" nowrap="nowrap"> + <input type="button" class="butt" name="Button" + value="<?php echo __('OK'); ?>" onclick="edit('Where')" /> + <input type="button" class="butt" name="Button" + value="<?php echo __('Cancel'); ?>" + onclick="document.getElementById('query_where').style.visibility = 'hidden';" /> + </td> + </tr> + </tbody> + </table> + </td> + <td class="frams6"></td> +</tr> +<tr> + <td class="frams4"><div class="bor"></div></td> + <td class="frams7"></td> + <td class="frams3"></td> +</tr> +</tbody> +</table> + +<?php +if($_REQUEST['query']) { + echo '<div class="panel">'; + echo '<div style="clear:both;"></div>'; + echo '<div id="ab"></div>'; + echo '<div style="clear:both;"></div>'; + echo '</div>'; + echo '<a class="trigger" href="#">' . __('Active options') . '</a>'; + echo '<div id="filter"></div>'; + echo '<div id="box">'; + echo '<span id="boxtitle"></span>'; + echo '<form method="post" action="db_qbe.php" >'; + echo '<textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea><div id="tblfooter">'; + echo ' <input type="submit" name="submit_sql" class="btn">'; + echo ' <input type="button" name="cancel" value="Cancel" onClick="closebox()" class="btn">'; + echo PMA_generate_common_hidden_inputs($GLOBALS['db']); + echo '</div></p>'; + echo '</form></div>'; + +} ?> + +  <img src="pmd/images/2leftarrow_m.png" width="0" height="0" alt="" /> <img src="pmd/images/rightarrow1.png" width="0" height="0" alt="" /> diff --git a/readme b/readme new file mode 100644 index 0000000..e69de29 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10941-g20e460f
by Michal Čihař 19 Nov '10

19 Nov '10

The branch, master has been updated via 20e460fc50adeaa3da3da28b54b2361c577f11c6 (commit) via 34b9c051cceb3c3afeaa8e1b9ab14402fba5d855 (commit) via 2654d7f1a2f39f834f6829a5bad32fd2a69a00d1 (commit) via 975ba03fae234fbd89d9e74bcda1bd9334a64cbb (commit) via 8eb41622cb78597e022e1f55db332a263b1a3903 (commit) via 982dc588de5ecab0db3b2a69278bc8573a74f980 (commit) via e4f5d6486acb4f46cfc7ae36db2c4f14b63e19f5 (commit) via 9ed3c0f6ca5ba9aa95b6e344c2b6d3855938a8cb (commit) via 624de955775dbf46633c2106f3c285d70cbcec20 (commit) via 8b83240d35c7231ceabf6337dd6bbe779a1f56a1 (commit) from 265f4a74f34128a3942874e3e3a1a98a802284db (commit) - Log ----------------------------------------------------------------- commit 20e460fc50adeaa3da3da28b54b2361c577f11c6 Merge: 34b9c051cceb3c3afeaa8e1b9ab14402fba5d855 265f4a74f34128a3942874e3e3a1a98a802284db Author: Pootle server <pootle(a)cihar.com> Date: Fri Nov 19 12:40:16 2010 +0100 Merge remote branch 'origin/master' commit 34b9c051cceb3c3afeaa8e1b9ab14402fba5d855 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:06:38 2010 +0200 Translation update done using Pootle. commit 2654d7f1a2f39f834f6829a5bad32fd2a69a00d1 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:05:14 2010 +0200 Translation update done using Pootle. commit 975ba03fae234fbd89d9e74bcda1bd9334a64cbb Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:04:37 2010 +0200 Translation update done using Pootle. commit 8eb41622cb78597e022e1f55db332a263b1a3903 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:04:19 2010 +0200 Translation update done using Pootle. commit 982dc588de5ecab0db3b2a69278bc8573a74f980 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:02:44 2010 +0200 Translation update done using Pootle. commit e4f5d6486acb4f46cfc7ae36db2c4f14b63e19f5 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:02:29 2010 +0200 Translation update done using Pootle. commit 9ed3c0f6ca5ba9aa95b6e344c2b6d3855938a8cb Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:02:01 2010 +0200 Translation update done using Pootle. commit 624de955775dbf46633c2106f3c285d70cbcec20 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:01:51 2010 +0200 Translation update done using Pootle. commit 8b83240d35c7231ceabf6337dd6bbe779a1f56a1 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 13:01:45 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 14 +++++++------- po/fr.po | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index b94346a..70f19f5 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-18 06:21-0500\n" -"PO-Revision-Date: 2010-11-12 12:41+0200\n" +"PO-Revision-Date: 2010-11-19 13:06+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -2848,14 +2848,14 @@ msgid "Changes tracking" msgstr "Changes tracking" #: libraries/config/messages.inc.php:202 -#, fuzzy #| msgid "" #| "Tracking of changes made in database. Requires configured PMA database." msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" -"Tracking of changes made in database. Requires configured PMA database." +"Tracking of changes made in database. Requires the phpMyAdmin configuration " +"storage." #: libraries/config/messages.inc.php:203 msgid "Customize export options" @@ -6773,7 +6773,7 @@ msgstr "" "has been configured." #: main.php:304 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." @@ -6781,8 +6781,8 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." msgstr "" -"The phpMyAdmin configuration storage has been deactivated. To find out why " -"click %shere%s." +"The phpMyAdmin configuration storage is not completely configured, some " +"extended features have been deactivated. To find out why click %shere%s." #: main.php:319 msgid "" diff --git a/po/fr.po b/po/fr.po index 81cccc4..95c3110 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-18 06:21-0500\n" -"PO-Revision-Date: 2010-11-18 01:15+0200\n" +"PO-Revision-Date: 2010-11-19 13:02+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -567,7 +567,7 @@ msgstr "Dans la(les) table(s) :" #: db_search.php:352 msgid "Inside column:" -msgstr "Dans la colonne: " +msgstr "Dans la colonne : " #: db_structure.php:59 msgid "No tables found in database" @@ -1620,7 +1620,7 @@ msgstr "" #: libraries/auth/cookie.auth.lib.php:245 msgid "Server:" -msgstr "Serveur: " +msgstr "Serveur : " #: libraries/auth/cookie.auth.lib.php:250 msgid "Username:" @@ -4553,7 +4553,7 @@ msgstr "utiliser ceci pour les futures exportations" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:512 msgid "Character set of the file:" -msgstr "Jeu de caractères du fichier: " +msgstr "Jeu de caractères du fichier : " #: libraries/display_export.lib.php:309 msgid "Compression:" @@ -6399,7 +6399,7 @@ msgstr "" "essayer votre requête. Le message d'erreur présenté plus bas pourrait vous " "indiquer la source du problème. En dernier recours, veuillez trouver la plus " "courte requête possible qui cause le problème, et soumettre un rapport " -"d'anomalie en incluant la section à couper: " +"d'anomalie en incluant la section à couper : " #: libraries/sqlparser.lib.php:175 msgid "BEGIN CUT" @@ -7807,7 +7807,7 @@ msgstr "Synchroniser les bases de données avec le serveur maître" #: server_replication.php:320 msgid "Control slave:" -msgstr "Contrôler le serveur esclave: " +msgstr "Contrôler le serveur esclave : " #: server_replication.php:323 msgid "Full start" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_8-10931-g265f4a7
by Marc Delisle 19 Nov '10

19 Nov '10

The branch, master has been updated via 265f4a74f34128a3942874e3e3a1a98a802284db (commit) from b2d7a780120ccaca22f11a0cd644d22090a4f7cc (commit) - Log ----------------------------------------------------------------- commit 265f4a74f34128a3942874e3e3a1a98a802284db Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Nov 19 05:58:51 2010 -0500 Document column highlighting/marking ----------------------------------------------------------------------- Summary of changes: Documentation.html | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Documentation.html b/Documentation.html index d572174..e96044b 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1829,7 +1829,8 @@ $cfg['TrustedProxies'] = <dd>The colors (HTML) uses for the pointer and the marker in browse mode.<br /> The former feature highlights the row over which your mouse is passing and the latter lets you visually mark/unmark rows by clicking on - them.<br /> + them. Highlighting / marking a column is done by hovering over / + clicking the column's header (outside of the text).<br /> See <tt>themes/themename/layout.inc.php</tt>.</dd> hooks/post-receive -- phpMyAdmin

1 0