- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 85358c18474ebd4ae2d6d941f3b7e398e8229e99
by Michal Čihař 12 Jul '11

12 Jul '11

The branch, master has been updated via 85358c18474ebd4ae2d6d941f3b7e398e8229e99 (commit) from 4e7dfcc87aa0c633b25d182302aed8b0fadf714e (commit) - Log ----------------------------------------------------------------- commit 85358c18474ebd4ae2d6d941f3b7e398e8229e99 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Jul 12 14:16:55 2011 +0200 Explicitely state that older versions are not affected here ----------------------------------------------------------------------- Summary of changes: templates/security/PMASA-2011-3 | 4 ++++ templates/security/PMASA-2011-4 | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/templates/security/PMASA-2011-3 b/templates/security/PMASA-2011-3 index d48bad0..9219e26 100644 --- a/templates/security/PMASA-2011-3 +++ b/templates/security/PMASA-2011-3 @@ -32,6 +32,10 @@ relates to the crafted table. The 3.3.x and 3.4.0 versions are affected. </py:def> +<py:def function="announcement_unaffected"> +Older releases than 3.3.0 are not affected. +</py:def> + <py:def function="announcement_solution"> Upgrade to phpMyAdmin 3.3.10.1 or 3.4.1 or apply the related patch listed below. </py:def> diff --git a/templates/security/PMASA-2011-4 b/templates/security/PMASA-2011-4 index 8ea0026..d08d096 100644 --- a/templates/security/PMASA-2011-4 +++ b/templates/security/PMASA-2011-4 @@ -23,6 +23,10 @@ a possible phishing attack. We consider this vulnerability to be serious. </py:def> +<py:def function="announcement_unaffected"> +Older releases than 3.4.0 are not affected. +</py:def> + <py:def function="announcement_affected"> The 3.4.0 version is affected. </py:def> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 4e7dfcc87aa0c633b25d182302aed8b0fadf714e
by Michal Čihař 11 Jul '11

11 Jul '11

The branch, master has been updated via 4e7dfcc87aa0c633b25d182302aed8b0fadf714e (commit) via 058544bff0ae82e0d8b04174bb5023b86f62700f (commit) via 225bb623fe0752e5a13e5b258c5d46a68018be4d (commit) from e3596488cc4eed5e8a8d89a66b115bc74fe8d79b (commit) - Log ----------------------------------------------------------------- commit 4e7dfcc87aa0c633b25d182302aed8b0fadf714e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 11 15:05:31 2011 +0200 Do not list 2.x releases commit 058544bff0ae82e0d8b04174bb5023b86f62700f Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 11 14:56:53 2011 +0200 Remove references to 2.x commit 225bb623fe0752e5a13e5b258c5d46a68018be4d Author: Michal Čihař <mcihar(a)suse.cz> Date: Thu Jul 7 15:42:31 2011 +0200 Document location of the build log file ----------------------------------------------------------------------- Summary of changes: README | 8 ++++++++ render.py | 2 +- templates/downloads.tpl | 5 ++--- templates/index.tpl | 4 +--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README b/README index b2e49ff..e3957f7 100644 --- a/README +++ b/README @@ -109,6 +109,14 @@ And finally rsync it to sourceforge: rsync -az --delete output/ user,phpmyadmin@web.sourceforge.net:htdocs/home_page/ +Automatic build +--------------- + +There is configured automatic build of website, which runs every hour. +In case website is not updated, you might want to check the build log +for any possible failures: + +http://www.phpmyadmin.net/home_page/render.log License ------- diff --git a/render.py b/render.py index a28b47a..059d094 100755 --- a/render.py +++ b/render.py @@ -427,7 +427,7 @@ class SFGenerator: for stable in outversions.keys(): version = releases[outversions[stable]]['version'] major_branch = MAJOR_BRANCH_REGEXP.match(version).group(1) - if major_branch == '1': + if major_branch in ['1', '2']: del outversions[stable] continue for check in outversions.keys(): diff --git a/templates/downloads.tpl b/templates/downloads.tpl index abf2a79..c8fe45f 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -22,9 +22,8 @@ If you do not have a package available or desire to install your own phpMyAdmin, you can download one of following - source packages. Please note that 3.x versions require at least PHP 5.2 - and MySQL 5 to use them. If you are using older versions, please choose - the 2.x branch, which is still supported for security fixes. + source packages. Please note that phpMyAdmin requires at least PHP 5.2 + and MySQL 5. <py:for each="release in releases"> diff --git a/templates/index.tpl b/templates/index.tpl index 0510e4e..c175908 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -55,9 +55,7 @@ and RTL languages. Since version 3.0.0, phpMyAdmin joined the <a href="${base_url}gophp5.${file_ext}">GoPHP5 initiative</a> and dropped compatibility code for older PHP and MySQL versions; version 3 and later requires -at least PHP 5.2 and MySQL 5. To use with older PHP or MySQL versions, use -the older (but still maintained) branch of 2.x releases, which you can find on the <a -href="${base_url}downloads.${file_ext}">download page</a>. +at least PHP 5.2 and MySQL 5. hooks/post-receive -- phpMyAdmin website

1 0

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

11 Jul '11

