Git September 2011

git@phpmyadmin.net

7 participants
167 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19127-gabc1d3c
by Rouslan Placella 14 Sep '11

14 Sep '11

The branch, master has been updated via abc1d3c345dfd11ea3d940c5b944d05fc173ec34 (commit) from 6b09880e1ca37d9e883ecb0d0fe9392c0cbf6146 (commit) - Log ----------------------------------------------------------------- commit abc1d3c345dfd11ea3d940c5b944d05fc173ec34 Author: Rouslan Placella <rouslan(a)placella.com> Date: Wed Sep 14 15:42:40 2011 +0100 Fixed broken validation and reindexing of some fields in the Routines editor ----------------------------------------------------------------------- Summary of changes: js/rte/routines.js | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/js/rte/routines.js b/js/rte/routines.js index 50c4f00..ac7a291 100644 --- a/js/rte/routines.js +++ b/js/rte/routines.js @@ -58,9 +58,9 @@ RTE.validateCustom = function () { if (isSuccess) { $(this).find(':input').each(function () { inputname = $(this).attr('name'); - if (inputname.substr(0, 17) === 'item_param_dir' || - inputname.substr(0, 18) === 'item_param_name' || - inputname.substr(0, 18) === 'item_param_type') { + if (inputname.substr(0, 14) === 'item_param_dir' || + inputname.substr(0, 15) === 'item_param_name' || + inputname.substr(0, 15) === 'item_param_type') { if ($(this).val() === '') { $(this).focus(); isSuccess = false; @@ -264,18 +264,18 @@ $(document).ready(function () { * the input field being reindexed. */ var inputname = $(this).attr('name'); - if (inputname.substr(0, 17) === 'item_param_dir') { + if (inputname.substr(0, 14) === 'item_param_dir') { + $(this).attr('name', inputname.substr(0, 14) + '[' + index + ']'); + } else if (inputname.substr(0, 15) === 'item_param_name') { + $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']'); + } else if (inputname.substr(0, 15) === 'item_param_type') { + $(this).attr('name', inputname.substr(0, 15) + '[' + index + ']'); + } else if (inputname.substr(0, 17) === 'item_param_length') { $(this).attr('name', inputname.substr(0, 17) + '[' + index + ']'); - } else if (inputname.substr(0, 18) === 'item_param_name') { - $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']'); - } else if (inputname.substr(0, 18) === 'item_param_type') { - $(this).attr('name', inputname.substr(0, 18) + '[' + index + ']'); - } else if (inputname.substr(0, 20) === 'item_param_length') { + } else if (inputname.substr(0, 20) === 'item_param_opts_text') { $(this).attr('name', inputname.substr(0, 20) + '[' + index + ']'); - } else if (inputname.substr(0, 23) === 'item_param_opts_text') { - $(this).attr('name', inputname.substr(0, 23) + '[' + index + ']'); - } else if (inputname.substr(0, 22) === 'item_param_opts_num') { - $(this).attr('name', inputname.substr(0, 22) + '[' + index + ']'); + } else if (inputname.substr(0, 19) === 'item_param_opts_num') { + $(this).attr('name', inputname.substr(0, 19) + '[' + index + ']'); } }); index++; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. bf754acd5c4bd16f0bb3a4a11e108c2c172583b0
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, master has been updated via bf754acd5c4bd16f0bb3a4a11e108c2c172583b0 (commit) via d36188f3ea49e446dc015e7b8266929434cc218a (commit) from 385f0b3a7532f8b384d5990cc0642a20910b61ce (commit) - Log ----------------------------------------------------------------- commit bf754acd5c4bd16f0bb3a4a11e108c2c172583b0 Merge: 385f0b3 d36188f Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 08:04:04 2011 -0400 Merge branch 'website-security' commit d36188f3ea49e446dc015e7b8266929434cc218a Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Sep 12 13:01:06 2011 -0400 PMASA-2011-14 proposal ----------------------------------------------------------------------- Summary of changes: .../security/{PMASA-2011-11 => PMASA-2011-14} | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) copy templates/security/{PMASA-2011-11 => PMASA-2011-14} (57%) diff --git a/templates/security/PMASA-2011-11 b/templates/security/PMASA-2011-14 similarity index 57% copy from templates/security/PMASA-2011-11 copy to templates/security/PMASA-2011-14 index f6f98fd..570a21d 100644 --- a/templates/security/PMASA-2011-11 +++ b/templates/security/PMASA-2011-14 @@ -3,23 +3,23 @@ <py:def function="announcement_id"> -PMASA-2011-11 +PMASA-2011-14 </py:def> <py:def function="announcement_date"> -2011-07-23 +2011-09-14 </py:def> <py:def function="announcement_summary"> -Local file inclusion vulnerability and code execution. +Multiple XSS. </py:def> <py:def function="announcement_description"> -In the 'relational schema' code a parameter was not sanitized before being used to concatenate a class name. +Firstly, if a row contains javascript code, after inline editing this row and saving, the code is executed. Secondly, missing sanitization on the db, table and column names leads to XSS vulnerabilities. </py:def> <py:def function="announcement_severity"> -We consider this vulnerability to be critical. +We consider these vulnerabilities to be serious. </py:def> <py:def function="announcement_mitigation"> @@ -27,25 +27,25 @@ An attacker must be logged in via phpMyAdmin to exploit this problem. </py:def> <py:def function="announcement_affected"> -Versions 3.4.0 to 3.4.3.1 are affected. +Versions 3.4.0 to 3.4.4 were found vulnerable. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.4.3.2 or apply the related patch listed below. +Upgrade to phpMyAdmin 3.4.5 or apply the related patches listed below. </py:def>  <py:def function="announcement_references"> -This issue was found by Norman Hippert from <a href="http://www.the-wildcat.de/">The-Wildcat.de</a> +The first issue was found by Brad Bernard (<a href="http://iunfollow.com">iunfollow.com</a>). The second issue was found by Nils Juenemann (<a href="https://twitter.com/#!/totally_unknown">https://twitter.com/#!/totally_unknown</a>.) </py:def>  -<py:def function="announcement_cve">CVE-2011-2718</py:def> <py:def function="announcement_cwe">661 98</py:def> <py:def function="announcement_commits"> -3ae58f0cd6b89ad4767920f9b214c38d3f6d4393 +bda213c58aec44925be661acb0e76c19483ea170 +2f28ce9c800274190418da0945ce3647d36e1db6 </py:def> <xi:include href="_page.tpl" /> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_4_5-44-g8cec661
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, TESTING has been updated via 8cec66133fdb06172991e8017e4dda6e445bd8c1 (commit) via b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) from 9ea5d25434fdca3d71eefedf80ac143c799b0bf9 (commit) - Log ----------------------------------------------------------------- commit 8cec66133fdb06172991e8017e4dda6e445bd8c1 Merge: 9ea5d25 b7d09b5 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:48:45 2011 -0400 Merge branch 'MAINT_3_4_5' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3076156..b307b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing diff --git a/Documentation.html b/Documentation.html index 019939e..bfeeca6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.5 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">phpMyAdmin</a> - 3.4.5-rc1 + 3.4.5 Documentation </h1> </div> diff --git a/README b/README index a836068..0206e1f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.5-rc1 +Version 3.4.5 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 96fd61d..e6c6c26 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.5-rc1'); + $this->set('PMA_VERSION', '3.4.5'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_4_5, created. RELEASE_3_4_5
by Marc Delisle 14 Sep '11

14 Sep '11

The annotated tag, RELEASE_3_4_5 has been created at d0b8b7d92fcc008815ca5713708f22c6c41e2c1b (tag) tagging b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) replaces RELEASE_3_4_5RC1 tagged by Marc Delisle on Wed Sep 14 07:48:44 2011 -0400 - Log ----------------------------------------------------------------- Released 3.4.5 Marc Delisle (1): 3.4.5 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19126-g6b09880
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, master has been updated via 6b09880e1ca37d9e883ecb0d0fe9392c0cbf6146 (commit) from 79183afd771d96f2b6aa9b7238a1ce7ef4e201ea (commit) - Log ----------------------------------------------------------------- commit 6b09880e1ca37d9e883ecb0d0fe9392c0cbf6146 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:44:30 2011 -0400 3.4.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30c3085..37671bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,7 +55,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5RC1-10-ge27ba51
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, QA_3_4 has been updated via e27ba519c5265109d6e3ad629297d057b2c53496 (commit) from 03a75ab9e0049a1f21ace0e6e1ddad63658ae8d7 (commit) - Log ----------------------------------------------------------------- commit e27ba519c5265109d6e3ad629297d057b2c53496 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:44:09 2011 -0400 3.4.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca34332..d05c29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ phpMyAdmin - ChangeLog - bug #3403165 [interface] Collation not displayed for long enum fields - bug #3399951 [export] Config for export compression not used -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_5, updated. RELEASE_3_4_5RC1-1-gb7d09b5
by Marc Delisle 14 Sep '11

14 Sep '11

The branch, MAINT_3_4_5 has been updated via b7d09b5bb865816bb357ceb357f6beb52d20afde (commit) from bda213c58aec44925be661acb0e76c19483ea170 (commit) - Log ----------------------------------------------------------------- commit b7d09b5bb865816bb357ceb357f6beb52d20afde Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Sep 14 07:43:33 2011 -0400 3.4.5 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 326c8c0..1344b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.5.0 (not yet released) +3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced - bug #3374802 [interface] Comment on a column breaks inline editing diff --git a/Documentation.html b/Documentation.html index 019939e..bfeeca6 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.5-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.5 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">phpMyAdmin</a> - 3.4.5-rc1 + 3.4.5 Documentation </h1> </div> diff --git a/README b/README index a836068..0206e1f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.5-rc1 +Version 3.4.5 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 96fd61d..e6c6c26 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.5-rc1'); + $this->set('PMA_VERSION', '3.4.5'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19125-g79183af
by Michal Čihař 14 Sep '11

14 Sep '11

The branch, master has been updated via 79183afd771d96f2b6aa9b7238a1ce7ef4e201ea (commit) via d7cbfd5bf3b9e983c0011a0ad4ef36d0b187f228 (commit) via d8b6ccc875237365f671f112d98f0d639c7c923a (commit) via 1b2d2b7f29c5e80f9cf80dbc5db6c6db20051c55 (commit) via 5a3700673089211532967badbc3532d60f9e320c (commit) via 503e0a6f612e9ed63b8c10ac1227bb84c7f773e8 (commit) via 1837b17fa4aeb9ccbf0fe4b5ff5719350de8950b (commit) via 6e200f9227c9d74f8dc3e181fc393ee24933180d (commit) via d0530f317046d8ee8b53020a782f0b17c1169596 (commit) via 06b4e4f1faf2aade68518fb2a3e2fb36f51d0b10 (commit) via 4b19821e7d0f2d4f3e29a6e381ce1870fedd5920 (commit) via 1321e11d581004aab1cbb457379cdfb31858d29d (commit) via 4bb676dc4e6d1d543a81bf2b70346db2756f2efc (commit) via 3db003c26f48b0edbeee115c78d1b0a55d307597 (commit) via ae172f6f73553bc91491a82d29fa5df3c5f572ce (commit) via f4f1c2712b265241e4a3271c115a9fa5d9b5c1ad (commit) via 0edf5e0c597f9a32787a24577d02087e160d8d81 (commit) via 050becb0d6b6a70fc11d82521f63df8c418f7529 (commit) via 7aa677175a09c0af4c39dbde7355511f7edfec76 (commit) via 5769617850229f07f9e051fd5c044793f8a9634a (commit) via aaae4f1c46fc808f83f9debbdd77f9b6f6f65fc3 (commit) via e10a25e774acf421daa06207a7b093cf7f2566b1 (commit) via b2c847e0b9264795c541d2c299333019953634c1 (commit) via f6d88dfdcac732055eefcbbe29fe603a12097675 (commit) via 9c4b5620b25342a53db29eff52e5fe9841f4e534 (commit) via 2d123c96e6eddc995fe907e1762f8e3204ae59ab (commit) via 33d10a5ced14c56906f3e6f5afc313e834d25ab4 (commit) via 9c2e4abca271ccfad2192b3280ba7f7729091056 (commit) via 6a74fd15b73dff77f5ca1dcd07528c4504aae18a (commit) via c0cc01b6a0e426dc0cbbae2268271705141309b0 (commit) via 9c2f11ec62f6600c13c1c3f5e5ad0b702ae41197 (commit) via 37f87df50df0d6af214f847b0f6e66fdea56a9fb (commit) via a3192732fe4483cda878d84ec37cba59be541113 (commit) via cc1efd391298e65fb2faf034f516ed13866362be (commit) via 1d8e4cdd9bb36afb181b983c004bfa460385d94b (commit) via d0260f85dd8415924affbdee053a8bb1020be9d8 (commit) via fe2b5a3793a7f92af1fa17f2cf6de76b93ea7694 (commit) via e1ea6e4387ae461206a8822f2029f8d7c10345fd (commit) via 2b0d73665dee0f270dc034b1fbb1c7b4035226a6 (commit) via 512dccc55ad6e60e0574de8da1de4af1397e4ff9 (commit) via 0833fceb2ec8a4e88d24d96728026afec93cecb5 (commit) via 67d3e561764e751725d4ad88e5a0577032a4e4dd (commit) via 36c95b0b52d78a7272602d00d653ebd78451c2ce (commit) via 032a5bf1ddcacdf76da963dde960005ac2c1466e (commit) via 0cfe486156842ccb426da06c0d4374b7b581bc9d (commit) via 31387c8ea946d4d74e5e8108ebc57131443e2397 (commit) via bac760e211ccbe606716d3750ac8e38bb4a34a0c (commit) via a0cc99597b76065d8fedb57a9364c03e29f44672 (commit) via baa184fc793fc9c7312e2a72321ce3c6b712b913 (commit) via feeb3016211b202effca2d296d213acb54ff942d (commit) via 5a1ea59c491ca4320623bfb4a444c44ba29ea3d5 (commit) via 0eb233e3f30cf0e168afa3a67737106cfa4b4011 (commit) via 9529e46ae0668da06b2a57ed6045d21440f775d6 (commit) via 3ba24c0c7d5cc3954587086a5d53dacaf044a323 (commit) via 2122918366f66953c305a80a9894967ce926918f (commit) via f4ee22faf7ef7cbec156a6315aea7cc333816e3e (commit) via 52c5c8c7f5eb1cd28163ab7d9c838acab5be47f1 (commit) via 1242b45d758b532c9a7635b4a9dd718bd7c53337 (commit) via 95d9052016fd15742db584216ad2e80de61c7338 (commit) via 57edd121a8c2ada88194a05c0a916f589b292e1e (commit) via 2dcd021e714ab61ec5fa259660110b32494eaa3f (commit) via e33291a4978131b11bd914eb4d210b34f690dad2 (commit) via 3d4f236d3bbb2d067795b82d5345a7465701e50c (commit) via a77f03703198c136e1d63d6e9857108e30f96b21 (commit) via 341ad023250782844781a063d82a562e0f29d292 (commit) via b6d1491267ca5bcce43a9812731c0b81207d4c89 (commit) via c773317b28a737d1f1c91cb8d84960fa3613be48 (commit) via 2fa6a4e5e714f7200c7e7c367359c130a75555d6 (commit) via df1164f204335b0d93241589f08c26624334cab9 (commit) via 7641337afd129f1de18ce7c560aff8ca63854d7a (commit) via f844631f07bbb240252b4c0633139b22ab11997d (commit) via e1e3bb41f6348b008d6b2fa889e114847bc86c17 (commit) via 69c1982d024561a6a6d650aa190ec63e17496543 (commit) via 2d74c77392e97d811ddbd5f5a17bd2373f5e6629 (commit) via e4f8ec38c81af4b3ddc392b6cb1e297675a3ed9f (commit) via 56519a016dfefbfba948446ffd33ba0bf4b736e6 (commit) via 336280e74d5d87ef55af3d4bde3d05bf05283b5e (commit) via 21990fb271f3f3d1e831e3f7988f8d1035d7320b (commit) via 535c0a9738b005007fc0edcd3c0205dd9927bcb1 (commit) via 82ecd478d62f7790db5132ad31a5fc4cd0f48ca5 (commit) via 40f3b24b58a2496dbd7bf8ebd630d7b78a560962 (commit) via 7afc6d7fcc4316ba3791cebf976c06b0446b3bdc (commit) via 55ff3b952df17fb2d7e0b1443f3d6ec343b440c0 (commit) via 2739d18beeb2d8ae71f49a65321fb6323d852b4c (commit) via a8d8d4bcfd54b86c11a38c0361b8c5378fae0fd3 (commit) via db3f36d33893a180b5cd4fb36e135e21f5ff50de (commit) via 272bc8bed9f753f1f1b47ad500955d746edaa857 (commit) via 94fec7dee108090b52ac70ba98682b1b04ec3d60 (commit) via b15449d70eb0c3f0d3fbd92d1a7fc87247474e05 (commit) via c628e10a0c2f7d9ce4e2031e6013a741acc48e41 (commit) via 9a201ecee9c71b11fb0e0f8a3c015660de3dcb8d (commit) via 9d6057972c6024b705733543de1720cbf91809ce (commit) via 3a616c6d59493fcbd4bad5351cf227e3a978508f (commit) via 1b7c84c16861b2f675469fd8d8e76d22c4f2ad06 (commit) via ed303779854a6a7c5a69e65c3420dbe63559e6d5 (commit) via dc3cecad0f3e8c1ec34991e798f8cbcf412bbceb (commit) via 4d03695a1c69ad01c21ec54b008d130f6891308b (commit) via 931014e28c039a69c7ed5dd3b9734bd563faf480 (commit) via 6a97541d5ab162d6850d3410b3f7f4b93f2adc13 (commit) via e9ca49ce5032fb0e7b07fc08e0cbe9d2d0dd3add (commit) via 839de5e9355d9c33aaf39096ee4bdc2a95574b92 (commit) via 10fa342c4884672aafe4b305e651081a7a1a8882 (commit) via 90004ab4ad78aa553c4bfa174a5dd1857a023ebe (commit) via 1e6bdf1a5175dc38963e6fed0c7a0f7615b86bea (commit) via 7060feffb29e45de09adbcb9df2ad86f150c02da (commit) via 461a80843f0c4712963efb6f438b717541fdc2cb (commit) via a9b7894644606f7c2a9dbb888fb6e4c0a633c73d (commit) via 88fdba9bdbdda02063f33a74d2b2fcb027cb5fbc (commit) via 9735aeb854d9be623911cb6f13dcb495d074ced0 (commit) via 4662be2cfd0cfd4dc8dff4b71587ece1323bb366 (commit) via 0c19781d38d47113d0a0a35b6af422916f1596b1 (commit) via 6b988f48aae8f6755e5e2c9d4141698f1d2b554f (commit) via 9da8dabe4a3620429d81565f57922e3b77582091 (commit) via c6014b5f651438de0b1ff3fd6b1c110af27c5ced (commit) via 1914526c0a6c138245c64c7542aa1738efeb9ff6 (commit) via d39548a66372d4d19e27e96c84049a005b9ad9de (commit) via 7a0089c8897dbb48e6bce8d440ee5d92d988df99 (commit) via 909b999d9d778fa5da0879fe73e1e2e31f0b9cbf (commit) via 56ff0c53c58a2cb28f552e167136883743415f31 (commit) via 9dc58e1ed223295806159df6f353be08bb6615fd (commit) from dd81bf847ae2d055aabdd24ca379575297eeae41 (commit) - Log ----------------------------------------------------------------- commit 79183afd771d96f2b6aa9b7238a1ce7ef4e201ea Merge: d7cbfd5 dd81bf8 Author: Michal Čihař <michal(a)cihar.com> Date: Wed Sep 14 07:29:18 2011 +0200 Merge remote-tracking branch 'origin/master' commit d7cbfd5bf3b9e983c0011a0ad4ef36d0b187f228 Merge: 110c1e4 d8b6ccc Author: Michal Čihař <michal(a)cihar.com> Date: Tue Sep 13 20:57:39 2011 +0200 Merge remote-tracking branch 'pootle/master' Conflicts: po/el.po po/fr.po po/ru.po commit d8b6ccc875237365f671f112d98f0d639c7c923a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 20:02:48 2011 +0200 Translation update done using Pootle. commit 1b2d2b7f29c5e80f9cf80dbc5db6c6db20051c55 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 20:01:53 2011 +0200 Translation update done using Pootle. commit 5a3700673089211532967badbc3532d60f9e320c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 20:00:35 2011 +0200 Translation update done using Pootle. commit 503e0a6f612e9ed63b8c10ac1227bb84c7f773e8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:59:54 2011 +0200 Translation update done using Pootle. commit 1837b17fa4aeb9ccbf0fe4b5ff5719350de8950b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:59:36 2011 +0200 Translation update done using Pootle. commit 6e200f9227c9d74f8dc3e181fc393ee24933180d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:59:19 2011 +0200 Translation update done using Pootle. commit d0530f317046d8ee8b53020a782f0b17c1169596 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:58:59 2011 +0200 Translation update done using Pootle. commit 06b4e4f1faf2aade68518fb2a3e2fb36f51d0b10 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:57:52 2011 +0200 Translation update done using Pootle. commit 4b19821e7d0f2d4f3e29a6e381ce1870fedd5920 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:56:17 2011 +0200 Translation update done using Pootle. commit 1321e11d581004aab1cbb457379cdfb31858d29d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:54:41 2011 +0200 Translation update done using Pootle. commit 4bb676dc4e6d1d543a81bf2b70346db2756f2efc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:53:19 2011 +0200 Translation update done using Pootle. commit 3db003c26f48b0edbeee115c78d1b0a55d307597 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:52:28 2011 +0200 Translation update done using Pootle. commit ae172f6f73553bc91491a82d29fa5df3c5f572ce Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:51:47 2011 +0200 Translation update done using Pootle. commit f4f1c2712b265241e4a3271c115a9fa5d9b5c1ad Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:49:59 2011 +0200 Translation update done using Pootle. commit 0edf5e0c597f9a32787a24577d02087e160d8d81 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:49:33 2011 +0200 Translation update done using Pootle. commit 050becb0d6b6a70fc11d82521f63df8c418f7529 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:48:31 2011 +0200 Translation update done using Pootle. commit 7aa677175a09c0af4c39dbde7355511f7edfec76 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:48:02 2011 +0200 Translation update done using Pootle. commit 5769617850229f07f9e051fd5c044793f8a9634a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:47:48 2011 +0200 Translation update done using Pootle. commit aaae4f1c46fc808f83f9debbdd77f9b6f6f65fc3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:47:29 2011 +0200 Translation update done using Pootle. commit e10a25e774acf421daa06207a7b093cf7f2566b1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:47:18 2011 +0200 Translation update done using Pootle. commit b2c847e0b9264795c541d2c299333019953634c1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:46:28 2011 +0200 Translation update done using Pootle. commit f6d88dfdcac732055eefcbbe29fe603a12097675 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:46:01 2011 +0200 Translation update done using Pootle. commit 9c4b5620b25342a53db29eff52e5fe9841f4e534 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:45:15 2011 +0200 Translation update done using Pootle. commit 2d123c96e6eddc995fe907e1762f8e3204ae59ab Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:44:54 2011 +0200 Translation update done using Pootle. commit 33d10a5ced14c56906f3e6f5afc313e834d25ab4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:44:40 2011 +0200 Translation update done using Pootle. commit 9c2e4abca271ccfad2192b3280ba7f7729091056 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:44:26 2011 +0200 Translation update done using Pootle. commit 6a74fd15b73dff77f5ca1dcd07528c4504aae18a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:43:26 2011 +0200 Translation update done using Pootle. commit c0cc01b6a0e426dc0cbbae2268271705141309b0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:42:12 2011 +0200 Translation update done using Pootle. commit 9c2f11ec62f6600c13c1c3f5e5ad0b702ae41197 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:41:45 2011 +0200 Translation update done using Pootle. commit 37f87df50df0d6af214f847b0f6e66fdea56a9fb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Tue Sep 13 19:40:02 2011 +0200 Translation update done using Pootle. commit a3192732fe4483cda878d84ec37cba59be541113 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:57:27 2011 +0200 Translation update done using Pootle. commit cc1efd391298e65fb2faf034f516ed13866362be Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:57:18 2011 +0200 Translation update done using Pootle. commit 1d8e4cdd9bb36afb181b983c004bfa460385d94b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:56:57 2011 +0200 Translation update done using Pootle. commit d0260f85dd8415924affbdee053a8bb1020be9d8 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:56:47 2011 +0200 Translation update done using Pootle. commit fe2b5a3793a7f92af1fa17f2cf6de76b93ea7694 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:56:38 2011 +0200 Translation update done using Pootle. commit e1ea6e4387ae461206a8822f2029f8d7c10345fd Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:56:37 2011 +0200 Translation update done using Pootle. commit 2b0d73665dee0f270dc034b1fbb1c7b4035226a6 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:56:08 2011 +0200 Translation update done using Pootle. commit 512dccc55ad6e60e0574de8da1de4af1397e4ff9 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:55:54 2011 +0200 Translation update done using Pootle. commit 0833fceb2ec8a4e88d24d96728026afec93cecb5 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:55:35 2011 +0200 Translation update done using Pootle. commit 67d3e561764e751725d4ad88e5a0577032a4e4dd Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:55:07 2011 +0200 Translation update done using Pootle. commit 36c95b0b52d78a7272602d00d653ebd78451c2ce Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:54:41 2011 +0200 Translation update done using Pootle. commit 032a5bf1ddcacdf76da963dde960005ac2c1466e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:54:14 2011 +0200 Translation update done using Pootle. commit 0cfe486156842ccb426da06c0d4374b7b581bc9d Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:54:12 2011 +0200 Translation update done using Pootle. commit 31387c8ea946d4d74e5e8108ebc57131443e2397 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:54:00 2011 +0200 Translation update done using Pootle. commit bac760e211ccbe606716d3750ac8e38bb4a34a0c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:53:52 2011 +0200 Translation update done using Pootle. commit a0cc99597b76065d8fedb57a9364c03e29f44672 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:53:40 2011 +0200 Translation update done using Pootle. commit baa184fc793fc9c7312e2a72321ce3c6b712b913 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:53:19 2011 +0200 Translation update done using Pootle. commit feeb3016211b202effca2d296d213acb54ff942d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:52:57 2011 +0200 Translation update done using Pootle. commit 5a1ea59c491ca4320623bfb4a444c44ba29ea3d5 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:52:56 2011 +0200 Translation update done using Pootle. commit 0eb233e3f30cf0e168afa3a67737106cfa4b4011 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:52:48 2011 +0200 Translation update done using Pootle. commit 9529e46ae0668da06b2a57ed6045d21440f775d6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:52:36 2011 +0200 Translation update done using Pootle. commit 3ba24c0c7d5cc3954587086a5d53dacaf044a323 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:52:26 2011 +0200 Translation update done using Pootle. commit 2122918366f66953c305a80a9894967ce926918f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:52:19 2011 +0200 Translation update done using Pootle. commit f4ee22faf7ef7cbec156a6315aea7cc333816e3e Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:51:46 2011 +0200 Translation update done using Pootle. commit 52c5c8c7f5eb1cd28163ab7d9c838acab5be47f1 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:50:50 2011 +0200 Translation update done using Pootle. commit 1242b45d758b532c9a7635b4a9dd718bd7c53337 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:50:26 2011 +0200 Translation update done using Pootle. commit 95d9052016fd15742db584216ad2e80de61c7338 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:50:25 2011 +0200 Translation update done using Pootle. commit 57edd121a8c2ada88194a05c0a916f589b292e1e Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:50:05 2011 +0200 Translation update done using Pootle. commit 2dcd021e714ab61ec5fa259660110b32494eaa3f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:49:41 2011 +0200 Translation update done using Pootle. commit e33291a4978131b11bd914eb4d210b34f690dad2 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:49:11 2011 +0200 Translation update done using Pootle. commit 3d4f236d3bbb2d067795b82d5345a7465701e50c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:49:00 2011 +0200 Translation update done using Pootle. commit a77f03703198c136e1d63d6e9857108e30f96b21 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:48:52 2011 +0200 Translation update done using Pootle. commit 341ad023250782844781a063d82a562e0f29d292 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:48:43 2011 +0200 Translation update done using Pootle. commit b6d1491267ca5bcce43a9812731c0b81207d4c89 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:48:16 2011 +0200 Translation update done using Pootle. commit c773317b28a737d1f1c91cb8d84960fa3613be48 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:47:47 2011 +0200 Translation update done using Pootle. commit 2fa6a4e5e714f7200c7e7c367359c130a75555d6 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:47:13 2011 +0200 Translation update done using Pootle. commit df1164f204335b0d93241589f08c26624334cab9 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:46:54 2011 +0200 Translation update done using Pootle. commit 7641337afd129f1de18ce7c560aff8ca63854d7a Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:46:26 2011 +0200 Translation update done using Pootle. commit f844631f07bbb240252b4c0633139b22ab11997d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:46:13 2011 +0200 Translation update done using Pootle. commit e1e3bb41f6348b008d6b2fa889e114847bc86c17 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:46:08 2011 +0200 Translation update done using Pootle. commit 69c1982d024561a6a6d650aa190ec63e17496543 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:46:07 2011 +0200 Translation update done using Pootle. commit 2d74c77392e97d811ddbd5f5a17bd2373f5e6629 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:45:55 2011 +0200 Translation update done using Pootle. commit e4f8ec38c81af4b3ddc392b6cb1e297675a3ed9f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:45:39 2011 +0200 Translation update done using Pootle. commit 56519a016dfefbfba948446ffd33ba0bf4b736e6 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:45:29 2011 +0200 Translation update done using Pootle. commit 336280e74d5d87ef55af3d4bde3d05bf05283b5e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:45:18 2011 +0200 Translation update done using Pootle. commit 21990fb271f3f3d1e831e3f7988f8d1035d7320b Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:45:02 2011 +0200 Translation update done using Pootle. commit 535c0a9738b005007fc0edcd3c0205dd9927bcb1 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:44:55 2011 +0200 Translation update done using Pootle. commit 82ecd478d62f7790db5132ad31a5fc4cd0f48ca5 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:44:48 2011 +0200 Translation update done using Pootle. commit 40f3b24b58a2496dbd7bf8ebd630d7b78a560962 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:44:44 2011 +0200 Translation update done using Pootle. commit 7afc6d7fcc4316ba3791cebf976c06b0446b3bdc Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:44:33 2011 +0200 Translation update done using Pootle. commit 55ff3b952df17fb2d7e0b1443f3d6ec343b440c0 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:44:19 2011 +0200 Translation update done using Pootle. commit 2739d18beeb2d8ae71f49a65321fb6323d852b4c Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:44:11 2011 +0200 Translation update done using Pootle. commit a8d8d4bcfd54b86c11a38c0361b8c5378fae0fd3 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:42:58 2011 +0200 Translation update done using Pootle. commit db3f36d33893a180b5cd4fb36e135e21f5ff50de Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:42:50 2011 +0200 Translation update done using Pootle. commit 272bc8bed9f753f1f1b47ad500955d746edaa857 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:42:41 2011 +0200 Translation update done using Pootle. commit 94fec7dee108090b52ac70ba98682b1b04ec3d60 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:42:07 2011 +0200 Translation update done using Pootle. commit b15449d70eb0c3f0d3fbd92d1a7fc87247474e05 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:41:18 2011 +0200 Translation update done using Pootle. commit c628e10a0c2f7d9ce4e2031e6013a741acc48e41 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:41:08 2011 +0200 Translation update done using Pootle. commit 9a201ecee9c71b11fb0e0f8a3c015660de3dcb8d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:39:43 2011 +0200 Translation update done using Pootle. commit 9d6057972c6024b705733543de1720cbf91809ce Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:39:03 2011 +0200 Translation update done using Pootle. commit 3a616c6d59493fcbd4bad5351cf227e3a978508f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:38:55 2011 +0200 Translation update done using Pootle. commit 1b7c84c16861b2f675469fd8d8e76d22c4f2ad06 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:38:45 2011 +0200 Translation update done using Pootle. commit ed303779854a6a7c5a69e65c3420dbe63559e6d5 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:38:32 2011 +0200 Translation update done using Pootle. commit dc3cecad0f3e8c1ec34991e798f8cbcf412bbceb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:38:17 2011 +0200 Translation update done using Pootle. commit 4d03695a1c69ad01c21ec54b008d130f6891308b Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:38:03 2011 +0200 Translation update done using Pootle. commit 931014e28c039a69c7ed5dd3b9734bd563faf480 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:38:02 2011 +0200 Translation update done using Pootle. commit 6a97541d5ab162d6850d3410b3f7f4b93f2adc13 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:37:54 2011 +0200 Translation update done using Pootle. commit e9ca49ce5032fb0e7b07fc08e0cbe9d2d0dd3add Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:37:48 2011 +0200 Translation update done using Pootle. commit 839de5e9355d9c33aaf39096ee4bdc2a95574b92 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:37:25 2011 +0200 Translation update done using Pootle. commit 10fa342c4884672aafe4b305e651081a7a1a8882 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:37:13 2011 +0200 Translation update done using Pootle. commit 90004ab4ad78aa553c4bfa174a5dd1857a023ebe Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:37:04 2011 +0200 Translation update done using Pootle. commit 1e6bdf1a5175dc38963e6fed0c7a0f7615b86bea Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:36:59 2011 +0200 Translation update done using Pootle. commit 7060feffb29e45de09adbcb9df2ad86f150c02da Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:36:47 2011 +0200 Translation update done using Pootle. commit 461a80843f0c4712963efb6f438b717541fdc2cb Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:36:34 2011 +0200 Translation update done using Pootle. commit a9b7894644606f7c2a9dbb888fb6e4c0a633c73d Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:36:13 2011 +0200 Translation update done using Pootle. commit 88fdba9bdbdda02063f33a74d2b2fcb027cb5fbc Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:36:04 2011 +0200 Translation update done using Pootle. commit 9735aeb854d9be623911cb6f13dcb495d074ced0 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:35:58 2011 +0200 Translation update done using Pootle. commit 4662be2cfd0cfd4dc8dff4b71587ece1323bb366 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:35:45 2011 +0200 Translation update done using Pootle. commit 0c19781d38d47113d0a0a35b6af422916f1596b1 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:35:29 2011 +0200 Translation update done using Pootle. commit 6b988f48aae8f6755e5e2c9d4141698f1d2b554f Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:35:19 2011 +0200 Translation update done using Pootle. commit 9da8dabe4a3620429d81565f57922e3b77582091 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:34:54 2011 +0200 Translation update done using Pootle. commit c6014b5f651438de0b1ff3fd6b1c110af27c5ced Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:34:14 2011 +0200 Translation update done using Pootle. commit 1914526c0a6c138245c64c7542aa1738efeb9ff6 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:34:04 2011 +0200 Translation update done using Pootle. commit d39548a66372d4d19e27e96c84049a005b9ad9de Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Sep 13 18:34:01 2011 +0200 Translation update done using Pootle. commit 7a0089c8897dbb48e6bce8d440ee5d92d988df99 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:33:59 2011 +0200 Translation update done using Pootle. commit 909b999d9d778fa5da0879fe73e1e2e31f0b9cbf Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:33:52 2011 +0200 Translation update done using Pootle. commit 56ff0c53c58a2cb28f552e167136883743415f31 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:33:07 2011 +0200 Translation update done using Pootle. commit 9dc58e1ed223295806159df6f353be08bb6615fd Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 18:30:58 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 150 +++++++++++++++++++++------------------------------------- po/fr.po | 160 +++++++++++++++++++++++++++---------------------------------- po/ru.po | 69 ++++++++++++-------------- 3 files changed, 158 insertions(+), 221 deletions(-) diff --git a/po/el.po b/po/el.po index 3aceb04..2cae0ea 100644 --- a/po/el.po +++ b/po/el.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-09-13 12:29-0400\n" -"PO-Revision-Date: 2011-09-12 12:07+0200\n" +"PO-Revision-Date: 2011-09-13 18:57+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" "MIME-Version: 1.0\n" @@ -10611,15 +10611,18 @@ msgid "" "table is supported by MySQL 5.1.6 and onwards. You may still use the server " "charting features however." msgstr "" +"Δυστυχώς ο διακομιστής βάσεων δεδομένων σας δεν υποστηρίζει καταγραφή σε " +"πίνακα, κάτι που είναι προαπαιτούμενο για την ανάλυση των καταγραφών βάσεων " +"δεδομένων με το phpMyAdmin. Η καταγραφή σε πίνακα υποστηρίζεται από την " +"MySQL 5.1.6 και νεότερη. Μπορείτε να χρησιμοποιήσετε παρόλα αυτά τα " +"χαρακτηριστικά διαγραμμάτων του διακομιστή." #: server_status.php:1612 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Παύση εποπτείας" +msgstr "Χρήση της εποπτείας" #: server_status.php:1614 -#, fuzzy #| msgid "" #| "Using the monitor: \n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10638,22 +10641,13 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"Χρήση της εποπτείας: \n" -" Εντάξει, είστε έτοιμοι! Μόλις πατήσετε το «Έναρξη εποπτείας» ο " -"φυλλομετρητής σας θα ανανεώσει όλα τα εμφανιζόμενα διαγράμματα\n" -" ανά ένα τακτικό διάστημα. Μπορείτε να προσθέσετε διαγράμματα και να " -"αλλάξετε τον ρυθμό ανανέωσης από τις «Ρυθμίσεις», ή να απομακρύνετε κάποιο " -"διάγραμμα\n" -" χρησιμοποιώντας το εικονίδιο γρανάζι για κάθε διάγραμμα.\n" -" Όταν δείτε ένα ξαφνικό μέγιστο, επιλέξτε την αντίστοιχη επέκταση " -"χρόνου σε οποιοδήποτε διάγραμμα έχοντας πατημένο το\n" -" αριστερό πλήκτρο του ποντικιού και μετακινηθείτε μέσα στο διάγραμμα. " -"Αυτό θα φορτώσει τα απαιτούμενα στατιστικά από τις καταγραφές βοηθόντας να " -"βρείτε τι προκάλεσε αυτή\n" -" την έντονη δραστηριότητα." +"Εντάξει, μπορείς να πηγαίνετε! Μόλις πατήσετε το «Έναρξη εποπτείας» ο " +"φυλλομετρητής σας θα ανανεώσει όλα τα προβαλλόμενα διαγράμματα σε τακτό " +"χρονικό διάστημα. Μπορείτε να προσθέσετε διαγράμματα και να αλλάξετε το " +"ρυθμό ανανέωσης από τις «Ρυθμίσεις» ή να απομακρύνετε οποιοδήποτε διάγραμμα " +"πατώντας το γρανάζι σε κάθε διάγραμμα." #: server_status.php:1616 -#, fuzzy #| msgid "" #| "Using the monitor: \n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10672,19 +10666,11 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" -"Χρήση της εποπτείας: \n" -" Εντάξει, είστε έτοιμοι! Μόλις πατήσετε το «Έναρξη εποπτείας» ο " -"φυλλομετρητής σας θα ανανεώσει όλα τα εμφανιζόμενα διαγράμματα\n" -" ανά ένα τακτικό διάστημα. Μπορείτε να προσθέσετε διαγράμματα και να " -"αλλάξετε τον ρυθμό ανανέωσης από τις «Ρυθμίσεις», ή να απομακρύνετε κάποιο " -"διάγραμμα\n" -" χρησιμοποιώντας το εικονίδιο γρανάζι για κάθε διάγραμμα.\n" -" Όταν δείτε ένα ξαφνικό μέγιστο, επιλέξτε την αντίστοιχη επέκταση " -"χρόνου σε οποιοδήποτε διάγραμμα έχοντας πατημένο το\n" -" αριστερό πλήκτρο του ποντικιού και μετακινηθείτε μέσα στο διάγραμμα. " -"Αυτό θα φορτώσει τα απαιτούμενα στατιστικά από τις καταγραφές βοηθόντας να " -"βρείτε τι προκάλεσε αυτή\n" -" την έντονη δραστηριότητα." +"Για να προβάλετε ερωτήματα από τις καταγραφές, επιλέξτε το αντίστοιχο " +"χρονικό εύρος σε οποιοδήποτε διάγραμμα έχοντας πατημένο το πλήκτρο το " +"ποντικιού και σαρώνοντας την επιφάνεια του διαγράμματος. Μόλις το " +"επιβεβαιώσετε, θα φορτωθεί ένας πίνακας ομαδοποιημένων ερωτημάτων, οπού εκεί " +"μπορείτε να πατήσετε οποιαδήποτε δήλωση SELECTγια περαιτέρω ανάλυση." #: server_status.php:1623 msgid "Please note:" @@ -10717,10 +10703,9 @@ msgstr "" " " #: server_status.php:1637 -#, fuzzy #| msgid "Remove chart" msgid "Preset chart" -msgstr "Απομάκρυνση διαγράμματος" +msgstr "Προκαθορισμός διαγράμματος" #: server_status.php:1641 msgid "Status variable(s)" @@ -10781,14 +10766,11 @@ msgstr "" "ομαδοποιήση" #: server_status.php:1713 -#, fuzzy #| msgid "" #| "Choose from which log you want the statistics to be generated from.</" #| "p> Results are grouped by query text." msgid "Choose from which log you want the statistics to be generated from." -msgstr "" -"Επιλέξτε από ποια καταγραφή θέλετε να προκύψουν τα στατιστικά. Τα " -"αποτελέσματα ομοδοποιούνται ανά κείμενο ερωτήματος." +msgstr "Επιλέξτε από ποια καταγραφή θέλετε να δημιουργούνται τα στατιστικά." #: server_status.php:1715 msgid "Results are grouped by query text." @@ -10900,10 +10882,9 @@ msgstr "" "Η βάση δεδομένων προορισμού συγχρονίστηκε με τη βάση δεδομένων προέλευσης" #: server_synchronize.php:1046 -#, fuzzy #| msgid "Issued queries" msgid "Executed queries" -msgstr "Δωθέντα ερωτήματα" +msgstr "Εκτελεσμένα ερωτήματα" #: server_synchronize.php:1192 msgid "Enter manually" @@ -10953,6 +10934,8 @@ msgstr "Λήψη" #: setup/frames/form.inc.php:25 msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgstr "" +"Λανθασμένο σύνολο φόρμας, ελέγξτε τη ακολουθία $formsets στο " +"setup/frames/form.inc.php" #: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" @@ -11285,10 +11268,9 @@ msgstr "" "χαρακτήρες." #: setup/validate.php:22 -#, fuzzy #| msgid "No data" msgid "Wrong data" -msgstr "Δεν υπάρχουν δεδομένα" +msgstr "Εσφαλμένα δεδομένα" #: sql.php:214 #, php-format @@ -11503,10 +11485,9 @@ msgid "No index parts defined!" msgstr "Δεν ορίστηκαν τα στοιχεία του ευρετηρίου!" #: tbl_indexes.php:169 -#, fuzzy #| msgid "Create a new index" msgid "Create an index" -msgstr "Δημιουργία νέου ευρετηρίου" +msgstr "Δημιουργία ευρετηρίου" #: tbl_indexes.php:171 msgid "Modify an index" @@ -11790,10 +11771,9 @@ msgid "Show more actions" msgstr "Προβολή περισσοτέρων δράσεων" #: tbl_structure.php:606 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "Εμφάνιση για εκτύπωση" +msgstr "Επεξεργασία εμφάνισης" #: tbl_structure.php:623 msgid "Relation view" @@ -11983,32 +11963,28 @@ msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns" msgstr "Εκτέλεσε ένα «επερώτημα κατά παράδειγμα» (χαρακτήρας μπαλαντέρ «%»)" #: tbl_zoom_select.php:135 -#, fuzzy #| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Απόκρυψη κριτηρίων αναζήτησης" +msgstr "Πρόσθετα κριτήρια αναζήτησης" #: tbl_zoom_select.php:258 -#, fuzzy #| msgid "Label" msgid "Data Label" -msgstr "Ετικέτα" +msgstr "Ετικέτα Δεδομένων" #: tbl_zoom_select.php:276 -#, fuzzy #| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Μέγιστος αριθμός γραμμών για προβολή" +msgstr "Μέγιστος αριθμός γραμμών για εκτύπωση" #: tbl_zoom_select.php:368 msgid "Browse/Edit the points" msgstr "Αναζήτηση/Επεξεργασία των σημείων" #: tbl_zoom_select.php:375 -#, fuzzy #| msgid "Control user" msgid "How to use" -msgstr "Έλεγχος χρήστη" +msgstr "Πως να το χρησιμοποιήσετε" #: themes.php:28 msgid "Get more themes!" @@ -12072,10 +12048,9 @@ msgid "The uptime is only %s" msgstr "Ο χρόνος λειτουργίας είναι μόνο %s" #: po/advisory_rules.php:10 -#, fuzzy #| msgid "Questions" msgid "Questions below 1,000" -msgstr "Ερωτήσεις" +msgstr "Ερωτήσεις κάτω από 1.000" #: po/advisory_rules.php:11 msgid "" @@ -12090,16 +12065,15 @@ msgid "" msgstr "" #: po/advisory_rules.php:13 -#, fuzzy, php-format +#, php-format #| msgid "Current connection" msgid "Current amount of Questions: %s" -msgstr "Τρέχουσα σύνδεση" +msgstr "Τρέχουσα ποσότητα ερωτήσεων: %s" #: po/advisory_rules.php:15 -#, fuzzy #| msgid "Show SQL queries" msgid "Percentage of slow queries" -msgstr "Εμφάνιση ερωτημάτων SQL" +msgstr "Ποσοστό αργών ερωτημάτων" #: po/advisory_rules.php:16 msgid "" @@ -12118,10 +12092,9 @@ msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" #: po/advisory_rules.php:20 -#, fuzzy #| msgid "Flush query cache" msgid "Slow query rate" -msgstr "Εκκαθάριση λανθάνουσας μνήμης ερωτημάτων" +msgstr "Βαθμός αργών ερωτημάτων" #: po/advisory_rules.php:21 msgid "" @@ -12136,10 +12109,9 @@ msgid "" msgstr "" #: po/advisory_rules.php:25 -#, fuzzy #| msgid "SQL queries" msgid "Long query time" -msgstr "Ερωτήματα SQL" +msgstr "Χρόνος μακρού ερωτήματος" #: po/advisory_rules.php:26 msgid "" @@ -12154,22 +12126,20 @@ msgid "" msgstr "" #: po/advisory_rules.php:28 -#, fuzzy, php-format +#, php-format #| msgid "long_query_time is set to %d second(s)." msgid "long_query_time is currently set to %ds." -msgstr "Το long_query_time έχει οριστεί σε %d δευτερόλεπτο(α)." +msgstr "Το long_query_time έχει οριστεί σε %dδ." #: po/advisory_rules.php:30 -#, fuzzy #| msgid "Show query box" msgid "Slow query logging" -msgstr "Προβολή παραθύρου ερωτήματος" +msgstr "Καταγραφή αργού ερωτήματος" #: po/advisory_rules.php:31 -#, fuzzy #| msgid "slow_query_log is enabled." msgid "The slow query log is disabled." -msgstr "Το slow_query_log είναι ενεργοποιημένα." +msgstr "Η καταγραφή αργού ερωτήματος είναι απενεργοποιημένη." #: po/advisory_rules.php:32 msgid "" @@ -12182,10 +12152,9 @@ msgid "log_slow_queries is set to 'OFF'" msgstr "Το log_slow_queries έχει οριστεί σε «ΑΝΕΝΕΡΓΟ»" #: po/advisory_rules.php:35 -#, fuzzy #| msgid "Clear series" msgid "Release Series" -msgstr "Εκκαθάριση σειράς" +msgstr "Σειρές Δημοσίευσης" #: po/advisory_rules.php:36 msgid "The MySQL server version less then 5.1." @@ -12198,20 +12167,19 @@ msgid "" msgstr "" #: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48 -#, fuzzy, php-format +#, php-format #| msgid "Create version" msgid "Current version: %s" -msgstr "Δημιουργία έκδοσης" +msgstr "Τρέχουσα έκδοση: %s" #: po/advisory_rules.php:40 po/advisory_rules.php:45 -#, fuzzy #| msgid "Version" msgid "Minor Version" -msgstr "Έκδοση" +msgstr "Μικρή Έκδοση" #: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Έκδοση μικρότερη από 5.1.30 (η πρώτη GA δημοσίευση της 5.1)." #: po/advisory_rules.php:42 msgid "" @@ -12221,19 +12189,17 @@ msgstr "" #: po/advisory_rules.php:46 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Έκδοση μικρότερη από 5.5.8 (η πρώτη GA δημοσίευση της 5.5)." #: po/advisory_rules.php:47 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "Πρέπει να αναβαθμίσετε σε %s %s ή νεότερη." +msgstr "Πρέπει να αναβαθμίσετε σε σταθερή έκδοση της MySQL 5.5" #: po/advisory_rules.php:50 po/advisory_rules.php:55 po/advisory_rules.php:60 -#, fuzzy #| msgid "Description" msgid "Distribution" -msgstr "Περιγραφή" +msgstr "Διανομή" #: po/advisory_rules.php:51 msgid "Version is compiled from source, not a MySQL official binary." @@ -12272,14 +12238,13 @@ msgid "Version string (%s) matches Drizzle versioning scheme" msgstr "" #: po/advisory_rules.php:65 -#, fuzzy #| msgid "MySQL charset" msgid "MySQL Architecture" -msgstr "Σύνολο χαρακτήρων MySQL" +msgstr "Αρχιτεκτονική MySQL" #: po/advisory_rules.php:66 msgid "MySQL is not compiled as a 64-bit package." -msgstr "" +msgstr "Η MySQL δεν δομήθηκε ως πακέτο 64-bit." #: po/advisory_rules.php:67 msgid "" @@ -12294,16 +12259,14 @@ msgid "Available memory on this host: %s" msgstr "Διαθέσιμη μνήμη σε αυτό το φιλοξενητή: %s" #: po/advisory_rules.php:70 -#, fuzzy #| msgid "Query cache" msgid "Query cache disabled" -msgstr "Λανθάνουσα μνήμη ερωτήματος" +msgstr "Η λανθάνουσα μνήμη είναι απενεργοποιημένη" #: po/advisory_rules.php:71 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is not enabled." -msgstr "Ο διακομιστής δεν αποκρίνεται" +msgstr "Η λανθάνουσα μνήμη ερωτήματος δεν είναι ενεργοποιημένη." #: po/advisory_rules.php:72 msgid "" @@ -12318,10 +12281,9 @@ msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" msgstr "" #: po/advisory_rules.php:75 -#, fuzzy #| msgid "Query cache" msgid "Query caching method" -msgstr "Λανθάνουσα μνήμη ερωτήματος" +msgstr "Μέθοδος λανθάνουσας μνήμης ερωτήματος" #: po/advisory_rules.php:76 msgid "Suboptimal caching method." @@ -12360,9 +12322,8 @@ msgid "The current query cache hit rate of %s%% is below 20%%" msgstr "" #: po/advisory_rules.php:85 -#, fuzzy msgid "Query Cache usage" -msgstr "Λανθάνουσα μνήμη ερωτήματος" +msgstr "Χρήση λανθάνουσας μνήμης ερωτήματος" #: po/advisory_rules.php:86 #, php-format @@ -12383,14 +12344,13 @@ msgid "" msgstr "" #: po/advisory_rules.php:90 -#, fuzzy #| msgid "Query cache" msgid "Query cache fragmentation" -msgstr "Λανθάνουσα μνήμη ερωτήματος" +msgstr "Συγκρότηση λανθάνουσας μνήμης ερωτήματος" #: po/advisory_rules.php:91 msgid "The query cache is considerably fragmented." -msgstr "" +msgstr "Η λανθάνουσας μνήμης ερωτήματος είναι αρκετά συγκροτημένη." #: po/advisory_rules.php:92 msgid "" diff --git a/po/fr.po b/po/fr.po index 50fbcdd..817f9bf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-09-13 12:29-0400\n" -"PO-Revision-Date: 2011-09-09 12:45+0200\n" +"PO-Revision-Date: 2011-09-13 18:57+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -6842,17 +6842,18 @@ msgid "" "You tried to import an invalid file or the imported file contains invalid " "data" msgstr "" +"Vous avez tenté d'importer un fichier invalide ou ce fichier contient des " +"données invalides." #: libraries/import/shp.php:333 #, php-format msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." -msgstr "" +msgstr "Les données spatiales MySQL ne supportent pas le type ESRI «%s»." #: libraries/import/shp.php:371 -#, fuzzy #| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" -msgstr "Cette page ne contient aucune table!" +msgstr "Le fichier importé ne contient aucune donnée." #: libraries/import/sql.php:33 msgid "SQL compatibility mode:" @@ -7377,14 +7378,12 @@ msgid "Execute every" msgstr "Exécuter chaque" #: libraries/rte/rte_events.lib.php:449 -#, fuzzy #| msgid "Start" msgctxt "Start of recurring event" msgid "Start" msgstr "Départ" #: libraries/rte/rte_events.lib.php:457 -#, fuzzy #| msgid "End" msgctxt "End of recurring event" msgid "End" @@ -7896,7 +7895,7 @@ msgstr "Jeux de caractères" #: libraries/server_links.inc.php:104 server_plugins.php:47 #: server_plugins.php:80 msgid "Plugins" -msgstr "" +msgstr "Plug-ins" #: libraries/server_links.inc.php:108 msgid "Engines" @@ -8182,16 +8181,14 @@ msgid "Operator" msgstr "Opérateur" #: libraries/tbl_select.lib.php:128 -#, fuzzy #| msgid "Search" msgid "Table Search" -msgstr "Rechercher" +msgstr "Recherche dans la table" #: libraries/tbl_select.lib.php:205 tbl_change.php:1002 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "Insérer" +msgstr "Modifier/Insérer" #: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -8371,10 +8368,9 @@ msgid "General Settings" msgstr "Paramètres généraux" #: main.php:101 -#, fuzzy #| msgid "MySQL connection collation" msgid "Server connection collation" -msgstr "Interclassement pour la connexion MySQL" +msgstr "Interclassement pour la connexion au serveur" #: main.php:116 msgid "Appearance Settings" @@ -8385,20 +8381,18 @@ msgid "More settings" msgstr "Plus de paramètres" #: main.php:156 -#, fuzzy #| msgid "Database for user" msgid "Database server" -msgstr "Base de données pour cet utilisateur" +msgstr "Serveur de base de données" #: main.php:159 msgid "Software" -msgstr "" +msgstr "Logiciel" #: main.php:160 -#, fuzzy #| msgid "Show versions" msgid "Software version" -msgstr "Montrer les versions" +msgstr "Version du logiciel" #: main.php:161 msgid "Protocol version" @@ -8411,20 +8405,18 @@ msgid "User" msgstr "Utilisateur" #: main.php:167 -#, fuzzy #| msgid "Server socket" msgid "Server charset" -msgstr "Interface de connexion socket" +msgstr "Jeu de caractères du serveur" #: main.php:179 msgid "Web server" msgstr "Serveur web" #: main.php:190 -#, fuzzy #| msgid "Use light version" msgid "Database client version" -msgstr "Active l'affichage léger" +msgstr "Version du client de base de données" #: main.php:192 msgid "PHP extension" @@ -8567,10 +8559,9 @@ msgid "No databases" msgstr "Aucune base de données" #: navigation.php:270 -#, fuzzy #| msgid "filter tables by name" msgid "Filter tables by name" -msgstr "filtrer par nom de table" +msgstr "Filtrer par nom de table" #: navigation.php:303 navigation.php:304 msgctxt "short form" @@ -8921,7 +8912,7 @@ msgstr "Schéma et/ou contenu des bases de données" #: server_plugins.php:81 msgid "Modules" -msgstr "" +msgstr "Modules" #: server_plugins.php:102 msgid "Begin" @@ -8929,15 +8920,15 @@ msgstr "Début" #: server_plugins.php:111 msgid "Plugin" -msgstr "" +msgstr "Plug-in" #: server_plugins.php:112 server_plugins.php:146 msgid "Module" -msgstr "" +msgstr "Module" #: server_plugins.php:113 server_plugins.php:148 msgid "Library" -msgstr "" +msgstr "Bibliothèque" #: server_plugins.php:114 server_plugins.php:149 tbl_tracking.php:635 msgid "Version" @@ -8945,17 +8936,16 @@ msgstr "Version" #: server_plugins.php:115 server_plugins.php:150 msgid "Author" -msgstr "" +msgstr "Auteur" #: server_plugins.php:116 server_plugins.php:151 msgid "License" msgstr "Licence" #: server_plugins.php:182 -#, fuzzy #| msgid "Disabled" msgid "disabled" -msgstr "Désactivé" +msgstr "désactivé" #: server_privileges.php:32 server_privileges.php:364 msgid "Includes all privileges except GRANT." @@ -9659,10 +9649,9 @@ msgid "Monitor" msgstr "Surveillance" #: server_status.php:779 -#, fuzzy #| msgid "Apply a divisor" msgid "Advisor" -msgstr "Appliquer un diviseur" +msgstr "Conseiller" #: server_status.php:789 server_status.php:811 msgid "Refresh rate: " @@ -9681,32 +9670,31 @@ msgid "Filter by category..." msgstr "Filtrer par catégorie..." #: server_status.php:855 -#, fuzzy #| msgid "Show only alert values" msgid "Show unformatted values" -msgstr "Afficher uniquement les valeurs d'alerte" +msgstr "Afficher les valeurs non formattées" #: server_status.php:859 msgid "Related links:" msgstr "Liens connexes:" #: server_status.php:892 -#, fuzzy #| msgid "Query analyzer" msgid "Run analyzer" -msgstr "Analyseur de requêtes" +msgstr "Lancer l'analyseur" #: server_status.php:893 -#, fuzzy #| msgid "Introduction" msgid "Instructions" -msgstr "Introduction" +msgstr "Consignes" #: server_status.php:900 msgid "" "The Advisor system can provide recommendations on server variables by " "analyzing the server status variables." msgstr "" +"Le conseiller peut donner des recommandations au sujet des variables de " +"serveur." #: server_status.php:902 msgid "" @@ -9714,6 +9702,8 @@ msgid "" "calculations and by rule of thumb which may not necessarily apply to your " "system." msgstr "" +"Veuillez noter que ce système se base sur de simples calculs et des règles " +"de base qui ne s'appliquent pas nécessairement à votre serveur." #: server_status.php:904 msgid "" @@ -9721,6 +9711,9 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" +"Avant de procéder à un changement, assurez-vous d'en connaître l'impact " +"(lisez la documentation) et de savoir comment défaire le changement. Un " +"réglage incorrect peut affecter négativement la performance." #: server_status.php:906 msgid "" @@ -9728,6 +9721,9 @@ msgid "" "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." msgstr "" +"La meilleure méthode est d'effectuer un changement à la fois, observer votre " +"serveur et défaire le changement si aucune amélioration mesurable ne s'est " +"produite." #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:928 @@ -10538,25 +10534,24 @@ msgid "Refresh rate" msgstr "Taux de rafraîchissement" #: server_status.php:1572 -#, fuzzy #| msgid "Chart columns:" msgid "Chart columns" -msgstr "Colonnes du graphique :" +msgstr "Colonnes du graphique" #: server_status.php:1588 -#, fuzzy #| msgid "Error management:" msgid "Chart arrangement" -msgstr "Gestion des erreurs : " +msgstr "Disposition du graphique" #: server_status.php:1588 msgid "" "The arrangement of the charts is stored to the browsers local storage. You " "may want to export it if you have a complicated set up." msgstr "" +"La disposition du graphique est stockée dans le navigateur. Vous pouvez " +"vouloir l'exporter si vous avez une configuration complexe." #: server_status.php:1589 -#, fuzzy #| msgid "Restore default value" msgid "Reset to default" msgstr "Ramener la valeur par défaut" @@ -10586,15 +10581,17 @@ msgid "" "table is supported by MySQL 5.1.6 and onwards. You may still use the server " "charting features however." msgstr "" +"Votre serveur ne supporte pas l'enregistrement du journal vers une table, ce " +"qui est requis pour l'analyse des journaux par phpMyAdmin. Cette fonction " +"est supportée par MySQL 5.1.6 et supérieur. Vous pouvez tout de même " +"utiliser les graphiques de serveur." #: server_status.php:1612 -#, fuzzy #| msgid "Pause monitor" msgid "Using the monitor:" -msgstr "Mettre la surveillance en pause" +msgstr "Utilisation de la surveillance :" #: server_status.php:1614 -#, fuzzy #| msgid "" #| "Using the monitor: Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10610,18 +10607,13 @@ msgid "" "change the refresh rate under 'Settings', or remove any chart using the cog " "icon on each respective chart." msgstr "" -"Utilisation de la surveillance : Vous êtes maintenant prêt! " -"Après avoir cliqué sur «Démarrer la surveillance», votre navigateur va " -"rafraîchir les graphiques à intervalle régulier. Vous pouvez ajouter des " -"graphiques et modifier le taux de rafraîchissement sous «Paramètres», ou " -"supprimer tout graphique via l'cône de rouage.Lorsque vous constatez un " -"pic d'activité soudain, sélectionnez la portion de temps pertinent sur l'un " -"des graphiques en tenant enfoncé le bouton gauche de la souris et en vous " -"déplaçant sur le graphique. Ceci va charger les statistiques à partir des " -"journaux et vous aidera à trouver la cause du pic dans l'activité." +"Vous êtes maintenant prêt! Après avoir cliqué sur «Démarrer la " +"surveillance», votre navigateur va rafraîchir les graphiques à intervalle " +"régulier. Vous pouvez ajouter des graphiques et modifier le taux de " +"rafraîchissement sous «Paramètres», ou supprimer tout graphique via l'cône " +"de rouage." #: server_status.php:1616 -#, fuzzy #| msgid "" #| "Using the monitor: Ok, you are good to go! Once you click " #| "'Start monitor' your browser will refresh all displayed charts in a " @@ -10637,22 +10629,17 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occuring SELECT statements to further analyze them." msgstr "" -"Utilisation de la surveillance : Vous êtes maintenant prêt! " -"Après avoir cliqué sur «Démarrer la surveillance», votre navigateur va " -"rafraîchir les graphiques à intervalle régulier. Vous pouvez ajouter des " -"graphiques et modifier le taux de rafraîchissement sous «Paramètres», ou " -"supprimer tout graphique via l'cône de rouage.Lorsque vous constatez un " -"pic d'activité soudain, sélectionnez la portion de temps pertinent sur l'un " -"des graphiques en tenant enfoncé le bouton gauche de la souris et en vous " -"déplaçant sur le graphique. Ceci va charger les statistiques à partir des " -"journaux et vous aidera à trouver la cause du pic dans l'activité." +"Pour afficher des requêtes à partir des journaux, sélectionnez la portion de " +"temps pertinente sur l'un des graphiques en tenant enfoncé le bouton gauche " +"de la souris et en vous déplaçant sur le graphique. Ceci va charger les " +"statistiques sous forme de requêtes groupées, par la suite vous pouvez " +"cliquer sur tout énoncé SELECT pour une analyse plus poussée." #: server_status.php:1623 msgid "Please note:" -msgstr "" +msgstr "Note :" #: server_status.php:1625 -#, fuzzy #| msgid "" #| "Please note: Enabling the general_log may increase the server load " #| "by 5-15%. Also be aware that generating statistics from the logs is a " @@ -10665,17 +10652,16 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" -"À noter :Activer le journal general_log peut causer une augmentation " -"de charge de 5 à 15%. Également, la génération des statistiques à partir des " -"journaux est une tâche intensive, donc il est suggéré de ne sélectionner " -"qu'une petite portion de temps et de désactiver general_log puis de vider la " -"table correspondante lorsque la surveillance n'est plus requise." +"Activer le journal general_log peut causer une augmentation de charge de 5 à " +"15%. Également, la génération des statistiques à partir des journaux est " +"une tâche intensive, donc il est suggéré de ne sélectionner qu'une petite " +"portion de temps et de désactiver general_log puis de vider la table " +"correspondante lorsque la surveillance n'est plus requise." #: server_status.php:1637 -#, fuzzy #| msgid "Remove chart" msgid "Preset chart" -msgstr "Supprimer le graphique" +msgstr "Graphique prédéfini" #: server_status.php:1641 msgid "Status variable(s)" @@ -10735,18 +10721,15 @@ msgstr "" "Enlever les données variables des énoncés INSERT pour un meilleur groupement" #: server_status.php:1713 -#, fuzzy #| msgid "" #| "Choose from which log you want the statistics to be generated from.</" #| "p> Results are grouped by query text." msgid "Choose from which log you want the statistics to be generated from." -msgstr "" -"Choississez depuis quel journal les statistiques doivent être générées.</" -"p>Les résultats sont regroupés par le texte des requêtes." +msgstr "Choisissez depuis quel journal les statistiques doivent être générées." #: server_status.php:1715 msgid "Results are grouped by query text." -msgstr "" +msgstr "Les résultats sont regroupés par le texte des requêtes." #: server_status.php:1720 msgid "Query analyzer" @@ -10849,10 +10832,9 @@ msgid "Target database has been synchronized with source database" msgstr "La base cible a été synchronizée avec la base source" #: server_synchronize.php:1046 -#, fuzzy #| msgid "Issued queries" msgid "Executed queries" -msgstr "Requêtes reçues" +msgstr "Requêtes exécutées" #: server_synchronize.php:1192 msgid "Enter manually" @@ -10902,6 +10884,8 @@ msgstr "Télécharger" #: setup/frames/form.inc.php:25 msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgstr "" +"Jeu de formulaires incorrect, vérifiez le tableau $formsets dans " +"setup/frames/form.inc.php" #: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" @@ -11013,7 +10997,7 @@ msgstr "Ajouter un serveur" #: setup/index.php:22 msgid "Wrong GET file attribute value" -msgstr "" +msgstr "Valeur incorrecte de l'attribut GET file" #: setup/lib/form_processing.lib.php:43 msgid "Warning" @@ -11225,10 +11209,9 @@ msgstr "" "spéciaux." #: setup/validate.php:22 -#, fuzzy #| msgid "No data" msgid "Wrong data" -msgstr "Aucune donnée" +msgstr "Données incorrectes" #: sql.php:214 #, php-format @@ -11443,10 +11426,9 @@ msgid "No index parts defined!" msgstr "Aucune colonne n'a été définie pour cet index!" #: tbl_indexes.php:169 -#, fuzzy #| msgid "Create a new index" msgid "Create an index" -msgstr "Créer un nouvel index" +msgstr "Créer un index" #: tbl_indexes.php:171 msgid "Modify an index" @@ -11628,7 +11610,7 @@ msgstr "Taille enr. " #: tbl_printview.php:388 tbl_structure.php:904 msgid "Next autoindex" -msgstr "" +msgstr "Prochain index automatique" #: tbl_relation.php:276 #, php-format diff --git a/po/ru.po b/po/ru.po index 92abc42..58f0020 100644 --- a/po/ru.po +++ b/po/ru.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-09-13 12:29-0400\n" -"PO-Revision-Date: 2011-09-12 17:49+0200\n" +"PO-Revision-Date: 2011-09-13 20:02+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "MIME-Version: 1.0\n" @@ -1584,13 +1584,15 @@ msgstr "Затронуто строк:" #: js/messages.php:188 msgid "Failed parsing config file. It doesn't seem to be valid JSON code" -msgstr "" +msgstr "Ошибка при разборе конфигурационного файла. Не корректный код JSON." #: js/messages.php:189 msgid "" "Failed building chart grid with imported config. Resetting to default " "config..." msgstr "" +"Ошибка построения сетки графика из импортированной конфигурации. Сброшено на " +"изначальную конфигурацию..." #: js/messages.php:190 libraries/config/messages.inc.php:170 #: libraries/db_links.inc.php:82 libraries/server_links.inc.php:69 @@ -1600,48 +1602,44 @@ msgid "Import" msgstr "Импорт" #: js/messages.php:192 -#, fuzzy #| msgid "Update Query" msgid "Analyse Query" -msgstr "Дополнить запрос" +msgstr "Анализ запроса" #: js/messages.php:196 msgid "Advisor system" -msgstr "" +msgstr "Системный советник" #: js/messages.php:197 msgid "Possible performance issues" -msgstr "" +msgstr "Возможные проблемы производительности" #: js/messages.php:198 msgid "Issue" -msgstr "" +msgstr "Проблема" #: js/messages.php:199 -#, fuzzy #| msgid "Documentation" msgid "Recommendation" -msgstr "Документация" +msgstr "Рекомендация" #: js/messages.php:200 -#, fuzzy #| msgid "Details" msgid "Rule details" -msgstr "Детали" +msgstr "Подробности правил" #: js/messages.php:201 -#, fuzzy #| msgid "Authentication" msgid "Justification" -msgstr "Идентификация" +msgstr "Обоснование" #: js/messages.php:202 msgid "Used variable / formula" -msgstr "" +msgstr "Использованная переменная / формула" #: js/messages.php:203 msgid "Test" -msgstr "" +msgstr "Тест" #: js/messages.php:208 libraries/tbl_properties.inc.php:758 #: pmd_general.php:382 pmd_general.php:419 pmd_general.php:539 @@ -1706,16 +1704,14 @@ msgid "Insert Table" msgstr "Вставить таблицу" #: js/messages.php:230 -#, fuzzy #| msgid "Add index" msgid "Hide indexes" -msgstr "Добавить индекс" +msgstr "Скрыть индексы" #: js/messages.php:231 -#, fuzzy #| msgid "Show grid" msgid "Show indexes" -msgstr "Отображать сетку" +msgstr "Отображать индексы" #: js/messages.php:234 msgid "Searching" @@ -1766,10 +1762,9 @@ msgid "Change" msgstr "Изменить" #: js/messages.php:252 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Максимальное время выполнения" +msgstr "Время выполнения запроса" #: js/messages.php:255 libraries/config/FormDisplay.tpl.php:323 #: libraries/schema/User_Schema.class.php:351 @@ -1788,52 +1783,51 @@ msgid "Show search criteria" msgstr "Отобразить параметры поиска" #: js/messages.php:262 libraries/tbl_select.lib.php:135 -#, fuzzy #| msgid "Search" msgid "Zoom Search" -msgstr "Поиск" +msgstr "Поиск с приближением" #: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "Каждая точка представляет строку данных." #: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "Задержание курсора над точкой отобразит ее название." #: js/messages.php:268 msgid "Use mousewheel to zoom in or out of the plot." -msgstr "" +msgstr "Используйте колесо мышки для увеличения или уменьшения участка." #: js/messages.php:270 msgid "Click and drag the mouse to navigate the plot." -msgstr "" +msgstr "Кликните и перетащите мышкой для перемещения участка." #: js/messages.php:272 msgid "Click reset zoom link to come back to original state." msgstr "" +"Кликните ссылку сброса увеличения для возвращения к исходному состоянию." #: js/messages.php:274 msgid "Click a data point to view and possibly edit the data row." -msgstr "" +msgstr "Кликните точку данных для просмотра или редактирования строки данных." #: js/messages.php:276 msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "" +msgstr "Можно изменить размер участка перетащив его вдоль нижнего правого угла." #: js/messages.php:278 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "Для построения графиков, строки конвертируются в числа." #: js/messages.php:280 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "Добавить/удалить столбцы" +msgstr "Выберите два столбца" #: js/messages.php:281 msgid "Select two different columns" -msgstr "" +msgstr "Выберите два различных столбца" #: js/messages.php:284 tbl_change.php:321 tbl_indexes.php:211 #: tbl_indexes.php:238 @@ -1845,10 +1839,9 @@ msgid "Copy" msgstr "Копировать" #: js/messages.php:300 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Добавить столбец" +msgstr "Добавить столбцы" #: js/messages.php:303 msgid "Select referenced key" @@ -1882,13 +1875,15 @@ msgstr "Добавить параметр для столбца" #: js/messages.php:313 msgid "Press escape to cancel editing" -msgstr "" +msgstr "Для отмены редактирования нажмите кнопку Esc" #: js/messages.php:314 msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" msgstr "" +"Вы отредактировали некоторые данные, но изменения не были сохранены. Вы " +"уверены, что хотите покинуть данную страницу без сохранения данных?" #: js/messages.php:315 msgid "Drag to reorder" @@ -1904,7 +1899,7 @@ msgstr "Кликнуть для снятия/установки отметки" #: js/messages.php:318 msgid "Click the drop-down arrow to toggle column's visibility" -msgstr "" +msgstr "Кликните выпадающую стрелку для переключения видимости столбцов" #: js/messages.php:320 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-19005-gdd81bf8
by Madhura Jayaratne 14 Sep '11

14 Sep '11

The branch, master has been updated via dd81bf847ae2d055aabdd24ca379575297eeae41 (commit) via 9d83d2fc35482424125b065cfac09e7ce04ebb09 (commit) via 29a8f3f32c50d359496f56da458b68d721ddb6ab (commit) via c1c81ed80aff6a870aea4fa84e05de79fb2c5836 (commit) via 1f6bd00b15ef9806820822316765b450f1e885b3 (commit) via e3bcd9f7cff628841ee158ffeb01b6df9990c900 (commit) via c3bb40cbce8a3e055fdd0ec98f9468f5d859ee00 (commit) from 110c1e4a59f1e45f3a4586ed970fc73d9fd8ff0e (commit) - Log ----------------------------------------------------------------- commit dd81bf847ae2d055aabdd24ca379575297eeae41 Merge: 9d83d2f 110c1e4 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 10:22:02 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 9d83d2fc35482424125b065cfac09e7ce04ebb09 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 10:06:54 2011 +0530 Load jquery.sprintf.js on demand commit 29a8f3f32c50d359496f56da458b68d721ddb6ab Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Wed Sep 14 07:56:50 2011 +0530 Load scripts from cache when they are available commit c1c81ed80aff6a870aea4fa84e05de79fb2c5836 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 13 21:52:52 2011 +0530 Load OpenLayers.js in a synchronous manner. commit 1f6bd00b15ef9806820822316765b450f1e885b3 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 13 19:03:43 2011 +0530 Revert changes to loadJavascript() method commit e3bcd9f7cff628841ee158ffeb01b6df9990c900 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 13 08:31:10 2011 +0530 JS files for gis_data_editor loaded dynamically commit c3bb40cbce8a3e055fdd0ec98f9468f5d859ee00 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Tue Sep 13 08:28:16 2011 +0530 OpenStreetMaps.js merged into OpenLayers.js ----------------------------------------------------------------------- Summary of changes: js/functions.js | 2 +- js/gis_data_editor.js | 92 ++++++++++++++++++++++++++----- js/openlayers/OpenLayers.js | 130 ++++++++++++++++++++++++++++++++++++++++++- js/tbl_change.js | 7 ++- sql.php | 9 --- tbl_change.php | 9 --- tbl_select.php | 9 --- 7 files changed, 214 insertions(+), 44 deletions(-) diff --git a/js/functions.js b/js/functions.js index b27dcc4..b0fc717 100644 --- a/js/functions.js +++ b/js/functions.js @@ -3325,7 +3325,7 @@ loadJavascript=function(file) { } else { $('head').append('<script type="text/javascript" src="'+file+'"></script>'); } -} +}; $(document).ready(function() { /** diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js index 6fb3d7b..f77e286 100644 --- a/js/gis_data_editor.js +++ b/js/gis_data_editor.js @@ -5,6 +5,8 @@ * */ +var gisEditorLoaded = false; + /** * Closes the GIS data editor and perform necessary clean up work. */ @@ -78,7 +80,7 @@ function initGISEditorVisualization() { } /** - * Opens up the GIS data editor. + * Loads JavaScript files and the GIS editor. * * @param value current value of the geometry field * @param field field name @@ -86,17 +88,56 @@ function initGISEditorVisualization() { * @param input_name name of the input field * @param token token */ -function openGISEditor(value, field, type, input_name, token) { - // Center the popup - var windowWidth = document.documentElement.clientWidth; - var windowHeight = document.documentElement.clientHeight; - var popupWidth = windowWidth * 0.9; - var popupHeight = windowHeight * 0.9; - var popupOffsetTop = windowHeight / 2 - popupHeight / 2; - var popupOffsetLeft = windowWidth / 2 - popupWidth / 2; - var $gis_editor = $("#gis_editor"); - $gis_editor.css({"top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight}); +function loadJSAndGISEditor(value, field, type, input_name, token) { + var head = document.getElementsByTagName('head')[0]; + var script; + + // Loads a set of small JS file needed for the GIS editor + var smallScripts = [ 'js/jquery/jquery.svg.js', + 'js/jquery/jquery.sprintf.js', + 'js/jquery/jquery.mousewheel.js', + 'js/jquery/jquery.event.drag-2.0.min.js', + 'js/tbl_gis_visualization.js' ]; + + for (i = 0; i < smallScripts.length; i++) { + script = document.createElement('script'); + script.type = 'text/javascript'; + script.src = smallScripts[i]; + head.appendChild(script); + } + + // OpenLayers.js is BIG and takes time. So asynchronous loading would not work. + // Load the JS and do a callback to load the content for the GIS Editor. + script = document.createElement('script'); + script.type = 'text/javascript'; + + script.onreadystatechange = function() { + if (this.readyState == 'complete') { + loadGISEditor(value, field, type, input_name, token); + } + }; + script.onload = function() { + loadGISEditor(value, field, type, input_name, token); + }; + + script.src = 'js/openlayers/OpenLayers.js'; + head.appendChild(script); + + gisEditorLoaded = true; +} + +/** + * Loads the GIS editor via AJAX + * + * @param value current value of the geometry field + * @param field field name + * @param type geometry type + * @param input_name name of the input field + * @param token token + */ +function loadGISEditor(value, field, type, input_name, token) { + var $gis_editor = $("#gis_editor"); $.post('gis_data_editor.php', { 'field' : field, 'value' : value, @@ -105,7 +146,7 @@ function openGISEditor(value, field, type, input_name, token) { 'get_gis_editor' : true, 'token' : token }, function(data) { - if(data.success == true) { + if (data.success == true) { $gis_editor.html(data.gis_editor); initGISEditorVisualization(); prepareJSVersion(); @@ -113,10 +154,33 @@ function openGISEditor(value, field, type, input_name, token) { PMA_ajaxShowMessage(data.error); } }, 'json'); +} + +/** + * Opens up the dialog for the GIS data editor. + */ +function openGISEditor() { + + // Center the popup + var windowWidth = document.documentElement.clientWidth; + var windowHeight = document.documentElement.clientHeight; + var popupWidth = windowWidth * 0.9; + var popupHeight = windowHeight * 0.9; + var popupOffsetTop = windowHeight / 2 - popupHeight / 2; + var popupOffsetLeft = windowWidth / 2 - popupWidth / 2; + + var $gis_editor = $("#gis_editor"); + var $backgrouond = $("#popup_background"); + + $gis_editor.css({"top": popupOffsetTop, "left": popupOffsetLeft, "width": popupWidth, "height": popupHeight}); + $backgrouond.css({"opacity":"0.7"}); + + $gis_editor.append('<div id="gis_data_editor"><img class="ajaxIcon" id="loadingMonitorIcon" src="' + + pmaThemeImage + 'ajax_clock_small.gif" alt=""></div>' + ); // Make it appear - $("#popup_background").css({"opacity":"0.7"}); - $("#popup_background").fadeIn("fast"); + $backgrouond.fadeIn("fast"); $gis_editor.fadeIn("fast"); } diff --git a/js/openlayers/OpenLayers.js b/js/openlayers/OpenLayers.js index 43e67e8..66b6188 100644 --- a/js/openlayers/OpenLayers.js +++ b/js/openlayers/OpenLayers.js @@ -2550,4 +2550,132 @@ return node;},"_Layer":function(options){var layer,subPaths,node,title;layer=opt options.subPaths.shift();this.writeNode("_Layer",options,node);return node;}else{if(layer instanceof OpenLayers.Layer.WMS){node=this.writeNode("_WMS",layer);}else if(layer instanceof OpenLayers.Layer.Vector){if(layer.protocol instanceof OpenLayers.Protocol.WFS.v1){node=this.writeNode("_WFS",layer);}else if(layer.protocol instanceof OpenLayers.Protocol.HTTP){if(layer.protocol.format instanceof OpenLayers.Format.GML){layer.protocol.format.version="2.1.2";node=this.writeNode("_GML",layer);}else if(layer.protocol.format instanceof OpenLayers.Format.KML){layer.protocol.format.version="2.2";node=this.writeNode("_KML",layer);}}else{this.setNamespace("feature",this.featureNS);node=this.writeNode("_InlineGeometry",layer);}} if(layer.options.maxScale){this.writeNode("sld:MinScaleDenominator",layer.options.maxScale,node);} if(layer.options.minScale){this.writeNode("sld:MaxScaleDenominator",layer.options.minScale,node);} -this.nestingLayerLookup[layer.name]=node;return node;}},"_WFS":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:layer.protocol.featurePrefix+":"+layer.protocol.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WFS,version:layer.protocol.version,url:layer.protocol.url},node);return node;},"_InlineGeometry":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:this.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("InlineGeometry",layer,node);return node;},"_GML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.GML,url:layer.protocol.url,version:layer.protocol.format.version},node);return node;},"_KML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.KML,version:layer.protocol.format.version,url:layer.protocol.url},node);return node;}},"gml":OpenLayers.Util.applyDefaults({"boundedBy":function(bounds){var node=this.createElementNSPlus("gml:boundedBy");this.writeNode("gml:Box",bounds,node);return node;}},OpenLayers.Format.GML.v2.prototype.writers.gml),"ows":OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,"sld":OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,"feature":OpenLayers.Format.GML.v2.prototype.writers.feature},CLASS_NAME:"OpenLayers.Format.OWSContext.v0_3_1"}); \ No newline at end of file +this.nestingLayerLookup[layer.name]=node;return node;}},"_WFS":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:layer.protocol.featurePrefix+":"+layer.protocol.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WFS,version:layer.protocol.version,url:layer.protocol.url},node);return node;},"_InlineGeometry":function(layer){var node=this.createElementNSPlus("Layer",{attributes:{name:this.featureType,hidden:layer.visibility?"0":"1"}});this.writeNode("ows:Title",layer.name,node);this.writeNode("InlineGeometry",layer,node);return node;},"_GML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.GML,url:layer.protocol.url,version:layer.protocol.format.version},node);return node;},"_KML":function(layer){var node=this.createElementNSPlus("Layer");this.writeNode("ows:Title",layer.name,node);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.KML,version:layer.protocol.format.version,url:layer.protocol.url},node);return node;}},"gml":OpenLayers.Util.applyDefaults({"boundedBy":function(bounds){var node=this.createElementNSPlus("gml:boundedBy");this.writeNode("gml:Box",bounds,node);return node;}},OpenLayers.Format.GML.v2.prototype.writers.gml),"ows":OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,"sld":OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,"feature":OpenLayers.Format.GML.v2.prototype.writers.feature},CLASS_NAME:"OpenLayers.Format.OWSContext.v0_3_1"}); + +// OpenStreetMaps.js merged + +/** + * Namespace: Util.OSM + */ +OpenLayers.Util.OSM = {}; + +/** + * Constant: MISSING_TILE_URL + * {String} URL of image to display for missing tiles + */ +OpenLayers.Util.OSM.MISSING_TILE_URL = "http://www.openstreetmap.org/openlayers/img/404.png"; + +/** + * Property: originalOnImageLoadError + * {Function} Original onImageLoadError function. + */ +OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError; + +/** + * Function: onImageLoadError + */ +OpenLayers.Util.onImageLoadError = function() { + if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) { + this.src = OpenLayers.Util.OSM.MISSING_TILE_URL; + } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) { + // do nothing - this layer is transparent + } else { + OpenLayers.Util.OSM.originalOnImageLoadError; + } +}; + +/** + * Class: OpenLayers.Layer.OSM.Mapnik + * + * Inherits from: + * - <OpenLayers.Layer.OSM> + */ +OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { + /** + * Constructor: OpenLayers.Layer.OSM.Mapnik + * + * Parameters: + * name - {String} + * options - {Object} Hashtable of extra options to tag onto the layer + */ + initialize: function(name, options) { + var url = [ + "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png", + "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png", + "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png" + ]; + options = OpenLayers.Util.extend({ + numZoomLevels: 19, + buffer: 0, + transitionEffect: "resize" + }, options); + var newArguments = [name, url, options]; + OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); + }, + + CLASS_NAME: "OpenLayers.Layer.OSM.Mapnik" +}); + +/** + * Class: OpenLayers.Layer.OSM.Osmarender + * + * Inherits from: + * - <OpenLayers.Layer.OSM> + */ +OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { + /** + * Constructor: OpenLayers.Layer.OSM.Osmarender + * + * Parameters: + * name - {String} + * options - {Object} Hashtable of extra options to tag onto the layer + */ + initialize: function(name, options) { + var url = [ + "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", + "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", + "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png" + ]; + options = OpenLayers.Util.extend({ + numZoomLevels: 18, + buffer: 0, + transitionEffect: "resize" + }, options); + var newArguments = [name, url, options]; + OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); + }, + + CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender" +}); + +/** + * Class: OpenLayers.Layer.OSM.CycleMap + * + * Inherits from: + * - <OpenLayers.Layer.OSM> + */ +OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, { + /** + * Constructor: OpenLayers.Layer.OSM.CycleMap + * + * Parameters: + * name - {String} + * options - {Object} Hashtable of extra options to tag onto the layer + */ + initialize: function(name, options) { + var url = [ + "http://a.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png", + "http://b.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png", + "http://c.tile.opencyclemap.org/cycle/${z}/${x}/${y}.png" + ]; + options = OpenLayers.Util.extend({ + numZoomLevels: 19, + buffer: 0, + transitionEffect: "resize" + }, options); + var newArguments = [name, url, options]; + OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); + }, + + CLASS_NAME: "OpenLayers.Layer.OSM.CycleMap" +}); \ No newline at end of file diff --git a/js/tbl_change.js b/js/tbl_change.js index 25bc120..099dab9 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -238,7 +238,12 @@ $(document).ready(function() { //Token var token = $("input[name='token']").val(); - openGISEditor(value, field, type, input_name, token); + openGISEditor(); + if (!gisEditorLoaded) { + loadJSAndGISEditor(value, field, type, input_name, token); + } else { + loadGISEditor(value, field, type, input_name, token); + } }); /** diff --git a/sql.php b/sql.php index 8b8cf12..9695d12 100644 --- a/sql.php +++ b/sql.php @@ -17,16 +17,7 @@ require_once './libraries/bookmark.lib.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; - -// required for GIS editor loaded via AJAX $GLOBALS['js_include'][] = 'gis_data_editor.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.svg.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js'; -$GLOBALS['js_include'][] = 'tbl_gis_visualization.js'; -$GLOBALS['js_include'][] = 'openlayers/OpenLayers.js'; -$GLOBALS['js_include'][] = 'OpenStreetMap.js'; if (isset($_SESSION['profiling'])) { $GLOBALS['js_include'][] = 'highcharts/highcharts.js'; diff --git a/tbl_change.php b/tbl_change.php index 5395dda..2fd9394 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -122,16 +122,7 @@ $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; - -// required for GIS editor $GLOBALS['js_include'][] = 'gis_data_editor.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.svg.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js'; -$GLOBALS['js_include'][] = 'tbl_gis_visualization.js'; -$GLOBALS['js_include'][] = 'openlayers/OpenLayers.js'; -$GLOBALS['js_include'][] = 'OpenStreetMap.js'; /** * HTTP and HTML headers diff --git a/tbl_select.php b/tbl_select.php index 00cecfe..0ad5d25 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -23,16 +23,7 @@ $GLOBALS['js_include'][] = 'tbl_select.js'; $GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; - -// required for GIS editor loaded via AJAX $GLOBALS['js_include'][] = 'gis_data_editor.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.svg.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js'; -$GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js'; -$GLOBALS['js_include'][] = 'tbl_gis_visualization.js'; -$GLOBALS['js_include'][] = 'openlayers/OpenLayers.js'; -$GLOBALS['js_include'][] = 'OpenStreetMap.js'; $titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-18998-g110c1e4
by Marc Delisle 13 Sep '11

13 Sep '11

The branch, master has been updated via 110c1e4a59f1e45f3a4586ed970fc73d9fd8ff0e (commit) from 47463352c4941b4db35ead6b954d2b597f11eebb (commit) - Log ----------------------------------------------------------------- commit 110c1e4a59f1e45f3a4586ed970fc73d9fd8ff0e Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Sep 13 12:30:10 2011 -0400 Refresh .po files ----------------------------------------------------------------------- Summary of changes: po/af.po | 4 +- po/ar.po | 4 +- po/az.po | 4 +- po/be.po | 4 +- po/be(a)latin.po | 4 +- po/bg.po | 4 +- po/bn.po | 4 +- po/br.po | 4 +- po/bs.po | 4 +- po/ca.po | 8 ++++- po/cs.po | 8 ++++- po/cy.po | 4 +- po/da.po | 8 ++++- po/de.po | 8 ++++- po/el.po | 22 +++++---------- po/en_GB.po | 77 +++++++++-------------------------------------------- po/es.po | 16 ++++++----- po/et.po | 4 +- po/eu.po | 4 +- po/fa.po | 4 +- po/fi.po | 4 +- po/fr.po | 33 +++++----------------- po/gl.po | 4 +- po/he.po | 4 +- po/hi.po | 4 +- po/hr.po | 4 +- po/hu.po | 4 +- po/id.po | 13 +++------ po/it.po | 8 ++++- po/ja.po | 15 +++++++--- po/ka.po | 4 +- po/ko.po | 4 +- po/lt.po | 4 +- po/lv.po | 4 +- po/mk.po | 4 +- po/ml.po | 4 +- po/mn.po | 4 +- po/ms.po | 4 +- po/nb.po | 4 +- po/nl.po | 8 ++++- po/phpmyadmin.pot | 4 +- po/pl.po | 11 +++----- po/pt.po | 4 +- po/pt_BR.po | 73 ++++++++------------------------------------------ po/ro.po | 4 +- po/ru.po | 56 ++++++++------------------------------ po/si.po | 4 +- po/sk.po | 4 +- po/sl.po | 22 ++++++++------- po/sq.po | 4 +- po/sr.po | 4 +- po/sr(a)latin.po | 4 +- po/sv.po | 34 +++++++++-------------- po/ta.po | 4 +- po/te.po | 4 +- po/th.po | 4 +- po/tr.po | 8 ++++- po/tt.po | 4 +- po/ug.po | 4 +- po/uk.po | 4 +- po/ur.po | 4 +- po/uz.po | 4 +- po/uz(a)latin.po | 4 +- po/zh_CN.po | 8 ++++- po/zh_TW.po | 8 ++++- 65 files changed, 249 insertions(+), 375 deletions(-) diff --git a/po/af.po b/po/af.po index d52e249..c24179d 100644 --- a/po/af.po +++ b/po/af.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: afrikaans <af(a)li.org>\n" @@ -6491,7 +6491,7 @@ msgstr "Stellings" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ar.po b/po/ar.po index 81dfa6a..0848bef 100644 --- a/po/ar.po +++ b/po/ar.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-08-07 03:51+0200\n" "Last-Translator: Abdullah Al-Saedi <abdullah.10(a)windowslive.com>\n" "Language-Team: arabic <ar(a)li.org>\n" @@ -6409,7 +6409,7 @@ msgstr "أوامر" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/az.po b/po/az.po index a26f395..b492591 100644 --- a/po/az.po +++ b/po/az.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: azerbaijani <az(a)li.org>\n" @@ -6577,7 +6577,7 @@ msgstr "Variantlar" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/be.po b/po/be.po index c7e7de2..5127cc8 100644 --- a/po/be.po +++ b/po/be.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: belarusian_cyrillic <be(a)li.org>\n" @@ -6774,7 +6774,7 @@ msgstr "Выразы" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 03b912d..3745ea7 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: belarusian_latin <be@latin@li.org>\n" @@ -6757,7 +6757,7 @@ msgstr "Vyrazy" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/bg.po b/po/bg.po index a14533a..f0d3775 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-02 09:19+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" @@ -6296,7 +6296,7 @@ msgstr "Добавяне на заявления:" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/bn.po b/po/bn.po index b96627a..e40cf5b 100644 --- a/po/bn.po +++ b/po/bn.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" "Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n" "Language-Team: bangla <bn(a)li.org>\n" @@ -6694,7 +6694,7 @@ msgstr "Statements" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/br.po b/po/br.po index 944702e..5ead377 100644 --- a/po/br.po +++ b/po/br.po @@ -7,7 +7,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-08-22 20:10+0200\n" "Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -6294,7 +6294,7 @@ msgstr "" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/bs.po b/po/bs.po index 05b1b56..b2bd4c1 100644 --- a/po/bs.po +++ b/po/bs.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: bosnian <bs(a)li.org>\n" @@ -6561,7 +6561,7 @@ msgstr "Ime" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ca.po b/po/ca.po index be0e100..55f2896 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" "Last-Translator: Xavier Navarro <xvnavarro(a)gmail.com>\n" "Language-Team: catalan <ca(a)li.org>\n" @@ -6682,8 +6682,12 @@ msgid "Add statements:" msgstr "Afegir instruccions:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Inclou noms de taules i camps amb -backquotes- (Protegeix els noms de " diff --git a/po/cs.po b/po/cs.po index 32623a5..9b598a6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-07 09:31+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" @@ -6462,8 +6462,12 @@ msgid "Add statements:" msgstr "Přidat příkazy:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Uzavřít název tabulky a polí do zpětných uvozovek (Zabrání interpretaci " diff --git a/po/cy.po b/po/cy.po index 042e8cc..d1352ff 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-05-19 21:21+0200\n" "Last-Translator: <ardavies(a)tiscali.co.uk>\n" "Language-Team: Welsh <cy(a)li.org>\n" @@ -6555,7 +6555,7 @@ msgstr "Ychwanegwch cyfyngiadau" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/da.po b/po/da.po index 54c6a8d..52a2769 100644 --- a/po/da.po +++ b/po/da.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-08-30 18:16+0200\n" "Last-Translator: Jørgen Thomsen <opensource(a)jth.net>\n" "Language-Team: danish <da(a)li.org>\n" @@ -6490,8 +6490,12 @@ msgid "Add statements:" msgstr "Tilføj forespørgsler:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Omgiv tabel- og feltnavne med backquotes (Beskytter felt- og tabelnavne " diff --git a/po/de.po b/po/de.po index 49042d1..4a574f2 100644 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-02 04:56+0200\n" "Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n" "Language-Team: german <de(a)li.org>\n" @@ -6569,8 +6569,12 @@ msgid "Add statements:" msgstr "Befehle hinzufügen:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Tabellen- und Feldnamen in Backticks einschließen (Schützt Feld- und " diff --git a/po/el.po b/po/el.po index 07815fa..3aceb04 100644 --- a/po/el.po +++ b/po/el.po @@ -3,14 +3,14 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-12 12:07+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" -"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -2211,7 +2211,6 @@ msgstr "Απομακρύντε το φάκελο «./config» πριν τη χρ #: libraries/Config.class.php:727 #, php-format -#| msgid "Existing configuration file (%d) is not readable." msgid "Existing configuration file (%s) is not readable." msgstr "Το υπαρχον αρχείο ρυθμίσεων (%s) δεν είναι αναγνώσιμο." @@ -6572,8 +6571,12 @@ msgid "Add statements:" msgstr "Προσθήκη δηλώσεων:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Εσωκλείνει ονόματα πίνακα και πεδίων με ανάποδα εισαγωγικά (Προστατεύει " @@ -10562,12 +10565,10 @@ msgid "Refresh rate" msgstr "Ρυθμός ανανέωσης" #: server_status.php:1572 -#| msgid "Chart columns:" msgid "Chart columns" msgstr "Στήλες διαγράμματος" #: server_status.php:1588 -#| msgid "Error management:" msgid "Chart arrangement" msgstr "Διευθέτηση διαγράμματος" @@ -10580,7 +10581,6 @@ msgstr "" "φυλλομετρητών. Ίσως θέλετε να το εξάγετε αν έχετε πολύπλοκη ρύθμιση." #: server_status.php:1589 -#| msgid "Restore default value" msgid "Reset to default" msgstr "Επαναφορά προεπιλογής" @@ -10589,14 +10589,6 @@ msgid "Monitor Instructions" msgstr "Οδηγίες Εποπτείας" #: server_status.php:1594 -#| msgid "" -#| "The phpMyAdmin Monitor can assist you in optimizing the server " -#| "configuration and track down time intensive\n" -#| " queries. For the latter you will need to set log_output to " -#| "'TABLE' and have either the slow_query_log or general_log enabled. Note " -#| "however, that the\n" -#| " general_log produces a lot of data and increases server load by " -#| "up to 15%" msgid "" "The phpMyAdmin Monitor can assist you in optimizing the server configuration " "and track down time intensive queries. For the latter you will need to set " diff --git a/po/en_GB.po b/po/en_GB.po index 25a763e..58d982d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-10 16:23+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" @@ -824,7 +824,6 @@ msgid "Copy and paste the joined values into the \"Length/Values\" field" msgstr "Copy and paste the joined values into the \"Length/Values\" field" #: export.php:29 -#| msgid "Bar type" msgid "Bad type!" msgstr "Bad type!" @@ -833,7 +832,6 @@ msgid "Selected export type has to be saved in file!" msgstr "Selected export type has to be saved in file!" #: export.php:106 -#| msgid "Add parameter" msgid "Bad parameters!" msgstr "Bad parameters!" @@ -860,7 +858,6 @@ msgid "Dump has been saved to file %s." msgstr "Dump has been saved to file %s." #: file_echo.php:21 -#| msgid "Export type" msgid "Invalid export type" msgstr "Invalid export type" @@ -899,7 +896,6 @@ msgstr "Y" #: gis_data_editor.php:195 gis_data_editor.php:243 gis_data_editor.php:295 #: js/messages.php:289 #, php-format -#| msgid "Point" msgid "Point %d" msgstr "Point %d" @@ -1242,17 +1238,14 @@ msgstr "" "your configuration to default in the Settings menu." #: js/messages.php:96 -#| msgid "Query cache" msgid "Query cache efficiency" msgstr "Query cache efficiency" #: js/messages.php:97 -#| msgid "Query cache" msgid "Query cache usage" msgstr "Query cache usage" #: js/messages.php:98 -#| msgid "Query cache" msgid "Query cache used" msgstr "Query cache used" @@ -1524,7 +1517,6 @@ msgstr "Log analyzed, but no data found in this time span." #. l10n: A collection of available filters #: js/messages.php:173 -#| msgid "Tables display options" msgid "Log table filter options" msgstr "Log table filter options" @@ -1595,12 +1587,10 @@ msgid "Import" msgstr "Import" #: js/messages.php:192 -#| msgid "Update Query" msgid "Analyse Query" msgstr "Analyse Query" #: js/messages.php:196 -#| msgid "Apply a divisor" msgid "Advisor system" msgstr "Advisor system" @@ -1613,17 +1603,14 @@ msgid "Issue" msgstr "Issue" #: js/messages.php:199 -#| msgid "Documentation" msgid "Recommendation" msgstr "Recommendation" #: js/messages.php:200 -#| msgid "Details" msgid "Rule details" msgstr "Rule details" #: js/messages.php:201 -#| msgid "Authentication" msgid "Justification" msgstr "Justification" @@ -1774,7 +1761,6 @@ msgid "Show search criteria" msgstr "Show search criteria" #: js/messages.php:262 libraries/tbl_select.lib.php:135 -#| msgid "Search" msgid "Zoom Search" msgstr "Zoom Search" @@ -1811,7 +1797,6 @@ msgid "Strings are converted into integer for plotting" msgstr "Strings are converted into integer for plotting" #: js/messages.php:280 -#| msgid "Add/Delete columns" msgid "Select two columns" msgstr "Select two columns" @@ -1903,7 +1888,6 @@ msgstr "" "You can also edit most columns by clicking directly on their content." #: js/messages.php:322 -#| msgid "Go to view" msgid "Go to link" msgstr "Go to link" @@ -1947,13 +1931,11 @@ msgid "Done" msgstr "Done" #: js/messages.php:359 -#| msgid "Prev" msgctxt "Previous month" msgid "Prev" msgstr "Prev" #: js/messages.php:364 -#| msgid "Next" msgctxt "Next month" msgid "Next" msgstr "Next" @@ -2102,8 +2084,6 @@ msgstr "Saturday" #. l10n: Short week day name #: js/messages.php:420 -#| msgctxt "Short week day name" -#| msgid "Sun" msgid "Sun" msgstr "Sun" @@ -2210,7 +2190,8 @@ msgstr "Existing configuration file (%s) is not readable." #: libraries/Config.class.php:752 msgid "Wrong permissions on configuration file, should not be world writable!" -msgstr "Wrong permissions on configuration file, should not be world writeable!" +msgstr "" +"Wrong permissions on configuration file, should not be world writeable!" #: libraries/Config.class.php:1297 msgid "Font size" @@ -2355,7 +2336,6 @@ msgstr[0] "%1$d row inserted." msgstr[1] "%1$d rows inserted." #: libraries/PDF.class.php:81 -#| msgid "Allows reading data." msgid "Error while creating PDF:" msgstr "Error while creating PDF:" @@ -2393,7 +2373,6 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "This MySQL server does not support the %s storage engine." #: libraries/Table.class.php:329 -#| msgid "Show slave status" msgid "unknown table status: " msgstr "unknown table status: " @@ -2425,8 +2404,8 @@ msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "" -"Failed to cleanup table UI preferences (see " -"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)" +"Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" +"['MaxTableUiprefs'] %s)" #: libraries/Table.class.php:1513 #, php-format @@ -2435,8 +2414,9 @@ msgid "" "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" -"Cannot save UI property \"%s\". The changes made will not be persistent after " -"you refresh this page. Please check if the table structure has been changed." +"Cannot save UI property \"%s\". The changes made will not be persistent " +"after you refresh this page. Please check if the table structure has been " +"changed." #: libraries/Theme.class.php:145 #, php-format @@ -2599,7 +2579,6 @@ msgid "PBMS get BLOB info failed:" msgstr "PBMS get BLOB info failed:" #: libraries/blobstreaming.lib.php:373 -#| msgid "get BLOB Content-Type failed" msgid "PBMS get BLOB Content-Type failed" msgstr "PBMS get BLOB Content-Type failed" @@ -2877,7 +2856,6 @@ msgstr "Missing parameter:" #: libraries/common.lib.php:2364 libraries/common.lib.php:2367 #: libraries/display_tbl.lib.php:306 -#| msgid "Begin" msgctxt "First page" msgid "Begin" msgstr "Begin" @@ -2885,7 +2863,6 @@ msgstr "Begin" #: libraries/common.lib.php:2365 libraries/common.lib.php:2368 #: libraries/display_tbl.lib.php:307 server_binlog.php:135 #: server_binlog.php:137 -#| msgid "Previous" msgctxt "Previous page" msgid "Previous" msgstr "Previous" @@ -2893,14 +2870,12 @@ msgstr "Previous" #: libraries/common.lib.php:2395 libraries/common.lib.php:2398 #: libraries/display_tbl.lib.php:370 server_binlog.php:170 #: server_binlog.php:172 -#| msgid "Next" msgctxt "Next page" msgid "Next" msgstr "Next" #: libraries/common.lib.php:2396 libraries/common.lib.php:2399 #: libraries/display_tbl.lib.php:385 -#| msgid "End" msgctxt "Last page" msgid "End" msgstr "End" @@ -4268,7 +4243,6 @@ msgid "Memory limit" msgstr "Memory limit" #: libraries/config/messages.inc.php:319 -#| msgid "These are Edit, Inline edit, Copy and Delete links" msgid "These are Edit, Copy and Delete links" msgstr "These are Edit, Copy and Delete links" @@ -4628,7 +4602,6 @@ msgstr "" "newest record in \"table_uiprefs\" and automatically delete older records" #: libraries/config/messages.inc.php:399 -#| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of records saved in \"table_uiprefs\" table" msgstr "Maximum number of records saved in \"table_uiprefs\" table" @@ -4965,12 +4938,10 @@ msgid "Show function fields" msgstr "Show function fields" #: libraries/config/messages.inc.php:462 -#| msgid "Where to show the table row links" msgid "Whether to show hint or not" msgstr "Whether to show hint or not" #: libraries/config/messages.inc.php:463 -#| msgid "Show indexes" msgid "Show hint" msgstr "Show hint" @@ -5303,7 +5274,6 @@ msgid "Could not initialize Drizzle connection library" msgstr "Could not initialise Drizzle connection library" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" msgstr "Could not connect to Drizzle server" @@ -5409,7 +5379,6 @@ msgid "The server is not responding" msgstr "The server is not responding" #: libraries/dbi/drizzle.dbi.lib.php:344 -#| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" msgstr "(or the local Drizzle server's socket is not correctly configured)" @@ -5717,7 +5686,6 @@ msgid "Language" msgstr "Language" #: libraries/display_tbl.lib.php:401 -#| msgid "Save directory" msgid "Save edited data" msgstr "Save edited data" @@ -6493,8 +6461,12 @@ msgid "Add statements:" msgstr "Add statements:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Enclose table and field names with backquotes (Protects field and table " @@ -6605,7 +6577,6 @@ msgid "Stand-in structure for view" msgstr "Stand-in structure for view" #: libraries/export/sql.php:1111 -#| msgid "Allows reading data." msgid "Error reading data:" msgstr "Error reading data:" @@ -6677,7 +6648,6 @@ msgstr "Go to database" #: libraries/import.lib.php:1109 libraries/import.lib.php:1132 #, php-format -#| msgid "Missing data for %s" msgid "Edit settings for %s" msgstr "Edit settings for %s" @@ -6687,7 +6657,6 @@ msgstr "Go to table" #: libraries/import.lib.php:1130 #, php-format -#| msgid "Structure only" msgid "Structure of %s" msgstr "Structure of %s" @@ -6791,7 +6760,6 @@ msgid "MySQL Spatial Extension does not support ESRI type \"%s\"." msgstr "MySQL Spatial Extension does not support ESRI type \"%s\"." #: libraries/import/shp.php:371 -#| msgid "This page does not contain any tables!" msgid "The imported file does not contain any data" msgstr "The imported file does not contain any data" @@ -7313,13 +7281,11 @@ msgid "Execute every" msgstr "Execute every" #: libraries/rte/rte_events.lib.php:449 -#| msgid "Start" msgctxt "Start of recurring event" msgid "Start" msgstr "Start" #: libraries/rte/rte_events.lib.php:457 -#| msgid "End" msgctxt "End of recurring event" msgid "End" msgstr "End" @@ -8112,7 +8078,6 @@ msgid "Operator" msgstr "Operator" #: libraries/tbl_select.lib.php:128 -#| msgid "Search" msgid "Table Search" msgstr "Table Search" @@ -8294,7 +8259,6 @@ msgid "General Settings" msgstr "General Settings" #: main.php:101 -#| msgid "MySQL connection collation" msgid "Server connection collation" msgstr "Server connection collation" @@ -8307,7 +8271,6 @@ msgid "More settings" msgstr "More settings" #: main.php:156 -#| msgid "Database for user" msgid "Database server" msgstr "Database server" @@ -8316,7 +8279,6 @@ msgid "Software" msgstr "Software" #: main.php:160 -#| msgid "Show versions" msgid "Software version" msgstr "Software version" @@ -8331,7 +8293,6 @@ msgid "User" msgstr "User" #: main.php:167 -#| msgid "Server socket" msgid "Server charset" msgstr "Server charset" @@ -8340,7 +8301,6 @@ msgid "Web server" msgstr "Web server" #: main.php:190 -#| msgid "Use light version" msgid "Database client version" msgstr "Database client version" @@ -8481,7 +8441,6 @@ msgid "No databases" msgstr "No databases" #: navigation.php:270 -#| msgid "filter tables by name" msgid "Filter tables by name" msgstr "Filter tables by name" @@ -8859,7 +8818,6 @@ msgid "License" msgstr "Licence" #: server_plugins.php:182 -#| msgid "Disabled" msgid "disabled" msgstr "disabled" @@ -9542,7 +9500,6 @@ msgid "Monitor" msgstr "Monitor" #: server_status.php:779 -#| msgid "Apply a divisor" msgid "Advisor" msgstr "Advisor" @@ -9563,7 +9520,6 @@ msgid "Filter by category..." msgstr "Filter by category..." #: server_status.php:855 -#| msgid "Show only alert values" msgid "Show unformatted values" msgstr "Show unformatted values" @@ -9572,12 +9528,10 @@ msgid "Related links:" msgstr "Related links:" #: server_status.php:892 -#| msgid "Query analyzer" msgid "Run analyzer" msgstr "Run analyser" #: server_status.php:893 -#| msgid "Introduction" msgid "Instructions" msgstr "Instructions" @@ -10408,12 +10362,10 @@ msgid "Refresh rate" msgstr "Refresh rate" #: server_status.php:1572 -#| msgid "Chart columns:" msgid "Chart columns" msgstr "Chart columns" #: server_status.php:1588 -#| msgid "Error management:" msgid "Chart arrangement" msgstr "Chart arrangement" @@ -10426,7 +10378,6 @@ msgstr "" "may want to export it if you have a complicated set up." #: server_status.php:1589 -#| msgid "Restore default value" msgid "Reset to default" msgstr "Reset to default" @@ -10463,7 +10414,6 @@ msgstr "" "charting features however." #: server_status.php:1612 -#| msgid "Pause monitor" msgid "Using the monitor:" msgstr "Using the monitor:" @@ -10552,7 +10502,6 @@ msgstr "" " " #: server_status.php:1637 -#| msgid "Remove chart" msgid "Preset chart" msgstr "Preset chart" diff --git a/po/es.po b/po/es.po index e45af75..bf27f21 100644 --- a/po/es.po +++ b/po/es.po @@ -3,14 +3,14 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-12 19:03+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -2218,7 +2218,6 @@ msgstr "¡Elimine el directorio './config' antes de utilizar phpMyAdmin!" #: libraries/Config.class.php:727 #, php-format -#| msgid "Existing configuration file (%d) is not readable." msgid "Existing configuration file (%s) is not readable." msgstr "El archivo de configuración existente (%s) no pudo ser leído." @@ -2452,8 +2451,8 @@ msgid "" "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" -"No se pudo guardar la propiedad de interfaz \"%s\". Los cambios realizados no " -"serán persistentes luego de actualizar esta página. Revise si cambió la " +"No se pudo guardar la propiedad de interfaz \"%s\". Los cambios realizados " +"no serán persistentes luego de actualizar esta página. Revise si cambió la " "estructura de la tabla." #: libraries/Theme.class.php:145 @@ -6609,8 +6608,12 @@ msgid "Add statements:" msgstr "Agregar sentencias:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Encerrar tabla y nombres de campo con comillas invertidas (protege los " @@ -11472,7 +11475,6 @@ msgid "No index parts defined!" msgstr "¡No se han definido las partes del índice!" #: tbl_indexes.php:169 -#| msgid "Create a new index" msgid "Create an index" msgstr "Crear un índice" diff --git a/po/et.po b/po/et.po index b84f47a..497d63a 100644 --- a/po/et.po +++ b/po/et.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: estonian <et(a)li.org>\n" @@ -6696,7 +6696,7 @@ msgstr "Parameerid" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/eu.po b/po/eu.po index 49ca4c2..1c2f81c 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: basque <eu(a)li.org>\n" @@ -6567,7 +6567,7 @@ msgstr "Sententziak" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/fa.po b/po/fa.po index 2d609cd..10102de 100644 --- a/po/fa.po +++ b/po/fa.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" "Last-Translator: <ahmad_usa2007(a)yahoo.com>\n" "Language-Team: persian <fa(a)li.org>\n" @@ -6480,7 +6480,7 @@ msgstr "شرج" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/fi.po b/po/fi.po index 00c9244..687a04f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" "Last-Translator: <asdfsdf(a)asdfasdfasdf.com>\n" "Language-Team: finnish <fi(a)li.org>\n" @@ -6816,7 +6816,7 @@ msgstr "Tieto" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/fr.po b/po/fr.po index c8a0ad9..50fbcdd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-09 12:45+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" @@ -1910,7 +1910,6 @@ msgstr "" "directement sur leur contenu." #: js/messages.php:322 -#| msgid "Go to view" msgid "Go to link" msgstr "Suivre le lien" @@ -1954,13 +1953,11 @@ msgid "Done" msgstr "Fermer" #: js/messages.php:359 -#| msgid "Prev" msgctxt "Previous month" msgid "Prev" msgstr "Précédent" #: js/messages.php:364 -#| msgid "Next" msgctxt "Next month" msgid "Next" msgstr "Suivant" @@ -2109,8 +2106,6 @@ msgstr "Samedi" #. l10n: Short week day name #: js/messages.php:420 -#| msgctxt "Short week day name" -#| msgid "Sun" msgid "Sun" msgstr "Dim" @@ -2368,7 +2363,6 @@ msgstr[0] "%1$d ligne insérée." msgstr[1] "%1$d lignes insérées." #: libraries/PDF.class.php:81 -#| msgid "Allows reading data." msgid "Error while creating PDF:" msgstr "Erreur pendant la création du PDF: " @@ -2407,7 +2401,6 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "Ce serveur MySQL ne supporte pas le moteur de stockage %s." #: libraries/Table.class.php:329 -#| msgid "Show slave status" msgid "unknown table status: " msgstr "Statut de table incorrect:" @@ -2439,8 +2432,8 @@ msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" msgstr "" -"Echec lors de la tentative de vidage de la table UI Préférences (voir " -"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)" +"Echec lors de la tentative de vidage de la table UI Préférences (voir $cfg" +"['Servers'][$i]['MaxTableUiprefs'] %s)" #: libraries/Table.class.php:1513 #, php-format @@ -2898,7 +2891,6 @@ msgstr "Paramètre manquant :" #: libraries/common.lib.php:2364 libraries/common.lib.php:2367 #: libraries/display_tbl.lib.php:306 -#| msgid "Begin" msgctxt "First page" msgid "Begin" msgstr "Début" @@ -2906,7 +2898,6 @@ msgstr "Début" #: libraries/common.lib.php:2365 libraries/common.lib.php:2368 #: libraries/display_tbl.lib.php:307 server_binlog.php:135 #: server_binlog.php:137 -#| msgid "Previous" msgctxt "Previous page" msgid "Previous" msgstr "Précédent" @@ -2914,14 +2905,12 @@ msgstr "Précédent" #: libraries/common.lib.php:2395 libraries/common.lib.php:2398 #: libraries/display_tbl.lib.php:370 server_binlog.php:170 #: server_binlog.php:172 -#| msgid "Next" msgctxt "Next page" msgid "Next" msgstr "Suivant" #: libraries/common.lib.php:2396 libraries/common.lib.php:2399 #: libraries/display_tbl.lib.php:385 -#| msgid "End" msgctxt "Last page" msgid "End" msgstr "Fin" @@ -4304,7 +4293,6 @@ msgid "Memory limit" msgstr "Limite mémoire" #: libraries/config/messages.inc.php:319 -#| msgid "These are Edit, Inline edit, Copy and Delete links" msgid "These are Edit, Copy and Delete links" msgstr "Il s'agit des liens Modifier, Copier et Effacer" @@ -4668,7 +4656,6 @@ msgstr "" "récentes entrées dans «table_uiprefs» sont conservées" #: libraries/config/messages.inc.php:399 -#| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of records saved in \"table_uiprefs\" table" msgstr "Nombre maximum de lignes conservées dans la table «table_uiprefs»" @@ -5011,12 +4998,10 @@ msgid "Show function fields" msgstr "Montrer les fonctions" #: libraries/config/messages.inc.php:462 -#| msgid "Where to show the table row links" msgid "Whether to show hint or not" msgstr "Afficher ou non les explications" #: libraries/config/messages.inc.php:463 -#| msgid "Show indexes" msgid "Show hint" msgstr "Montrer les explications" @@ -5353,7 +5338,6 @@ msgid "Could not initialize Drizzle connection library" msgstr "Impossible d'initialiser la bibliothèque de connexion Drizzle" #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212 -#| msgid "Could not connect to MySQL server" msgid "Could not connect to Drizzle server" msgstr "Connexion au serveur Drizzle impossible" @@ -5461,7 +5445,6 @@ msgid "The server is not responding" msgstr "Le serveur ne répond pas" #: libraries/dbi/drizzle.dbi.lib.php:344 -#| msgid "(or the local MySQL server's socket is not correctly configured)" msgid "(or the local Drizzle server's socket is not correctly configured)" msgstr "" "(ou l'interface de connexion vers le serveur Drizzle local n'est pas " @@ -5776,7 +5759,6 @@ msgid "Language" msgstr "Langue" #: libraries/display_tbl.lib.php:401 -#| msgid "Save directory" msgid "Save edited data" msgstr "Sauvegarder les données modifiées" @@ -6564,8 +6546,12 @@ msgid "Add statements:" msgstr "Ajouter les énoncés :" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Entourer les noms des tables et des colonnes par des guillemets obliques " @@ -6679,7 +6665,6 @@ msgid "Stand-in structure for view" msgstr "Doublure de structure pour la vue" #: libraries/export/sql.php:1111 -#| msgid "Allows reading data." msgid "Error reading data:" msgstr "Erreur de lecture des données :" @@ -6751,7 +6736,6 @@ msgstr "Aller à la base de données" #: libraries/import.lib.php:1109 libraries/import.lib.php:1132 #, php-format -#| msgid "Missing data for %s" msgid "Edit settings for %s" msgstr "Paramètres de modification pour %s" @@ -6761,7 +6745,6 @@ msgstr "Aller à la table" #: libraries/import.lib.php:1130 #, php-format -#| msgid "Structure only" msgid "Structure of %s" msgstr "Structure de %s" diff --git a/po/gl.po b/po/gl.po index b3c07d2..5e96fe9 100644 --- a/po/gl.po +++ b/po/gl.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: galician <gl(a)li.org>\n" @@ -7029,7 +7029,7 @@ msgstr "Informacións" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/he.po b/po/he.po index f8efcdb..46bc7b5 100644 --- a/po/he.po +++ b/po/he.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" "Last-Translator: <zippoxer(a)gmail.com>\n" "Language-Team: hebrew <he(a)li.org>\n" @@ -6575,7 +6575,7 @@ msgstr "משפטים" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/hi.po b/po/hi.po index 28712d3..696eae9 100644 --- a/po/hi.po +++ b/po/hi.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-07-24 19:04+0200\n" "Last-Translator: <deadefy(a)nepalimail.com>\n" "Language-Team: hindi <hi(a)li.org>\n" @@ -6425,7 +6425,7 @@ msgstr "शर्तें जोडें" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/hr.po b/po/characters or keywords)"cts column and table "ine."dmin!"λύπλοκη ρύθμιση."εύει "+��uɠ+�: ɠ+5@ɠ+�(<ʠ++��@^ʠ+ ��k0ɠ+6 ��!�!�*��+��x�;ʠ+!��ɠ+�0ɠ+�*��`ɠ+�*��ߟʠ+uɠ+Пʠ+�ԟʠ+�ٟʠ+�: ɠ+x�;ʠ+!��k0ɠ+�!�!�*��+��H�ʠ+�!��ɠ+�0ɠ+�*��`ɠ+�*��*��*��8;@ɠ+�p�+��uɠ+�: ɠ+�!�� k0ɠ+GHIJKMNOP�*��+��He�ɠ+�#��ɠ+�0ɠ+�*��0ߟʠ+uɠ+�;ʠ+��ɠ+Пʠ+�ԟʠ+�ٟʠ+�: ɠ+He�ɠ+�#��!��k0ɠ+8e�ɠ+�#��!��k0ɠ+(e�ɠ+�#�� "��k0ɠ+e�ɠ+�#��P"��k0ɠ+ �ޟʠ+uɠ+�ٟʠ+��ɠ+eɠ+�ԟʠ+�"��y��ɠ+eɠ+Пʠ+ #��Z��ɠ+eɠ+ؔ�ɠ+�;ʠ+��ɠ+Пʠ+��;ʠ+�ԟʠ+�ٟʠ+�: ɠ+8;@ɠ+]�ɠ++��p+�ɠ+�$��#��k0ɠ+5678:<=>?@BD�*��+��]�ɠ++��uɠ+5@ɠ+P#��]�ɠ+eɠ+5@ɠ+�_@f�S Q��l��sgɠ++��]�ɠ+�%��$��k0ɠ+u]�� 4Q��U^Qʉ��u��*ēv�*��+��H�dɠ+��ɠ+P,��ˠ+�ˠ+�F�ɠ+�*��,��*��0'��;ʠ+uɠ+��;ʠ+�-��ˠ+`,��'��ˠ++��hr.po index f7027db..74867c0 100644 --- a/po/hr.po +++ b/po/hr.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: croatian <hr(a)li.org>\n" @@ -6756,7 +6756,7 @@ msgstr "Izjave" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/hu.po b/po/hu.po index db6ebe6..09d3256 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-05-27 18:52+0200\n" "Last-Translator: <slygyor(a)gmail.com>\n" "Language-Team: hungarian <hu(a)li.org>\n" @@ -6704,7 +6704,7 @@ msgstr "Utasítások" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/id.po b/po/id.po index 48528d4..3ef8d44 100644 --- a/po/id.po +++ b/po/id.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-12 09:37+0200\n" "Last-Translator: <uringinteristi(a)gmail.com>\n" "Language-Team: indonesian <id(a)li.org>\n" @@ -416,7 +416,6 @@ msgstr "Sekurang-kurangnya satu kolom harus dipilih untuk ditampilkan" #: db_qbe.php:186 #, php-format -#| msgid "visual builder" msgid "Switch to %svisual builder%s" msgstr "Alihkan ke %spembangun visual%s" @@ -828,7 +827,6 @@ msgid "Copy and paste the joined values into the \"Length/Values\" field" msgstr "keluaran" #: export.php:29 -#| msgid "Bar type" msgid "Bad type!" msgstr "Penulisan yang buruk!" @@ -837,7 +835,6 @@ msgid "Selected export type has to be saved in file!" msgstr "jenis ekspor yang diipilih harus disimpan dalam file!" #: export.php:106 -#| msgid "Remove database" msgid "Bad parameters!" msgstr "Pembatasan yang buruk!" @@ -6541,7 +6538,7 @@ msgstr "Keterangan" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" @@ -12857,7 +12854,6 @@ msgstr "" "dari 1 per jam" #: po/advisory_rules.php:240 -#| msgid "Table of contents" msgid "Percentage of aborted clients" msgstr "Persentase klien-klien yang dibatalkan" @@ -12871,8 +12867,8 @@ msgid "" "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." msgstr "" -"Klien-klien biasanya dibatalkan apabila mereka tidak menutup " -"koneksi/sambungan ke MySQL secara tepat. Hal ini bisa disebabkan oleh adanya " +"Klien-klien biasanya dibatalkan apabila mereka tidak menutup koneksi/" +"sambungan ke MySQL secara tepat. Hal ini bisa disebabkan oleh adanya " "kesalahan pada jaringan (network) atau penutupan penanganan database secara " "tepat. Periksa jaringan dan kode anda." @@ -12897,7 +12893,6 @@ msgid "Is InnoDB disabled?" msgstr "Apakah InnoDB non-aktif?" #: po/advisory_rules.php:251 -#| msgid "Could not save recent table" msgid "You do not have InnoDB enabled." msgstr "InnoDB anda tidak ada yang aktif" diff --git a/po/it.po b/po/it.po index f0b1411..12e233d 100644 --- a/po/it.po +++ b/po/it.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-07-22 19:13+0200\n" "Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n" "Language-Team: italian <it(a)li.org>\n" @@ -6664,8 +6664,12 @@ msgid "Add statements:" msgstr "Aggiungi istruzioni:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Racchiudi i nomi dei campi e delle tabelle in virgolette ` (Protegge i " diff --git a/po/ja.po b/po/ja.po index b4d8716..bd93d0c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-11 11:14+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" @@ -2200,7 +2200,8 @@ msgstr "" #: libraries/Config.class.php:703 msgid "Remove \"./config\" directory before using phpMyAdmin!" -msgstr "phpMyAdmin を使用し始める前に、「./config」ディレクトリを削除してください！" +msgstr "" +"phpMyAdmin を使用し始める前に、「./config」ディレクトリを削除してください！" #: libraries/Config.class.php:727 #, php-format @@ -2209,7 +2210,9 @@ msgstr "設定ファイル (%s) は存在しますが、読み込むことがで #: libraries/Config.class.php:752 msgid "Wrong permissions on configuration file, should not be world writable!" -msgstr "設定ファイルのパーミッションが正しくありません。書き込み可能になっていません！" +msgstr "" +"設定ファイルのパーミッションが正しくありません。書き込み可能になっていませ" +"ん！" #: libraries/Config.class.php:1297 msgid "Font size" @@ -6475,8 +6478,12 @@ msgid "Add statements:" msgstr "追加コマンド：" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "逆クォートでテーブルやフィールドの名前を囲む (特殊な文字やキーワードを含む" diff --git a/po/ka.po b/po/ka.po index d0285ca..b4428a3 100644 --- a/po/ka.po +++ b/po/ka.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: georgian <ka(a)li.org>\n" @@ -6950,7 +6950,7 @@ msgstr "Statements" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ko.po b/po/ko.po index d605fb5..c7f82ad 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-08-05 14:17+0200\n" "Last-Translator: Chung-Ook Lee <hantip(a)gmail.com>\n" "Language-Team: korean <ko(a)li.org>\n" @@ -6508,7 +6508,7 @@ msgstr "명세" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/lt.po b/po/lt.po index 7564c81..cc93afb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-08-08 18:05+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" @@ -6430,7 +6430,7 @@ msgstr "Pridėti sakinius:" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/lv.po b/po/lv.po index 1a95910..2a4827b 100644 --- a/po/lv.po +++ b/po/lv.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: latvian <lv(a)li.org>\n" @@ -6588,7 +6588,7 @@ msgstr "Parametrs" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/mk.po b/po/mk.po index be2bf93..9a97902 100644 --- a/po/mk.po +++ b/po/mk.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-05-19 17:04+0200\n" "Last-Translator: <sjanevski(a)gmail.com>\n" "Language-Team: macedonian_cyrillic <mk(a)li.org>\n" @@ -6625,7 +6625,7 @@ msgstr "Име" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ml.po b/po/ml.po index 5905f61..ff05db3 100644 --- a/po/ml.po +++ b/po/ml.po @@ -5,7 +5,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: Malayalam <ml(a)li.org>\n" @@ -6124,7 +6124,7 @@ msgstr "" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/mn.po b/po/mn.po index eb7598c..26a0c8d 100644 --- a/po/mn.po +++ b/po/mn.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: mongolian <mn(a)li.org>\n" @@ -6630,7 +6630,7 @@ msgstr "Баримтжуулал" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ms.po b/po/ms.po index 5e508b1..0b99c11 100644 --- a/po/ms.po +++ b/po/ms.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: malay <ms(a)li.org>\n" @@ -6517,7 +6517,7 @@ msgstr "Penyataan" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/nb.po b/po/nb.po index 4c52b0b..b69c027 100644 --- a/po/nb.po +++ b/po/nb.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: norwegian <no(a)li.org>\n" @@ -6671,7 +6671,7 @@ msgstr "Oversikt" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/nl.po b/po/nl.po index bd8f545..e97bff5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-06-04 15:19+0200\n" "Last-Translator: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>\n" "Language-Team: dutch <nl(a)li.org>\n" @@ -6653,8 +6653,12 @@ msgid "Add statements:" msgstr "Statements toevoegen:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Voeg aanhalingstekens toe aan tabel- en veldnamen (Beschermt tabel- en " diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot index c813c6d..27b0261 100644 --- a/po/phpmyadmin.pot +++ b/po/phpmyadmin.pot @@ -8,7 +8,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -6126,7 +6126,7 @@ msgstr "" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/pl.po b/po/pl.po index 33edd71..5c44930 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-09 20:17+0200\n" "Last-Translator: Stanisław Krukowski <stankruk(a)neostrada.pl>\n" "Language-Team: polish <pl(a)li.org>\n" @@ -1236,7 +1236,6 @@ msgid "Processes" msgstr "Procesy" #: js/messages.php:84 -#| msgid "Connections" msgid "Connections / Processes" msgstr "Połączenia / Procesy" @@ -6815,7 +6814,7 @@ msgstr "Cecha" #: libraries/export/sql.php:211 #, fuzzy msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "\"Użycie cudzysłowów z nazwami tabel i pól\" zapewnia ochronę nazwom pól i " @@ -13645,7 +13644,6 @@ msgid "" msgstr "" #: po/advisory_rules.php:270 -#| msgid "max. concurrent connections" msgid "MyISAM concurrent inserts" msgstr "MyISAM concurrent inserts" @@ -13660,9 +13658,8 @@ msgid "" "refman/5.5/en/concurrent-inserts.html\\\">MySQL Documentation</a>" msgstr "" "Ustawienie {concurrent_insert} na 1 ogranicza zawartość pomiędzy odczytem a " -"zapisem do danej tabeli. Zobacz także <a " -"href=\\\"http://dev.mysql.com/doc/refman/5.5/en/concurrent-" -"inserts.html\\\">Dokumentację MySQL</a>" +"zapisem do danej tabeli. Zobacz także <a href=\\\"http://dev.mysql.com/doc/" +"refman/5.5/en/concurrent-inserts.html\\\">Dokumentację MySQL</a>" #: po/advisory_rules.php:273 msgid "concurrent_insert is set to 0" diff --git a/po/pt.po b/po/pt.po index 2a8ed34..8d4bff8 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-08-29 10:54+0200\n" "Last-Translator: <dobreira(a)gmail.com>\n" "Language-Team: portuguese <pt(a)li.org>\n" @@ -6495,7 +6495,7 @@ msgstr "Itens" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 28cc54f..ab8b96a 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-10 03:20+0200\n" "Last-Translator: <erickdeoliveiraleal(a)gmail.com>\n" "Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n" @@ -417,7 +417,6 @@ msgstr "Você deve escolher pelo menos uma coluna para exibir" #: db_qbe.php:186 #, php-format -#| msgid "visual builder" msgid "Switch to %svisual builder%s" msgstr "Alterar para %sconstrutor visual%s" @@ -825,7 +824,6 @@ msgid "Copy and paste the joined values into the \"Length/Values\" field" msgstr "Copie e cole os valores concatenados na coluna \"Tamanho/Valores\"" #: export.php:29 -#| msgid "Bar type" msgid "Bad type!" msgstr "Tipo incorreto!" @@ -834,7 +832,6 @@ msgid "Selected export type has to be saved in file!" msgstr "Tipo de exportação selecionada tem que ser salvo no arquivo!" #: export.php:106 -#| msgid "Add index" msgid "Bad parameters!" msgstr "Parâmetros incorretos!" @@ -862,13 +859,11 @@ msgid "Dump has been saved to file %s." msgstr "Dump foi salvo no arquivo %s." #: file_echo.php:21 -#| msgid "Export type" msgid "Invalid export type" msgstr "Formato inválido para exportação" #: gis_data_editor.php:84 #, php-format -#| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" msgstr "Valores do campo \"%s\"" @@ -907,7 +902,6 @@ msgstr "Ponto %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 -#| msgid "Add index" msgid "Add a point" msgstr "Adicione um ponto" @@ -926,7 +920,6 @@ msgid "Inner Ring" msgstr "Anel interno" #: gis_data_editor.php:252 -#| msgid "Add a new User" msgid "Add a linestring" msgstr "Adicionar uma linha" @@ -955,8 +948,8 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" -"Selecione \"GeomFromText\" no campo \"Function\" e cole a string abaixo no campo " -"\"Value\"" +"Selecione \"GeomFromText\" no campo \"Function\" e cole a string abaixo no " +"campo \"Value\"" #: import.php:57 #, php-format @@ -1243,7 +1236,6 @@ msgid "Query statistics" msgstr "Estatísticas de Consultas" #: js/messages.php:93 -#| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" msgstr "Configuração do monitor local incompatível" @@ -1300,12 +1292,10 @@ msgid "Average load" msgstr "Carga média" #: js/messages.php:107 -#| msgid "System memory" msgid "Total memory" msgstr "Memória total do sistema" #: js/messages.php:108 -#| msgid "System memory" msgid "Cached memory" msgstr "Cache de memória" @@ -1314,17 +1304,14 @@ msgid "Buffered memory" msgstr "Memória em Buffer" #: js/messages.php:110 -#| msgid "System memory" msgid "Free memory" msgstr "Memória livre" #: js/messages.php:111 -#| msgid "System memory" msgid "Used memory" msgstr "Memória usada" #: js/messages.php:113 -#| msgid "Total" msgid "Total Swap" msgstr "Swap Total" @@ -1337,7 +1324,6 @@ msgid "Used Swap" msgstr "Swap Utilizado" #: js/messages.php:116 -#| msgid "Free pages" msgid "Free Swap" msgstr "Swap livre" @@ -1346,7 +1332,6 @@ msgid "Bytes sent" msgstr "Bytes enviados" #: js/messages.php:119 -#| msgid "Received" msgid "Bytes received" msgstr "Bytes Recebidos" @@ -1370,18 +1355,15 @@ msgstr "Configurações" # The word "chart" in brasilian portuguese can mean either "Table = tabela" or "Report = relatório" or "Chart = gráfico" or "Diagram = diagrama". So, it depends of the context. #: js/messages.php:127 -#| msgid "Remove database" msgid "Remove chart" msgstr "Remover Gráfico" #: js/messages.php:128 -#| msgid "Edit labels and series" msgid "Edit title and labels" msgstr "Editar rótulos e títulos" # The word "chart" in brasilian portuguese can mean either "Table = tabela" or "Report = relatório" or "Chart = gráfico" or "Diagram = diagrama". So, it depends of the context. #: js/messages.php:129 -#| msgid "Snap to grid" msgid "Add chart to grid" msgstr "Adicionar gráfico ajustado na grade" @@ -2410,7 +2392,6 @@ msgstr[0] "%1$d linha inserida." msgstr[1] "%1$d linha(s) inseridas." #: libraries/PDF.class.php:81 -#| msgid "Allows reading data." msgid "Error while creating PDF:" msgstr "Erro ao criar o PDF:" @@ -3930,7 +3911,6 @@ msgid "SQL queries settings" msgstr "Configurações de consultas SQL" #: libraries/config/messages.inc.php:220 -#| msgid "SQL history" msgid "SQL Validator" msgstr "Validador SQL" @@ -4814,7 +4794,6 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:430 -#| msgid "Defragment table" msgid "UI preferences table" msgstr "Preferências visuais da tabela" @@ -6493,7 +6472,7 @@ msgstr "Adicionar instruções:" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" @@ -6618,7 +6597,6 @@ msgid "Open new phpMyAdmin window" msgstr "Abrir nova janela do phpMyAdmin" #: libraries/gis_visualization.lib.php:134 -#| msgid "No data found for the chart." msgid "No data found for GIS visualization." msgstr "Não foram encontrados dados para a visualização GIS." @@ -8269,17 +8247,6 @@ msgstr "" "isso é feito usando a função gmdate()." #: libraries/transformations/text_plain__external.inc.php:10 -#| msgid "" -#| "LINUX ONLY: Launches an external application and feeds it the field data " -#| "via standard input. Returns the standard output of the application. The " -#| "default is Tidy, to pretty-print HTML code. For security reasons, you " -#| "have to manually edit the file libraries/transformations/" -#| "text_plain__external.inc.php and list the tools you want to make " -#| "available. The first option is then the number of the program you want to " -#| "use and the second option is the parameters for the program. The third " -#| "option, if set to 1, will convert the output using htmlspecialchars() " -#| "(Default 1). The fourth option, if set to 1, will prevent wrapping and " -#| "ensure that the output appears all on one line (Default 1)." msgid "" "LINUX ONLY: Launches an external application and feeds it the column data " "via standard input. Returns the standard output of the application. The " @@ -8295,19 +8262,15 @@ msgstr "" "LINUX APENAS: Rode uma aplicação externa e alimente os campos de dados pela " "entrada padrão. Retorna a saída padrão da aplicação. Padrão é Limpo, para " "uma bonita impressão do código HTML. Por razões de segurança, você deve " -"editar manualmente o arquivo " -"libraries/transformations/text_plain__external.inc.php e inserir as " -"ferramentas que você permite rodar. A primeira opção é o número do programa " -"que você quer rodar e a segunda opção são os parâmetros para o programa. A " -"terceira opção, se setada para 1 irá converter a saída usando " -"htmlspecialchars() (Padrão é 1). A quarta opção, se setada como 1 irá por um " -"NOWRAP para o conteúdo da célula, de forma que a saída inteira será " +"editar manualmente o arquivo libraries/transformations/text_plain__external." +"inc.php e inserir as ferramentas que você permite rodar. A primeira opção é " +"o número do programa que você quer rodar e a segunda opção são os parâmetros " +"para o programa. A terceira opção, se setada para 1 irá converter a saída " +"usando htmlspecialchars() (Padrão é 1). A quarta opção, se setada como 1 irá " +"por um NOWRAP para o conteúdo da célula, de forma que a saída inteira será " "mostrada sem reformatação(Padrão é 1)" #: libraries/transformations/text_plain__formatted.inc.php:10 -#| msgid "" -#| "Displays the contents of the field as-is, without running it through " -#| "htmlspecialchars(). That is, the field is assumed to contain valid HTML." msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." @@ -8316,10 +8279,6 @@ msgstr "" "htmlspecialchars(). Isso é, a coluna assume conter HTML válido" #: libraries/transformations/text_plain__imagelink.inc.php:10 -#| msgid "" -#| "Displays an image and a link; the field contains the filename. The first " -#| "option is a URL prefix like \"http://www.example.com/\". The second and " -#| "third options are the width and the height in pixels." msgid "" "Displays an image and a link; the column contains the filename. The first " "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -8330,18 +8289,14 @@ msgstr "" "terceira opção são a largura e a altura em pixels." #: libraries/transformations/text_plain__link.inc.php:10 -#| msgid "" -#| "Displays a link; the field contains the filename. The first option is a " -#| "URL prefix like \"http://www.example.com/\". The second option is a title " -#| "for the link." msgid "" "Displays a link; the column contains the filename. The first option is a URL " "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" "Mostra um link, o campo contém o nome do arquivo. A primeira opção é um " -"prefixo URL como \"http://www.exemplo.com/\". A segunda opção é um título para " -"o link." +"prefixo URL como \"http://www.exemplo.com/\". A segunda opção é um título " +"para o link." #: libraries/transformations/text_plain__longToIpv4.inc.php:10 msgid "" @@ -9576,7 +9531,6 @@ msgid "Reset slave" msgstr "" #: server_replication.php:326 -#| msgid "Structure only" msgid "Start SQL Thread only" msgstr "Iniciar somente processo SQL" @@ -9585,7 +9539,6 @@ msgid "Stop SQL Thread only" msgstr "" #: server_replication.php:331 -#| msgid "Structure only" msgid "Start IO Thread only" msgstr "Iniciar somente processo IO" @@ -11537,7 +11490,6 @@ msgid "Table %s has been flushed" msgstr "Tabela %s foi limpa" #: tbl_operations.php:672 -#| msgid "Flush the table (\"FLUSH\")" msgid "Flush the table (FLUSH)" msgstr "Limpar a tabela (FLUSH)" @@ -11696,7 +11648,6 @@ msgid "Add unique index" msgstr "Adicionar índice único" #: tbl_structure.php:173 tbl_structure.php:174 -#| msgid "Add index" msgid "Add SPATIAL index" msgstr "Adicionar índice SPATIAL" diff --git a/po/ro.po b/po/ro.po index 07bdda8..40fecc6 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: romanian <ro(a)li.org>\n" @@ -6764,7 +6764,7 @@ msgstr "Comenzi" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ru.po b/po/ru.po index 6984d00..92abc42 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,14 +3,14 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-12 17:49+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" @@ -420,7 +420,6 @@ msgstr "" #: db_qbe.php:186 #, php-format -#| msgid "visual builder" msgid "Switch to %svisual builder%s" msgstr "Переключиться на %sвизуальный составитель запросов%s" @@ -830,7 +829,6 @@ msgid "Copy and paste the joined values into the \"Length/Values\" field" msgstr "Скопируйте и вставьте объединенные значения в поле \"Длина/значения\"" #: export.php:29 -#| msgid "Bar type" msgid "Bad type!" msgstr "Ошибочный тип!" @@ -839,7 +837,6 @@ msgid "Selected export type has to be saved in file!" msgstr "Выбранный тип экспорта возможен только в файл!" #: export.php:106 -#| msgid "Add parameter" msgid "Bad parameters!" msgstr "Ошибочные параметры!" @@ -867,13 +864,11 @@ msgid "Dump has been saved to file %s." msgstr "Дамп был сохранен в файл %s." #: file_echo.php:21 -#| msgid "Export type" msgid "Invalid export type" msgstr "Ошибочный тип экспорта" #: gis_data_editor.php:84 #, php-format -#| msgid "Values for the column \"%s\"" msgid "Value for the column \"%s\"" msgstr "Значение для поля \"%s\"" @@ -912,12 +907,10 @@ msgstr "Точка %d" #: gis_data_editor.php:204 gis_data_editor.php:250 gis_data_editor.php:302 #: js/messages.php:295 -#| msgid "Add routine" msgid "Add a point" msgstr "Добавить точку" #: gis_data_editor.php:220 js/messages.php:290 -#| msgid "Lines terminated by" msgid "Linestring" msgstr "Линия" @@ -930,12 +923,10 @@ msgid "Inner Ring" msgstr "Внутренний контур" #: gis_data_editor.php:252 -#| msgid "Add a new User" msgid "Add a linestring" msgstr "Добавить линию" #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:296 -#| msgid "Add a new User" msgid "Add an inner ring" msgstr "Добавить внутренний контур" @@ -944,12 +935,10 @@ msgid "Polygon" msgstr "Многоугольник" #: gis_data_editor.php:306 js/messages.php:297 -#| msgid "Add column" msgid "Add a polygon" msgstr "Добавить многоугольник" #: gis_data_editor.php:310 -#| msgid "Geometry" msgid "Add geometry" msgstr "Добавить геометрии" @@ -958,7 +947,8 @@ msgid "" "Chose \"GeomFromText\" from the \"Function\" column and paste the below " "string into the \"Value\" field" msgstr "" -"Из поля функции выберите \"GeomFromText\" и вставьте строку ниже, как значение" +"Из поля функции выберите \"GeomFromText\" и вставьте строку ниже, как " +"значение" #: import.php:57 #, php-format @@ -1229,7 +1219,6 @@ msgstr "Соединения / Процессы" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:86 -#| msgid "Connections since last refresh" msgid "Questions since last refresh" msgstr "Вопросов с момента последнего обновления" @@ -1243,7 +1232,6 @@ msgid "Query statistics" msgstr "Статистика запросов" #: js/messages.php:93 -#| msgid "Failed to read configuration file" msgid "Local monitor configuration incompatible" msgstr "Настройки локального монитора несовместимы" @@ -1260,17 +1248,14 @@ msgstr "" "меню Настройки, в изначальные." #: js/messages.php:96 -#| msgid "Query cache" msgid "Query cache efficiency" msgstr "Эффективность кеширования запросов" #: js/messages.php:97 -#| msgid "Query cache" msgid "Query cache usage" msgstr "Использование кеширования запросов" #: js/messages.php:98 -#| msgid "Query cache" msgid "Query cache used" msgstr "Кеш запросов использован" @@ -1301,7 +1286,6 @@ msgid "Average load" msgstr "Средняя загрузка" #: js/messages.php:107 -#| msgid "Total count" msgid "Total memory" msgstr "Полная память" @@ -1310,7 +1294,6 @@ msgid "Cached memory" msgstr "Кешированная память" #: js/messages.php:109 -#| msgid "Buffer Pool" msgid "Buffered memory" msgstr "Беферизованная память" @@ -1323,7 +1306,6 @@ msgid "Used memory" msgstr "Использованная память" #: js/messages.php:113 -#| msgid "Total" msgid "Total Swap" msgstr "Всего области подкачки" @@ -1336,7 +1318,6 @@ msgid "Used Swap" msgstr "Использовано области подкачки" #: js/messages.php:116 -#| msgid "Free pages" msgid "Free Swap" msgstr "Свободно области подкачки" @@ -1345,7 +1326,6 @@ msgid "Bytes sent" msgstr "Отослано байт" #: js/messages.php:119 -#| msgid "Received" msgid "Bytes received" msgstr "Принято байт" @@ -1355,7 +1335,6 @@ msgstr "Соединения" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:124 -#| msgid "Versions" msgid "Questions" msgstr "Вопросы" @@ -1369,7 +1348,6 @@ msgid "Settings" msgstr "Настройки" #: js/messages.php:127 -#| msgid "Remove database" msgid "Remove chart" msgstr "Удалить график" @@ -1378,7 +1356,6 @@ msgid "Edit title and labels" msgstr "Редактировать название и подписи" #: js/messages.php:129 -#| msgid "Snap to grid" msgid "Add chart to grid" msgstr "Добавить график к сетке" @@ -1454,21 +1431,18 @@ msgstr "" #. l10n: %s is FILE or TABLE #: js/messages.php:146 #, php-format -#| msgid "Save output to a file" msgid "Set log_output to %s" msgstr "Установить log_output в %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:148 #, php-format -#| msgid "Enabled" msgid "Enable %s" msgstr "Включить %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:150 #, php-format -#| msgid "Disabled" msgid "Disable %s" msgstr "Отключить %s" @@ -1487,23 +1461,19 @@ msgstr "" "учетной записью root, или свяжитесь с администратором базы данных." #: js/messages.php:154 -#| msgid "Manage your settings" msgid "Change settings" msgstr "Изменить настройки" #: js/messages.php:155 -#| msgid "More settings" msgid "Current settings" msgstr "Текущие настройки" #: js/messages.php:157 server_status.php:1634 -#| msgid "Chart title" msgid "Chart Title" msgstr "Заголовок графика" #. l10n: As in differential values #: js/messages.php:159 -#| msgid "Difference" msgid "Differential" msgstr "Различия" @@ -1551,19 +1521,16 @@ msgstr "" "Данные журналов загружены. Запросы выполненные в данный промежуток времени:" #: js/messages.php:169 -#| msgid "Jump to database" msgid "Jump to Log table" msgstr "Перейти к таблице журнала" #: js/messages.php:170 msgid "Log analysed, but no data found in this time span." msgstr "" -"Анализ журнала пройден, но данные за выбранный промежуток времени не " -"найдены." +"Анализ журнала пройден, но данные за выбранный промежуток времени не найдены." #. l10n: A collection of available filters #: js/messages.php:173 -#| msgid "Tables display options" msgid "Log table filter options" msgstr "Параметры фильтра таблицы журнала" @@ -1578,20 +1545,18 @@ msgstr "Фильтровать запросы по строке, либо рег #: js/messages.php:177 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "Группировать запросы с игнорированием переменных данных в условии WHERE" +msgstr "" +"Группировать запросы с игнорированием переменных данных в условии WHERE" #: js/messages.php:178 -#| msgid "Number of inserted rows" msgid "Sum of grouped rows:" msgstr "Сумма сгруппированных строк:" #: js/messages.php:179 -#| msgid "Total" msgid "Total:" msgstr "Всего:" #: js/messages.php:181 -#| msgid "Loading" msgid "Loading logs" msgstr "Загрузка журналов" @@ -1610,7 +1575,6 @@ msgstr "" "учетной записи, должны решить проблему." #: js/messages.php:184 -#| msgid "Reload" msgid "Reload page" msgstr "Перезагрузка страницы" @@ -6638,8 +6602,12 @@ msgid "Add statements:" msgstr "Добавить выражения:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Заключить имена таблиц и полей в обратные кавычки (защищает имена таблиц " diff --git a/po/si.po b/po/si.po index 7939b2f..b031066 100644 --- a/po/si.po +++ b/po/si.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-06-04 15:35+0200\n" "Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n" "Language-Team: sinhala <si(a)li.org>\n" @@ -6436,7 +6436,7 @@ msgstr "ප්‍රකාශ එක් කරන්න:" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/sk.po b/po/sk.po index a48ff18..6ca0e01 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-07-27 15:32+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" @@ -6524,7 +6524,7 @@ msgstr "Pridať príkazy:" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/sl.po b/po/sl.po index 1e6a44c..b0393b7 100644 --- a/po/sl.po +++ b/po/sl.po @@ -3,16 +3,16 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-13 00:30+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " -"n%100==4 ? 2 : 3);\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:319 @@ -2202,7 +2202,6 @@ msgstr "Pred uporabo phpMyAdmina odstranite mapo \"./config\"!" #: libraries/Config.class.php:727 #, php-format -#| msgid "Existing configuration file (%d) is not readable." msgid "Existing configuration file (%s) is not readable." msgstr "Obstoječa konfiguracijska datoteka (%s) ni berljiva." @@ -2437,9 +2436,9 @@ msgid "" "after you refresh this page. Please check if the table structure has been " "changed." msgstr "" -"Ne morem straniti lastnosti uporabniškega vmesnika \"%s\". Narejene spremembe " -"po osvežitvi te strani ne bodo stalne. Prosimo, preverite, ali je bila " -"struktura tabele spremenjena." +"Ne morem straniti lastnosti uporabniškega vmesnika \"%s\". Narejene " +"spremembe po osvežitvi te strani ne bodo stalne. Prosimo, preverite, ali je " +"bila struktura tabele spremenjena." #: libraries/Theme.class.php:145 #, php-format @@ -6507,8 +6506,12 @@ msgid "Add statements:" msgstr "Dodaj izjave:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Obdaj imena tabel in polj z narekovaji (Zaščiti imena polj in tabel, " @@ -11282,7 +11285,6 @@ msgid "No index parts defined!" msgstr "Ni definiranega dela indeksa!" #: tbl_indexes.php:169 -#| msgid "Create a new index" msgid "Create an index" msgstr "Ustvari indeks" diff --git a/po/sq.po b/po/sq.po index a891da9..f1be250 100644 --- a/po/sq.po +++ b/po/sq.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: albanian <sq(a)li.org>\n" @@ -6579,7 +6579,7 @@ msgstr "Instruksione" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/sr.po b/po/sr.po index 2e689a8..83ac062 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" "Last-Translator: <theranchcowboy(a)googlemail.com>\n" "Language-Team: serbian_cyrillic <sr(a)li.org>\n" @@ -6706,7 +6706,7 @@ msgstr "Име" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index f430fcb..9d33745 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" "Last-Translator: Sasa Kostic <sasha.kostic(a)gmail.com>\n" "Language-Team: serbian_latin <sr@latin@li.org>\n" @@ -6696,7 +6696,7 @@ msgstr "Ime" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/sv.po b/po/sv.po index 8ca98f8..fdeeb5e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,14 +3,14 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-12 18:20+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" -"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -6474,8 +6474,12 @@ msgid "Add statements:" msgstr "Lägg till uppgift:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Bifoga tabell och fältnamnen med backquotes (Skyddar fältet och namn på " @@ -11235,7 +11239,6 @@ msgid "No index parts defined!" msgstr "Inga delar av index är definierade!" #: tbl_indexes.php:169 -#| msgid "Create a new index" msgid "Create an index" msgstr "Skapa index" @@ -12051,9 +12054,9 @@ msgid "" "cache, especially if you have multiple slaves." msgstr "" "Du använder MySQL Querycachen med en ganska högbelastad databas. Det kan " -"vara värt att överväga att använda <a " -"href=\\\"http://dev.mysql.com/doc/refman/5.5/en/ha-memcached.html\\\"> memcached " -"</ a> istället för MySQL Querycachen, speciellt om du har flera slavar." +"vara värt att överväga att använda <a href=\\\"http://dev.mysql.com/doc/" +"refman/5.5/en/ha-memcached.html\\\"> memcached </ a> istället för MySQL " +"Querycachen, speciellt om du har flera slavar." #: po/advisory_rules.php:78 #, php-format @@ -12108,7 +12111,6 @@ msgstr "" "cache-storlek är %s%%. Det bör vara över 80%%" #: po/advisory_rules.php:90 -#| msgid "Query cache" msgid "Query cache fragmentation" msgstr "Frågecache fragmentering" @@ -12152,7 +12154,6 @@ msgid "Query cache low memory prunes" msgstr "Fråge cachen lite minne prunes" #: po/advisory_rules.php:96 -#| msgid "The amount of free memory for query cache." msgid "" "Cached queries are removed due to low query cache memory from the query " "cache." @@ -12178,7 +12179,6 @@ msgstr "" "värdet är, desto bättre (Denna regel aktiveras vid: 0,1%)" #: po/advisory_rules.php:100 -#| msgid "Query cache" msgid "Query cache max size" msgstr "Maximal storlek för frågecache" @@ -12204,7 +12204,6 @@ msgid "Current query cache size: %s" msgstr "Nuvarande storlek på frågecache: %s" #: po/advisory_rules.php:105 -#| msgid "Query results" msgid "Query cache min result size" msgstr "Frågecachen minimum resultat storlek" @@ -12212,8 +12211,7 @@ msgstr "Frågecachen minimum resultat storlek" msgid "" "The max size of the result set in the query cache is the default of 1 MiB." msgstr "" -"Den maximala storleken på resultatet i fråg cachen är standardvärdet på 1 " -"Mb." +"Den maximala storleken på resultatet i fråg cachen är standardvärdet på 1 Mb." #: po/advisory_rules.php:107 msgid "" @@ -12241,12 +12239,10 @@ msgid "query_cache_limit is set to 1 MiB" msgstr "query_cache_limit är satt till 1 Mb" #: po/advisory_rules.php:110 -#| msgid "Allows creating temporary tables." msgid "Percentage of sorts that cause temporary tables" msgstr "Andelen av typer som medför temporära tabeller" #: po/advisory_rules.php:111 po/advisory_rules.php:116 -#| msgid "Allows creating temporary tables." msgid "Too many sorts are causing temporary tables." msgstr "Alltför många typer orsakar temporära tabeller." @@ -12268,7 +12264,6 @@ msgstr "" "än 10%%." #: po/advisory_rules.php:115 -#| msgid "Allows creating temporary tables." msgid "Rate of sorts that cause temporary tables" msgstr "Andelen sorter som orsakar temporära tabeller." @@ -12281,7 +12276,6 @@ msgstr "" "1 per timme." #: po/advisory_rules.php:120 -#| msgid "Start row" msgid "Sort rows" msgstr "Sortera rader" @@ -12297,8 +12291,8 @@ msgid "" "sorting" msgstr "" "Även om det inte är fel med en stor mängd radsorteringar,bör du se till att " -"frågor som kräver mycket sortering använder de indexerade fälten i ORDER " -"BY-satsen, då detta kommer resultera i mycket snabbare sortering" +"frågor som kräver mycket sortering använder de indexerade fälten i ORDER BY-" +"satsen, då detta kommer resultera i mycket snabbare sortering" #: po/advisory_rules.php:123 #, php-format @@ -12306,12 +12300,10 @@ msgid "Sorted rows average: %s" msgstr "Genomsnittligt antal sorterade rader: %s" #: po/advisory_rules.php:125 -#| msgid "There are no routines to display." msgid "Rate of joins without indexes" msgstr "Andelen JOIN som saknar index" #: po/advisory_rules.php:126 -#| msgid "There are no routines to display." msgid "There are too many joins without indexes." msgstr "Det finns för många JOINS som saknar index" diff --git a/po/ta.po b/po/ta.po index 037d508..fc1eb55 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,7 +6,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-08-23 10:51+0200\n" "Last-Translator: Sajeepan Yogenthiran <ysajeepan(a)live.com>\n" "Language-Team: Tamil <ta(a)li.org>\n" @@ -6196,7 +6196,7 @@ msgstr "தடைகளை சேர்க்க" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/te.po b/po/te.po index 1c130d7..f209bff 100644 --- a/po/te.po +++ b/po/te.po @@ -6,7 +6,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" "Last-Translator: <veeven(a)gmail.com>\n" "Language-Team: Telugu <te(a)li.org>\n" @@ -6338,7 +6338,7 @@ msgstr "స్పందనలకు చేర్చు" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/th.po b/po/th.po index bfcd6e7..f18b39d 100644 --- a/po/th.po +++ b/po/th.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-07-24 11:50+0200\n" "Last-Translator: Waitaya Krongapiradee <wyte_sk133(a)hotmail.com>\n" "Language-Team: thai <th(a)li.org>\n" @@ -6538,7 +6538,7 @@ msgstr "คำสั่ง" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/tr.po b/po/tr.po index 048085c..821795a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-01 11:59+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" @@ -6521,8 +6521,12 @@ msgid "Add statements:" msgstr "İfadeleri ekle:" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "Tablo ve alan adlarını tırnak içine al (Özel karakterlerle ya da anahtar " diff --git a/po/tt.po b/po/tt.po index eb34003..5ee378a 100644 --- a/po/tt.po +++ b/po/tt.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: tatarish <tt(a)li.org>\n" @@ -6649,7 +6649,7 @@ msgstr "Cömlä" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ug.po b/po/ug.po index e61f292..332de1a 100644 --- a/po/ug.po +++ b/po/ug.po @@ -6,7 +6,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" "Last-Translator: <gheni(a)yahoo.cn>\n" "Language-Team: Uyghur <ug(a)li.org>\n" @@ -6451,7 +6451,7 @@ msgstr "مەجبۇرى قوشۇش" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/uk.po b/po/uk.po index 870b252..99381b1 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-07-03 18:10+0200\n" "Last-Translator: <vovka2008(a)gmail.com>\n" "Language-Team: ukrainian <uk(a)li.org>\n" @@ -6324,7 +6324,7 @@ msgstr "Параметр" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/ur.po b/po/ur.po index 743cc7c..eeeebea 100644 --- a/po/ur.po +++ b/po/ur.po @@ -6,7 +6,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" "Last-Translator: Mehbooob Khan <mehboobbugti(a)gmail.com>\n" "Language-Team: Urdu <ur(a)li.org>\n" @@ -6462,7 +6462,7 @@ msgstr "Add constraints" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/uz.po b/po/uz.po index 227392f..6d6f625 100644 --- a/po/uz.po +++ b/po/uz.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_cyrillic <uz(a)li.org>\n" @@ -7029,7 +7029,7 @@ msgstr "Тавсиф" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 4112a95..d62b546 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: uzbek_latin <uz@latin@li.org>\n" @@ -7055,7 +7055,7 @@ msgstr "Tavsif" #: libraries/export/sql.php:211 msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2352fa6..202157e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-09-02 04:21+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" @@ -6298,8 +6298,12 @@ msgid "Add statements:" msgstr "添加语句：" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "给表名和字段名加上反引号 (保护名称中含有特殊字符或保留字的字段和表)" diff --git a/po/zh_TW.po b/po/zh_TW.po index 9499be5..efed713 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,7 +3,7 @@ msgid "" 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-09-11 06:58-0400\n" +"POT-Creation-Date: 2011-09-13 12:29-0400\n" "PO-Revision-Date: 2011-06-19 09:59+0200\n" "Last-Translator: <star(a)origin.club.tw>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" @@ -6397,8 +6397,12 @@ msgid "Add statements:" msgstr "新增指令：" #: libraries/export/sql.php:211 +#, fuzzy +#| msgid "" +#| "Enclose table and field names with backquotes (Protects field and " +#| "table names formed with special characters or keywords)" msgid "" -"Enclose table and field names with backquotes (Protects field and table " +"Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" msgstr "" "給資料表名稱和欄位名稱加上反引號 (保護名稱中含有特殊字元或保留字的欄位和" hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git September 2011