- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8647-ge0eaac2
by Herman van Rink 27 Aug '10

27 Aug '10

The branch, master has been updated via e0eaac2e144d1e738510839b93e5d9b0e9c020e8 (commit) via 51c9c1763ea70c36e0d22cc865b48f5186da1fbc (commit) via 0ea410c3e4fe6093723f65860f643cc096d78af2 (commit) via 58f8ebc23c2982a299773b3c2c15f144b089c27a (commit) via dcf470e6d752b80ffaf3d641eb0000e47f341d05 (commit) via e141acf5c6bec609cfcd72c9ac131942d59f8d2e (commit) via e076ec85e174038c7ffe17f701342e52f4413afe (commit) via 6fb5591f4edd26058056718c83305ad12501ae8e (commit) via d8edf38d0d66d2b30d7e8d56f85334c326527a31 (commit) via b477c4cb1a0ccbe75bd748470d590d7805b48e5d (commit) via b81a22e41f5027e85361997dc8d9936d86957f7f (commit) via b32e5879fd10bb7e650442e2e4af54f2ecc72c4c (commit) via 4d8d81f4e5191a19baa540c68003d99a0f7289b3 (commit) via 6c9f949613e766719a2a8bfd3a9919cd102f452a (commit) via 62b443c0691fa119958f6ac09ee6c6694ba54f3f (commit) via 0b90202b8ffb79b8246bb987248311757080f7aa (commit) via eb3f96ac51c78ec51827a2636c1757d8707377fa (commit) via d6185d7ace9d1e7fdba08568f3ded0e2b16462d3 (commit) via 59f220eb1307fd881ba43e809e0a729432d83d86 (commit) via 47f67613a2066b69bdf03ff8e43a857f59e8e230 (commit) via 68f4a8daf70a832f2f7d87c379250d6816895c0a (commit) via 55089f12dbd9493a92bab79e2d11a956368ad61f (commit) via fe77ca741c4ae9e89fdfd373c10b3cc36e068dc8 (commit) via 1c1d555002ec8b85ff134a8d9b572c9b4c8e51f7 (commit) via 0b620df9129c11087bde584b6f6f9e00b90e0f66 (commit) via 57614902eb7e7db60025a196ca79fa4170e22141 (commit) via 88b9e72597030218d781381ff3970efa30d65fbf (commit) via 4577d63b4d85e6f8c9700bf4fb80d3d9e865995a (commit) via b0888714b6ab232d7b0dfc24b38d0da9875eed70 (commit) via aecac3a6913aa6c93458f8df9edaf7cd4a055980 (commit) via c6ce98be18ae87c655721ef4559fbb42d3afdce2 (commit) via 34ec78abb5e222fc2fcf7bee31fd7cd73e0b7366 (commit) via 4f62c6c2ea45583539f3d191ad9bcf072b684d10 (commit) via 8b7e8257b34f5ae9ad60030d4d9f1d10f338b174 (commit) via 039e30450c7c81739b293b8138cabba2c25f5606 (commit) via 53c071941a7523ae35f8fdacb6ee9acdbda1aebc (commit) via 0604e81526cfd591b0ced14823a8a00c522ff66a (commit) via 3afe966b5196c0cc04d3d52ad61392a82949b0a1 (commit) via b7daf5d98571d9ec39c001f1b8065fcd490f4a8c (commit) via afe5f63c4bb5f34355a465ee8f85f620ad01d959 (commit) via 25a59f23d5d97e0d9459feba97eb63959c7b4f76 (commit) via e3736762aeecf47c4c4a062af49c5f5edc61448f (commit) via bcbd662f4856e3d7c413d182d2cf017c556daf64 (commit) via 557eb2096bedb5f46f49d10b8e3349f7273d4fe3 (commit) via 2f78d2d147ae22563e1c0d44e9f0a60155efee0e (commit) via c40e145597f1dddf04a99f3f776c1e83637b3653 (commit) via 979aa9a7ed7b4179d41de6998d6e8b4183611d22 (commit) via 3df1126c8539d410c0bc376a04c94401dbc109ed (commit) via 6b806f20477abf750fe071f89cb74c1d9a095f53 (commit) via e5c8b5a8945810af7178901056b7330f92191e8e (commit) via 08e048b3077c6d68e424372a7fc6f6958030ff55 (commit) via 7eedd0387db12235f529b11158683dca6c4b6522 (commit) via cd1cbce4efe567a05cd9c002987005b8ecc4b6c1 (commit) via 48f2caccae987a242912d4f17e87ebe3043c70f2 (commit) via 45e740e96b8f0b042d7974d2abc617095f7cb4eb (commit) via f53b1a52941fa839c76356a6de80c0fd11e97519 (commit) via 881bd0909febd4feab6144b8547e7881808afba4 (commit) via dfe34ad8d4860899c7415c94be5a0db9653860ad (commit) via 933238bcfb258a2f3b7276e804a13b1c4cd27c62 (commit) via 4d6fd853d341fcacd3bbdb878cba821a514cd5de (commit) via c530e97fb7a7cc28eebd410c39c11c0786b6eea8 (commit) via 2e421895edf8cb8557ec2c12158c96a8e2ab6d73 (commit) via e22cd9aab4dfcb3714aae10b949f8819f4e4e248 (commit) via 31622c3f83cb75bca67a171ac31bddb3290a798b (commit) via 09a7a4c9126d0a4175c047c44eab437347889218 (commit) via d387343ee00115b046572ab2757dce044364503d (commit) via 7958e84fffcc464e4a92512e37609c3340a9485b (commit) via 45fd079c9cf51f25fbcd8fd874255a54e861dbe7 (commit) via c1ed3e22915d91bfa613058e42a8f70fdd0a6e59 (commit) via c9a785cf038b081219f7493d946f65298d5e3f45 (commit) via 14ab690286cfe339ac661883228c59601be01bc1 (commit) via c342ad07e0e9c8ee1552ced4360ff2dbd07213f5 (commit) via f1e30fea1ee1c61819e1083a54ce3ce07915e559 (commit) via c2e7aef7bae96b1155cef26f9cdcf6505591b897 (commit) via 278ee6e2cabe1c38d3568cf8d342913f00393324 (commit) via 1cae244e8987ff294eed39cf4cd8ac8f3e08897c (commit) via eeead429908320594f2262c1071a99f02fb5aace (commit) via c5b49bb839f472487073d8b6508436aa4e0cff42 (commit) via 12d875dadc8539b6a7d2934d912878d723814e5c (commit) via 9970ce91da7655537ff442e98e987612f5bd39d0 (commit) via 8eb93f5a68bf81c2475dca4477d7e5e9e3a4964f (commit) via f9d20c8c7a82de57b965464782fb254244e7dec2 (commit) via 13c2a8cd24b333e31f6a3d9a688c1c61c851b479 (commit) via c152e0dd3e5776fe5ae6fe7f0543d07e48822aa7 (commit) via d1708970d6e5f407adf2a18a8dfe6c5720773efe (commit) via 7074f1b90ee7e9afe694caa6b9550679fbf52ad5 (commit) via f1b5ab52ef7f16fe66f0deede1c99964c10c25e8 (commit) via fc21678fa4d499085afa0fe333cf770cddd25a99 (commit) via d814efcfb634d8ddb25d5089d84583c4424bba1a (commit) via 473b9b38dcc8200b7efb9a52c8f24aa00d171ec6 (commit) via 9e25d0536d7d6e52f915d3cabde7bbde814f9e9e (commit) via 1f378cef7fed5565f722913dbed8ec7721a793fa (commit) via 7dd6900cfed526341e2004a3419b2f6974df5b04 (commit) via 61e00e523e7a36570bf05cacfae53dc33621f5e8 (commit) via 1cff6bd9283d6a9f3e1a3bf219ecf218ffe510fb (commit) via 79485cd126fb4111d129aaedc0ea1ec55ff59640 (commit) from 49ff70a30e1d185276b4862218ba3eb253708745 (commit) - Log ----------------------------------------------------------------- commit e0eaac2e144d1e738510839b93e5d9b0e9c020e8 Merge: 49ff70a30e1d185276b4862218ba3eb253708745 51c9c1763ea70c36e0d22cc865b48f5186da1fbc Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Aug 27 11:09:49 2010 +0200 Merge branch 'gsoc2010-blinky' commit 51c9c1763ea70c36e0d22cc865b48f5186da1fbc Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Aug 26 17:01:12 2010 +0200 Code cleanup, mostly added extra spaces commit 0ea410c3e4fe6093723f65860f643cc096d78af2 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Aug 26 10:01:08 2010 +0200 updated changelog commit 58f8ebc23c2982a299773b3c2c15f144b089c27a Merge: dcf470e6d752b80ffaf3d641eb0000e47f341d05 53b394181424dd08ee2d4431a47b49d9b6fd43c2 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Aug 26 09:54:42 2010 +0200 Merge branch 'master' into gsoc2010-blinky commit dcf470e6d752b80ffaf3d641eb0000e47f341d05 Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Aug 25 17:44:27 2010 +0200 duplicated icon from themes/original/img/b_chart.png commit e141acf5c6bec609cfcd72c9ac131942d59f8d2e Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Aug 19 11:03:58 2010 +0200 Changed text to tooltip, and elaborated. commit e076ec85e174038c7ffe17f701342e52f4413afe Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Aug 25 16:10:27 2010 +0200 Add vim mode lines commit 6fb5591f4edd26058056718c83305ad12501ae8e Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Aug 25 15:49:05 2010 +0200 Add CDATA to script code commit d8edf38d0d66d2b30d7e8d56f85334c326527a31 Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Aug 25 15:43:42 2010 +0200 Add some htmlspecialchars for XSS prevention commit b477c4cb1a0ccbe75bd748470d590d7805b48e5d Merge: b81a22e41f5027e85361997dc8d9936d86957f7f b32e5879fd10bb7e650442e2e4af54f2ecc72c4c Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Aug 25 16:59:54 2010 +0200 Merge branch 'blinky/master' into gsoc2010-blinky Conflicts: Documentation.html - renumbered 6.28 to 6.29 commit b81a22e41f5027e85361997dc8d9936d86957f7f Merge: 0aba4e12f02f92c07204d8063f98cf1904686464 1cff6bd9283d6a9f3e1a3bf219ecf218ffe510fb Author: Herman van Rink <rink(a)initfour.nl> Date: Wed Aug 25 16:30:12 2010 +0200 Merge remote branch 'blinky/master' into gsoc2010-blinky commit b32e5879fd10bb7e650442e2e4af54f2ecc72c4c Merge: 4d8d81f4e5191a19baa540c68003d99a0f7289b3 b51a217c36b45194f79915992a599338b3bac9ef Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Mon Aug 16 01:01:30 2010 +0300 Merge commit 'origin/master' into local commit 4d8d81f4e5191a19baa540c68003d99a0f7289b3 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Sun Aug 15 22:15:12 2010 +0300 added documentation link commit 6c9f949613e766719a2a8bfd3a9919cd102f452a Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Sun Aug 15 15:10:32 2010 +0300 added entry in the faq commit 62b443c0691fa119958f6ac09ee6c6694ba54f3f Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Aug 13 19:54:22 2010 +0300 chenaged comments in the JS files commit 0b90202b8ffb79b8246bb987248311757080f7aa Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Aug 13 14:50:21 2010 +0300 fixed an issue when a serie name was not set, thus generating a warning commit eb3f96ac51c78ec51827a2636c1757d8707377fa Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Aug 13 14:34:07 2010 +0300 changed comments to comply with phpdoc and added some new comments. Moved color settings to more appropriate places. commit d6185d7ace9d1e7fdba08568f3ded0e2b16462d3 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Aug 13 12:17:26 2010 +0300 removed leftovers from never-used flash chart implmenetation commit 59f220eb1307fd881ba43e809e0a729432d83d86 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Aug 6 13:22:04 2010 +0300 added check for json encoder, cleaned up error handling a bit commit 47f67613a2066b69bdf03ff8e43a857f59e8e230 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Aug 5 16:47:28 2010 +0300 fixed a notice which was generated on non supported query result format commit 68f4a8daf70a832f2f7d87c379250d6816895c0a Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 20:26:16 2010 +0300 removed OFC implementation, since we are not going to use it. commit 55089f12dbd9493a92bab79e2d11a956368ad61f Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 20:22:55 2010 +0300 getting title shadow back. Will see how it looks on the demo server. commit fe77ca741c4ae9e89fdfd373c10b3cc36e068dc8 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 20:22:03 2010 +0300 fixing built-in functions so that they work with modified imagemap. commit 1c1d555002ec8b85ff134a8d9b572c9b4c8e51f7 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 20:12:10 2010 +0300 fixed a bug if a chart was drawn for a query result of one row commit 0b620df9129c11087bde584b6f6f9e00b90e0f66 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 19:15:08 2010 +0300 enable warning report to the chart. commit 57614902eb7e7db60025a196ca79fa4170e22141 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 19:06:11 2010 +0300 image map enchancements. commit 88b9e72597030218d781381ff3970efa30d65fbf Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 16:18:57 2010 +0300 fixed not translated strings, thanks Herman commit 4577d63b4d85e6f8c9700bf4fb80d3d9e865995a Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 16:18:35 2010 +0300 commented the render function, thanks Herman commit b0888714b6ab232d7b0dfc24b38d0da9875eed70 Merge: aecac3a6913aa6c93458f8df9edaf7cd4a055980 d0fc397fe1c474150883e85a791a012a7ae03380 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 29 14:14:26 2010 +0300 Merge commit 'origin/master' into local Conflicts: server_status.php commit aecac3a6913aa6c93458f8df9edaf7cd4a055980 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 28 16:28:58 2010 +0300 trying to fix the title bug on the demo server commit c6ce98be18ae87c655721ef4559fbb42d3afdce2 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 28 12:26:40 2010 +0300 moved setting defaults to the correct place. commit 34ec78abb5e222fc2fcf7bee31fd7cd73e0b7366 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 28 11:27:32 2010 +0300 turned of shadow in the title commit 4f62c6c2ea45583539f3d191ad9bcf072b684d10 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 28 11:02:17 2010 +0300 added font size setting commit 8b7e8257b34f5ae9ad60030d4d9f1d10f338b174 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 27 18:32:47 2010 +0300 bugfix for changed format commit 039e30450c7c81739b293b8138cabba2c25f5606 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 27 18:28:19 2010 +0300 added setting for continuous image commit 53c071941a7523ae35f8fdacb6ee9acdbda1aebc Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 27 18:26:50 2010 +0300 forgot to swap label names commit 0604e81526cfd591b0ced14823a8a00c522ff66a Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 27 18:11:01 2010 +0300 bugfix and a query result format changes according to the latest wiki article about charts. commit 3afe966b5196c0cc04d3d52ad61392a82949b0a1 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 27 12:52:46 2010 +0300 added query results chart when results have only one column. commit b7daf5d98571d9ec39c001f1b8065fcd490f4a8c Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 23 16:53:46 2010 +0300 removed overlib dependancy. Written simple tooltip. commit afe5f63c4bb5f34355a465ee8f85f620ad01d959 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 23 13:54:19 2010 +0300 fixed radar chart tooltip text. commit 25a59f23d5d97e0d9459feba97eb63959c7b4f76 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 23 13:19:30 2010 +0300 chart is rendered in parts. Fixes the issue with browsers which have limited size on base64 images. commit e3736762aeecf47c4c4a062af49c5f5edc61448f Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 22 14:30:02 2010 +0300 cleaned JS for tooltips commit bcbd662f4856e3d7c413d182d2cf017c556daf64 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 21 19:35:15 2010 +0300 added tooltip JS includes for other chart places. commit 557eb2096bedb5f46f49d10b8e3349f7273d4fe3 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 21 19:32:17 2010 +0300 added tooltips for radar charts. commit 2f78d2d147ae22563e1c0d44e9f0a60155efee0e Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 20 23:29:13 2010 +0300 tooltip on the pie working. Now only on the query results chart. commit c40e145597f1dddf04a99f3f776c1e83637b3653 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 20 20:29:19 2010 +0300 added JS tooltips to the bar and line charts. Other types generate warnings for now. commit 979aa9a7ed7b4179d41de6998d6e8b4183611d22 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 9 17:34:28 2010 +0300 graceful error handling commit 3df1126c8539d410c0bc376a04c94401dbc109ed Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 9 16:29:14 2010 +0300 fixed custom axis lables on the multi chart. commit 6b806f20477abf750fe071f89cb74c1d9a095f53 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 9 16:27:25 2010 +0300 Chart title has been put to the settings array. commit e5c8b5a8945810af7178901056b7330f92191e8e Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 9 16:17:16 2010 +0300 default labels are returned to the settings form. commit 08e048b3077c6d68e424372a7fc6f6958030ff55 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 9 16:16:22 2010 +0300 fixed chart error handler. commit 7eedd0387db12235f529b11158683dca6c4b6522 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jul 9 16:08:53 2010 +0300 Fixed a case where a notice was generated when the first point was added to the data set. commit cd1cbce4efe567a05cd9c002987005b8ecc4b6c1 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 8 20:29:27 2010 +0300 data overflow fix commit 48f2caccae987a242912d4f17e87ebe3043c70f2 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 8 20:26:40 2010 +0300 error handling commit 45e740e96b8f0b042d7974d2abc617095f7cb4eb Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 8 19:52:38 2010 +0300 fixed option hendling commit f53b1a52941fa839c76356a6de80c0fd11e97519 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 8 14:19:16 2010 +0300 added radar chart type to the query results charts. commit 881bd0909febd4feab6144b8547e7881808afba4 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 8 13:47:29 2010 +0300 added value skip option to the radar chart in pChar.class commit dfe34ad8d4860899c7415c94be5a0db9653860ad Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 8 12:40:03 2010 +0300 added chart type PIE to the query results charts commit 933238bcfb258a2f3b7276e804a13b1c4cd27c62 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jul 8 11:24:49 2010 +0300 fixed a bug where GD function was used before the check if GD is available. commit 4d6fd853d341fcacd3bbdb878cba821a514cd5de Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 7 17:41:45 2010 +0300 Added multi bar chart. Added margin options. commit c530e97fb7a7cc28eebd410c39c11c0786b6eea8 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 7 16:57:30 2010 +0300 decreased the size of the points in the line chart commit 2e421895edf8cb8557ec2c12158c96a8e2ab6d73 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 7 16:57:06 2010 +0300 using background color setting now commit e22cd9aab4dfcb3714aae10b949f8819f4e4e248 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 7 16:37:09 2010 +0300 Restructured code. This allows more chart types and removes some code duplication. Added line charts. commit 31622c3f83cb75bca67a171ac31bddb3290a798b Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 7 16:34:02 2010 +0300 added getPieLegendBoxSize($Data) method commit 09a7a4c9126d0a4175c047c44eab437347889218 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 7 13:51:30 2010 +0300 added error messaged commit d387343ee00115b046572ab2757dce044364503d Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jul 7 09:29:29 2010 +0300 removed debug info added check for gd library commit 7958e84fffcc464e4a92512e37609c3340a9485b Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 6 23:26:36 2010 +0300 debug on the demo server commit 45fd079c9cf51f25fbcd8fd874255a54e861dbe7 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 6 22:23:34 2010 +0300 debug on the demo server commit c1ed3e22915d91bfa613058e42a8f70fdd0a6e59 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 6 21:23:03 2010 +0300 debug on the demo server commit c9a785cf038b081219f7493d946f65298d5e3f45 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 6 19:22:41 2010 +0300 debug on the demo server commit 14ab690286cfe339ac661883228c59601be01bc1 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 6 18:23:05 2010 +0300 debug on the demo server commit c342ad07e0e9c8ee1552ced4360ff2dbd07213f5 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 6 17:30:32 2010 +0300 debug on the demo server commit f1e30fea1ee1c61819e1083a54ce3ce07915e559 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jul 6 17:02:48 2010 +0300 debug on the demo server commit c2e7aef7bae96b1155cef26f9cdcf6505591b897 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jun 23 14:06:57 2010 +0300 added configurable settings for title and labels commit 278ee6e2cabe1c38d3568cf8d342913f00393324 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jun 23 13:32:23 2010 +0300 added curly braces where needed commit 1cae244e8987ff294eed39cf4cd8ac8f3e08897c Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Wed Jun 23 13:30:20 2010 +0300 fixed case error commit eeead429908320594f2262c1071a99f02fb5aace Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jun 22 15:25:06 2010 +0300 Moved settings to an array. Form fields to choose settings for query result chart. commit c5b49bb839f472487073d8b6508436aa4e0cff42 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jun 22 14:24:23 2010 +0300 added stacked bar chart commit 12d875dadc8539b6a7d2934d912878d723814e5c Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Mon Jun 21 17:35:42 2010 +0300 early code to show a chart for query results commit 9970ce91da7655537ff442e98e987612f5bd39d0 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Mon Jun 21 17:34:50 2010 +0300 restructured the code to be more OOP friendly commit 8eb93f5a68bf81c2475dca4477d7e5e9e3a4964f Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 20:54:32 2010 +0300 Increased default size. commit f9d20c8c7a82de57b965464782fb254244e7dec2 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 19:04:59 2010 +0300 added chart button. Will be used later to draw a chart of the query results. commit 13c2a8cd24b333e31f6a3d9a688c1c61c851b479 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 17:39:32 2010 +0300 fixed default sizes and colors. Fixed some var names. commit c152e0dd3e5776fe5ae6fe7f0543d07e48822aa7 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 17:14:04 2010 +0300 modified status chart size. commit d1708970d6e5f407adf2a18a8dfe6c5720773efe Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 17:10:19 2010 +0300 moved chart dependant code to the chart lib. commit 7074f1b90ee7e9afe694caa6b9550679fbf52ad5 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 16:01:56 2010 +0300 color changes to make them more distinguishable commit f1b5ab52ef7f16fe66f0deede1c99964c10c25e8 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 16:01:09 2010 +0300 added first pChart charts. commit fc21678fa4d499085afa0fe333cf770cddd25a99 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Thu Jun 17 16:00:08 2010 +0300 moved flash file to appropriate directory commit d814efcfb634d8ddb25d5089d84583c4424bba1a Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jun 15 20:13:34 2010 +0300 added the chart in the profiling window commit 473b9b38dcc8200b7efb9a52c8f24aa00d171ec6 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Tue Jun 15 20:13:12 2010 +0300 fixed the layout of the chart in the server status page commit 9e25d0536d7d6e52f915d3cabde7bbde814f9e9e Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Mon Jun 14 23:36:52 2010 +0300 implementation of the pie chart using OFC commit 1f378cef7fed5565f722913dbed8ec7721a793fa Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Mon Jun 14 23:36:22 2010 +0300 added OFC php wrapper together with SWF file to PMA commit 7dd6900cfed526341e2004a3419b2f6974df5b04 Merge: 61e00e523e7a36570bf05cacfae53dc33621f5e8 662f3d4da33363f77051a847488d41f40cf33655 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jun 4 16:29:15 2010 +0200 Merge commit 'origin/master' into local commit 61e00e523e7a36570bf05cacfae53dc33621f5e8 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Fri Jun 4 16:19:55 2010 +0200 file placeholder creation. Will build on top of these. commit 1cff6bd9283d6a9f3e1a3bf219ecf218ffe510fb Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Mon May 24 22:15:00 2010 +0200 Revert initial commit commit 79485cd126fb4111d129aaedc0ea1ec55ff59640 Author: Martynas Mickevicius <mmartynas(a)gmail.com> Date: Mon May 24 21:55:44 2010 +0200 test commit ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + Documentation.html | 5 + js/pMap.js | 164 ++ libraries/chart.lib.php | 257 ++ libraries/chart/pChart/fonts/tahoma.ttf | Bin 0 -> 383804 bytes libraries/chart/pChart/pCache.class | 119 + libraries/chart/pChart/pChart.class | 3626 +++++++++++++++++++++++++++ libraries/chart/pChart/pData.class | 260 ++ libraries/chart/pma_chart.php | 184 ++ libraries/chart/pma_pchart_chart.php | 399 +++ libraries/chart/pma_pchart_multi.php | 118 + libraries/chart/pma_pchart_multi_bar.php | 38 + libraries/chart/pma_pchart_multi_line.php | 39 + libraries/chart/pma_pchart_multi_radar.php | 100 + libraries/chart/pma_pchart_pie.php | 101 + libraries/chart/pma_pchart_single.php | 57 + libraries/chart/pma_pchart_single_bar.php | 35 + libraries/chart/pma_pchart_single_line.php | 35 + libraries/chart/pma_pchart_single_radar.php | 88 + libraries/chart/pma_pchart_stacked_bar.php | 36 + libraries/common.lib.php | 14 +- libraries/display_tbl.lib.php | 6 + server_status.php | 14 + sql.php | 3 +- tbl_chart.php | 192 ++ themes/darkblue_orange/img/b_chart.png | Bin 0 -> 3118 bytes themes/original/img/b_chart.png | Bin 0 -> 3118 bytes 27 files changed, 5889 insertions(+), 2 deletions(-) create mode 100644 js/pMap.js create mode 100644 libraries/chart.lib.php create mode 100644 libraries/chart/pChart/fonts/tahoma.ttf create mode 100644 libraries/chart/pChart/pCache.class create mode 100644 libraries/chart/pChart/pChart.class create mode 100644 libraries/chart/pChart/pData.class create mode 100644 libraries/chart/pma_chart.php create mode 100644 libraries/chart/pma_pchart_chart.php create mode 100644 libraries/chart/pma_pchart_multi.php create mode 100644 libraries/chart/pma_pchart_multi_bar.php create mode 100644 libraries/chart/pma_pchart_multi_line.php create mode 100644 libraries/chart/pma_pchart_multi_radar.php create mode 100644 libraries/chart/pma_pchart_pie.php create mode 100644 libraries/chart/pma_pchart_single.php create mode 100644 libraries/chart/pma_pchart_single_bar.php create mode 100644 libraries/chart/pma_pchart_single_line.php create mode 100644 libraries/chart/pma_pchart_single_radar.php create mode 100644 libraries/chart/pma_pchart_stacked_bar.php create mode 100644 tbl_chart.php create mode 100644 themes/darkblue_orange/img/b_chart.png create mode 100644 themes/original/img/b_chart.png diff --git a/ChangeLog b/ChangeLog index eb47035..10451cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -109,6 +109,7 @@ $Id$ - rfe #2973909 Users preferences - [relations] Dropped WYSIWYG-PDF configuration variable. - rfe #806035, #686260 [relations] Export relations to Dia, SVG and others ++ [interface] Added charts to status tab, profiling page and query results 3.3.7.0 (not yet released) diff --git a/Documentation.html b/Documentation.html index 96f0bee..50d6dd1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4340,6 +4340,11 @@ chmod o+rwx tmp other. </p> +<h4 id="faq6_29"> + <a href="#faq6_29">6.28 Why can't I get a chart from my query result table?</a></h4> + +<p> Not every table can be put to the chart. Only tables with one, two or three columns can be visualised as a chart. Moreover the table must be in a special format for chart script to understand it. Currently supported formats can be found in the <a href="http://wiki.phpmyadmin.net/pma/Devel:Charts#Data_formats_for_query_results_…">wiki</a>.</p> + <h3 id="faqproject">phpMyAdmin project</h3> <h4 id="faq7_1"> diff --git a/js/pMap.js b/js/pMap.js new file mode 100644 index 0000000..b63221c --- /dev/null +++ b/js/pMap.js @@ -0,0 +1,164 @@ +/** + * Holds the definition and the creation of the imageMap object + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * responsible for showing tooltips above the image chart + */ +var imageMap = { + 'mouseMoved': function(event, cont) { + // return if no imageMap set + // this can happen if server has no json + if (!this.imageMap) { + return; + } + + // get mouse coordinated relative to image + var mouseX = event.pageX - cont.offsetLeft; + var mouseY = event.pageY - cont.offsetTop; + + //console.log("X: " + mouseX + ", Y: " + mouseY); + + /* Check if we are flying over a map zone + * Lets use the following method to check if a given + * point is in any convex polygon. + * http://www.programmingforums.org/post168124-3.html + */ + var found = false; + for (var key = 0; key < this.imageMap.length; key++) + { + var seriesName = this.imageMap[key]['n']; + var seriesValue = this.imageMap[key]['v']; + + var signSum = 0; + for (var i = 0; i < this.imageMap[key]['p'].length; i++) + { + var index1; + var index2; + + if (i == this.imageMap[key]['p'].length - 1) + { + index1 = i; + index2 = 0; + } + else + { + index1 = i; + index2 = i+1; + } + var result = this.getDeterminant( + this.imageMap[key]['p'][index1][0], + this.imageMap[key]['p'][index1][1], + this.imageMap[key]['p'][index2][0], + this.imageMap[key]['p'][index2][1], + mouseX, + mouseY + ); + if (result > 0) { signSum += 1; } else { signSum += -1; } + } + + if (Math.abs(signSum) == this.imageMap[key]['p'].length) + { + found = true; + if (this.currentKey != key) + { + this.tooltip.show(); + this.tooltip.title(seriesName); + this.tooltip.text(seriesValue); + this.currentKey = key; + } + this.tooltip.move(mouseX + 20, mouseY + 20); + } + } + if (!found && this.currentKey != -1 ) + { + this.tooltip.hide(); + this.currentKey = -1; + } + }, + + 'getDeterminant': function (X1, Y1, X2, Y2, X3, Y3) { + return (X2*Y3 - X3*Y2) - (X1*Y3 - X3*Y1) + (X1*Y2 - X2*Y1); + }, + + 'loadImageMap': function(map) { + this.imageMap = JSON.parse(map); + for (key in this.imageMap) + { + // FIXME + // without this loop image map does not work + // on IE8 in the status page + } + }, + + 'init': function() { + this.tooltip.init(); + + $("div#chart").bind('mousemove',function(e) { + imageMap.mouseMoved(e, this); + }); + + this.tooltip.attach("div#chart"); + + this.currentKey = -1; + }, + + 'tooltip': { + 'init': function () { + this.el = $('<div></div>'); + this.el.css('position', 'absolute'); + this.el.css('font-family', 'tahoma'); + this.el.css('background-color', '#373737'); + this.el.css('color', '#BEBEBE'); + this.el.css('padding', '3px'); + + var title = $('<p></p>'); + title.attr('id', 'title'); + title.css('margin', '0px'); + title.css('padding', '3px'); + title.css('background-color', '#606060'); + title.css('text-align', 'center'); + title.html('Title'); + this.el.append(title); + + var text = $('<p></p>'); + text.attr('id', 'text'); + text.css('margin', '0'); + text.html('Text'); + this.el.append(text); + + this.hide(); + }, + + 'attach': function (element) { + $(element).prepend(this.el); + }, + + 'move': function (x, y) { + this.el.css('margin-left', x); + this.el.css('margin-top', y); + }, + + 'hide': function () { + this.el.css('display', 'none'); + }, + + 'show': function () { + this.el.css('display', 'block'); + }, + + 'title': function (title) { + this.el.find("p#title").html(title); + }, + + 'text': function (text) { + this.el.find("p#text").html(text.replace(/;/g, "<br />")); + } + } +}; + +$(document).ready(function() { + imageMap.init(); +}); diff --git a/libraries/chart.lib.php b/libraries/chart.lib.php new file mode 100644 index 0000000..045da94 --- /dev/null +++ b/libraries/chart.lib.php @@ -0,0 +1,257 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Chart functions used to generate various types of charts. + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +define('ERR_NO_GD', 0); +define('ERR_NO_JSON', 1); + +require_once './libraries/chart/pma_pchart_pie.php'; +require_once './libraries/chart/pma_pchart_single_bar.php'; +require_once './libraries/chart/pma_pchart_multi_bar.php'; +require_once './libraries/chart/pma_pchart_stacked_bar.php'; +require_once './libraries/chart/pma_pchart_single_line.php'; +require_once './libraries/chart/pma_pchart_multi_line.php'; +require_once './libraries/chart/pma_pchart_single_radar.php'; +require_once './libraries/chart/pma_pchart_multi_radar.php'; + +/** + * Formats a chart for the status page. + * @param array $data data for the status chart + * @return string HTML and JS code for the chart + */ +function PMA_chart_status($data) +{ + // format keys which will be shown in the chart + $chartData = array(); + foreach($data as $dataKey => $dataValue) { + $key = ucwords(str_replace(array('Com_', '_'), array('', ' '), $dataKey)); + $value = (int)$dataValue; + $chartData[$key] = $value; + } + + $chart = new PMA_pChart_Pie( + $chartData, + array('titleText' => __('Query statistics')) + ); + $chartCode = $chart->toString(); + PMA_handle_chart_err($chart->getErrors()); + echo $chartCode; +} + +/** + * Formats a chart for the profiling page. + * @param array $data data for the status chart + * @return string HTML and JS code for the chart + */ +function PMA_chart_profiling($data) +{ + $chartData = array(); + foreach($data as $dataValue) { + $value = (int)($dataValue['Duration'] * 1000000); + $key = ucwords($dataValue['Status']); + $chartData[$key] = $value; + } + + $chart = new PMA_pChart_Pie( + $chartData, + array('titleText' => __('Query execution time comparison (in microseconds)')) + ); + $chartCode = $chart->toString(); + PMA_handle_chart_err($chart->getErrors()); + echo $chartCode; +} + +/** + * Formats a chart for the query results page. + * @param array $data data for the status chart + * @param array $chartSettings settings used to generate the chart + * @return string HTML and JS code for the chart + */ +function PMA_chart_results($data, &$chartSettings) +{ + $chartData = array(); + $chart = null; + + // set default title if not already set + if (empty($chartSettings['titleText'])) { + $chartSettings['titleText'] = __('Query results'); + } + + // set default type if not already set + if (empty($chartSettings['type'])) { + $chartSettings['type'] = 'bar'; + } + + // set default type if not already set + if (empty($chartSettings['continuous'])) { + $chartSettings['continuous'] = 'off'; + } + + // set default bar type if needed + if ($chartSettings['type'] == 'bar' && empty($chartSettings['barType'])) { + $chartSettings['barType'] = 'stacked'; + } + + // default for legend + $chartSettings['legend'] = false; + + // default for muti series + $chartSettings['multi'] = false; + + if (!isset($data[0])) { + // empty data + return __('No data found for the chart.'); + } + + if (count($data[0]) == 1 || count($data[0]) == 2) { + // One or two columns in every row. + // This data is suitable for a simple bar chart. + + if ($chartSettings['type'] == 'pie') { + // loop through the rows, data for pie chart has to be formated + // in a different way then in other charts. + foreach ($data as $rowKey => $row) { + $values = array_values($row); + + if (count($row) == 1) { + $chartData[$rowKey] = $values[0]; + } + else { + $chartData[$values[1]] = $values[0]; + } + } + + $chartSettings['legend'] = true; + $chart = new PMA_pChart_pie($chartData, $chartSettings); + } + else { + // loop through the rows + foreach ($data as $rowKey => $row) { + + // loop through the columns in the row + foreach ($row as $valueKey => $value) { + $chartData[$valueKey][] = $value; + } + + // if only one column, we need to add + // placeholder data for x axis + if (count($row) == 1) { + $chartData[''][] = $rowKey; + } + } + + switch ($chartSettings['type']) { + case 'bar': + default: + $chart = new PMA_pChart_single_bar($chartData, $chartSettings); + break; + case 'line': + $chart = new PMA_pChart_single_line($chartData, $chartSettings); + break; + case 'radar': + $chart = new PMA_pChart_single_radar($chartData, $chartSettings); + break; + } + } + } + else if (count($data[0]) == 3) { + // Three columns (x axis, y axis, series) in every row. + // This data is suitable for a stacked bar chart. + $chartSettings['multi'] = true; + + $keys = array_keys($data[0]); + $yAxisKey = $keys[0]; + $xAxisKey = $keys[1]; + $seriesKey = $keys[2]; + + // get all the series labels + $seriesLabels = array(); + foreach ($data as $row) { + $seriesLabels[] = $row[$seriesKey]; + } + $seriesLabels = array_unique($seriesLabels); + + // loop through the rows + $currentXLabel = $data[0][$xAxisKey]; + foreach ($data as $row) { + + // save the label + // use the same value as the key and the value to get rid of duplicate results + $chartData[$xAxisKey][$row[$xAxisKey]] = $row[$xAxisKey]; + + // make sure to set value to every serie + $currentSeriesLabel = (string)$row[$seriesKey]; + foreach ($seriesLabels as $seriesLabelsValue) { + if ($currentSeriesLabel == $seriesLabelsValue) { + // the value os for this serie + $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = (int)$row[$yAxisKey]; + } + else if (!isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) { + // if the value for this serie is not set, set it to 0 + $chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = 0; + } + } + } + + $chartSettings['legend'] = true; + + // determine the chart type + switch ($chartSettings['type']) { + case 'bar': + default: + + // determine the bar chart type + switch ($chartSettings['barType']) { + case 'stacked': + default: + $chart = new PMA_pChart_stacked_bar($chartData, $chartSettings); + break; + case 'multi': + $chart = new PMA_pChart_multi_bar($chartData, $chartSettings); + break; + } + break; + + case 'line': + $chart = new PMA_pChart_multi_line($chartData, $chartSettings); + break; + case 'radar': + $chart = new PMA_pChart_multi_radar($chartData, $chartSettings); + break; + } + } + else { + // unknown data format + return ''; + } + + $chartCode = $chart->toString(); + $chartSettings = $chart->getSettings(); + $chartErrors = $chart->getErrors(); + PMA_handle_chart_err($chartErrors); + + return $chartCode; +} + +/** + * Simple handler of chart errors. + * @param array $errors all occured errors + */ +function PMA_handle_chart_err($errors) +{ + if (in_array(ERR_NO_GD, $errors)) { + PMA_warnMissingExtension('GD', false, __('GD extension is needed for charts.')); + } + else if (in_array(ERR_NO_JSON, $errors)) { + PMA_warnMissingExtension('JSON', false, __('JSON encoder is needed for chart tooltips.')); + } +} + +?> diff --git a/libraries/chart/pChart/fonts/tahoma.ttf b/libraries/chart/pChart/fonts/tahoma.ttf new file mode 100644 index 0000000..59b14a2 Binary files /dev/null and b/libraries/chart/pChart/fonts/tahoma.ttf differ diff --git a/libraries/chart/pChart/pCache.class b/libraries/chart/pChart/pCache.class new file mode 100644 index 0000000..2bcd6b0 --- /dev/null +++ b/libraries/chart/pChart/pCache.class @@ -0,0 +1,119 @@ +<?php + /* + pCache - Faster renderding using data cache + Copyright (C) 2008 Jean-Damien POGOLOTTI + Version 1.1.2 last updated on 06/17/08 + + http://pchart.sourceforge.net + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 1,2,3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + Class initialisation : + pCache($CacheFolder="Cache/") + Cache management : + IsInCache($Data) + GetFromCache($ID,$Data) + WriteToCache($ID,$Data,$Picture) + DeleteFromCache($ID,$Data) + ClearCache() + Inner functions : + GetHash($ID,$Data) + */ + + /* pCache class definition */ + class pCache + { + var $HashKey = ""; + var $CacheFolder = "Cache/"; + + /* Create the pCache object */ + function pCache($CacheFolder="Cache/") + { + $this->CacheFolder = $CacheFolder; + } + + /* This function is clearing the cache folder */ + function ClearCache() + { + if ($handle = opendir($this->CacheFolder)) + { + while (false !== ($file = readdir($handle))) + { + if ( $file != "." && $file != ".." ) + unlink($this->CacheFolder.$file); + } + closedir($handle); + } + } + + /* This function is checking if we have an offline version of this chart */ + function IsInCache($ID,$Data,$Hash="") + { + if ( $Hash == "" ) + $Hash = $this->GetHash($ID,$Data); + + if ( file_exists($this->CacheFolder.$Hash) ) + return(TRUE); + else + return(FALSE); + } + + /* This function is making a copy of drawn chart in the cache folder */ + function WriteToCache($ID,$Data,$Picture) + { + $Hash = $this->GetHash($ID,$Data); + $FileName = $this->CacheFolder.$Hash; + + imagepng($Picture->Picture,$FileName); + } + + /* This function is removing any cached copy of this chart */ + function DeleteFromCache($ID,$Data) + { + $Hash = $this->GetHash($ID,$Data); + $FileName = $this->CacheFolder.$Hash; + + if ( file_exists($FileName ) ) + unlink($FileName); + } + + /* This function is retrieving the cached picture if applicable */ + function GetFromCache($ID,$Data) + { + $Hash = $this->GetHash($ID,$Data); + if ( $this->IsInCache("","",$Hash ) ) + { + $FileName = $this->CacheFolder.$Hash; + + header('Content-type: image/png'); + @readfile($FileName); + exit(); + } + } + + /* This function is building the graph unique hash key */ + function GetHash($ID,$Data) + { + $mKey = "$ID"; + foreach($Data as $key => $Values) + { + $tKey = ""; + foreach($Values as $Serie => $Value) + $tKey = $tKey.$Serie.$Value; + $mKey = $mKey.md5($tKey); + } + return(md5($mKey)); + } + } +?> \ No newline at end of file diff --git a/libraries/chart/pChart/pChart.class b/libraries/chart/pChart/pChart.class new file mode 100644 index 0000000..2b5a077 --- /dev/null +++ b/libraries/chart/pChart/pChart.class @@ -0,0 +1,3626 @@ +<?php + /* + pChart - a PHP class to build charts! + Copyright (C) 2008 Jean-Damien POGOLOTTI + Version 1.27d last updated on 09/30/08 + + http://pchart.sourceforge.net + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 1,2,3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + Class initialisation : + pChart($XSize,$YSize) + Draw methods : + drawBackground($R,$G,$B) + drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B) + drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100) + drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B) + drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B) + drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0) + drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0) + drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B) + drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B) + drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE) + drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B) + drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B) + drawFromPNG($FileName,$X,$Y,$Alpha=100) + drawFromGIF($FileName,$X,$Y,$Alpha=100) + drawFromJPG($FileName,$X,$Y,$Alpha=100) + Graph setup methods : + addBorder($Width=3,$R=0,$G=0,$B=0) + clearScale() + clearShadow() + createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades) + drawGraphArea($R,$G,$B,$Stripe=FALSE) + drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE) + drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1) + drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1) + drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100) + drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=FALSE) + drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B) + drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE) + drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL) + drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50) + drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1) + drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA) + drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100) + getLegendBoxSize($DataDescription) + loadColorPalette($FileName,$Delimiter=",") + reportWarnings($Interface="CLI") + setGraphArea($X1,$Y1,$X2,$Y2) + setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210) + setColorPalette($ID,$R,$G,$B) + setCurrency($Currency) + setDateFormat($Format) + setFontProperties($FontName,$FontSize) + setLineStyle($Width=1,$DotSize=0) + setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMin=0,$XDivisions=5) + setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha) + writeValues($Data,$DataDescription,$Series) + Graphs methods : + drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE) + drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1) + drawLineGraph($Data,$DataDescription,$SerieName="") + drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0) + drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE) + drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="") + drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE) + drawOverlayBarGraph($Data,$DataDescription,$Alpha=50) + drawBarGraph($Data,$DataDescription,$Shadow=FALSE) + drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE) + drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0) + drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1) + drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1) + drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0) + drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0) + drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0) + drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0) + Other methods : + setImageMap($Mode=TRUE,$GraphID="MyGraph") + getImageMap() + getSavedImageMap($MapName,$Flush=TRUE) + Render($FileName) + Stroke() + */ + + /* Declare some script wide constants */ + define("SCALE_NORMAL",1); + define("SCALE_ADDALL",2); + define("SCALE_START0",3); + define("SCALE_ADDALLSTART0",4); + define("PIE_PERCENTAGE", 1); + define("PIE_LABELS",2); + define("PIE_NOLABEL",3); + define("PIE_PERCENTAGE_LABEL", 4); + define("TARGET_GRAPHAREA",1); + define("TARGET_BACKGROUND",2); + define("ALIGN_TOP_LEFT",1); + define("ALIGN_TOP_CENTER",2); + define("ALIGN_TOP_RIGHT",3); + define("ALIGN_LEFT",4); + define("ALIGN_CENTER",5); + define("ALIGN_RIGHT",6); + define("ALIGN_BOTTOM_LEFT",7); + define("ALIGN_BOTTOM_CENTER",8); + define("ALIGN_BOTTOM_RIGHT",9); + + /* pChart class definition */ + class pChart + { + /* Palettes definition */ + var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46), + "1"=>array("R"=>224,"G"=>100,"B"=>46), + "2"=>array("R"=>224,"G"=>214,"B"=>46), + "3"=>array("R"=>46,"G"=>151,"B"=>224), + "4"=>array("R"=>176,"G"=>46,"B"=>224), + "5"=>array("R"=>224,"G"=>46,"B"=>117), + "6"=>array("R"=>92,"G"=>224,"B"=>46), + "7"=>array("R"=>224,"G"=>176,"B"=>46)); + + /* Some static vars used in the class */ + var $XSize = NULL; + var $YSize = NULL; + var $Picture = NULL; + var $ImageMap = NULL; + + /* Error management */ + var $ErrorReporting = FALSE; + var $ErrorInterface = "CLI"; + var $Errors = NULL; + var $ErrorFontName = "Fonts/pf_arma_five.ttf"; + var $ErrorFontSize = 6; + + /* vars related to the graphing area */ + var $GArea_X1 = NULL; + var $GArea_Y1 = NULL; + var $GArea_X2 = NULL; + var $GArea_Y2 = NULL; + var $GAreaXOffset = NULL; + var $VMax = NULL; + var $VMin = NULL; + var $VXMax = NULL; + var $VXMin = NULL; + var $Divisions = NULL; + var $XDivisions = NULL; + var $DivisionHeight = NULL; + var $XDivisionHeight = NULL; + var $DivisionCount = NULL; + var $XDivisionCount = NULL; + var $DivisionRatio = NULL; + var $XDivisionRatio = NULL; + var $DivisionWidth = NULL; + var $DataCount = NULL; + var $Currency = "\$"; + + /* Text format related vars */ + var $FontName = NULL; + var $FontSize = NULL; + var $DateFormat = "d/m/Y"; + + /* Lines format related vars */ + var $LineWidth = 1; + var $LineDotSize = 0; + + /* Layer related vars */ + var $Layers = NULL; + + /* Set antialias quality : 0 is maximum, 100 minimum*/ + var $AntialiasQuality = 0; + + /* Shadow settings */ + var $ShadowActive = FALSE; + var $ShadowXDistance = 1; + var $ShadowYDistance = 1; + var $ShadowRColor = 60; + var $ShadowGColor = 60; + var $ShadowBColor = 60; + var $ShadowAlpha = 50; + var $ShadowBlur = 0; + + /* Image Map settings */ + var $BuildMap = FALSE; + var $MapFunction = NULL; + var $tmpFolder = "tmp/"; + var $MapID = NULL; + + /* This function create the background picture */ + function pChart($XSize,$YSize) + { + $this->XSize = $XSize; + $this->YSize = $YSize; + $this->Picture = imagecreatetruecolor($XSize,$YSize); + $C_White =$this->AllocateColor($this->Picture,255,255,255); + imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White); + imagecolortransparent($this->Picture,$C_White); + $this->setFontProperties("tahoma.ttf",8); + } + + /* Set if warnings should be reported */ + function reportWarnings($Interface="CLI") + { + $this->ErrorReporting = TRUE; + $this->ErrorInterface = $Interface; + } + + /* Set the font properties */ + function setFontProperties($FontName,$FontSize) + { + $this->FontName = $FontName; + $this->FontSize = $FontSize; + } + + /* Set the shadow properties */ + function setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha=50,$Blur=0) + { + $this->ShadowActive = TRUE; + $this->ShadowXDistance = $XDistance; + $this->ShadowYDistance = $YDistance; + $this->ShadowRColor = $R; + $this->ShadowGColor = $G; + $this->ShadowBColor = $B; + $this->ShadowAlpha = $Alpha; + $this->ShadowBlur = $Blur; + } + + /* Remove shadow option */ + function clearShadow() + { + $this->ShadowActive = FALSE; + } + + /* Set Palette color */ + function setColorPalette($ID,$R,$G,$B) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $this->Palette[$ID]["R"] = $R; + $this->Palette[$ID]["G"] = $G; + $this->Palette[$ID]["B"] = $B; + } + + /* Create a color palette shading from one color to another */ + function createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades) + { + $RFactor = ($R2-$R1)/$Shades; + $GFactor = ($G2-$G1)/$Shades; + $BFactor = ($B2-$B1)/$Shades; + + for($i=0;$i<=$Shades-1;$i++) + { + $this->Palette[$i]["R"] = $R1+$RFactor*$i; + $this->Palette[$i]["G"] = $G1+$GFactor*$i; + $this->Palette[$i]["B"] = $B1+$BFactor*$i; + } + } + + /* Load Color Palette from file */ + function loadColorPalette($FileName,$Delimiter=",") + { + $handle = @fopen($FileName,"r"); + $ColorID = 0; + if ($handle) + { + while (!feof($handle)) + { + $buffer = fgets($handle, 4096); + $buffer = str_replace(chr(10),"",$buffer); + $buffer = str_replace(chr(13),"",$buffer); + $Values = split($Delimiter,$buffer); + if ( count($Values) == 3 ) + { + $this->Palette[$ColorID]["R"] = $Values[0]; + $this->Palette[$ColorID]["G"] = $Values[1]; + $this->Palette[$ColorID]["B"] = $Values[2]; + $ColorID++; + } + } + } + } + + /* Set line style */ + function setLineStyle($Width=1,$DotSize=0) + { + $this->LineWidth = $Width; + $this->LineDotSize = $DotSize; + } + + /* Set currency symbol */ + function setCurrency($Currency) + { + $this->Currency = $Currency; + } + + /* Set the graph area location */ + function setGraphArea($X1,$Y1,$X2,$Y2) + { + $this->GArea_X1 = $X1; + $this->GArea_Y1 = $Y1; + $this->GArea_X2 = $X2; + $this->GArea_Y2 = $Y2; + } + + /* Prepare the graph area */ + function drawGraphArea($R,$G,$B,$Stripe=FALSE) + { + $this->drawFilledRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B,FALSE); + $this->drawRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R-40,$G-40,$B-40); + + if ( $Stripe ) + { + $R2 = $R-15; if ( $R2 < 0 ) { $R2 = 0; } + $G2 = $R-15; if ( $G2 < 0 ) { $G2 = 0; } + $B2 = $R-15; if ( $B2 < 0 ) { $B2 = 0; } + + $LineColor =$this->AllocateColor($this->Picture,$R2,$G2,$B2); + $SkewWidth = $this->GArea_Y2-$this->GArea_Y1-1; + + for($i=$this->GArea_X1-$SkewWidth;$i<=$this->GArea_X2;$i=$i+4) + { + $X1 = $i; $Y1 = $this->GArea_Y2; + $X2 = $i+$SkewWidth; $Y2 = $this->GArea_Y1; + + + if ( $X1 < $this->GArea_X1 ) + { $X1 = $this->GArea_X1; $Y1 = $this->GArea_Y1 + $X2 - $this->GArea_X1 + 1; } + + if ( $X2 >= $this->GArea_X2 ) + { $Y2 = $this->GArea_Y1 + $X2 - $this->GArea_X2 +1; $X2 = $this->GArea_X2 - 1; } +// * Fixed in 1.27 * { $X2 = $this->GArea_X2 - 1; $Y2 = $this->GArea_Y2 - ($this->GArea_X2 - $X1); } + + imageline($this->Picture,$X1,$Y1,$X2,$Y2+1,$LineColor); + } + } + } + + /* Allow you to clear the scale : used if drawing multiple charts */ + function clearScale() + { + $this->VMin = NULL; + $this->VMax = NULL; + $this->VXMin = NULL; + $this->VXMax = NULL; + $this->Divisions = NULL; + $this->XDivisions = NULL; } + + /* Allow you to fix the scale, use this to bypass the automatic scaling */ + function setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMax=0,$XDivisions=5) + { + $this->VMin = $VMin; + $this->VMax = $VMax; + $this->Divisions = $Divisions; + + if ( !$VXMin == 0 ) + { + $this->VXMin = $VXMin; + $this->VXMax = $VXMax; + $this->XDivisions = $XDivisions; + } + } + + /* Wrapper to the drawScale() function allowing a second scale to be drawn */ + function drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1) + { + $this->drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks,$Angle,$Decimals,$WithMargin,$SkipLabels,TRUE); + } + + /* Compute and draw the scale */ + function drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE) + { + /* Validate the Data and DataDescription array */ + $this->validateData("drawScale",$Data); + + $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B); + + $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B); + $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B); + + if ( $this->VMin == NULL && $this->VMax == NULL) + { + if (isset($DataDescription["Values"][0])) + { + $this->VMin = $Data[0][$DataDescription["Values"][0]]; + $this->VMax = $Data[0][$DataDescription["Values"][0]]; + } + else { $this->VMin = 2147483647; $this->VMax = -2147483647; } + + /* Compute Min and Max values */ + if ( $ScaleMode == SCALE_NORMAL || $ScaleMode == SCALE_START0 ) + { + if ( $ScaleMode == SCALE_START0 ) { $this->VMin = 0; } + + foreach ( $Data as $Key => $Values ) + { + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + if (isset($Data[$Key][$ColName])) + { + $Value = $Data[$Key][$ColName]; + + if ( is_numeric($Value) ) + { + if ( $this->VMax < $Value) { $this->VMax = $Value; } + if ( $this->VMin > $Value) { $this->VMin = $Value; } + } + } + } + } + } + elseif ( $ScaleMode == SCALE_ADDALL || $ScaleMode == SCALE_ADDALLSTART0 ) /* Experimental */ + { + if ( $ScaleMode == SCALE_ADDALLSTART0 ) { $this->VMin = 0; } + + foreach ( $Data as $Key => $Values ) + { + $Sum = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + if (isset($Data[$Key][$ColName])) + { + $Value = $Data[$Key][$ColName]; + if ( is_numeric($Value) ) + $Sum += $Value; + } + } + if ( $this->VMax < $Sum) { $this->VMax = $Sum; } + if ( $this->VMin > $Sum) { $this->VMin = $Sum; } + } + } + + if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) ) + $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1; + + /* If all values are the same */ + if ( $this->VMax == $this->VMin ) + { + if ( $this->VMax >= 0 ) { $this->VMax++; } + else { $this->VMin--; } + } + + $DataRange = $this->VMax - $this->VMin; + if ( $DataRange == 0 ) { $DataRange = .1; } + + /* Compute automatic scaling */ + $ScaleOk = FALSE; $Factor = 1; + $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight; + + if ( $this->VMin == 0 && $this->VMax == 0 ) + { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;} + elseif ($MaxDivs > 1) + { + while(!$ScaleOk) + { + $Scale1 = ( $this->VMax - $this->VMin ) / $Factor; + $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2; + $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4; + + if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;} + if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;} + if (!$ScaleOk) + { + if ( $Scale2 > 1 ) { $Factor = $Factor * 10; } + if ( $Scale2 < 1 ) { $Factor = $Factor / 10; } + } + } + + if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor) + { + $GridID = floor ( $this->VMax / $Scale / $Factor) + 1; + $this->VMax = $GridID * $Scale * $Factor; + $Divisions++; + } + + if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor) + { + $GridID = floor( $this->VMin / $Scale / $Factor); + $this->VMin = $GridID * $Scale * $Factor; + $Divisions++; + } + } + else /* Can occurs for small graphs */ + $Scale = 1; + + if ( !isset($Divisions) ) + $Divisions = 2; + + if ($Scale == 1 && $Divisions%2 == 1) + $Divisions--; + } + else + $Divisions = $this->Divisions; + + $this->DivisionCount = $Divisions; + + $DataRange = $this->VMax - $this->VMin; + if ( $DataRange == 0 ) { $DataRange = .1; } + + $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions; + $this->DivisionRatio = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange; + + $this->GAreaXOffset = 0; + if ( count($Data) > 1 ) + { + if ( $WithMargin == FALSE ) + $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data)-1); + else + { + $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data)); + $this->GAreaXOffset = $this->DivisionWidth / 2; + } + } + else + { + $this->DivisionWidth = $this->GArea_X2 - $this->GArea_X1; + $this->GAreaXOffset = $this->DivisionWidth / 2; + } + + $this->DataCount = count($Data); + + if ( $DrawTicks == FALSE ) + return(0); + + $YPos = $this->GArea_Y2; $XMin = NULL; + for($i=1;$i<=$Divisions+1;$i++) + { + if ( $RightScale ) + $this->drawLine($this->GArea_X2,$YPos,$this->GArea_X2+5,$YPos,$R,$G,$B); + else + $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B); + + $Value = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions); + $Value = round($Value * pow(10,$Decimals)) / pow(10,$Decimals); + if ( $DataDescription["Format"]["Y"] == "number" ) + $Value = $Value.$DataDescription["Unit"]["Y"]; + if ( $DataDescription["Format"]["Y"] == "time" ) + $Value = $this->ToTime($Value); + if ( $DataDescription["Format"]["Y"] == "date" ) + $Value = $this->ToDate($Value); + if ( $DataDescription["Format"]["Y"] == "metric" ) + $Value = $this->ToMetric($Value); + if ( $DataDescription["Format"]["Y"] == "currency" ) + $Value = $this->ToCurrency($Value); + + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value); + $TextWidth = $Position[2]-$Position[0]; + + if ( $RightScale ) + { + imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+10,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value); + if ( $XMin < $this->GArea_X2+15+$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X2+15+$TextWidth; } + } + else + { + imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value); + if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; } + } + + $YPos = $YPos - $this->DivisionHeight; + } + + /* Write the Y Axis caption if set */ + if ( isset($DataDescription["Axis"]["Y"]) ) + { + $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]); + $TextHeight = abs($Position[1])+abs($Position[3]); + $TextTop = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2); + + if ( $RightScale ) + imagettftext($this->Picture,$this->FontSize,90,$XMin+$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]); + else + imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]); + } + + /* Horizontal Axis */ + $XPos = $this->GArea_X1 + $this->GAreaXOffset; + $ID = 1; $YMax = NULL; + foreach ( $Data as $Key => $Values ) + { + if ( $ID % $SkipLabels == 0 ) + { + $this->drawLine(floor($XPos),$this->GArea_Y2,floor($XPos),$this->GArea_Y2+5,$R,$G,$B); + $Value = $Data[$Key][$DataDescription["Position"]]; + if ( $DataDescription["Format"]["X"] == "number" ) + $Value = $Value.$DataDescription["Unit"]["X"]; + if ( $DataDescription["Format"]["X"] == "time" ) + $Value = $this->ToTime($Value); + if ( $DataDescription["Format"]["X"] == "date" ) + $Value = $this->ToDate($Value); + if ( $DataDescription["Format"]["X"] == "metric" ) + $Value = $this->ToMetric($Value); + if ( $DataDescription["Format"]["X"] == "currency" ) + $Value = $this->ToCurrency($Value); + + $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value); + $TextWidth = abs($Position[2])+abs($Position[0]); + $TextHeight = abs($Position[1])+abs($Position[3]); + + if ( $Angle == 0 ) + { + $YPos = $this->GArea_Y2+18; + imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value); + } + else + { + $YPos = $this->GArea_Y2+10+$TextHeight; + if ( $Angle <= 90 ) + imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value); + else + imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value); + } + if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; } + } + + $XPos = $XPos + $this->DivisionWidth; + $ID++; + } + + /* Write the X Axis caption if set */ + if ( isset($DataDescription["Axis"]["X"]) ) + { + $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]); + $TextWidth = abs($Position[2])+abs($Position[0]); + $TextLeft = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2); + imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]); + } + } + + /* Compute and draw the scale for X/Y charts */ + function drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1) + { + /* Validate the Data and DataDescription array */ + $this->validateData("drawScale",$Data); + + $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B); + + $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B); + $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B); + + /* Process Y scale */ + if ( $this->VMin == NULL && $this->VMax == NULL) + { + $this->VMin = $Data[0][$YSerieName]; + $this->VMax = $Data[0][$YSerieName]; + + foreach ( $Data as $Key => $Values ) + { + if (isset($Data[$Key][$YSerieName])) + { + $Value = $Data[$Key][$YSerieName]; + if ( $this->VMax < $Value) { $this->VMax = $Value; } + if ( $this->VMin > $Value) { $this->VMin = $Value; } + } + } + + if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) ) + $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1; + + $DataRange = $this->VMax - $this->VMin; + if ( $DataRange == 0 ) { $DataRange = .1; } + + /* Compute automatic scaling */ + $ScaleOk = FALSE; $Factor = 1; + $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight; + + if ( $this->VMin == 0 && $this->VMax == 0 ) + { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;} + elseif ($MaxDivs > 1) + { + while(!$ScaleOk) + { + $Scale1 = ( $this->VMax - $this->VMin ) / $Factor; + $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2; + $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4; + + if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;} + if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;} + if (!$ScaleOk) + { + if ( $Scale2 > 1 ) { $Factor = $Factor * 10; } + if ( $Scale2 < 1 ) { $Factor = $Factor / 10; } + } + } + + if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor) + { + $GridID = floor ( $this->VMax / $Scale / $Factor) + 1; + $this->VMax = $GridID * $Scale * $Factor; + $Divisions++; + } + + if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor) + { + $GridID = floor( $this->VMin / $Scale / $Factor); + $this->VMin = $GridID * $Scale * $Factor; + $Divisions++; + } + } + else /* Can occurs for small graphs */ + $Scale = 1; + + if ( !isset($Divisions) ) + $Divisions = 2; + + if ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions-1))) + $Divisions--; + elseif ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions+1))) + $Divisions++; + } + else + $Divisions = $this->Divisions; + + $this->DivisionCount = $Divisions; + + $DataRange = $this->VMax - $this->VMin; + if ( $DataRange == 0 ) { $DataRange = .1; } + + $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions; + $this->DivisionRatio = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange; + + $YPos = $this->GArea_Y2; $XMin = NULL; + for($i=1;$i<=$Divisions+1;$i++) + { + $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B); + $Value = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions); + $Value = round($Value * pow(10,$Decimals)) / pow(10,$Decimals); + if ( $DataDescription["Format"]["Y"] == "number" ) + $Value = $Value.$DataDescription["Unit"]["Y"]; + if ( $DataDescription["Format"]["Y"] == "time" ) + $Value = $this->ToTime($Value); + if ( $DataDescription["Format"]["Y"] == "date" ) + $Value = $this->ToDate($Value); + if ( $DataDescription["Format"]["Y"] == "metric" ) + $Value = $this->ToMetric($Value); + if ( $DataDescription["Format"]["Y"] == "currency" ) + $Value = $this->ToCurrency($Value); + + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value); + $TextWidth = $Position[2]-$Position[0]; + imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value); + + if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; } + + $YPos = $YPos - $this->DivisionHeight; + } + + /* Process X scale */ + if ( $this->VXMin == NULL && $this->VXMax == NULL) + { + $this->VXMin = $Data[0][$XSerieName]; + $this->VXMax = $Data[0][$XSerieName]; + + foreach ( $Data as $Key => $Values ) + { + if (isset($Data[$Key][$XSerieName])) + { + $Value = $Data[$Key][$XSerieName]; + if ( $this->VXMax < $Value) { $this->VXMax = $Value; } + if ( $this->VXMin > $Value) { $this->VXMin = $Value; } + } + } + + if ( $this->VXMax > preg_replace('/\.[0-9]+/','',$this->VXMax) ) + $this->VXMax = preg_replace('/\.[0-9]+/','',$this->VXMax)+1; + + $DataRange = $this->VMax - $this->VMin; + if ( $DataRange == 0 ) { $DataRange = .1; } + + /* Compute automatic scaling */ + $ScaleOk = FALSE; $Factor = 1; + $MinDivWidth = 25; $MaxDivs = ($this->GArea_X2 - $this->GArea_X1) / $MinDivWidth; + + if ( $this->VXMin == 0 && $this->VXMax == 0 ) + { $this->VXMin = 0; $this->VXMax = 2; $Scale = 1; $XDivisions = 2;} + elseif ($MaxDivs > 1) + { + while(!$ScaleOk) + { + $Scale1 = ( $this->VXMax - $this->VXMin ) / $Factor; + $Scale2 = ( $this->VXMax - $this->VXMin ) / $Factor / 2; + $Scale4 = ( $this->VXMax - $this->VXMin ) / $Factor / 4; + + if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale1); $Scale = 1;} + if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale2); $Scale = 2;} + if (!$ScaleOk) + { + if ( $Scale2 > 1 ) { $Factor = $Factor * 10; } + if ( $Scale2 < 1 ) { $Factor = $Factor / 10; } + } + } + + if ( floor($this->VXMax / $Scale / $Factor) != $this->VXMax / $Scale / $Factor) + { + $GridID = floor ( $this->VXMax / $Scale / $Factor) + 1; + $this->VXMax = $GridID * $Scale * $Factor; + $XDivisions++; + } + + if ( floor($this->VXMin / $Scale / $Factor) != $this->VXMin / $Scale / $Factor) + { + $GridID = floor( $this->VXMin / $Scale / $Factor); + $this->VXMin = $GridID * $Scale * $Factor; + $XDivisions++; + } + } + else /* Can occurs for small graphs */ + $Scale = 1; + + if ( !isset($XDivisions) ) + $XDivisions = 2; + + if ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions-1))) + $XDivisions--; + elseif ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions+1))) + $XDivisions++; + } + else + $XDivisions = $this->XDivisions; + + $this->XDivisionCount = $Divisions; + $this->DataCount = $Divisions + 2; + + $XDataRange = $this->VXMax - $this->VXMin; + if ( $XDataRange == 0 ) { $XDataRange = .1; } + + $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDivisions; + $this->XDivisionRatio = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDataRange; + + $XPos = $this->GArea_X1; $YMax = NULL; + for($i=1;$i<=$XDivisions+1;$i++) + { + $this->drawLine($XPos,$this->GArea_Y2,$XPos,$this->GArea_Y2+5,$R,$G,$B); + + $Value = $this->VXMin + ($i-1) * (( $this->VXMax - $this->VXMin ) / $XDivisions); + $Value = round($Value * pow(10,$Decimals)) / pow(10,$Decimals); + if ( $DataDescription["Format"]["Y"] == "number" ) + $Value = $Value.$DataDescription["Unit"]["Y"]; + if ( $DataDescription["Format"]["Y"] == "time" ) + $Value = $this->ToTime($Value); + if ( $DataDescription["Format"]["Y"] == "date" ) + $Value = $this->ToDate($Value); + if ( $DataDescription["Format"]["Y"] == "metric" ) + $Value = $this->ToMetric($Value); + if ( $DataDescription["Format"]["Y"] == "currency" ) + $Value = $this->ToCurrency($Value); + + $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value); + $TextWidth = abs($Position[2])+abs($Position[0]); + $TextHeight = abs($Position[1])+abs($Position[3]); + + if ( $Angle == 0 ) + { + $YPos = $this->GArea_Y2+18; + imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value); + } + else + { + $YPos = $this->GArea_Y2+10+$TextHeight; + if ( $Angle <= 90 ) + imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value); + else + imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value); + } + + if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; } + + $XPos = $XPos + $this->DivisionWidth; + } + + /* Write the Y Axis caption if set */ + if ( isset($DataDescription["Axis"]["Y"]) ) + { + $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]); + $TextHeight = abs($Position[1])+abs($Position[3]); + $TextTop = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2); + imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]); + } + + /* Write the X Axis caption if set */ + if ( isset($DataDescription["Axis"]["X"]) ) + { + $Position = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]); + $TextWidth = abs($Position[2])+abs($Position[0]); + $TextLeft = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2); + imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]); + } + } + + /* Compute and draw the scale */ + function drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100) + { + /* Draw mosaic */ + if ( $Mosaic ) + { + $LayerWidth = $this->GArea_X2-$this->GArea_X1; + $LayerHeight = $this->GArea_Y2-$this->GArea_Y1; + + $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight); + $C_White =$this->AllocateColor($this->Layers[0],255,255,255); + imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White); + imagecolortransparent($this->Layers[0],$C_White); + + $C_Rectangle =$this->AllocateColor($this->Layers[0],250,250,250); + + $YPos = $LayerHeight; //$this->GArea_Y2-1; + $LastY = $YPos; + for($i=0;$i<=$this->DivisionCount;$i++) + { + $LastY = $YPos; + $YPos = $YPos - $this->DivisionHeight; + + if ( $YPos <= 0 ) { $YPos = 1; } + + if ( $i % 2 == 0 ) + { + imagefilledrectangle($this->Layers[0],1,$YPos,$LayerWidth-1,$LastY,$C_Rectangle); + } + } + imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha); + imagedestroy($this->Layers[0]); + } + + /* Horizontal lines */ + $YPos = $this->GArea_Y2 - $this->DivisionHeight; + for($i=1;$i<=$this->DivisionCount;$i++) + { + if ( $YPos > $this->GArea_Y1 && $YPos < $this->GArea_Y2 ) + $this->drawDottedLine($this->GArea_X1,$YPos,$this->GArea_X2,$YPos,$LineWidth,$R,$G,$B); + + $YPos = $YPos - $this->DivisionHeight; + } + + /* Vertical lines */ + if ( $this->GAreaXOffset == 0 ) + { $XPos = $this->GArea_X1 + $this->DivisionWidth + $this->GAreaXOffset; $ColCount = $this->DataCount-2; } + else + { $XPos = $this->GArea_X1 + $this->GAreaXOffset; $ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth ); } + + for($i=1;$i<=$ColCount;$i++) + { + if ( $XPos > $this->GArea_X1 && $XPos < $this->GArea_X2 ) + $this->drawDottedLine(floor($XPos),$this->GArea_Y1,floor($XPos),$this->GArea_Y2,$LineWidth,$R,$G,$B); + $XPos = $XPos + $this->DivisionWidth; + } + } + + /* retrieve the legends size */ + function getLegendBoxSize($DataDescription) + { + if ( !isset($DataDescription["Description"]) ) + return(-1); + + /* <-10->[8]<-4->Text<-10-> */ + $MaxWidth = 0; $MaxHeight = 8; + foreach($DataDescription["Description"] as $Key => $Value) + { + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = $Position[1]-$Position[7]; + if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; } + $MaxHeight = $MaxHeight + $TextHeight + 4; + } + $MaxHeight = $MaxHeight - 3; + $MaxWidth = $MaxWidth + 32; + + return(array($MaxWidth,$MaxHeight)); + } + + function getPieLegendBoxSize($Data) + { + $MaxWidth = 0; $MaxHeight = 8; + foreach($Data as $Value) + { + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value['Keys']); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = $Position[1]-$Position[7]; + if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; } + $MaxHeight = $MaxHeight + $TextHeight + 4; + } + $MaxHeight = $MaxHeight - 3; + $MaxWidth = $MaxWidth + 32; + + return(array($MaxWidth,$MaxHeight)); + } + + /* Draw the data legends */ + function drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=TRUE) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawLegend",$DataDescription); + + if ( !isset($DataDescription["Description"]) ) + return(-1); + + $C_TextColor =$this->AllocateColor($this->Picture,$Rt,$Gt,$Bt); + + /* <-10->[8]<-4->Text<-10-> */ + $MaxWidth = 0; $MaxHeight = 8; + foreach($DataDescription["Description"] as $Key => $Value) + { + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = $Position[1]-$Position[7]; + if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; } + $MaxHeight = $MaxHeight + $TextHeight + 4; + } + $MaxHeight = $MaxHeight - 5; + $MaxWidth = $MaxWidth + 32; + + if ( $Rs == -1 || $Gs == -1 || $Bs == -1 ) + { $Rs = $R-30; $Gs = $G-30; $Bs = $B-30; } + + if ( $Border ) + { + $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$Rs,$Gs,$Bs); + $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B); + } + + $YOffset = 4 + $this->FontSize; $ID = 0; + foreach($DataDescription["Description"] as $Key => $Value) + { + $this->drawFilledRoundedRectangle($XPos+10,$YPos+$YOffset-4,$XPos+14,$YPos+$YOffset-4,2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]); + imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value); + + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value); + $TextHeight = $Position[1]-$Position[7]; + + $YOffset = $YOffset + $TextHeight + 4; + $ID++; + } + } + + /* Draw the data legends */ + function drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawPieLegend",$DataDescription,FALSE); + $this->validateData("drawPieLegend",$Data); + + if ( !isset($DataDescription["Position"]) ) + return(-1); + + $C_TextColor =$this->AllocateColor($this->Picture,0,0,0); + + /* <-10->[8]<-4->Text<-10-> */ + $MaxWidth = 0; $MaxHeight = 8; + foreach($Data as $Key => $Value) + { + $Value2 = $Value[$DataDescription["Position"]]; + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value2); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = $Position[1]-$Position[7]; + if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; } + + $MaxHeight = $MaxHeight + $TextHeight + 4; + } + $MaxHeight = $MaxHeight - 3; + $MaxWidth = $MaxWidth + 32; + + $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$R-30,$G-30,$B-30); + $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B); + + $YOffset = 4 + $this->FontSize; $ID = 0; + foreach($Data as $Key => $Value) + { + $Value2 = $Value[$DataDescription["Position"]]; + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value2); + $TextHeight = $Position[1]-$Position[7]; + $this->drawFilledRectangle($XPos+10,$YPos+$YOffset-6,$XPos+14,$YPos+$YOffset-2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]); + + imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value2); + $YOffset = $YOffset + $TextHeight + 4; + $ID++; + } + } + + /* Draw the graph title */ + function drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE) + { + $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B); + + if ( $XPos2 != -1 ) + { + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value); + $TextWidth = $Position[2]-$Position[0]; + $XPos = floor(( $XPos2 - $XPos - $TextWidth ) / 2 ) + $XPos; + } + + if ( $YPos2 != -1 ) + { + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Value); + $TextHeight = $Position[5]-$Position[3]; + $YPos = floor(( $YPos2 - $YPos - $TextHeight ) / 2 ) + $YPos; + } + + if ( $Shadow ) + { + $C_ShadowColor = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor); + imagettftext($this->Picture,$this->FontSize,0,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$C_ShadowColor,$this->FontName,$Value); + } + + imagettftext($this->Picture,$this->FontSize,0,$XPos,$YPos,$C_TextColor,$this->FontName,$Value); + } + + /* Draw a text box with text align & alpha properties */ + function drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100) + { + $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Text); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = $Position[5]-$Position[3]; + $AreaWidth = $X2 - $X1; + $AreaHeight = $Y2 - $Y1; + + if ( $BgR != -1 && $BgG != -1 && $BgB != -1 ) + $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$BgR,$BgG,$BgB,FALSE,$Alpha); + + if ( $Align == ALIGN_TOP_LEFT ) { $X = $X1+1; $Y = $Y1+$this->FontSize+1; } + if ( $Align == ALIGN_TOP_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+$this->FontSize+1; } + if ( $Align == ALIGN_TOP_RIGHT ) { $X = $X2-$TextWidth-1; $Y = $Y1+$this->FontSize+1; } + if ( $Align == ALIGN_LEFT ) { $X = $X1+1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); } + if ( $Align == ALIGN_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+($AreaHeight/2)-($TextHeight/2); } + if ( $Align == ALIGN_RIGHT ) { $X = $X2-$TextWidth-1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); } + if ( $Align == ALIGN_BOTTOM_LEFT ) { $X = $X1+1; $Y = $Y2-1; } + if ( $Align == ALIGN_BOTTOM_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y2-1; } + if ( $Align == ALIGN_BOTTOM_RIGHT ) { $X = $X2-$TextWidth-1; $Y = $Y2-1; } + + $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B); + $C_ShadowColor =$this->AllocateColor($this->Picture,0,0,0); + if ( $Shadow ) + imagettftext($this->Picture,$this->FontSize,$Angle,$X+1,$Y+1,$C_ShadowColor,$this->FontName,$Text); + + imagettftext($this->Picture,$this->FontSize,$Angle,$X,$Y,$C_TextColor,$this->FontName,$Text); + } + + /* Compute and draw the scale */ + function drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B); + $Y = $this->GArea_Y2 - ($Value - $this->VMin) * $this->DivisionRatio; + + if ( $Y <= $this->GArea_Y1 || $Y >= $this->GArea_Y2 ) + return(-1); + + if ( $TickWidth == 0 ) + $this->drawLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$R,$G,$B); + else + $this->drawDottedLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$TickWidth,$R,$G,$B); + + if ( $ShowLabel ) + { + if ( $FreeText == NULL ) + { $Label = $Value; } else { $Label = $FreeText; } + + if ( $ShowOnRight ) + imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+2,$Y+($this->FontSize/2),$C_TextColor,$this->FontName,$Label); + else + imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1+2,$Y-($this->FontSize/2),$C_TextColor,$this->FontName,$Label); + } + } + + /* This function put a label on a specific point */ + function setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("setLabel",$DataDescription); + $this->validateData("setLabel",$Data); + $ShadowFactor = 100; + $C_Label =$this->AllocateColor($this->Picture,$R,$G,$B); + $C_Shadow =$this->AllocateColor($this->Picture,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor); + $C_TextColor =$this->AllocateColor($this->Picture,0,0,0); + + $Cp = 0; $Found = FALSE; + foreach ( $Data as $Key => $Value ) + { + if ( $Data[$Key][$DataDescription["Position"]] == $ValueName ) + { $NumericalValue = $Data[$Key][$SerieName]; $Found = TRUE; } + if ( !$Found ) + $Cp++; + } + + $XPos = $this->GArea_X1 + $this->GAreaXOffset + ( $this->DivisionWidth * $Cp ) + 2; + $YPos = $this->GArea_Y2 - ($NumericalValue - $this->VMin) * $this->DivisionRatio; + + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption); + $TextHeight = $Position[3] - $Position[5]; + $TextWidth = $Position[2]-$Position[0] + 2; + $TextOffset = floor($TextHeight/2); + + // Shadow + $Poly = array($XPos+1,$YPos+1,$XPos + 9,$YPos - $TextOffset,$XPos + 8,$YPos + $TextOffset + 2); + imagefilledpolygon($this->Picture,$Poly,3,$C_Shadow); + $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos - $TextOffset - .2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor); + $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor); + $this->drawFilledRectangle($XPos + 9,$YPos - $TextOffset-.2,$XPos + 13 + $TextWidth,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor); + + // Label background + $Poly = array($XPos,$YPos,$XPos + 8,$YPos - $TextOffset - 1,$XPos + 8,$YPos + $TextOffset + 1); + imagefilledpolygon($this->Picture,$Poly,3,$C_Label); + $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos - $TextOffset - 1.2,$R,$G,$B); + $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos + $TextOffset + 1.2,$R,$G,$B); + $this->drawFilledRectangle($XPos + 8,$YPos - $TextOffset - 1.2,$XPos + 12 + $TextWidth,$YPos + $TextOffset + 1.2,$R,$G,$B); + + imagettftext($this->Picture,$this->FontSize,0,$XPos + 10,$YPos + $TextOffset,$C_TextColor,$this->FontName,$Caption); + } + + /* This function draw a plot graph */ + function drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawPlotGraph",$DataDescription); + $this->validateData("drawPlotGraph",$Data); + + $GraphID = 0; + $Ro = $R2; $Go = $G2; $Bo = $B2; + + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $R = $this->Palette[$ColorID]["R"]; + $G = $this->Palette[$ColorID]["G"]; + $B = $this->Palette[$ColorID]["B"]; + $R2 = $Ro; $G2 = $Go; $B2 = $Bo; + + if ( isset($DataDescription["Symbol"][$ColName]) ) + { + $Is_Alpha = ((ord ( file_get_contents ($DataDescription["Symbol"][$ColName], false, null, 25, 1)) & 6) & 4) == 4; + + $Infos = getimagesize($DataDescription["Symbol"][$ColName]); + $ImageWidth = $Infos[0]; + $ImageHeight = $Infos[1]; + $Symbol = imagecreatefromgif($DataDescription["Symbol"][$ColName]); + } + + $XPos = $this->GArea_X1 + $this->GAreaXOffset; + $Hsize = round($BigRadius/2); + $R3 = -1; $G3 = -1; $B3 = -1; + foreach ( $Data as $Key => $Values ) + { + $Value = $Data[$Key][$ColName]; + $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio); + + /* Save point into the image map if option activated */ + if ( $this->BuildMap ) + $this->addToImageMap($XPos-$Hsize,$YPos-$Hsize,$XPos+1+$Hsize,$YPos+$Hsize+1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Plot"); + + if ( is_numeric($Value) ) + { + if ( !isset($DataDescription["Symbol"][$ColName]) ) + { + + if ( $Shadow ) + { + if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 ) + $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3); + else + { + $R3 = $this->Palette[$ColorID]["R"]-20; if ( $R3 < 0 ) { $R3 = 0; } + $G3 = $this->Palette[$ColorID]["G"]-20; if ( $G3 < 0 ) { $G3 = 0; } + $B3 = $this->Palette[$ColorID]["B"]-20; if ( $B3 < 0 ) { $B3 = 0; } + $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3); + } + } + + $this->drawFilledCircle($XPos+1,$YPos+1,$BigRadius,$R,$G,$B); + + if ( $SmallRadius != 0 ) + { + if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 ) + $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2); + else + { + $R2 = $this->Palette[$ColorID]["R"]-15; if ( $R2 < 0 ) { $R2 = 0; } + $G2 = $this->Palette[$ColorID]["G"]-15; if ( $G2 < 0 ) { $G2 = 0; } + $B2 = $this->Palette[$ColorID]["B"]-15; if ( $B2 < 0 ) { $B2 = 0; } + + $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2); + } + } + } + else + { + imagecopymerge($this->Picture,$Symbol,$XPos+1-$ImageWidth/2,$YPos+1-$ImageHeight/2,0,0,$ImageWidth,$ImageHeight,100); + } + } + + $XPos = $XPos + $this->DivisionWidth; + } + $GraphID++; + } + } + + /* This function draw a plot graph in an X/Y space */ + function drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=TRUE) + { + $R = $this->Palette[$PaletteID]["R"]; + $G = $this->Palette[$PaletteID]["G"]; + $B = $this->Palette[$PaletteID]["B"]; + $R3 = -1; $G3 = -1; $B3 = -1; + + $YLast = -1; $XLast = -1; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) ) + { + $X = $Data[$Key][$XSerieName]; + $Y = $Data[$Key][$YSerieName]; + + $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio); + $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio); + + + if ( $Shadow ) + { + if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 ) + $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3); + else + { + $R3 = $this->Palette[$PaletteID]["R"]-20; if ( $R < 0 ) { $R = 0; } + $G3 = $this->Palette[$PaletteID]["G"]-20; if ( $G < 0 ) { $G = 0; } + $B3 = $this->Palette[$PaletteID]["B"]-20; if ( $B < 0 ) { $B = 0; } + $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3); + } + } + + $this->drawFilledCircle($X+1,$Y+1,$BigRadius,$R,$G,$B); + + if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 ) + $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2); + else + { + $R2 = $this->Palette[$PaletteID]["R"]+20; if ( $R > 255 ) { $R = 255; } + $G2 = $this->Palette[$PaletteID]["G"]+20; if ( $G > 255 ) { $G = 255; } + $B2 = $this->Palette[$PaletteID]["B"]+20; if ( $B > 255 ) { $B = 255; } + $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2); + } + } + } + + } + + /* This function draw an area between two series */ + function drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50) + { + /* Validate the Data and DataDescription array */ + $this->validateData("drawArea",$Data); + + $LayerWidth = $this->GArea_X2-$this->GArea_X1; + $LayerHeight = $this->GArea_Y2-$this->GArea_Y1; + + $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight); + $C_White =$this->AllocateColor($this->Layers[0],255,255,255); + imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White); + imagecolortransparent($this->Layers[0],$C_White); + + $C_Graph =$this->AllocateColor($this->Layers[0],$R,$G,$B); + + $XPos = $this->GAreaXOffset; + $LastXPos = -1; + foreach ( $Data as $Key => $Values ) + { + $Value1 = $Data[$Key][$Serie1]; + $Value2 = $Data[$Key][$Serie2]; + $YPos1 = $LayerHeight - (($Value1-$this->VMin) * $this->DivisionRatio); + $YPos2 = $LayerHeight - (($Value2-$this->VMin) * $this->DivisionRatio); + + if ( $LastXPos != -1 ) + { + $Points = ""; + $Points[] = $LastXPos; $Points[] = $LastYPos1; + $Points[] = $LastXPos; $Points[] = $LastYPos2; + $Points[] = $XPos; $Points[] = $YPos2; + $Points[] = $XPos; $Points[] = $YPos1; + + imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph); + } + + $LastYPos1 = $YPos1; + $LastYPos2 = $YPos2; + $LastXPos = $XPos; + + $XPos = $XPos + $this->DivisionWidth; + } + + imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha); + imagedestroy($this->Layers[0]); + } + + + /* This function write the values of the specified series */ + function writeValues($Data,$DataDescription,$Series) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("writeValues",$DataDescription); + $this->validateData("writeValues",$Data); + + if ( !is_array($Series) ) { $Series = array($Series); } + + foreach($Series as $Key => $Serie) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $Serie ) { $ColorID = $ID; }; $ID++; } + + $XPos = $this->GArea_X1 + $this->GAreaXOffset; + $XLast = -1; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$Serie]) && is_numeric($Data[$Key][$Serie])) + { + $Value = $Data[$Key][$Serie]; + $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio); + + $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Value); + $Width = $Positions[2] - $Positions[6]; $XOffset = $XPos - ($Width/2); + $Height = $Positions[3] - $Positions[7]; $YOffset = $YPos - 4; + + $C_TextColor =$this->AllocateColor($this->Picture,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + imagettftext($this->Picture,$this->FontSize,0,$XOffset,$YOffset,$C_TextColor,$this->FontName,$Value); + } + $XPos = $XPos + $this->DivisionWidth; + } + + } + } + + /* This function draw a line graph */ + function drawLineGraph($Data,$DataDescription,$SerieName="") + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawLineGraph",$DataDescription); + $this->validateData("drawLineGraph",$Data); + + $GraphID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + if ( $SerieName == "" || $SerieName == $ColName ) + { + $XPos = $this->GArea_X1 + $this->GAreaXOffset; + $XLast = -1; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + { + $Value = $Data[$Key][$ColName]; + $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio); + + /* Save point into the image map if option activated */ + if ( $this->BuildMap ) + $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Line"); + + if (!is_numeric($Value)) { $XLast = -1; } + if ( $XLast != -1 ) + $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE); + + $XLast = $XPos; + $YLast = $YPos; + if (!is_numeric($Value)) { $XLast = -1; } + } + $XPos = $XPos + $this->DivisionWidth; + } + $GraphID++; + } + } + } + + /* This function draw a line graph */ + function drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0) + { + $YLast = -1; $XLast = -1; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) ) + { + $X = $Data[$Key][$XSerieName]; + $Y = $Data[$Key][$YSerieName]; + + $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio); + $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio); + + if ($XLast != -1 && $YLast != -1) + { + $this->drawLine($XLast,$YLast,$X,$Y,$this->Palette[$PaletteID]["R"],$this->Palette[$PaletteID]["G"],$this->Palette[$PaletteID]["B"],TRUE); + } + + $XLast = $X; + $YLast = $Y; + } + } + } + + /* This function draw a cubic curve */ + function drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="") + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawCubicCurve",$DataDescription); + $this->validateData("drawCubicCurve",$Data); + + $GraphID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + if ( $SerieName == "" || $SerieName == $ColName ) + { + $XIn = ""; $Yin = ""; $Yt = ""; $U = ""; + $XIn[0] = 0; $YIn[0] = 0; + + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $Index = 1; + $XLast = -1; $Missing = ""; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName]) ) + { + $Value = $Data[$Key][$ColName]; + $XIn[$Index] = $Index; + $YIn[$Index] = $Value; + if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; } + $Index++; + } + } + $Index--; + + $Yt[0] = 0; + $Yt[1] = 0; + $U[1] = 0; + for($i=2;$i<=$Index-1;$i++) + { + $Sig = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]); + $p = $Sig * $Yt[$i-1] + 2; + $Yt[$i] = ($Sig - 1) / $p; + $U[$i] = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]); + $U[$i] = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p; + } + + $qn = 0; + $un = 0; + $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1); + + for($k=$Index-1;$k>=1;$k--) + $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k]; + + $XPos = $this->GArea_X1 + $this->GAreaXOffset; + for($X=1;$X<=$Index;$X=$X+$Accuracy) + { + $klo = 1; + $khi = $Index; + $k = $khi - $klo; + while($k > 1) + { + $k = $khi - $klo; + If ( $XIn[$k] >= $X ) + $khi = $k; + else + $klo = $k; + } + $klo = $khi - 1; + + $h = $XIn[$khi] - $XIn[$klo]; + $a = ($XIn[$khi] - $X) / $h; + $b = ($X - $XIn[$klo]) / $h; + $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6; + + $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio); + + if ( $XLast != -1 && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)]) ) + $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE); + + $XLast = $XPos; + $YLast = $YPos; + $XPos = $XPos + $this->DivisionWidth * $Accuracy; + } + + // Add potentialy missing values + $XPos = $XPos - $this->DivisionWidth * $Accuracy; + if ( $XPos < ($this->GArea_X2 - $this->GAreaXOffset) ) + { + $YPos = $this->GArea_Y2 - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio); + $this->drawLine($XLast,$YLast,$this->GArea_X2-$this->GAreaXOffset,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE); + } + + $GraphID++; + } + } + } + + /* This function draw a filled cubic curve */ + function drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawFilledCubicCurve",$DataDescription); + $this->validateData("drawFilledCubicCurve",$Data); + + $LayerWidth = $this->GArea_X2-$this->GArea_X1; + $LayerHeight = $this->GArea_Y2-$this->GArea_Y1; + $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio); + if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; } + + $GraphID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $XIn = ""; $Yin = ""; $Yt = ""; $U = ""; + $XIn[0] = 0; $YIn[0] = 0; + + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $Index = 1; + $XLast = -1; $Missing = ""; + foreach ( $Data as $Key => $Values ) + { + $Value = $Data[$Key][$ColName]; + $XIn[$Index] = $Index; + $YIn[$Index] = $Value; + if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; } + $Index++; + } + $Index--; + + $Yt[0] = 0; + $Yt[1] = 0; + $U[1] = 0; + for($i=2;$i<=$Index-1;$i++) + { + $Sig = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]); + $p = $Sig * $Yt[$i-1] + 2; + $Yt[$i] = ($Sig - 1) / $p; + $U[$i] = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]); + $U[$i] = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p; + } + + $qn = 0; + $un = 0; + $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1); + + for($k=$Index-1;$k>=1;$k--) + $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k]; + + $Points = ""; + $Points[] = $this->GAreaXOffset; + $Points[] = $LayerHeight; + + $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight); + $C_White =$this->AllocateColor($this->Layers[0],255,255,255); + imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White); + imagecolortransparent($this->Layers[0],$C_White); + + $YLast = NULL; + $XPos = $this->GAreaXOffset; $PointsCount = 2; + for($X=1;$X<=$Index;$X=$X+$Accuracy) + { + $klo = 1; + $khi = $Index; + $k = $khi - $klo; + while($k > 1) + { + $k = $khi - $klo; + If ( $XIn[$k] >= $X ) + $khi = $k; + else + $klo = $k; + } + $klo = $khi - 1; + + $h = $XIn[$khi] - $XIn[$klo]; + $a = ($XIn[$khi] - $X) / $h; + $b = ($X - $XIn[$klo]) / $h; + $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6; + + $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio); + + if ( $YLast != NULL && $AroundZero && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)])) + { + $aPoints = ""; + $aPoints[] = $XLast; + $aPoints[] = $YLast; + $aPoints[] = $XPos; + $aPoints[] = $YPos; + $aPoints[] = $XPos; + $aPoints[] = $YZero; + $aPoints[] = $XLast; + $aPoints[] = $YZero; + + $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph); + } + + if ( !isset($Missing[floor($X)]) || $YLast == NULL ) + { + $PointsCount++; + $Points[] = $XPos; + $Points[] = $YPos; + } + else + { + $PointsCount++; $Points[] = $XLast; $Points[] = $LayerHeight; + } + + $YLast = $YPos; $XLast = $XPos; + $XPos = $XPos + $this->DivisionWidth * $Accuracy; + } + + // Add potentialy missing values + $XPos = $XPos - $this->DivisionWidth * $Accuracy; + if ( $XPos < ($LayerWidth-$this->GAreaXOffset) ) + { + $YPos = $LayerHeight - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio); + + if ( $YLast != NULL && $AroundZero ) + { + $aPoints = ""; + $aPoints[] = $XLast; + $aPoints[] = $YLast; + $aPoints[] = $LayerWidth-$this->GAreaXOffset; + $aPoints[] = $YPos; + $aPoints[] = $LayerWidth-$this->GAreaXOffset; + $aPoints[] = $YZero; + $aPoints[] = $XLast; + $aPoints[] = $YZero; + + $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph); + } + + if ( $YIn[$klo] != "" && $YIn[$khi] != "" || $YLast == NULL ) + { + $PointsCount++; + $Points[] = $LayerWidth-$this->GAreaXOffset; + $Points[] = $YPos; + } + } + + $Points[] = $LayerWidth-$this->GAreaXOffset; + $Points[] = $LayerHeight; + + if ( !$AroundZero ) + { + $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + imagefilledpolygon($this->Layers[0],$Points,$PointsCount,$C_Graph); + } + + imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha); + imagedestroy($this->Layers[0]); + + $this->drawCubicCurve($Data,$DataDescription,$Accuracy,$ColName); + + $GraphID++; + } + } + + /* This function draw a filled line graph */ + function drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE) + { + $Empty = -2147483647; + + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawFilledLineGraph",$DataDescription); + $this->validateData("drawFilledLineGraph",$Data); + + $LayerWidth = $this->GArea_X2-$this->GArea_X1; + $LayerHeight = $this->GArea_Y2-$this->GArea_Y1; + + $GraphID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $aPoints = ""; + $aPoints[] = $this->GAreaXOffset; + $aPoints[] = $LayerHeight; + + $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight); + $C_White = $this->AllocateColor($this->Layers[0],255,255,255); + imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White); + imagecolortransparent($this->Layers[0],$C_White); + + $XPos = $this->GAreaXOffset; + $XLast = -1; $PointsCount = 2; + $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio); + if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; } + + $YLast = $Empty; + foreach ( $Data as $Key => $Values ) + { + $Value = $Data[$Key][$ColName]; + $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio); + + /* Save point into the image map if option activated */ + if ( $this->BuildMap ) + $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"FLine"); + + if ( !is_numeric($Value) ) + { + $PointsCount++; + $aPoints[] = $XLast; + $aPoints[] = $LayerHeight; + + $YLast = $Empty; + } + else + { + $PointsCount++; + if ( $YLast <> $Empty ) + { $aPoints[] = $XPos; $aPoints[] = $YPos; } + else + { $PointsCount++; $aPoints[] = $XPos; $aPoints[] = $LayerHeight; $aPoints[] = $XPos; $aPoints[] = $YPos; } + + if ($YLast <> $Empty && $AroundZero) + { + $Points = ""; + $Points[] = $XLast; $Points[] = $YLast; + $Points[] = $XPos; + $Points[] = $YPos; + $Points[] = $XPos; + $Points[] = $YZero; + $Points[] = $XLast; + $Points[] = $YZero; + + $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph); + } + $YLast = $YPos; + } + + $XLast = $XPos; + $XPos = $XPos + $this->DivisionWidth; + } + $aPoints[] = $LayerWidth - $this->GAreaXOffset; + $aPoints[] = $LayerHeight; + + if ( $AroundZero == FALSE ) + { + $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + imagefilledpolygon($this->Layers[0],$aPoints,$PointsCount,$C_Graph); + } + + imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha); + imagedestroy($this->Layers[0]); + $GraphID++; + $this->drawLineGraph($Data,$DataDescription,$ColName); + } + } + + /* This function draw a bar graph */ + function drawOverlayBarGraph($Data,$DataDescription,$Alpha=50) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawOverlayBarGraph",$DataDescription); + $this->validateData("drawOverlayBarGraph",$Data); + + $LayerWidth = $this->GArea_X2-$this->GArea_X1; + $LayerHeight = $this->GArea_Y2-$this->GArea_Y1; + + $GraphID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $this->Layers[$GraphID] = imagecreatetruecolor($LayerWidth,$LayerHeight); + $C_White = $this->AllocateColor($this->Layers[$GraphID],255,255,255); + $C_Graph = $this->AllocateColor($this->Layers[$GraphID],$this->Palette[$GraphID]["R"],$this->Palette[$GraphID]["G"],$this->Palette[$GraphID]["B"]); + imagefilledrectangle($this->Layers[$GraphID],0,0,$LayerWidth,$LayerHeight,$C_White); + imagecolortransparent($this->Layers[$GraphID],$C_White); + + $XWidth = $this->DivisionWidth / 4; + $XPos = $this->GAreaXOffset; + $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio); + $XLast = -1; $PointsCount = 2; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName]) ) + { + $Value = $Data[$Key][$ColName]; + if ( is_numeric($Value) ) + { + $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio); + + imagefilledrectangle($this->Layers[$GraphID],$XPos-$XWidth,$YPos,$XPos+$XWidth,$YZero,$C_Graph); + + $X1 = floor($XPos - $XWidth + $this->GArea_X1); $Y1 = floor($YPos+$this->GArea_Y1) + .2; + $X2 = floor($XPos + $XWidth + $this->GArea_X1); $Y2 = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio); + if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; } + if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; } + + /* Save point into the image map if option activated */ + if ( $this->BuildMap ) + $this->addToImageMap($X1,min($Y1,$Y2),$X2,max($Y1,$Y2),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"oBar"); + + $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE); + } + } + $XPos = $XPos + $this->DivisionWidth; + } + + $GraphID++; + } + + for($i=0;$i<=($GraphID-1);$i++) + { + imagecopymerge($this->Picture,$this->Layers[$i],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha); + imagedestroy($this->Layers[$i]); + } + } + + /* This function draw a bar graph */ + function drawBarGraph($Data,$DataDescription,$Shadow=FALSE,$Alpha=100) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawBarGraph",$DataDescription); + $this->validateData("drawBarGraph",$Data); + + $GraphID = 0; + $Series = count($DataDescription["Values"]); + $SeriesWidth = $this->DivisionWidth / ($Series+1); + $SerieXOffset = $this->DivisionWidth / 2 - $SeriesWidth / 2; + + $YZero = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio); + if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; } + + $SerieID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $XPos = $this->GArea_X1 + $this->GAreaXOffset - $SerieXOffset + $SeriesWidth * $SerieID; + $XLast = -1; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + { + if ( is_numeric($Data[$Key][$ColName]) ) + { + $Value = $Data[$Key][$ColName]; + $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio); + + /* Save point into the image map if option activated */ + if ( $this->BuildMap ) + { + $this->addToImageMap($XPos+1,min($YZero,$YPos),$XPos+$SeriesWidth-1,max($YZero,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar"); + } + + if ( $Shadow && $Alpha == 100 ) + $this->drawRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,25,25,25,TRUE,$Alpha); + + $this->drawFilledRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha); + } + } + $XPos = $XPos + $this->DivisionWidth; + } + $SerieID++; + } + } + + /* This function draw a stacked bar graph */ + function drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawBarGraph",$DataDescription); + $this->validateData("drawBarGraph",$Data); + + $GraphID = 0; + $Series = count($DataDescription["Values"]); + if ( $Contiguous ) + $SeriesWidth = $this->DivisionWidth; + else + $SeriesWidth = $this->DivisionWidth * .8; + + $YZero = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio); + if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; } + + $SerieID = 0; $LastValue = ""; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $XPos = $this->GArea_X1 + $this->GAreaXOffset - $SeriesWidth / 2; + $XLast = -1; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + { + if ( is_numeric($Data[$Key][$ColName]) ) + { + $Value = $Data[$Key][$ColName]; + + if ( isset($LastValue[$Key]) ) + { + $YPos = $this->GArea_Y2 - ((($Value+$LastValue[$Key])-$this->VMin) * $this->DivisionRatio); + $YBottom = $this->GArea_Y2 - (($LastValue[$Key]-$this->VMin) * $this->DivisionRatio); + $LastValue[$Key] += $Value; + } + else + { + $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio); + $YBottom = $YZero; + $LastValue[$Key] = $Value; + } + + /* Save point into the image map if option activated */ + if ( $this->BuildMap ) + $this->addToImageMap($XPos+1,min($YBottom,$YPos),$XPos+$SeriesWidth-1,max($YBottom,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"sBar"); + + $this->drawFilledRectangle($XPos+1,$YBottom,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha); + } + } + $XPos = $XPos + $this->DivisionWidth; + } + $SerieID++; + } + } + + /* This function draw a limits bar graphs */ + function drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawLimitsGraph",$DataDescription); + $this->validateData("drawLimitsGraph",$Data); + + $XWidth = $this->DivisionWidth / 4; + $XPos = $this->GArea_X1 + $this->GAreaXOffset; + + foreach ( $Data as $Key => $Values ) + { + $Min = $Data[$Key][$DataDescription["Values"][0]]; + $Max = $Data[$Key][$DataDescription["Values"][0]]; + $GraphID = 0; $MaxID = 0; $MinID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + if ( isset($Data[$Key][$ColName]) ) + { + if ( $Data[$Key][$ColName] > $Max && is_numeric($Data[$Key][$ColName])) + { $Max = $Data[$Key][$ColName]; $MaxID = $GraphID; } + } + if ( isset($Data[$Key][$ColName]) && is_numeric($Data[$Key][$ColName])) + { + if ( $Data[$Key][$ColName] < $Min ) + { $Min = $Data[$Key][$ColName]; $MinID = $GraphID; } + $GraphID++; + } + } + + $YPos = $this->GArea_Y2 - (($Max-$this->VMin) * $this->DivisionRatio); + $X1 = floor($XPos - $XWidth); $Y1 = floor($YPos) - .2; + $X2 = floor($XPos + $XWidth); + if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; } + if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; } + + $YPos = $this->GArea_Y2 - (($Min-$this->VMin) * $this->DivisionRatio); + $Y2 = floor($YPos) + .2; + + $this->drawLine(floor($XPos)-.2,$Y1+1,floor($XPos)-.2,$Y2-1,$R,$G,$B,TRUE); + $this->drawLine(floor($XPos)+.2,$Y1+1,floor($XPos)+.2,$Y2-1,$R,$G,$B,TRUE); + $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$MaxID]["R"],$this->Palette[$MaxID]["G"],$this->Palette[$MaxID]["B"],FALSE); + $this->drawLine($X1,$Y2,$X2,$Y2,$this->Palette[$MinID]["R"],$this->Palette[$MinID]["G"],$this->Palette[$MinID]["B"],FALSE); + + $XPos = $XPos + $this->DivisionWidth; + } + } + + /* This function draw radar axis centered on the graph area */ + function drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1,$valueMod=1) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawRadarAxis",$DataDescription); + $this->validateData("drawRadarAxis",$Data); + + $C_TextColor = $this->AllocateColor($this->Picture,$A_R,$A_G,$A_B); + + /* Draw radar axis */ + $Points = count($Data); + $Radius = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset; + $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1; + $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1; + + /* Search for the max value */ + if ( $MaxValue == -1 ) + { + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; } + } + } + } + + /* Draw the mosaic */ + if ( $Mosaic ) + { + $RadiusScale = $Radius / $MaxValue; + for ( $t=1; $t<=$MaxValue-1; $t++) + { + $TRadius = $RadiusScale * $t; + $LastX1 = -1; + + for ( $i=0; $i<=$Points; $i++) + { + $Angle = -90 + $i * 360/$Points; + $X1 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter; + $Y1 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter; + $X2 = cos($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $XCenter; + $Y2 = sin($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $YCenter; + + if ( $t % 2 == 1 && $LastX1 != -1) + { + $Plots = ""; + $Plots[] = $X1; $Plots[] = $Y1; + $Plots[] = $X2; $Plots[] = $Y2; + $Plots[] = $LastX2; $Plots[] = $LastY2; + $Plots[] = $LastX1; $Plots[] = $LastY1; + + $C_Graph = $this->AllocateColor($this->Picture,250,250,250); + imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_Graph); + } + + $LastX1 = $X1; $LastY1= $Y1; + $LastX2 = $X2; $LastY2= $Y2; + } + } + } + + + /* Draw the spider web */ + for ( $t=1; $t<=$MaxValue; $t++) + { + $TRadius = ( $Radius / $MaxValue ) * $t; + $LastX = -1; + + for ( $i=0; $i<=$Points; $i++) + { + $Angle = -90 + $i * 360/$Points; + $X = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter; + $Y = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter; + + if ( $LastX != -1 ) + $this->drawDottedLine($LastX,$LastY,$X,$Y,4,$S_R,$S_G,$S_B); + + $LastX = $X; $LastY= $Y; + } + } + + /* Draw the axis */ + for ( $i=0; $i<=$Points; $i++) + { + $Angle = -90 + $i * 360/$Points; + $X = cos($Angle * 3.1418 / 180 ) * $Radius + $XCenter; + $Y = sin($Angle * 3.1418 / 180 ) * $Radius + $YCenter; + + $this->drawLine($XCenter,$YCenter,$X,$Y,$A_R,$A_G,$A_B); + + $XOffset = 0; $YOffset = 0; + if (isset($Data[$i][$DataDescription["Position"]])) + { + $Label = $Data[$i][$DataDescription["Position"]]; + + $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Label); + $Width = $Positions[2] - $Positions[6]; + $Height = $Positions[3] - $Positions[7]; + + if ( $Angle >= 0 && $Angle <= 90 ) + $YOffset = $Height; + + if ( $Angle > 90 && $Angle <= 180 ) + { $YOffset = $Height; $XOffset = -$Width; } + + if ( $Angle > 180 && $Angle <= 270 ) + { $XOffset = -$Width; } + + imagettftext($this->Picture,$this->FontSize,0,$X+$XOffset,$Y+$YOffset,$C_TextColor,$this->FontName,$Label); + + if ( $this->BuildMap ) + { + $vecX = $X - $XCenter; + $vecY = $Y - $YCenter; + + // get a perpendicular vector + $vecXtemp = $vecX; + $vecX = -$vecY; + $vecY = $vecXtemp; + + // normalization + $vecLength = sqrt($vecX * $vecX + $vecY * $vecY); + $vecX = $vecX / $vecLength; + $vecY = $vecY / $vecLength; + + $tooltipValue = ''; + foreach ($DataDescription['Description'] as $key => $value) { + $tooltipValue .= $value.' : '.sprintf("%.2f", $Data[$i][$key]).';'; + } + + $offset = 10; + $poly = array( + array($X+$vecX*-$offset,$Y+$vecY*-$offset), + array($X+$vecX*+$offset,$Y+$vecY*+$offset), + array($XCenter+$vecX*+$offset,$YCenter+$vecY*+$offset), + array($XCenter+$vecX*-$offset,$YCenter+$vecY*-$offset), + ); + $this->addPolyToImageMap($poly,$Label,$tooltipValue,'Radar'); + } + } + } + + /* Write the values */ + for ( $t=1; $t<=$MaxValue; $t++) + { + if ($t % $valueMod != 0) + { continue; } + + $TRadius = ( $Radius / $MaxValue ) * $t; + + $Angle = -90 + 360 / $Points; + $X1 = $XCenter; + $Y1 = $YCenter - $TRadius; + $X2 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter; + $Y2 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter; + + $XPos = floor(($X2-$X1)/2) + $X1; + $YPos = floor(($Y2-$Y1)/2) + $Y1; + + $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$t); + $X = $XPos - ( $X+$Positions[2] - $X+$Positions[6] ) / 2; + $Y = $YPos + $this->FontSize; + + $this->drawFilledRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,240,240,240); + $this->drawRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,220,220,220); + imagettftext($this->Picture,$this->FontSize,0,$X,$Y,$C_TextColor,$this->FontName,$t); + } + } + + /* This function draw a radar graph centered on the graph area */ + function drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawRadar",$DataDescription); + $this->validateData("drawRadar",$Data); + + $Points = count($Data); + $Radius = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset; + $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1; + $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1; + + /* Search for the max value */ + if ( $MaxValue == -1 ) + { + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; } + } + } + } + + $GraphID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $Angle = -90; + $XLast = -1; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + { + $Value = $Data[$Key][$ColName]; + $Strength = ( $Radius / $MaxValue ) * $Value; + + $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter; + $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter; + + if ( $XLast != -1 ) + $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + + if ( $XLast == -1 ) + { $FirstX = $XPos; $FirstY = $YPos; } + + $Angle = $Angle + (360/$Points); + $XLast = $XPos; + $YLast = $YPos; + } + } + $this->drawLine($XPos,$YPos,$FirstX,$FirstY,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + $GraphID++; + } + } + + /* This function draw a radar graph centered on the graph area */ + function drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawFilledRadar",$DataDescription); + $this->validateData("drawFilledRadar",$Data); + + $Points = count($Data); + $LayerWidth = $this->GArea_X2-$this->GArea_X1; + $LayerHeight = $this->GArea_Y2-$this->GArea_Y1; + $Radius = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset; + $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2; + $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2; + + /* Search for the max value */ + if ( $MaxValue == -1 ) + { + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + if ( $Data[$Key][$ColName] > $MaxValue && is_numeric($Data[$Key][$ColName])) { $MaxValue = $Data[$Key][$ColName]; } + } + } + } + + $GraphID = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + $ID = 0; + foreach ( $DataDescription["Description"] as $keyI => $ValueI ) + { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; } + + $Angle = -90; + $XLast = -1; + $Plots = ""; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + { + $Value = $Data[$Key][$ColName]; + if ( !is_numeric($Value) ) { $Value = 0; } + $Strength = ( $Radius / $MaxValue ) * $Value; + + $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter; + $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter; + + $Plots[] = $XPos; + $Plots[] = $YPos; + + $Angle = $Angle + (360/$Points); + $XLast = $XPos; + $YLast = $YPos; + } + } + + if (isset($Plots[0])) + { + $Plots[] = $Plots[0]; + $Plots[] = $Plots[1]; + + $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight); + $C_White = $this->AllocateColor($this->Layers[0],255,255,255); + imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White); + imagecolortransparent($this->Layers[0],$C_White); + + $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + imagefilledpolygon($this->Layers[0],$Plots,(count($Plots)+1)/2,$C_Graph); + + imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha); + imagedestroy($this->Layers[0]); + + for($i=0;$i<=count($Plots)-4;$i=$i+2) + $this->drawLine($Plots[$i]+$this->GArea_X1,$Plots[$i+1]+$this->GArea_Y1,$Plots[$i+2]+$this->GArea_X1,$Plots[$i+3]+$this->GArea_Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]); + } + + $GraphID++; + } + } + + /* This function draw a flat pie chart */ + function drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawBasicPieGraph",$DataDescription,FALSE); + $this->validateData("drawBasicPieGraph",$Data); + + /* Determine pie sum */ + $Series = 0; $PieSum = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + if ( $ColName != $DataDescription["Position"] ) + { + $Series++; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; + } + } + } + + /* Validate serie */ + if ( $Series != 1 ) + RaiseFatal("Pie chart can only accept one serie of data."); + + $SpliceRatio = 360 / $PieSum; + $SplicePercent = 100 / $PieSum; + + /* Calculate all polygons */ + $Angle = 0; $TopPlots = ""; + foreach($iValues as $Key => $Value) + { + $TopPlots[$Key][] = $XPos; + $TopPlots[$Key][] = $YPos; + + /* Process labels position & size */ + $Caption = ""; + if ( !($DrawLabels == PIE_NOLABEL) ) + { + $TAngle = $Angle+($Value*$SpliceRatio/2); + if ($DrawLabels == PIE_PERCENTAGE) + $Caption = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%"; + elseif ($DrawLabels == PIE_LABELS) + $Caption = $iLabels[$Key]; + elseif ($DrawLabels == PIE_PERCENTAGE_LABEL) + $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%"; + elseif ($DrawLabels == PIE_PERCENTAGE_LABEL) + $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%"; + + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = abs($Position[1])+abs($Position[3]); + + $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $XPos; + + if ( $TAngle > 0 && $TAngle < 180 ) + $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $YPos + 4; + else + $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+4) + $YPos - ($TextHeight/2); + + if ( $TAngle > 90 && $TAngle < 270 ) + $TX = $TX - $TextWidth; + + $C_TextColor = $this->AllocateColor($this->Picture,70,70,70); + imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption); + } + + /* Process pie slices */ + for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5) + { + $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos; + $TopY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos; + + $TopPlots[$Key][] = $TopX; + $TopPlots[$Key][] = $TopY; + } + + $TopPlots[$Key][] = $XPos; + $TopPlots[$Key][] = $YPos; + + $Angle = $iAngle; + } + $PolyPlots = $TopPlots; + + /* Set array values type to float --- PHP Bug with imagefilledpolygon casting to integer */ + foreach ($TopPlots as $Key => $Value) + { foreach ($TopPlots[$Key] as $Key2 => $Value2) { settype($TopPlots[$Key][$Key2],"float"); } } + + /* Draw Top polygons */ + foreach ($PolyPlots as $Key => $Value) + { + $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]); + imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo); + } + + $this->drawCircle($XPos-.5,$YPos-.5,$Radius,$R,$G,$B); + $this->drawCircle($XPos-.5,$YPos-.5,$Radius+.5,$R,$G,$B); + + /* Draw Top polygons */ + foreach ($TopPlots as $Key => $Value) + { + for($j=0;$j<=count($TopPlots[$Key])-4;$j=$j+2) + $this->drawLine($TopPlots[$Key][$j],$TopPlots[$Key][$j+1],$TopPlots[$Key][$j+2],$TopPlots[$Key][$j+3],$R,$G,$B); + } + } + + function drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0) + { + $this->drawFlatPieGraph($Data,$DataDescription,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$Radius,PIE_NOLABEL,$SpliceDistance,$Decimals,TRUE); + $this->drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius,$DrawLabels,$SpliceDistance,$Decimals,FALSE); + } + + /* This function draw a flat pie chart */ + function drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0,$AllBlack=FALSE) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawFlatPieGraph",$DataDescription,FALSE); + $this->validateData("drawFlatPieGraph",$Data); + + $ShadowStatus = $this->ShadowActive ; $this->ShadowActive = FALSE; + + /* Determine pie sum */ + $Series = 0; $PieSum = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + if ( $ColName != $DataDescription["Position"] ) + { + $Series++; + foreach ( $Data as $Key => $Values ) + { + if ( isset($Data[$Key][$ColName])) + $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; + } + } + } + + /* Validate serie */ + if ( $Series != 1 ) + { + RaiseFatal("Pie chart can only accept one serie of data."); + return(0); + } + + $SpliceRatio = 360 / $PieSum; + $SplicePercent = 100 / $PieSum; + + /* Calculate all polygons */ + $Angle = 0; $TopPlots = ""; + foreach($iValues as $Key => $Value) + { + $XOffset = cos(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance; + $YOffset = sin(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance; + + $TopPlots[$Key][] = round($XPos + $XOffset); + $TopPlots[$Key][] = round($YPos + $YOffset); + + if ( $AllBlack ) + { $Rc = $this->ShadowRColor; $Gc = $this->ShadowGColor; $Bc = $this->ShadowBColor; } + else + { $Rc = $this->Palette[$Key]["R"]; $Gc = $this->Palette[$Key]["G"]; $Bc = $this->Palette[$Key]["B"]; } + + $XLineLast = ""; $YLineLast = ""; + + /* Process labels position & size */ + $Caption = ""; + if ( !($DrawLabels == PIE_NOLABEL) ) + { + $TAngle = $Angle+($Value*$SpliceRatio/2); + if ($DrawLabels == PIE_PERCENTAGE) + $Caption = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%"; + elseif ($DrawLabels == PIE_LABELS) + $Caption = $iLabels[$Key]; + elseif ($DrawLabels == PIE_PERCENTAGE_LABEL) + $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%"; + elseif ($DrawLabels == PIE_PERCENTAGE_LABEL) + $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%"; + + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = abs($Position[1])+abs($Position[3]); + + $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $XPos; + + if ( $TAngle > 0 && $TAngle < 180 ) + $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $YPos + 4; + else + $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+$SpliceDistance+4) + $YPos - ($TextHeight/2); + + if ( $TAngle > 90 && $TAngle < 270 ) + $TX = $TX - $TextWidth; + + $C_TextColor = $this->AllocateColor($this->Picture,70,70,70); + imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption); + } + + /* Process pie slices */ + if ( !$AllBlack ) + $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc); + else + $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc); + + $XLineLast = ""; $YLineLast = ""; + for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5) + { + $PosX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos + $XOffset; + $PosY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos + $YOffset; + + $TopPlots[$Key][] = round($PosX); $TopPlots[$Key][] = round($PosY); + + if ( $iAngle == $Angle || $iAngle == $Angle+$Value*$SpliceRatio || $iAngle +.5 > $Angle+$Value*$SpliceRatio) + $this->drawLine($XPos+$XOffset,$YPos+$YOffset,$PosX,$PosY,$Rc,$Gc,$Bc); + + if ( $XLineLast != "" ) + $this->drawLine($XLineLast,$YLineLast,$PosX,$PosY,$Rc,$Gc,$Bc); + + $XLineLast = $PosX; $YLineLast = $PosY; + } + + $TopPlots[$Key][] = round($XPos + $XOffset); $TopPlots[$Key][] = round($YPos + $YOffset); + + $Angle = $iAngle; + } + $PolyPlots = $TopPlots; + + /* Draw Top polygons */ + foreach ($PolyPlots as $Key => $Value) + { + if ( !$AllBlack ) + $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]); + else + $C_GraphLo = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor); + + imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo); + } + $this->ShadowActive = $ShadowStatus; + } + + /* This function draw a pseudo-3D pie chart */ + function drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0) + { + /* Validate the Data and DataDescription array */ + $this->validateDataDescription("drawPieGraph",$DataDescription,FALSE); + $this->validateData("drawPieGraph",$Data); + + /* Determine pie sum */ + $Series = 0; $PieSum = 0; $rPieSum = 0; + foreach ( $DataDescription["Values"] as $Key2 => $ColName ) + { + if ( $ColName != $DataDescription["Position"] ) + { + $Series++; + foreach ( $Data as $Key => $Values ) + if ( isset($Data[$Key][$ColName])) + { + if ( $Data[$Key][$ColName] == 0 ) + { $iValues[] = 0; $rValues[] = 0; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; } + // Removed : $PieSum++; $rValues[] = 1; + else + { $PieSum += $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; $rValues[] = $Data[$Key][$ColName]; $rPieSum += $Data[$Key][$ColName];} + } + } + } + + /* Validate serie */ + if ( $Series != 1 ) + RaiseFatal("Pie chart can only accept one serie of data."); + + $SpliceDistanceRatio = $SpliceDistance; + $SkewHeight = ($Radius * $Skew) / 100; + $SpliceRatio = (360 - $SpliceDistanceRatio * count($iValues) ) / $PieSum; + $SplicePercent = 100 / $PieSum; + $rSplicePercent = 100 / $rPieSum; + + /* Calculate all polygons */ + $Angle = 0; $CDev = 5; + $TopPlots = ""; $BotPlots = ""; + $aTopPlots = ""; $aBotPlots = ""; + foreach($iValues as $Key => $Value) + { + $XCenterPos = cos(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos; + $YCenterPos = sin(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos; + $XCenterPos2 = cos(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos; + $YCenterPos2 = sin(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos; + + $TopPlots[$Key][] = round($XCenterPos); $BotPlots[$Key][] = round($XCenterPos); + $TopPlots[$Key][] = round($YCenterPos); $BotPlots[$Key][] = round($YCenterPos + $SpliceHeight); + $aTopPlots[$Key][] = $XCenterPos; $aBotPlots[$Key][] = $XCenterPos; + $aTopPlots[$Key][] = $YCenterPos; $aBotPlots[$Key][] = $YCenterPos + $SpliceHeight; + + /* Process labels position & size */ + $Caption = ""; + if ( !($DrawLabels == PIE_NOLABEL) ) + { + $TAngle = $Angle+($Value*$SpliceRatio/2); + if ($DrawLabels == PIE_PERCENTAGE) + $Caption = (round($rValues[$Key] * pow(10,$Decimals) * $rSplicePercent)/pow(10,$Decimals))."%"; + elseif ($DrawLabels == PIE_LABELS) + $Caption = $iLabels[$Key]; + elseif ($DrawLabels == PIE_PERCENTAGE_LABEL) + $Caption = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%"; + + $Position = imageftbbox($this->FontSize,0,$this->FontName,$Caption); + $TextWidth = $Position[2]-$Position[0]; + $TextHeight = abs($Position[1])+abs($Position[3]); + + $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius + 10)+ $XPos; + + if ( $TAngle > 0 && $TAngle < 180 ) + $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 10) + $YPos + $SpliceHeight + 4; + else + $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 4) + $YPos - ($TextHeight/2); + + if ( $TAngle > 90 && $TAngle < 270 ) + $TX = $TX - $TextWidth; + + $C_TextColor = $this->AllocateColor($this->Picture,70,70,70); + imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption); + } + + /* Process pie slices */ + for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5) + { + $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos; + $TopY = sin($iAngle * 3.1418 / 180 ) * $SkewHeight + $YPos; + + $TopPlots[$Key][] = round($TopX); $BotPlots[$Key][] = round($TopX); + $TopPlots[$Key][] = round($TopY); $BotPlots[$Key][] = round($TopY + $SpliceHeight); + $aTopPlots[$Key][] = $TopX; $aBotPlots[$Key][] = $TopX; + $aTopPlots[$Key][] = $TopY; $aBotPlots[$Key][] = $TopY + $SpliceHeight; + } + + $TopPlots[$Key][] = round($XCenterPos2); $BotPlots[$Key][] = round($XCenterPos2); + $TopPlots[$Key][] = round($YCenterPos2); $BotPlots[$Key][] = round($YCenterPos2 + $SpliceHeight); + $aTopPlots[$Key][] = $XCenterPos2; $aBotPlots[$Key][] = $XCenterPos2; + $aTopPlots[$Key][] = $YCenterPos2; $aBotPlots[$Key][] = $YCenterPos2 + $SpliceHeight; + + $Angle = $iAngle + $SpliceDistanceRatio; + } + + /* Draw Bottom polygons */ + foreach($iValues as $Key => $Value) + { + $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-20); + imagefilledpolygon($this->Picture,$BotPlots[$Key],(count($BotPlots[$Key])+1)/2,$C_GraphLo); + + if ( $EnhanceColors ) { $En = -10; } else { $En = 0; } + + for($j=0;$j<=count($aBotPlots[$Key])-4;$j=$j+2) + $this->drawLine($aBotPlots[$Key][$j],$aBotPlots[$Key][$j+1],$aBotPlots[$Key][$j+2],$aBotPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En); + } + + /* Draw pie layers */ + if ( $EnhanceColors ) { $ColorRatio = 30 / $SpliceHeight; } else { $ColorRatio = 25 / $SpliceHeight; } + for($i=$SpliceHeight-1;$i>=1;$i--) + { + foreach($iValues as $Key => $Value) + { + $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-10); + $Plots = ""; $Plot = 0; + foreach($TopPlots[$Key] as $Key2 => $Value2) + { + $Plot++; + if ( $Plot % 2 == 1 ) + $Plots[] = $Value2; + else + $Plots[] = $Value2+$i; + } + imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_GraphLo); + + $Index = count($Plots); + if ($EnhanceColors ) {$ColorFactor = -20 + ($SpliceHeight - $i) * $ColorRatio; } else { $ColorFactor = 0; } + + $this->drawAntialiasPixel($Plots[0],$Plots[1],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor); + $this->drawAntialiasPixel($Plots[2],$Plots[3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor); + $this->drawAntialiasPixel($Plots[$Index-4],$Plots[$Index-3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor); + } + } + + if ( $this->BuildMap ) + { + // Add points to Image Map. + foreach ($TopPlots as $key => $PointArr) + { + $serieName = $Data[$key][$DataDescription['Values'][1]]; + $serieValue = $Data[$key][$DataDescription['Values'][0]]; + + // last point of the arc + $lastX = $PointArr[count($PointArr)-4]; + $lastY = $PointArr[count($PointArr)-3]; + + // the point at the middle + $middleX = $PointArr[0]; + $middleY = $PointArr[1]; + + // first point in the arc + $firstX = $PointArr[2]; + $firstY = $PointArr[3]; + + // point on the first third of the arc + $firstThird = count($PointArr)/3; + $firstThirdX = $PointArr[$firstThird + ($firstThird % 2)]; + $firstThirdY = $PointArr[$firstThird + ($firstThird % 2)+1]; + + // point on the second third of the arc + $secondThird = count($PointArr)/3*2; + $secondThirdX = $PointArr[$secondThird + ($secondThird % 2)]; + $secondThirdY = $PointArr[$secondThird + ($secondThird % 2)+1]; + + // Will create three polygons for every piece of the pie. In such way + // no polygon will be concave. JS only works with convex polygons. + $poly = array( + array($middleX,$middleY), + array($firstX,$firstY), + array($firstThirdX,$firstThirdY), + ); + $this->addPolyToImageMap($poly,$serieName,$serieValue,"Pie"); + + $poly = array( + array($middleX,$middleY), + array($firstThirdX,$firstThirdY), + array($secondThirdX,$secondThirdY), + ); + $this->addPolyToImageMap($poly,$serieName,$serieValue,"Pie"); + + $poly = array( + array($middleX,$middleY), + array($secondThirdX,$secondThirdY), + array($lastX,$lastY), + ); + $this->addPolyToImageMap($poly,$serieName,$serieValue,"Pie"); + } + } + + /* Draw Top polygons */ + for($Key=count($iValues)-1;$Key>=0;$Key--) + { + $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]); + imagefilledpolygon($this->Picture,$TopPlots[$Key],(count($TopPlots[$Key])+1)/2,$C_GraphLo); + + if ( $EnhanceColors ) { $En = 10; } else { $En = 0; } + for($j=0;$j<=count($aTopPlots[$Key])-4;$j=$j+2) + $this->drawLine($aTopPlots[$Key][$j],$aTopPlots[$Key][$j+1],$aTopPlots[$Key][$j+2],$aTopPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En); + } + } + + /* This function can be used to set the background color */ + function drawBackground($R,$G,$B) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B); + imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_Background); + } + + /* This function can be used to set the background color */ + function drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + if ( $Target == TARGET_GRAPHAREA ) { $X1 = $this->GArea_X1+1; $X2 = $this->GArea_X2-1; $Y1 = $this->GArea_Y1+1; $Y2 = $this->GArea_Y2; } + if ( $Target == TARGET_BACKGROUND ) { $X1 = 0; $X2 = $this->XSize; $Y1 = 0; $Y2 = $this->YSize; } + + /* Positive gradient */ + if ( $Decay > 0 ) + { + $YStep = ($Y2 - $Y1 - 2) / $Decay; + for($i=0;$i<=$Decay;$i++) + { + $R-=1;$G-=1;$B-=1; + $Yi1 = $Y1 + ( $i * $YStep ); + $Yi2 = ceil( $Yi1 + ( $i * $YStep ) + $YStep ); + if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; } + + $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B); + imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background); + } + } + + /* Negative gradient */ + if ( $Decay < 0 ) + { + $YStep = ($Y2 - $Y1 - 2) / -$Decay; + $Yi1 = $Y1; $Yi2 = $Y1+$YStep; + for($i=-$Decay;$i>=0;$i--) + { + $R+=1;$G+=1;$B+=1; + $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B); + imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background); + + $Yi1+= $YStep; + $Yi2+= $YStep; + if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; } + } + } + } + + /* This function create a rectangle with antialias */ + function drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B); + + $X1=$X1-.2;$Y1=$Y1-.2; + $X2=$X2+.2;$Y2=$Y2+.2; + $this->drawLine($X1,$Y1,$X2,$Y1,$R,$G,$B); + $this->drawLine($X2,$Y1,$X2,$Y2,$R,$G,$B); + $this->drawLine($X2,$Y2,$X1,$Y2,$R,$G,$B); + $this->drawLine($X1,$Y2,$X1,$Y1,$R,$G,$B); + } + + /* This function create a filled rectangle with antialias */ + function drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100,$NoFallBack=FALSE) + { + if ( $X2 < $X1 ) { list($X1, $X2) = array($X2, $X1); } + if ( $Y2 < $Y1 ) { list($Y1, $Y2) = array($Y2, $Y1); } + + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + if ( $Alpha == 100 ) + { + /* Process shadows */ + if ( $this->ShadowActive && !$NoFallBack ) + { + $this->drawFilledRectangle($X1+$this->ShadowXDistance,$Y1+$this->ShadowYDistance,$X2+$this->ShadowXDistance,$Y2+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha,TRUE); + if ( $this->ShadowBlur != 0 ) + { + $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur); + + for($i=1; $i<=$this->ShadowBlur; $i++) + $this->drawFilledRectangle($X1+$this->ShadowXDistance-$i/2,$Y1+$this->ShadowYDistance-$i/2,$X2+$this->ShadowXDistance-$i/2,$Y2+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE); + for($i=1; $i<=$this->ShadowBlur; $i++) + $this->drawFilledRectangle($X1+$this->ShadowXDistance+$i/2,$Y1+$this->ShadowYDistance+$i/2,$X2+$this->ShadowXDistance+$i/2,$Y2+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE); + } + } + + $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B); + imagefilledrectangle($this->Picture,round($X1),round($Y1),round($X2),round($Y2),$C_Rectangle); + } + else + { + $LayerWidth = abs($X2-$X1)+2; + $LayerHeight = abs($Y2-$Y1)+2; + + $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight); + $C_White = $this->AllocateColor($this->Layers[0],255,255,255); + imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White); + imagecolortransparent($this->Layers[0],$C_White); + + $C_Rectangle = $this->AllocateColor($this->Layers[0],$R,$G,$B); + imagefilledrectangle($this->Layers[0],round(1),round(1),round($LayerWidth-1),round($LayerHeight-1),$C_Rectangle); + + imagecopymerge($this->Picture,$this->Layers[0],round(min($X1,$X2)-1),round(min($Y1,$Y2)-1),0,0,$LayerWidth,$LayerHeight,$Alpha); + imagedestroy($this->Layers[0]); + } + + if ( $DrawBorder ) + { + $ShadowSettings = $this->ShadowActive; $this->ShadowActive = FALSE; + $this->drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B); + $this->ShadowActive = $ShadowSettings; + } + } + + /* This function create a rectangle with rounded corners and antialias */ + function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B); + + $Step = 90 / ((3.1418 * $Radius)/2); + + for($i=0;$i<=90;$i=$i+$Step) + { + $X = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius; + $Y = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius; + $this->drawAntialiasPixel($X,$Y,$R,$G,$B); + + $X = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius; + $Y = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius; + $this->drawAntialiasPixel($X,$Y,$R,$G,$B); + + $X = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius; + $Y = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius; + $this->drawAntialiasPixel($X,$Y,$R,$G,$B); + + $X = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius; + $Y = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius; + $this->drawAntialiasPixel($X,$Y,$R,$G,$B); + } + + $X1=$X1-.2;$Y1=$Y1-.2; + $X2=$X2+.2;$Y2=$Y2+.2; + $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B); + $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B); + $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B); + $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B); + } + + /* This function create a filled rectangle with rounded corners and antialias */ + function drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B); + + $Step = 90 / ((3.1418 * $Radius)/2); + + for($i=0;$i<=90;$i=$i+$Step) + { + $Xi1 = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius; + $Yi1 = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius; + + $Xi2 = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius; + $Yi2 = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius; + + $Xi3 = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius; + $Yi3 = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius; + + $Xi4 = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius; + $Yi4 = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius; + + imageline($this->Picture,$Xi1,$Yi1,$X1+$Radius,$Yi1,$C_Rectangle); + imageline($this->Picture,$X2-$Radius,$Yi2,$Xi2,$Yi2,$C_Rectangle); + imageline($this->Picture,$X2-$Radius,$Yi3,$Xi3,$Yi3,$C_Rectangle); + imageline($this->Picture,$Xi4,$Yi4,$X1+$Radius,$Yi4,$C_Rectangle); + + $this->drawAntialiasPixel($Xi1,$Yi1,$R,$G,$B); + $this->drawAntialiasPixel($Xi2,$Yi2,$R,$G,$B); + $this->drawAntialiasPixel($Xi3,$Yi3,$R,$G,$B); + $this->drawAntialiasPixel($Xi4,$Yi4,$R,$G,$B); + } + + imagefilledrectangle($this->Picture,$X1,$Y1+$Radius,$X2,$Y2-$Radius,$C_Rectangle); + imagefilledrectangle($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y2,$C_Rectangle); + + $X1=$X1-.2;$Y1=$Y1-.2; + $X2=$X2+.2;$Y2=$Y2+.2; + $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B); + $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B); + $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B); + $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B); + } + + /* This function create a circle with antialias */ + function drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0) + { + if ( $Width == 0 ) { $Width = $Height; } + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B); + $Step = 360 / (2 * 3.1418 * max($Width,$Height)); + + for($i=0;$i<=360;$i=$i+$Step) + { + $X = cos($i*3.1418/180) * $Height + $Xc; + $Y = sin($i*3.1418/180) * $Width + $Yc; + $this->drawAntialiasPixel($X,$Y,$R,$G,$B); + } + } + + /* This function create a filled circle/ellipse with antialias */ + function drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0) + { + if ( $Width == 0 ) { $Width = $Height; } + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B); + $Step = 360 / (2 * 3.1418 * max($Width,$Height)); + + for($i=90;$i<=270;$i=$i+$Step) + { + $X1 = cos($i*3.1418/180) * $Height + $Xc; + $Y1 = sin($i*3.1418/180) * $Width + $Yc; + $X2 = cos((180-$i)*3.1418/180) * $Height + $Xc; + $Y2 = sin((180-$i)*3.1418/180) * $Width + $Yc; + + $this->drawAntialiasPixel($X1-1,$Y1-1,$R,$G,$B); + $this->drawAntialiasPixel($X2-1,$Y2-1,$R,$G,$B); + + if ( ($Y1-1) > $Yc - max($Width,$Height) ) + imageline($this->Picture,$X1,$Y1-1,$X2-1,$Y2-1,$C_Circle); + } + } + + /* This function will draw a filled ellipse */ + function drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B) + { $this->drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); } + + /* This function will draw an ellipse */ + function drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B) + { $this->drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); } + + /* This function create a line with antialias */ + function drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE) + { + if ( $this->LineDotSize > 1 ) { $this->drawDottedLine($X1,$Y1,$X2,$Y2,$this->LineDotSize,$R,$G,$B,$GraphFunction); return(0); } + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1)); + if ( $Distance == 0 ) + return(-1); + $XStep = ($X2-$X1) / $Distance; + $YStep = ($Y2-$Y1) / $Distance; + + for($i=0;$i<=$Distance;$i++) + { + $X = $i * $XStep + $X1; + $Y = $i * $YStep + $Y1; + + if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction ) + { + if ( $this->LineWidth == 1 ) + $this->drawAntialiasPixel($X,$Y,$R,$G,$B); + else + { + $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2); + for($j=$StartOffset;$j<=$EndOffset;$j++) + $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B); + } + } + } + } + + /* This function create a line with antialias */ + function drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B,$GraphFunction=FALSE) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1)); + + $XStep = ($X2-$X1) / $Distance; + $YStep = ($Y2-$Y1) / $Distance; + + $DotIndex = 0; + for($i=0;$i<=$Distance;$i++) + { + $X = $i * $XStep + $X1; + $Y = $i * $YStep + $Y1; + + if ( $DotIndex <= $DotSize) + { + if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction ) + { + if ( $this->LineWidth == 1 ) + $this->drawAntialiasPixel($X,$Y,$R,$G,$B); + else + { + $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2); + for($j=$StartOffset;$j<=$EndOffset;$j++) + $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B); + } + } + } + + $DotIndex++; + if ( $DotIndex == $DotSize * 2 ) + $DotIndex = 0; + } + } + + /* Load a PNG file and draw it over the chart */ + function drawFromPNG($FileName,$X,$Y,$Alpha=100) + { $this->drawFromPicture(1,$FileName,$X,$Y,$Alpha); } + + /* Load a GIF file and draw it over the chart */ + function drawFromGIF($FileName,$X,$Y,$Alpha=100) + { $this->drawFromPicture(2,$FileName,$X,$Y,$Alpha); } + + /* Load a JPEG file and draw it over the chart */ + function drawFromJPG($FileName,$X,$Y,$Alpha=100) + { $this->drawFromPicture(3,$FileName,$X,$Y,$Alpha); } + + /* Generic loader function for external pictures */ + function drawFromPicture($PicType,$FileName,$X,$Y,$Alpha=100) + { + if ( file_exists($FileName)) + { + $Infos = getimagesize($FileName); + $Width = $Infos[0]; + $Height = $Infos[1]; + if ( $PicType == 1 ) { $Raster = imagecreatefrompng($FileName); } + if ( $PicType == 2 ) { $Raster = imagecreatefromgif($FileName); } + if ( $PicType == 3 ) { $Raster = imagecreatefromjpeg($FileName); } + + imagecopymerge($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height,$Alpha); + imagedestroy($Raster); + } + } + + /* Draw an alpha pixel */ + function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B) + { + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize ) + return(-1); + + $RGB2 = imagecolorat($this->Picture, $X, $Y); + $R2 = ($RGB2 >> 16) & 0xFF; + $G2 = ($RGB2 >> 8) & 0xFF; + $B2 = $RGB2 & 0xFF; + + $iAlpha = (100 - $Alpha)/100; + $Alpha = $Alpha / 100; + + $Ra = floor($R*$Alpha+$R2*$iAlpha); + $Ga = floor($G*$Alpha+$G2*$iAlpha); + $Ba = floor($B*$Alpha+$B2*$iAlpha); + + $C_Aliased = $this->AllocateColor($this->Picture,$Ra,$Ga,$Ba); + imagesetpixel($this->Picture,$X,$Y,$C_Aliased); + } + + /* Color helper */ + function AllocateColor($Picture,$R,$G,$B,$Factor=0) + { + $R = $R + $Factor; + $G = $G + $Factor; + $B = $B + $Factor; + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + return(imagecolorallocate($Picture,$R,$G,$B)); + } + + /* Add a border to the picture */ + function addBorder($Size=3,$R=0,$G=0,$B=0) + { + $Width = $this->XSize+2*$Size; + $Height = $this->YSize+2*$Size; + + $Resampled = imagecreatetruecolor($Width,$Height); + $C_Background = $this->AllocateColor($Resampled,$R,$G,$B); + imagefilledrectangle($Resampled,0,0,$Width,$Height,$C_Background); + + imagecopy($Resampled,$this->Picture,$Size,$Size,0,0,$this->XSize,$this->YSize); + imagedestroy($this->Picture); + + $this->XSize = $Width; + $this->YSize = $Height; + + $this->Picture = imagecreatetruecolor($this->XSize,$this->YSize); + $C_White = $this->AllocateColor($this->Picture,255,255,255); + imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_White); + imagecolortransparent($this->Picture,$C_White); + imagecopy($this->Picture,$Resampled,0,0,0,0,$this->XSize,$this->YSize); + } + + /* Render the current picture to a file */ + function Render($FileName) + { + if ( $this->ErrorReporting ) + $this->printErrors($this->ErrorInterface); + + /* Save image map if requested */ + if ( $this->BuildMap ) + $this->SaveImageMap(); + + imagepng($this->Picture,$FileName); + } + + /* Render the current picture to STDOUT */ + function Stroke() + { + if ( $this->ErrorReporting ) + $this->printErrors("GD"); + + /* Save image map if requested */ + if ( $this->BuildMap ) + $this->SaveImageMap(); + + header('Content-type: image/png'); + imagepng($this->Picture); + } + + /* Private functions for internal processing */ + function drawAntialiasPixel($X,$Y,$R,$G,$B,$Alpha=100,$NoFallBack=FALSE) + { + /* Process shadows */ + if ( $this->ShadowActive && !$NoFallBack ) + { + $this->drawAntialiasPixel($X+$this->ShadowXDistance,$Y+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha,TRUE); + if ( $this->ShadowBlur != 0 ) + { + $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur); + + for($i=1; $i<=$this->ShadowBlur; $i++) + $this->drawAntialiasPixel($X+$this->ShadowXDistance-$i/2,$Y+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE); + for($i=1; $i<=$this->ShadowBlur; $i++) + $this->drawAntialiasPixel($X+$this->ShadowXDistance+$i/2,$Y+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE); + } + } + + if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; } + if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; } + if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; } + + $Plot = ""; + $Xi = floor($X); + $Yi = floor($Y); + + if ( $Xi == $X && $Yi == $Y) + { + if ( $Alpha == 100 ) + { + $C_Aliased = $this->AllocateColor($this->Picture,$R,$G,$B); + imagesetpixel($this->Picture,$X,$Y,$C_Aliased); + } + else + $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B); + } + else + { + $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha; + if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); } + + $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha; + if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); } + + $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha; + if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); } + + $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha; + if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); } + } + } + + /* Validate data contained in the description array */ + function validateDataDescription($FunctionName,&$DataDescription,$DescriptionRequired=TRUE) + { + if (!isset($DataDescription["Position"])) + { + $this->Errors[] = "[Warning] ".$FunctionName." - Y Labels are not set."; + $DataDescription["Position"] = "Name"; + } + + if ( $DescriptionRequired ) + { + if (!isset($DataDescription["Description"])) + { + $this->Errors[] = "[Warning] ".$FunctionName." - Series descriptions are not set."; + foreach($DataDescription["Values"] as $key => $Value) + { + $DataDescription["Description"][$Value] = $Value; + } + } + + if (count($DataDescription["Description"]) < count($DataDescription["Values"])) + { + $this->Errors[] = "[Warning] ".$FunctionName." - Some series descriptions are not set."; + foreach($DataDescription["Values"] as $key => $Value) + { + if ( !isset($DataDescription["Description"][$Value])) + $DataDescription["Description"][$Value] = $Value; + } + } + } + } + + /* Validate data contained in the data array */ + function validateData($FunctionName,&$Data) + { + $DataSummary = array(); + + foreach($Data as $key => $Values) + { + foreach($Values as $key2 => $Value) + { + if (!isset($DataSummary[$key2])) + $DataSummary[$key2] = 1; + else + $DataSummary[$key2]++; + } + } + + if ( max($DataSummary) == 0 ) + $this->Errors[] = "[Warning] ".$FunctionName." - No data set."; + + foreach($DataSummary as $key => $Value) + { + if ($Value < max($DataSummary)) + { + $this->Errors[] = "[Warning] ".$FunctionName." - Missing data in serie ".$key."."; + } + } + } + + /* Print all error messages on the CLI or graphically */ + function printErrors($Mode="CLI") + { + if (count($this->Errors) == 0) + return(0); + + if ( $Mode == "CLI" ) + { + foreach($this->Errors as $key => $Value) + echo $Value."\r\n"; + } + elseif ( $Mode == "GD" ) + { + $this->setLineStyle($Width=1); + $MaxWidth = 0; + foreach($this->Errors as $key => $Value) + { + $Position = imageftbbox($this->ErrorFontSize,0,$this->ErrorFontName,$Value); + $TextWidth = $Position[2]-$Position[0]; + if ( $TextWidth > $MaxWidth ) { $MaxWidth = $TextWidth; } + } + $this->drawFilledRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,233,185,185); + $this->drawRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,193,145,145); + + $C_TextColor = $this->AllocateColor($this->Picture,133,85,85); + $YPos = $this->YSize - (18 + (count($this->Errors)-1) * ($this->ErrorFontSize + 4)); + foreach($this->Errors as $key => $Value) + { + imagettftext($this->Picture,$this->ErrorFontSize,0,$this->XSize-($MaxWidth+15),$YPos,$C_TextColor,$this->ErrorFontName,$Value); + $YPos = $YPos + ($this->ErrorFontSize + 4); + } + } + } + + /* Activate the image map creation process */ + function setImageMap($Mode=TRUE,$GraphID="MyGraph") + { + $this->BuildMap = $Mode; + $this->MapID = $GraphID; + } + + /* Add a box into the image map */ + function addToImageMap($X1,$Y1,$X2,$Y2,$SerieName,$Value,$CallerFunction) + { + $poly = array(array($X1,$Y1),array($X2,$Y1),array($X2,$Y2),array($X1,$Y2)); + $this->addPolyToImageMap($poly,$SerieName,$Value,$CallerFunction); + } + + function addPolyToImageMap($poly,$SerieName,$Value,$CallerFunction) + { + if ( $this->MapFunction == NULL || $this->MapFunction == $CallerFunction) + { + $this->ImageMap[] = array( + 'n' => (string)$SerieName, + 'v' => (string)$Value, + 'p' => $poly, + ); + $this->MapFunction = $CallerFunction; + } + } + + /* Draw image map to the current chart image */ + function debugImageMap() + { + foreach ($this->ImageMap as $polygon) + { + $points = array(); + foreach ($polygon['p'] as $point) + { + $points[] = $point[0]; + $points[] = $point[1]; + } + + $color = $this->AllocateColor($this->Picture,rand(0,255),rand(0,255),rand(0,255)); + imagefilledpolygon($this->Picture,$points,(count($points)+1)/2,$color); + } + + } + + /* Get the current image map */ + function getImageMap() + { + return $this->ImageMap; + } + + /* Load and cleanup the image map from disk */ + function getSavedImageMap($MapName,$Flush=TRUE) + { + /* Strip HTML query strings */ + $Values = $this->tmpFolder.$MapName; + $Value = split("\?",$Values); + $FileName = $Value[0]; + + if ( file_exists($FileName) ) + { + $Handle = fopen($FileName, "r"); + $MapContent = fread($Handle, filesize($FileName)); + fclose($Handle); + echo $MapContent; + + if ( $Flush ) + unlink($FileName); + + exit(); + } + else + { + header("HTTP/1.0 404 Not Found"); + exit(); + } + } + + /* Save the image map to the disk */ + function SaveImageMap() + { + if ( !$this->BuildMap ) { return(-1); } + + if ( $this->ImageMap == NULL ) + { + $this->Errors[] = "[Warning] SaveImageMap - Image map is empty."; + return(-1); + } + + $Handle = fopen($this->tmpFolder.$this->MapID, 'w'); + if ( !$Handle ) + { + $this->Errors[] = "[Warning] SaveImageMap - Cannot save the image map."; + return(-1); + } + else + { + fwrite($Handle, serialize($this->getImageMap())); + } + fclose ($Handle); + } + + /* Convert seconds to a time format string */ + function ToTime($Value) + { + $Hour = floor($Value/3600); + $Minute = floor(($Value - $Hour*3600)/60); + $Second = floor($Value - $Hour*3600 - $Minute*60); + + if (strlen($Hour) == 1 ) { $Hour = "0".$Hour; } + if (strlen($Minute) == 1 ) { $Minute = "0".$Minute; } + if (strlen($Second) == 1 ) { $Second = "0".$Second; } + + return($Hour.":".$Minute.":".$Second); + } + + /* Convert to metric system */ + function ToMetric($Value) + { + $Go = floor($Value/1000000000); + $Mo = floor(($Value - $Go*1000000000)/1000000); + $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000); + $o = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000); + + if ($Go != 0) { return($Go.".".$Mo."g"); } + if ($Mo != 0) { return($Mo.".".$ko."m"); } + if ($Ko != 0) { return($Ko.".".$o)."k"; } + return($o); + } + + /* Convert to curency */ + function ToCurrency($Value) + { + $Go = floor($Value/1000000000); + $Mo = floor(($Value - $Go*1000000000)/1000000); + $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000); + $o = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000); + + if ( strlen($o) == 1 ) { $o = "00".$o; } + if ( strlen($o) == 2 ) { $o = "0".$o; } + + $ResultString = $o; + if ( $Ko != 0 ) { $ResultString = $Ko.".".$ResultString; } + if ( $Mo != 0 ) { $ResultString = $Mo.".".$ResultString; } + if ( $Go != 0 ) { $ResultString = $Go.".".$ResultString; } + + $ResultString = $this->Currency.$ResultString; + return($ResultString); + } + + /* Set date format for axis labels */ + function setDateFormat($Format) + { + $this->DateFormat = $Format; + } + + /* Convert TS to a date format string */ + function ToDate($Value) + { + return(date($this->DateFormat,$Value)); + } + + /* Check if a number is a full integer (for scaling) */ + function isRealInt($Value) + { + if ($Value == floor($Value)) + return(TRUE); + return(FALSE); + } + } + + function RaiseFatal($Message) + { + echo "[FATAL] ".$Message."\r\n"; + exit(); + } +?> \ No newline at end of file diff --git a/libraries/chart/pChart/pData.class b/libraries/chart/pChart/pData.class new file mode 100644 index 0000000..1c4a301 --- /dev/null +++ b/libraries/chart/pChart/pData.class @@ -0,0 +1,260 @@ +<?php + /* + pData - Simplifying data population for pChart + Copyright (C) 2008 Jean-Damien POGOLOTTI + Version 1.13 last updated on 08/17/08 + + http://pchart.sourceforge.net + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 1,2,3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + + Class initialisation : + pData() + Data populating methods : + ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1) + AddPoint($Value,$Serie="Serie1",$Description="") + Series manipulation methods : + AddSerie($SerieName="Serie1") + AddAllSeries() + RemoveSerie($SerieName="Serie1") + SetAbsciseLabelSerie($SerieName = "Name") + SetSerieName($Name,$SerieName="Serie1") + + SetSerieSymbol($Name,$Symbol) + SetXAxisName($Name="X Axis") + SetYAxisName($Name="Y Axis") + SetXAxisFormat($Format="number") + SetYAxisFormat($Format="number") + SetXAxisUnit($Unit="") + SetYAxisUnit($Unit="") + removeSerieName($SerieName) + removeAllSeries() + Data retrieval methods : + GetData() + GetDataDescription() + */ + + /* pData class definition */ + class pData + { + var $Data; + var $DataDescription; + + function pData() + { + $this->Data = array(); + $this->DataDescription = ""; + $this->DataDescription["Position"] = "Name"; + $this->DataDescription["Format"]["X"] = "number"; + $this->DataDescription["Format"]["Y"] = "number"; + $this->DataDescription["Unit"]["X"] = NULL; + $this->DataDescription["Unit"]["Y"] = NULL; + } + + function ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1) + { + $handle = @fopen($FileName,"r"); + if ($handle) + { + $HeaderParsed = FALSE; + while (!feof($handle)) + { + $buffer = fgets($handle, 4096); + $buffer = str_replace(chr(10),"",$buffer); + $buffer = str_replace(chr(13),"",$buffer); + $Values = split($Delimiter,$buffer); + + if ( $buffer != "" ) + { + if ( $HasHeader == TRUE && $HeaderParsed == FALSE ) + { + if ( $DataColumns == -1 ) + { + $ID = 1; + foreach($Values as $key => $Value) + { $this->SetSerieName($Value,"Serie".$ID); $ID++; } + } + else + { + $SerieName = ""; + + foreach($DataColumns as $key => $Value) + $this->SetSerieName($Values[$Value],"Serie".$Value); + } + $HeaderParsed = TRUE; + } + else + { + if ( $DataColumns == -1 ) + { + $ID = 1; + foreach($Values as $key => $Value) + { $this->AddPoint(intval($Value),"Serie".$ID); $ID++; } + } + else + { + $SerieName = ""; + if ( $DataName != -1 ) + $SerieName = $Values[$DataName]; + + foreach($DataColumns as $key => $Value) + $this->AddPoint($Values[$Value],"Serie".$Value,$SerieName); + } + } + } + } + fclose($handle); + } + } + + function AddPoint($Value,$Serie="Serie1",$Description="") + { + if (is_array($Value) && count($Value) == 1) + $Value = array_pop($Value); + + $ID = 0; + for($i=0;$i<=count($this->Data);$i++) + { if(isset($this->Data[$i][$Serie])) { $ID = $i+1; } } + + if ( count($Value) == 1 ) + { + $this->Data[$ID][$Serie] = $Value; + if ( $Description != "" ) + $this->Data[$ID]["Name"] = $Description; + elseif (!isset($this->Data[$ID]["Name"])) + $this->Data[$ID]["Name"] = $ID; + } + else + { + foreach($Value as $key => $Val) + { + $this->Data[$ID][$Serie] = $Val; + if (!isset($this->Data[$ID]["Name"])) + $this->Data[$ID]["Name"] = $ID; + $ID++; + } + } + } + + function AddSerie($SerieName="Serie1") + { + if ( !isset($this->DataDescription["Values"]) ) + { + $this->DataDescription["Values"][] = $SerieName; + } + else + { + $Found = FALSE; + foreach($this->DataDescription["Values"] as $key => $Value ) + if ( $Value == $SerieName ) { $Found = TRUE; } + + if ( !$Found ) + $this->DataDescription["Values"][] = $SerieName; + } + } + + function AddAllSeries() + { + unset($this->DataDescription["Values"]); + + if ( isset($this->Data[0]) ) + { + foreach($this->Data[0] as $Key => $Value) + { + if ( $Key != "Name" ) + $this->DataDescription["Values"][] = $Key; + } + } + } + + function RemoveSerie($SerieName="Serie1") + { + if ( !isset($this->DataDescription["Values"]) ) + return(0); + + $Found = FALSE; + foreach($this->DataDescription["Values"] as $key => $Value ) + { + if ( $Value == $SerieName ) + unset($this->DataDescription["Values"][$key]); + } + } + + function SetAbsciseLabelSerie($SerieName = "Name") + { + $this->DataDescription["Position"] = $SerieName; + } + + function SetSerieName($Name,$SerieName="Serie1") + { + $this->DataDescription["Description"][$SerieName] = $Name; + } + + function SetXAxisName($Name="X Axis") + { + $this->DataDescription["Axis"]["X"] = $Name; + } + + function SetYAxisName($Name="Y Axis") + { + $this->DataDescription["Axis"]["Y"] = $Name; + } + + function SetXAxisFormat($Format="number") + { + $this->DataDescription["Format"]["X"] = $Format; + } + + function SetYAxisFormat($Format="number") + { + $this->DataDescription["Format"]["Y"] = $Format; + } + + function SetXAxisUnit($Unit="") + { + $this->DataDescription["Unit"]["X"] = $Unit; + } + + function SetYAxisUnit($Unit="") + { + $this->DataDescription["Unit"]["Y"] = $Unit; + } + + function SetSerieSymbol($Name,$Symbol) + { + $this->DataDescription["Symbol"][$Name] = $Symbol; + } + + function removeSerieName($SerieName) + { + if ( isset($this->DataDescription["Description"][$SerieName]) ) + unset($this->DataDescription["Description"][$SerieName]); + } + + function removeAllSeries() + { + foreach($this->DataDescription["Values"] as $Key => $Value) + unset($this->DataDescription["Values"][$Key]); + } + + function GetData() + { + return($this->Data); + } + + function GetDataDescription() + { + return($this->DataDescription); + } + } +?> \ No newline at end of file diff --git a/libraries/chart/pma_chart.php b/libraries/chart/pma_chart.php new file mode 100644 index 0000000..ae483c8 --- /dev/null +++ b/libraries/chart/pma_chart.php @@ -0,0 +1,184 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Holds the base class that all charts inherit from and some widely used + * constants. + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +define('RED', 0); +define('GREEN', 1); +define('BLUE', 2); + +/** + * The base class that all charts inherit from. + * @abstract + * @package phpMyAdmin + */ +abstract class PMA_chart +{ + /** + * @var array All the default settigs values are here. + */ + protected $settings = array( + + // Default title for every chart. + 'titleText' => 'Chart', + + // The style of the chart title. + 'titleColor' => '#FAFAFA', + + // Colors for the different slices in the pie chart. + 'colors' => array( + '#BCE02E', + '#E0642E', + '#E0D62E', + '#2E97E0', + '#B02EE0', + '#E02E75', + '#5CE02E', + '#E0B02E', + '#000000', + '#0022E0', + '#726CB1', + '#481A36', + '#BAC658', + '#127224', + '#825119', + '#238C74', + '#4C489B', + '#87C9BF', + ), + + // Chart background color. + 'bgColor' => '#84AD83', + + // The width of the chart. + 'width' => 520, + + // The height of the chart. + 'height' => 325, + + // Default X Axis label. If empty, label will be taken from the data. + 'xLabel' => '', + + // Default Y Axis label. If empty, label will be taken from the data. + 'yLabel' => '', + ); + + /** + * @var array Options that the user has specified + */ + private $userSpecifiedSettings = null; + + /** + * @var array Error codes will be stored here + */ + protected $errors = array(); + + /** + * Store user specified options + * @param array $options users specified options + */ + function __construct($options = null) + { + $this->userSpecifiedSettings = $options; + } + + /** + * All the variable initialization has to be done here. + */ + protected function init() + { + $this->handleOptions(); + } + + /** + * A function which handles passed parameters. Useful if desired + * chart needs to be a little bit different from the default one. + */ + private function handleOptions() + { + if (is_null($this->userSpecifiedSettings)) { + return; + } + + $this->settings = array_merge($this->settings, $this->userSpecifiedSettings); + } + + protected function getTitleText() + { + return $this->settings['titleText']; + } + + protected function getTitleColor($component) + { + return $this->hexStrToDecComp($this->settings['titleColor'], $component); + } + + protected function getColors() + { + return $this->settings['colors']; + } + + protected function getWidth() + { + return $this->settings['width']; + } + + protected function getHeight() + { + return $this->settings['height']; + } + + protected function getBgColor($component) + { + return $this->hexStrToDecComp($this->settings['bgColor'], $component); + } + + protected function setXLabel($label) + { + $this->settings['xLabel'] = $label; + } + + protected function getXLabel() + { + return $this->settings['xLabel']; + } + + protected function setYLabel($label) + { + $this->settings['yLabel'] = $label; + } + + protected function getYLabel() + { + return $this->settings['yLabel']; + } + + public function getSettings() + { + return $this->settings; + } + + public function getErrors() + { + return $this->errors; + } + + /** + * Get one the dec color component from the hex color string + * @param string $colorString color string, i.e. #5F22A99 + * @param int $component color component to get, i.e. 0 gets red. + */ + protected function hexStrToDecComp($colorString, $component) + { + return hexdec(substr($colorString, ($component * 2) + 1, 2)); + } +} + +?> diff --git a/libraries/chart/pma_pchart_chart.php b/libraries/chart/pma_pchart_chart.php new file mode 100644 index 0000000..b8e5375 --- /dev/null +++ b/libraries/chart/pma_pchart_chart.php @@ -0,0 +1,399 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Holds the base class that all charts using pChart inherit from and some + * widely used constants + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +define('TOP', 0); +define('RIGHT', 1); +define('BOTTOM', 2); +define('LEFT', 3); + +require_once 'pma_chart.php'; + +require_once 'pChart/pData.class'; +require_once 'pChart/pChart.class'; + +/** + * Base class for every chart implemented using pChart. + * @abstract + * @package phpMyAdmin + */ +abstract class PMA_pChart_chart extends PMA_chart +{ + /** + * @var String title text + */ + protected $titleText; + + /** + * @var array data for the chart + */ + protected $data; + + /** + * @var object pData object that holds the description of the data + */ + protected $dataSet; + + /** + * @var object pChart object that holds the chart + */ + protected $chart; + + /** + * @var array holds base64 encoded chart image parts + */ + protected $partsEncoded = array(); + + public function __construct($data, $options = null) + { + parent::__construct($options); + + $this->data = $data; + + $this->settings['fontPath'] = './libraries/chart/pChart/fonts/'; + + $this->settings['scale'] = SCALE_ADDALLSTART0; + + $this->settings['labelHeight'] = 20; + + $this->settings['fontSize'] = 8; + + $this->settings['continuous'] = 'off'; + + // as in CSS (top, right, bottom, left) + $this->setAreaMargins(array(20, 20, 40, 60)); + + // when graph area gradient is used, this is the color of the graph + // area border + $this->settings['graphAreaColor'] = '#D5D9DD'; + + // the background color of the graph area + $this->settings['graphAreaGradientColor'] = '#A3CBA7'; + + // the color of the grid lines in the graph area + $this->settings['gridColor'] = '#E6E6E6'; + + // the color of the scale and the labels + $this->settings['scaleColor'] = '#D5D9DD'; + + $this->settings['titleBgColor'] = '#000000'; + } + + protected function init() + { + parent::init(); + + // create pChart object + $this->chart = new pChart($this->getWidth(), $this->getHeight()); + + // create pData object + $this->dataSet = new pData; + + $this->chart->reportWarnings('GD'); + $this->chart->ErrorFontName = $this->getFontPath().'tahoma.ttf'; + + // initialize colors + foreach ($this->getColors() as $key => $color) { + $this->chart->setColorPalette( + $key, + hexdec(substr($color, 1, 2)), + hexdec(substr($color, 3, 2)), + hexdec(substr($color, 5, 2)) + ); + } + + $this->chart->setFontProperties($this->getFontPath().'tahoma.ttf', $this->getFontSize()); + + $this->chart->setImageMap(true, 'mapid'); + } + + /** + * data is put to the $dataSet object according to what type chart is + * @abstract + */ + abstract protected function prepareDataSet(); + + /** + * all components of the chart are drawn + */ + protected function prepareChart() + { + $this->drawBackground(); + $this->drawChart(); + } + + /** + * draws the background + */ + protected function drawBackground() + { + $this->drawCommon(); + $this->drawTitle(); + $this->setGraphAreaDimensions(); + $this->drawGraphArea(); + } + + /** + * draws the part of the background which is common to most of the charts + */ + protected function drawCommon() + { + $this->chart->drawGraphAreaGradient( + $this->getBgColor(RED), + $this->getBgColor(GREEN), + $this->getBgColor(BLUE), + 50,TARGET_BACKGROUND); + $this->chart->addBorder(2); + } + + /** + * draws the chart title + */ + protected function drawTitle() + { + // Draw the title + $this->chart->drawTextBox( + 0, + 0, + $this->getWidth(), + $this->getLabelHeight(), + $this->getTitleText(), + 0, + $this->getTitleColor(RED), + $this->getTitleColor(GREEN), + $this->getTitleColor(BLUE), + ALIGN_CENTER, + True, + $this->getTitleBgColor(RED), + $this->getTitleBgColor(GREEN), + $this->getTitleBgColor(BLUE), + 30 + ); + } + + /** + * calculates and sets the dimensions that will be used for the actual graph + */ + protected function setGraphAreaDimensions() + { + $this->chart->setGraphArea( + $this->getAreaMargin(LEFT), + $this->getLabelHeight() + $this->getAreaMargin(TOP), + $this->getWidth() - $this->getAreaMargin(RIGHT), + $this->getHeight() - $this->getAreaMargin(BOTTOM) + ); + } + + /** + * draws graph area (the area where all bars, lines, points will be seen) + */ + protected function drawGraphArea() + { + $this->chart->drawGraphArea( + $this->getGraphAreaColor(RED), + $this->getGraphAreaColor(GREEN), + $this->getGraphAreaColor(BLUE), + FALSE + ); + $this->chart->drawScale( + $this->dataSet->GetData(), + $this->dataSet->GetDataDescription(), + $this->getScale(), + $this->getScaleColor(RED), + $this->getScaleColor(GREEN), + $this->getScaleColor(BLUE), + TRUE,0,2,TRUE + ); + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + 50 + ); + $this->chart->drawGrid( + 4, + TRUE, + $this->getGridColor(RED), + $this->getGridColor(GREEN), + $this->getGridColor(BLUE), + 20 + ); + } + + /** + * draws the chart + * @abstract + */ + protected abstract function drawChart(); + + /** + * Renders the chart, base 64 encodes the output and puts it into + * array partsEncoded. + * + * Parameter can be used to slice the chart vertically into parts. This + * solves an issue where some browsers (IE8) accept base64 images only up + * to some length. + * + * @param integer $parts number of parts to render. + * Default value 1 means that all the + * chart will be in one piece. + */ + protected function render($parts = 1) + { + $fullWidth = 0; + + for ($i = 0; $i < $parts; $i++) { + + // slicing is vertical so part height is the full height + $partHeight = $this->chart->YSize; + + // there will be some rounding erros, will compensate later + $partWidth = round($this->chart->XSize / $parts); + $fullWidth += $partWidth; + $partX = $partWidth * $i; + + if ($i == $parts - 1) { + // if this is the last part, compensate for the rounding errors + $partWidth += $this->chart->XSize - $fullWidth; + } + + // get a part from the full chart image + $part = imagecreatetruecolor($partWidth, $partHeight); + imagecopy($part, $this->chart->Picture, 0, 0, $partX, 0, $partWidth, $partHeight); + + // render part and save it to variable + ob_start(); + imagepng($part, NULL, 9, PNG_ALL_FILTERS); + $output = ob_get_contents(); + ob_end_clean(); + + // base64 encode the current part + $partEncoded = base64_encode($output); + $this->partsEncoded[$i] = $partEncoded; + } + } + + /** + * get the HTML and JS code for the configured chart + * @return string HTML and JS code for the chart + */ + public function toString() + { + if (!function_exists('gd_info')) { + array_push($this->errors, ERR_NO_GD); + return ''; + } + + $this->init(); + $this->prepareDataSet(); + $this->prepareChart(); + + //$this->chart->debugImageMap(); + //$this->chart->printErrors('GD'); + + // check if a user wanted a chart in one part + if ($this->isContinuous()) { + $this->render(1); + } + else { + $this->render(20); + } + + $returnData = '<div id="chart">'; + foreach ($this->partsEncoded as $part) { + $returnData .= '<img src="data:image/png;base64,'.$part.'" />'; + } + $returnData .= '</div>'; + + // add tooltips only if json is available + if (function_exists('json_encode')) { + $returnData .= ' + <script type="text/javascript"> + //<![CDATA[ + imageMap.loadImageMap(\''.json_encode($this->getImageMap()).'\'); + //]]> + </script> + '; + } + else { + array_push($this->errors, ERR_NO_JSON); + } + + return $returnData; + } + + protected function getLabelHeight() + { + return $this->settings['labelHeight']; + } + + protected function setAreaMargins($areaMargins) + { + $this->settings['areaMargins'] = $areaMargins; + } + + protected function getAreaMargin($side) + { + return $this->settings['areaMargins'][$side]; + } + + protected function getFontPath() + { + return $this->settings['fontPath']; + } + + protected function getScale() + { + return $this->settings['scale']; + } + + protected function getFontSize() + { + return $this->settings['fontSize']; + } + + protected function isContinuous() + { + return $this->settings['continuous'] == 'on'; + } + + protected function getImageMap() + { + return $this->chart->getImageMap(); + } + + protected function getGraphAreaColor($component) + { + return $this->hexStrToDecComp($this->settings['graphAreaColor'], $component); + } + + protected function getGraphAreaGradientColor($component) + { + return $this->hexStrToDecComp($this->settings['graphAreaGradientColor'], $component); + } + + protected function getGridColor($component) + { + return $this->hexStrToDecComp($this->settings['gridColor'], $component); + } + + protected function getScaleColor($component) + { + return $this->hexStrToDecComp($this->settings['scaleColor'], $component); + } + + protected function getTitleBgColor($component) + { + return $this->hexStrToDecComp($this->settings['titleBgColor'], $component); + } +} + +?> diff --git a/libraries/chart/pma_pchart_multi.php b/libraries/chart/pma_pchart_multi.php new file mode 100644 index 0000000..685b746 --- /dev/null +++ b/libraries/chart/pma_pchart_multi.php @@ -0,0 +1,118 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_chart.php'; + +/** + * Base class for every chart that uses multiple series. + * All of these charts will require legend box. + * @abstract + * @package phpMyAdmin + */ +abstract class PMA_pChart_multi extends PMA_pChart_chart +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + + // as in CSS (top, right, bottom, left) + $this->setLegendMargins(array(20, 10, 0, 0)); + } + + /** + * data set preparation for multi serie graphs + */ + protected function prepareDataSet() + { + $values = array_values($this->data); + $keys = array_keys($this->data); + + // Dataset definition + $this->dataSet->AddPoint($values[0], "Keys"); + + $i = 0; + foreach ($values[1] as $seriesName => $seriesData) { + $this->dataSet->AddPoint($seriesData, "Values".$i); + $this->dataSet->SetSerieName($seriesName, "Values".$i); + $i++; + } + $this->dataSet->AddAllSeries(); + + $this->dataSet->RemoveSerie("Keys"); + $this->dataSet->SetAbsciseLabelSerie("Keys"); + + $xLabel = $this->getXLabel(); + if (empty($xLabel)) { + $this->setXLabel($keys[0]); + } + $yLabel = $this->getYLabel(); + if (empty($yLabel)) { + $this->setYLabel($keys[1]); + } + + $this->dataSet->SetXAxisName($this->getXLabel()); + $this->dataSet->SetYAxisName($this->getYLabel()); + } + + /** + * set graph area dimensions with respect to legend box size + */ + protected function setGraphAreaDimensions() + { + $this->chart->setGraphArea( + $this->getAreaMargin(LEFT), + $this->getLabelHeight() + $this->getAreaMargin(TOP), + $this->getWidth() - $this->getAreaMargin(RIGHT) - $this->getLegendBoxWidth() - $this->getLegendMargin(LEFT) - $this->getLegendMargin(RIGHT), + $this->getHeight() - $this->getAreaMargin(BOTTOM) + ); + } + + /** + * multi serie charts need a legend. draw it + */ + protected function drawChart() + { + $this->drawLegend(); + } + + /** + * draws a legend + */ + protected function drawLegend() + { + // Draw the legend + $this->chart->drawLegend( + $this->getWidth() - $this->getLegendMargin(RIGHT) - $this->getLegendBoxWidth(), + $this->getLabelHeight() + $this->getLegendMargin(TOP), + $this->dataSet->GetDataDescription(), + 250,250,250,50,50,50 + ); + } + + protected function setLegendMargins($legendMargins) + { + if (!isset($this->settings['legendMargins'])) { + $this->settings['legendMargins'] = $legendMargins; + } + } + + protected function getLegendMargin($side) + { + return $this->settings['legendMargins'][$side]; + } + + protected function getLegendBoxWidth() + { + $legendSize = $this->chart->getLegendBoxSize($this->dataSet->GetDataDescription()); + return $legendSize[0]; + } +} + +?> diff --git a/libraries/chart/pma_pchart_multi_bar.php b/libraries/chart/pma_pchart_multi_bar.php new file mode 100644 index 0000000..6c3969b --- /dev/null +++ b/libraries/chart/pma_pchart_multi_bar.php @@ -0,0 +1,38 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_multi.php'; + +/** + * implements multi bar chart + * @package phpMyAdmin + */ +class PMA_pChart_multi_bar extends PMA_pChart_multi +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + + $this->settings['scale'] = SCALE_NORMAL; + } + + /** + * draws multi bar graph + */ + protected function drawChart() + { + parent::drawChart(); + + // Draw the bar chart + $this->chart->drawBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70); + } +} + +?> diff --git a/libraries/chart/pma_pchart_multi_line.php b/libraries/chart/pma_pchart_multi_line.php new file mode 100644 index 0000000..892c011 --- /dev/null +++ b/libraries/chart/pma_pchart_multi_line.php @@ -0,0 +1,39 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_multi.php'; + +/** + * implements multi line chart + * @package phpMyAdmin + */ +class PMA_pChart_multi_line extends PMA_pChart_multi +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + + $this->settings['scale'] = SCALE_NORMAL; + } + + /** + * draws multi line chart + */ + protected function drawChart() + { + parent::drawChart(); + + // Draw the bar chart + $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription()); + $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE); + } +} + +?> diff --git a/libraries/chart/pma_pchart_multi_radar.php b/libraries/chart/pma_pchart_multi_radar.php new file mode 100644 index 0000000..2224acc --- /dev/null +++ b/libraries/chart/pma_pchart_multi_radar.php @@ -0,0 +1,100 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_multi.php'; + +/** + * implements multi radar chart + * @package phpMyAdmin + */ +class PMA_pChart_multi_radar extends PMA_pChart_multi +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + + $this->normalizeValues(); + } + + /** + * Get the largest value from the data and normalize all the other values. + */ + private function normalizeValues() + { + $maxValue = 0; + $keys = array_keys($this->data); + $valueKey = $keys[1]; + + // get the max value + foreach ($this->data[$valueKey] as $values) { + if (max($values) > $maxValue) { + $maxValue = max($values); + } + } + + // normalize all the values according to the max value + foreach ($this->data[$valueKey] as &$values) { + foreach ($values as &$value) { + $value = $value / $maxValue * 10; + } + } + } + + /** + * graph area for the radar chart does not include grid lines + */ + protected function drawGraphArea() + { + $this->chart->drawGraphArea( + $this->getGraphAreaColor(RED), + $this->getGraphAreaColor(GREEN), + $this->getGraphAreaColor(BLUE), + FALSE + ); + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + 50 + ); + } + + /** + * draw multi radar chart + */ + protected function drawChart() + { + parent::drawChart(); + + // when drawing radar graph we can specify the border from the top of + // graph area. We want border to be dynamic, so that either the top + // or the side of the radar is some distance away from the top or the + // side of the graph area. + $areaWidth = $this->chart->GArea_X2 - $this->chart->GArea_X1; + $areaHeight = $this->chart->GArea_Y2 - $this->chart->GArea_Y1; + + if ($areaHeight > $areaWidth) { + $borderOffset = ($areaHeight - $areaWidth) / 2; + } + else { + $borderOffset = 0; + } + + // the least ammount that radar is away from the graph area side. + $borderOffset += 40; + + // Draw the radar chart + $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), TRUE, $borderOffset, + 120, 120, 120, 230, 230, 230, -1, 2); + $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset); + } +} + +?> diff --git a/libraries/chart/pma_pchart_pie.php b/libraries/chart/pma_pchart_pie.php new file mode 100644 index 0000000..5bf77fc --- /dev/null +++ b/libraries/chart/pma_pchart_pie.php @@ -0,0 +1,101 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_multi.php'; + +/** + * implements pie chart + * @package phpMyAdmin + */ +class PMA_pChart_Pie extends PMA_pChart_multi +{ + public function __construct($data, $options = null) + { + // limit data size, no more than 18 pie slices + $data = array_slice($data, 0, 18, true); + parent::__construct($data, $options); + + $this->setAreaMargins(array(20, 10, 20, 20)); + } + + /** + * prepare data set for the pie chart + */ + protected function prepareDataSet() + { + // Dataset definition + $this->dataSet->AddPoint(array_values($this->data), "Values"); + $this->dataSet->AddPoint(array_keys($this->data), "Keys"); + $this->dataSet->AddAllSeries(); + $this->dataSet->SetAbsciseLabelSerie("Keys"); + } + + /** + * graph area for the pie chart does not include grid lines + */ + protected function drawGraphArea() + { + $this->chart->drawGraphArea( + $this->getGraphAreaColor(RED), + $this->getGraphAreaColor(GREEN), + $this->getGraphAreaColor(BLUE), + FALSE + ); + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + 50 + ); + } + + /** + * draw the pie chart + */ + protected function drawChart() + { + parent::drawChart(); + + // draw pie chart in the middle of graph area + $middleX = ($this->chart->GArea_X1 + $this->chart->GArea_X2) / 2; + $middleY = ($this->chart->GArea_Y1 + $this->chart->GArea_Y2) / 2; + + $this->chart->drawPieGraph( + $this->dataSet->GetData(), + $this->dataSet->GetDataDescription(), + $middleX, + // pie graph is skewed. Upper part is shorter than the + // lower part. This is why we set an offset to the + // Y middle coordiantes. + $middleY - 15, + 120, PIE_PERCENTAGE, FALSE, 60, 30, 10, 1); + } + + /** + * draw legend for the pie chart + */ + protected function drawLegend() + { + $this->chart->drawPieLegend( + $this->getWidth() - $this->getLegendMargin(RIGHT) - $this->getLegendBoxWidth(), + $this->getLabelHeight() + $this->getLegendMargin(TOP), + $this->dataSet->GetData(), + $this->dataSet->GetDataDescription(), + 250, 250, 250); + } + + protected function getLegendBoxWidth() + { + $legendSize = $this->chart->getPieLegendBoxSize($this->dataSet->GetData()); + return $legendSize[0]; + } +} + +?> diff --git a/libraries/chart/pma_pchart_single.php b/libraries/chart/pma_pchart_single.php new file mode 100644 index 0000000..04fef80 --- /dev/null +++ b/libraries/chart/pma_pchart_single.php @@ -0,0 +1,57 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_chart.php'; + +/** + * Base class for every chart that uses only one series. + * @abstract + * @package phpMyAdmin + */ +abstract class PMA_pChart_single extends PMA_pChart_chart +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + } + + /** + * data set preparation for single serie charts + */ + protected function prepareDataSet() + { + $values = array_values($this->data); + $keys = array_keys($this->data); + + // Dataset definition + $this->dataSet->AddPoint($values[0], "Values"); + $this->dataSet->AddPoint($values[1], "Keys"); + + //$this->dataSet->AddAllSeries(); + $this->dataSet->AddSerie("Values"); + + $this->dataSet->SetAbsciseLabelSerie("Keys"); + + $yLabel = $this->getYLabel(); + if (empty($yLabel)) { + $this->setYLabel($keys[0]); + } + $xLabel = $this->getXLabel(); + if (empty($xLabel)) { + $this->setXLabel($keys[1]); + } + + $this->dataSet->SetXAxisName($this->getXLabel()); + $this->dataSet->SetYAxisName($this->getYLabel()); + $this->dataSet->SetSerieName($this->getYLabel(), "Values"); + } +} + +?> diff --git a/libraries/chart/pma_pchart_single_bar.php b/libraries/chart/pma_pchart_single_bar.php new file mode 100644 index 0000000..821df63 --- /dev/null +++ b/libraries/chart/pma_pchart_single_bar.php @@ -0,0 +1,35 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_single.php'; + +/** + * implements single bar chart + * @package phpMyAdmin + */ +class PMA_pChart_single_bar extends PMA_pChart_single +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + } + + /** + * draws single bar chart + */ + protected function drawChart() + { + // Draw the bar chart + // use stacked bar graph function, because it gives bars with alpha + $this->chart->drawStackedBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70); + } +} + +?> diff --git a/libraries/chart/pma_pchart_single_line.php b/libraries/chart/pma_pchart_single_line.php new file mode 100644 index 0000000..a0ac742 --- /dev/null +++ b/libraries/chart/pma_pchart_single_line.php @@ -0,0 +1,35 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_single.php'; + +/** + * implements single line chart + * @package phpMyAdmin + */ +class PMA_pChart_single_line extends PMA_pChart_single +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + } + + /** + * draws single line chart + */ + protected function drawChart() + { + // Draw the line chart + $this->chart->drawLineGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription()); + $this->chart->drawPlotGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 3, 1, -1, -1, -1, TRUE); + } +} + +?> diff --git a/libraries/chart/pma_pchart_single_radar.php b/libraries/chart/pma_pchart_single_radar.php new file mode 100644 index 0000000..1b31cd0 --- /dev/null +++ b/libraries/chart/pma_pchart_single_radar.php @@ -0,0 +1,88 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_single.php'; + +/** + * implements single radar chart + * @package phpMyAdmin + */ +class PMA_pChart_single_radar extends PMA_pChart_single +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + + $this->normalizeValues(); + } + + /** + * Get the largest value from the data and normalize all the other values. + */ + private function normalizeValues() + { + $maxValue = 0; + $keys = array_keys($this->data); + $valueKey = $keys[0]; + $maxValue = max($this->data[$valueKey]); + + foreach ($this->data[$valueKey] as &$value) { + $value = $value / $maxValue * 10; + } + } + + /** + * graph area for the radar chart does not include grid lines + */ + protected function drawGraphArea() + { + $this->chart->drawGraphArea( + $this->getGraphAreaColor(RED), + $this->getGraphAreaColor(GREEN), + $this->getGraphAreaColor(BLUE), + FALSE + ); + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + 50 + ); + } + + /** + * draws the radar chart + */ + protected function drawChart() + { + // when drawing radar graph we can specify the border from the top of + // graph area. We want border to be dynamic, so that either the top + // or the side of the radar is some distance away from the top or the + // side of the graph area. + $areaWidth = $this->chart->GArea_X2 - $this->chart->GArea_X1; + $areaHeight = $this->chart->GArea_Y2 - $this->chart->GArea_Y1; + + if ($areaHeight > $areaWidth) { + $borderOffset = ($areaHeight - $areaWidth) / 2; + } + else { + $borderOffset = 0; + } + + // the least ammount that radar is away from the graph area side. + $borderOffset += 40; + + $this->chart->drawRadarAxis($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), + TRUE, $borderOffset, 120, 120, 120, 230, 230, 230, -1, 2); + $this->chart->drawFilledRadar($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 50, $borderOffset); + } +} + +?> diff --git a/libraries/chart/pma_pchart_stacked_bar.php b/libraries/chart/pma_pchart_stacked_bar.php new file mode 100644 index 0000000..4a633f0 --- /dev/null +++ b/libraries/chart/pma_pchart_stacked_bar.php @@ -0,0 +1,36 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * @author Martynas Mickevicius <mmartynas(a)gmail.com> + * @package phpMyAdmin + */ + +/** + * + */ +require_once 'pma_pchart_multi.php'; + +/** + * implements stacked bar chart + * @package phpMyAdmin + */ +class PMA_pChart_stacked_bar extends PMA_pChart_multi +{ + public function __construct($data, $options = null) + { + parent::__construct($data, $options); + } + + /** + * draws stacked bar chart + */ + protected function drawChart() + { + parent::drawChart(); + + // Draw the bar chart + $this->chart->drawStackedBarGraph($this->dataSet->GetData(), $this->dataSet->GetDataDescription(), 70); + } +} + +?> diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 741d8cb..dd7f40a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1280,12 +1280,14 @@ function PMA_profilingCheckbox($sql_query) * Displays the results of SHOW PROFILE * * @param array the results + * @param boolean show chart * @access public * */ -function PMA_profilingResults($profiling_results) +function PMA_profilingResults($profiling_results, $show_chart = false) { echo '<fieldset><legend>' . __('Profiling') . '</legend>' . "\n"; + echo '<div style="float: left;">'; echo '<table>' . "\n"; echo ' <tr>' . "\n"; echo ' <th>' . __('Status') . '</th>' . "\n"; @@ -1297,7 +1299,17 @@ function PMA_profilingResults($profiling_results) echo '<td>' . $one_result['Status'] . '</td>' . "\n"; echo '<td>' . $one_result['Duration'] . '</td>' . "\n"; } + echo '</table>' . "\n"; + echo '</div>'; + + if ($show_chart) { + require_once './libraries/chart.lib.php'; + echo '<div style="float: left;">'; + PMA_chart_profiling($profiling_results); + echo '</div>'; + } + echo '</fieldset>' . "\n"; } diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 747c5b5..0deed6e 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2182,6 +2182,12 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { 'tbl_export.php' . PMA_generate_common_url($_url_params), PMA_getIcon('b_tblexport.png', __('Export'), false, true), '', true, true, '') . "\n"; + + // show chart + echo PMA_linkOrButton( + 'tbl_chart.php' . PMA_generate_common_url($_url_params), + PMA_getIcon('b_chart.png', __('Display chart'), false, true), + '', true, true, '') . "\n"; } // CREATE VIEW diff --git a/server_status.php b/server_status.php index bcbfe06..520bb51 100644 --- a/server_status.php +++ b/server_status.php @@ -16,6 +16,8 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { } require_once './libraries/common.inc.php'; +$GLOBALS['js_include'][] = 'pMap.js'; + /** * Does the common work */ @@ -34,6 +36,11 @@ require './libraries/replication.inc.php'; require_once './libraries/replication_gui.lib.php'; /** + * Chart generation + */ +require_once './libraries/chart.lib.php'; + +/** * Messages are built using the message name */ $strShowStatusBinlog_cache_disk_useDescr = __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.'); @@ -692,6 +699,13 @@ foreach ($used_queries as $name => $value) { ?> </tbody> </table> + <div class="clearfloat"></div> +</div> + +<div> + <?php + echo PMA_chart_status($used_queries); + ?> </div> <div id="serverstatussection"> diff --git a/sql.php b/sql.php index 12c6ac5..9a370d8 100644 --- a/sql.php +++ b/sql.php @@ -14,6 +14,7 @@ require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/bookmark.lib.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; +$GLOBALS['js_include'][] = 'pMap.js'; /** * Defines the url to return to in case of error in a sql statement @@ -602,7 +603,7 @@ else { } if (isset($profiling_results)) { - PMA_profilingResults($profiling_results); + PMA_profilingResults($profiling_results, true); } // Displays the results in a table diff --git a/tbl_chart.php b/tbl_chart.php new file mode 100644 index 0000000..0e9ed40 --- /dev/null +++ b/tbl_chart.php @@ -0,0 +1,192 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * handles creation of the chart + * + * @version $Id$ + * @package phpMyAdmin + */ + +/** + * do not import request variable into global scope + * @ignore + */ +if (! defined('PMA_NO_VARIABLES_IMPORT')) { + define('PMA_NO_VARIABLES_IMPORT', true); +} + +/** + * + */ +require_once './libraries/common.inc.php'; + +$GLOBALS['js_include'][] = 'pMap.js'; + +/** + * Runs common work + */ +require './libraries/db_common.inc.php'; +$url_params['goto'] = $cfg['DefaultTabDatabase']; +$url_params['back'] = 'sql.php'; + +/* + * Import chart functions + */ +require_once './libraries/chart.lib.php'; + +/* + * Execute the query and return the result + */ +$data = array(); + +$result = PMA_DBI_try_query($sql_query); +while ($row = PMA_DBI_fetch_assoc($result)) { + $data[] = $row; +} + +// get settings if any posted +$chartSettings = array(); +if (PMA_isValid($_REQUEST['chartSettings'], 'array')) { + $chartSettings = $_REQUEST['chartSettings']; +} + +// get the chart and settings after chart generation +$chart = PMA_chart_results($data, $chartSettings); + +if (!empty($chart)) { + $message = PMA_Message::success(__('Chart generated successfully.')); +} +else { + $message = PMA_Message::error(__('The result of this query can\'t be used for a chart. See [a@./Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]')); +} + +/** + * Displays top menu links + * We use db links because a chart is not necessarily on a single table + */ +$num_tables = 0; +require_once './libraries/db_links.inc.php'; + +$url_params['db'] = $GLOBALS['db']; +$url_params['reload'] = 1; + +/** + * Displays the page + */ +?> + +<div id="div_view_options"> +<form method="post" action="tbl_chart.php"> +<?php echo PMA_generate_common_hidden_inputs($url_params); ?> +<fieldset> + <legend><?php echo __('Display chart'); ?></legend> + + <div style="float: right"> + <?php echo $chart; ?> + </div> + + <input type="hidden" name="sql_query" id="sql_query" value="<?php echo htmlspecialchars($sql_query); ?>" /> + + <table> + <tr><td><label for="width"><?php echo __("Width"); ?></label></td> + <td><input type="text" name="chartSettings[width]" id="width" value="<?php echo (isset($chartSettings['width']) ? htmlspecialchars($chartSettings['width']) : ''); ?>" /></td> + </tr> + + <tr><td><label for="height"><?php echo __("Height"); ?></label></td> + <td><input type="text" name="chartSettings[height]" id="height" value="<?php echo (isset($chartSettings['height']) ? htmlspecialchars($chartSettings['height']) : ''); ?>" /></td> + </tr> + + <tr><td><label for="titleText"><?php echo __("Title"); ?></label></td> + <td><input type="text" name="chartSettings[titleText]" id="titleText" value="<?php echo (isset($chartSettings['titleText']) ? htmlspecialchars($chartSettings['titleText']) : ''); ?>" /></td> + </tr> + + <?php if ($chartSettings['type'] != 'pie' && $chartSettings['type'] != 'radar') { ?> + <tr><td><label for="xLabel"><?php echo __("X Axis label"); ?></label></td> + <td><input type="text" name="chartSettings[xLabel]" id="xLabel" value="<?php echo (isset($chartSettings['xLabel']) ? htmlspecialchars($chartSettings['xLabel']) : ''); ?>" /></td> + </tr> + + <tr><td><label for="yLabel"><?php echo __("Y Axis label"); ?></label></td> + <td><input type="text" name="chartSettings[yLabel]" id="yLabel" value="<?php echo (isset($chartSettings['yLabel']) ? htmlspecialchars($chartSettings['yLabel']) : ''); ?>" /></td> + </tr> + <?php } ?> + + <tr><td><label for="areaMargins"><?php echo __("Area margins"); ?></label></td> + <td> + <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][0]) ? htmlspecialchars($chartSettings['areaMargins'][0]) : ''); ?>" /> + <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][1]) ? htmlspecialchars($chartSettings['areaMargins'][1]) : ''); ?>" /> + <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][2]) ? htmlspecialchars($chartSettings['areaMargins'][2]) : ''); ?>" /> + <input type="text" name="chartSettings[areaMargins][]" size="2" value="<?php echo (isset($chartSettings['areaMargins'][3]) ? htmlspecialchars($chartSettings['areaMargins'][3]) : ''); ?>" /> + </td> + </tr> + + <?php if ($chartSettings['legend'] == true) { ?> + <tr><td><label for="legendMargins"><?php echo __("Legend margins"); ?></label></td> + <td> + <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][0]); ?>" /> + <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][1]); ?>" /> + <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][2]); ?>" /> + <input type="text" name="chartSettings[legendMargins][]" size="2" value="<?php echo htmlspecialchars($chartSettings['legendMargins'][3]); ?>" /> + </td> + </tr> + <?php } ?> + + <tr><td><label for="type"><?php echo __("Type"); ?></label></td> + <td> + <input type="radio" name="chartSettings[type]" value="bar" <?php echo ($chartSettings['type'] == 'bar' ? 'checked' : ''); ?>><?php echo __('Bar'); ?> + <input type="radio" name="chartSettings[type]" value="line" <?php echo ($chartSettings['type'] == 'line' ? 'checked' : ''); ?>><?php echo __('Line'); ?> + <input type="radio" name="chartSettings[type]" value="radar" <?php echo ($chartSettings['type'] == 'radar' ? 'checked' : ''); ?>><?php echo __('Radar'); ?> + <?php if ($chartSettings['multi'] == false) { ?> + <input type="radio" name="chartSettings[type]" value="pie" <?php echo ($chartSettings['type'] == 'pie' ? 'checked' : ''); ?>><?php echo __('Pie'); ?> + <?php } ?> + </td> + </tr> + + <?php if ($chartSettings['type'] == 'bar' && isset($chartSettings['multi']) && $chartSettings['multi'] == true) { ?> + <tr><td><label for="barType"><?php echo __("Bar type"); ?></label></td> + <td> + <input type="radio" name="chartSettings[barType]" value="stacked" <?php echo ($chartSettings['barType'] == 'stacked' ? 'checked' : ''); ?>><?php echo __('Stacked'); ?> + <input type="radio" name="chartSettings[barType]" value="multi" <?php echo ($chartSettings['barType'] == 'multi' ? 'checked' : ''); ?>><?php echo __('Multi'); ?> + </td> + </tr> + <?php } ?> + + <tr><td><label for="continuous"><?php echo __("Continuous image"); ?></label></td> + <td> + <input type="checkbox" name="chartSettings[continuous]" id="continuous" <?php echo ($chartSettings['continuous'] == 'on' ? 'checked="checked"' : ''); ?>> + <?php echo PMA_showHint(PMA_sanitize(__('For compatibility reasons the chart image is segmented by default, select this to draw the whole chart in one image.'))) ?> + </td> + </tr> + + <tr><td><label for="fontSize"><?php echo __("Font size"); ?></label></td> + <td><input type="text" name="chartSettings[fontSize]" id="fontSize" value="<?php echo (isset($chartSettings['fontSize']) ? htmlspecialchars($chartSettings['fontSize']) : ''); ?>" /></td> + </tr> + + <?php if ($chartSettings['type'] == 'radar') { ?> + <tr><td colspan="2"> + <p> + <?php echo __('When drawing a radar chart all values are normalized to a range [0..10].'); ?> + </p> + </td></tr> + <?php } ?> + + <tr><td colspan="2"> + <p> + <?php echo __('Note that not every result table can be put to the chart. See <a href="./Documentation.html#faq6_29" target="Documentation">FAQ 6.29</a>'); ?> + </p> + </td></tr> + + </table> + +</fieldset> +<fieldset class="tblFooters"> + <input type="submit" name="displayChart" value="<?php echo __('Redraw'); ?>" /> +</fieldset> +</form> +</div> +<?php +/** + * Displays the footer + */ +require_once './libraries/footer.inc.php'; + +?> diff --git a/themes/darkblue_orange/img/b_chart.png b/themes/darkblue_orange/img/b_chart.png new file mode 100644 index 0000000..388ec30 Binary files /dev/null and b/themes/darkblue_orange/img/b_chart.png differ diff --git a/themes/original/img/b_chart.png b/themes/original/img/b_chart.png new file mode 100644 index 0000000..388ec30 Binary files /dev/null and b/themes/original/img/b_chart.png differ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8551-g49ff70a
by Michal Čihař 27 Aug '10

27 Aug '10

The branch, master has been updated via 49ff70a30e1d185276b4862218ba3eb253708745 (commit) via 95afff4a31a9fb5e42d7df1b3925e86c2c6467ec (commit) via fbed6b35a1c9be4c55456a5dd6b38f46a58f3c4e (commit) via 07685b095efeaf25b5014ab253442115704601a1 (commit) from f912586a0dd6fb5bdf0960ce99a249a45872c056 (commit) - Log ----------------------------------------------------------------- commit 49ff70a30e1d185276b4862218ba3eb253708745 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 27 10:29:06 2010 +0200 Translation update done using Pootle. commit 95afff4a31a9fb5e42d7df1b3925e86c2c6467ec Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 27 10:28:51 2010 +0200 Translation update done using Pootle. commit fbed6b35a1c9be4c55456a5dd6b38f46a58f3c4e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 27 10:26:22 2010 +0200 Translation update done using Pootle. commit 07685b095efeaf25b5014ab253442115704601a1 Author: Pootle server <pootle(a)cihar.com> Date: Fri Aug 27 10:21:52 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/cs.po b/po/cs.po index b1cce25..f0889e2 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-08-25 09:51+0200\n" -"PO-Revision-Date: 2010-08-25 09:51+0200\n" +"PO-Revision-Date: 2010-08-27 10:29+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -3069,15 +3069,15 @@ msgstr "Platnost přihlašovací cookie" #: libraries/config/messages.inc.php:294 msgid "Double size of textarea for LONGTEXT fields" -msgstr "" +msgstr "Zdvojnásobit velikost editačního pole pro typ LONGTEXT" #: libraries/config/messages.inc.php:295 msgid "Bigger textarea for LONGTEXT" -msgstr "" +msgstr "Větší editační pole pro LONGTEXT" #: libraries/config/messages.inc.php:296 msgid "Use icons on main page" -msgstr "" +msgstr "Zobrazit ikony na hlavní stránce" #: libraries/config/messages.inc.php:297 msgid "Maximum number of characters used when a SQL query is displayed" @@ -3090,7 +3090,7 @@ msgstr "Nejvyšší délka zobrazeného SQL dotazu" #: libraries/config/messages.inc.php:299 libraries/config/messages.inc.php:304 #: libraries/config/messages.inc.php:331 msgid "Users cannot set a higher value" -msgstr "" +msgstr "Uživatelé nemohou nastavit větší hodnotu" #: libraries/config/messages.inc.php:300 msgid "Maximum number of databases displayed in left frame and database list" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8547-gf912586
by Michal Čihař 27 Aug '10

27 Aug '10

The branch, master has been updated via f912586a0dd6fb5bdf0960ce99a249a45872c056 (commit) via db8d66a728b0a8cbbd27d8c6789f0d68e980e96e (commit) via f898e45a5b879228b44b1cdf5efeba310772db37 (commit) via 0e31c8b0d9b0681eb09477a2a61c557f8ab8b1ba (commit) from d5d5490b89abb91ca7743f85e574fb3a34aebc25 (commit) - Log ----------------------------------------------------------------- commit f912586a0dd6fb5bdf0960ce99a249a45872c056 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:39:53 2010 +0200 Translation update done using Pootle. commit db8d66a728b0a8cbbd27d8c6789f0d68e980e96e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:39:33 2010 +0200 Translation update done using Pootle. commit f898e45a5b879228b44b1cdf5efeba310772db37 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:39:06 2010 +0200 Translation update done using Pootle. commit 0e31c8b0d9b0681eb09477a2a61c557f8ab8b1ba Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:38:33 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/po/tr.po b/po/tr.po index 5673c9d..88b77aa 100644 --- a/po/tr.po +++ b/po/tr.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-08-25 09:51+0200\n" -"PO-Revision-Date: 2010-08-27 09:27+0200\n" +"PO-Revision-Date: 2010-08-27 09:39+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -3185,7 +3185,7 @@ msgstr "Sadece simgeleri, sadece metni veya her ikisinide kullanır" #: libraries/config/messages.inc.php:316 msgid "Iconic navigation bar" -msgstr "Simgesel rehber çubuğu" +msgstr "Sembolik rehber çubuğu" #: libraries/config/messages.inc.php:317 msgid "use GZip output buffering for increased speed in HTTP transfers" @@ -3222,18 +3222,17 @@ msgid "" "Structure page if any of the required tables for the relation features could " "not be found" msgstr "" -"Eğer ilişkilendirme için gerekli tabloların herhangi biri bulunamazsa, " +"Eğer ilişkilendirme için gerekli tabloların herhangi biri bulunamazsa, " "veritabanı ayrıntıları Yapı sayfasında gösterilen varsayılan uyarıyı " "etkisizleştir" #: libraries/config/messages.inc.php:324 -#, fuzzy msgid "Missing phpMyAdmin configuration storage tables" -msgstr "phpMyAdmin belgeleri" +msgstr "Eksik phpMyAdmin yapılandırma depolama tabloları" #: libraries/config/messages.inc.php:326 msgid "Iconic table operations" -msgstr "Simgesel tablo işlemleri" +msgstr "Sembolik tablo işlemleri" #: libraries/config/messages.inc.php:327 msgid "Disallow BLOB and BINARY columns from editing" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8543-gd5d5490
by Michal Čihař 27 Aug '10

27 Aug '10

The branch, master has been updated via d5d5490b89abb91ca7743f85e574fb3a34aebc25 (commit) from 1f1a57e99a50888ffb5ec2e4da3d1e99dac6cfea (commit) - Log ----------------------------------------------------------------- commit d5d5490b89abb91ca7743f85e574fb3a34aebc25 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:27:58 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index cfd563f..5673c9d 100644 --- a/po/tr.po +++ b/po/tr.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-08-25 09:51+0200\n" -"PO-Revision-Date: 2010-08-27 09:17+0200\n" +"PO-Revision-Date: 2010-08-27 09:27+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -3018,11 +3018,12 @@ msgid "Light tabs" msgstr "Hafif sekmeler" #: libraries/config/messages.inc.php:284 -#, fuzzy #| msgid "Maximum number of characters used when a SQL query is displayed" msgid "" "Maximum number of characters shown in any non-numeric column on browse view" -msgstr "SQL sorgusu görüntülendiğinde kullanılan en fazla karakter sayısıdır" +msgstr "" +"Gözat görünümünde herhangi bir sayısal olmayan sütunda gösterilen en fazla " +"karakter sayısıdır" #: libraries/config/messages.inc.php:285 msgid "Limit column characters" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8542-g1f1a57e
by Michal Čihař 27 Aug '10

27 Aug '10

The branch, master has been updated via 1f1a57e99a50888ffb5ec2e4da3d1e99dac6cfea (commit) via e9b799360611e8a6114a38261f95b20501adbf49 (commit) via 1c128ba241b498f3edce404a017de033b36530fb (commit) via 364c7554266deb39d5d2fe7a93193629ddda7257 (commit) via a3fffa3890a04718759ea1adf02b27b042692c4a (commit) via 6e4caaabcbb18e837822abd82db8d466738af809 (commit) via 0e9f04147e2b95eff4931a13b3f8a6cadbec91c8 (commit) via d09b12595bfadbdf7aae5dec0b78b42b8fbad75b (commit) via d9b0377473beabbf14f6e78c2aca54ff93856110 (commit) via be803cd5d78963cb44f99706470f175eaed44c87 (commit) via b1f7fdf0265cdadfa7a1fd38b0bbbc6ccb78629a (commit) via c1270a2e5b3afd341a7947f150f0e989ed13ec48 (commit) via 34fd757aacf555703dd71730ef76c89a4b6d7727 (commit) via 66b2015131bbae537e6bdd86aee6a15445f103ee (commit) via 4375faf55efd0612185695745c2c7577acb23640 (commit) via e62352ad7a047fac52957ccb80f2aaf1788159f8 (commit) via 3037b1086977e2ed20694ab2f8a79fdf4a42b2c0 (commit) via 8e75e2b3fd3e891f29fc15d6b46045cc7494fa85 (commit) via b5a56b222bd91d6d2ae3182131fe173a677db17c (commit) via e0e5801cea677ac6cddf062ebc20ffa2e07c25ad (commit) via 92559c6ed32ae6fe3e771d3916457b88f1528c3f (commit) via 013b5cebda60fc9e4c04db8bfed08b9f933824f0 (commit) via 10b2e15122da2e1af5fef39a60d2b16509aa7ede (commit) via 60c6cf920f14d6f8690a03caf3173de5b1fa7c88 (commit) via 099f1a653bdcfaf1509621a9a1008909dc12a814 (commit) via a9f281d3a46c5069f30311895f0a958fbcf356ee (commit) via 8c159f7a3676b5913bebee18152e848270b61bc8 (commit) via 7eb2ba2865598af07c7439effc1d56f27cddc29c (commit) via 34214c982099d2692bb8581bed71a25c65fa2783 (commit) via cd8fe082b8992aafb7df8bb90739a47c694c6e02 (commit) via e9c31a114207fa0cc5aff5206f7e75fefc1425d8 (commit) via f55da457e2f2c2401454ab7e5fe2f056450fd8ff (commit) via 71036c6b8ef3d5380d9e1d5f5a7fde90b2fa0ff2 (commit) via 9e71f4324edc6eb1f85fd67ab7240a4a5dc3293a (commit) via 48752924101b354038efce7ac6edbe953d4080f1 (commit) via acb24881d55ca5e4a006f0bdc061a359c89e59dc (commit) via 83378cb97e24531b5d2c7b6fca99d4051db546b9 (commit) via 302b6e91ae16f2ebe58666eebca7c17e241aebda (commit) via 256f52524aabe19489431e8e1873788bf3ee09fe (commit) via 2c6eff7e7133f3691c1d58302d542f783b2cbd65 (commit) via 4ec52dd6564432ec08c773a0fc7c5827dd045ce9 (commit) via eb9a8909418573c2d569d2fe077f8b7d3980aaa1 (commit) via c792010b7249f7f49b147ae3fb67871436098101 (commit) from 88e4d4c2edb17af79e00b6f65e7823f755bbd7b0 (commit) - Log ----------------------------------------------------------------- commit 1f1a57e99a50888ffb5ec2e4da3d1e99dac6cfea Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:17:40 2010 +0200 Translation update done using Pootle. commit e9b799360611e8a6114a38261f95b20501adbf49 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:10:58 2010 +0200 Translation update done using Pootle. commit 1c128ba241b498f3edce404a017de033b36530fb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:09:43 2010 +0200 Translation update done using Pootle. commit 364c7554266deb39d5d2fe7a93193629ddda7257 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:09:06 2010 +0200 Translation update done using Pootle. commit a3fffa3890a04718759ea1adf02b27b042692c4a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 09:08:16 2010 +0200 Translation update done using Pootle. commit 6e4caaabcbb18e837822abd82db8d466738af809 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:50:26 2010 +0200 Translation update done using Pootle. commit 0e9f04147e2b95eff4931a13b3f8a6cadbec91c8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:50:20 2010 +0200 Translation update done using Pootle. commit d09b12595bfadbdf7aae5dec0b78b42b8fbad75b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:34:07 2010 +0200 Translation update done using Pootle. commit d9b0377473beabbf14f6e78c2aca54ff93856110 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:33:23 2010 +0200 Translation update done using Pootle. commit be803cd5d78963cb44f99706470f175eaed44c87 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:32:28 2010 +0200 Translation update done using Pootle. commit b1f7fdf0265cdadfa7a1fd38b0bbbc6ccb78629a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:31:51 2010 +0200 Translation update done using Pootle. commit c1270a2e5b3afd341a7947f150f0e989ed13ec48 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:30:56 2010 +0200 Translation update done using Pootle. commit 34fd757aacf555703dd71730ef76c89a4b6d7727 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:29:58 2010 +0200 Translation update done using Pootle. commit 66b2015131bbae537e6bdd86aee6a15445f103ee Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 08:28:53 2010 +0200 Translation update done using Pootle. commit 4375faf55efd0612185695745c2c7577acb23640 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:41:45 2010 +0200 Translation update done using Pootle. commit e62352ad7a047fac52957ccb80f2aaf1788159f8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:36:27 2010 +0200 Translation update done using Pootle. commit 3037b1086977e2ed20694ab2f8a79fdf4a42b2c0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:35:28 2010 +0200 Translation update done using Pootle. commit 8e75e2b3fd3e891f29fc15d6b46045cc7494fa85 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:35:24 2010 +0200 Translation update done using Pootle. commit b5a56b222bd91d6d2ae3182131fe173a677db17c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:35:19 2010 +0200 Translation update done using Pootle. commit e0e5801cea677ac6cddf062ebc20ffa2e07c25ad Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:35:14 2010 +0200 Translation update done using Pootle. commit 92559c6ed32ae6fe3e771d3916457b88f1528c3f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:35:02 2010 +0200 Translation update done using Pootle. commit 013b5cebda60fc9e4c04db8bfed08b9f933824f0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:34:42 2010 +0200 Translation update done using Pootle. commit 10b2e15122da2e1af5fef39a60d2b16509aa7ede Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:34:19 2010 +0200 Translation update done using Pootle. commit 60c6cf920f14d6f8690a03caf3173de5b1fa7c88 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:33:42 2010 +0200 Translation update done using Pootle. commit 099f1a653bdcfaf1509621a9a1008909dc12a814 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:06:31 2010 +0200 Translation update done using Pootle. commit a9f281d3a46c5069f30311895f0a958fbcf356ee Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:06:17 2010 +0200 Translation update done using Pootle. commit 8c159f7a3676b5913bebee18152e848270b61bc8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:05:51 2010 +0200 Translation update done using Pootle. commit 7eb2ba2865598af07c7439effc1d56f27cddc29c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:05:40 2010 +0200 Translation update done using Pootle. commit 34214c982099d2692bb8581bed71a25c65fa2783 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:04:55 2010 +0200 Translation update done using Pootle. commit cd8fe082b8992aafb7df8bb90739a47c694c6e02 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:04:06 2010 +0200 Translation update done using Pootle. commit e9c31a114207fa0cc5aff5206f7e75fefc1425d8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:03:58 2010 +0200 Translation update done using Pootle. commit f55da457e2f2c2401454ab7e5fe2f056450fd8ff Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:03:22 2010 +0200 Translation update done using Pootle. commit 71036c6b8ef3d5380d9e1d5f5a7fde90b2fa0ff2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:03:09 2010 +0200 Translation update done using Pootle. commit 9e71f4324edc6eb1f85fd67ab7240a4a5dc3293a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 07:02:37 2010 +0200 Translation update done using Pootle. commit 48752924101b354038efce7ac6edbe953d4080f1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 06:59:11 2010 +0200 Translation update done using Pootle. commit acb24881d55ca5e4a006f0bdc061a359c89e59dc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 06:59:02 2010 +0200 Translation update done using Pootle. commit 83378cb97e24531b5d2c7b6fca99d4051db546b9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 06:57:09 2010 +0200 Translation update done using Pootle. commit 302b6e91ae16f2ebe58666eebca7c17e241aebda Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 06:55:34 2010 +0200 Translation update done using Pootle. commit 256f52524aabe19489431e8e1873788bf3ee09fe Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 06:54:55 2010 +0200 Translation update done using Pootle. commit 2c6eff7e7133f3691c1d58302d542f783b2cbd65 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 06:53:18 2010 +0200 Translation update done using Pootle. commit 4ec52dd6564432ec08c773a0fc7c5827dd045ce9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Aug 27 06:52:04 2010 +0200 Translation update done using Pootle. commit eb9a8909418573c2d569d2fe077f8b7d3980aaa1 Author: Domen <dbc334(a)gmail.com> Date: Thu Aug 26 21:44:43 2010 +0200 Translation update done using Pootle. commit c792010b7249f7f49b147ae3fb67871436098101 Author: Domen <dbc334(a)gmail.com> Date: Thu Aug 26 21:44:22 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sl.po | 12 +++----- po/tr.po | 86 ++++++++++++++++++++++++++++++++++++------------------------- 2 files changed, 56 insertions(+), 42 deletions(-) diff --git a/po/sl.po b/po/sl.po index baab9df..56d5dc0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ 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-08-25 09:51+0200\n" -"PO-Revision-Date: 2010-08-24 21:40+0200\n" +"PO-Revision-Date: 2010-08-26 21:44+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -3288,10 +3288,9 @@ msgid "Query window height" msgstr "Višina okna poizvedb" #: libraries/config/messages.inc.php:338 -#, fuzzy #| msgid "Query window height (in pixels)" msgid "Query window width (in pixels)" -msgstr "Višina okna poizvedb (v slikovnih pikah)" +msgstr "Širina okna poizvedb (v slikovnih pikah)" #: libraries/config/messages.inc.php:339 msgid "Query window width" @@ -6936,12 +6935,11 @@ msgid "Existing settings will be overwritten!" msgstr "Obstoječe nastavitve bodo prepisane!" #: prefs_manage.php:323 -#, fuzzy #| msgid "You can reset all your settings and restore them to default values" msgid "You can reset all your settings and restore them to default values." msgstr "" "Ponastavite lahko vse svoje nastavitve in jih obnovite na njihove privzete " -"vrednosti" +"vrednosti." #: querywindow.php:93 msgid "Import files" diff --git a/po/tr.po b/po/tr.po index f60e52e..cfd563f 100644 --- a/po/tr.po +++ b/po/tr.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-08-25 09:51+0200\n" -"PO-Revision-Date: 2010-08-24 08:47+0200\n" +"PO-Revision-Date: 2010-08-27 09:17+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1520,7 +1520,7 @@ msgid "" "%1$ssetup script%2$s to create one." msgstr "" "Muhtemelen bunun sebebi yapılandırma dosyasını oluşturmadığınız içindir. Bir " -"tane oluşturmak için %1$skurulum programcığı%2$s kullanmak isteyebilirsiniz." +"tane oluşturmak için %1$skur programcığı%2$s kullanmak isteyebilirsiniz." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2272,10 +2272,9 @@ msgid "Show icons for warning, error and information messages" msgstr "Uyarı, hata ve bilgi mesajları için simgeleri göster" #: libraries/config/messages.inc.php:65 -#, fuzzy #| msgid "Ignore errors" msgid "Iconic errors" -msgstr "Hataları yoksay" +msgstr "Sembolik hatalar" #: libraries/config/messages.inc.php:66 msgid "" @@ -3819,6 +3818,8 @@ msgid "" "Defines whether or not type fields should be initially displayed in edit/" "insert mode" msgstr "" +"Düzenle/ekle kipinde alanlar doldurulsada doldurulmasada ilk olarak " +"gösterilmesini tanımlar" #: libraries/config/messages.inc.php:440 #, fuzzy @@ -3915,7 +3916,7 @@ msgstr "Kilitli tabloları atla" #: libraries/config/messages.inc.php:461 msgid "Requires SQL Validator to be enabled" -msgstr "" +msgstr "SQL Onaylayıcının etkinleştirilmesini gerektirir" #: libraries/config/messages.inc.php:463 #: libraries/display_change_password.lib.php:40 @@ -3932,16 +3933,20 @@ msgid "" "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be " "installed" msgstr "" +"[strong]Uyarı:[/strong] PHP SOAP uzantısı ya da PEAR SOAP kurulu olması " +"gerekir" #: libraries/config/messages.inc.php:465 msgid "Enable SQL Validator" -msgstr "" +msgstr "SQL Onaylayıcı etkin" #: libraries/config/messages.inc.php:466 msgid "" "If you have a custom username, specify it here (defaults to [kbd]anonymous[/" "kbd])" msgstr "" +"Eğer özel kullanıcı adınız varsa, onu burada belirleyin (varsayılanı " +"[kbd]isimsiz'dir[/kbd])" #: libraries/config/messages.inc.php:467 tbl_tracking.php:405 #: tbl_tracking.php:456 @@ -3962,57 +3967,58 @@ msgstr "Yeni veritabanı adı öner" #: libraries/config/messages.inc.php:470 msgid "A warning is displayed on the main page if Suhosin is detected" -msgstr "" +msgstr "Eğer Suhosin algılanırsa, ana sayfada uyarı gösterilir" #: libraries/config/messages.inc.php:471 msgid "Suhosin warning" -msgstr "" +msgstr "Suhosin uyarısı" #: libraries/config/messages.inc.php:472 msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Düzenle kipinde metin alanı boyutu (sütunlar), bu değer SQL sorgu metni " +"alanları (*2) ve sorgu penceresi (*1.25) için önemi belirtecektir" #: libraries/config/messages.inc.php:473 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Textarea columns" -msgstr "CHAR metin alanı sütunları" +msgstr "Metin alanı sütunları" #: libraries/config/messages.inc.php:474 msgid "" "Textarea size (rows) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Düzenle kipinde metin alanı boyutu (satırlar), bu değer SQL sorgu metni " +"alanları (*2) ve sorgu penceresi (*1.25) için önemi belirtecektir" #: libraries/config/messages.inc.php:475 -#, fuzzy #| msgid "CHAR textarea rows" msgid "Textarea rows" -msgstr "CHAR metin alanı satırları" +msgstr "Metin alanı satırları" #: libraries/config/messages.inc.php:476 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Veritabanı seçildiğinde tarayıcı penceresi başlığı" #: libraries/config/messages.inc.php:478 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Hiçbir şey seçilmediğinde tarayıcı penceresi başlığı" #: libraries/config/messages.inc.php:479 -#, fuzzy #| msgid "Default table tab" msgid "Default title" -msgstr "Varsayılan tablo sekmesi" +msgstr "Varsayılan başlık" #: libraries/config/messages.inc.php:480 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Sunucu seçildiğinde tarayıcı penceresi başlığı" #: libraries/config/messages.inc.php:482 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Tablo seçildiğinde tarayıcı penceresi başlığı" #: libraries/config/messages.inc.php:484 msgid "" @@ -4051,10 +4057,12 @@ msgid "" "When disabled, users cannot set any of the options below, regardless of the " "checkbox on the right" msgstr "" +"Etkisizleştirildiğinde kullanıcılar sağdaki işaret kutusunu dikkate almadan " +"herhangi bir seçeneği ayarlayamazlar" #: libraries/config/messages.inc.php:491 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Ayarlarda Geliştirici sekmesi etkin" #: libraries/config/messages.inc.php:492 msgid "" @@ -5854,7 +5862,7 @@ msgstr "SQL geçmişi" #: libraries/relation.lib.php:141 msgid "User preferences" -msgstr "" +msgstr "Kullanıcı tercihleri" #: libraries/relation.lib.php:145 msgid "Quick steps to setup advanced features:" @@ -6017,7 +6025,7 @@ msgstr "Tablolar yok" #: libraries/schema/Export_Relation_Schema.class.php:209 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "ŞEMA HATASI: " #: libraries/schema/Pdf_Relation_Schema.class.php:896 #: libraries/schema/Pdf_Relation_Schema.class.php:1124 @@ -6059,7 +6067,7 @@ msgstr "Dahili ilişkiler" #: libraries/schema/User_Schema.class.php:118 msgid "FOREIGN KEY" -msgstr "" +msgstr "FOREIGN KEY" #: libraries/schema/User_Schema.class.php:150 msgid "Please choose a page to edit" @@ -6089,19 +6097,19 @@ msgstr "CSV" #: libraries/schema/User_Schema.class.php:357 msgid "DIA" -msgstr "" +msgstr "DIA" #: libraries/schema/User_Schema.class.php:358 msgid "VISIO" -msgstr "" +msgstr "VISIO" #: libraries/schema/User_Schema.class.php:359 msgid "EPS" -msgstr "" +msgstr "EPS" #: libraries/schema/User_Schema.class.php:361 msgid "Select Export Relational Type" -msgstr "" +msgstr "Dışa Aktarma İlişkisel Türü Seç" #: libraries/schema/User_Schema.class.php:382 msgid "Show grid" @@ -6611,6 +6619,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Tercihleriniz sadece şu anki oturum için kaydedilecektir. Bunların kalıcı " +"olarak depolanması %sphpMyAdmin yapılandırma depolaması%s gerektirir." #: libraries/user_preferences.lib.php:141 #, fuzzy @@ -6623,6 +6633,8 @@ msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Tarayıcınız bu alan adı için phpMyAdmin yapılandırmasına sahip. Şu anki " +"oturum için bunu içe aktarmak istiyor musunuz?" #: libraries/zip_extension.lib.php:26 msgid "No files found inside ZIP archive!" @@ -6939,15 +6951,15 @@ msgstr "Varsayılan yapılandırma bundan yüklenemedi: %1$s" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "Bazı alanlar için yapılandırma doğru olmayan veri içeriyor." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Kalan ayarları içe aktarmak istiyor musunuz?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" -msgstr "" +msgstr "Kaydedilme: @DATE@" #: prefs_manage.php:239 #, fuzzy @@ -6957,11 +6969,11 @@ msgstr "Dosyaları içe aktar" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Tarayıcının depolamasından içe aktar" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Ayarlar tarayıcınızın yerel depolamasından içe aktarılacaktır." #: prefs_manage.php:254 #, fuzzy @@ -6971,7 +6983,7 @@ msgstr "Diğer çekirdek ayarlar" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Bu özellik web tarayıcınız tarafından desteklenmez" #: prefs_manage.php:263 #, fuzzy @@ -6985,22 +6997,26 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Config.inc.php dosyasını değiştirerek daha fazla ayar ayarlayabilirsiniz, " +"örn. %sKur programcığı%s kullanarak." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Tarayıcının depolamasına kaydet" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." -msgstr "" +msgstr "Ayarlar tarayıcının yerel depolamasına kaydedilecektir." #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Mevcut ayarlar üzerine yazılacak!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Tüm ayarlarınızı sıfırlayabilir ve varsayılan değerlere geri " +"yükleyebilirsiniz." #: querywindow.php:93 msgid "Import files" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8499-g88e4d4c
by Michal Čihař 26 Aug '10

26 Aug '10

The branch, master has been updated via 88e4d4c2edb17af79e00b6f65e7823f755bbd7b0 (commit) via 34d6ace3b227f6f214780b959f22f21cce1db732 (commit) via 7ed7238c9314124d450518b0619304b911bae366 (commit) via 66e8c620d2a40e44b12456617ec12616356af5ab (commit) via 31fb4bb878cf29972cc6f26f2a1f984e5c69cbe7 (commit) via 269c5eb790b3d6bad545805505d42df88b11958d (commit) via a69b604ffafd74f60b5b430486105927c9701572 (commit) via 8d8221ce1f7c57018acb775779b0b475d882c9c8 (commit) via 0107471f1bf4a394116d667b7c983f79279d2d78 (commit) via 282cce7a2ff881d5510c3675d6ed8fb94b5c0e1c (commit) via ef72d5693e12473d79536532a3846ffeb13214ab (commit) from 53b394181424dd08ee2d4431a47b49d9b6fd43c2 (commit) - Log ----------------------------------------------------------------- commit 88e4d4c2edb17af79e00b6f65e7823f755bbd7b0 Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:59:36 2010 +0200 Translation update done using Pootle. commit 34d6ace3b227f6f214780b959f22f21cce1db732 Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:58:06 2010 +0200 Translation update done using Pootle. commit 7ed7238c9314124d450518b0619304b911bae366 Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:57:42 2010 +0200 Translation update done using Pootle. commit 66e8c620d2a40e44b12456617ec12616356af5ab Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:54:29 2010 +0200 Translation update done using Pootle. commit 31fb4bb878cf29972cc6f26f2a1f984e5c69cbe7 Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:53:12 2010 +0200 Translation update done using Pootle. commit 269c5eb790b3d6bad545805505d42df88b11958d Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:52:08 2010 +0200 Translation update done using Pootle. commit a69b604ffafd74f60b5b430486105927c9701572 Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:51:07 2010 +0200 Translation update done using Pootle. commit 8d8221ce1f7c57018acb775779b0b475d882c9c8 Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:50:12 2010 +0200 Translation update done using Pootle. commit 0107471f1bf4a394116d667b7c983f79279d2d78 Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:49:00 2010 +0200 Translation update done using Pootle. commit 282cce7a2ff881d5510c3675d6ed8fb94b5c0e1c Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:48:03 2010 +0200 Translation update done using Pootle. commit ef72d5693e12473d79536532a3846ffeb13214ab Author: gheni <gheni(a)yahoo.cn> Date: Thu Aug 26 11:47:46 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ug.po | 48 ++++++------------------------------------------ 1 files changed, 6 insertions(+), 42 deletions(-) diff --git a/po/ug.po b/po/ug.po index 179ef77..fa18910 100644 --- a/po/ug.po +++ b/po/ug.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-08-25 09:51+0200\n" -"PO-Revision-Date: 2010-07-30 11:41+0200\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" "Language: ug\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1510 @@ -242,7 +242,7 @@ msgstr "ھەممىنى تاللاش" #: db_export.php:46 db_search.php:329 server_export.php:28 msgid "Unselect All" -msgstr "ھەممە تاللاشنى قالدۇرۇش" +msgstr "تاللاشنى قالدۇرۇش" #: db_operations.php:33 tbl_create.php:47 msgid "The database name is empty!" @@ -1048,10 +1048,9 @@ msgid "Generate" msgstr "ھاسىللاش" #: js/messages.php:70 -#, fuzzy #| msgid "Mo" msgid "More" -msgstr "دۈشەنبە" +msgstr "تېخىمۇ كۆپ" #. l10n: Display text for calendar close link #: js/messages.php:80 @@ -1609,11 +1608,11 @@ msgstr "تەكشۈرۈشتىن ئۆزكۈزىۋاتىدۇ..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS خاتالىقى" #: libraries/blobstreaming.lib.php:267 msgid "PBMS connection failed:" -msgstr "" +msgstr "PBMS ئۇلىنالمىدى:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" @@ -9033,38 +9032,3 @@ msgstr "" #~ msgid "Data Dictionary Format" #~ msgstr "سانلىق مەلۇمات لوغەت شەكلى" - -#, fuzzy -#~| msgid "Add AUTO_INCREMENT value" -#~ msgid "<code>AUTO_INCREMENT</code>" -#~ msgstr "AUTO_INCREMENT قوشۇش" - -#~ msgid "remember template" -#~ msgstr "ئەستە ساقلاش قېلىپى" - -#~ msgid "Imported file compression will be automatically detected from: %s" -#~ msgstr "ئاپتۇماتىك پەرىق ئىتەلەيدىغان پىرىس ھۆججەت تىپلىرى: %s" - -#~ msgid "BLOB Repository" -#~ msgstr "BLOB ئامبىرى" - -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "ئېچىلدى" - -#~ msgid "Disable" -#~ msgstr "تاقاش" - -#~ msgid "Damaged" -#~ msgstr "بۇزۇلغان" - -#~ msgctxt "BLOB repository" -#~ msgid "Repair" -#~ msgstr "ئوڭشاش" - -#~ msgctxt "BLOB repository" -#~ msgid "Disabled" -#~ msgstr "تاقالدى" - -#~ msgid "Enable" -#~ msgstr "ئېچىش" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8488-g53b3941
by Michal Čihař 25 Aug '10

25 Aug '10

The branch, master has been updated via 53b394181424dd08ee2d4431a47b49d9b6fd43c2 (commit) via 8ec1c4a1647546477ebff2745c62fcf2627b89a9 (commit) from 8042e642c9d72654e7920f697349eee3cb959dc6 (commit) - Log ----------------------------------------------------------------- commit 53b394181424dd08ee2d4431a47b49d9b6fd43c2 Merge: 8042e642c9d72654e7920f697349eee3cb959dc6 8ec1c4a1647546477ebff2745c62fcf2627b89a9 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 15:29:33 2010 +0200 Merge branch 'QA_3_3' Conflicts: tbl_change.php ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_6RC1-9-g8ec1c4a
by Michal Čihař 25 Aug '10

25 Aug '10

The branch, QA_3_3 has been updated via 8ec1c4a1647546477ebff2745c62fcf2627b89a9 (commit) from d1e9585c9e31b82a57e47c614c4989791117c78a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: tbl_change.php | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tbl_change.php b/tbl_change.php index 9731974..aa1a74f 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -180,7 +180,7 @@ if (isset($where_clause)) { } else { // end if (no row returned) $meta = PMA_DBI_get_fields_meta($result[$key_id]); list($unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result[$key_id], count($meta), $meta, $rows[$key_id], true); - if (! empty($unique_condition)) { + if (! empty($unique_condition)) { $found_unique_key = true; } unset($unique_condition, $tmp_clause_is_unique); @@ -429,11 +429,7 @@ foreach ($rows as $row_id => $vrow) { $real_null_value = FALSE; $special_chars_encoded = ''; if (isset($vrow)) { - // (we are editing) - // On a BLOB that can have a NULL value, the is_null() returns - // true if it has no content but for me this is different than - // having been set explicitely to NULL so I put an exception here - if (! $field['is_blob'] && is_null($vrow[$field['Field']])) { + if (is_null($vrow[$field['Field']])) { $real_null_value = TRUE; $vrow[$field['Field']] = ''; $special_chars = ''; @@ -548,12 +544,12 @@ foreach ($rows as $row_id => $vrow) { ) { $default_function = $cfg['DefaultFunctions']['pk_char36']; } - + // this is set only when appropriate and is always true if (isset($field['display_binary_as_hex'])) { $default_function = 'UNHEX'; } - + // garvin: loop on the dropdown array and print all available options for that field. foreach ($dropdown as $each_dropdown){ echo '<option'; @@ -627,7 +623,7 @@ foreach ($rows as $row_id => $vrow) { // foreign key in a drop-down $onclick .= '4, '; } elseif ($foreigners && isset($foreigners[$field['Field']]) && $foreignData['foreign_link'] == true) { - // foreign key with a browsing icon + // foreign key with a browsing icon $onclick .= '6, '; } else { $onclick .= '5, '; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8486-g8042e64
by Michal Čihař 25 Aug '10

25 Aug '10

The branch, master has been updated via 8042e642c9d72654e7920f697349eee3cb959dc6 (commit) via cd4d91e1506c7b3b1890d6943dc814463c23dc9b (commit) via 6c8658286a3f265b54a00225336f5b3ccbdf7370 (commit) via 59a84ae32723f3e31193841586e5a0e3731535ce (commit) from 01a33dc79acc274e81e196e463cb8f907fc941d4 (commit) - Log ----------------------------------------------------------------- commit 8042e642c9d72654e7920f697349eee3cb959dc6 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 10:00:35 2010 +0200 Unfuzzy. commit cd4d91e1506c7b3b1890d6943dc814463c23dc9b Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 09:51:33 2010 +0200 Update po files. commit 6c8658286a3f265b54a00225336f5b3ccbdf7370 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 09:50:54 2010 +0200 Czech translation update. commit 59a84ae32723f3e31193841586e5a0e3731535ce Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 09:50:48 2010 +0200 Add missing dot. ----------------------------------------------------------------------- Summary of changes: po/af.po | 4 +- po/ar.po | 4 +- po/az.po | 4 +- po/be.po | 4 +- po/be(a)latin.po | 4 +- po/bg.po | 4 +- po/bn.po | 4 +- po/bs.po | 4 +- po/ca.po | 4 +- po/cs.po | 107 +++++++++++++++++----------------------------------- po/cy.po | 4 +- po/da.po | 4 +- po/de.po | 4 +- po/el.po | 4 +- po/en_GB.po | 6 ++- po/es.po | 4 +- po/et.po | 4 +- po/eu.po | 4 +- po/fa.po | 4 +- po/fi.po | 4 +- po/fr.po | 4 +- po/gl.po | 4 +- po/he.po | 4 +- po/hi.po | 4 +- po/hr.po | 4 +- po/hu.po | 4 +- po/id.po | 4 +- po/it.po | 4 +- po/ja.po | 4 +- po/ka.po | 4 +- po/ko.po | 4 +- po/lt.po | 4 +- po/lv.po | 4 +- po/mk.po | 4 +- po/mn.po | 4 +- po/ms.po | 4 +- po/nb.po | 4 +- po/nl.po | 4 +- po/phpmyadmin.pot | 4 +- po/pl.po | 4 +- po/pt.po | 4 +- po/pt_BR.po | 4 +- po/ro.po | 4 +- po/ru.po | 4 +- po/si.po | 4 +- po/sk.po | 4 +- po/sl.po | 6 ++- po/sq.po | 4 +- po/sr.po | 4 +- po/sr(a)latin.po | 4 +- po/sv.po | 4 +- po/ta.po | 4 +- po/te.po | 4 +- po/th.po | 4 +- po/tr.po | 4 +- po/tt.po | 4 +- po/ug.po | 4 +- po/uk.po | 4 +- po/ur.po | 4 +- po/uz.po | 4 +- po/uz(a)latin.po | 4 +- po/zh_CN.po | 4 +- po/zh_TW.po | 4 +- prefs_manage.php | 2 +- 64 files changed, 164 insertions(+), 197 deletions(-) diff --git a/po/af.po b/po/af.po index fa46ee0..0cffdf9 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6781,7 +6781,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ar.po b/po/ar.po index 90a65fe..c7fbcfe 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6856,7 +6856,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/az.po b/po/az.po index 4d0cd51..3e01a44 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" @@ -6923,7 +6923,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/be.po b/po/be.po index fcfa102..f474b19 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7141,7 +7141,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/be(a)latin.po b/po/be(a)latin.po index b614e6e..2da50d3 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7101,7 +7101,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/bg.po b/po/bg.po index 61ec700..f440e57 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6975,7 +6975,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/bn.po b/po/bn.po index cbcbabc..29bd0f3 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bangla <bn(a)li.org>\n" @@ -7056,7 +7056,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/bs.po b/po/bs.po index 0d7b8e0..65997d1 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" @@ -6910,7 +6910,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ca.po b/po/ca.po index 834af03..241279e 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: catalan <ca(a)li.org>\n" @@ -7333,7 +7333,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/cs.po b/po/cs.po index 2a342c3..b1cce25 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,8 +6,8 @@ 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-08-25 09:32+0200\n" -"PO-Revision-Date: 2010-08-25 09:41+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" +"PO-Revision-Date: 2010-08-25 09:51+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -2703,19 +2703,14 @@ msgid "Configuration storage" msgstr "Úložiště konfigurace" #: libraries/config/messages.inc.php:200 -#, fuzzy -#| msgid "" -#| "Configure phpMyAdmin database to gain access to additional features, see " -#| "[a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/" -#| "a] in documentation" msgid "" "Configure phpMyAdmin configuration storage to gain access to additional " "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" -"Nastavení databáze phpMyAdmina tak, aby získal přístup k dodatečným funkcím, " -"viz sekce [a@../Documentation.html#linked-tables]úložiště nastavení " -"phpMyAdmina[/a] v dokumentaci" +"Nastavení úložiště nastavení phpMyAdmina tak, aby získal přístup k " +"dodatečným funkcím, viz sekce [a(a)Documentation.xn--html#linked-tables]loit-hoc34fd9clwa " +"nastavení phpMyAdmina[/a] v dokumentaci" #: libraries/config/messages.inc.php:201 msgid "Changes tracking" @@ -3211,7 +3206,7 @@ msgstr "" #: libraries/config/messages.inc.php:324 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "" +msgstr "Chybějící tabulky v úložišti nastavení phpMyAdmina" #: libraries/config/messages.inc.php:326 msgid "Iconic table operations" @@ -3268,7 +3263,6 @@ msgid "Query window height" msgstr "Výška okna dotazů" #: libraries/config/messages.inc.php:338 -#| msgid "Query window width" msgid "Query window width (in pixels)" msgstr "Šířka okna dotazů (v pixelech)" @@ -4301,10 +4295,8 @@ msgid "Rows:" msgstr "Řádky:" #: libraries/display_export.lib.php:157 -#, fuzzy -#| msgid "Dump all rows" msgid "Dump some row(s)" -msgstr "Všechny řádky" +msgstr "Vypsat některé řádky" #: libraries/display_export.lib.php:159 msgid "Number of rows:" @@ -4348,11 +4340,7 @@ msgid "table name" msgstr "jméno tabulky" #: libraries/display_export.lib.php:240 -#, fuzzy, 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." +#, 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: " @@ -4360,11 +4348,12 @@ msgid "" 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 " -"následující nahrazení: %3$s. Jakýkoliv jiný text zůstane zachován beze změny." +"následující nahrazení: %3$s. Jakýkoliv jiný text zůstane zachován beze " +"změny. Více podrobností je ve %4$sFAQ%5$s." #: libraries/display_export.lib.php:278 msgid "use this for future exports" -msgstr "" +msgstr "použít i pro budoucí exporty" #: libraries/display_export.lib.php:284 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:509 @@ -4474,19 +4463,14 @@ msgstr "" "pokračovat od pozice %d." #: libraries/display_import.lib.php:221 -#, fuzzy -#| msgid "" -#| "Allow the interruption of an import in case the script detects it is " -#| "close to the PHP timeout limit. This might be good way to import large " -#| "files, however it can break transactions." msgid "" "Allow the interruption of an import in case the script detects it is close " "to the PHP timeout limit. <i>(This might be good way to import large files, " "however it can break transactions.)</i>" msgstr "" "Povolit přerušení importu v případě že skript pozná, že se blíží časový " -"limit nastavený v PHP. Tímto způsobem můžete importovat i velké soubory, ale " -"může to způsobit problémy s transakcemi." +"limit nastavený v PHP. <i>(Tímto způsobem můžete importovat i velké soubory, " +"ale může to způsobit problémy s transakcemi.)</i>" #: libraries/display_import.lib.php:228 msgid "Number of rows to skip, starting from the first row:" @@ -5087,10 +5071,8 @@ msgstr "Verze Excelu:" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy -#| msgid "Databases display options" msgid "Data dump options" -msgstr "Nastavení zobrazení databází" +msgstr "Nastavení výpisu dat" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:929 libraries/export/texytext.php:123 @@ -5116,10 +5098,8 @@ msgstr "Struktura tabulky @TABLE@" #: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 -#, fuzzy -#| msgid "Transformation options" msgid "Object creation options" -msgstr "Parametry transformace" +msgstr "Nastavení vytváření objektů" #: libraries/export/latex.php:51 libraries/export/latex.php:75 msgid "Table caption (continued)" @@ -5190,12 +5170,12 @@ msgid "" "Display comments <i>(includes info such as export timestamp, PHP version, " "and server version)</i>" msgstr "" +"Zobrazit komentáře <i>(ty obsahují informace jako čas exportu, verzi PHP " +"nebo MySQL serveru)</i>" #: libraries/export/sql.php:35 -#, fuzzy -#| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Přidat vlastní komentář do hlavičky (\\n odděluje řádky)" +msgstr "Přidat vlastní komentář do hlavičky (\\n odděluje řádky):" #: libraries/export/sql.php:37 msgid "" @@ -5329,7 +5309,7 @@ msgstr "XML" #: libraries/export/xml.php:30 msgid "Object creation options (all are recommended)" -msgstr "" +msgstr "Nastavení vytváření objektů (všechna jsou doporučena)" #: libraries/export/xml.php:40 msgid "Views" @@ -6003,7 +5983,7 @@ msgstr "EPS" #: libraries/schema/User_Schema.class.php:361 msgid "Select Export Relational Type" -msgstr "" +msgstr "Zvolte typ výstupu relací" #: libraries/schema/User_Schema.class.php:382 msgid "Show grid" @@ -6302,11 +6282,11 @@ msgstr "" #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" -msgstr "" +msgstr "Příliš mnoho dat ENUM nebo SET?" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Získejte více místa pro editaci" #: libraries/tbl_properties.inc.php:396 msgctxt "for default" @@ -6345,21 +6325,14 @@ msgid "You have to add at least one column." msgstr "Musíte přidat alespoň jedno pole." #: libraries/tbl_properties.inc.php:799 -#, fuzzy -#| msgid "" -#| "Please enter the values for transformation options using this format: " -#| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or a " -#| "single quote (\"'\") amongst those values, precede it with a backslash " -#| "(for example '\\\\xyz' or 'a\\'b')." msgid "" "Enter each value in a separate field. If you ever need to put a backslash " "(\"\\\") or a single quote (\"'\") amongst those values, precede it with a " "backslash (for example '\\\\xyz' or 'a\\'b')." msgstr "" -"Zadejte parametry transformací v následujícím tvaru: 'a', 100, b,'c'...<br /" -">Pokud potřebujete použít zpětné lomítko („\\“) nebo jednoduché uvozovky " -"(„'“) mezi těmito hodnotami, vložte před ně zpětné lomítko (například '\\" -"\\xyz' nebo 'a\\'b')." +"Zadejte každou hodnotu to samostatného políčka. Pokud potřebujete použít " +"zpětné lomítko („\\“) nebo jednoduché uvozovky („'“) mezi těmito hodnotami, " +"vložte před ně zpětné lomítko (například '\\\\xyz' nebo 'a\\'b')." #: libraries/tbl_triggers.lib.php:28 msgid "Event" @@ -6493,12 +6466,10 @@ msgstr "" "zkrácený text (výchozí je ...)." #: libraries/user_preferences.inc.php:32 -#| msgid "Other core settings" msgid "Manage your settings" msgstr "Spravujte svoje nastavení" #: libraries/user_preferences.inc.php:47 prefs_manage.php:291 -#| msgid "Modifications have been saved" msgid "Configuration has been saved" msgstr "Nastavení bylo uloženo" @@ -6512,7 +6483,6 @@ msgstr "" "musíte nastavit %súložiště nastavení phpMyAdmina%s." #: libraries/user_preferences.lib.php:141 -#| msgid "Cannot load or save configuration" msgid "Could not save configuration" msgstr "Nepodařilo se uložit nastavení" @@ -6820,22 +6790,20 @@ msgid "to/from page" msgstr "do/ze stránky" #: prefs_forms.php:78 -#| msgid "Submitted form contains errors" msgid "Cannot save settings, submitted form contains errors" msgstr "Nepodařilo se uložit nastavení, odeslaný formulář obsahuje chyby" #: prefs_manage.php:80 -#| msgid "Could not load default configuration from: %1$s" msgid "Could not import configuration" msgstr "Nepodařilo se nahrát konfiguraci" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "Nastavení obsahuje neplatné data pro některé položky" #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Přejete si načíst zbývající nastavení?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" @@ -6854,7 +6822,6 @@ msgid "Settings will be imported from your browser's local storage." msgstr "Nastavení bude načteno z lokálního úložiště ve vašem prohlížeči" #: prefs_manage.php:254 -#| msgid "Other core settings" msgid "You have no saved settings!" msgstr "Nemáte žádná uložená nastavení!" @@ -6863,7 +6830,6 @@ msgid "This feature is not supported by your web browser" msgstr "Tato funkce není vaším prohlížečem podporována" #: prefs_manage.php:263 -#| msgid "Server configuration" msgid "Merge with current configuration" msgstr "Sloučit se současným nastavením" @@ -6873,22 +6839,25 @@ 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." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Uložit do úložiště prohlížeče" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." -msgstr "" +msgstr "Nastavení bude uloženo do lokálního úložiště prohlížeče." #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Již uložené nastavení bude přepsáno!" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" -msgstr "" +#| msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." +msgstr "Můžete vymazat vaše nastavení a vrátit se k výchozím hodnotám." #: querywindow.php:93 msgid "Import files" @@ -6904,7 +6873,6 @@ msgid "<b>%s</b> table not found or not set in %s" msgstr "<b>%s</b> tabulka nenalezena nebo není nastavena v %s" #: schema_export.php:46 -#| msgid "The %s table doesn't exist!" msgid "File doesn't exist" msgstr "Soubor neexistuje" @@ -8565,11 +8533,6 @@ msgid "Cannot load or save configuration" msgstr "Nelze načíst nebo uložit nastavení" #: setup/frames/index.inc.php:50 -#| msgid "" -#| "Please create web server writable folder [em]config[/em] in phpMyAdmin " -#| "top level directory as described in [a@../Documentation.html#setup_script]" -#| "documentation[/a]. Otherwise you will be only able to download or display " -#| "it." msgid "" "Please create web server writable folder [em]config[/em] in phpMyAdmin top " "level directory as described in [a(a)Documentation.html#setup_script]" diff --git a/po/cy.po b/po/cy.po index 2ce745a..9cba928 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6709,7 +6709,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/da.po b/po/da.po index e39ffab..2ac0b95 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7006,7 +7006,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/de.po b/po/de.po index 1b1b615..11e4a12 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-07-31 21:09+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: german <de(a)li.org>\n" @@ -7287,7 +7287,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/el.po b/po/el.po index 81a3d45..f78219e 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-30 23:16+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: greek <el(a)li.org>\n" @@ -7307,7 +7307,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/en_GB.po b/po/en_GB.po index 0d8ec61..e9e9710 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-08-24 14:12+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" @@ -6899,7 +6899,9 @@ msgid "Existing settings will be overwritten!" msgstr "Existing settings will be overwritten!" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +#, fuzzy +#| msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "You can reset all your settings and restore them to default values" #: querywindow.php:93 diff --git a/po/es.po b/po/es.po index f732f5a..9aa8ac3 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7297,7 +7297,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/et.po b/po/et.po index 88528cc..497a719 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" @@ -7050,7 +7050,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/eu.po b/po/eu.po index 78795c7..93703a0 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6927,7 +6927,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/fa.po b/po/fa.po index cf10c21..d4e7717 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6768,7 +6768,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/fi.po b/po/fi.po index d62eb95..18e672d 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7305,7 +7305,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/fr.po b/po/fr.po index 9409407..20cff85 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-08-21 20:02+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" @@ -7154,7 +7154,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/gl.po b/po/gl.po index 8ff47a7..aa25f88 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7355,7 +7355,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/he.po b/po/he.po index 7ee95ff..4e92180 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hebrew <he(a)li.org>\n" @@ -6837,7 +6837,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/hi.po b/po/hi.po index 28fc507..a3d5da5 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6671,7 +6671,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/hr.po b/po/hr.po index babf8ef..051538e 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7115,7 +7115,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/hu.po b/po/hu.po index 4f176ff..68152f8 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-07-22 02:22+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: hungarian <hu(a)li.org>\n" @@ -7343,7 +7343,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/id.po b/po/id.po index 92c14fd..a89f3c3 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-06-16 01:45+0200\n" "Last-Translator: <jack.hakim(a)yahoo.com>\n" "Language-Team: indonesian <id(a)li.org>\n" @@ -6989,7 +6989,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/it.po b/po/it.po index bd49d6d..2de0fe2 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-08-22 19:39+0200\n" "Last-Translator: <rebeluca(a)gmail.com>\n" "Language-Team: italian <it(a)li.org>\n" @@ -7103,7 +7103,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ja.po b/po/ja.po index 8c417cf..e140096 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7046,7 +7046,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ka.po b/po/ka.po index 6f11ca1..f82e8f8 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" @@ -7278,7 +7278,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ko.po b/po/ko.po index 4dadf32..987d79b 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6746,7 +6746,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/lt.po b/po/lt.po index a6030db..3e74271 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-08-23 12:05+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" @@ -7001,7 +7001,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/lv.po b/po/lv.po index a2315cc..caa50c6 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" @@ -6932,7 +6932,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/mk.po b/po/mk.po index d7d9ab3..ad8230a 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6993,7 +6993,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/mn.po b/po/mn.po index ce3c7b7..0467ac1 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" @@ -6935,7 +6935,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ms.po b/po/ms.po index 6746d1f..b44014a 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" @@ -6807,7 +6807,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/nb.po b/po/nb.po index 792c330..475a66e 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-07-22 08:43+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" @@ -7095,7 +7095,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/nl.po b/po/nl.po index f36517c..6d5485c 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-05-31 01:06+0200\n" "Last-Translator: Bjorn <inbox(a)bjornroesbeke.be>\n" "Language-Team: dutch <nl(a)li.org>\n" @@ -7330,7 +7330,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index 74ac0f3..ff3e554 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6469,7 +6469,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/pl.po b/po/pl.po index dac97ab..7975068 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-07-22 02:29+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: polish <pl(a)li.org>\n" @@ -7180,7 +7180,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/pt.po b/po/pt.po index 7553bba..8ec0ef7 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6888,7 +6888,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/pt_BR.po b/po/pt_BR.po index 2e85bb3..d6ec659 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-07-13 23:58+0200\n" "Last-Translator: William Bachion <william(a)bachiondesign.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" @@ -7082,7 +7082,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ro.po b/po/ro.po index a9b8dbe..8fece3a 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7125,7 +7125,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ru.po b/po/ru.po index 064d968..b2933cc 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7354,7 +7354,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/si.po b/po/si.po index aac3dc1..ec11746 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7035,7 +7035,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/sk.po b/po/sk.po index 01a7cf9..828f7fe 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7044,7 +7044,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/s l.po b/po/sl.po index 7386002..baab9df 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-08-24 21:40+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" @@ -6936,7 +6936,9 @@ msgid "Existing settings will be overwritten!" msgstr "Obstoječe nastavitve bodo prepisane!" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +#, fuzzy +#| msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" "Ponastavite lahko vse svoje nastavitve in jih obnovite na njihove privzete " "vrednosti" diff --git a/po/sq.po b/po/sq.po index 3d3a41f..b9ac06a 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6934,7 +6934,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/sr.po b/po/sr.po index 5c99f89..410abed 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7068,7 +7068,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 3fe8acb..7acedec 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-07-22 02:27+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" @@ -7064,7 +7064,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/sv.po b/po/sv.po index faa2d7d..298c16d 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7286,7 +7286,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ta.po b/po/ta.po index f6c72c3..31d92c1 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6538,7 +6538,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/te.po b/po/te.po index d78056b..463b45e 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6664,7 +6664,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/th.po b/po/th.po index 71e78c2..bdc1bb0 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai <th(a)li.org>\n" @@ -6837,7 +6837,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/tr.po b/po/tr.po index ef23bd0..f60e52e 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-08-24 08:47+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" @@ -6999,7 +6999,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/tt.po b/po/tt.po index ec241f2..da5a45a 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6988,7 +6988,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ug.po b/po/ug.po index affc0e2..179ef77 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-07-30 11:41+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" @@ -6642,7 +6642,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/uk.po b/po/uk.po index 7341cee..0ed9302 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6837,7 +6837,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/ur.po b/po/ur.po index 1823783..cebe913 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -6581,7 +6581,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/uz.po b/po/uz.po index 2a71dc6..cde937e 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7363,7 +7363,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 2df8a01..09049b9 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\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" @@ -7401,7 +7401,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/zh_CN.po b/po/zh_CN.po index 4df8e5f..51f88fa 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-08-10 08:13+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" @@ -6916,7 +6916,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/po/zh_TW.po b/po/zh_TW.po index 73fae81..53569d7 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-08-25 09:32+0200\n" +"POT-Creation-Date: 2010-08-25 09:51+0200\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" @@ -6929,7 +6929,7 @@ msgid "Existing settings will be overwritten!" msgstr "" #: prefs_manage.php:323 -msgid "You can reset all your settings and restore them to default values" +msgid "You can reset all your settings and restore them to default values." msgstr "" #: querywindow.php:93 diff --git a/prefs_manage.php b/prefs_manage.php index ae9ef11..76ead89 100644 --- a/prefs_manage.php +++ b/prefs_manage.php @@ -320,7 +320,7 @@ PMA_printJsValue("PMA_messages['strSavedOn']", __('Saved on: @DATE@')); <h2><?php echo __('Reset') ?></h2> <form class="group-cnt prefs-form" name="prefs_reset" action="prefs_manage.php" method="post"> <?php echo PMA_generate_common_hidden_inputs() . "\n" ?> - <?php echo __('You can reset all your settings and restore them to default values') ?> + <?php echo __('You can reset all your settings and restore them to default values.') ?> <br /><br /> <input type="submit" name="submit_clear" value="<?php echo __('Reset') ?>" /> </form> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6RC1-8482-g01a33dc
by Michal Čihař 25 Aug '10

25 Aug '10

The branch, master has been updated via 01a33dc79acc274e81e196e463cb8f907fc941d4 (commit) via 2aa0fd10087edd23f330253cf225af2e628bff18 (commit) via 1b58bc993ecec80f15e82916e93598d771b05813 (commit) via 99975dfc17213988e06b6828d5a099833d376710 (commit) via d1e9585c9e31b82a57e47c614c4989791117c78a (commit) via b301062beee05de9cbe995047b28add9f16a3d59 (commit) via 45bdf8f522728dba467fb62888fea2fb5f6e8cca (commit) via 5920476d442d42186b9f396b2de7ca80e681d33f (commit) from 4a1d88ab6b3b27a3370a1f5b2e55e33cc1b2ee05 (commit) - Log ----------------------------------------------------------------- commit 01a33dc79acc274e81e196e463cb8f907fc941d4 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 09:41:54 2010 +0200 Czech translation update. commit 2aa0fd10087edd23f330253cf225af2e628bff18 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 09:33:01 2010 +0200 Update po files. commit 1b58bc993ecec80f15e82916e93598d771b05813 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 09:32:11 2010 +0200 Fix description of config option. commit 99975dfc17213988e06b6828d5a099833d376710 Merge: 4a1d88ab6b3b27a3370a1f5b2e55e33cc1b2ee05 d1e9585c9e31b82a57e47c614c4989791117c78a Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Aug 25 09:30:12 2010 +0200 Merge branch 'QA_3_3' Conflicts: test/PMA_headerLocation_test.php ----------------------------------------------------------------------- Summary of changes: libraries/Message.class.php | 2 +- libraries/config/messages.inc.php | 4 +- po/af.po | 16 ++- po/ar.po | 18 ++- po/az.po | 18 ++- po/be.po | 18 ++- po/be(a)latin.po | 18 ++- po/bg.po | 18 ++- po/bn.po | 18 ++- po/bs.po | 18 ++- po/ca.po | 18 ++- po/cs.po | 140 ++++++++-------------- po/cy.po | 16 ++- po/da.po | 18 ++- po/de.po | 18 ++- po/el.po | 18 ++- po/en_GB.po | 159 +++++--------------------- po/es.po | 18 ++- po/et.po | 18 ++- po/eu.po | 18 ++- po/fa.po | 16 ++- po/fi.po | 18 ++- po/fr.po | 18 ++- po/gl.po | 18 ++- po/he.po | 18 ++- po/hi.po | 18 ++- po/hr.po | 18 ++- po/hu.po | 18 ++- po/id.po | 18 ++- po/it.po | 18 ++- po/ja.po | 18 ++- po/ka.po | 18 ++- po/ko.po | 18 ++- po/lt.po | 18 ++- po/lv.po | 18 ++- po/mk.po | 18 ++- po/mn.po | 18 ++- po/ms.po | 16 ++- po/nb.po | 18 ++- po/nl.po | 18 ++- po/phpmyadmin.pot | 16 ++- po/pl.po | 18 ++- po/pt.po | 18 ++- po/pt_BR.po | 18 ++- po/ro.po | 18 ++- po/ru.po | 18 ++- po/si.po | 18 ++- po/sk.po | 18 ++- po/sl.po | 234 +++++++------------------------------ po/sq.po | 18 ++- po/sr.po | 18 ++- po/sr(a)latin.po | 18 ++- po/sv.po | 18 ++- po/ta.po | 16 ++- po/te.po | 16 ++- po/th.po | 18 ++- po/tr.po | 64 +++-------- po/tt.po | 18 ++- po/ug.po | 16 ++- po/uk.po | 18 ++- po/ur.po | 16 ++- po/uz.po | 18 ++- po/uz(a)latin.po | 18 ++- po/zh_CN.po | 18 ++- po/zh_TW.po | 18 ++- test/PMA_headerLocation_test.php | 26 ++-- test/PMA_whichCrlf_test.php | 2 +- 67 files changed, 841 insertions(+), 834 deletions(-) diff --git a/libraries/Message.class.php b/libraries/Message.class.php index 68d32bc..8783cdb 100644 --- a/libraries/Message.class.php +++ b/libraries/Message.class.php @@ -721,7 +721,7 @@ class PMA_Message static public function format() { $params = func_get_args(); - if (is_array($params[1])) { + if (isset($params[1]) && is_array($params[1])) { array_unshift($params[1], $params[0]); $params = $params[1]; } diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 7dc5c14..cf39b23 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -335,7 +335,7 @@ $strConfigQueryWindowDefTab_desc = __('Tab displayed when opening a new query wi $strConfigQueryWindowDefTab_name = __('Default query window tab'); $strConfigQueryWindowHeight_desc = __('Query window height (in pixels)'); $strConfigQueryWindowHeight_name = __('Query window height'); -$strConfigQueryWindowWidth_desc = __('Query window height (in pixels)'); +$strConfigQueryWindowWidth_desc = __('Query window width (in pixels)'); $strConfigQueryWindowWidth_name = __('Query window width'); $strConfigRecodingEngine_desc = __('Select which functions will be used for character set conversion'); $strConfigRecodingEngine_name = __('Recoding engine'); @@ -495,4 +495,4 @@ $strConfigVersionCheckLink = __('Check for latest version'); $strConfigZipDump_desc = __('Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations'); $strConfigZipDump_name = __('ZIP'); -?> \ No newline at end of file +?> diff --git a/po/af.po b/po/af.po index a527b2c..fa46ee0 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3291,7 +3291,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3299,6 +3299,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4169,16 +4173,16 @@ msgstr "Overhead" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/ar.po b/po/ar.po index 8c3bd48..90a65fe 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3302,7 +3302,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3312,6 +3312,12 @@ msgstr "" msgid "Query window height" msgstr "نافذة الاستعلام" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "نافذة الاستعلام" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4175,16 +4181,16 @@ msgstr "الفوقي" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/az.po b/po/az.po index 8538617..4d0cd51 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" @@ -3326,7 +3326,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3336,6 +3336,12 @@ msgstr "" msgid "Query window height" msgstr "Sorğu penceresi" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Sorğu penceresi" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4210,16 +4216,16 @@ msgstr "Aşma deyeri" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/be.po b/po/be.po index cc05717..fcfa102 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3382,7 +3382,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3392,6 +3392,12 @@ msgstr "" msgid "Query window height" msgstr "Акно запыту" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Акно запыту" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4283,16 +4289,16 @@ msgstr "" "Не атрымалася ўсталяваць злучэньне для controluser, вызначанае ў вашым " "канфігурацыйным файле." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Сэрвэр не адказвае" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(або сокет лякальнага сэрвэра MySQL не сканфігураваны правільна)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Падрабязьней..." diff --git a/po/be(a)latin.po b/po/be(a)latin.po index d896d35..b614e6e 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3357,7 +3357,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3367,6 +3367,12 @@ msgstr "" msgid "Query window height" msgstr "Akno zapytu" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Akno zapytu" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4246,16 +4252,16 @@ msgstr "" "Nie atrymałasia ŭstalavać złučeńnie dla controluser, vyznačanaje ŭ vašym " "kanfihuracyjnym fajle." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Server nie adkazvaje" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(abo sokiet lakalnaha servera MySQL nie skanfihuravany pravilna)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Padrabiaźniej..." diff --git a/po/bg.po b/po/bg.po index 1eeb4cc..61ec700 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3340,7 +3340,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3350,6 +3350,12 @@ msgstr "" msgid "Query window height" msgstr "Прозорец за заявки" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Прозорец за заявки" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4229,16 +4235,16 @@ msgstr "Загубено място" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Няма отговор от сървъра" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/bn.po b/po/bn.po index 1ba5d4a..cbcbabc 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bangla <bn(a)li.org>\n" @@ -3360,7 +3360,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3370,6 +3370,12 @@ msgstr "" msgid "Query window height" msgstr "Query window" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Query window" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4252,16 +4258,16 @@ msgstr "Overhead" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "The server is not responding" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/bs.po b/po/bs.po index ad50031..0d7b8e0 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" @@ -3322,7 +3322,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3332,6 +3332,12 @@ msgstr "" msgid "Query window height" msgstr "Prozor za upite" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Prozor za upite" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4205,16 +4211,16 @@ msgstr "Prekoračenje" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/ca.po b/po/ca.po index 65e8c30..834af03 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:13+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: catalan <ca(a)li.org>\n" @@ -3459,7 +3459,7 @@ msgstr "Pestanya que es mostra al entrar a una nova finestra de consultes" msgid "Default query window tab" msgstr "Pestanya de finestra de consultes predeterminada" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3469,6 +3469,12 @@ msgstr "" msgid "Query window height" msgstr "Finestra de consultes" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Finestra de consultes" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4446,16 +4452,16 @@ msgstr "" "La connexió de l'usuari de control ha fallat, tal com està definida ara a la " "configuració." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "El servidor no respon" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(o el sòcol del servidor local MySQL no està configurat correctament)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detalls..." diff --git a/po/cs.po b/po/cs.po index e56d77b..2a342c3 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,8 +6,8 @@ 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-08-23 13:31+0200\n" -"PO-Revision-Date: 2010-08-24 15:19+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" +"PO-Revision-Date: 2010-08-25 09:41+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -815,11 +815,6 @@ msgid "Values for the column \"%s\"" msgstr "Hodnoty pro pole \"%s\"" #: enum_editor.php:22 -#| msgid "" -#| "Please enter the values for transformation options using this format: " -#| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or a " -#| "single quote (\"'\") amongst those values, precede it with a backslash " -#| "(for example '\\\\xyz' or 'a\\'b')." msgid "" "Enter each value in a separate field, enclosed in single quotes. If you ever " "need to put a backslash (\"\\\") or a single quote (\"'\") amongst those " @@ -2194,7 +2189,6 @@ msgid "Debug SQL" msgstr "Ladit SQL" #: libraries/config/messages.inc.php:45 -#| msgid "Databases display options" msgid "Default display direction" msgstr "Výchozí směr zobrazování" @@ -2235,7 +2229,6 @@ msgid "Default table tab" msgstr "Výchozí panel tabulky" #: libraries/config/messages.inc.php:54 -#| msgid "Show binary contents as HEX" msgid "Show binary contents as HEX by default" msgstr "Zobrazení binárního obsah šestnáctkově (HEX) jako výchozí" @@ -2264,7 +2257,6 @@ msgid "Edit SQL queries in popup window" msgstr "Upravovat SQL dotazy v samostatném okně" #: libraries/config/messages.inc.php:61 -#| msgid "Edit next row" msgid "Edit in window" msgstr "Upravovat v okně" @@ -2281,7 +2273,6 @@ msgid "Show icons for warning, error and information messages" msgstr "Zobrazit ikony pro varování, chyby a informační zprávy" #: libraries/config/messages.inc.php:65 -#| msgid "Ignore errors" msgid "Iconic errors" msgstr "Chyby s ikonami" @@ -2534,7 +2525,7 @@ msgstr "CSV" #: libraries/config/messages.inc.php:155 msgid "Developer" -msgstr "Vývojář" +msgstr "Pro vývojáře" #: libraries/config/messages.inc.php:156 msgid "Settings for phpMyAdmin developers" @@ -2708,7 +2699,6 @@ msgid "Enter server connection parameters" msgstr "Vložte parametry připojení k serveru" #: libraries/config/messages.inc.php:199 -#| msgid "Configuration: %s" msgid "Configuration storage" msgstr "Úložiště konfigurace" @@ -2766,12 +2756,10 @@ msgid "Customize links shown in SQL Query boxes" msgstr "Přizpůsobení odkazů zobrazených v políčcích pro SQL dotazy" #: libraries/config/messages.inc.php:214 -#| msgid "SQL queries" msgid "SQL queries settings" msgstr "Nastavení SQL dotazů" #: libraries/config/messages.inc.php:215 -#| msgid "SQL history" msgid "SQL Validator" msgstr "Ověřování SQL" @@ -2800,12 +2788,10 @@ msgid "Choose how you want tabs to work" msgstr "Nastaví, jak mají fungovat panely" #: libraries/config/messages.inc.php:221 -#| msgid "Use text field" msgid "Text fields" msgstr "Textová pole" #: libraries/config/messages.inc.php:222 -#| msgid "Customize export options" msgid "Customize text input fields" msgstr "Přizpůsobení textových polí" @@ -2814,7 +2800,6 @@ msgid "Texy! text" msgstr "Texy! text" #: libraries/config/messages.inc.php:225 -#| msgid "Warning" msgid "Warnings" msgstr "Varování" @@ -2993,7 +2978,7 @@ msgstr "Oddělovač tabulkovýho stromu" #: libraries/config/messages.inc.php:276 msgid "URL where logo in the navigation frame will point to" -msgstr "" +msgstr "URL na které bude odkazovat logo v navigačním rámu" #: libraries/config/messages.inc.php:277 msgid "Logo link URL" @@ -3028,7 +3013,6 @@ msgid "Light tabs" msgstr "Odlehčené panely" #: libraries/config/messages.inc.php:284 -#| msgid "Maximum number of characters used when a SQL query is displayed" msgid "" "Maximum number of characters shown in any non-numeric column on browse view" msgstr "Nejvyšší počet znaků zobrazeních v nečíselných polích při procházení" @@ -3167,7 +3151,6 @@ msgid "Memory limit" msgstr "Omezení paměti" #: libraries/config/messages.inc.php:311 -#| msgid "Show/Hide left menu" msgid "Show left delete link" msgstr "Zobrazit odkaz pro mazání nalevo" @@ -3177,13 +3160,11 @@ msgstr "Zobrazit odkaz pro mazání napravo" #: libraries/config/messages.inc.php:313 msgid "Use natural order for sorting table and database names" -msgstr "" +msgstr "Použít přirozené řazení pro jména tabulek a databází" #: libraries/config/messages.inc.php:314 -#, fuzzy -#| msgid "Alter table order by" msgid "Natural order" -msgstr "Změnit pořadí tabulky podle" +msgstr "Přirozené pořadí" #: libraries/config/messages.inc.php:315 libraries/config/messages.inc.php:325 msgid "Use only icons, only text or both" @@ -3278,17 +3259,20 @@ msgstr "Panel zobrazený při otevření nového okna dotazů" msgid "Default query window tab" msgstr "Výchozí panel okna dotazů" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" -msgstr "" +msgstr "Výška okna dotazů (v pixelech)" #: libraries/config/messages.inc.php:337 -#| msgid "Query window" msgid "Query window height" msgstr "Výška okna dotazů" +#: libraries/config/messages.inc.php:338 +#| msgid "Query window width" +msgid "Query window width (in pixels)" +msgstr "Šířka okna dotazů (v pixelech)" + #: libraries/config/messages.inc.php:339 -#| msgid "Query window" msgid "Query window width" msgstr "Šířka okna dotazů" @@ -3305,17 +3289,16 @@ msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" msgstr "Zopakovat záhlaví každých X buněk, [kbd]0[/kbd] vypne tuto funknci" #: libraries/config/messages.inc.php:343 -#| msgid "Repair threads" msgid "Repeat headers" msgstr "Opakovat záhlaví" #: libraries/config/messages.inc.php:344 msgid "Show help button instead of Documentation text" -msgstr "" +msgstr "Zobrazit ikonu pro nápovědu místo textu Dokumentace" #: libraries/config/messages.inc.php:345 msgid "Show help button" -msgstr "" +msgstr "Zobrazit ikonu pro nápovědu" #: libraries/config/messages.inc.php:347 msgid "Directory where exports can be saved on server" @@ -3517,10 +3500,6 @@ msgid "Connect without password" msgstr "Připojit bez hesla" #: libraries/config/messages.inc.php:389 -#, fuzzy -#| msgid "" -#| "You can use MySQL wildcard characters (% and _), escape them if you want " -#| "to use their literal instances, i.e. use 'my\\_db' and not 'my_db'" msgid "" "You can use MySQL wildcard characters (% and _), escape them if you want to " "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not " @@ -3529,7 +3508,9 @@ msgid "" "alphabetical order." msgstr "" "Můžete použít žolíky MySQL (% a _), escapujte je, pokud je chcete použít " -"jako znaky, např. použijte 'moje\\_db' a ne 'moje_db'" +"jako znaky, např. použijte 'moje\\_db' a ne 'moje_db'. Použitím této volby " +"můžete také změnit pořadí databází, stačí na konci seznamu uvést [kbd]*[/" +"kbd] pro zobrazní ostatních v abecedním pořadí." #: libraries/config/messages.inc.php:390 msgid "Show only listed databases" @@ -3566,7 +3547,6 @@ msgstr "" "phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:396 -#| msgid "database name" msgid "Database name" msgstr "Jméno databáze" @@ -3723,9 +3703,6 @@ msgid "Automatically create versions" msgstr "Automaticky vytvářet verze" #: libraries/config/messages.inc.php:426 -#| msgid "" -#| "Leave blank for no SQL query tracking support, suggested: [kbd]" -#| "pma_tracking[/kbd]" msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" @@ -3798,7 +3775,6 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:440 -#| msgid "Show open tables" msgid "Show field types" msgstr "Zobrazit typy polí" @@ -3946,7 +3922,6 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:473 -#| msgid "CHAR textarea columns" msgid "Textarea columns" msgstr "" @@ -3964,25 +3939,23 @@ msgstr "Řádky pro textové oblasti CHAR" #: libraries/config/messages.inc.php:476 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Titulek prohlížeče pokud je vybraná databáze" #: libraries/config/messages.inc.php:478 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Titulek prohlížeče pokud není nic vybráno" #: libraries/config/messages.inc.php:479 -#, fuzzy -#| msgid "Default table tab" msgid "Default title" -msgstr "Výchozí panel tabulky" +msgstr "Výchozí titulek" #: libraries/config/messages.inc.php:480 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Titulek prohlížeče pokud je vybraný server" #: libraries/config/messages.inc.php:482 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Titulek prohlížeče pokud je vybraná tabulka" #: libraries/config/messages.inc.php:484 msgid "" @@ -4024,7 +3997,7 @@ msgstr "" #: libraries/config/messages.inc.php:491 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Povolit záložku Pro vývojáře v nastaveních" #: libraries/config/messages.inc.php:492 msgid "" @@ -4228,16 +4201,16 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Nepodařilo se připojit jako controluser, který je nadefinován v nastaveních." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Server neodpovídá" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(nebo není správně nastaven lokální socket MySQL serveru)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Podrobnosti..." @@ -4427,7 +4400,7 @@ msgstr "Formát:" #: libraries/display_export.lib.php:339 libraries/display_import.lib.php:250 msgid "Format-Specific Options:" -msgstr "" +msgstr "Parametry pro výstupní formát:" #: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" @@ -5257,15 +5230,15 @@ msgstr "" #: libraries/export/sql.php:136 msgid "Instead of <code>INSERT</code> statements, use:" -msgstr "" +msgstr "Namísto příkazů <code>INSERT</code> použít:" #: libraries/export/sql.php:138 msgid "<code>INSERT DELAYED</code> statements" -msgstr "" +msgstr "příkazy <code>INSERT DELAYED</code>" #: libraries/export/sql.php:140 msgid "<code>INSERT IGNORE</code> statements" -msgstr "" +msgstr "příkazy <code>INSERT IGNORE</code>" #: libraries/export/sql.php:147 msgid "Function to use when dumping data:" @@ -5788,7 +5761,7 @@ msgstr "SQL historie" #: libraries/relation.lib.php:141 msgid "User preferences" -msgstr "" +msgstr "Uživatelská nastavení" #: libraries/relation.lib.php:145 msgid "Quick steps to setup advanced features:" @@ -5952,7 +5925,7 @@ msgstr "žádné tabulky" #: libraries/schema/Export_Relation_Schema.class.php:209 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "Chyba při vytváření schéma:" #: libraries/schema/Pdf_Relation_Schema.class.php:896 #: libraries/schema/Pdf_Relation_Schema.class.php:1124 @@ -6001,7 +5974,6 @@ msgid "Please choose a page to edit" msgstr "Zvolte stránku, kterou chcete změnit" #: libraries/schema/User_Schema.class.php:155 -#| msgid "Select Tables" msgid "Select page" msgstr "Zvolte stránku" @@ -6010,12 +5982,10 @@ msgid "Select Tables" msgstr "Vybrat tabulky" #: libraries/schema/User_Schema.class.php:351 -#| msgid "Relational schema" msgid "Display relational schema" msgstr "Zobrazit relační schéma" #: libraries/schema/User_Schema.class.php:356 -#| msgid "CSV" msgid "SVG" msgstr "SVG" @@ -6064,7 +6034,6 @@ msgid "Portrait" msgstr "Na výšku" #: libraries/schema/User_Schema.class.php:399 -#| msgid "Creation" msgid "Orientation" msgstr "Orientace" @@ -6127,7 +6096,6 @@ msgid "Synchronize" msgstr "Synchronizace" #: libraries/server_links.inc.php:97 -#| msgid "settings" msgid "Settings" msgstr "Nastavení" @@ -6525,16 +6493,14 @@ msgstr "" "zkrácený text (výchozí je ...)." #: libraries/user_preferences.inc.php:32 -#, fuzzy #| msgid "Other core settings" msgid "Manage your settings" -msgstr "Jiná důležitá nastavení" +msgstr "Spravujte svoje nastavení" #: libraries/user_preferences.inc.php:47 prefs_manage.php:291 -#, fuzzy #| msgid "Modifications have been saved" msgid "Configuration has been saved" -msgstr "Změny byly uloženy" +msgstr "Nastavení bylo uloženo" #: libraries/user_preferences.inc.php:69 #, php-format @@ -6542,18 +6508,21 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vaše nastavení bude uchováno jen pro toto sezení. Pro trvalá nastavení " +"musíte nastavit %súložiště nastavení phpMyAdmina%s." #: libraries/user_preferences.lib.php:141 -#, fuzzy #| msgid "Cannot load or save configuration" msgid "Could not save configuration" -msgstr "Nelze načíst nebo uložit nastavení" +msgstr "Nepodařilo se uložit nastavení" #: libraries/user_preferences.lib.php:309 msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Ve vašem prohlížeči je uloženo nastavení phpMyAdmina pro tuto doménu. " +"Přejete si ho importovat do tohoto sezení?" #: libraries/zip_extension.lib.php:26 msgid "No files found inside ZIP archive!" @@ -6628,7 +6597,7 @@ msgstr "Oficiální stránka phpMyAdmina" #: main.php:220 msgid "Mailing lists" -msgstr "" +msgstr "Mailové konference" #: main.php:246 msgid "" @@ -6851,16 +6820,14 @@ msgid "to/from page" msgstr "do/ze stránky" #: prefs_forms.php:78 -#, fuzzy #| msgid "Submitted form contains errors" msgid "Cannot save settings, submitted form contains errors" -msgstr "Odeslaný formulář obsahuje chyby" +msgstr "Nepodařilo se uložit nastavení, odeslaný formulář obsahuje chyby" #: prefs_manage.php:80 -#, fuzzy #| msgid "Could not load default configuration from: %1$s" msgid "Could not import configuration" -msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: %1$s" +msgstr "Nepodařilo se nahrát konfiguraci" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." @@ -6875,33 +6842,30 @@ msgid "Saved on: @DATE@" msgstr "Uloženo: @DATE@" #: prefs_manage.php:239 -#| msgid "Import files" msgid "Import from file" msgstr "Importovat ze souboru" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Načíst z úložiště v prohlížeči" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Nastavení bude načteno z lokálního úložiště ve vašem prohlížeči" #: prefs_manage.php:254 -#, fuzzy #| msgid "Other core settings" msgid "You have no saved settings!" -msgstr "Jiná důležitá nastavení" +msgstr "Nemáte žádná uložená nastavení!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Tato funkce není vaším prohlížečem podporována" #: prefs_manage.php:263 -#, fuzzy #| msgid "Server configuration" msgid "Merge with current configuration" -msgstr "Nastavení serveru" +msgstr "Sloučit se současným nastavením" #: prefs_manage.php:277 #, php-format @@ -6940,10 +6904,9 @@ msgid "<b>%s</b> table not found or not set in %s" msgstr "<b>%s</b> tabulka nenalezena nebo není nastavena v %s" #: schema_export.php:46 -#, fuzzy #| msgid "The %s table doesn't exist!" msgid "File doesn't exist" -msgstr "Tabulka %s neexistuje!" +msgstr "Soubor neexistuje" #: server_binlog.php:106 msgid "Select binary log to view" @@ -8602,7 +8565,6 @@ msgid "Cannot load or save configuration" msgstr "Nelze načíst nebo uložit nastavení" #: setup/frames/index.inc.php:50 -#, fuzzy #| msgid "" #| "Please create web server writable folder [em]config[/em] in phpMyAdmin " #| "top level directory as described in [a@../Documentation.html#setup_script]" @@ -8614,7 +8576,7 @@ msgid "" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" "Prosím, vytvořte adresář [em]config[/em] zapisovatelný pro web server v " -"kořenovém adresáři phpMyAdmin, jak je popsáno v [a@../Documentation." +"kořenovém adresáři phpMyAdmina, jak je popsáno v [a@Documentation." "html#setup_script]dokumentaci[/a]. Jinak budete moci nastavení pouze " "stáhnout nebo zobrazit." diff --git a/po/cy.po b/po/cy.po index b3c2d0e..2ce745a 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3249,7 +3249,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3257,6 +3257,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4135,16 +4139,16 @@ msgstr "Gorbenion" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Dyw'r gweinydd ddim yn ymateb" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Manylion..." diff --git a/po/da.po b/po/da.po index 73a4e2f..e39ffab 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3333,7 +3333,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3343,6 +3343,12 @@ msgstr "" msgid "Query window height" msgstr "Foresp. vindue" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Foresp. vindue" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4213,16 +4219,16 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Forbindelse for kontrolbruger som defineret i din konfiguration slog fejl." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Serveren svarer ikke" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(eller den lokale MySQL servers socket er ikke korrekt konfigureret)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/de.po b/po/de.po index 27320c2..1b1b615 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-07-31 21:09+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: german <de(a)li.org>\n" @@ -3403,7 +3403,7 @@ msgstr "Angezeigtes Tab beim Öffnen eines neuen Abfragefensters" msgid "Default query window tab" msgstr "Voreingestelltes Tab für Abfragefenster" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3413,6 +3413,12 @@ msgstr "" msgid "Query window height" msgstr "Abfragefenster" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Abfragefenster" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4391,18 +4397,18 @@ msgstr "" "Verbindung für den controluser, wie er in Ihrer Konfiguration angegeben ist, " "ist fehlgeschlagen." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Der Server antwortet nicht." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(evtl. ist auch der Socket des lokalen MySQL-Servers socket nicht korrekt " "konfiguriert)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Details ..." diff --git a/po/el.po b/po/el.po index 1e481e5..81a3d45 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-30 23:16+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: greek <el(a)li.org>\n" @@ -3433,7 +3433,7 @@ msgstr "Προβολή καρτέλας με το άνοιγμα νέου παρ msgid "Default query window tab" msgstr "Προεπιλεγμένη καρτέλα παραθύρου ερωτήματος" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3443,6 +3443,12 @@ msgstr "" msgid "Query window height" msgstr "Παράθυρο ερωτήματος" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Παράθυρο ερωτήματος" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4420,16 +4426,16 @@ msgstr "Περίσσεια" msgid "Connection for controluser as defined in your configuration failed." msgstr "Ανεπιτυχής σύνδεση του χρήστη ελέγχου όπως ορίστηκε στη ρύθμισή σας." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Ο διακομιστής δεν αποκρίνεται" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ή η τοπική υποδοχή του διακομιστή MySQL δεν έχει ρυθμιστεί σωστά)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Λεπτομέρειες..." diff --git a/po/en_GB.po b/po/en_GB.po index 2f2acc9..0d8ec61 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-08-24 14:12+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" @@ -340,7 +340,6 @@ msgstr "" "click %shere%s." #: db_operations.php:531 -#| msgid "Relational schema" msgid "Edit or export relational schema" msgstr "Edit or export relational schema" @@ -1926,12 +1925,10 @@ msgid "Custom - like above, but without the quick/custom choice" msgstr "Custom - like above, but without the quick/custom choice" #: libraries/config.values.php:119 -#| msgid "Delayed inserts" msgid "complete inserts" msgstr "complete inserts" #: libraries/config.values.php:120 -#| msgid "Delayed inserts" msgid "extended inserts" msgstr "extended inserts" @@ -1977,7 +1974,6 @@ msgstr "Missing data for %s" #: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 -#| msgid "Variable" msgid "unavailable" msgstr "unavailable" @@ -1998,18 +1994,15 @@ msgid "export will not work, missing function (%s)" msgstr "export will not work, missing function (%s)" #: libraries/config/FormDisplay.class.php:758 -#| msgid "$cfg['SQLValidator'] boolean" msgid "SQL Validator is disabled" msgstr "SQL Validator is disabled" #: libraries/config/FormDisplay.class.php:765 -#| msgid "PHP extension to use" msgid "SOAP extension not found" msgstr "SOAP extension not found" #: libraries/config/FormDisplay.class.php:773 #, php-format -#| msgid "Maximum tables" msgid "maximum %s" msgstr "maximum %s" @@ -2056,10 +2049,6 @@ msgid "Allow login to any MySQL server" msgstr "Allow login to any MySQL server" #: libraries/config/messages.inc.php:19 -#| msgid "" -#| "Setting this to <tt>true</tt> allows a page located on a different domain " -#| "to call phpMyAdmin inside a frame, and is a potential security hole " -#| "allowing cross-frame scripting attacks." msgid "" "Enabling this allows a page located on a different domain to call phpMyAdmin " "inside a frame, and is a potential [strong]security hole[/strong] allowing " @@ -2070,7 +2059,6 @@ msgstr "" "cross-frame scripting attacks" #: libraries/config/messages.inc.php:20 -#| msgid "$cfg['AllowThirdPartyFraming'] boolean" msgid "Allow third party framing" msgstr "Allow third party framing" @@ -2194,7 +2182,6 @@ msgid "Debug SQL" msgstr "Debug SQL" #: libraries/config/messages.inc.php:45 -#| msgid "Databases display options" msgid "Default display direction" msgstr "Default display direction" @@ -2235,7 +2222,6 @@ msgid "Default table tab" msgstr "Default table tab" #: libraries/config/messages.inc.php:54 -#| msgid "Show binary contents as HEX" msgid "Show binary contents as HEX by default" msgstr "Show binary contents as HEX by default" @@ -2264,27 +2250,22 @@ msgid "Edit SQL queries in popup window" msgstr "Edit SQL queries in popup window" #: libraries/config/messages.inc.php:61 -#| msgid "Edit next row" msgid "Edit in window" msgstr "Edit in window" #: libraries/config/messages.inc.php:62 -#| msgid "Display Features" msgid "Display errors" msgstr "Display errors" #: libraries/config/messages.inc.php:63 -#| msgid "Ignore errors" msgid "Gather errors" msgstr "Gather errors" #: libraries/config/messages.inc.php:64 -#| msgid "Uses icons for warnings, errors and informations." msgid "Show icons for warning, error and information messages" msgstr "Show icons for warning, error and information messages" #: libraries/config/messages.inc.php:65 -#| msgid "Ignore errors" msgid "Iconic errors" msgstr "Iconic errors" @@ -2350,7 +2331,6 @@ msgid "Replace NULL by" msgstr "Replace NULL by" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 -#| msgid "Remove carriage return/line feed characters within columns" msgid "Remove CRLF characters within columns" msgstr "Remove CRLF characters within columns" @@ -2366,7 +2346,6 @@ msgid "Lines terminated by" msgstr "Lines terminated by" #: libraries/config/messages.inc.php:80 -#| msgid "Excel edition:" msgid "Excel edition" msgstr "Excel edition" @@ -2400,7 +2379,6 @@ msgid "Table caption" msgstr "Table caption" #: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:100 -#| msgid "Include table caption" msgid "Continued table caption" msgstr "Continued table caption" @@ -2421,7 +2399,6 @@ msgid "Relations" msgstr "Relations" #: libraries/config/messages.inc.php:103 -#| msgid "Export Method:" msgid "Export method" msgstr "Export method" @@ -2448,7 +2425,6 @@ msgid "SQL compatibility mode" msgstr "SQL compatibility mode" #: libraries/config/messages.inc.php:118 -#| msgid "Syntax to use when inserting data:" msgid "Syntax to use when inserting data" msgstr "Syntax to use when inserting data" @@ -2457,7 +2433,6 @@ msgid "Creation/Update/Check dates" msgstr "Creation/Update/Check dates" #: libraries/config/messages.inc.php:120 -#| msgid "Delayed inserts" msgid "Use delayed inserts" msgstr "Use delayed inserts" @@ -2470,7 +2445,6 @@ msgid "Use hexadecimal for BLOB" msgstr "Use hexadecimal for BLOB" #: libraries/config/messages.inc.php:126 -#| msgid "Delayed inserts" msgid "Use ignore inserts" msgstr "Use ignore inserts" @@ -2479,7 +2453,6 @@ msgid "Maximal length of created query" msgstr "Maximal length of created query" #: libraries/config/messages.inc.php:133 -#| msgid "Export" msgid "Export type" msgstr "Export type" @@ -2488,7 +2461,6 @@ msgid "Enclose export in a transaction" msgstr "Enclose export in a transaction" #: libraries/config/messages.inc.php:135 -#| msgid "Export contents" msgid "Export time in UTC" msgstr "Export time in UTC" @@ -2532,7 +2504,6 @@ msgstr "Customise browse mode" #: libraries/config/messages.inc.php:171 libraries/config/messages.inc.php:182 #: libraries/config/messages.inc.php:184 libraries/config/messages.inc.php:212 #: libraries/config/messages.inc.php:224 -#| msgid "Customize default export options" msgid "Customize default options" msgstr "Customise default options" @@ -2574,7 +2545,6 @@ msgid "Features" msgstr "Features" #: libraries/config/messages.inc.php:163 -#| msgid "Generate" msgid "General" msgstr "General" @@ -2648,7 +2618,6 @@ msgid "Microsoft Office" msgstr "Microsoft Office" #: libraries/config/messages.inc.php:183 -#| msgid "Open Document Text" msgid "Open Document" msgstr "Open Document" @@ -2661,7 +2630,6 @@ msgid "Settings that didn't fit enywhere else" msgstr "Settings that didn't fit enywhere else" #: libraries/config/messages.inc.php:187 -#| msgid "Page name" msgid "Page titles" msgstr "Page titles" @@ -2671,9 +2639,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" -"Specify browser's title bar text. Refer to " -"[a(a)Documentation.html#cfg_TitleTable]documentation[/a] for magic strings " -"that can be used to get special values." +"Specify browser's title bar text. Refer to [a@Documentation." +"html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " +"get special values." #: libraries/config/messages.inc.php:189 #: libraries/navigation_header.inc.php:83 @@ -2703,12 +2671,10 @@ msgid "Basic settings" msgstr "Basic settings" #: libraries/config/messages.inc.php:194 -#| msgid "Authentication type" msgid "Authentication" msgstr "Authentication" #: libraries/config/messages.inc.php:195 -#| msgid "Authentication type" msgid "Authentication settings" msgstr "Authentication settings" @@ -2729,15 +2695,10 @@ msgid "Enter server connection parameters" msgstr "Enter server connection parameters" #: libraries/config/messages.inc.php:199 -#| msgid "Configuration: %s" msgid "Configuration storage" msgstr "Configuration storage" #: libraries/config/messages.inc.php:200 -#| msgid "" -#| "Configure phpMyAdmin database to gain access to additional features, see " -#| "[a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/" -#| "a] in documentation" msgid "" "Configure phpMyAdmin configuration storage to gain access to additional " "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " @@ -2786,12 +2747,10 @@ msgid "Customize links shown in SQL Query boxes" msgstr "Customise links shown in SQL Query boxes" #: libraries/config/messages.inc.php:214 -#| msgid "SQL queries" msgid "SQL queries settings" msgstr "SQL queries settings" #: libraries/config/messages.inc.php:215 -#| msgid "SQL history" msgid "SQL Validator" msgstr "SQL Validator" @@ -2803,10 +2762,9 @@ msgid "" "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" "If you wish to use the SQL Validator service, you should be aware that " -"[strong]all SQL statements are stored anonymously for statistical " -"purposes[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL " -"Validator[/a], Copyright 2002 Upright Database Technology. All rights " -"reserved.[/em]" +"[strong]all SQL statements are stored anonymously for statistical purposes[/" +"strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " +"Copyright 2002 Upright Database Technology. All rights reserved.[/em]" #: libraries/config/messages.inc.php:217 msgid "Startup" @@ -2825,12 +2783,10 @@ msgid "Choose how you want tabs to work" msgstr "Choose how you want tabs to work" #: libraries/config/messages.inc.php:221 -#| msgid "Use text field" msgid "Text fields" msgstr "Text fields" #: libraries/config/messages.inc.php:222 -#| msgid "Customize export options" msgid "Customize text input fields" msgstr "Customise text input fields" @@ -2839,7 +2795,6 @@ msgid "Texy! text" msgstr "Texy! text" #: libraries/config/messages.inc.php:225 -#| msgid "Warning" msgid "Warnings" msgstr "Warnings" @@ -2917,7 +2872,6 @@ msgstr "Use LOCAL keyword" #: libraries/config/messages.inc.php:249 libraries/config/messages.inc.php:257 #: libraries/config/messages.inc.php:258 -#| msgid "Put columns names in the first row" msgid "Column names in first row" msgstr "Column names in first row" @@ -2926,12 +2880,10 @@ msgid "Do not import empty rows" msgstr "Do not import empty rows" #: libraries/config/messages.inc.php:251 -#| msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>" msgid "Import currencies ($5.00 to 5.00)" msgstr "Import currencies (£5.00 to 5.00)" #: libraries/config/messages.inc.php:252 -#| msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>" msgid "Import percentages as proper decimals (12.00% to .12)" msgstr "Import percentages as proper decimals (12.00% to .12)" @@ -2944,7 +2896,6 @@ msgid "Partial import: skip queries" msgstr "Partial import: skip queries" #: libraries/config/messages.inc.php:256 -#| msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" msgid "Do not use AUTO_INCREMENT for zero values" msgstr "Do not use AUTO_INCREMENT for zero values" @@ -3057,9 +3008,6 @@ msgid "Light tabs" msgstr "Light tabs" #: libraries/config/messages.inc.php:284 -#| msgid "" -#| "Maximum number of characters shown in any non-numeric field on browse " -#| "view. Can be turned off by a toggle button on the browse page." msgid "" "Maximum number of characters shown in any non-numeric column on browse view" msgstr "" @@ -3128,7 +3076,6 @@ msgid "Bigger textarea for LONGTEXT" msgstr "Bigger textarea for LONGTEXT" #: libraries/config/messages.inc.php:296 -#| msgid "Uses icons on main page in lists and menu tabs." msgid "Use icons on main page" msgstr "Use icons on main page" @@ -3176,10 +3123,6 @@ msgid "Maximum tables" msgstr "Maximum tables" #: libraries/config/messages.inc.php:307 -#| msgid "" -#| "Disable the default warning that is displayed if mcrypt is missing for " -#| "cookie authentication. You can set this parameter to <tt>TRUE</tt> to " -#| "stop this message from appearing." msgid "" "Disable the default warning that is displayed if mcrypt is missing for " "cookie authentication" @@ -3204,7 +3147,6 @@ msgid "Memory limit" msgstr "Memory limit" #: libraries/config/messages.inc.php:311 -#| msgid "Show/Hide left menu" msgid "Show left delete link" msgstr "Show left delete link" @@ -3217,7 +3159,6 @@ msgid "Use natural order for sorting table and database names" msgstr "Use natural order for sorting table and database names" #: libraries/config/messages.inc.php:314 -#| msgid "Alter table order by" msgid "Natural order" msgstr "Natural order" @@ -3284,9 +3225,6 @@ msgid "Protect binary columns" msgstr "Protect binary columns" #: libraries/config/messages.inc.php:329 -#| msgid "" -#| "Enable if you want DB-based query history (requires pmadb). If disabled, " -#| "this utilizes JS-routines to display query history (lost by window close)." msgid "" "Enable if you want DB-based query history (requires phpMyAdmin configuration " "storage). If disabled, this utilizes JS-routines to display query history " @@ -3316,17 +3254,21 @@ msgstr "Tab displayed when opening a new query window" msgid "Default query window tab" msgstr "Default query window tab" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "Query window height (in pixels)" #: libraries/config/messages.inc.php:337 -#| msgid "Query window" msgid "Query window height" msgstr "Query window height" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window height (in pixels)" +msgid "Query window width (in pixels)" +msgstr "Query window height (in pixels)" + #: libraries/config/messages.inc.php:339 -#| msgid "Query window" msgid "Query window width" msgstr "Query window width" @@ -3339,18 +3281,15 @@ msgid "Recoding engine" msgstr "Recoding engine" #: libraries/config/messages.inc.php:342 -#| msgid "Repeat the headers every X cells, or 0 to deactivate." msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" -msgstr "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" +msgstr "" +"Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" #: libraries/config/messages.inc.php:343 -#| msgid "Metadata Headers" msgid "Repeat headers" msgstr "Repeat headers" #: libraries/config/messages.inc.php:344 -#| msgid "" -#| "Shows a help button instead of the "Documentation" message." msgid "Show help button instead of Documentation text" msgstr "Show help button instead of Documentation text" @@ -3371,7 +3310,6 @@ msgid "Leave blank if not used" msgstr "Leave blank if not used" #: libraries/config/messages.inc.php:350 -#| msgid "Host authentication order" msgid "Host authorization order" msgstr "Host authorisation order" @@ -3380,7 +3318,6 @@ msgid "Leave blank for defaults" msgstr "Leave blank for defaults" #: libraries/config/messages.inc.php:352 -#| msgid "Host authentication rules" msgid "Host authorization rules" msgstr "Host authorisation rules" @@ -3559,9 +3496,6 @@ msgid "Connect without password" msgstr "Connect without password" #: libraries/config/messages.inc.php:389 -#| msgid "" -#| "You can use MySQL wildcard characters (% and _), escape them if you want " -#| "to use their literal instances, i.e. use 'my\\_db' and not 'my_db'" msgid "" "You can use MySQL wildcard characters (% and _), escape them if you want to " "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not " @@ -3608,7 +3542,6 @@ msgstr "" "no support. Suggested: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:396 -#| msgid "database name" msgid "Database name" msgstr "Database name" @@ -3764,15 +3697,12 @@ msgid "Automatically create versions" msgstr "Automatically create versions" #: libraries/config/messages.inc.php:426 -#| msgid "" -#| "Leave blank for no SQL query tracking support, suggested: [kbd]" -#| "pma_tracking[/kbd]" msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" msgstr "" -"Leave blank for no user preferences storage in database, suggested: " -"[kbd]pma_config[/kbd]" +"Leave blank for no user preferences storage in database, suggested: [kbd]" +"pma_config[/kbd]" #: libraries/config/messages.inc.php:427 msgid "User preferences storage table" @@ -3834,18 +3764,14 @@ msgid "Show create database form" msgstr "Show create database form" #: libraries/config/messages.inc.php:439 -#| msgid "" -#| "Defines whether or not type fields should be initially displayed in edit/" -#| "insert mode. The user can toggle this setting from the interface." msgid "" "Defines whether or not type fields should be initially displayed in edit/" "insert mode" msgstr "" -"Defines whether or not type fields should be initially displayed in " -"edit/insert mode" +"Defines whether or not type fields should be initially displayed in edit/" +"insert mode" #: libraries/config/messages.inc.php:440 -#| msgid "Show open tables" msgid "Show field types" msgstr "Show field types" @@ -3963,8 +3889,8 @@ msgid "" "If you have a custom username, specify it here (defaults to [kbd]anonymous[/" "kbd])" msgstr "" -"If you have a custom username, specify it here (defaults to " -"[kbd]anonymous[/kbd])" +"If you have a custom username, specify it here (defaults to [kbd]anonymous[/" +"kbd])" #: libraries/config/messages.inc.php:467 tbl_tracking.php:405 #: tbl_tracking.php:456 @@ -4000,7 +3926,6 @@ msgstr "" "query textareas (*2) and for query window (*1.25)" #: libraries/config/messages.inc.php:473 -#| msgid "CHAR textarea columns" msgid "Textarea columns" msgstr "Textarea columns" @@ -4013,7 +3938,6 @@ msgstr "" "query textareas (*2) and for query window (*1.25)" #: libraries/config/messages.inc.php:475 -#| msgid "CHAR textarea rows" msgid "Textarea rows" msgstr "Textarea rows" @@ -4026,7 +3950,6 @@ msgid "Title of browser window when nothing is selected" msgstr "Title of browser window when nothing is selected" #: libraries/config/messages.inc.php:479 -#| msgid "Default table tab" msgid "Default title" msgstr "Default title" @@ -4113,22 +4036,18 @@ msgid "ZIP" msgstr "ZIP" #: libraries/config/setup.forms.php:41 -#| msgid "'config' authentication mode" msgid "Config authentication" msgstr "Config authentication" #: libraries/config/setup.forms.php:45 -#| msgid "the Cookie authentication mode" msgid "Cookie authentication" msgstr "Cookie authentication" #: libraries/config/setup.forms.php:48 -#| msgid "Swekey authentication" msgid "HTTP authentication" msgstr "HTTP authentication" #: libraries/config/setup.forms.php:51 -#| msgid "'signon' authentication mode" msgid "Signon authentication" msgstr "Signon authentication" @@ -4160,7 +4079,6 @@ msgstr "Open Document Spreadsheet" #: libraries/config/setup.forms.php:280 #: libraries/config/user_preferences.forms.php:180 -#| msgid "Databases display options" msgid "Database export options" msgstr "Database export options" @@ -4287,16 +4205,16 @@ msgstr "Overhead" msgid "Connection for controluser as defined in your configuration failed." msgstr "Connection for controluser as defined in your configuration failed." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "The server is not responding" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Details..." @@ -6073,7 +5991,6 @@ msgid "Please choose a page to edit" msgstr "Please choose a page to edit" #: libraries/schema/User_Schema.class.php:155 -#| msgid "Select Tables" msgid "Select page" msgstr "Select page" @@ -6082,12 +5999,10 @@ msgid "Select Tables" msgstr "Select Tables" #: libraries/schema/User_Schema.class.php:351 -#| msgid "Relational schema" msgid "Display relational schema" msgstr "Display relational schema" #: libraries/schema/User_Schema.class.php:356 -#| msgid "CSV" msgid "SVG" msgstr "SVG" @@ -6136,7 +6051,6 @@ msgid "Portrait" msgstr "Portrait" #: libraries/schema/User_Schema.class.php:399 -#| msgid "Creation" msgid "Orientation" msgstr "Orientation" @@ -6199,7 +6113,6 @@ msgid "Synchronize" msgstr "Synchronise" #: libraries/server_links.inc.php:97 -#| msgid "settings" msgid "Settings" msgstr "Settings" @@ -6594,12 +6507,10 @@ msgstr "" "(Default: \"...\")." #: libraries/user_preferences.inc.php:32 -#| msgid "Other core settings" msgid "Manage your settings" msg str "Manage your settings" #: libraries/user_preferences.inc.php:47 prefs_manage.php:291 -#| msgid "Modifications have been saved" msgid "Configuration has been saved" msgstr "Configuration has been saved" @@ -6613,7 +6524,6 @@ msgstr "" "permanently requires %sphpMyAdmin configuration storage%s." #: libraries/user_preferences.lib.php:141 -#| msgid "Cannot load or save configuration" msgid "Could not save configuration" msgstr "Could not save configuration" @@ -6655,7 +6565,6 @@ msgid "Choose..." msgstr "Choose..." #: main.php:150 prefs_manage.php:274 -#| msgid "settings" msgid "More settings" msgstr "More settings" @@ -6925,12 +6834,10 @@ msgid "to/from page" msgstr "to/from page" #: prefs_forms.php:78 -#| msgid "Submitted form contains errors" msgid "Cannot save settings, submitted form contains errors" msgstr "Cannot save settings, submitted form contains errors" #: prefs_manage.php:80 -#| msgid "Could not load default configuration from: %1$s" msgid "Could not import configuration" msgstr "Could not import configuration" @@ -6947,7 +6854,6 @@ msgid "Saved on: @DATE@" msgstr "Saved on: @DATE@" #: prefs_manage.php:239 -#| msgid "Import files" msgid "Import from file" msgstr "Import from file" @@ -6960,7 +6866,6 @@ msgid "Settings will be imported from your browser's local storage." msgstr "Settings will be imported from your browser's local storage." #: prefs_manage.php:254 -#| msgid "Other core settings" msgid "You have no saved settings!" msgstr "You have no saved settings!" @@ -6969,7 +6874,6 @@ msgid "This feature is not supported by your web browser" msgstr "This feature is not supported by your web browser" #: prefs_manage.php:263 -#| msgid "Server configuration" msgid "Merge with current configuration" msgstr "Merge with current configuration" @@ -7012,7 +6916,6 @@ msgid "<b>%s</b> table not found or not set in %s" msgstr "<b>%s</b> table not found or not set in %s" #: schema_export.php:46 -#| msgid "The %s table doesn't exist!" msgid "File doesn't exist" msgstr "File doesn't exist" @@ -8680,20 +8583,14 @@ msgid "Cannot load or save configuration" msgstr "Cannot load or save configuration" #: setup/frames/index.inc.php:50 -#| msgid "" -#| "Please create web server writable folder [em]config[/em] in phpMyAdmin " -#| "top level directory as described in [a@../Documentation.html#setup_script]" -#| "documentation[/a]. Otherwise you will be only able to download or display " -#| "it." msgid "" "Please create web server writable folder [em]config[/em] in phpMyAdmin top " "level directory as described in [a(a)Documentation.html#setup_script]" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" "Please create web server writable folder [em]config[/em] in phpMyAdmin top " -"level directory as described in " -"[a(a)Documentation.html#setup_script]documentation[/a] Otherwise you will be " -"only able to download or display it." +"level directory as described in [a(a)Documentation.html#setup_script]" +"documentation[/a]. Otherwise you will be only able to download or display it." #: setup/frames/index.inc.php:57 msgid "" diff --git a/po/es.po b/po/es.po index 2ec309a..f732f5a 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3447,7 +3447,7 @@ msgstr "La ceja se muestra cuando abre una nueva ventana de consulta" msgid "Default query window tab" msgstr "Ceja predetermnada para la ventana de consulta" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3457,6 +3457,12 @@ msgstr "" msgid "Query window height" msgstr "Ventana de consulta" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Ventana de consulta" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4411,17 +4417,17 @@ msgstr "" "La conexión para controluser, como está definida en su configuración, " "fracasó." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "El servidor no está respondiendo" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(o el socket del servidor MySQL local no está configurado correctamente)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detalles..." diff --git a/po/et.po b/po/et.po index 95f78dd..88528cc 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" @@ -3362,7 +3362,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3372,6 +3372,12 @@ msgstr "" msgid "Query window height" msgstr "Päringuaken" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Päringuaken" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4254,16 +4260,16 @@ msgstr "Ülejääv" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Server ei vasta" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(või kohaliku MySQL serveri soketid ei ole korrektselt seadistatud)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/eu.po b/po/eu.po index eca0fcf..78795c7 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3326,7 +3326,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3336,6 +3336,12 @@ msgstr "" msgid "Query window height" msgstr "Kontsulta-leihoa" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Kontsulta-leihoa" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4209,16 +4215,16 @@ msgstr "Arazteko hondakina" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/fa.po b/po/fa.po index e63836f..cf10c21 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3288,7 +3288,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3296,6 +3296,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4163,16 +4167,16 @@ msgstr "" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/fi.po b/po/fi.po index b927787..d62eb95 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3447,7 +3447,7 @@ msgstr "Uutta kyselyikkunaa avattaessa näytettävä välilehti" msgid "Default query window tab" msgstr "Oletusarvoinen kyselyikkunavälilehti" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3457,6 +3457,12 @@ msgstr "" msgid "Query window height" msgstr "Kyselyikkuna" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Kyselyikkuna" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4430,18 +4436,18 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Yhteyden muodostus asetuksissa määriteltyyn superuser-käyttäjään epäonnistui." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Palvelin ei vastaa" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(tai paikallisen MySQL-palvelimen pistokkeen asetuksia ei ole määritelty " "oikein)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Lisätiedot..." diff --git a/po/fr.po b/po/fr.po index 24e1fee..9409407 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-08-21 20:02+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" @@ -3390,7 +3390,7 @@ msgstr "L'onglet affiché à l'ouverture d'une fenêtre de requêtes." msgid "Default query window tab" msgstr "Onglet par défaut pour fenêtre de requêtes" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3400,6 +3400,12 @@ msgstr "" msgid "Query window height" msgstr "Fenêtre de requête" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Fenêtre de requête" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4381,18 +4387,18 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "La connexion au controluser tel que défini dans votre configuration a échoué." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Le serveur ne répond pas" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(ou l'interface de connexion (socket) vers le serveur MySQL local n'est pas " "correctement configurée)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Détails..." diff --git a/po/gl.po b/po/gl.po index 0594b31..8ff47a7 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3469,7 +3469,7 @@ msgstr "O separador que aparece cando se entra nunha xanela de procuras" msgid "Default query window tab" msgstr "Separador por omisión das xanelas de procuras" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3479,6 +3479,12 @@ msgstr "" msgid "Query window height" msgstr "Xanela de procuras" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Xanela de procuras" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4469,17 +4475,17 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Fallou a conexión para controluser tal e como se define na súa configuración." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "O servidor non está a responder" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(ou o socket local do servidor de MySQL non se configurou correctamente)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detalles..." diff --git a/po/he.po b/po/he.po index 6c48848..7ee95ff 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: hebrew <he(a)li.org>\n" @@ -3310,7 +3310,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3320,6 +3320,12 @@ msgstr "" msgid "Query window height" msgstr "חלון שאילתה" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "חלון שאילתה" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4195,16 +4201,16 @@ msgstr "תקורה" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "השרת אינו מגיב" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/hi.po b/po/hi.po index 34358fc..28fc507 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3233,7 +3233,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3243,6 +3243,12 @@ msgstr "" msgid "Query window height" msgstr "क्वरी पेज" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "क्वरी पेज" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4111,16 +4117,16 @@ msgstr "" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/hr.po b/po/hr.po index 7c0c183..babf8ef 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3376,7 +3376,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3386,6 +3386,12 @@ msgstr "" msgid "Query window height" msgstr "Prozor za upite" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Prozor za upite" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4269,17 +4275,17 @@ msgstr "" "Povezivanje kontrolnih korisnika na način kako je definirano u vašoj " "konfiguraciji nije uspjelo." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Poslužitelj ne odgovara" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(ili priključak lokalnog MySQL poslužitelja nije ispravno konfiguriran)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detalji..." diff --git a/po/hu.po b/po/hu.po index bb57157..4f176ff 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-07-22 02:22+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: hungarian <hu(a)li.org>\n" @@ -3461,7 +3461,7 @@ msgstr "Új lekérdezési ablak megnyitásakor fül megjelenítése" msgid "Default query window tab" msgstr "Alapértelmezett lekérdezési ablak fül" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3471,6 +3471,12 @@ msgstr "" msgid "Query window height" msgstr "Lekérdezés ablak" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Lekérdezés ablak" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4461,18 +4467,18 @@ msgstr "" "A konfigurációban meghatározott kapcsolat a kontrollfelhasználó számára nem " "sikerült." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "A szerver nem válaszol" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(vagy nem megfelelően állították be a helyi MySQL szerver " "szoftvercsatornáját)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Részletek..." diff --git a/po/id.po b/po/id.po index 56a792e..92c14fd 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-06-16 01:45+0200\n" "Last-Translator: <jack.hakim(a)yahoo.com>\n" "Language-Team: indonesian <id(a)li.org>\n" @@ -3326,7 +3326,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3336,6 +3336,12 @@ msgstr "" msgid "Query window height" msgstr "Jendela Pencarian" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Jendela Pencarian" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4216,16 +4222,16 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Koneksi untuk controluser yang di definisikan di konfigurasi Anda gagal." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Server tidak menjawab" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(atau konfigurasi socket dari server MySQL tidak benar)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Rincian..." diff --git a/po/it.po b/po/it.po index 9779f68..bd49d6d 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-08-22 19:39+0200\n" "Last-Translator: <rebeluca(a)gmail.com>\n" "Language-Team: italian <it(a)li.org>\n" @@ -3327,7 +3327,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3337,6 +3337,12 @@ msgstr "" msgid "Query window height" msgstr "Finestra della Query" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Finestra della Query" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4231,16 +4237,16 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Connessione per controluser come definito nella configurazione fallita." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Il server non risponde" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(o il socket del server locale MySQL non è correttamente configurato)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Dettagli..." diff --git a/po/ja.po b/po/ja.po index ad8f72e..8c417cf 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3332,7 +3332,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3342,6 +3342,12 @@ msgstr "" msgid "Query window height" msgstr "クエリウィンドウ" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "クエリウィンドウ" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4214,16 +4220,16 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "設定ファイルに定義されている管理ユーザ(controluser)での接続に失敗しました" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "サーバが応答しません" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(あるいはローカルの MySQL サーバのソケットが正しく設定されていません)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "詳細..." diff --git a/po/ka.po b/po/ka.po index 696de89..6f11ca1 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" @@ -3441,7 +3441,7 @@ msgstr "Tab displayed when opening a new query window" msgid "Default query window tab" msgstr "Default query window tab" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3451,6 +3451,12 @@ msgstr "" msgid "Query window height" msgstr "Query window" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Query window" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4418,16 +4424,16 @@ msgstr "Overhead" msgid "Connection for controluser as defined in your configuration failed." msgstr "Connection for controluser as defined in your configuration failed." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "სერვერი არ პასუხობს" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "დეტალები..." diff --git a/po/ko.po b/po/ko.po index 0330bc0..4dadf32 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3248,7 +3248,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3258,6 +3258,12 @@ msgstr "" msgid "Query window height" msgstr "질의 창" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "질의 창" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4139,16 +4145,16 @@ msgstr "부담" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "서버 응답이 없습니다" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/lt.po b/po/lt.po index e479e5b..a6030db 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-08-23 12:05+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" @@ -3378,7 +3378,7 @@ msgstr "Parodoma kortelė kai atidaromas naujas užklausos langas" msgid "Default query window tab" msgstr "Numatytoji užklausos lango kortelė" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3388,6 +3388,12 @@ msgstr "" msgid "Query window height" msgstr "Užklausų langas" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Užklausų langas" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4279,16 +4285,16 @@ msgstr "Perteklius" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Serveris neatsako" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(arba vietiniai MySQL serverio socketai yra blogai sukonfigūruoti)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detalės..." diff --git a/po/lv.po b/po/lv.po index 32d906f..a2315cc 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" @@ -3324,7 +3324,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3334,6 +3334,12 @@ msgstr "" msgid "Query window height" msgstr "Vaicājuma logs" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Vaicājuma logs" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4208,16 +4214,16 @@ msgstr "Pārtēriņš" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Serveris neatbild" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/mk.po b/po/mk.po index bdbd2f8..d7d9ab3 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3334,7 +3334,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3344,6 +3344,12 @@ msgstr "" msgid "Query window height" msgstr "Прозорец за упити" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Прозорец за упити" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4224,16 +4230,16 @@ msgstr "Пречекорување" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Серверот не одговара" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(или приклучокот со локалниот MySQL сервер не е исправно подесен)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/mn.po b/po/mn.po index 5382ab9..ce3c7b7 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" @@ -3303,7 +3303,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3313,6 +3313,12 @@ msgstr "" msgid "Query window height" msgstr "Асуултын цонх" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Асуултын цонх" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4182,16 +4188,16 @@ msgstr "Толгой дээр" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Сервэрээс хариу алга" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(эсвэл дотоод MySQL сервэрийн socket нь зөв тохируулагдаагүй)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/ms.po b/po/ms.po index a36e8e0..6746d1f 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" @@ -3299,7 +3299,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3307,6 +3307,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4178,16 +4182,16 @@ msgstr "Melebihi" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/nb.po b/po/nb.po index 17366e0..792c330 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-07-22 08:43+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" @@ -3338,7 +3338,7 @@ msgstr "Fanen som vises når et nytt spørringsvindu åpnes" msgid "Default query window tab" msgstr "Standard spørringsvindufane" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3348,6 +3348,12 @@ msgstr "" msgid "Query window height" msgstr "Spørringsvindu" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Spørringsvindu" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4297,16 +4303,16 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Tilkoblingen for kontrollbrukeren som definert i din konfigurasjon feilet." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Tjeneren svarer ikke" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(eller den lokale MySQL tjenerens sokkel er ikke korrekt konfigurert)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detaljer..." diff --git a/po/nl.po b/po/nl.po index 5bd237c..f36517c 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-05-31 01:06+0200\n" "Last-Translator: Bjorn <inbox(a)bjornroesbeke.be>\n" "Language-Team: dutch <nl(a)li.org>\n" @@ -3426,7 +3426,7 @@ msgstr "Tabblad dat wordt getoond bij het openen van een nieuw query-venster" msgid "Default query window tab" msgstr "Standaard query-venster tabblad" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3436,6 +3436,12 @@ msgstr "" msgid "Query window height" msgstr "Query-venster" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Query-venster" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4429,16 +4435,16 @@ msgstr "" "Connectie voor de controle gebruiker zoals in de configuratie is opgegeven " "is mislukt." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "De server reageert niet" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(of de MySQL-server heeft het socket niet juist ingesteld)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Details..." diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index d93fe9d..74ac0f3 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3139,7 +3139,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3147,6 +3147,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -3996,16 +4000,16 @@ msgstr "" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/pl.po b/po/pl.po index e01dd51..dac97ab 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-07-22 02:29+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: polish <pl(a)li.org>\n" @@ -3425,7 +3425,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3435,6 +3435,12 @@ msgstr "" msgid "Query window height" msgstr "Okienko zapytania" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Okienko zapytania" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4336,17 +4342,17 @@ msgstr "" "Połączenie dla użytkownika kontrolnego zdefiniowanego w pliku " "konfiguracyjnym nie powiodło się." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Serwer nie odpowiada" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(lub gniazdo lokalnego serwera MySQL nie jest skonfigurowane poprawnie)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Szczegóły…" diff --git a/po/pt.po b/po/pt.po index c760312..7553bba 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3335,7 +3335,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3345,6 +3345,12 @@ msgstr "" msgid "Query window height" msgstr "Janela de Query" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Janela de Query" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4220,16 +4226,16 @@ msgstr "Suspenso" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6cafe22..2e85bb3 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-07-13 23:58+0200\n" "Last-Translator: William Bachion <william(a)bachiondesign.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" @@ -3371,7 +3371,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3381,6 +3381,12 @@ msgstr "" msgid "Query window height" msgstr "Janela de consulta" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Janela de consulta" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4271,17 +4277,17 @@ msgid "Connection for controluser as defined in your configuration failed." msgstr "" "Conexão para controle do usuário como definido nas configurações falhou." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "O servidor não está respondendo" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" "(ou o soquete do servidor MySQL local não está configurado corretamente)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detalhes..." diff --git a/po/ro.po b/po/ro.po index 4036c6e..a9b8dbe 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3387,7 +3387,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3397,6 +3397,12 @@ msgstr "" msgid "Query window height" msgstr "Fereastra de comandă" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Fereastra de comandă" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4281,16 +4287,16 @@ msgstr "Asupra" msgid "Connection for controluser as defined in your configuration failed." msgstr "Connection for controluser as defined in your configuration failed." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Serverul nu răspunde" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(sau soclul serverului MySQL local nu este configurat momentan)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detalii..." diff --git a/po/ru.po b/po/ru.po index a62bb49..064d968 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3469,7 +3469,7 @@ msgstr "" msgid "Default query window tab" msgstr "Вкладка по умолчанию для окна запросов" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3479,6 +3479,12 @@ msgstr "" msgid "Query window height" msgstr "Окно запроса" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Окно запроса" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4470,16 +4476,16 @@ msgstr "" "controluser, с помощью параметров определенных в конфигурационном файле " "config.inc.php." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Сервер не отвечает" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(либо сокет локального MySQL-сервера некорректно настроен)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Детали..." diff --git a/po/si.po b/po/si.po index e31d19e..aac3dc1 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3358,7 +3358,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3368,6 +3368,12 @@ msgstr "" msgid "Query window height" msgstr "Query window" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Query window" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4250,16 +4256,16 @@ msgstr "පිරිවැය" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "සර්වරය ප්‍රතිචාර නොදක්වයි" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(or the local MySQL server's socket is not correctly configured)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/sk.po b/po/sk.po index 6a1382c..01a7cf9 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3360,7 +3360,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3370,6 +3370,12 @@ msgstr "" msgid "Query window height" msgstr "SQL okno" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "SQL okno" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4255,16 +4261,16 @@ msgstr "Naviac" msgid "Connection for controluser as defined in your configuration failed." msgstr "Nepodarilo sa pripojiť ku controluser podľa nastavení z konfigurácie." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Server neodpovedá" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/sl.po b/po/sl.po index 4098a3d..7386002 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-08-24 21:40+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" @@ -11,8 +11,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " -"n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -340,7 +340,6 @@ msgstr "" "zakaj, kliknite %stukaj%s." #: db_operations.php:531 -#| msgid "Relational schema" msgid "Edit or export relational schema" msgstr "Uredi ali izvozi relacijsko shemo" @@ -815,11 +814,6 @@ msgid "Values for the column \"%s\"" msgstr "Vrednosti za stolpec \"%s\"" #: enum_editor.php:22 -#| msgid "" -#| "Please enter the values for transformation options using this format: " -#| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or a " -#| "single quote (\"'\") amongst those values, precede it with a backslash " -#| "(for example '\\\\xyz' or 'a\\'b')." msgid "" "Enter each value in a separate field, enclosed in single quotes. If you ever " "need to put a backslash (\"\\\") or a single quote (\"'\") amongst those " @@ -827,8 +821,8 @@ msgid "" msgstr "" "Vsako vrednost vnesite v ločeno polje, obdano z enojnima narekovajema. Če " "želite med vrednosti vnesti desno poševnico (\"\\\") ali enojni narekovaj " -"(\"'\"), morate pred ta znak postaviti desno poševnico (npr. '\\\\xyz' ali " -"'a\\'b')." +"(\"'\"), morate pred ta znak postaviti desno poševnico (npr. '\\\\xyz' ali 'a" +"\\'b')." #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -1066,7 +1060,6 @@ msgid "Generate" msgstr "Ustvari" #: js/messages.php:70 -#| msgid "Mo" msgid "More" msgstr "Več" @@ -1908,7 +1901,6 @@ msgstr "Prebrskajte svoj računalnik:" #: libraries/common.lib.php:2864 #, php-format -#| msgid "web server upload directory" msgid "Select from the web server upload directory <b>%s</b>:" msgstr "Izberite iz mape za nalaganje na spletnem strežniku <b>%s</b>:" @@ -1933,7 +1925,6 @@ msgstr "podatki" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#| msgid "Structure and data" msgid "structure and data" msgstr "struktura in podatki" @@ -1950,12 +1941,10 @@ msgid "Custom - like above, but without the quick/custom choice" msgstr "Po meri - kot zgoraj, vendar brez izbire hitro/po meri" #: libraries/config.values.php:119 -#| msgid "Complete inserts" msgid "complete inserts" msgstr "popolne poizvedbe insert" #: libraries/config.values.php:120 -#| msgid "Extended inserts" msgid "extended inserts" msgstr "razširjene poizvedbe insert" @@ -2001,7 +1990,6 @@ msgstr "Manjkajoči podatki za %s" #: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 -#| msgid "Variable" msgid "unavailable" msgstr "ni na voljo" @@ -2026,13 +2014,11 @@ msgid "SQL Validator is disabled" msgstr "Preverjalnik SQL je onemogočen" #: libraries/config/FormDisplay.class.php:765 -#| msgid "PHP extension to use" msgid "SOAP extension not found" msgstr "Razširitev SOAP ni najdena" #: libraries/config/FormDisplay.class.php:773 #, php-format -#| msgid "Maximum tables" msgid "maximum %s" msgstr "največ %s" @@ -2087,9 +2073,8 @@ msgid "" "cross-frame scripting attacks" msgstr "" "Omogočitev tega dovoljuje strani, ki se nahaja na drugačni domeni, " -"vključitev phpMyAdmina v okvirju, kar predstavlja morebitno " -"[strong]varnostno luknjo[/strong], saj dovoljuje skriptne napade preko " -"okvirjev" +"vključitev phpMyAdmina v okvirju, kar predstavlja morebitno [strong]" +"varnostno luknjo[/strong], saj dovoljuje skriptne napade preko okvirjev" #: libraries/config/messages.inc.php:20 msgid "Allow third party framing" @@ -2217,7 +2202,6 @@ msgid "Debug SQL" msgstr "Odkrivaj napake SQL" #: libraries/config/messages.inc.php:45 -#| msgid "Databases display options" msgid "Default display direction" msgstr "Privzeta smer prikaza" @@ -2258,7 +2242,6 @@ msgid "Default table tab" msgstr "Privzet zavihek tabele" #: libraries/config/messages.inc.php:54 -#| msgid "Show binary contents as HEX" msgid "Show binary contents as HEX by default" msgstr "Privzeto prikaži dvojiške vsebine kot HEX" @@ -2287,17 +2270,14 @@ msgid "Edit SQL queries in popup window" msgstr "Uredi poizvedbe SQL v pojavnem oknu" #: libraries/config/messages.inc.php:61 -#| msgid "Edit next row" msgid "Edit in window" msgstr "Uredi v oknu" #: libraries/config/messages.inc.php:62 -#| msgid "Display Features" msgid "Display errors" msgstr "Prikaži napake" #: libraries/config/messages.inc.php:63 -#| msgid "Ignore errors" msgid "Gather errors" msgstr "Zberi napake" @@ -2307,7 +2287,6 @@ msgstr "" "Prikaži ikone za opozorilna sporočila, sporočila o napakah in informacijah" #: libraries/config/messages.inc.php:65 -#| msgid "Ignore errors" msgid "Iconic errors" msgstr "Napake z ikonami" @@ -2372,7 +2351,6 @@ msgid "Replace NULL by" msgstr "Zamenjaj NULL z" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 -#| msgid "Remove CRLF characters within columns" msgid "Remove CRLF characters within columns" msgstr "Odstrani znake CRLF znotraj stolpcev" @@ -2388,7 +2366,6 @@ msgid "Lines terminated by" msgstr "Vrstice zaključene z" #: libraries/config/messages.inc.php:80 -#| msgid "Excel edition" msgid "Excel edition" msgstr "Izdaja za Excel" @@ -2409,8 +2386,6 @@ msgstr "Predloga imena tabele" #: libraries/config/messages.inc.php:138 libraries/export/htmlword.php:23 #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 -#| msgid "%s table" -#| msgid_plural "%s tables" msgid "Dump table" msgstr "Odloži tabelo" @@ -2444,7 +2419,6 @@ msgid "Relations" msgstr "Relacije" #: libraries/config/messages.inc.php:103 -#| msgid "Export type" msgid "Export method" msgstr "Način izvoza" @@ -2499,7 +2473,6 @@ msgid "Maximal length of created query" msgstr "Največja dolžina ustvarjene poizvedbe" #: libraries/config/messages.inc.php:133 -#| msgid "Export tables" msgid "Export type" msgstr "Vrsta izvoza" @@ -2551,7 +2524,6 @@ msgstr "Prilagodite način brskanja" #: libraries/config/messages.inc.php:171 libraries/config/messages.inc.php:182 #: libraries/config/messages.inc.php:184 libraries/config/messages.inc.php:212 #: libraries/config/messages.inc.php:224 -#| msgid "Customize default export options" msgid "Customize default options" msgstr "Prilagodite privzete možnosti" @@ -2593,7 +2565,6 @@ msgid "Features" msgstr "Lastnosti" #: libraries/config/messages.inc.php:163 -#| msgid "Generate" msgid "General" msgstr "Splošno" @@ -2667,7 +2638,6 @@ msgid "Microsoft Office" msgstr "Microsoft Office" #: libraries/config/messages.inc.php:183 -#| msgid "Open Document Text" msgid "Open Document" msgstr "Open Document" @@ -2680,7 +2650,6 @@ msgid "Settings that didn't fit enywhere else" msgstr "Nastavitve, ki se ne uvrščajo nikamor drugam" #: libraries/config/messages.inc.php:187 -#| msgid "Page name" msgid "Page titles" msgstr "Naslovi strani" @@ -2690,9 +2659,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" -"Določite besedilo naslovne vrstice brskalnika. Oglejte si " -"[a(a)Documentation.html#cfg_TitleTable]dokumentacijo[/a] za čarobne nize, ki " -"jih lahko uporabite za pridobitev posebnih vrednosti." +"Določite besedilo naslovne vrstice brskalnika. Oglejte si [a@Documentation." +"html#cfg_TitleTable]dokumentacijo[/a] za čarobne nize, ki jih lahko " +"uporabite za pridobitev posebnih vrednosti." #: libraries/config/messages.inc.php:189 #: libraries/navigation_header.inc.php:83 @@ -2722,12 +2691,10 @@ msgid "Basic settings" msgstr "Osnovne nastavitve" #: libraries/config/messages.inc.php:194 -#| msgid "Authentication type" msgid "Authentication" msgstr "Overovitev" #: libraries/config/messages.inc.php:195 -#| msgid "Authentication type" msgid "Authentication settings" msgstr "Nastavitve overovitve" @@ -2748,15 +2715,10 @@ msgid "Enter server connection parameters" msgstr "Vnesite parametre povezave s strežnikom" #: libraries/config/messages.inc.php:199 -#| msgid "Configuration: %s" msgid "Configuration storage" msgstr "Hramba konfiguracije" #: libraries/config/messages.inc.php:200 -#| msgid "" -#| "Configure phpMyAdmin database to gain access to additional features, see " -#| "[a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/" -#| "a] in documentation" msgid "" "Configure phpMyAdmin configuration storage to gain access to additional " "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " @@ -2806,12 +2768,10 @@ msgid "Customize links shown in SQL Query boxes" msgstr "Prilagodi povezave prikazane v poljih poizvedbe SQL" #: libraries/config/messages.inc.php:214 -#| msgid "SQL queries" msgid "SQL queries settings" msgstr "Nastavitve poizvedb SQL" #: libraries/config/messages.inc.php:215 -#| msgid "SQL history" msgid "SQL Validator" msgstr "Preverjalnik SQL" @@ -2822,11 +2782,10 @@ msgid "" "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" -"Če želite uporabljati storitev Preverjalnika SQL, se zavedajte, da " -"[strong]so vse izjave SQL brezimno shranjene v statistične " -"namene[/strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL " -"Validator[/a], Copyright 2002 Upright Database Technology. Vse pravice " -"pridržane.[/em]" +"Če želite uporabljati storitev Preverjalnika SQL, se zavedajte, da [strong]" +"so vse izjave SQL brezimno shranjene v statistične namene[/strong].[br][em]" +"[a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], Copyright 2002 " +"Upright Database Technology. Vse pravice pridržane.[/em]" #: libraries/config/messages.inc.php:217 msgid "Startup" @@ -2845,12 +2804,10 @@ msgid "Choose how you want tabs to work" msgstr "Določite, kako želite, da zavihki delujejo" #: libraries/config/messages.inc.php:221 -#| msgid "Use text field" msgid "Text fields" msgstr "Besedilna polja" #: libraries/config/messages.inc.php:222 -#| msgid "Customize export options" msgid "Customize text input fields" msgstr "Prilagodi polja za vnos besedila" @@ -2859,7 +2816,6 @@ msgid "Texy! text" msgstr "Besedilo Texy!" #: libraries/config/messages.inc.php:225 -#| msgid "Warning" msgid "Warnings" msgstr "Opozorila" @@ -2945,12 +2901,10 @@ msgid "Do not import empty rows" msgstr "Ne uvozi praznih vrstic" #: libraries/config/messages.inc.php:251 -#| msgid "Import currencies ($5.00 to 5.00)" msgid "Import currencies ($5.00 to 5.00)" msgstr "Uvozi denarne enote ($5.00 v 5.00)" #: libraries/config/messages.inc.php:252 -#| msgid "Import percentages as proper decimals (12.00% to .12)" msgid "Import percentages as proper decimals (12.00% to .12)" msgstr "Uvozi odstotke kot ustrezne decimalne vrednosti (12.00% v ,12)" @@ -2963,7 +2917,6 @@ msgid "Partial import: skip queries" msgstr "Delni uvoz: preskoči poizvedbe" #: libraries/config/messages.inc.php:256 -#| msgid "Do not use AUTO_INCREMENT for zero values" msgid "Do not use AUTO_INCREMENT for zero values" msgstr "Ne uporabi AUTO_INCREMENT za ničelne vrednosti" @@ -3076,7 +3029,6 @@ msgid "Light tabs" msgstr "Lahki zavihki" #: libraries/config/messages.inc.php:284 -#| msgid "Maximum number of characters used when a SQL query is displayed" msgid "" "Maximum number of characters shown in any non-numeric column on browse view" msgstr "" @@ -3220,7 +3172,6 @@ msgid "Memory limit" msgstr "Omejitev spomina" #: libraries/config/messages.inc.php:311 -#| msgid "Show/Hide left menu" msgid "Show left delete link" msgstr "Pokaži levo povezavo za izbris" @@ -3233,7 +3184,6 @@ msgid "Use natural order for sorting table and database names" msgstr "Uporabi naravni vrstni red za razvrščanje tabel in imen zbirk podatkov" #: libraries/config/messages.inc.php:314 -#| msgid "Alter table order by" msgid "Natural order" msgstr "Naravni vrstni red" @@ -3300,9 +3250,6 @@ msgid "Protect binary columns" msgstr "Zaščiti dvojiške stolpce" #: libraries/config/messages.inc.php:329 -#| msgid "" -#| "Enable if you want DB-based query history (requires pmadb). If disabled, " -#| "this utilizes JS-routines to display query history (lost by window close)." msgid "" "Enable if you want DB-based query history (requires phpMyAdmin configuration " "storage). If disabled, this utilizes JS-routines to display query history " @@ -3310,8 +3257,7 @@ msgid "" msgstr "" "Omogočite, če želite zgodovino poizvedb temelječo na zbirki podatkov " "(potrebuje hrambo konfiguracije phpMyAdmin). Če je onemogočeno, se za prikaz " -"zgodovine poizvedb uporabi rutina JavaScript (ki se izgubi ob zaprtju " -"okna)." +"zgodovine poizvedb uporabi rutina JavaScript (ki se izgubi ob zaprtju okna)." #: libraries/config/messages.inc.php:330 msgid "Permanent query history" @@ -3333,17 +3279,21 @@ msgstr "Zavihek, ki se prikaže ob odprtju novega okna za poizvedbe" msgid "Default query window tab" msgstr "Privzet zavihek okna za poizvedbe" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "Višina okna poizvedb (v slikovnih pikah)" #: libraries/config/messages.inc.php:337 -#| msgid "Query window" msgid "Query window height" msgstr "Višina okna poizvedb" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window height (in pixels)" +msgid "Query window width (in pixels)" +msgstr "Višina okna poizvedb (v slikovnih pikah)" + #: libraries/config/messages.inc.php:339 -#| msgid "Query window" msgid "Query window width" msgstr "Širina okna poizvedb" @@ -3360,7 +3310,6 @@ msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" msgstr "Ponovi glave vsakih X celic, [kbd]0[/kbd] dezaktivira to funkcijo" #: libraries/config/messages.inc.php:343 -#| msgid "Repair threads" msgid "Repeat headers" msgstr "Ponovi glave" @@ -3385,7 +3334,6 @@ msgid "Leave blank if not used" msgstr "Pustite prazno, če se ne uporablja" #: libraries/config/messages.inc.php:350 -#| msgid "Host authentication order" msgid "Host authorization order" msgstr "Zaporedje overovitve gostitelja" @@ -3394,7 +3342,6 @@ msgid "Leave blank for defaults" msgstr "Pustite prazno za privzeto" #: libraries/config/messages.inc.php:352 -#| msgid "Host authentication rules" msgid "Host authorization rules" msgstr "Pravila overovitve gostitelja" @@ -3453,8 +3400,8 @@ msgid "" "Leave blank for no column comments/mime types, suggested: [kbd]" "pma_column_info[/kbd]" msgstr "" -"Pustite prazno, če ne želite pripomb/vrst mime stolpcev; predlagano: " -"[kbd]pma_column_info[/kbd]" +"Pustite prazno, če ne želite pripomb/vrst mime stolpcev; predlagano: [kbd]" +"pma_column_info[/kbd]" #: libraries/config/messages.inc.php:364 msgid "Column information table" @@ -3574,9 +3521,6 @@ msgid "Connect without password" msgstr "Poveži se brez gesla" #: libraries/config/messages.inc.php:389 -#| msgid "" -#| "You can use MySQL wildcard characters (% and _), escape them if you want " -#| "to use their literal instances, i.e. use 'my\\_db' and not 'my_db'" msgid "" "You can use MySQL wildcard characters (% and _), escape them if you want to " "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not " @@ -3624,7 +3568,6 @@ msgstr "" "Pustite prazno, če ne želite podpore. Predlagano: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:396 -#| msgid "database name" msgid "Database name" msgstr "Ime zbirke podatkov" @@ -3783,9 +3726,6 @@ msgid "Automatically create versions" msgstr "Samodejno ustvari različice" #: libraries/config/messages.inc.php:426 -#| msgid "" -#| "Leave blank for no SQL query tracking support, suggested: [kbd]" -#| "pma_tracking[/kbd]" msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" @@ -3858,7 +3798,6 @@ msgid "" msgstr "Določa ali naj bodo v načinu urejanja/vstavljanja prikazane vrste polj" #: libraries/config/messages.inc.php:440 -#| msgid "Show open tables" msgid "Show field types" msgstr "Pokaži vrste polj" @@ -3977,8 +3916,8 @@ msgid "" "If you have a custom username, specify it here (defaults to [kbd]anonymous[/" "kbd])" msgstr "" -"Če imate uporabniško ime po meri, ga določite tukaj (privzeto " -"[kbd]anonymous[/kbd])" +"Če imate uporabniško ime po meri, ga določite tukaj (privzeto [kbd]anonymous" +"[/kbd])" #: libraries/config/messages.inc.php:467 tbl_tracking.php:405 #: tbl_tracking.php:456 @@ -4014,7 +3953,6 @@ msgstr "" "za polja poizvedb SQL (*2) in za okno poizvedbe (*1,25)" #: libraries/config/messages.inc.php:473 -#| msgid "CHAR textarea columns" msgid "Textarea columns" msgstr "Stolpcev besedilnega polja" @@ -4027,7 +3965,6 @@ msgstr "" "za polja poizvedb SQL (*2) in za okno poizvedbe (*1,25)" #: libraries/config/messages.inc.php:475 -#| msgid "CHAR textarea rows" msgid "Textarea rows" msgstr "Vrstic besedilnega polja" @@ -4040,7 +3977,6 @@ msgid "Title of browser window when nothing is selected" msgstr "Naslov okna brskalnika, ko je ni izbrano nič" #: libraries/config/messages.inc.php:479 -#| msgid "Default table tab" msgid "Default title" msgstr "Privzeti naslov" @@ -4126,22 +4062,18 @@ msgid "ZIP" msgstr "ZIP" #: libraries/config/setup.forms.php:41 -#| msgid "Host authentication order" msgid "Config authentication" msgstr "Overitev preko konfiguracije" #: libraries/config/setup.forms.php:45 -#| msgid "Host authentication order" msgid "Cookie authentication" msgstr "Overitev preko piškotka" #: libraries/config/setup.forms.php:48 -#| msgid "Host authentication order" msgid "HTTP authentication" msgstr "Overitev preko HTTP" #: libraries/config/setup.forms.php:51 -#| msgid "Host authentication order" msgid "Signon authentication" msgstr "Overitev preko signon" @@ -4301,16 +4233,16 @@ msgstr "" "Povezava za controluserja, kot je določena v vaši konfiguraciji, je " "spodletela." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Strežnik se ne odziva" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ali pa lokalna vtičnica strežnika MySQL ni pravilno konfigurirana)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Podrobnosti ..." @@ -4371,49 +4303,40 @@ msgstr "" "Ne morem naložiti vtičnikov za izvoz, prosimo, preverite vašo namestitev!" #: libraries/display_export.lib.php:87 -#| msgid "Allows locking tables for the current thread." msgid "Exporting databases in the current server" msgstr "Izvažanje zbirk podatkov na trenutnem strežniku" #: libraries/display_export.lib.php:89 #, php-format -#| msgid "Create table on database %s" msgid "Exporting tables in the database \"%s\"" msgstr "Izvažanje tabel v zbirki podatkov \"%s\"" #: libraries/display_export.lib.php:91 #, php-format -#| msgid "Create table on database %s" msgid "Exporting rows in the table \"%s\"" msgstr "Izvažanje vrstic v tabeli \"%s\"" #: libraries/display_export.lib.php:97 -#| msgid "Export type" msgid "Export Method:" msgstr "Način izvoza:" #: libraries/display_export.lib.php:137 -#| msgid "Databases" msgid "Database(s):" msgstr "Zbirke podatkov:" #: libraries/display_export.lib.php:139 -#| msgid "Tables" msgid "Table(s):" msgstr "Tabele:" #: libraries/display_export.lib.php:149 -#| msgid "Rows" msgid "Rows:" msgstr "Vrstice:" #: libraries/display_export.lib.php:157 -#| msgid "Dump all rows" msgid "Dump some row(s)" msgstr "Odloži nekaj vrstic" #: libraries/display_export.lib.php:159 -#| msgid "Number of columns" msgid "Number of rows:" msgstr "Število vrstic:" @@ -4431,17 +4354,14 @@ msgstr "Izhod:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 #, php-format -#| msgid "Save on server in %s directory" msgid "Save on server in the directory <b>%s</b>" msgstr "Shrani na strežnik v imenik <b>%s</b>" #: libraries/display_export.lib.php:206 -#| msgid "Save as file" msgid "Save output to a file" msgstr "Shrani izhod v datoteko" #: libraries/display_export.lib.php:227 -#| msgid "File name template" msgid "File name template:" msgstr "Predloga imena datoteke:" @@ -4459,10 +4379,6 @@ msgstr "ime tabele" #: libraries/display_export.lib.php:240 #, 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." msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " "formatting strings. Additionally the following transformations will happen: " @@ -4483,7 +4399,6 @@ msgid "Character set of the file:" msgstr "Nabor znakov datoteke:" #: libraries/display_export.lib.php:312 -#| msgid "Compression" msgid "Compression:" msgstr "Stiskanje:" @@ -4494,23 +4409,19 @@ msgid "None" msgstr "Brez" #: libraries/display_export.lib.php:316 -#| msgid "\"zipped\"" msgid "zipped" msgstr "zipano" #: libraries/display_export.lib.php:318 -#| msgid "\"gzipped\"" msgid "gzipped" msgstr "gzipano" #: libraries/display_export.lib.php:320 -#| msgid "\"bzipped\"" msgid "bzipped" msgstr "bzipano" #: libraries/display_export.lib.php:334 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 -#| msgid "Format" msgid "Format:" msgstr "Oblika:" @@ -4519,7 +4430,6 @@ msgid "Format-Specific Options:" msgstr "Možnosti odvisne od oblike:" #: libraries/display_export.lib.php:348 libraries/display_import.lib.php:260 -#| msgid "Encoding conversion" msgid "Encoding Conversion:" msgstr "Pretvorba kodiranja:" @@ -4546,24 +4456,20 @@ msgstr "" "niso na voljo." #: libraries/display_import.lib.php:129 -#| msgid "Cannot log in to the MySQL server" msgid "Importing into the current server" msgstr "Uvažanje v trenutni strežnik" #: libraries/display_import.lib.php:131 #, php-format -#| msgid "Jump to database" msgid "Importing into the database \"%s\"" msgstr "Uvažanje v zbirko podatkov \"%s\"" #: libraries/display_import.lib.php:133 #, php-format -#| msgid "Jump to database" msgid "Importing into the table \"%s\"" msgstr "Uvažanje v tabelo \"%s\"" #: libraries/display_import.lib.php:139 -#| msgid "File to import" msgid "File to Import:" msgstr "Datoteka za uvoz:" @@ -4585,7 +4491,6 @@ msgid "File uploads are not allowed on this server." msgstr "Nalaganje datotek na tem strežniku ni dovoljeno." #: libraries/display_import.lib.php:208 -#| msgid "Partial import" msgid "Partial Import:" msgstr "Delni uvoz:" @@ -4598,10 +4503,6 @@ msgstr "" "položaja %d." #: libraries/display_import.lib.php:221 -#| msgid "" -#| "Allow the interruption of an import in case the script detects it is " -#| "close to the PHP timeout limit. This might be good way to import large " -#| "files, however it can break transactions." msgid "" "Allow the interruption of an import in case the script detects it is close " "to the PHP timeout limit. <i>(This might be good way to import large files, " @@ -4612,7 +4513,6 @@ msgstr "" "lahko prekine transakcije.)</i>" #: libraries/display_import.lib.php:228 -#| msgid "Number of queries to skip from start" msgid "Number of rows to skip, starting from the first row:" msgstr "Število vrstic, ki jih naj preskočim od prve vrstice:" @@ -5028,8 +4928,8 @@ msgid "" "A \":\" delimited list of metadata headers to be used to initialize the " "pbms_metadata_header table when a database is created." msgstr "" -"Seznam glav metapodatkov, ločenih z \":\", ki bo uporabljen za pripravo tabele " -"pbms_metadata_header, ko je ustvarjena zbirka podatkov." +"Seznam glav metapodatkov, ločenih z \":\", ki bo uporabljen za pripravo " +"tabele pbms_metadata_header, ko je ustvarjena zbirka podatkov." #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" @@ -5183,22 +5083,18 @@ msgstr "" "bo naslednja najvišja številka." #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#| msgid "Columns terminated by" msgid "Columns separated with:" msgstr "Stolpci so ločeni z:" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#| msgid "Columns enclosed by" msgid "Columns enclosed with:" msgstr "Stolpci so obdani z:" #: libraries/export/csv.php:23 libraries/import/csv.php:29 -#| msgid "Columns escaped by" msgid "Columns escaped with:" msgstr "Stolpci so izognjeni z:" #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#| msgid "Lines terminated by" msgid "Lines terminated with:" msgstr "Vrstice so zaključene z:" @@ -5206,26 +5102,22 @@ msgstr "Vrstice so zaključene z:" #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#| msgid "Replace NULL by" msgid "Replace NULL with:" msgstr "Zamenjaj NULL z:" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#| msgid "Remove CRLF characters within columns" msgid "Remove carriage return/line feed characters within columns" msgstr "" "Odstrani znake prehoda na začetek vrstice/pomika v novo vrsto znotraj " "stolpcev" #: libraries/export/excel.php:32 -#| msgid "Excel edition" msgid "Excel edition:" msgstr "Različica Excel:" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#| msgid "Databases display options" msgid "Data dump options" msgstr "Možnosti odlaganja podatkov" @@ -5253,29 +5145,24 @@ msgstr "Struktura tabele @TABLE@" #: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 -#| msgid "Transformation options" msgid "Object creation options" msgstr "Možnosti ustvarjanja objektov" #: libraries/export/latex.php:51 libraries/export/latex.php:75 -#| msgid "Table caption" msgid "Table caption (continued)" msgstr "Naslov tabele (nadaljevanje)" #: libraries/export/latex.php:56 libraries/export/odt.php:42 #: libraries/export/sql.php:40 -#| msgid "Disable foreign key checks" msgid "Display foreign key relationships" msgstr "Prikaži razmerja tujih ključev" #: libraries/export/latex.php:59 libraries/export/odt.php:45 -#| msgid "Displaying Column Comments" msgid "Display comments" msgstr "Prikaži pripombe" #: libraries/export/latex.php:62 libraries/export/odt.php:48 #: libraries/export/sql.php:44 -#| msgid "Available MIME types" msgid "Display MIME types" msgstr "Prikaži vrste MIME" @@ -5318,7 +5205,6 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Ustvari poročilo, ki vsebuje podatke tabele same)" #: libraries/export/pdf.php:24 -#| msgid "Report title" msgid "Report title:" msgstr "Naslov poročila:" @@ -5335,7 +5221,6 @@ msgstr "" "različica PHP in različica strežnika)</i>" #: libraries/export/sql.php:35 -#| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" msgstr "" "Dodatna prilagojena pripomba v glavi (\n" @@ -5359,12 +5244,10 @@ msgstr "" #: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 #, php-format -#| msgid "Statements" msgid "Add %s statement" msgstr "Dodaj %s izjavo" #: libraries/export/sql.php:91 -#| msgid "Statements" msgid "Add statements:" msgstr "Dodaj izjave:" @@ -5417,8 +5300,8 @@ msgid "" "(7,8,9)</code>" msgstr "" "vključi več vrstic v vsaki izjavi <code>INSERT</code><br />     " -"  Primer: <code>INSERT INTO ime_tabele VALUES (1,2,3), (4,5,6), " -"(7,8,9)</code>" +"  Primer: <code>INSERT INTO ime_tabele VALUES (1,2,3), (4,5,6), (7,8,9)" +"</code>" #: libraries/export/sql.php:156 msgid "" @@ -5441,8 +5324,8 @@ msgid "" "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes " "0x616263)</i>" msgstr "" -"Odloži dvojiške stolpce v šestnajstiškem zapisu <i>(na primer, \"abc\" postane " -"0x616263)</i>" +"Odloži dvojiške stolpce v šestnajstiškem zapisu <i>(na primer, \"abc\" " +"postane 0x616263)</i>" #: libraries/export/sql.php:171 msgid "" @@ -5498,7 +5381,6 @@ msgid "Object creation options (all are recommended)" msgstr "Možnosti ustvarjanja objektov (vse so priporočljive)" #: libraries/export/xml.php:40 -#| msgid "View" msgid "Views" msgstr "Pogledi" @@ -5585,7 +5467,6 @@ msgstr "" "ločena z vejicami in ne smejo biti obdana z narekovaji." #: libraries/import/csv.php:41 -#| msgid "Column names" msgid "Column names: " msgstr "Imena stolpcev: " @@ -5633,23 +5514,19 @@ msgid "This plugin does not support compressed imports!" msgstr "Ta vtičnik ne podpira stisnjenih uvozov!" #: libraries/import/ods.php:28 -#| msgid "Import percentages as proper decimals (12.00% to .12)" msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>" msgstr "" "Uvozi odstotke kot ustrezne decimalne vrednosti <i>(npr. 12.00% v ,12)</i>" #: libraries/import/ods.php:29 -#| msgid "Import currencies ($5.00 to 5.00)" msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>" msgstr "Uvozi denarne enote <i>(npr. $5.00 v 5.00)</i>" #: libraries/import/sql.php:32 -#| msgid "SQL compatibility mode" msgid "SQL compatibility mode:" msgstr "Združljivostni način SQL:" #: libraries/import/sql.php:42 -#| msgid "Do not use AUTO_INCREMENT for zero values" msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" msgstr "Ne uporabi <code>AUTO_INCREMENT</code> za ničelne vrednosti" @@ -5899,7 +5776,6 @@ msgid "Log out" msgstr "Odjava" #: libraries/plugin_interface.lib.php:336 -#| msgid "This format has no options" msgid "This format has no options" msgstr "Za to obliko ni možnosti" @@ -6155,7 +6031,6 @@ msgid "Please choose a page to edit" msgstr "Izberite stran za urejanje" #: libraries/schema/User_Schema.class.php:155 -#| msgid "Select Tables" msgid "Select page" msgstr "Izberi stran" @@ -6164,12 +6039,10 @@ msgid "Select Tables" msgstr "Izberi tabele" #: libraries/schema/User_Schema.class.php:351 -#| msgid "Relational schema" msgid "Display relational schema" msgstr "Prikaži relacijsko shemo" #: libraries/schema/User_Schema.class.php:356 -#| msgid "CSV" msgid "SVG" msgstr "SVG" @@ -6218,7 +6091,6 @@ msgid "Portrait" msgstr "Pokončno" #: libraries/schema/User_Schema.class.php:399 -#| msgid "Creation" msgid "Orientation" msgstr "Usmerjenost" @@ -6250,7 +6122,6 @@ msgid "Unknown language: %1$s." msgstr "Neznani jezik: %1$s." #: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44 -#| msgid "Current server" msgid "Current Server" msgstr "Trenutni strežnik" @@ -6282,7 +6153,6 @@ msgid "Synchronize" msgstr "Sinhroniziraj" #: libraries/server_links.inc.php:97 -#| msgid "settings" msgid "Settings" msgstr "Nastavitve" @@ -6532,19 +6402,14 @@ msgid "You have to add at least one column." msgstr "Dodati morate vsaj en stolpec." #: libraries/tbl_properties.inc.php:799 -#| msgid "" -#| "Please enter the values for transformation options using this format: " -#| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or a " -#| "single quote (\"'\") amongst those values, precede it with a backslash " -#| "(for example '\\\\xyz' or 'a\\'b')." msgid "" "Enter each value in a separate field. If you ever need to put a backslash " "(\"\\\") or a single quote (\"'\") amongst those values, precede it with a " "backslash (for example '\\\\xyz' or 'a\\'b')." msgstr "" "Vnesite vsako vrednost v ločeno polje. Če želite med vrednosti vnesti desno " -"poševnico (\"\\\") ali enojni narekovaj (\"'\"), morate pred ta znak postaviti " -"desno poševnico (na primer '\\\\xyz' ali 'a\\'b')." +"poševnico (\"\\\") ali enojni narekovaj (\"'\"), morate pred ta znak " +"postaviti desno poševnico (na primer '\\\\xyz' ali 'a\\'b')." #: libraries/tbl_triggers.lib.php:28 msgid "Event" @@ -6679,12 +6544,10 @@ msgstr "" "(Privzeto: \"...\")." #: libraries/user_preferences.inc.php:32 -#| msgid "Other core settings" msgid "Manage your settings" msgstr "Upravljajte svoje nastavitve" #: libraries/user_preferences.inc.php:47 prefs_manage.php:291 -#| msgid "Modifications have been saved" msgid "Configuration has been saved" msgstr "Konfiguracija je shranjena" @@ -6698,7 +6561,6 @@ msgstr "" "zahteva %shrambo konfiguracije phpMyAdmin%s." #: libraries/user_preferences.lib.php:141 -#| msgid "Cannot load or save configuration" msgid "Could not save configuration" msgstr "Ne morem shraniti konfiguracije" @@ -6720,7 +6582,6 @@ msgid "Error in ZIP archive:" msgstr "Napaka v arhivu ZIP:" #: main.php:66 -#| msgid "General relation features" msgid "General Settings" msgstr "Splošne nastavitve" @@ -6729,7 +6590,6 @@ msgid "MySQL connection collation" msgstr "Razvrščanje znakov povezave MySQL" #: main.php:112 -#| msgid "Other core settings" msgid "Appearance Settings" msgstr "Prikazne nastavitve" @@ -6742,7 +6602,6 @@ msgid "Choose..." msgstr "Izberite ..." #: main.php:150 prefs_manage.php:274 -#| msgid "settings" msgid "More settings" msgstr "Več nastavitev" @@ -7012,12 +6871,10 @@ msgid "to/from page" msgstr "od/do strani" #: prefs_forms.php:78 -#| msgid "Submitted form contains errors" msgid "Cannot save settings, submitted form contains errors" msgstr "Ne morem shraniti nastavitev, poslan obrazec vsebuje napake" #: prefs_manage.php:80 -#| msgid "Could not load default configuration from: %1$s" msgid "Could not import configuration" msgstr "Ne morem uvoziti konfiguracije" @@ -7034,7 +6891,6 @@ msgid "Saved on: @DATE@" msgstr "Shranjeno: @DATE@" #: prefs_manage.php:239 -#| msgid "Import files" msgid "Import from file" msgstr "Uvozi iz datoteke" @@ -7047,7 +6903,6 @@ msgid "Settings will be imported from your browser's local storage." msgstr "Nastavitve bodo uvožene iz brskalnikove lokalne hrambe." #: prefs_manage.php:254 -#| msgid "Other core settings" msgid "You have no saved settings!" msgstr "Nimate shranjenih nastavitev!" @@ -7056,7 +6911,6 @@ msgid "This feature is not supported by your web browser" msgstr "Te funkcije vaš spletni brskalnik ne podpira" #: prefs_manage.php:263 -#| msgid "Server configuration" msgid "Merge with current configuration" msgstr "Združi s trenutno konfiguracijo" @@ -7101,7 +6955,6 @@ msgid "<b>%s</b> table not found or not set in %s" msgstr "Tabele <b>%s</b> ni mogoče najti ali pa ni v %s" #: schema_export.php:46 -#| msgid "The %s table doesn't exist!" msgid "File doesn't exist" msgstr "Datoteka ne obstaja" @@ -8788,20 +8641,15 @@ msgid "Cannot load or save configuration" msgstr "Ne morem naložiti ali shraniti konfiguracije" #: setup/frames/index.inc.php:50 -#| msgid "" -#| "Please create web server writable folder [em]config[/em] in phpMyAdmin " -#| "top level directory as described in [a@../Documentation.html#setup_script]" -#| "documentation[/a]. Otherwise you will be only able to download or display " -#| "it." msgid "" "Please create web server writable folder [em]config[/em] in phpMyAdmin top " "level directory as described in [a(a)Documentation.html#setup_script]" "documentation[/a]. Otherwise you will be only able to download or display it." msgstr "" "Prosimo, na spletnem strežniku ustvarite zapisljivo mapo [em]config[/em] v " -"najvišjem nivoju mape phpMyAdmina, kot opisuje " -"[a(a)Documentation.html#setup_script]dokumentacija[/a] V naprotnem primeru jo " -"boste lahko samo prenesli ali jo prikazali." +"najvišjem nivoju mape phpMyAdmina, kot opi suje [a@Documentation." +"html#setup_script]dokumentacija[/a]. V naprotnem primeru jo boste lahko samo " +"prenesli ali jo prikazali." #: setup/frames/index.inc.php:57 msgid "" diff --git a/po/sq.po b/po/sq.po index 350ee3f..3d3a41f 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3322,7 +3322,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3332,6 +3332,12 @@ msgstr "" msgid "Query window height" msgstr "Dritarja e Query" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Dritarja e Query" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4206,16 +4212,16 @@ msgstr "Mbi limit" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Serveri nuk përgjigjet" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/sr.po b/po/sr.po index 3fb5fd6..5c99f89 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3370,7 +3370,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3380,6 +3380,12 @@ msgstr "" msgid "Query window height" msgstr "Прозор за упите" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Прозор за упите" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4264,16 +4270,16 @@ msgstr "" "Конекција за controluser-а, онако како је дефинисана у вашој конфигурацији, " "није успела." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Сервер не одговара" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(или прикључак локалног MySQL сервера није исправно подешен)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 2373335..3fe8acb 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-07-22 02:27+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" @@ -3368,7 +3368,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3378,6 +3378,12 @@ msgstr "" msgid "Query window height" msgstr "Prozor za upite" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Prozor za upite" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4262,16 +4268,16 @@ msgstr "" "Konekcija za controluser-a, onako kako je definisana u vašoj konfiguraciji, " "nije uspela." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Server ne odgovara" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ili priključak lokalnog MySQL servera nije ispravno podešen)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/sv.po b/po/sv.po index 826d3e9..faa2d7d 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3447,7 +3447,7 @@ msgstr "Flik som visas när man öppnar ett nytt frågefönster" msgid "Default query window tab" msgstr "Standard frågefönsterflik" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3457,6 +3457,12 @@ msgstr "" msgid "Query window height" msgstr "Frågefönster" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Frågefönster" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4425,16 +4431,16 @@ msgstr "Outnyttjat" msgid "Connection for controluser as defined in your configuration failed." msgstr "Uppkoppling för controluser enligt din konfiguration misslyckades." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Servern svarar inte" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(eller den lokala MySQL-serverns socket är inte korrekt konfigurerad)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Detaljer..." diff --git a/po/ta.po b/po/ta.po index 364e99d..f6c72c3 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3197,7 +3197,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3205,6 +3205,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4056,16 +4060,16 @@ msgstr "" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/te.po b/po/te.po index daf5722..d78056b 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3247,7 +3247,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3255,6 +3255,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4112,16 +4116,16 @@ msgstr "" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "వివరాలు..." diff --git a/po/th.po b/po/th.po index e9b170b..71e78c2 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: thai <th(a)li.org>\n" @@ -3305,7 +3305,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3315,6 +3315,12 @@ msgstr "" msgid "Query window height" msgstr "หน้าต่างคำค้น" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "หน้าต่างคำค้น" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4190,16 +4196,16 @@ msgstr "เกินความจำเป็น" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "เซิร์ฟเวอร์ดังกล่าวไม่ตอบสนอง" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/tr.po b/po/tr.po index 77ef886..ef23bd0 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-08-24 08:47+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" @@ -340,7 +340,6 @@ msgstr "" "için %sburaya%s tıklayın." #: db_operations.php:531 -#| msgid "Relational schema" msgid "Edit or export relational schema" msgstr "İlişkisel şemayı dışa aktar veya düzenle" @@ -1929,12 +1928,10 @@ msgid "Custom - like above, but without the quick/custom choice" msgstr "Özel - yukarıdaki gibi ancak hızlı/özel seçimsiz" #: libraries/config.values.php:119 -#| msgid "Delayed inserts" msgid "complete inserts" msgstr "tam eklemeler" #: libraries/config.values.php:120 -#| msgid "Delayed inserts" msgid "extended inserts" msgstr "genişletilmiş eklemeler" @@ -1980,7 +1977,6 @@ msgstr "%s için kayıp veri" #: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 -#| msgid "Variable" msgid "unavailable" msgstr "kullanılamaz" @@ -2005,13 +2001,11 @@ msgid "SQL Validator is disabled" msgstr "SQL Onaylayıcı etkisizleştirildi" #: libraries/config/FormDisplay.class.php:765 -#| msgid "PHP extension to use" msgid "SOAP extension not found" msgstr "SOAP uzantısı bulunamadı" #: libraries/config/FormDisplay.class.php:773 #, php-format -#| msgid "Maximum tables" msgid "maximum %s" msgstr "en fazla %s" @@ -2194,7 +2188,6 @@ msgid "Debug SQL" msgstr "SQL Hata Ayıklama" #: libraries/config/messages.inc.php:45 -#| msgid "Databases display options" msgid "Default display direction" msgstr "Varsayılan görüntü talimatı" @@ -2235,7 +2228,6 @@ msgid "Default table tab" msgstr "Varsayılan tablo sekmesi" #: libraries/config/messages.inc.php:54 -#| msgid "Show binary contents as HEX" msgid "Show binary contents as HEX by default" msgstr "Binari içerikleri varsayılandan HEX olarak göster" @@ -2264,17 +2256,14 @@ msgid "Edit SQL queries in popup window" msgstr "Açılır pencere içinde SQL sorgularını düzenle" #: libraries/config/messages.inc.php:61 -#| msgid "Edit next row" msgid "Edit in window" msgstr "Pencerede düzenle" #: libraries/config/messages.inc.php:62 -#| msgid "Display Features" msgid "Display errors" msgstr "Hataları göster" #: libraries/config/messages.inc.php:63 -#| msgid "Ignore errors" msgid "Gather errors" msgstr "Hataları toparla" @@ -2350,7 +2339,6 @@ msgid "Replace NULL by" msgstr "NULL'u bunla değiştir:" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 -#| msgid "Remove carriage return/line feed characters within columns" msgid "Remove CRLF characters within columns" msgstr "Sütunlardaki CRLF karakterlerini kaldır" @@ -2366,7 +2354,6 @@ msgid "Lines terminated by" msgstr "Satırı sonlandıran:" #: libraries/config/messages.inc.php:80 -#| msgid "Excel edition:" msgid "Excel edition" msgstr "Excel yapısı" @@ -2400,7 +2387,6 @@ msgid "Table caption" msgstr "Tablo başlığı" #: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:100 -#| msgid "Include table caption" msgid "Continued table caption" msgstr "Devam eden tablo başlığı" @@ -2421,7 +2407,6 @@ msgid "Relations" msgstr "İlişkiler" #: libraries/config/messages.inc.php:103 -#| msgid "Export Method:" msgid "Export method" msgstr "Dışa aktarma yöntemi" @@ -2448,7 +2433,6 @@ msgid "SQL compatibility mode" msgstr "SQL uyumluluk kipi" #: libraries/config/messages.inc.php:118 -#| msgid "Syntax to use when inserting data:" msgid "Syntax to use when inserting data" msgstr "Veri eklenirken kullanılacak sözdizimi" @@ -2457,7 +2441,6 @@ msgid "Creation/Update/Check dates" msgstr "Oluşturma/Güncelleme/Denetleme tarihleri" #: libraries/config/messages.inc.php:120 -#| msgid "Delayed inserts" msgid "Use delayed inserts" msgstr "Gecikmiş eklemeleri kullan" @@ -2470,7 +2453,6 @@ msgid "Use hexadecimal for BLOB" msgstr "BLOB için onaltılık düzen kullan" #: libraries/config/messages.inc.php:126 -#| msgid "Delayed inserts" msgid "Use ignore inserts" msgstr "Yoksayılan eklemeleri kullan" @@ -2479,7 +2461,6 @@ msgid "Maximal length of created query" msgstr "Oluşturulan sorgunun azami uzunluğu" #: libraries/config/messages.inc.php:133 -#| msgid "Export" msgid "Export type" msgstr "Dışa aktarma türü" @@ -2488,7 +2469,6 @@ msgid "Enclose export in a transaction" msgstr "İşlem içinde dışa aktarmayı kapsa" #: libraries/config/messages.inc.php:135 -#| msgid "Export contents" msgid "Export time in UTC" msgstr "UTC olarak dışa aktarma zamanı" @@ -2532,7 +2512,6 @@ msgstr "Gözatma modunu özelleştirir" #: libraries/config/messages.inc.php:171 libraries/config/messages.inc.php:182 #: libraries/config/messages.inc.php:184 libraries/config/messages.inc.php:212 #: libraries/config/messages.inc.php:224 -#| msgid "Customize default export options" msgid "Customize default options" msgstr "Varsayılan seçenekleri özelleştirir" @@ -2574,7 +2553,6 @@ msgid "Features" msgstr "Özellikler" #: libraries/config/messages.inc.php:163 -#| msgid "Generate" msgid "General" msgstr "Genel" @@ -2648,7 +2626,6 @@ msgid "Microsoft Office" msgstr "Microsoft Office" #: libraries/config/messages.inc.php:183 -#| msgid "Open Document Text" msgid "Open Document" msgstr "Open Belgesi" @@ -2661,7 +2638,6 @@ msgid "Settings that didn't fit enywhere else" msgstr "Başka hiçbir yere uymayan ayarlar" #: libraries/config/messages.inc.php:187 -#| msgid "Page name" msgid "Page titles" msgstr "Sayfa başlığı" @@ -2672,8 +2648,8 @@ msgid "" "get special values." msgstr "" "Tarayıcının başlık çubuğu metnini belirler. Özel değerleri almak için " -"kullanılabilecek sihirli dizgiler için " -"[a(a)Documentation.html#cfg_TitleTable]belgelerden[/a] yararlanın." +"kullanılabilecek sihirli dizgiler için [a(a)Documentation.html#cfg_TitleTable]" +"belgelerden[/a] yararlanın." #: libraries/config/messages.inc.php:189 #: libraries/navigation_header.inc.php:83 @@ -2703,12 +2679,10 @@ msgid "Basic settings" msgstr "Temel ayarlar" #: libraries/config/messages.inc.php:194 -#| msgid "Authentication type" msgid "Authentication" msgstr "Kimlik denetimi" #: libraries/config/messages.inc.php:195 -#| msgid "Authentication type" msgid "Authentication settings" msgstr "Kimlik denetimi ayarları" @@ -2729,15 +2703,10 @@ msgid "Enter server connection parameters" msgstr "Sunucu bağlantı parametrelerini girin" #: libraries/config/messages.inc.php:199 -#| msgid "Configuration: %s" msgid "Configuration storage" msgstr "Yapılandırma depolama" #: libraries/config/messages.inc.php:200 -#| msgid "" -#| "Configure phpMyAdmin database to gain access to additional features, see " -#| "[a@../Documentation.html#linked-tables]phpMyAdmin configuration storage[/" -#| "a] in documentation" msgid "" "Configure phpMyAdmin configuration storage to gain access to additional " "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " @@ -2787,12 +2756,10 @@ msgid "Customize links shown in SQL Query boxes" msgstr "SQL Sorgu kutularında gösterilecek bağlantıları özelleştirir" #: libraries/config/messages.inc.php:214 -#| msgid "SQL queries" msgid "SQL queries settings" msgstr "SQL sorguları ayarları" #: libraries/config/messages.inc.php:215 -#| msgid "SQL history" msgid "SQL Validator" msgstr "SQL Onaylayıcı" @@ -2826,12 +2793,10 @@ msgid "Choose how you want tabs to work" msgstr "Sekmelerin nasıl çalışmasını istiyorsanız seçin" #: libraries/config/messages.inc.php:221 -#| msgid "Use text field" msgid "Text fields" msgstr "Metin alanları" #: libraries/config/messages.inc.php:222 -#| msgid "Customize export options" msgid "Customize text input fields" msgstr "Metin giriş alanlarını özelleştirir" @@ -2840,7 +2805,6 @@ msgid "Texy! text" msgstr "Texy! metni" #: libraries/config/messages.inc.php:225 -#| msgid "Warning" msgid "Warnings" msgstr "Uyarılar" @@ -2918,7 +2882,6 @@ msgstr "YEREL anahtar kelime kullan" #: libraries/config/messages.inc.php:249 libraries/config/messages.inc.php:257 #: libraries/config/messages.inc.php:258 -#| msgid "Put columns names in the first row" msgid "Column names in first row" msgstr "İlk satır içindeki sütun adları" @@ -2927,12 +2890,10 @@ msgid "Do not import empty rows" msgstr "Boş satırları içe aktarma" #: libraries/config/messages.inc.php:251 -#| msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>" msgid "Import currencies ($5.00 to 5.00)" msgstr "Parasalları içe aktar ($5.00'ı 5.00'a)" #: libraries/config/messages.inc.php:252 -#| msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>" msgid "Import percentages as proper decimals (12.00% to .12)" msgstr "Yüzdeleri doğru ondalık olarak içe aktar (%12.00'ı .12'ye)" @@ -2945,7 +2906,6 @@ msgid "Partial import: skip queries" msgstr "Kısmi içe aktarma: sorguları atla" #: libraries/config/messages.inc.php:256 -#| msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" msgid "Do not use AUTO_INCREMENT for zero values" msgstr "Sıfır değerleri için AUTO_INCREMENT değeri kullanma" @@ -3204,7 +3164,6 @@ msgid "Memory limit" msgstr "Bellek sınırı" #: libraries/config/messages.inc.php:311 -#| msgid "Show/Hide left menu" msgid "Show left delete link" msgstr "Sol silme bağlantısını göster" @@ -3217,7 +3176,6 @@ msgid "Use natural order for sorting table and database names" msgstr "Tablo ve veritabanı adlarını sıralamak için doğal sıra kullan" #: libraries/config/messages.inc.php:314 -#| msgid "Alter table order by" msgid "Natural order" msgstr "Doğal sıra" @@ -3319,7 +3277,7 @@ msgstr "Yeni sorgu penceresi açıldığında görüntülenen sekme" msgid "Default query window tab" msgstr "Varsayılan sorgu penceresi sekmesi" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "Sorgu penceresi yüksekliği (piksel olarak)" @@ -3329,6 +3287,12 @@ msgstr "Sorgu penceresi yüksekliği (piksel olarak)" msgid "Query window height" msgstr "Sorgu penceresi" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window height (in pixels)" +msgid "Query window width (in pixels)" +msgstr "Sorgu penceresi yüksekliği (piksel olarak)" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4304,16 +4268,16 @@ msgstr "" "Yapılandırmanız içinde tanımlanmış denetim kullanıcıları için bağlantı " "başarısız." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Sunucu yanıt vermiyor" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ya da yerel MySQL sunucusunun soketi doğru olarak yapılandırılmadı)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Ayrıntılar..." diff --git a/po/tt.po b/po/tt.po index 6225430..ec241f2 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3339,7 +3339,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3349,6 +3349,12 @@ msgstr "" msgid "Query window height" msgstr "Soraw täräzäse" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Soraw täräzäse" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4231,16 +4237,16 @@ msgstr "Overhead" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Bu server endäşmi" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(yä cirle MySQL-server soketı döres köylänmägän ide)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/ug.po b/po/ug.po index aab2be3..affc0e2 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-07-30 11:41+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" @@ -3201,7 +3201,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3209,6 +3209,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4076,16 +4080,16 @@ msgstr "ئېغىر يۈك" msgid "Connection for controluser as defined in your configuration failed." msgstr "تەڭشەك ھۆججىتى ئىچىدىكى ئىشلەنكۈچى ئۇلۈنما كونتىرولى مەغلۇب بولدى." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "مۇلازىمىتېردا ئىنكاس يوق" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(يەرلىك MySQL مۇلازىمىتېرى توغرا تەڭشەلمىگەن)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "تەپسىلاتلار..." diff --git a/po/uk.po b/po/uk.po index 2ed5ced..7341cee 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3284,7 +3284,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3294,6 +3294,12 @@ msgstr "" msgid "Query window height" msgstr "Вікно запиту" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Вікно запиту" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4157,16 +4163,16 @@ msgstr "Надмірні видатки" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/ur.po b/po/ur.po index 029aab2..1823783 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3199,7 +3199,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3207,6 +3207,10 @@ msgstr "" msgid "Query window height" msgstr "" +#: libraries/config/messages.inc.php:338 +msgid "Query window width (in pixels)" +msgstr "" + #: libraries/config/messages.inc.php:339 msgid "Query window width" msgstr "" @@ -4062,16 +4066,16 @@ msgstr "" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/po/uz.po b/po/uz.po index 55abae8..2a71dc6 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3466,7 +3466,7 @@ msgstr "Янги сўровлар ойнаси очилганда кўрсати msgid "Default query window tab" msgstr "Сўровлар ойнасининг ёрлиғи" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3476,6 +3476,12 @@ msgstr "" msgid "Query window height" msgstr "Сўровлар ойнаси" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "Сўровлар ойнаси" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4469,16 +4475,16 @@ msgstr "" "\"config.inc.php\" конфигурацион файлининг \"controluser\" директивасида " "кўрсатилган фойдаланувчи ёрдамида уланиб бўлмади." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Сервер жавоб бермаяпти" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(ёки локал MySQL сервернинг сокети нотўғри созланган)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Тафсилотлар..." diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 838d371..2df8a01 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\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" @@ -3479,7 +3479,7 @@ msgstr "Yangi so‘rovlar oynasi ochilganda ko‘rsatiladigan yorliq" msgid "Default query window tab" msgstr "So‘rovlar oynasining yorlig‘i" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3489,6 +3489,12 @@ msgstr "" msgid "Query window height" msgstr "So‘rovlar oynasi" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "So‘rovlar oynasi" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4489,16 +4495,16 @@ msgstr "" "\"config.inc.php\" konfiguratsion faylining \"controluser\" direktivasida " "ko‘rsatilgan foydalanuvchi yordamida ulanib bo‘lmadi." -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "Server javob bermayapti" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(yoki lokal MySQL serverning soketi noto‘g‘ri sozlangan)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "Tafsilotlar..." diff --git a/po/zh_CN.po b/po/zh_CN.po index a56c2b4..4df8e5f 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-08-10 08:13+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" @@ -3272,7 +3272,7 @@ msgstr "打开一个新查询窗口时默认显示的页面" msgid "Default query window tab" msgstr "默认查询窗口标签" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3282,6 +3282,12 @@ msgstr "" msgid "Query window height" msgstr "查询窗口" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "查询窗口" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4198,16 +4204,16 @@ msgstr "多余" msgid "Connection for controluser as defined in your configuration failed." msgstr "使用配置文件中定义的控制用户连接失败。" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "服务器没有响应" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "(或者本地 MySQL 服务器的套接字没有正确配置)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "详细..." diff --git a/po/zh_TW.po b/po/zh_TW.po index ee6ee5c..73fae81 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-08-23 13:31+0200\n" +"POT-Creation-Date: 2010-08-25 09:32+0200\n" "PO-Revision-Date: 2010-03-12 09:15+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" @@ -3321,7 +3321,7 @@ msgstr "" msgid "Default query window tab" msgstr "" -#: libraries/config/messages.inc.php:336 libraries/config/messages.inc.php:338 +#: libraries/config/messages.inc.php:336 msgid "Query window height (in pixels)" msgstr "" @@ -3331,6 +3331,12 @@ msgstr "" msgid "Query window height" msgstr "查詢視窗" +#: libraries/config/messages.inc.php:338 +#, fuzzy +#| msgid "Query window" +msgid "Query window width (in pixels)" +msgstr "查詢視窗" + #: libraries/config/messages.inc.php:339 #, fuzzy #| msgid "Query window" @@ -4211,16 +4217,16 @@ msgstr "多餘" msgid "Connection for controluser as defined in your configuration failed." msgstr "" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysql.dbi.lib.php:353 -#: libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysql.dbi.lib.php:359 +#: libraries/dbi/mysqli.dbi.lib.php:411 msgid "The server is not responding" msgstr "伺服器並無回應" -#: libraries/dbi/mysql.dbi.lib.php:351 libraries/dbi/mysqli.dbi.lib.php:406 +#: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "( 或者本機 MySQL 伺服器之 socket 並未正確設定)" -#: libraries/dbi/mysql.dbi.lib.php:360 tbl_structure.php:700 +#: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 msgid "Details..." msgstr "" diff --git a/test/PMA_headerLocation_test.php b/test/PMA_headerLocation_test.php index 12be7f0..daad689 100644 --- a/test/PMA_headerLocation_test.php +++ b/test/PMA_headerLocation_test.php @@ -53,7 +53,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase if (function_exists("rename_function")) $this->apdExt = true; - + if ($this->apdExt && !$GLOBALS['test_header']) { // using apd extension to overriding header and headers_sent functions for test purposes @@ -84,7 +84,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase } } - + public function __destruct() { // rename_function may causes CLI error report in Windows XP, but nothing more happen @@ -106,7 +106,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase if ($this->runkitExt) { $this->oldIISvalue = 'non-defined'; - + if (defined('PMA_IS_IIS')) { $this->oldIISvalue = PMA_IS_IIS; runkit_constant_redefine('PMA_IS_IIS', NULL); @@ -114,10 +114,10 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase else { runkit_constant_add('PMA_IS_IIS', NULL); } - + $this->oldSIDvalue = 'non-defined'; - + if (defined('SID')) { $this->oldSIDvalue = SID; runkit_constant_redefine('SID', NULL); @@ -125,7 +125,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase else { runkit_constant_add('SID', NULL); } - + } } @@ -145,7 +145,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase runkit_constant_redefine('SID', $this->oldSIDvalue); elseif (defined('SID')) { runkit_constant_remove('SID'); - } + } } if ($this->apdExt) @@ -153,7 +153,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase } - + public function testSendHeaderLocationWithSidUrlWithQuestionMark() { if ($this->runkitExt && $this->apdExt) { @@ -162,7 +162,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase $testUri = 'http://testurl.com/test.php?test=test'; $separator = PMA_get_arg_separator(); - + $header = 'Location: ' . $testUri . $separator . SID; PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header'] @@ -182,7 +182,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase $testUri = 'http://testurl.com/test.php'; $separator = PMA_get_arg_separator(); - + $header = 'Location: ' . $testUri . '?' . SID; PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header'] @@ -203,7 +203,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase $testUri = 'http://testurl.com/test.php'; $separator = PMA_get_arg_separator(); - + $header = 'Refresh: 0; ' . $testUri; PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header'] @@ -223,7 +223,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase { if ($this->apdExt) { - $testUri = 'http://testurl.com/test.php'; + $testUri = 'http://testurl.com/test.php'; $header = 'Location: ' . $testUri; PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header'] @@ -243,7 +243,7 @@ class PMA_headerLocation_test extends PHPUnit_Extensions_OutputTestCase define('PMA_IS_IIS', true); else $this->markTestSkipped('Cannot redefine constant/function - missing APD or/and runkit extension'); - + // over 600 chars $testUri = 'http://testurl.com/test.php?testlonguri=over600chars&test=test&test=test&te…'; diff --git a/test/PMA_whichCrlf_test.php b/test/PMA_whichCrlf_test.php index 7aecf7d..244b548 100644 --- a/test/PMA_whichCrlf_test.php +++ b/test/PMA_whichCrlf_test.php @@ -15,7 +15,7 @@ require_once 'PHPUnit/Framework.php'; /** * Include to test. */ -require_once './libraries/common.lib.php'; +require_once './libraries/common.inc.php'; /** * Test whichCrlf function. hooks/post-receive -- phpMyAdmin

1 0