The branch, master has been updated via 4bb11fd55a3dcb2c22a6df47af3453a4caa004e7 (commit) via 31f78b7d2c810cebd42dcef488b14db343e42982 (commit) via 2f49792ae6141437f487aa79c0f74e786079a182 (commit) via 47cd8dc6b5a63ef30fbd96fc3dbfda35c6d0e694 (commit) via d9555e79cb132470c02b0f486f5198ac1a495e4d (commit) via 59246e96e5463354fb40e3cbd5baa167697ce0c8 (commit) via 7020f8f5bcd1e4c063bf9bcdb3889c7956be6b88 (commit) via e216cbf9d33e842da2f5dde3bb5255cdcea12223 (commit) via f68203ae5d87d09d85e5aef947ea184eb830dd59 (commit) via f3003a7369702a78be4204895ddfdcaa9ca1b9ad (commit) via d35289cf9833cb4606e12720bc3262fae7984fd3 (commit) via 8842c5704d6822eb0a7d54eb5ffbd497829c8b7d (commit) via 8792006a83be87fb8c84ae0ddd9c886cf7fc13b3 (commit) via 268720118924377ee0be983fd6c903f099740dd6 (commit) via c64711266cb744c08fb5bd3202741f5189a0b99e (commit) via a2937e300e67fcd3de8c1f955101f136409a0793 (commit) via c610ee66255855631068a179d9b4b58602f2fb74 (commit) via 6a8e53651ba14bfc7ff12ade6f908da595dafb0b (commit) via 32047190b841c48839c8710a534892c7042724ae (commit) via 146368a48badf514a42b435ec0795412ecc50eea (commit) via ba6f782305fa6b6fbdb21af46d7fc4b7903d0d06 (commit) via 5f1dd71fc5ee923e04289c50654f67d733c38270 (commit) via 1edd89f30755560de2b67691ea185c2e3bb67e6a (commit) via 9fcc8dd236ee1365512845e3fbfc52aca942fb77 (commit) via cd2dd33d06031ee6791f735a825ef59e0a99a0ff (commit) via 5a838b252a1451841733bd58ede1c7db9cef9bd5 (commit) via d14d84e34094a0a2e5d90d5dccc1d8ebc98d4846 (commit) via 7c60dcc259057107f771d43ccf75e25eb15aef83 (commit) via 7a4e5584eceade95a6c0d415321698289ff3b217 (commit) via c04c25013e884edeede6d091a374925df4b94f80 (commit) via 430f045f33a3884d02d3600a395a17ce3772e152 (commit) via 37d3cdfa3126ce0d69226dbdba0f8ebc94502e53 (commit) via f8be4527da0e69c80b34d6d3d9fe02c9ff755c7f (commit) via 93f6c8ad3061f45d7acbe81586cdaae04e4d0630 (commit) via 6e16a21fd885f62dabad34ced4cdcdc7839713a0 (commit) via 36ffa98374cfb319ff0ef59798572b4f3cdab32f (commit) via 4ea2e5ddb5c9b5a228ff3edb6cb17d2363092bcc (commit) via bbafdbe2baf3c1f74c82650a1f1a639dcf5951f7 (commit) via 274dbf4b361ce4f369264b705e6ce575b4a9799c (commit) via 5f9518270da18cd5af175b1a7aa53de07a14991b (commit) via 2b41e62ee041bc41f9a40f6f6560b7ca8d030ee1 (commit) via 4705a7aaab4ee65eedd5974536d5ae7ad0362e54 (commit) via d7bc91583d8610a04d63cb87a4193922e3cf9e4c (commit) via b65888fc31f68c4e175da006c55707a264d8a087 (commit) via 7e546dcc40902fc05edb97462e127dddda1e3c11 (commit) via e5037951bbd3a7ca88228a5a8af698e8676af64a (commit) via d4bb366c3f96b114fe43dfb0d7bd2fa5319946b4 (commit) via c02726cba847946de1b96679b03d13cad6628ca5 (commit) via 87c45447a869b24afdebfdd75b96c282672fd2f5 (commit) via 2e95a69310bad4dd62c3bf7fdab717d718b2909c (commit) via a7f9ff15b6511f8c95addf419895dd9f000df51a (commit) via 8773c89eac520e2929e8ab2602ab60e7f34cdd7c (commit) via bd5e043b7bc5a9ece60df09229f46e896c78a2b0 (commit) via bcd5873378ef2456b281f1b8bf8d1003357976a5 (commit) via a0f8146765a7261e8eebc811e6b489d9e35b9810 (commit) via 5a27e898e95d3a827a505eac33f2cea253787bb6 (commit) via 683db5c28841b158a9d2859106ba2b92f6c6dfdd (commit) via 16716dd11ffa008d7e21bb2fd598488154ccee45 (commit) via 68a1c81e192ac27fe18e5902cee4f672d4fdd8b9 (commit) via 598325190487c1833869098af023b765e2cbd81e (commit) via ef045048e6d878e08d434806e385c50e4924aa1c (commit) via 947ee90b8b89004e449d78155d6b19d93696df8e (commit) via 6ec6352f3efa6df1fc0ce2d3505e5f3c75536d45 (commit) via 92d437bd29800af407a7d98acabfbafaa298dde0 (commit) via 264dde0b5ec0754c6ce7d05de0a4a0a34511df6c (commit) via 06b65a38bdec0b6b6954ced5b1f37d5b1b42db03 (commit) via 43a9b12d0897bc6cf8cf97caca7ea79043b11f31 (commit) from dacfab623734ca5927693dc9cdabd84c4961420a (commit) - Log ----------------------------------------------------------------- commit 4bb11fd55a3dcb2c22a6df47af3453a4caa004e7 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jul 11 14:32:58 2011 +0200 Fix format string commit 31f78b7d2c810cebd42dcef488b14db343e42982 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 14:02:19 2011 +0200 Translation update done using Pootle. commit 2f49792ae6141437f487aa79c0f74e786079a182 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 14:02:09 2011 +0200 Translation update done using Pootle. commit 47cd8dc6b5a63ef30fbd96fc3dbfda35c6d0e694 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 14:02:02 2011 +0200 Translation update done using Pootle. commit d9555e79cb132470c02b0f486f5198ac1a495e4d Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 14:01:54 2011 +0200 Translation update done using Pootle. commit 59246e96e5463354fb40e3cbd5baa167697ce0c8 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 14:00:15 2011 +0200 Translation update done using Pootle. commit 7020f8f5bcd1e4c063bf9bcdb3889c7956be6b88 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 14:00:03 2011 +0200 Translation update done using Pootle. commit e216cbf9d33e842da2f5dde3bb5255cdcea12223 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:59:49 2011 +0200 Translation update done using Pootle. commit f68203ae5d87d09d85e5aef947ea184eb830dd59 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:59:06 2011 +0200 Translation update done using Pootle. commit f3003a7369702a78be4204895ddfdcaa9ca1b9ad Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:58:28 2011 +0200 Translation update done using Pootle. commit d35289cf9833cb4606e12720bc3262fae7984fd3 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:58:20 2011 +0200 Translation update done using Pootle. commit 8842c5704d6822eb0a7d54eb5ffbd497829c8b7d Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:58:10 2011 +0200 Translation update done using Pootle. commit 8792006a83be87fb8c84ae0ddd9c886cf7fc13b3 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:58:01 2011 +0200 Translation update done using Pootle. commit 268720118924377ee0be983fd6c903f099740dd6 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:57:22 2011 +0200 Translation update done using Pootle. commit c64711266cb744c08fb5bd3202741f5189a0b99e Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:57:08 2011 +0200 Translation update done using Pootle. commit a2937e300e67fcd3de8c1f955101f136409a0793 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:56:52 2011 +0200 Translation update done using Pootle. commit c610ee66255855631068a179d9b4b58602f2fb74 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:56:05 2011 +0200 Translation update done using Pootle. commit 6a8e53651ba14bfc7ff12ade6f908da595dafb0b Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:55:39 2011 +0200 Translation update done using Pootle. commit 32047190b841c48839c8710a534892c7042724ae Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:55:13 2011 +0200 Translation update done using Pootle. commit 146368a48badf514a42b435ec0795412ecc50eea Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:54:52 2011 +0200 Translation update done using Pootle. commit ba6f782305fa6b6fbdb21af46d7fc4b7903d0d06 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:54:20 2011 +0200 Translation update done using Pootle. commit 5f1dd71fc5ee923e04289c50654f67d733c38270 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:53:28 2011 +0200 Translation update done using Pootle. commit 1edd89f30755560de2b67691ea185c2e3bb67e6a Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:53:21 2011 +0200 Translation update done using Pootle. commit 9fcc8dd236ee1365512845e3fbfc52aca942fb77 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:52 2011 +0200 Translation update done using Pootle. commit cd2dd33d06031ee6791f735a825ef59e0a99a0ff Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:47 2011 +0200 Translation update done using Pootle. commit 5a838b252a1451841733bd58ede1c7db9cef9bd5 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:43 2011 +0200 Translation update done using Pootle. commit d14d84e34094a0a2e5d90d5dccc1d8ebc98d4846 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:36 2011 +0200 Translation update done using Pootle. commit 7c60dcc259057107f771d43ccf75e25eb15aef83 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:30 2011 +0200 Translation update done using Pootle. commit 7a4e5584eceade95a6c0d415321698289ff3b217 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:23 2011 +0200 Translation update done using Pootle. commit c04c25013e884edeede6d091a374925df4b94f80 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:20 2011 +0200 Translation update done using Pootle. commit 430f045f33a3884d02d3600a395a17ce3772e152 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:52:12 2011 +0200 Translation update done using Pootle. commit 37d3cdfa3126ce0d69226dbdba0f8ebc94502e53 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:51:56 2011 +0200 Translation update done using Pootle. commit f8be4527da0e69c80b34d6d3d9fe02c9ff755c7f Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:51:41 2011 +0200 Translation update done using Pootle. commit 93f6c8ad3061f45d7acbe81586cdaae04e4d0630 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:50:41 2011 +0200 Translation update done using Pootle. commit 6e16a21fd885f62dabad34ced4cdcdc7839713a0 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:50:33 2011 +0200 Translation update done using Pootle. commit 36ffa98374cfb319ff0ef59798572b4f3cdab32f Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:50:26 2011 +0200 Translation update done using Pootle. commit 4ea2e5ddb5c9b5a228ff3edb6cb17d2363092bcc Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:50:16 2011 +0200 Translation update done using Pootle. commit bbafdbe2baf3c1f74c82650a1f1a639dcf5951f7 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:50:05 2011 +0200 Translation update done using Pootle. commit 274dbf4b361ce4f369264b705e6ce575b4a9799c Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:54 2011 +0200 Translation update done using Pootle. commit 5f9518270da18cd5af175b1a7aa53de07a14991b Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:47 2011 +0200 Translation update done using Pootle. commit 2b41e62ee041bc41f9a40f6f6560b7ca8d030ee1 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:40 2011 +0200 Translation update done using Pootle. commit 4705a7aaab4ee65eedd5974536d5ae7ad0362e54 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:33 2011 +0200 Translation update done using Pootle. commit d7bc91583d8610a04d63cb87a4193922e3cf9e4c Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:26 2011 +0200 Translation update done using Pootle. commit b65888fc31f68c4e175da006c55707a264d8a087 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:21 2011 +0200 Translation update done using Pootle. commit 7e546dcc40902fc05edb97462e127dddda1e3c11 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:17 2011 +0200 Translation update done using Pootle. commit e5037951bbd3a7ca88228a5a8af698e8676af64a Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:10 2011 +0200 Translation update done using Pootle. commit d4bb366c3f96b114fe43dfb0d7bd2fa5319946b4 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:06 2011 +0200 Translation update done using Pootle. commit c02726cba847946de1b96679b03d13cad6628ca5 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:49:02 2011 +0200 Translation update done using Pootle. commit 87c45447a869b24afdebfdd75b96c282672fd2f5 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:57 2011 +0200 Translation update done using Pootle. commit 2e95a69310bad4dd62c3bf7fdab717d718b2909c Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:53 2011 +0200 Translation update done using Pootle. commit a7f9ff15b6511f8c95addf419895dd9f000df51a Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:41 2011 +0200 Translation update done using Pootle. commit 8773c89eac520e2929e8ab2602ab60e7f34cdd7c Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:37 2011 +0200 Translation update done using Pootle. commit bd5e043b7bc5a9ece60df09229f46e896c78a2b0 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:32 2011 +0200 Translation update done using Pootle. commit bcd5873378ef2456b281f1b8bf8d1003357976a5 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:25 2011 +0200 Translation update done using Pootle. commit a0f8146765a7261e8eebc811e6b489d9e35b9810 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:18 2011 +0200 Translation update done using Pootle. commit 5a27e898e95d3a827a505eac33f2cea253787bb6 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:05 2011 +0200 Translation update done using Pootle. commit 683db5c28841b158a9d2859106ba2b92f6c6dfdd Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:48:00 2011 +0200 Translation update done using Pootle. commit 16716dd11ffa008d7e21bb2fd598488154ccee45 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:47:45 2011 +0200 Translation update done using Pootle. commit 68a1c81e192ac27fe18e5902cee4f672d4fdd8b9 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:47:21 2011 +0200 Translation update done using Pootle. commit 598325190487c1833869098af023b765e2cbd81e Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:46:59 2011 +0200 Translation update done using Pootle. commit ef045048e6d878e08d434806e385c50e4924aa1c Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:46:36 2011 +0200 Translation update done using Pootle. commit 947ee90b8b89004e449d78155d6b19d93696df8e Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:46:11 2011 +0200 Translation update done using Pootle. commit 6ec6352f3efa6df1fc0ce2d3505e5f3c75536d45 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:46:05 2011 +0200 Translation update done using Pootle. commit 92d437bd29800af407a7d98acabfbafaa298dde0 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:45:57 2011 +0200 Translation update done using Pootle. commit 264dde0b5ec0754c6ce7d05de0a4a0a34511df6c Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:45:51 2011 +0200 Translation update done using Pootle. commit 06b65a38bdec0b6b6954ced5b1f37d5b1b42db03 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:45:43 2011 +0200 Translation update done using Pootle. commit 43a9b12d0897bc6cf8cf97caca7ea79043b11f31 Author: jacobkamphansen <jacobkamphansen(a)gmail.com> Date: Mon Jul 11 13:45:14 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/da.po | 149 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 67 insertions(+), 82 deletions(-) diff --git a/po/da.po b/po/da.po index ea2aa50..6ee4912 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-04 10:57+0200\n" -"Last-Translator: <thomas(a)dyhr.com>\n" +"PO-Revision-Date: 2011-07-11 14:02+0200\n" +"Last-Translator: <jacobkamphansen(a)gmail.com>\n" "Language-Team: danish <da(a)li.org>\n" "Language: da\n" "MIME-Version: 1.0\n" @@ -415,7 +415,7 @@ msgstr "Du skal vælge mindst en kolonne der skal vises" #: db_qbe.php:186 msgid "Switch to" -msgstr "skift til" +msgstr "Skift til" #: db_qbe.php:186 msgid "visual builder" @@ -424,7 +424,7 @@ msgstr "" #: db_qbe.php:222 libraries/db_structure.lib.php:90 #: libraries/display_tbl.lib.php:937 msgid "Sort" -msgstr "Sorter" +msgstr "Sortér" #: db_qbe.php:231 db_qbe.php:265 libraries/db_structure.lib.php:97 #: libraries/display_tbl.lib.php:557 libraries/display_tbl.lib.php:898 @@ -504,11 +504,11 @@ msgid "Your SQL query has been executed successfully" msgstr "Din SQL-forespørgsel blev udført korrekt" #: db_routines.php:158 -#, fuzzy, php-format +#, php-format msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" -msgstr[0] "række påvirket af den sidste SQL-sætning inde i proceduren" -msgstr[1] "rækker påvirket af den sidste SQL-sætning inde i proceduren" +msgstr[0] "%d række påvirket af den sidste SQL-sætning inde i proceduren" +msgstr[1] "%d rækker påvirket af den sidste SQL-sætning inde i proceduren" #: db_routines.php:168 #, php-format @@ -552,30 +552,30 @@ msgid "Export of routine %s" msgstr "Eksport af rutine %s" #: db_routines.php:291 libraries/db_routines.lib.php:911 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: %s" msgid "Invalid routine type: \"%s\"" -msgstr "Server indekset %s er ugyldigt" +msgstr "Server-indekset \"%s\" er ugyldigt" #: db_routines.php:312 msgid "Sorry, we failed to restore the dropped routine." -msgstr "" +msgstr "Beklager, det lykkedes ikke at genetablere den slettede rutine." #: db_routines.php:313 msgid "The backed up query was:" -msgstr "" +msgstr "Den gemte forespørgsel var:" #: db_routines.php:317 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Routine %1$s has been modified." -msgstr "Tabel %s er slettet" +msgstr "Tabel \"%1$s\" er slettet" #: db_routines.php:330 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been created." msgid "Routine %1$s has been created." -msgstr "Database %1$s er oprettet," +msgstr "Rutine %1$s er oprettet," #: db_routines.php:338 msgid "One or more errors have occured while processing your request:" @@ -613,7 +613,7 @@ msgstr "mindst ét af ordene" #: db_search.php:43 db_search.php:285 msgid "all words" -msgstr "alle ordene" +msgstr "alle ord" #: db_search.php:44 db_search.php:286 msgid "the exact phrase" @@ -632,8 +632,8 @@ msgstr "Søgeresultater for \"%s\" %s:" #, php-format msgid "%s match inside table %s" msgid_plural "%s matches inside table %s" -msgstr[0] "%s hit i tabel %s" -msgstr[1] "%s hits i tabel %s" +msgstr[0] "%s sammenfald i tabel %s" +msgstr[1] "%s sammenfald i tabel %s" #: db_search.php:231 libraries/common.lib.php:2650 #: libraries/common.lib.php:2834 libraries/common.lib.php:2835 @@ -644,7 +644,7 @@ msgstr "Vis" #: db_search.php:236 #, php-format msgid "Delete the matches for the %s table?" -msgstr "Slet match for %s tabellen?" +msgstr "Slet sammenfald for %s tabellen?" #: db_search.php:236 libraries/display_tbl.lib.php:1338 #: libraries/display_tbl.lib.php:2314 @@ -662,8 +662,8 @@ msgstr "Slet" #, php-format msgid "Total: %s match" msgid_plural "Total: %s matches" -msgstr[0] "I alt: %s hit" -msgstr[1] "I alt %s hits" +msgstr[0] "I alt: %s sammenfald" +msgstr[1] "I alt %s sammenfald" #: db_search.php:272 msgid "Search in database" @@ -682,7 +682,6 @@ msgid "Words are separated by a space character (\" \")." msgstr "Ord adskilles af mellemrums-karakter (\" \")." #: db_search.php:298 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside tables:" msgstr "Indeni tabel(ler):" @@ -698,17 +697,17 @@ msgstr "Ingen tabeller fundet i databasen" #: db_structure.php:270 tbl_operations.php:688 #, php-format msgid "Table %s has been emptied" -msgstr "Tabel %s er tømt" +msgstr "Tabel %s blev tømt" #: db_structure.php:279 tbl_operations.php:705 #, php-format msgid "View %s has been dropped" -msgstr "Visning %s er blevet droppet" +msgstr "Visning %s er blevet slettet" #: db_structure.php:279 tbl_operations.php:705 #, php-format msgid "Table %s has been dropped" -msgstr "Tabel %s er slettet" +msgstr "Tabel %s blev slettet" #: db_structure.php:286 tbl_create.php:269 msgid "Tracking is active." @@ -723,7 +722,7 @@ msgstr "Sporing er ikke aktiv." msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "" +msgstr "Viewet har mindst dette antal rækker. Se venligst %sdokumentationen%s." #: db_structure.php:386 db_structure.php:400 libraries/header.inc.php:152 #: libraries/tbl_info.inc.php:60 tbl_structure.php:212 @@ -757,13 +756,13 @@ msgstr "Med det markerede:" #: server_databases.php:262 server_privileges.php:583 #: server_privileges.php:1669 tbl_structure.php:590 msgid "Check All" -msgstr "Afmærk alt" +msgstr "Vælg alle" #: db_structure.php:483 libraries/display_tbl.lib.php:2335 #: libraries/replication_gui.lib.php:35 server_databases.php:264 #: server_privileges.php:586 server_privileges.php:1673 tbl_structure.php:594 msgid "Uncheck All" -msgstr "Fjern alle mærker" +msgstr "Fravælg alle" #: db_structure.php:488 msgid "Check tables having overhead" @@ -776,7 +775,7 @@ msgstr "Check tabeller der har overhead" #: libraries/tbl_links.inc.php:80 prefs_manage.php:288 #: server_privileges.php:1354 setup/frames/menu.inc.php:21 msgid "Export" -msgstr "Eksport" +msgstr "Eksportér" #: db_structure.php:498 db_structure.php:553 #: libraries/display_tbl.lib.php:2439 tbl_structure.php:628 @@ -784,8 +783,10 @@ msgstr "Eksport" msgid "Print view" msgstr "Vis (udskriftvenlig)" +# By "Empty", if this is an action, it should translate to "Tøm" but if it's a state it should translate to "Tom". #: db_structure.php:502 libraries/common.lib.php:2843 #: libraries/common.lib.php:2844 +#, fuzzy msgid "Empty" msgstr "Tøm" @@ -803,11 +804,11 @@ msgstr "Tjek tabel" #: db_structure.php:508 tbl_operations.php:653 tbl_structure.php:842 #: tbl_structure.php:844 msgid "Optimize table" -msgstr "Optimer tabel" +msgstr "Optimér tabel" #: db_structure.php:510 tbl_operations.php:640 msgid "Repair table" -msgstr "Reparer tabel" +msgstr "Reparér tabel" #: db_structure.php:512 tbl_operations.php:627 msgid "Analyze table" @@ -927,7 +928,7 @@ msgstr "Output" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" -msgstr "" +msgstr "Kopiér og indsæt de sammensatte værdier i \"Længde/Værdier\"-feltet" #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -1070,10 +1071,9 @@ msgid "You are about to DESTROY a complete table!" msgstr "Du er ved at DESTRUERE en komplet tabel!" #: js/messages.php:33 -#, fuzzy #| msgid "You are about to DESTROY a complete database!" msgid "You are about to TRUNCATE a complete table!" -msgstr "Du er ved at DESTRUERE en komplet database!" +msgstr "Du er ved at slette en hel tabel!" #: js/messages.php:35 msgid "Deleting tracking data" @@ -1089,12 +1089,13 @@ msgstr "Denne operation kan tage lang tid. Fortsæt alligevel?" #: js/messages.php:40 msgid "You are about to DISABLE a BLOB Repository!" -msgstr "" +msgstr "Du er ved at deaktivere en BLOB-beholder." #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" msgstr "" +"Er du sikker på at du vil deaktivere alle BLOB-referencer i databasen %s?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1106,10 +1107,9 @@ msgstr "Dette er ikke et tal!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:49 -#, fuzzy #| msgid "Total" msgid "Total count" -msgstr "Total" +msgstr "Samlet antal" #: js/messages.php:52 msgid "The host name is empty!" @@ -1129,10 +1129,9 @@ msgstr "De to kodeord er ikke ens!" #: js/messages.php:56 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Enhver bruger" +msgstr "Opret bruger" #: js/messages.php:57 msgid "Reloading Privileges" @@ -1157,24 +1156,22 @@ msgid "Edit" msgstr "Ret" #: js/messages.php:64 server_status.php:420 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Server valg" +msgstr "Realtids trafikoversigt" #: js/messages.php:65 server_status.php:423 msgid "Live conn./process chart" -msgstr "" +msgstr "Realtids forbind./opgave-oversigt" #: js/messages.php:66 server_status.php:445 -#, fuzzy #| msgid "Showing SQL query" msgid "Live query chart" -msgstr "Viser SQL-forespørgsel" +msgstr "Realtid forespørgsels-oversigt" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Statiske data" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1187,7 +1184,7 @@ msgstr "Total" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:602 msgid "Other" -msgstr "" +msgstr "Andet" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1322 @@ -1201,39 +1198,37 @@ msgstr "," #: js/messages.php:78 msgid "KiB sent since last refresh" -msgstr "" +msgstr "KiB sendt siden forrige visning" #: js/messages.php:79 msgid "KiB received since last refresh" -msgstr "" +msgstr "KiB modtaget siden forrige visning" #: js/messages.php:80 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic (in KiB)" -msgstr "Server valg" +msgstr "Server-trafik (i KiB)" #: js/messages.php:81 msgid "Connections since last refresh" -msgstr "" +msgstr "Forbindelser siden sidste visning" #: js/messages.php:82 server_status.php:794 msgid "Processes" msgstr "Processer" #: js/messages.php:83 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Forbindelser" +msgstr "Forbindelser / Opgaver" #: js/messages.php:84 msgid "Issued queries since last refresh" -msgstr "" +msgstr "Igangsatte forespørgsler siden forrige visning" #: js/messages.php:85 msgid "Issued queries" -msgstr "" +msgstr "Igangsatte forespørgsler" #: js/messages.php:87 server_status.php:402 msgid "Query statistics" @@ -1260,7 +1255,7 @@ msgstr "Felj i udførsel af forespørgsel" #: js/messages.php:97 msgid "Dropping Column" -msgstr "" +msgstr "Sletter kolonne" #: js/messages.php:98 msgid "Adding Primary Key" @@ -1273,16 +1268,14 @@ msgid "OK" msgstr "OK" #: js/messages.php:102 -#, fuzzy #| msgid "Rename database to" msgid "Renaming Databases" -msgstr "Omdøb database til" +msgstr "Omdøber databaser" #: js/messages.php:103 -#, fuzzy #| msgid "Rename database to" msgid "Reload Database" -msgstr "Omdøb database til" +msgstr "Opfrisk database" #: js/messages.php:104 msgid "Copying Database" @@ -1297,28 +1290,24 @@ msgid "Table must have at least one column" msgstr "Tabellen skal have mindst en kolonne" #: js/messages.php:107 -#, fuzzy #| msgid "Create table" msgid "Create Table" msgstr "Opret tabel" #: js/messages.php:112 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Benyt tabeller" +msgstr "Indsæt tabel" #: js/messages.php:113 -#, fuzzy #| msgid "Indexes" msgid "Hide indexes" -msgstr "Indeks" +msgstr "Skjul indekser" #: js/messages.php:114 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Vis gitter" +msgstr "Vis indekser" #: js/messages.php:117 msgid "Searching" @@ -1333,10 +1322,9 @@ msgid "Show search results" msgstr "Vis søgeresultater" #: js/messages.php:120 -#, fuzzy #| msgid "Browse" msgid "Browsing" -msgstr "Vis" +msgstr "Viser" #: js/messages.php:121 msgid "Deleting" @@ -1345,12 +1333,13 @@ msgstr "Sletter" #: js/messages.php:124 msgid "The definition of a stored function must contain a RETURN statement!" msgstr "" +"Ifølge definitionen på en stored function, skal denne indeholde et RETURN-" +"udtryk." #: js/messages.php:125 -#, fuzzy #| msgid "Missing value in the form!" msgid "Value too long in the form!" -msgstr "Ingen værdi i formularen !" +msgstr "Værdien i formularen er for lang!" #: js/messages.php:128 msgid "" @@ -1465,10 +1454,9 @@ msgid ", latest stable version:" msgstr ", seneste stabile version:" #: js/messages.php:169 -#, fuzzy #| msgid "No databases" msgid "up to date" -msgstr "Ingen databaser" +msgstr "up-to-date" #. l10n: Display text for calendar close link #: js/messages.php:187 @@ -1477,7 +1465,6 @@ msgstr "Færdig" #. l10n: Display text for previous month link in calendar #: js/messages.php:189 -#, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Forrige" @@ -1565,7 +1552,6 @@ msgstr "apr" #. l10n: Short month name #: js/messages.php:219 libraries/common.lib.php:1466 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -1608,7 +1594,7 @@ msgstr "dec" #: js/messages.php:236 msgid "Sunday" -msgstr "søndag" +msgstr "Søndag" #: js/messages.php:237 msgid "Monday" @@ -1620,21 +1606,20 @@ msgstr "tirsdag" #: js/messages.php:239 msgid "Wednesday" -msgstr "" +msgstr "Onsdag" #: js/messages.php:240 msgid "Thursday" -msgstr "" +msgstr "Torsdag" #: js/messages.php:241 -#, fuzzy #| msgid "Fri" msgid "Friday" -msgstr "fre" +msgstr "Fredag" #: js/messages.php:242 msgid "Saturday" -msgstr "" +msgstr "Lørdag" #. l10n: Short week day name #: js/messages.php:246 libraries/common.lib.php:1483 @@ -1931,7 +1916,7 @@ msgstr "Sti til tema ikke fundet for tema %s!" #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40 msgid "Theme" -msgstr "" +msgstr "Tema" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." hooks/post-receive -- phpMyAdmin

1 0

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

11 Jul '11

The branch, master has been updated via dacfab623734ca5927693dc9cdabd84c4961420a (commit) via 317b4247e0a16f6964f9cb7d9b7807209fcdb31b (commit) via 83c66096188b0c730bd4d836be5f331b2d32b3b2 (commit) via a3e60aef1592653e57779b7de96021bf57f5c98c (commit) via 9259ad0ab926e21296d782420c4200c419fa84f5 (commit) via d047c9d30a5a83b156b3577a973d08e69d6ee168 (commit) via d8e47df2a3bdb2a1df25f7c6071e08b5aa16bedf (commit) via 9f3c3902d09a2f2db07de1850481634b0d61d2bd (commit) via a9b6a0c44ccb6f03d739efa912e4b3ffd60dbddb (commit) via 74e74cf8a70a04bc222485fd1d6d8e4c6c76bf56 (commit) via cd80d6720e1a80bd6b24c320c140c949ad71eeb6 (commit) via a366e20b2a4fbc830739352906da5f24d1fde413 (commit) via d1ce0548cb05f17722748caf9954e325de497725 (commit) via db703010ce449f7f7202f1c050940aa17179692e (commit) via 5935d35e59204606626f6c257f1cb3859a9e2cd5 (commit) via 582e19230efd07769ef8a815ac90c4c235185cf2 (commit) via eb794337da4ebace6099cab57ae08be64063a6b5 (commit) via f52f9939609936706218cf6fcbc012d8e5481d20 (commit) via ffaf5fdbd69494905475f503e63398af69713d22 (commit) via 0af290b2fbe905b27a662d4f161e67db4a9cc0b1 (commit) via e00f812391f6044013101eb3376dd0fae02cb149 (commit) via 92a816f531aa46852b87d7eda974fafbe8fa5d99 (commit) via 8875ed40029510e9b374a06c1aa4c88cc463dc8c (commit) via d4e820fbf8fca20b4dea6d47fe65227a4bd4c3f4 (commit) via 8c6496fcc4d9a5fe01f9ff3ac4e75e8a3dd316cb (commit) via c27a3ae0f55ebf77abdae82634ad9ddd8a185b3c (commit) via 138e284a95c84aa75058bc6e0a5fd38b02ba4eeb (commit) via 1282f6242aef52faffc57dcfe0084675d1e4db01 (commit) via 660791db531ef11d7879828076d118f5fa5ea047 (commit) via 915d444d78215a9e8a6e56367b77e34896231815 (commit) via 4b57a28ef1ef778071a772833fcfe4cbcbe9f774 (commit) via cad8fecb93b34785c849d403685710ca5cf5c9e7 (commit) via 31b8934c703437ff8ef48e93536cb751660853dd (commit) via c714dc4f9f845d29b23280b7b65f309fc7f09853 (commit) via 81b08e6d9f624b129eb31681c817ff80e78aa44b (commit) via ef7260cc51ba1645480890e90b630d1be66397ac (commit) via 8c97cc5bd48a4027c540fb0ea289a909d662bb87 (commit) via 4ca4d6fd0fa1061008f7c524692c0bb2822259e9 (commit) via d2ee67d626a0dc436579c518b8c5ea5e410d1e99 (commit) via 1c43605edd3bb4564d3cd229414cf3ddb6547cda (commit) via f6b2a00c68e3c2f6f9ce315e084f3c08eb4f00d2 (commit) via 96778a0956c22ff60970d0725c4b9e0ef476ede1 (commit) via da22bed13a263220604906830ea86f3d9923f43d (commit) via f3d742ea22fbadda18bdba35b55223eb8413d29a (commit) via e1d8781ddc12bd30e2dce2a22fd16a900e33c6a3 (commit) via 9cff5afa1e9860a7025e008e0cc63a213ad7a3db (commit) via 2a93566e50a5cacec6fb1a669cea594114c99860 (commit) via cff781af7445aa83cd4ab4b439b024a37a1c7db5 (commit) via 62efb63a976b8d2c4eaf807ac96bf5306db7dec5 (commit) via 659af124fd9e9587cf230d57b8d6ddd7c3fa627b (commit) via ec1022ed5009d8fd73e0aecf8b95faa27a555b28 (commit) via 2f6bb0e17ef468b920d07f5d90b145aa2736e6a1 (commit) via 2f5e9c870a12c378fea7efe0baff613d7141b1b0 (commit) via c8b5fea22307989dc076ecd8a9f3624e7abac535 (commit) via 52cd82ed3acbb28803f2dd125d50e1cd0439f62b (commit) via 309969df4310daad565fc31a14e994545f710557 (commit) via f5dfa97dde8c5ece5ef17c00aba230397028384e (commit) via 60de985484cb038962e20be9f2d08696029cee8b (commit) via c416bdcd276e3f7bc6e48840660b42e351cd0060 (commit) via acb3d82e0700dc7413cb5c3ee9013906d1300ea5 (commit) via 18894ee43c61efc685a67b0b4638536aac7ce114 (commit) via 67762a33339a2e8da2351ad87af3f13819f0e0b1 (commit) via 3a6f8b5e1480e77b21c9af79e7854e96d52b6cf5 (commit) via 21607eb748a555ae114d3eee69dd2e9199c38e4a (commit) via 28abbff50750c3b33427c4e4e03a9c37fae7e0a6 (commit) via 5eace32ef025603af0bf11d88ec4f9b2f23fe919 (commit) via 569d9ecb417df354100600f8635a628930b7659c (commit) via 06cdca48b368947a9b803a3f7d97d43467cf3699 (commit) via f2a0f62db463cecfd17a134d2a03c00d4037a0e5 (commit) via 2d8d932ac2b0a4ed541133cf66ebcd87c8758dbe (commit) via d01e47e8cf03ac56318da3b98d759388456e8205 (commit) via 6ca1aa2dc5d1a9d9ca85b789be599edfd0323a04 (commit) via 5e1f342275b0a10a57ec10f2e437be00c2732861 (commit) from 4b80c81536aa9dee63aff1d2e0197572760b5a72 (commit) - Log ----------------------------------------------------------------- commit dacfab623734ca5927693dc9cdabd84c4961420a Author: mrbendig <mrbendig(a)mrbendig.com> Date: Mon Jul 11 09:26:37 2011 +0200 Translation update done using Pootle. commit 317b4247e0a16f6964f9cb7d9b7807209fcdb31b Author: mrbendig <mrbendig(a)mrbendig.com> Date: Mon Jul 11 09:25:31 2011 +0200 Translation update done using Pootle. commit 83c66096188b0c730bd4d836be5f331b2d32b3b2 Author: mrbendig <mrbendig(a)mrbendig.com> Date: Mon Jul 11 09:25:08 2011 +0200 Translation update done using Pootle. commit a3e60aef1592653e57779b7de96021bf57f5c98c Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:42:48 2011 +0200 Translation update done using Pootle. commit 9259ad0ab926e21296d782420c4200c419fa84f5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:42:39 2011 +0200 Translation update done using Pootle. commit d047c9d30a5a83b156b3577a973d08e69d6ee168 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:39:06 2011 +0200 Translation update done using Pootle. commit d8e47df2a3bdb2a1df25f7c6071e08b5aa16bedf Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:38:39 2011 +0200 Translation update done using Pootle. commit 9f3c3902d09a2f2db07de1850481634b0d61d2bd Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:36:14 2011 +0200 Translation update done using Pootle. commit a9b6a0c44ccb6f03d739efa912e4b3ffd60dbddb Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:36:04 2011 +0200 Translation update done using Pootle. commit 74e74cf8a70a04bc222485fd1d6d8e4c6c76bf56 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:35:52 2011 +0200 Translation update done using Pootle. commit cd80d6720e1a80bd6b24c320c140c949ad71eeb6 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:35:45 2011 +0200 Translation update done using Pootle. commit a366e20b2a4fbc830739352906da5f24d1fde413 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:35:40 2011 +0200 Translation update done using Pootle. commit d1ce0548cb05f17722748caf9954e325de497725 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:35:03 2011 +0200 Translation update done using Pootle. commit db703010ce449f7f7202f1c050940aa17179692e Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:34:52 2011 +0200 Translation update done using Pootle. commit 5935d35e59204606626f6c257f1cb3859a9e2cd5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:34:38 2011 +0200 Translation update done using Pootle. commit 582e19230efd07769ef8a815ac90c4c235185cf2 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:33:48 2011 +0200 Translation update done using Pootle. commit eb794337da4ebace6099cab57ae08be64063a6b5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:33:41 2011 +0200 Translation update done using Pootle. commit f52f9939609936706218cf6fcbc012d8e5481d20 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:33:29 2011 +0200 Translation update done using Pootle. commit ffaf5fdbd69494905475f503e63398af69713d22 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:33:22 2011 +0200 Translation update done using Pootle. commit 0af290b2fbe905b27a662d4f161e67db4a9cc0b1 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:33:08 2011 +0200 Translation update done using Pootle. commit e00f812391f6044013101eb3376dd0fae02cb149 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:31:52 2011 +0200 Translation update done using Pootle. commit 92a816f531aa46852b87d7eda974fafbe8fa5d99 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:30:13 2011 +0200 Translation update done using Pootle. commit 8875ed40029510e9b374a06c1aa4c88cc463dc8c Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:30:07 2011 +0200 Translation update done using Pootle. commit d4e820fbf8fca20b4dea6d47fe65227a4bd4c3f4 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:29:01 2011 +0200 Translation update done using Pootle. commit 8c6496fcc4d9a5fe01f9ff3ac4e75e8a3dd316cb Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:28:32 2011 +0200 Translation update done using Pootle. commit c27a3ae0f55ebf77abdae82634ad9ddd8a185b3c Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:26:07 2011 +0200 Translation update done using Pootle. commit 138e284a95c84aa75058bc6e0a5fd38b02ba4eeb Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:25:36 2011 +0200 Translation update done using Pootle. commit 1282f6242aef52faffc57dcfe0084675d1e4db01 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:25:25 2011 +0200 Translation update done using Pootle. commit 660791db531ef11d7879828076d118f5fa5ea047 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:25:16 2011 +0200 Translation update done using Pootle. commit 915d444d78215a9e8a6e56367b77e34896231815 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:25:07 2011 +0200 Translation update done using Pootle. commit 4b57a28ef1ef778071a772833fcfe4cbcbe9f774 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:24:40 2011 +0200 Translation update done using Pootle. commit cad8fecb93b34785c849d403685710ca5cf5c9e7 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:24:14 2011 +0200 Translation update done using Pootle. commit 31b8934c703437ff8ef48e93536cb751660853dd Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:24:08 2011 +0200 Translation update done using Pootle. commit c714dc4f9f845d29b23280b7b65f309fc7f09853 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:24:03 2011 +0200 Translation update done using Pootle. commit 81b08e6d9f624b129eb31681c817ff80e78aa44b Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:23:54 2011 +0200 Translation update done using Pootle. commit ef7260cc51ba1645480890e90b630d1be66397ac Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:23:46 2011 +0200 Translation update done using Pootle. commit 8c97cc5bd48a4027c540fb0ea289a909d662bb87 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:22:45 2011 +0200 Translation update done using Pootle. commit 4ca4d6fd0fa1061008f7c524692c0bb2822259e9 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:22:32 2011 +0200 Translation update done using Pootle. commit d2ee67d626a0dc436579c518b8c5ea5e410d1e99 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:22:20 2011 +0200 Translation update done using Pootle. commit 1c43605edd3bb4564d3cd229414cf3ddb6547cda Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:22:00 2011 +0200 Translation update done using Pootle. commit f6b2a00c68e3c2f6f9ce315e084f3c08eb4f00d2 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:20:54 2011 +0200 Translation update done using Pootle. commit 96778a0956c22ff60970d0725c4b9e0ef476ede1 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:20:30 2011 +0200 Translation update done using Pootle. commit da22bed13a263220604906830ea86f3d9923f43d Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:19:18 2011 +0200 Translation update done using Pootle. commit f3d742ea22fbadda18bdba35b55223eb8413d29a Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:19:14 2011 +0200 Translation update done using Pootle. commit e1d8781ddc12bd30e2dce2a22fd16a900e33c6a3 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:19:08 2011 +0200 Translation update done using Pootle. commit 9cff5afa1e9860a7025e008e0cc63a213ad7a3db Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:18:32 2011 +0200 Translation update done using Pootle. commit 2a93566e50a5cacec6fb1a669cea594114c99860 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:17:34 2011 +0200 Translation update done using Pootle. commit cff781af7445aa83cd4ab4b439b024a37a1c7db5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:17:29 2011 +0200 Translation update done using Pootle. commit 62efb63a976b8d2c4eaf807ac96bf5306db7dec5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:17:22 2011 +0200 Translation update done using Pootle. commit 659af124fd9e9587cf230d57b8d6ddd7c3fa627b Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:17:13 2011 +0200 Translation update done using Pootle. commit ec1022ed5009d8fd73e0aecf8b95faa27a555b28 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:16:31 2011 +0200 Translation update done using Pootle. commit 2f6bb0e17ef468b920d07f5d90b145aa2736e6a1 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:16:10 2011 +0200 Translation update done using Pootle. commit 2f5e9c870a12c378fea7efe0baff613d7141b1b0 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:15:59 2011 +0200 Translation update done using Pootle. commit c8b5fea22307989dc076ecd8a9f3624e7abac535 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:15:49 2011 +0200 Translation update done using Pootle. commit 52cd82ed3acbb28803f2dd125d50e1cd0439f62b Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:15:30 2011 +0200 Translation update done using Pootle. commit 309969df4310daad565fc31a14e994545f710557 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:15:18 2011 +0200 Translation update done using Pootle. commit f5dfa97dde8c5ece5ef17c00aba230397028384e Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:15:05 2011 +0200 Translation update done using Pootle. commit 60de985484cb038962e20be9f2d08696029cee8b Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:14:59 2011 +0200 Translation update done using Pootle. commit c416bdcd276e3f7bc6e48840660b42e351cd0060 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:14:37 2011 +0200 Translation update done using Pootle. commit acb3d82e0700dc7413cb5c3ee9013906d1300ea5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:14:15 2011 +0200 Translation update done using Pootle. commit 18894ee43c61efc685a67b0b4638536aac7ce114 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:13:12 2011 +0200 Translation update done using Pootle. commit 67762a33339a2e8da2351ad87af3f13819f0e0b1 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:12:32 2011 +0200 Translation update done using Pootle. commit 3a6f8b5e1480e77b21c9af79e7854e96d52b6cf5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:12:24 2011 +0200 Translation update done using Pootle. commit 21607eb748a555ae114d3eee69dd2e9199c38e4a Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:11:43 2011 +0200 Translation update done using Pootle. commit 28abbff50750c3b33427c4e4e03a9c37fae7e0a6 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:11:17 2011 +0200 Translation update done using Pootle. commit 5eace32ef025603af0bf11d88ec4f9b2f23fe919 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:11:08 2011 +0200 Translation update done using Pootle. commit 569d9ecb417df354100600f8635a628930b7659c Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:10:46 2011 +0200 Translation update done using Pootle. commit 06cdca48b368947a9b803a3f7d97d43467cf3699 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:09:42 2011 +0200 Translation update done using Pootle. commit f2a0f62db463cecfd17a134d2a03c00d4037a0e5 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:09:34 2011 +0200 Translation update done using Pootle. commit 2d8d932ac2b0a4ed541133cf66ebcd87c8758dbe Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:07:47 2011 +0200 Translation update done using Pootle. commit d01e47e8cf03ac56318da3b98d759388456e8205 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:07:34 2011 +0200 Translation update done using Pootle. commit 6ca1aa2dc5d1a9d9ca85b789be599edfd0323a04 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:07:05 2011 +0200 Translation update done using Pootle. commit 5e1f342275b0a10a57ec10f2e437be00c2732861 Author: erickdeoliveiraleal <erickdeoliveiraleal(a)gmail.com> Date: Mon Jul 11 04:06:43 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/de.po | 8 ++-- po/pt_BR.po | 174 +++++++++++++++++++++++++++-------------------------------- 2 files changed, 84 insertions(+), 98 deletions(-) diff --git a/po/de.po b/po/de.po index bb8bf93..c75838e 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-10 04:23+0200\n" +"PO-Revision-Date: 2011-07-11 09:26+0200\n" "Last-Translator: <mrbendig(a)mrbendig.com>\n" "Language-Team: german <de(a)li.org>\n" "Language: de\n" @@ -4025,7 +4025,7 @@ msgstr "" #: libraries/config/messages.inc.php:393 msgid "SQL query history table" -msgstr "History Table" +msgstr "SQL Abfragehistorien Tabelle" #: libraries/config/messages.inc.php:394 msgid "Hostname where MySQL server is running" @@ -4180,7 +4180,7 @@ msgstr "" #: libraries/config/messages.inc.php:423 msgid "PDF schema: table coordinates" -msgstr "Table Coords Table" +msgstr "PDF Schema: Tabellen Koordinatien" #: libraries/config/messages.inc.php:424 msgid "" @@ -5855,7 +5855,7 @@ msgid "" "buffers of this size). The default is 1MB." msgstr "" "Die Größe des globalen Transaktionslogpuffers (es werden 2 Puffer dieser " -"Größe angelegt. Die Voreinstellung ist 1 MB." +"Größe angelegt). Die Voreinstellung ist 1 MB." #: libraries/engines/pbxt.lib.php:47 msgid "Checkpoint frequency" diff --git a/po/pt_BR.po b/po/pt_BR.po index 62f27bb..0aaa02f 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-05 15:06+0200\n" -"Last-Translator: <vitorpc.18(a)gmail.com>\n" +"PO-Revision-Date: 2011-07-11 04:42+0200\n" +"Last-Translator: <erickdeoliveiraleal(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -247,6 +247,7 @@ msgstr "Ver o esquema do Banco de Dados" #: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48 #: export.php:371 navigation.php:299 +#, fuzzy msgid "No tables found in database." msgstr "Nenhuma tabela encontrada no Banco de Dados" @@ -595,6 +596,10 @@ msgid "" "handling multi queries. The execution of some stored routines may fail!</" "b> Please use the improved 'mysqli' extension to avoid any problems." msgstr "" +"Você está usando extensão 'mysql' obsoleta do PHP, que não é capaz de lidar " +"com multi consultas. <b.>A execução de algumas rotinas de armazenamento " +"podem falhar! Por favor, use a extensão melhorada 'mysqli' para evitar " +"quaisquer problemas." #: db_search.php:30 libraries/auth/config.auth.lib.php:83 #: libraries/auth/config.auth.lib.php:102 @@ -1154,7 +1159,7 @@ msgstr "Gráfico de tráfego em tempo real" #: js/messages.php:65 server_status.php:423 msgid "Live conn./process chart" -msgstr "" +msgstr "Quadro conn./process em tempo real" #: js/messages.php:66 server_status.php:445 msgid "Live query chart" @@ -1321,6 +1326,7 @@ msgstr "Apagando %s" #: js/messages.php:124 msgid "The definition of a stored function must contain a RETURN statement!" msgstr "" +"A definição de uma função armazenada deve conter uma instrução de RETURN!" #: js/messages.php:125 #, fuzzy @@ -1920,7 +1926,7 @@ msgstr "Encontrado caminho inválido para o tema %s!" #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40 msgid "Theme" -msgstr "" +msgstr "Tema" #: libraries/auth/config.auth.lib.php:76 msgid "Cannot connect: invalid settings." @@ -1971,7 +1977,7 @@ msgstr "Você pode digitar a url/IP e a porta separados por um espaço." #: libraries/auth/cookie.auth.lib.php:211 msgid "Server:" -msgstr "Servidor" +msgstr "Servidor:" #: libraries/auth/cookie.auth.lib.php:216 msgid "Username:" @@ -2015,7 +2021,7 @@ msgstr "Usuário ou senha incorreta. Acesso negado." #: libraries/auth/signon.auth.lib.php:87 msgid "Can not find signon authentication script:" -msgstr "Não é possível encontrar o script de autenticação de logon" +msgstr "Não é possível encontrar o script de autenticação de logon:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2132,6 +2138,8 @@ msgid "" "This usually means there is a syntax error in it, please check any errors " "shown below." msgstr "" +"Isso geralmente significa que há um erro de sintaxe, por favor cheque " +"qualquer erro mostrado abaixo." #: libraries/common.inc.php:595 #, fuzzy, php-format @@ -2143,7 +2151,9 @@ msgstr "Não foi possível carregar configuração padrão de: \"%1$s\"" msgid "" "The <tt>$cfg['PmaAbsoluteUri']</tt> directive MUST be set in your " "configuration file!" -msgstr "A variável <tt>$cfg['PmaAbsoluteUri']</tt> deve ser setada" +msgstr "" +"A diretriz<tt>$cfg['PmaAbsoluteUri']</tt> deve ser estabelecida no seu " +"arquivo de configuração!" #: libraries/common.inc.php:630 #, fuzzy, php-format @@ -2212,7 +2222,7 @@ msgstr "consulta SQL" #: libraries/common.lib.php:1031 msgid "Failed to connect to SQL validator!" -msgstr "Falha ao conectar ao validador SQL" +msgstr "Falha ao conectar ao validador SQL!" #: libraries/common.lib.php:1072 libraries/config/messages.inc.php:474 msgid "Explain SQL" @@ -2366,8 +2376,7 @@ msgstr "Selecionar a partir do diretório de upload do servidor %s:" #: libraries/common.lib.php:2814 libraries/sql_query_form.lib.php:447 #: tbl_change.php:887 msgid "The directory you set for upload work cannot be reached" -msgstr "" -"O diretório que você especificou para subir arquivos não foi encontrado." +msgstr "O diretório que você especificou para subir arquivos não foi encontrado" #: libraries/common.lib.php:2822 msgid "There are no files to upload" @@ -2375,7 +2384,7 @@ msgstr "Não existem arquivos para fazer upload" #: libraries/common.lib.php:2849 libraries/common.lib.php:2850 msgid "Execute" -msgstr "" +msgstr "Executar" #: libraries/config.values.php:45 libraries/config.values.php:47 #: libraries/config.values.php:51 @@ -2434,7 +2443,7 @@ msgstr "Personalizada - exibir todas as opções possíveis para configurar" #: libraries/config.values.php:102 msgid "Custom - like above, but without the quick/custom choice" -msgstr "Personalizada - como acima, mas sem a escolha rápida/personalizada." +msgstr "Personalizada - como acima, mas sem a escolha rápida/personalizada" #: libraries/config.values.php:120 #, fuzzy @@ -2454,7 +2463,7 @@ msgstr "ambos acima" #: libraries/config.values.php:123 msgid "neither of the above" -msgstr "nenhuma das acima." +msgstr "nenhuma das acima" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:412 @@ -2587,33 +2596,35 @@ msgstr "Permitir elaboração de terceiros" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "Exibir link "Apagar banco de dados" para usuários normais" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Frase secreta utilizada para encriptar cookies na autenticação por " +"[kbd]cookie[/kbd]" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "Segredo Blowfish" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "Destacar linhas selecionadas" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "Marcador de linha" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "Destacar linha apontada pelo cursor do mouse" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Destacar apontador" #: libraries/config/messages.inc.php:30 msgid "" @@ -2623,7 +2634,7 @@ msgstr "" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -2631,14 +2642,17 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Define que tipo de controles de edição devem ser utilizados pelas colunas " +"CHAR e VARCHAR; [kbd]input[/kbd] - permite limitar o tamanho do campo, " +"[kbd]textarea[/kbd] - permite quebra de linhas em colunas" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "Edição de colunas CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "Número de colunas para caixas de texto CHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" @@ -2962,10 +2976,9 @@ msgid "SQL compatibility mode" msgstr "Modo de compatibilidade SQL" #: libraries/config/messages.inc.php:122 libraries/export/sql.php:176 -#, fuzzy #| msgid "<code>@TABLE@</code>" msgid "<code>CREATE TABLE</code> options:" -msgstr "<code>@TABLE@</code>" +msgstr "<code>CRIAR TABELA</code> opções:" #: libraries/config/messages.inc.php:123 msgid "Creation/Update/Check dates" @@ -3174,10 +3187,9 @@ msgid "Settings that didn't fit enywhere else" msgstr "" #: libraries/config/messages.inc.php:192 -#, fuzzy #| msgid "Page number:" msgid "Page titles" -msgstr "Numero da página:" +msgstr "Títulos das páginas" #: libraries/config/messages.inc.php:193 msgid "" @@ -3213,14 +3225,12 @@ msgid "Basic settings" msgstr "Configurações básicas" #: libraries/config/messages.inc.php:199 -#, fuzzy msgid "Authentication" -msgstr "Autenticando..." +msgstr "Autenticação" #: libraries/config/messages.inc.php:200 -#, fuzzy msgid "Authentication settings" -msgstr "Autenticando..." +msgstr "Configurações de autenticação" #: libraries/config/messages.inc.php:201 msgid "Server configuration" @@ -3477,10 +3487,9 @@ msgid "Display servers selection" msgstr "" #: libraries/config/messages.inc.php:272 -#, fuzzy #| msgid "The number of tables that are open." msgid "Minimum number of tables to display the table filter box" -msgstr "O número de tabelas que estão abertas." +msgstr "Número mínimo de tabelas para mostrar a caixa de filtro de tabelas" #: libraries/config/messages.inc.php:273 msgid "String that separates databases into different tree levels" @@ -3897,9 +3906,8 @@ msgid "SweKey config file" msgstr "" #: libraries/config/messages.inc.php:369 -#, fuzzy msgid "Authentication method to use" -msgstr "Autenticando..." +msgstr "Método de autenticação para usar" #: libraries/config/messages.inc.php:370 setup/frames/index.inc.php:126 msgid "Authentication type" @@ -4701,10 +4709,9 @@ msgid "Events" msgstr "Eventos" #: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no events to display." -msgstr "Não existem arquivos para fazer upload" +msgstr "Não existem eventos para serem mostrados" #: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:661 #: libraries/db_routines.lib.php:807 libraries/db_routines.lib.php:1156 @@ -4770,10 +4777,9 @@ msgid "Triggers" msgstr "Gatilhos" #: libraries/db_routines.lib.php:630 -#, fuzzy #| msgid "Details..." msgid "Details" -msgstr "Detalhes..." +msgstr "Detalhes" #: libraries/db_routines.lib.php:633 #, fuzzy @@ -4912,10 +4918,9 @@ msgid "You must provide a routine definition." msgstr "" #: libraries/db_routines.lib.php:1151 -#, fuzzy #| msgid "There are no files to upload" msgid "There are no routines to display." -msgstr "Não existem arquivos para fazer upload" +msgstr "Não existem rotinas para mostrar." #: libraries/db_routines.lib.php:1192 #, fuzzy @@ -4924,10 +4929,9 @@ msgid "Add routine" msgstr "Adicionar índice" #: libraries/db_routines.lib.php:1195 -#, fuzzy #| msgid "You don't have sufficient privileges to be here right now!" msgid "You do not have the necessary privileges to create a new routine" -msgstr "Você não tem direitos suficientes para estar aqui agora!" +msgstr "Você não tem direitos suficientes para criar uma nova rotina" #: libraries/db_structure.lib.php:43 libraries/display_tbl.lib.php:2084 msgid "" @@ -5012,10 +5016,9 @@ msgid "Could not load export plugins, please check your installation!" msgstr "Não pode carregar exportação dos plugins, verifique sua instalação!" #: libraries/display_export.lib.php:80 -#, fuzzy #| msgid "Allows locking tables for the current thread." msgid "Exporting databases from the current server" -msgstr "Permitir bloquear tabelas para a processo atual." +msgstr "Exportar bancos de dados do servidor atual" #: libraries/display_export.lib.php:82 #, fuzzy, php-format @@ -5033,7 +5036,7 @@ msgstr "Criar nova tabela no Banco de Dados %s" #, fuzzy #| msgid "Export type" msgid "Export Method:" -msgstr "Tipo de exportação" +msgstr "Método de exportação:" #: libraries/display_export.lib.php:106 msgid "Quick - display only the minimal options" @@ -5061,10 +5064,9 @@ msgid "Dump some row(s)" msgstr "" #: libraries/display_export.lib.php:152 -#, fuzzy #| msgid "Number of fields" msgid "Number of rows:" -msgstr "Número de arquivos" +msgstr "Número de linhas:" #: libraries/display_export.lib.php:155 msgid "Row to begin at:" @@ -5091,10 +5093,9 @@ msgid "Save output to a file" msgstr "Enviado" #: libraries/display_export.lib.php:220 -#, fuzzy #| msgid "File name template" msgid "File name template:" -msgstr "Nome do arquivo do modelo" +msgstr "Nome do arquivo do modelo:" #: libraries/display_export.lib.php:222 msgid "@SERVER@ will become the server name" @@ -5130,13 +5131,12 @@ msgstr "" #: libraries/display_export.lib.php:274 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:463 msgid "Character set of the file:" -msgstr "Conjunto de caracteres do arquivo" +msgstr "Conjunto de caracteres do arquivo:" #: libraries/display_export.lib.php:304 -#, fuzzy #| msgid "Compression" msgid "Compression:" -msgstr "Compressão" +msgstr "Compressão:" #: libraries/display_export.lib.php:306 libraries/display_tbl.lib.php:564 #: libraries/export/sql.php:1058 libraries/tbl_properties.inc.php:562 @@ -5170,16 +5170,14 @@ msgstr "Enviado" #: libraries/display_export.lib.php:326 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:38 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Formato" +msgstr "Formato:" #: libraries/display_export.lib.php:331 -#, fuzzy #| msgid "Transformation options" msgid "Format-specific options:" -msgstr "Opções de transformação" +msgstr "Opções de formato especifico:" #: libraries/display_export.lib.php:332 msgid "" @@ -5188,9 +5186,8 @@ msgid "" msgstr "" #: libraries/display_export.lib.php:340 libraries/display_import.lib.php:260 -#, fuzzy msgid "Encoding Conversion:" -msgstr "Versão do cliente MySQL" +msgstr "Codificação de conversão:" #: libraries/display_import.lib.php:66 msgid "" @@ -5226,10 +5223,9 @@ msgid "Importing into the table \"%s\"" msgstr "Sem bases" #: libraries/display_import.lib.php:139 -#, fuzzy #| msgid "File to import" msgid "File to Import:" -msgstr "Arquivo para importar" +msgstr "Arquivo para importar:" #: libraries/display_import.lib.php:156 #, php-format @@ -5247,10 +5243,9 @@ msgid "File uploads are not allowed on this server." msgstr "Não é permitido subir arquivos neste servidor." #: libraries/display_import.lib.php:208 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Importação parcial" +msgstr "Importação parcial:" #: libraries/display_import.lib.php:214 #, php-format @@ -5261,7 +5256,6 @@ msgstr "" "continuar na posição %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 " @@ -5276,10 +5270,9 @@ msgstr "" "grandes, entretanto isso pode interromper as transações." #: libraries/display_import.lib.php:228 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of rows to skip, starting from the first row:" -msgstr "Número de registros (consultas) ignoradas no início" +msgstr "Número de registros para pular, iniciando da primeira linha:" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" @@ -5475,13 +5468,13 @@ msgstr "" #, fuzzy, php-format #| msgid "No valid image path for theme %s found!" msgid "No trigger with name %s found" -msgstr "Encontrado caminho inválido para imagens para o tema %s!" +msgstr "Nenhum trigger com o nome %s encontrado" #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66 #, fuzzy #| msgid "There are no files to upload" msgid "There are no triggers to display." -msgstr "Não existem arquivos para fazer upload" +msgstr "Não existem triggers para mostrar" #: libraries/display_triggers.inc.php:77 server_status.php:800 sql.php:943 msgid "Time" @@ -5916,47 +5909,42 @@ msgid "The PrimeBase Media Streaming (PBMS) home page" msgstr "" #: libraries/export/csv.php:24 libraries/import/csv.php:28 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Linhas terminadas por" +msgstr "Colunas separadas com:" #: libraries/export/csv.php:25 libraries/import/csv.php:29 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "Campos delimitados por" +msgstr "Colunas delimitadas por:" #: libraries/export/csv.php:26 libraries/import/csv.php:30 #, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped with:" -msgstr "Campos contornados por" +msgstr "Campos pulados por:" #: libraries/export/csv.php:27 libraries/import/csv.php:31 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Linhas terminadas por" +msgstr "Linhas terminadas com:" #: libraries/export/csv.php:28 libraries/export/excel.php:23 #: libraries/export/htmlword.php:29 libraries/export/latex.php:80 #: libraries/export/ods.php:24 libraries/export/odt.php:60 #: libraries/export/xls.php:24 libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" -msgstr "Substituir NULL por" +msgstr "Substituir NULL com:" #: libraries/export/csv.php:29 libraries/export/excel.php:24 msgid "Remove carriage return/line feed characters within columns" msgstr "" #: libraries/export/excel.php:33 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" -msgstr "Edição do Excel" +msgstr "Edição do Excel:" #: libraries/export/htmlword.php:28 libraries/export/latex.php:70 #: libraries/export/odt.php:56 libraries/export/sql.php:208 @@ -6062,10 +6050,9 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Gerado um relatório contendo dados da tabela simples)" #: libraries/export/pdf.php:25 -#, fuzzy #| msgid "Report title" msgid "Report title:" -msgstr "Título do Relatório" +msgstr "Título do Relatório:" #: libraries/export/php_array.php:18 msgid "PHP array" @@ -6081,7 +6068,9 @@ msgstr "" #, fuzzy #| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Adicionar comentário pessoal no cabeçalho (\\n quebra linhas)" +msgstr "" +"Adicionar comentário pessoal no cabeçalho (\n" +" quebra linhas)" #: libraries/export/sql.php:48 msgid "" @@ -6102,10 +6091,9 @@ msgid "Add %s statement" msgstr "Comandos" #: libraries/export/sql.php:145 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Comandos" +msgstr "Adicionar instruções:" #: libraries/export/sql.php:197 msgid "" @@ -6348,7 +6336,6 @@ msgid "Import currencies (ex. $5.00 to 5.00)" msgstr "" #: libraries/import/sql.php:33 -#, fuzzy #| msgid "SQL compatibility mode" msgid "SQL compatibility mode:" msgstr "Modo de compatibilidade SQL" @@ -6411,7 +6398,7 @@ msgstr "Conjunto de caracteres" #: libraries/mysql_charsets.lib.php:198 libraries/mysql_charsets.lib.php:399 #: tbl_change.php:556 msgid "Binary" -msgstr " Binário " +msgstr " Binário" #: libraries/mysql_charsets.lib.php:210 msgid "Bulgarian" @@ -6850,7 +6837,6 @@ msgid "Create a page" msgstr "Criar uma nova página" #: libraries/schema/User_Schema.class.php:95 -#, fuzzy #| msgid "Page number:" msgid "Page name" msgstr "Numero da página:" @@ -6907,7 +6893,7 @@ msgstr "Mostrar dimensão das tabelas" #: libraries/schema/User_Schema.class.php:380 msgid "Display all tables with the same width" -msgstr "mostrar todas as tabelas com o mesmo tamanho?" +msgstr "Mostrar todas as tabelas com o mesmo tamanho" #: libraries/schema/User_Schema.class.php:385 msgid "Only show keys" @@ -7272,7 +7258,6 @@ msgid "+ Add a value" msgstr "+ Adicionar um valor" #: libraries/transformations/application_octetstream__download.inc.php:9 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -7284,10 +7269,11 @@ msgid "" "of a column which contains the filename. If you use the second option, you " "need to set the first option to the empty string." msgstr "" -"Mostrar o link para baixar os dados binários do campo. Primeira opção é o " -"nome do arquivo binário. Segunda opção é um possível nome de campo de uma " -"linha da tabela que contém o nome do arquivo. Se você usar a segunda opção " -"precisa colocar na primeira opção uma string em branco" +"Mostrar um link para baixar os dados binários da coluna. Você pode usar a " +"primeira opção para especificar o nome do arquivo, ou usar a segunda opção " +"como o nome de uma coluna que contém o nome do arquivo. Se você usar a " +"segunda opção, você precisará primeiro de configurar a primeira opção para a " +"string vazia." #: libraries/transformations/application_octetstream__hex.inc.php:9 msgid "" @@ -7304,8 +7290,8 @@ msgid "" "Displays a clickable thumbnail. The options are the maximum width and height " "in pixels. The original aspect ratio is preserved." msgstr "" -"Mostrar uma miniatura clicável; opções: largura,altura em pixels (mantém a " -"proporção original)" +"Mostrar uma miniatura clicável; As opções são a largura e altura máxima em " +"pixels." #: libraries/transformations/image_jpeg__link.inc.php:9 msgid "Displays a link to download this image." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-7903-g4b80c81
by Michal Čihař 10 Jul '11

10 Jul '11

The branch, master has been updated via 4b80c81536aa9dee63aff1d2e0197572760b5a72 (commit) via ed88c4a7b68c8efd764a364d1a9579aa762ebdaa (commit) from d64e4ea58daf52fbc81ddc12262647ec0056861c (commit) - Log ----------------------------------------------------------------- commit 4b80c81536aa9dee63aff1d2e0197572760b5a72 Merge: d64e4ea58daf52fbc81ddc12262647ec0056861c ed88c4a7b68c8efd764a364d1a9579aa762ebdaa Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jul 10 22:47:34 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index e61c146..371aec2 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -253,7 +253,13 @@ function PMA_getPHPDocLink($target) { */ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') { - $message = sprintf(__('The %s extension is missing. Please check your PHP configuration.'), + /* Gettext does not have to be loaded yet here */ + if (function_exists('__')) { + $message = __('The %s extension is missing. Please check your PHP configuration.'); + } else { + $message = 'The %s extension is missing. Please check your PHP configuration.'; + } + $message = sprintf($message, '[a@' . PMA_getPHPDocLink('book.' . $extension . '.php') . '@Documentation][em]' . $extension . '[/em][/a]'); if ($extra != '') { $message .= ' ' . $extra; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-25-ged88c4a
by Michal Čihař 10 Jul '11

10 Jul '11

The branch, QA_3_4 has been updated via ed88c4a7b68c8efd764a364d1a9579aa762ebdaa (commit) from 58d25ddcb8a036743e32879c9320dcd802626082 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/core.lib.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 1350247..80c1f12 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -275,7 +275,13 @@ function PMA_getPHPDocLink($target) { */ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') { - $message = sprintf(__('The %s extension is missing. Please check your PHP configuration.'), + /* Gettext does not have to be loaded yet here */ + if (function_exists('__')) { + $message = __('The %s extension is missing. Please check your PHP configuration.'); + } else { + $message = 'The %s extension is missing. Please check your PHP configuration.'; + } + $message = sprintf($message, '[a@' . PMA_getPHPDocLink('book.' . $extension . '.php') . '@Documentation][em]' . $extension . '[/em][/a]'); if ($extra != '') { $message .= ' ' . $extra; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-7901-gd64e4ea
by Michal Čihař 10 Jul '11

10 Jul '11

The branch, master has been updated via d64e4ea58daf52fbc81ddc12262647ec0056861c (commit) via 56f68a55ca4b33eba352190ef60657d857618b97 (commit) via c36e6a7a6bcf9b5267e13e545b2902a147fc9529 (commit) via 9543bb136bc52d2c75e48fc3d2ad8a8aace94e71 (commit) via f2f5bd4bba21e86602cc872c369d8e2c0b9601e7 (commit) via f94b33e47aedd69828fd5d03cd44ac6b6786a511 (commit) via 58e725f088704c9042b4ea04c564def9bb044b1d (commit) via fe731ea3b0afe0efbba04259aa2b1623f44e771b (commit) via c7d2fa039c9b884a7c7169cb97118a2327734035 (commit) via 6d39b71ed68cf507780f4096d89a979800e169de (commit) via b86a2c40b75ac7cc3b3be23a230e2fa5287243e8 (commit) via c55cba1a8f1b48e1af84bf7a32fe37cb9a787af9 (commit) via 93d878df1b4781b8dca99e13ef687104d68a767b (commit) via b05332a856f4ff4dc36c4cdaaf27a18525fe3984 (commit) via a73674bb6e6e6d29a0c0a1386d198c6f74c3f0bd (commit) via f13eae0228203240f16c9fe1b4c69a4ee26eb7a7 (commit) via 492fb1c21ac9d89042640a95f4cf6e77d4985b4b (commit) via a16920c2a095c7b8a1ee59f01ded26d5bd74a213 (commit) via 2e15a0b0fcaa1ff7e30a1e65a4b1e28828a9c076 (commit) via acd92b47170481152c8676d3e4b9e7e9ea33528f (commit) via 2b029e996f23ae4e2dd1cbf2f6553677b2e4191e (commit) via 2b6612aeff0eb16aaea360bfca706379698a0981 (commit) from b4cd34155024403bb430c259a2b4a71cb80a385b (commit) - Log ----------------------------------------------------------------- commit d64e4ea58daf52fbc81ddc12262647ec0056861c Merge: b4cd34155024403bb430c259a2b4a71cb80a385b 56f68a55ca4b33eba352190ef60657d857618b97 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Jul 10 22:16:21 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 56f68a55ca4b33eba352190ef60657d857618b97 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:45:12 2011 +0200 Translation update done using Pootle. commit c36e6a7a6bcf9b5267e13e545b2902a147fc9529 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:44:58 2011 +0200 Translation update done using Pootle. commit 9543bb136bc52d2c75e48fc3d2ad8a8aace94e71 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:44:33 2011 +0200 Translation update done using Pootle. commit f2f5bd4bba21e86602cc872c369d8e2c0b9601e7 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:44:13 2011 +0200 Translation update done using Pootle. commit f94b33e47aedd69828fd5d03cd44ac6b6786a511 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:44:09 2011 +0200 Translation update done using Pootle. commit 58e725f088704c9042b4ea04c564def9bb044b1d Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:43:39 2011 +0200 Translation update done using Pootle. commit fe731ea3b0afe0efbba04259aa2b1623f44e771b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:43:28 2011 +0200 Translation update done using Pootle. commit c7d2fa039c9b884a7c7169cb97118a2327734035 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:43:17 2011 +0200 Translation update done using Pootle. commit 6d39b71ed68cf507780f4096d89a979800e169de Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:40:44 2011 +0200 Translation update done using Pootle. commit b86a2c40b75ac7cc3b3be23a230e2fa5287243e8 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:40:16 2011 +0200 Translation update done using Pootle. commit c55cba1a8f1b48e1af84bf7a32fe37cb9a787af9 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:39:21 2011 +0200 Translation update done using Pootle. commit 93d878df1b4781b8dca99e13ef687104d68a767b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:39:02 2011 +0200 Translation update done using Pootle. commit b05332a856f4ff4dc36c4cdaaf27a18525fe3984 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:37:38 2011 +0200 Translation update done using Pootle. commit a73674bb6e6e6d29a0c0a1386d198c6f74c3f0bd Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:37:25 2011 +0200 Translation update done using Pootle. commit f13eae0228203240f16c9fe1b4c69a4ee26eb7a7 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:36:56 2011 +0200 Translation update done using Pootle. commit 492fb1c21ac9d89042640a95f4cf6e77d4985b4b Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:36:25 2011 +0200 Translation update done using Pootle. commit a16920c2a095c7b8a1ee59f01ded26d5bd74a213 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:34:36 2011 +0200 Translation update done using Pootle. commit 2e15a0b0fcaa1ff7e30a1e65a4b1e28828a9c076 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:34:16 2011 +0200 Translation update done using Pootle. commit acd92b47170481152c8676d3e4b9e7e9ea33528f Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:33:14 2011 +0200 Translation update done using Pootle. commit 2b029e996f23ae4e2dd1cbf2f6553677b2e4191e Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:33:03 2011 +0200 Translation update done using Pootle. commit 2b6612aeff0eb16aaea360bfca706379698a0981 Author: fulup.jakez <fulup.jakez(a)ofis-bzh.org> Date: Sun Jul 10 19:32:52 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/br.po | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/po/br.po b/po/br.po index 3d9425d..6d92660 100644 --- a/po/br.po +++ b/po/br.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-07 15:16+0200\n" -"PO-Revision-Date: 2011-07-09 15:58+0200\n" +"PO-Revision-Date: 2011-07-10 19:45+0200\n" "Last-Translator: <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "Language: br\n" @@ -2645,25 +2645,30 @@ msgid "" "Compress gzip/bzip2 exports on the fly without the need for much memory; if " "you encounter problems with created gzip/bzip2 files disable this feature" msgstr "" +"Gwaskañ a ra an ezporzhiadennoù gzip/bzip2 war ar prim hep sunañ nemeur a " +"vemor; Mar bez kudennoù gant ar restroù gzip/bzip2 krouet, diweredekait an " +"dibarzh." #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" -msgstr "" +msgstr "Gwaskañ war ar prim" #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:165 msgid "Configuration file" -msgstr "" +msgstr "Restr gefluniañ" #: libraries/config/messages.inc.php:42 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"Ur gemennadenn ("Ha sur oc'h...") a zlefe dont war wel pa vezer " +"war-nes koll roadennoù." #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" -msgstr "" +msgstr "Kadarnaat ar rekedoù diverkañ DROP" #: libraries/config/messages.inc.php:44 msgid "Debug SQL" @@ -2738,61 +2743,65 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Diweredekaat an oberiadennoù trezalc'h a-vras, evel gwellekaat pe kempenn " +"taolennoù diuzet un diaz roadennoù." #: libraries/config/messages.inc.php:61 msgid "Disable multi table maintenance" -msgstr "" +msgstr "Diweredekaat trezalc'h an taolennoù lies." #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Aozañ ar rekedoù SQL en ur prenestr difoupañ" #: libraries/config/messages.inc.php:63 msgid "Edit in window" -msgstr "" +msgstr "Aozañ en ur prenestr" #: libraries/config/messages.inc.php:64 msgid "Display errors" -msgstr "" +msgstr "Diskouez ar fazioù" #: libraries/config/messages.inc.php:65 msgid "Gather errors" -msgstr "" +msgstr "Dastum ar fazioù" #: libraries/config/messages.inc.php:66 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "Diskouez an arlunioù evit ar c'hemennoù diwall, faziañ ha titouriñ" #: libraries/config/messages.inc.php:67 msgid "Iconic errors" -msgstr "" +msgstr "Arlunioù evit ar fazioù" #: libraries/config/messages.inc.php:68 msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" msgstr "" +"Niver a eilennoù lakaet evit seveniñ ar skriptoù ([kbd]0[/kbd] a dalvez hep " +"bevenn)" #: libraries/config/messages.inc.php:69 msgid "Maximum execution time" -msgstr "" +msgstr "Pad seveniñ hirañ" #: libraries/config/messages.inc.php:70 prefs_manage.php:299 msgid "Save as file" -msgstr "" +msgstr "Enrollañ evel restr" #: libraries/config/messages.inc.php:71 libraries/config/messages.inc.php:239 msgid "Character set of the file" -msgstr "" +msgstr "Strobad arouezennoù ar restr" #: libraries/config/messages.inc.php:72 libraries/config/messages.inc.php:88 #: tbl_gis_visualization.php:210 tbl_printview.php:373 tbl_structure.php:870 msgid "Format" -msgstr "" +msgstr "Furmad" #: libraries/config/messages.inc.php:73 msgid "Compression" -msgstr "" +msgstr "Gwaskadur" #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:81 #: libraries/config/messages.inc.php:89 libraries/config/messages.inc.php:93 @@ -2804,13 +2813,13 @@ msgstr "" #: libraries/export/odt.php:58 libraries/export/texytext.php:28 #: libraries/export/xls.php:25 libraries/export/xlsx.php:25 msgid "Put columns names in the first row" -msgstr "" +msgstr "Diskouez anvioù ar bannoù diouzhtu el linenn gentañ" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:241 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:76 #: libraries/import/ldi.php:42 msgid "Columns enclosed by" -msgstr "" +msgstr "Bannoù gronnet gant" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:242 #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-7879-gb4cd341
by Marc Delisle 10 Jul '11

10 Jul '11

The branch, master has been updated via b4cd34155024403bb430c259a2b4a71cb80a385b (commit) via 900f5c33687def24bcb9ffaa7e834d925058bcbd (commit) via 673ed34d94b549d0c316ed880c32d644c6a379eb (commit) via ee2653639a7b73ec329cebeb8185a8bbd86c90f6 (commit) via 416f3e5639bc8664781d60d988640c1d15b40fcf (commit) via fd9692218e4fa8d936ffd12ed63f4f74fbcb1b83 (commit) via 19bd37401cde8456aca67db1bd5bcabb415fab53 (commit) via 0750275cc2dd5ae36fa1db0afac5815340a5330d (commit) via 8db8671bfdd7a3d8862203189f13294ab6c8dcb6 (commit) via 8a6fc88a8cfb6858326e9ca1d9296d20000f43ac (commit) via 1e8cbeceb957874f4670ea06a4acb57421db4400 (commit) from 4ae5cb079944786b0d57fccda045e9ac72dc9fab (commit) - Log ----------------------------------------------------------------- commit b4cd34155024403bb430c259a2b4a71cb80a385b Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 10 16:14:35 2011 -0400 ChangeLog entry for new feature commit 900f5c33687def24bcb9ffaa7e834d925058bcbd Merge: 4ae5cb079944786b0d57fccda045e9ac72dc9fab 673ed34d94b549d0c316ed880c32d644c6a379eb Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jul 10 16:09:13 2011 -0400 Merge commit '673ed34d94b549d0c316ed880c32d644c6a379eb' commit 673ed34d94b549d0c316ed880c32d644c6a379eb Merge: ee2653639a7b73ec329cebeb8185a8bbd86c90f6 99c1692b077403fceba39831ce2b559248d1a2ba Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 10 15:24:09 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit ee2653639a7b73ec329cebeb8185a8bbd86c90f6 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 10 15:23:20 2011 +0530 Fixed bugs in enum editor commit 416f3e5639bc8664781d60d988640c1d15b40fcf Merge: fd9692218e4fa8d936ffd12ed63f4f74fbcb1b83 65c8f659e0adc68e698d9d9be13a1092cb716d7a Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 9 07:14:44 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit fd9692218e4fa8d936ffd12ed63f4f74fbcb1b83 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 9 07:14:13 2011 +0530 Fixed the issue adding time picker to insert dialog commit 19bd37401cde8456aca67db1bd5bcabb415fab53 Merge: 0750275cc2dd5ae36fa1db0afac5815340a5330d 5ce96bccbe217ae0e2c52cdb6624eabf8fc2f6af Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 9 00:15:25 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 0750275cc2dd5ae36fa1db0afac5815340a5330d Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jul 9 00:14:55 2011 +0530 Added single column change option in table structure commit 8db8671bfdd7a3d8862203189f13294ab6c8dcb6 Merge: 8a6fc88a8cfb6858326e9ca1d9296d20000f43ac 909c8ceb49b94f1a81eef8fa267fa457e54170f4 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 8 21:58:04 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 8a6fc88a8cfb6858326e9ca1d9296d20000f43ac Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 8 21:57:29 2011 +0530 Added datapickers in insert form in dialog commit 1e8cbeceb957874f4670ea06a4acb57421db4400 Merge: f778dfc5af9756e6ab438a279d3ec1d60af57add baa2efa1f123ea0a386c9b001781860aabb27aff Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Fri Jul 8 21:09:34 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/db_structure.js | 43 +++++++++------- js/tbl_structure.js | 135 +++++++++++++++++++++++++++++++++------------------ 3 files changed, 112 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index af1f275..a137c4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ phpMyAdmin - ChangeLog - bug #3353856 [AJAX] AJAX dialogs use wrong font-size - bug #3354356 [interface] Timepicker does not work in AJAX dialogs + AJAX for table Structure Indexes Edit ++ AJAX for table Structure column Change 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/db_structure.js b/js/db_structure.js index ad55341..b1c2ff0 100644 --- a/js/db_structure.js +++ b/js/db_structure.js @@ -61,12 +61,12 @@ $(document).ready(function() { $("td.insert_table a.ajax").live('click', function(event){ event.preventDefault(); currrent_insert_table = $(this); - var url = $(this).attr("href"); - if (url.substring(0, 15) == "tbl_change.php?") { - url = url.substring(15); + var $url = $(this).attr("href"); + if ($url.substring(0, 15) == "tbl_change.php?") { + $url = $url.substring(15); } - var div = $('<div id="insert_table_dialog"></div>'); + var $div = $('<div id="insert_table_dialog"></div>'); var target = "tbl_change.php"; /** @@ -75,38 +75,43 @@ $(document).ready(function() { */ var button_options = {}; // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();} + button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} + button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} var $msgbox = PMA_ajaxShowMessage(); - $.get( target , url+"&ajax_request=true" , function(data) { + $.get( target , $url+"&ajax_request=true" , function(data) { //in the case of an error, show the error message returned. if (data.success != undefined && data.success == false) { - div + $div .append(data.error) .dialog({ title: PMA_messages['strInsertTable'], height: 230, width: 900, + modal: true, open: PMA_verifyTypeOfAllColumns, buttons : button_options_error })// end dialog options } else { - div - .append(data) - .dialog({ - title: PMA_messages['strInsertTable'], - height: 600, - width: 900, - open: PMA_verifyTypeOfAllColumns, - buttons : button_options - }) + var $dialog = $div + .append(data) + .dialog({ + title: PMA_messages['strInsertTable'], + height: 600, + width: 900, + modal: true, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + });// end dialog options //Remove the top menu container from the dialog - .find("#topmenucontainer").hide() - ; // end dialog options + $dialog.find("#topmenucontainer").hide(); + //Adding the datetime pikers for the dialog + $dialog.find('.datefield, .datetimefield').each(function () { + PMA_addDatepicker($(this)); + }); $(".insertRowTable").addClass("ajax"); $("#buttonYes").addClass("ajax"); } diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 49e3fe0..c58bd54 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -153,59 +153,35 @@ $(document).ready(function() { event.preventDefault(); /*Check whether atleast one row is selected for change*/ - if($("#tablestructure tbody tr").hasClass("marked")){ - var div = $('<div id="change_column_dialog"></div>'); - - /** - * @var button_options Object that stores the options passed to jQueryUI - * dialog - */ - var button_options = {}; - // in the following function we need to use $(this) - button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();} - - var button_options_error = {}; - button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} + if ($("#tablestructure tbody tr").hasClass("marked")) { + /*Define the action and $url variabls for the post method*/ var $form = $("#fieldsForm"); - var $msgbox = PMA_ajaxShowMessage(); - - $.get( $form.attr('action') , $form.serialize()+"&ajax_request=true&submit_mult=change" , function(data) { - //in the case of an error, show the error message returned. - if (data.success != undefined && data.success == false) { - div - .append(data.error) - .dialog({ - title: PMA_messages['strChangeTbl'], - height: 230, - width: 900, - open: PMA_verifyTypeOfAllColumns, - modal: true, - buttons : button_options_error - })// end dialog options - } else { - div - .append(data) - .dialog({ - title: PMA_messages['strChangeTbl'], - height: 600, - width: 900, - open: PMA_verifyTypeOfAllColumns, - modal: true, - buttons : button_options - }) - //Remove the top menu container from the dialog - .find("#topmenucontainer").hide() - ; // end dialog options - $("#append_fields_form input[name=do_save_data]").addClass("ajax"); - } - PMA_ajaxRemoveMessage($msgbox); - }) // end $.get() + var action = $form.attr('action'); + var url = $form.serialize()+"&ajax_request=true&submit_mult=change"; + /*Calling for the changeColumns fucntion*/ + changeColumns(action,url); } else { PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']); } }); /** + *Ajax event handler for single column change + **/ + $("#fieldsForm.ajax #tablestructure tbody tr td.edit a").live('click', function(event){ + event.preventDefault(); + /*Define the action and $url variabls for the post method*/ + var action = "tbl_alter.php"; + var url = $(this).attr('href'); + if (url.substring(0, 13) == "tbl_alter.php") { + url = url.substring(14, url.length); + } + url = url + "&ajax_request=true"; + /*Calling for the changeColumns fucntion*/ + changeColumns(action,url); + }); + + /** *Ajax action for submitting the column change form **/ $("#append_fields_form input[name=do_save_data].ajax").live('click', function(event) { @@ -309,7 +285,7 @@ $(document).ready(function() { PMA_ajaxRemoveMessage($msgbox); }) // end $.get() }); - + /** *Ajax action for submiting the index form **/ @@ -401,6 +377,69 @@ $(document).ready(function() { return false; }); } //end show/hide table index - + }) // end $(document).ready() + +/** + * Loads the append_fields_form to the Change dialog allowing users + * to change the columns + * @param string action Variable which parses the name of the + * destination file + * @param string $url Variable which parses the data for the + * post action + */ +function changeColumns(action,url) { + /*Remove the hidden dialogs if there are*/ + if ($('#change_column_dialog').length != 0) { + $('#change_column_dialog').remove(); + } + var div = $('<div id="change_column_dialog"></div>'); + + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + // in the following function we need to use $(this) + button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();} + + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).dialog('close').remove();} + var $msgbox = PMA_ajaxShowMessage(); + + $.get( action , url , function(data) { + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + div + .append(data.error) + .dialog({ + title: PMA_messages['strChangeTbl'], + height: 230, + width: 900, + modal: true, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options_error + })// end dialog options + } else { + div + .append(data) + .dialog({ + title: PMA_messages['strChangeTbl'], + height: 600, + width: 900, + modal: true, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + }) + //Remove the top menu container from the dialog + .find("#topmenucontainer").hide() + ; // end dialog options + $("#append_fields_form input[name=do_save_data]").addClass("ajax"); + /*changed the z-index of the enum editor to allow the edit*/ + $("#enum_editor").css("z-index", "1100"); + } + PMA_ajaxRemoveMessage($msgbox); + }) // end $.get() +} + hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-7868-g4ae5cb0
by Madhura Jayaratne 10 Jul '11

10 Jul '11

The branch, master has been updated via 4ae5cb079944786b0d57fccda045e9ac72dc9fab (commit) via 58d25ddcb8a036743e32879c9320dcd802626082 (commit) via a546479680cd1da8af6812ed0eef83b390bab07f (commit) from 99c1692b077403fceba39831ce2b559248d1a2ba (commit) - Log ----------------------------------------------------------------- commit 4ae5cb079944786b0d57fccda045e9ac72dc9fab Merge: 99c1692b077403fceba39831ce2b559248d1a2ba 58d25ddcb8a036743e32879c9320dcd802626082 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jul 10 18:00:46 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b03cafb..af1f275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog - bug #3353649 [interface] "Create an index on X columns" form not validated - bug #3350790 [interface] JS error in Table->Structure->Index->Edit - bug #3353811 [interface] Info message has "error" class +- bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL 3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/sql.js b/js/sql.js index 48fb65f..9b54bb9 100644 --- a/js/sql.js +++ b/js/sql.js @@ -685,7 +685,10 @@ $(document).ready(function() { }) } else { $this_field.find('textarea').live('keypress', function(e) { - $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false); + // FF errorneously triggers for modifier keys such as tab (bug #3357837) + if (e.which != 0) { + $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false); + } }) } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-24-g58d25dd
by Madhura Jayaratne 10 Jul '11

10 Jul '11

The branch, QA_3_4 has been updated via 58d25ddcb8a036743e32879c9320dcd802626082 (commit) from a546479680cd1da8af6812ed0eef83b390bab07f (commit) - Log ----------------------------------------------------------------- commit 58d25ddcb8a036743e32879c9320dcd802626082 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Jul 10 17:58:35 2011 +0530 Typo ----------------------------------------------------------------------- Summary of changes: js/sql.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 82eadb0..b185b69 100644 --- a/js/sql.js +++ b/js/sql.js @@ -644,7 +644,7 @@ $(document).ready(function() { }) } else { $this_field.find('textarea').live('keypress', function(e) { - // FF errorniously triggers for modifier keys such as tab (bug #3357837) + // FF errorneously triggers for modifier keys such as tab (bug #3357837) if (e.which != 0) { $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false); } hooks/post-receive -- phpMyAdmin

1 0