- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1010-gbe49589
by Marc Delisle 19 Dec '10

19 Dec '10

The branch, master has been updated via be49589dcd7e7b9fbde3bd12160a82be6ccee8fb (commit) from e459494e708f3269ede2ee5da2bdfd43c85c2ca0 (commit) - Log ----------------------------------------------------------------- commit be49589dcd7e7b9fbde3bd12160a82be6ccee8fb Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 19 06:29:43 2010 -0500 HTML errors ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 3b8211d..75f9be5 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -40,9 +40,6 @@ $foreignData = PMA_getForeignData($foreigners, $field, $override_total, isset($f if (isset($rownumber)) { $rownumber_param = '&rownumber=' . urlencode($rownumber); - ?> -<input type="hidden" name="rownumber" value="<?php echo htmlspecialchars($rownumber); ?>" /> - <?php } else { $rownumber_param = ''; } @@ -260,7 +257,7 @@ if (is_array($foreignData['disp_row'])) { ?></td> <td width="20%"> <img src="<?php echo $GLOBALS['pmaThemeImage'] . 'spacer.png'; ?>" - alt="" width="1" height="1"></td> + alt="" width="1" height="1" /></td> <td> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1009-ge459494
by Marc Delisle 19 Dec '10

19 Dec '10

The branch, master has been updated via e459494e708f3269ede2ee5da2bdfd43c85c2ca0 (commit) via ea8a2bbc4f8f1486d4253f98391021adda7b0174 (commit) from e4b6f71162776574832ceb5f6b8dea14afb8ce3e (commit) - Log ----------------------------------------------------------------- commit e459494e708f3269ede2ee5da2bdfd43c85c2ca0 Merge: ea8a2bbc4f8f1486d4253f98391021adda7b0174 e4b6f71162776574832ceb5f6b8dea14afb8ce3e Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 19 06:22:36 2010 -0500 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit ea8a2bbc4f8f1486d4253f98391021adda7b0174 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 19 06:22:06 2010 -0500 Missing jquery library which is referenced in js/functions.js ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 4b07400..3b8211d 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -93,7 +93,10 @@ if (is_array($foreignData['disp_row'])) { <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=right&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> - <script src="./js/functions.js" type="text/javascript"></script> +<?php +// includes everything asked for by libraries/common.inc.php +require_once './libraries/header_scripts.inc.php'; +?> <script type="text/javascript"> //<![CDATA[ self.focus(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1007-ge4b6f71
by Michal Čihař 19 Dec '10

19 Dec '10

The branch, master has been updated via e4b6f71162776574832ceb5f6b8dea14afb8ce3e (commit) via d85620088f362c8a584f7f4b14b5670711b2fedf (commit) via 370b9c76f9e3e20762e4fc031a2a6882b9263b1a (commit) via 3ae1645bb997b5c6c0d08cf5e223b5e9e135c9d2 (commit) via 2148b75dff5c69cf3ecd4a82d516200e45f0746c (commit) via 62ff83322c405fd288695acba8c7fc336fea26f8 (commit) via 727489b7678625bcedb181dc567740e89f29e906 (commit) via 91781af6f46b8bec21cf9dce14df887beafc4b39 (commit) via 9b531db47a9794ad0ab4439a019afb3919fdfa74 (commit) via 62af2ee5f1a6adcf823259f52fd77153c465545d (commit) via 09df04cff35c0769444c10e13f4a3a3edf507a9d (commit) via 96dd3d05ea1c0bbd0eb8d950d5077bf40919860f (commit) via 393476074f1f865ca3171163f35ae23653fd8b12 (commit) via 1bdef2d0fef1ac49752d61f338e9e352c116bd48 (commit) via 5f6fc641a136a16780cfc3680e749fe79983f10c (commit) via 42be4594dc611c390aa5e6274682945154426f88 (commit) via e07b9e17726514da92c0ea6cbaf454f00d27bd8a (commit) via 4b764d1ce23b28f1db2471822680a0e10ecb2d09 (commit) via 24e942c221e4ad193a68210c70d87fdab3898838 (commit) via b12c857f71d6868fc369b922b3fec675cfb6ad27 (commit) via f3aab19beaad990c27c12156fabc7a486845222d (commit) via ec992704966c58b0b310d19444a905bb6361ebf8 (commit) via 0db278668ee8590086462054a749c4b4e6199edd (commit) via 184bb5da0711209b43b528cb85f1d5cacf270409 (commit) via c52781de66130dda792c569509cff754fc225578 (commit) via facbbbe79a918868a0f760d7935b56b97eec4dfc (commit) via c99eb33fd3324cfed5305b7e7fa275405b2d3449 (commit) via f4b0cd3f0f790b350a89dde1252c8de60f5cdd86 (commit) via cceadfc7fb9f60256e4538fef7b46e73f250b517 (commit) via c41b9f1edbeef80e870375e1c56963b55652b784 (commit) via eb5c15efac60048d7de37f5dffde36a79b98e983 (commit) via 5abdbe92c5631c9c8eeb24d75dafa9f45267f064 (commit) via e91894eb383ddb876108372a06bd1e662882aef9 (commit) via 3d3b9f271177f19512ff745da0c0c55f7ad22d59 (commit) via 1816e84f15f0941b754fd8768f7515c90f85c39d (commit) via c1ce139b803b389e4e27be9b928cbc2c3c3ce8ff (commit) via 0544093d2f53262b472b95c1ed0f0be5658921b4 (commit) via 031d3eef074ccd63b5718d2bf0700b36989bc605 (commit) via 2fe02721c28be2e309d2e24c10b0d9e1b10db53c (commit) via 8aa723189eeb83633a6377d8a72b51400c878eec (commit) via 2c81cd83a3ec4562ea27a5d56f9d6b16a8bc384a (commit) via 89ade7a369c730f43623a104c494f54ada081e1f (commit) via 408d60b78976159dbf360cf9954b4cc5f7f8ea90 (commit) via 0582067d760d68c0421dee254ed0c7fcdcaefa7c (commit) via 7f96cea45dbc19c74cb36209a392129657d28a50 (commit) via 2e483dfbce3c379aa235b56863066b567dc72036 (commit) via 079795e9b53410377bd7e24082bb0d0e7060daf0 (commit) via 673e5f32679ef845e1c6fd31e8bb644b3b2e2156 (commit) via 1be6cde75bc7982d251f5a15dad741334e90def9 (commit) via a6d2cbd71628ddf6b456aa7536b40178e25bc660 (commit) via 3c718f354f46afede53a757286c687a2bc548ace (commit) via 847841e677d54a57f8fc4b3156c31be2575d3bac (commit) via a3dd175270a6290e67fd1550bc81f8ecbc525b82 (commit) via 65031f0d9372faa41660382aa4c94eb72eecf8ea (commit) via 2e12b7665f8d2e9e65d5d8daa6d513fd21d0d39e (commit) via a54e4dfb4f38067995f4b51649c2ae2d9955d509 (commit) via 61ecdd040994aaa06ccaa6d40076ae84dcb383af (commit) via c53fa153beda2c7ec54f854636fddc9c56c876ee (commit) via a06830adb5ca2c875254b9b9dae32643eed70d34 (commit) via 278a52376c14335048de12dd6c4cb42b8c6052c7 (commit) via d0046c076862b11a4989751688de987bd8339178 (commit) via 67fc81abbd6d381775d1a6d116c9f79b42c35bc9 (commit) via 076cd5b8702be7ce596750f79ed1983e5a6ad088 (commit) via 38598b98758aa2f7027346517ad1dcaecbe69e1f (commit) via 92d34eca881f74a3eb09c4f3d7953be5b31b48c4 (commit) via 38ae77d7c4c46c16fe4917cbe57b899600511284 (commit) via ada691d7905c79f7a5d3c5354c4bfbcc66c18003 (commit) via de5b3e2e44b16707fff4a7105d4f21ab5421f1ea (commit) via dcabb5d39c534746f7f7e5a5fd6c258175232e42 (commit) via c6efa0fbc03a395f53f26025a8d54e085537513c (commit) via 30962d95b5a2a6494bb1d79fb1684ee4526deb73 (commit) via 297aea65f227038c1539782382d6719f8baa6550 (commit) via c469b68710bec6db5429aa9355035996f2e802c5 (commit) via 7f27c698b77298b4553e2587896cfbc85b5cdfdb (commit) via 71b5e7b0668d0c907ee17c124007ed0fa7077791 (commit) via 1b337e45d8113cb844614fcc488c308905eacc44 (commit) via 203664c0f2f66bdde431875e26b92ac5173a0481 (commit) via 93d1868b547eff390b78cdd7a9debb7d84b2e9b5 (commit) via d03fb7878e027bff20358a8027f835519bd9ef2a (commit) via b40c2c9fc02b72280ce57a9f89d53b2b25b431bf (commit) via 1671db152b5c001902b66ed83ed0089d16d5f6e1 (commit) via 3838cab18873e0c8c23a3b18a74054005e188c62 (commit) via fc89a0d19cbc4e8b4203afee835a3e6bc5af3e41 (commit) via be41bd738458d9a6baa0a616a54139af9ebb2d00 (commit) via ed0b406d6c695cf3256c498d99ce5d87433d88f7 (commit) via ce58781a26f9f7e305d6330be0712312e038821d (commit) via 2286e25c30e5d79a6be1e5611a204d65b7713cec (commit) via 18602192e334d97dad0ffc302032ae1c0a414bb7 (commit) via 1541909a34d3a92042b0e010cd4a5254ff9fefb5 (commit) via 1bdaa7feffde650c01ce472c0fc15a1999b38794 (commit) via 7b2e660d2c0d44748b64b080a255ea7c0a682f7f (commit) via 54bd046e67d7e8df2b8a8d8776b64b87a961c095 (commit) via 458e02ee4cae68c30945f56bd291bdde588f6805 (commit) via 10276942b503bcceef24e05bacf0aa6413b4b759 (commit) via f89ed56fcc7f1f1796fa92e1cbad7ee568ad35a6 (commit) via ae1cf6734ae4c4f2a624069153ad1fb577320223 (commit) via 66927491499b5f8b9d7d02e504613d8f183c9036 (commit) via 81f7016ee7c98f5da6063105a88c9ca451ff8095 (commit) via b5fce42718437b5308e3ce9b9918d96df0a48de6 (commit) via 2b835f31f96d1c2635e9bdf307dd177ede746574 (commit) via 325ec234a78fca4fc6e6c197cc6a28f3efda0aa4 (commit) via afb802b1fed0328459abaedd608182dc366120a3 (commit) via 804b46a75a574b983dbf5634c3d898fd8bfc51f1 (commit) via 850f1c13ae57cb3e418fcc1d9e0e7fa87cb4682c (commit) via 74a460d2706d9fe2780570aef9a85172ff1b3de0 (commit) via 036264a83849359fee50b43eda14b7f160d13d24 (commit) via 7f281c3237cd81b8cb6e9f462c9b437a5e4fbb69 (commit) via 4fc2265aa80e146661197c4e90e64a7beb0874ad (commit) via a6855cfc84b3976cb7694b81e1182eb8c6811c8e (commit) via da044e3e6735bfff205a2304f2d5c434f75907ec (commit) via 7a33ef31d5fadd6553c7f00f7d03966480224926 (commit) via f7a60805a9f103771cd449f623c04a0baa2c7021 (commit) via adc8e60565402f6f1cbddbe2c433d09245db8b82 (commit) via 2ebf78941b2d65a3e27fc12c7b38579851516a3f (commit) via fefbacc48d8842faf763f83e9d5c07911ced6e16 (commit) via d262b59a386ad23d46e49f55b36180a1fabadc20 (commit) via 16d9a0c448381a556575d30d79ff98a55b6f711b (commit) via 85d0bc741171bd9fc7b04f0f89f42e72ce7185cc (commit) via 891f312b13f5cebe1423ee4190803fbe3a9b48c9 (commit) via a88e49800a4f2745421c73ea4c161e69fa0bdca8 (commit) via fb348cdbbdf9105febd358bb5bf2509af4fb747d (commit) via 1557702f74f93225a1c04413c700d98719441c99 (commit) via a0eb3ea1c279e35e186dba82d6ea111bece60a0a (commit) via b7057dd3ba158e98977148124e08212f424ee87d (commit) via 921d760bead0222c1364f43f97abf72d325720e8 (commit) via d02de0d811c78e0533ecc8dc37f79c3188ba8139 (commit) via 8466ffb6efa298ef1331b25bb76deba294ef5cae (commit) via 4e92eb8beb639f1c4618d9a972768f5f2953a0fd (commit) via f7d779e7b879b152dc73cd9d81a8589cb07c2f07 (commit) via ef3bfbc18ed9c943211ff161fdfb99e813b1356c (commit) via 5863cb978b568c5c5ebe9613170d794cac67eb6b (commit) via d94c412ffb7e31f4a5ba9cd216b1e577471f706d (commit) via e5a80b938b8496be986384ddf6c4d1f64741e549 (commit) via 9aa5a31684aac32d271a834e1c7b6f8dc38e7ead (commit) via 7b78eecbeca93dcba66fcd4d666d4d570367e9c5 (commit) from c3db2ade118cd21b38771335bda2e2b258432bb7 (commit) - Log ----------------------------------------------------------------- commit e4b6f71162776574832ceb5f6b8dea14afb8ce3e Merge: c3db2ade118cd21b38771335bda2e2b258432bb7 d85620088f362c8a584f7f4b14b5670711b2fedf Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 19 11:53:19 2010 +0100 Merge remote branch 'pootle/master' commit d85620088f362c8a584f7f4b14b5670711b2fedf Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:28:15 2010 +0200 Translation update done using Pootle. commit 370b9c76f9e3e20762e4fc031a2a6882b9263b1a Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:28:01 2010 +0200 Translation update done using Pootle. commit 3ae1645bb997b5c6c0d08cf5e223b5e9e135c9d2 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:27:47 2010 +0200 Translation update done using Pootle. commit 2148b75dff5c69cf3ecd4a82d516200e45f0746c Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:27:26 2010 +0200 Translation update done using Pootle. commit 62ff83322c405fd288695acba8c7fc336fea26f8 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:27:16 2010 +0200 Translation update done using Pootle. commit 727489b7678625bcedb181dc567740e89f29e906 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:26:53 2010 +0200 Translation update done using Pootle. commit 91781af6f46b8bec21cf9dce14df887beafc4b39 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:24:14 2010 +0200 Translation update done using Pootle. commit 9b531db47a9794ad0ab4439a019afb3919fdfa74 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:24:01 2010 +0200 Translation update done using Pootle. commit 62af2ee5f1a6adcf823259f52fd77153c465545d Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:23:52 2010 +0200 Translation update done using Pootle. commit 09df04cff35c0769444c10e13f4a3a3edf507a9d Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:23:36 2010 +0200 Translation update done using Pootle. commit 96dd3d05ea1c0bbd0eb8d950d5077bf40919860f Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:23:19 2010 +0200 Translation update done using Pootle. commit 393476074f1f865ca3171163f35ae23653fd8b12 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:23:06 2010 +0200 Translation update done using Pootle. commit 1bdef2d0fef1ac49752d61f338e9e352c116bd48 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:22:46 2010 +0200 Translation update done using Pootle. commit 5f6fc641a136a16780cfc3680e749fe79983f10c Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:22:21 2010 +0200 Translation update done using Pootle. commit 42be4594dc611c390aa5e6274682945154426f88 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:21:55 2010 +0200 Translation update done using Pootle. commit e07b9e17726514da92c0ea6cbaf454f00d27bd8a Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:21:43 2010 +0200 Translation update done using Pootle. commit 4b764d1ce23b28f1db2471822680a0e10ecb2d09 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:21:27 2010 +0200 Translation update done using Pootle. commit 24e942c221e4ad193a68210c70d87fdab3898838 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:20:39 2010 +0200 Translation update done using Pootle. commit b12c857f71d6868fc369b922b3fec675cfb6ad27 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:20:36 2010 +0200 Translation update done using Pootle. commit f3aab19beaad990c27c12156fabc7a486845222d Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:20:10 2010 +0200 Translation update done using Pootle. commit ec992704966c58b0b310d19444a905bb6361ebf8 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:19:02 2010 +0200 Translation update done using Pootle. commit 0db278668ee8590086462054a749c4b4e6199edd Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:17:32 2010 +0200 Translation update done using Pootle. commit 184bb5da0711209b43b528cb85f1d5cacf270409 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:17:06 2010 +0200 Translation update done using Pootle. commit c52781de66130dda792c569509cff754fc225578 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:16:24 2010 +0200 Translation update done using Pootle. commit facbbbe79a918868a0f760d7935b56b97eec4dfc Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:13:10 2010 +0200 Translation update done using Pootle. commit c99eb33fd3324cfed5305b7e7fa275405b2d3449 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:12:39 2010 +0200 Translation update done using Pootle. commit f4b0cd3f0f790b350a89dde1252c8de60f5cdd86 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:11:53 2010 +0200 Translation update done using Pootle. commit cceadfc7fb9f60256e4538fef7b46e73f250b517 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:11:12 2010 +0200 Translation update done using Pootle. commit c41b9f1edbeef80e870375e1c56963b55652b784 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:10:46 2010 +0200 Translation update done using Pootle. commit eb5c15efac60048d7de37f5dffde36a79b98e983 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:10:44 2010 +0200 Translation update done using Pootle. commit 5abdbe92c5631c9c8eeb24d75dafa9f45267f064 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:10:04 2010 +0200 Translation update done using Pootle. commit e91894eb383ddb876108372a06bd1e662882aef9 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:09:44 2010 +0200 Translation update done using Pootle. commit 3d3b9f271177f19512ff745da0c0c55f7ad22d59 Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:09:05 2010 +0200 Translation update done using Pootle. commit 1816e84f15f0941b754fd8768f7515c90f85c39d Author: gaspy <gaspy(a)totaki.com> Date: Sat Dec 18 21:08:45 2010 +0200 Translation update done using Pootle. commit c1ce139b803b389e4e27be9b928cbc2c3c3ce8ff Merge: 0544093d2f53262b472b95c1ed0f0be5658921b4 02b9dc80089d3277f5c96d526d0b9fca8c189cb3 Author: Pootle server <pootle(a)cihar.com> Date: Sat Dec 18 16:40:21 2010 +0100 Merge remote branch 'origin/master' commit 0544093d2f53262b472b95c1ed0f0be5658921b4 Merge: 031d3eef074ccd63b5718d2bf0700b36989bc605 45ec0da621e96c108bc70395eb01ad9495f281d0 Author: Pootle server <pootle(a)cihar.com> Date: Fri Dec 17 16:40:24 2010 +0100 Merge remote branch 'origin/master' commit 031d3eef074ccd63b5718d2bf0700b36989bc605 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:46:07 2010 +0200 Translation update done using Pootle. commit 2fe02721c28be2e309d2e24c10b0d9e1b10db53c Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:46:01 2010 +0200 Translation update done using Pootle. commit 8aa723189eeb83633a6377d8a72b51400c878eec Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:45:57 2010 +0200 Translation update done using Pootle. commit 2c81cd83a3ec4562ea27a5d56f9d6b16a8bc384a Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:45:55 2010 +0200 Translation update done using Pootle. commit 89ade7a369c730f43623a104c494f54ada081e1f Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:45:46 2010 +0200 Translation update done using Pootle. commit 408d60b78976159dbf360cf9954b4cc5f7f8ea90 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:45:41 2010 +0200 Translation update done using Pootle. commit 0582067d760d68c0421dee254ed0c7fcdcaefa7c Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:45:04 2010 +0200 Translation update done using Pootle. commit 7f96cea45dbc19c74cb36209a392129657d28a50 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:44:53 2010 +0200 Translation update done using Pootle. commit 2e483dfbce3c379aa235b56863066b567dc72036 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:44:39 2010 +0200 Translation update done using Pootle. commit 079795e9b53410377bd7e24082bb0d0e7060daf0 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:44:33 2010 +0200 Translation update done using Pootle. commit 673e5f32679ef845e1c6fd31e8bb644b3b2e2156 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:44:27 2010 +0200 Translation update done using Pootle. commit 1be6cde75bc7982d251f5a15dad741334e90def9 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:44:02 2010 +0200 Translation update done using Pootle. commit a6d2cbd71628ddf6b456aa7536b40178e25bc660 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:43:41 2010 +0200 Translation update done using Pootle. commit 3c718f354f46afede53a757286c687a2bc548ace Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:40:33 2010 +0200 Translation update done using Pootle. commit 847841e677d54a57f8fc4b3156c31be2575d3bac Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:40:12 2010 +0200 Translation update done using Pootle. commit a3dd175270a6290e67fd1550bc81f8ecbc525b82 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:40:05 2010 +0200 Translation update done using Pootle. commit 65031f0d9372faa41660382aa4c94eb72eecf8ea Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:39:39 2010 +0200 Translation update done using Pootle. commit 2e12b7665f8d2e9e65d5d8daa6d513fd21d0d39e Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:39:13 2010 +0200 Translation update done using Pootle. commit a54e4dfb4f38067995f4b51649c2ae2d9955d509 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:39:01 2010 +0200 Translation update done using Pootle. commit 61ecdd040994aaa06ccaa6d40076ae84dcb383af Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:38:31 2010 +0200 Translation update done using Pootle. commit c53fa153beda2c7ec54f854636fddc9c56c876ee Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:38:27 2010 +0200 Translation update done using Pootle. commit a06830adb5ca2c875254b9b9dae32643eed70d34 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:37:39 2010 +0200 Translation update done using Pootle. commit 278a52376c14335048de12dd6c4cb42b8c6052c7 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:37:00 2010 +0200 Translation update done using Pootle. commit d0046c076862b11a4989751688de987bd8339178 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:36:09 2010 +0200 Translation update done using Pootle. commit 67fc81abbd6d381775d1a6d116c9f79b42c35bc9 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:36:00 2010 +0200 Translation update done using Pootle. commit 076cd5b8702be7ce596750f79ed1983e5a6ad088 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:35:34 2010 +0200 Translation update done using Pootle. commit 38598b98758aa2f7027346517ad1dcaecbe69e1f Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:35:22 2010 +0200 Translation update done using Pootle. commit 92d34eca881f74a3eb09c4f3d7953be5b31b48c4 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:35:08 2010 +0200 Translation update done using Pootle. commit 38ae77d7c4c46c16fe4917cbe57b899600511284 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:35:00 2010 +0200 Translation update done using Pootle. commit ada691d7905c79f7a5d3c5354c4bfbcc66c18003 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:34:40 2010 +0200 Translation update done using Pootle. commit de5b3e2e44b16707fff4a7105d4f21ab5421f1ea Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:34:27 2010 +0200 Translation update done using Pootle. commit dcabb5d39c534746f7f7e5a5fd6c258175232e42 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:34:11 2010 +0200 Translation update done using Pootle. commit c6efa0fbc03a395f53f26025a8d54e085537513c Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:33:34 2010 +0200 Translation update done using Pootle. commit 30962d95b5a2a6494bb1d79fb1684ee4526deb73 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:33:18 2010 +0200 Translation update done using Pootle. commit 297aea65f227038c1539782382d6719f8baa6550 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:33:12 2010 +0200 Translation update done using Pootle. commit c469b68710bec6db5429aa9355035996f2e802c5 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:33:05 2010 +0200 Translation update done using Pootle. commit 7f27c698b77298b4553e2587896cfbc85b5cdfdb Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:32:28 2010 +0200 Translation update done using Pootle. commit 71b5e7b0668d0c907ee17c124007ed0fa7077791 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:29:46 2010 +0200 Translation update done using Pootle. commit 1b337e45d8113cb844614fcc488c308905eacc44 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:29:37 2010 +0200 Translation update done using Pootle. commit 203664c0f2f66bdde431875e26b92ac5173a0481 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:29:27 2010 +0200 Translation update done using Pootle. commit 93d1868b547eff390b78cdd7a9debb7d84b2e9b5 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:29:00 2010 +0200 Translation update done using Pootle. commit d03fb7878e027bff20358a8027f835519bd9ef2a Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:28:33 2010 +0200 Translation update done using Pootle. commit b40c2c9fc02b72280ce57a9f89d53b2b25b431bf Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:28:22 2010 +0200 Translation update done using Pootle. commit 1671db152b5c001902b66ed83ed0089d16d5f6e1 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:27:44 2010 +0200 Translation update done using Pootle. commit 3838cab18873e0c8c23a3b18a74054005e188c62 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:27:35 2010 +0200 Translation update done using Pootle. commit fc89a0d19cbc4e8b4203afee835a3e6bc5af3e41 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:27:28 2010 +0200 Translation update done using Pootle. commit be41bd738458d9a6baa0a616a54139af9ebb2d00 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:27:14 2010 +0200 Translation update done using Pootle. commit ed0b406d6c695cf3256c498d99ce5d87433d88f7 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:26:26 2010 +0200 Translation update done using Pootle. commit ce58781a26f9f7e305d6330be0712312e038821d Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:26:07 2010 +0200 Translation update done using Pootle. commit 2286e25c30e5d79a6be1e5611a204d65b7713cec Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:25:36 2010 +0200 Translation update done using Pootle. commit 18602192e334d97dad0ffc302032ae1c0a414bb7 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:25:21 2010 +0200 Translation update done using Pootle. commit 1541909a34d3a92042b0e010cd4a5254ff9fefb5 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:24:35 2010 +0200 Translation update done using Pootle. commit 1bdaa7feffde650c01ce472c0fc15a1999b38794 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:22:15 2010 +0200 Translation update done using Pootle. commit 7b2e660d2c0d44748b64b080a255ea7c0a682f7f Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:22:01 2010 +0200 Translation update done using Pootle. commit 54bd046e67d7e8df2b8a8d8776b64b87a961c095 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:21:22 2010 +0200 Translation update done using Pootle. commit 458e02ee4cae68c30945f56bd291bdde588f6805 Author: morsa.h <morsa.h(a)gmail.com> Date: Fri Dec 17 14:20:59 2010 +0200 Translation update done using Pootle. commit 10276942b503bcceef24e05bacf0aa6413b4b759 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Dec 17 01:17:01 2010 +0200 Translation update done using Pootle. commit f89ed56fcc7f1f1796fa92e1cbad7ee568ad35a6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Dec 17 01:16:46 2010 +0200 Translation update done using Pootle. commit ae1cf6734ae4c4f2a624069153ad1fb577320223 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Dec 17 01:16:10 2010 +0200 Translation update done using Pootle. commit 66927491499b5f8b9d7d02e504613d8f183c9036 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Dec 17 01:15:09 2010 +0200 Translation update done using Pootle. commit 81f7016ee7c98f5da6063105a88c9ca451ff8095 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Dec 17 01:14:52 2010 +0200 Translation update done using Pootle. commit b5fce42718437b5308e3ce9b9918d96df0a48de6 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:56:02 2010 +0200 Translation update done using Pootle. commit 2b835f31f96d1c2635e9bdf307dd177ede746574 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:55:57 2010 +0200 Translation update done using Pootle. commit 325ec234a78fca4fc6e6c197cc6a28f3efda0aa4 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:55:40 2010 +0200 Translation update done using Pootle. commit afb802b1fed0328459abaedd608182dc366120a3 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:55:26 2010 +0200 Translation update done using Pootle. commit 804b46a75a574b983dbf5634c3d898fd8bfc51f1 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:54:57 2010 +0200 Translation update done using Pootle. commit 850f1c13ae57cb3e418fcc1d9e0e7fa87cb4682c Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:54:34 2010 +0200 Translation update done using Pootle. commit 74a460d2706d9fe2780570aef9a85172ff1b3de0 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:54:03 2010 +0200 Translation update done using Pootle. commit 036264a83849359fee50b43eda14b7f160d13d24 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:53:41 2010 +0200 Translation update done using Pootle. commit 7f281c3237cd81b8cb6e9f462c9b437a5e4fbb69 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:53:07 2010 +0200 Translation update done using Pootle. commit 4fc2265aa80e146661197c4e90e64a7beb0874ad Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:52:41 2010 +0200 Translation update done using Pootle. commit a6855cfc84b3976cb7694b81e1182eb8c6811c8e Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:52:28 2010 +0200 Translation update done using Pootle. commit da044e3e6735bfff205a2304f2d5c434f75907ec Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:52:05 2010 +0200 Translation update done using Pootle. commit 7a33ef31d5fadd6553c7f00f7d03966480224926 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:51:38 2010 +0200 Translation update done using Pootle. commit f7a60805a9f103771cd449f623c04a0baa2c7021 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:51:29 2010 +0200 Translation update done using Pootle. commit adc8e60565402f6f1cbddbe2c433d09245db8b82 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:51:10 2010 +0200 Translation update done using Pootle. commit 2ebf78941b2d65a3e27fc12c7b38579851516a3f Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:50:39 2010 +0200 Translation update done using Pootle. commit fefbacc48d8842faf763f83e9d5c07911ced6e16 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:50:19 2010 +0200 Translation update done using Pootle. commit d262b59a386ad23d46e49f55b36180a1fabadc20 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:49:08 2010 +0200 Translation update done using Pootle. commit 16d9a0c448381a556575d30d79ff98a55b6f711b Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:48:44 2010 +0200 Translation update done using Pootle. commit 85d0bc741171bd9fc7b04f0f89f42e72ce7185cc Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:48:04 2010 +0200 Translation update done using Pootle. commit 891f312b13f5cebe1423ee4190803fbe3a9b48c9 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:47:31 2010 +0200 Translation update done using Pootle. commit a88e49800a4f2745421c73ea4c161e69fa0bdca8 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:47:14 2010 +0200 Translation update done using Pootle. commit fb348cdbbdf9105febd358bb5bf2509af4fb747d Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:46:42 2010 +0200 Translation update done using Pootle. commit 1557702f74f93225a1c04413c700d98719441c99 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:45:38 2010 +0200 Translation update done using Pootle. commit a0eb3ea1c279e35e186dba82d6ea111bece60a0a Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:45:10 2010 +0200 Translation update done using Pootle. commit b7057dd3ba158e98977148124e08212f424ee87d Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:44:57 2010 +0200 Translation update done using Pootle. commit 921d760bead0222c1364f43f97abf72d325720e8 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:44:44 2010 +0200 Translation update done using Pootle. commit d02de0d811c78e0533ecc8dc37f79c3188ba8139 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:44:24 2010 +0200 Translation update done using Pootle. commit 8466ffb6efa298ef1331b25bb76deba294ef5cae Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:44:12 2010 +0200 Translation update done using Pootle. commit 4e92eb8beb639f1c4618d9a972768f5f2953a0fd Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:43:12 2010 +0200 Translation update done using Pootle. commit f7d779e7b879b152dc73cd9d81a8589cb07c2f07 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:42:52 2010 +0200 Translation update done using Pootle. commit ef3bfbc18ed9c943211ff161fdfb99e813b1356c Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:41:47 2010 +0200 Translation update done using Pootle. commit 5863cb978b568c5c5ebe9613170d794cac67eb6b Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:41:27 2010 +0200 Translation update done using Pootle. commit d94c412ffb7e31f4a5ba9cd216b1e577471f706d Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:41:10 2010 +0200 Translation update done using Pootle. commit e5a80b938b8496be986384ddf6c4d1f64741e549 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:39:51 2010 +0200 Translation update done using Pootle. commit 9aa5a31684aac32d271a834e1c7b6f8dc38e7ead Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:39:40 2010 +0200 Translation update done using Pootle. commit 7b78eecbeca93dcba66fcd4d666d4d570367e9c5 Author: gaspy <gaspy(a)totaki.com> Date: Thu Dec 16 22:36:41 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 210 +++++++++++++++++++--------------------------- po/pt.po | 285 +++++++++++++------------------------------------------------- po/tr.po | 19 ++--- 3 files changed, 149 insertions(+), 365 deletions(-) diff --git a/po/es.po b/po/es.po index 6e2032e..3a126a1 100644 --- a/po/es.po +++ b/po/es.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-11-29 02:31+0200\n" -"Last-Translator: <javipas(a)gmail.com>\n" +"PO-Revision-Date: 2010-12-18 21:28+0200\n" +"Last-Translator: <gaspy(a)totaki.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" @@ -251,7 +251,7 @@ msgstr "¡El nombre de la base de datos está vacío!" #: db_operations.php:268 #, php-format msgid "Database %s has been renamed to %s" -msgstr "La base de datos %s ha sido cambiada de nombre a %s" +msgstr "La base de datos %s ha sido renombrada a %s" #: db_operations.php:272 #, php-format @@ -260,7 +260,7 @@ msgstr "La base de datos %s ha sido copiada a %s" #: db_operations.php:395 msgid "Rename database to" -msgstr "Cambiar el nombre de la base de datos a" +msgstr "Renombrar la base de datos a" #: db_operations.php:400 server_processlist.php:56 msgid "Command" @@ -397,8 +397,8 @@ msgstr "Última revisión" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "%s tablas" -msgstr[1] "%s tabla(s)" +msgstr[0] "%s tabla" +msgstr[1] "%s tablas" #: db_qbe.php:25 import.php:452 libraries/Message.class.php:190 #: libraries/display_tbl.lib.php:1977 libraries/sql_query_form.lib.php:136 @@ -471,7 +471,7 @@ msgstr "Modificar" #: db_qbe.php:603 msgid "Add/Delete criteria rows" -msgstr "Añadir/borrar filas de criterios" +msgstr "Añadir/borrar filas de criterio" #: db_qbe.php:615 msgid "Add/Delete columns" @@ -525,12 +525,12 @@ msgstr "Resultados de la búsqueda por \"<i>%s</i>\" %s:" # singular: %s resultado en la tabla <i>%s</i> # plural: %s resultados en la tabla <i>%s</i> #: db_search.php:248 -#, fuzzy, php-format +#, php-format, fuzzy #| msgid "%s match(es) inside table <i>%s</i>" msgid "%s match inside table <i>%s</i>" msgid_plural "%s matches inside table <i>%s</i>" -msgstr[0] "%s resultado(s) en la tabla <i>%s</i>" -msgstr[1] "%s resultado(s) en la tabla <i>%s</i>" +msgstr[0] "%s resultado en la tabla <i>%s</i>" +msgstr[1] "%s resultados en la tabla <i>%s</i>" #: db_search.php:255 libraries/common.lib.php:2818 #: libraries/common.lib.php:2996 libraries/common.lib.php:2997 @@ -558,12 +558,12 @@ msgid "Delete the matches for the %s table?" msgstr "Borrar los datos de seguimiento para esta tabla" #: db_search.php:273 -#, fuzzy, php-format +#, php-format, fuzzy #| msgid "<b>Total:</b> <i>%s</i> match(es)" msgid "<b>Total:</b> <i>%s</i> match" msgid_plural "<b>Total:</b> <i>%s</i> matches" -msgstr[0] "<b>Total:</b> <i>%s</i> resultado(s)" -msgstr[1] "<b>Total:</b> <i>%s</i> resultado(s)" +msgstr[0] "<b>Total:</b> <i>%s</i> resultado" +msgstr[1] "<b>Total:</b> <i>%s</i> resultados" #: db_search.php:296 msgid "Search in database" @@ -586,10 +586,9 @@ msgid "Inside table(s):" msgstr "En la(s) tabla(s):" #: db_search.php:352 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "Dentro del campo:" +msgstr "Dentro de la columna" #: db_structure.php:59 #, fuzzy @@ -956,7 +955,7 @@ msgstr "¡Está a punto de DESTRUIR una base de datos completa!" #: js/messages.php:32 msgid "Dropping Event" -msgstr "Eliminando evento" +msgstr "Evento de eliminación" #: js/messages.php:33 msgid "Dropping Procedure" @@ -1484,7 +1483,7 @@ msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." msgstr "" -"Los índices %1$s y %2$s parecen ser iguales y posiblemente se puede remover " +"Los índices %1$s y %2$s parecen ser iguales y posiblemente se puede eliminar " "uno." #: libraries/List_Database.class.php:430 libraries/config/messages.inc.php:172 @@ -1501,28 +1500,28 @@ msgid "Error" msgstr "Error" #: libraries/Message.class.php:281 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) affected." msgid "%1$d row affected." msgid_plural "%1$d rows affected." -msgstr[0] "%1$d fila(s) fueron afectadas." -msgstr[1] "%1$d fila(s) fueron afectadas." +msgstr[0] "%1$d fila afectada." +msgstr[1] "%1$d filas afectadas." #: libraries/Message.class.php:300 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) deleted." msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "%1$d fila(s) fueron eliminadas." -msgstr[1] "%1$d fila(s) fueron eliminadas." +msgstr[0] "%1$d fila eliminada." +msgstr[1] "%1$d filas eliminadas." #: libraries/Message.class.php:319 -#, fuzzy, php-format +#, php-format #| msgid "%1$d row(s) inserted." msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "%1$d filas(s) fueron insertadas." -msgstr[1] "%1$d filas(s) fueron insertadas." +msgstr[0] "%1$d fila insertada." +msgstr[1] "%1$d filas insertadas." #: libraries/StorageEngine.class.php:194 msgid "" @@ -1618,8 +1617,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the %" "1$ssetup script%2$s to create one." msgstr "" -"La razón más probable es que usted no creó un archivo de configuración. " -"Utilice %1$ssetup script%2$s para crear una." +"La razón más probable es que usted no haya creado un archivo de " +"configuración. Utilice %1$ssetup script%2$s para crear uno." #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2381,23 +2380,24 @@ msgstr "Confirmar las consultas DROP" #: libraries/config/messages.inc.php:42 msgid "Debug SQL" -msgstr "" +msgstr "Depuración SQL" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "Databases display options" msgid "Default display direction" -msgstr "Opciones para visualizar las bases de datos" +msgstr "Dirección por defecto de la visualización" #: libraries/config/messages.inc.php:44 msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal[/kbd], [kbd]vertical[/kbd] o un número indicando las " +"columnas como máximo para las que se usará el modo vertical." #: libraries/config/messages.inc.php:45 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "Dirección de visualización para creación/edición de columnas" #: libraries/config/messages.inc.php:46 msgid "Tab that is displayed when entering a database" @@ -2425,11 +2425,11 @@ msgstr "Ceja predeterminada de la tabla" #: libraries/config/messages.inc.php:52 msgid "Show binary contents as HEX by default" -msgstr "" +msgstr "Mostrar el contenido binario en HEXadecimal por defecto" #: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" -msgstr "" +msgstr "Mostrar contenido binario como HEXadecimal" #: libraries/config/messages.inc.php:54 #, fuzzy @@ -2450,41 +2450,39 @@ msgstr "Muestra los servidores en una lista" #: libraries/config/messages.inc.php:58 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Editar las consultas SQL en una ventana emergente" #: libraries/config/messages.inc.php:59 -#, fuzzy #| msgid "Edit next row" msgid "Edit in window" -msgstr "Editar la siguiente fila" +msgstr "Editar en ventana" #: libraries/config/messages.inc.php:60 -#, fuzzy #| msgid "Display Features" msgid "Display errors" -msgstr "Mostrar las opciones" +msgstr "Mostrar errores" #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Ignore errors" msgid "Gather errors" -msgstr "Ignorar los errores" +msgstr "Agrupar los errores" #: libraries/config/messages.inc.php:62 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "Mostrar iconos para los mensajes de información, error y advertencia" #: libraries/config/messages.inc.php:63 -#, fuzzy #| msgid "Ignore errors" msgid "Iconic errors" -msgstr "Ignorar los errores" +msgstr "Iconos en los errores" #: libraries/config/messages.inc.php:64 msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" msgstr "" +"Definir el tiempo máximo permitido (en segundos) para la ejecución de un " +"script ([kbd]0[/kbd] para ilimitado)" #: libraries/config/messages.inc.php:65 msgid "Maximum execution time" @@ -2519,7 +2517,7 @@ msgstr "Compresión" #, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" -msgstr "Poner los nombres de campo en la primera hilera" +msgstr "Poner los nombres de campo en la primera fila" #: libraries/config/messages.inc.php:71 libraries/config/messages.inc.php:236 #: libraries/config/messages.inc.php:243 libraries/import/csv.php:73 @@ -2552,10 +2550,9 @@ msgstr "" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:240 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:61 #: libraries/import/ldi.php:40 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns terminated by" -msgstr "Líneas terminadas en" +msgstr "Columnas terminadas en" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:235 #: libraries/import/csv.php:81 libraries/import/ldi.php:43 @@ -2585,10 +2582,9 @@ msgstr "Nombre de la plantilla de la tabla" #: libraries/config/messages.inc.php:138 libraries/export/htmlword.php:23 #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 -#, fuzzy #| msgid "%s table(s)" msgid "Dump table" -msgstr "%s tabla(s)" +msgstr "Volcar tabla" #: libraries/config/messages.inc.php:88 libraries/export/latex.php:31 msgid "Include table caption" @@ -2620,10 +2616,9 @@ msgid "Relations" msgstr "Relaciones" #: libraries/config/messages.inc.php:101 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "Tipo de exportación" +msgstr "Método de exportación" #: libraries/config/messages.inc.php:110 libraries/config/messages.inc.php:112 msgid "Save on server" @@ -2651,7 +2646,7 @@ msgstr "Modalidad compatible con SQL" #: libraries/config/messages.inc.php:118 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "Sintaxis a utilizar para insertar datos" #: libraries/config/messages.inc.php:119 msgid "Creation/Update/Check dates" @@ -2687,9 +2682,8 @@ msgid "Enclose export in a transaction" msgstr "Incluir lo exportado en una transacción" #: libraries/config/messages.inc.php:135 -#, fuzzy msgid "Export time in UTC" -msgstr "Exportar las opciones predeterminadas" +msgstr "Exportar hora en UTC" #: libraries/config/messages.inc.php:143 msgid "Force secured connection while using phpMyAdmin" @@ -2747,11 +2741,11 @@ msgstr "CSV" #: libraries/config/messages.inc.php:155 msgid "Developer" -msgstr "" +msgstr "Desarrollados" #: libraries/config/messages.inc.php:156 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Configuración para desarrolladores de phpMyAdmin" #: libraries/config/messages.inc.php:157 msgid "Edit mode" @@ -2772,17 +2766,16 @@ msgstr "Personalizar las opciones comunes de exportación predeteminadas" #: libraries/config/messages.inc.php:162 libraries/config/messages.inc.php:204 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "Hallazgos" +msgstr "Características" #: libraries/config/messages.inc.php:163 -#, fuzzy #| msgid "Generate" msgid "General" -msgstr "Generar" +msgstr "General" #: libraries/config/messages.inc.php:164 msgid "Set some commonly used options" -msgstr "" +msgstr "Definir algunas opciones usadas normalmente" #: libraries/config/messages.inc.php:165 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2844,16 +2837,14 @@ msgid "Main frame" msgstr "Página principal" #: libraries/config/messages.inc.php:181 -#, fuzzy #| msgid "Microsoft Excel 2000" msgid "Microsoft Office" -msgstr "Microsoft Excel 2000" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:183 -#, fuzzy #| msgid "Open Document Text" msgid "Open Document" -msgstr "Texto Open Document" +msgstr "Open Document" #: libraries/config/messages.inc.php:185 msgid "Other core settings" @@ -2864,10 +2855,9 @@ msgid "Settings that didn't fit enywhere else" msgstr "Parámetros que no encajaban en otra parte" #: libraries/config/messages.inc.php:187 -#, fuzzy #| msgid "Page number:" msgid "Page titles" -msgstr "Número de página:" +msgstr "Títulos de página" #: libraries/config/messages.inc.php:188 msgid "" @@ -2875,6 +2865,9 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"Especificar el texto de la barra de título del navegador. Consulte la " +"[a(a)Documentation.xn--html#cfg_titletable]documentacin[/a-god] para ver las palabras " +"mágicas que podrán ser usadas para obtener valores especiales" #: libraries/config/messages.inc.php:189 #: libraries/navigation_header.inc.php:83 @@ -2904,16 +2897,14 @@ msgid "Basic settings" msgstr "Ajustes básicos" #: libraries/config/messages.inc.php:194 -#, fuzzy #| msgid "Authentication type" msgid "Authentication" -msgstr "Tipo de autenticación" +msgstr "Autentificación" #: libraries/config/messages.inc.php:195 -#, fuzzy #| msgid "Authentication type" msgid "Authentication settings" -msgstr "Tipo de autenticación" +msgstr "Configuración de autentificación" #: libraries/config/messages.inc.php:196 msgid "Server configuration" @@ -2954,7 +2945,7 @@ msgstr "" #: libraries/config/messages.inc.php:201 msgid "Changes tracking" -msgstr "" +msgstr "Seguimiento de cambios" #: libraries/config/messages.inc.php:202 msgid "" @@ -2992,16 +2983,14 @@ msgid "Customize links shown in SQL Query boxes" msgstr "Cambiar los enlaces mostrados en las ventanas de consulta SQL" #: libraries/config/messages.inc.php:214 -#, fuzzy #| msgid "SQL queries" msgid "SQL queries settings" -msgstr "Consultas SQL" +msgstr "Configuración de las consultas SQL" #: libraries/config/messages.inc.php:215 -#, fuzzy #| msgid "SQL history" msgid "SQL Validator" -msgstr "Historial-SQL" +msgstr "Validador SQL" #: libraries/config/messages.inc.php:216 msgid "" @@ -3044,14 +3033,13 @@ msgid "Texy! text" msgstr "Texto Texy!" #: libraries/config/messages.inc.php:225 -#, fuzzy #| msgid "Warning" msgid "Warnings" -msgstr "Advertencia" +msgstr "Advertencias" #: libraries/config/messages.inc.php:226 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Desactivar algunas de las advertencias mostradas por phpMyAdmin" #: libraries/config/messages.inc.php:227 msgid "" @@ -3130,7 +3118,7 @@ msgstr "Poner los nombres de campo en la primera hilera" #: libraries/config/messages.inc.php:250 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "No importar filas vacías" #: libraries/config/messages.inc.php:251 msgid "Import currencies ($5.00 to 5.00)" @@ -3256,7 +3244,7 @@ msgstr "Logo enlace objetivo" #: libraries/config/messages.inc.php:281 msgid "Highlight server under the mouse cursor" -msgstr "" +msgstr "Resaltar servidor bajo el cursor" #: libraries/config/messages.inc.php:282 msgid "Enable highlighting" @@ -3277,7 +3265,7 @@ msgstr "" #: libraries/config/messages.inc.php:286 msgid "Limit column characters" -msgstr "" +msgstr "Límite de caracteres de la columna" #: libraries/config/messages.inc.php:287 msgid "" @@ -3332,28 +3320,28 @@ msgstr "Validez del cookie usado para el Login" #: libraries/config/messages.inc.php:295 msgid "Double size of textarea for LONGTEXT columns" -msgstr "" +msgstr "Doble tamaño del textarea para las columnas LONGTEXT" #: libraries/config/messages.inc.php:296 msgid "Bigger textarea for LONGTEXT" -msgstr "" +msgstr "textarea más grande para LONGTEXT" #: libraries/config/messages.inc.php:297 msgid "Use icons on main page" -msgstr "" +msgstr "Usar iconos en la página principal" #: libraries/config/messages.inc.php:298 msgid "Maximum number of characters used when a SQL query is displayed" -msgstr "" +msgstr "Número máximo de caracteres usados al mostrar una consulta SQL" #: libraries/config/messages.inc.php:299 msgid "Maximum displayed SQL length" -msgstr "" +msgstr "Máxima longitud al mostrar consulta SQL" #: libraries/config/messages.inc.php:300 libraries/config/messages.inc.php:305 #: libraries/config/messages.inc.php:332 msgid "Users cannot set a higher value" -msgstr "" +msgstr "Los usuarios no pueden definir un valor más alto" #: libraries/config/messages.inc.php:301 msgid "Maximum number of databases displayed in left frame and database list" @@ -3395,13 +3383,15 @@ msgstr "" #: libraries/config/messages.inc.php:309 msgid "mcrypt warning" -msgstr "" +msgstr "advertencia mcrypt" #: libraries/config/messages.inc.php:310 msgid "" "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " "([kbd]0[/kbd] for no limit)" msgstr "" +"El número de bytes que un script puede reservar. ej. [kbd]32M[/kbd] " +"([kbd]0[/kbd] para ilimitado)" #: libraries/config/messages.inc.php:311 msgid "Memory limit" @@ -3441,7 +3431,7 @@ msgstr "" #: libraries/config/messages.inc.php:319 msgid "GZip output buffering" -msgstr "" +msgstr "Buffer de salida de GZip" #: libraries/config/messages.inc.php:320 msgid "" @@ -3470,7 +3460,7 @@ msgstr "" #: libraries/config/messages.inc.php:325 msgid "Missing phpMyAdmin configuration storage tables" -msgstr "" +msgstr "Faltan las tablas de almacenaje de configuración de phpMyAdmin" #: libraries/config/messages.inc.php:327 msgid "Iconic table operations" @@ -3478,7 +3468,7 @@ msgstr "Operaciones de las tablas mediante íconos" #: libraries/config/messages.inc.php:328 msgid "Disallow BLOB and BINARY columns from editing" -msgstr "" +msgstr "No permitir la edición de columnas BLOB y BINARIAS" #: libraries/config/messages.inc.php:329 #, fuzzy @@ -3515,7 +3505,7 @@ msgstr "Ceja predetermnada para la ventana de consulta" #: libraries/config/messages.inc.php:337 msgid "Query window height (in pixels)" -msgstr "" +msgstr "Altura (en pixels) de la ventana de consultas" #: libraries/config/messages.inc.php:338 #, fuzzy @@ -3561,7 +3551,7 @@ msgstr "" #: libraries/config/messages.inc.php:346 msgid "Show help button" -msgstr "" +msgstr "Mostrar el botón de ayuda" #: libraries/config/messages.inc.php:348 msgid "Directory where exports can be saved on server" @@ -3594,7 +3584,7 @@ msgstr "Reglas de autenticación del Host" #: libraries/config/messages.inc.php:354 msgid "Allow logins without a password" -msgstr "" +msgstr "Permitir identificación sin contraseña" #: libraries/config/messages.inc.php:355 msgid "Allow root login" @@ -10284,33 +10274,3 @@ msgstr "Cambiar el nombre de la vista a " #~ msgid "Disable Statistics" #~ msgstr "Desactivar las estadísticas" - -#, fuzzy -#~| msgid "Hide query box" -#~ msgid "Hide query chart" -#~ msgstr "Ocultar ventana de consultas SQL" - -#, fuzzy -#~ msgid "Start" -#~ msgstr "Inicio" - -#, fuzzy -#~| msgid "Display databases in a tree" -#~ msgid "Display table filter" -#~ msgstr "Mostrar las bases de datos en un árbol" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "Las opciones adicionales para trabajar con tablas vinculadas fueron " -#~ "desactivadas. Para saber porqué, dé clic %saquí%s." - -#~ msgid "Ignore duplicate rows" -#~ msgstr "Ignore las filas duplicadas" - -#~ msgid "Execute bookmarked query" -#~ msgstr "Ejecute la consulta marcada previamente" - -#~ msgid "No tables" -#~ msgstr "No existen tablas" diff --git a/po/pt.po b/po/pt.po index 7b76616..e818afe 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-07-22 02:23+0200\n" -"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" +"PO-Revision-Date: 2010-12-17 14:46+0200\n" +"Last-Translator: <morsa.h(a)gmail.com>\n" "Language-Team: portuguese <pt(a)li.org>\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 #: libraries/display_tbl.lib.php:415 server_privileges.php:1594 @@ -97,16 +97,16 @@ msgstr "" #: bs_disp_as_mime_type.php:35 msgid "Failed to fetch headers" -msgstr "" +msgstr "Erro ao obter cabeçalhos (headers)" #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" msgstr "" #: db_create.php:58 -#, fuzzy, php-format +#, php-format msgid "Database %1$s has been created." -msgstr "A base de dados %s foi eliminada." +msgstr "A base de dados %s foi criada." #: db_datadict.php:48 db_operations.php:360 msgid "Database comment: " @@ -127,10 +127,9 @@ msgstr "Comentários da tabela" #: tbl_change.php:300 tbl_indexes.php:187 tbl_printview.php:139 #: tbl_relation.php:399 tbl_select.php:132 tbl_structure.php:197 #: tbl_tracking.php:267 tbl_tracking.php:318 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Nome dos Campos" +msgstr "Coluna" #: db_datadict.php:170 db_printview.php:104 libraries/Index.class.php:442 #: libraries/db_events.inc.php:25 libraries/db_routines.inc.php:36 @@ -166,7 +165,7 @@ msgstr "Nulo" #: libraries/tbl_properties.inc.php:105 tbl_printview.php:143 #: tbl_structure.php:202 tbl_tracking.php:271 msgid "Default" -msgstr "Defeito" +msgstr "Omissão" #: db_datadict.php:177 libraries/export/htmlword.php:252 #: libraries/export/latex.php:376 libraries/export/odt.php:314 @@ -244,33 +243,30 @@ msgid "Unselect All" msgstr "Limpa Todas as Selecções" #: db_operations.php:41 tbl_create.php:48 -#, fuzzy msgid "The database name is empty!" -msgstr "O nome da tabela está vazio!" +msgstr "O nome da base de dados está vazia!" #: db_operations.php:268 -#, fuzzy, php-format +#, php-format msgid "Database %s has been renamed to %s" -msgstr "Tabela %s renomeada para %s" +msgstr "O nome da base de dados %s foi alterado para %s" #: db_operations.php:272 -#, fuzzy, php-format +#, php-format msgid "Database %s has been copied to %s" -msgstr "Tabela %s copiada para %s." +msgstr "A base de dados %s foi copiada para %s." #: db_operations.php:395 -#, fuzzy msgid "Rename database to" -msgstr "Renomeia a tabela para " +msgstr "Alterar o nome da base de dados para" #: db_operations.php:400 server_processlist.php:56 msgid "Command" msgstr "Comando" #: db_operations.php:429 -#, fuzzy msgid "Remove database" -msgstr "Renomeia a tabela para " +msgstr "Remover a Base de Dados" #: db_operations.php:441 #, php-format @@ -278,18 +274,16 @@ msgid "Database %s has been dropped." msgstr "A base de dados %s foi eliminada." #: db_operations.php:446 -#, fuzzy msgid "Drop the database (DROP)" -msgstr "Sem bases de dados" +msgstr "Apagar a Base de Dados (DROP)" #: db_operations.php:474 -#, fuzzy msgid "Copy database to" -msgstr "Sem bases de dados" +msgstr "Copiar a Base de Dados para" #: db_operations.php:481 tbl_operations.php:530 tbl_tracking.php:382 msgid "Structure only" -msgstr "Somente estrutura" +msgstr "Somente a estrutura" #: db_operations.php:482 tbl_operations.php:531 tbl_tracking.php:384 msgid "Structure and data" @@ -301,7 +295,7 @@ msgstr "Apenas dados" #: db_operations.php:491 msgid "CREATE DATABASE before copying" -msgstr "" +msgstr "Criar a Base de Dados antes de copiar (CREATE DATABASE)" #: db_operations.php:494 libraries/config/messages.inc.php:122 #: libraries/config/messages.inc.php:123 libraries/config/messages.inc.php:125 @@ -317,12 +311,11 @@ msgstr "Adicionar valor AUTO_INCREMENT" #: db_operations.php:502 tbl_operations.php:547 msgid "Add constraints" -msgstr "Adicionar limitadores" +msgstr "Adicionar restrições (constraints)" #: db_operations.php:515 -#, fuzzy msgid "Switch to copied database" -msgstr "Mudar para a tabela copiada" +msgstr "Mudar para a Base de Dados copiada" #: db_operations.php:535 libraries/Index.class.php:447 #: libraries/build_html_for_db.lib.php:19 libraries/db_structure.lib.php:53 @@ -348,10 +341,9 @@ msgstr "" "foram desactivadas. Para saber porquê carregue %saqui%s." #: db_operations.php:581 -#, fuzzy #| msgid "Relational schema" msgid "Edit or export relational schema" -msgstr "Esquema relacional" +msgstr "Editar ou exporta o esquema relacional (schema)" #: db_printview.php:102 db_tracking.php:84 db_tracking.php:169 #: libraries/config/messages.inc.php:484 libraries/db_structure.lib.php:37 @@ -392,22 +384,22 @@ msgstr "Criação" #: libraries/schema/Pdf_Relation_Schema.class.php:1225 tbl_printview.php:441 #: tbl_structure.php:909 msgid "Last update" -msgstr "Actualização" +msgstr "Última actualização" #: db_printview.php:203 libraries/db_info.inc.php:96 #: libraries/export/sql.php:589 #: libraries/schema/Pdf_Relation_Schema.class.php:1230 tbl_printview.php:451 #: tbl_structure.php:917 msgid "Last check" -msgstr "Verificação" +msgstr "Última Verificação" #: db_printview.php:220 db_structure.php:432 -#, fuzzy, php-format +#, php-format #| msgid "%s table(s)" msgid "%s table" msgid_plural "%s tables" -msgstr[0] "%s tabela(s)" -msgstr[1] "%s tabela(s)" +msgstr[0] "%s tabela" +msgstr[1] "%s tabelas" #: db_qbe.php:25 import.php:452 libraries/Message.class.php:190 #: libraries/display_tbl.lib.php:1977 libraries/sql_query_form.lib.php:136 @@ -422,11 +414,11 @@ msgstr "Tem que escolher pelo menos uma coluna para mostrar" #: db_qbe.php:182 msgid "Switch to" -msgstr "" +msgstr "Trocar para" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "Construtor Gráfico" #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 @@ -450,7 +442,7 @@ msgstr "Descendente" #: db_qbe.php:283 db_tracking.php:90 libraries/display_tbl.lib.php:306 #: tbl_change.php:269 tbl_tracking.php:591 msgid "Show" -msgstr "Mostra" +msgstr "Mostrar" #: db_qbe.php:319 msgid "Criteria" @@ -476,19 +468,17 @@ msgstr "Ou" #: db_qbe.php:526 msgid "Modify" -msgstr "Modifica" +msgstr "Modificar" #: db_qbe.php:603 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Adicionar/Remover Critérios" +msgstr "Adicionar/Remover Linhas de Critérios" #: db_qbe.php:615 -#, fuzzy #| msgid "Add/Delete Field Columns" msgid "Add/Delete columns" -msgstr "Adicionar/Remover Campos" +msgstr "Adicionar/Remover Colunas" #: db_qbe.php:628 db_qbe.php:653 msgid "Update Query" @@ -505,7 +495,7 @@ msgstr "Comando SQL na base de dados <b>%s</b>:" #: db_qbe.php:953 libraries/common.lib.php:1160 msgid "Submit Query" -msgstr "Executa Comando SQL" +msgstr "Executar Comando SQL" #: db_search.php:53 libraries/auth/config.auth.lib.php:83 #: libraries/auth/config.auth.lib.php:102 @@ -528,7 +518,7 @@ msgstr "a frase exacta" #: db_search.php:68 db_search.php:311 msgid "as regular expression" -msgstr "as regular expression" +msgstr "como expressão regular" #: db_search.php:230 #, php-format @@ -536,19 +526,19 @@ msgid "Search results for \"<i>%s</i>\" %s:" msgstr "Procurar resultados para \"<i>%s</i>\" %s:" #: db_search.php:248 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table <i>%s</i>" msgid "%s match inside table <i>%s</i>" msgid_plural "%s matches inside table <i>%s</i>" -msgstr[0] "%s resultado(s) na tabela <i>%s</i>" -msgstr[1] "%s resultado(s) na tabela <i>%s</i>" +msgstr[0] "%s resultado na tabela <i>%s</i>" +msgstr[1] "%s resultados na tabela <i>%s</i>" #: db_search.php:255 libraries/common.lib.php:2818 #: libraries/common.lib.php:2996 libraries/common.lib.php:2997 #: libraries/mult_submits.inc.php:115 libraries/tbl_links.inc.php:48 #: tbl_structure.php:36 tbl_structure.php:48 tbl_structure.php:557 msgid "Browse" -msgstr "Visualiza" +msgstr "Visualizar" #: db_search.php:260 libraries/display_tbl.lib.php:1190 #: libraries/display_tbl.lib.php:2052 @@ -563,18 +553,18 @@ msgid "Delete" msgstr "Apagar" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Dumping data for table" msgid "Delete the matches for the %s table?" -msgstr "Extraindo dados da tabela" +msgstr "Apagar os semelhantes para a %s tabela?" #: db_search.php:273 -#, fuzzy, php-format +#, php-format #| msgid "<b>Total:</b> <i>%s</i> match(es)" msgid "<b>Total:</b> <i>%s</i> match" msgid_plural "<b>Total:</b> <i>%s</i> matches" -msgstr[0] "<b>Total:</b> <i>%s</i> resultado(s)" -msgstr[1] "<b>Total:</b> <i>%s</i> resultado(s)" +msgstr[0] "<b>Total:</b> <i>%s</i> resultado" +msgstr[1] "<b>Total:</b> <i>%s</i> resultados" #: db_search.php:296 msgid "Search in database" @@ -582,7 +572,7 @@ msgstr "Pesquisar na Base de Dados" #: db_search.php:299 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" -msgstr "Palavra(s) ou valor(es) para pesquisar para (wildcard: \"%\"):" +msgstr "Palavra(s) ou valor(es) a pesquisar (wildcard: \"%\"):" #: db_search.php:304 msgid "Find:" @@ -597,16 +587,14 @@ msgid "Inside table(s):" msgstr "Dentro de Tabela(s):" #: db_search.php:352 -#, fuzzy #| msgid "Inside table(s):" msgid "Inside column:" -msgstr "Dentro de Tabela(s):" +msgstr "Dentro da coluna:" #: db_structure.php:59 -#, fuzzy #| msgid "No tables found in database." msgid "No tables found in database" -msgstr "Nenhuma tabela encontrada na base de dados" +msgstr "Não foram encontradas tabelas na base de dados" #: db_structure.php:270 tbl_operations.php:658 #, php-format @@ -614,9 +602,9 @@ msgid "Table %s has been emptied" msgstr "A tabela %s foi limpa" #: db_structure.php:279 tbl_operations.php:675 -#, fuzzy, php-format +#, php-format msgid "View %s has been dropped" -msgstr "O campo %s foi eliminado" +msgstr "A Vista %s foi eliminada" #: db_structure.php:279 tbl_operations.php:675 #, php-format @@ -625,11 +613,11 @@ msgstr "A tabela %s foi eliminada" #: db_structure.php:286 tbl_create.php:295 msgid "Tracking is active." -msgstr "" +msgstr "Detecção de Alterações está activa." #: db_structure.php:288 tbl_create.php:297 msgid "Tracking is not active." -msgstr "" +msgstr "Detecção de Alterações está desactivada." #: db_structure.php:372 libraries/display_tbl.lib.php:1940 #, php-format @@ -637,18 +625,20 @@ msgid "" "This view has at least this number of rows. Please refer to %sdocumentation%" "s." msgstr "" +"Esta vista tem número de linhas aproximado. Por favor, consulte a %" +"sdocumentação%s." #: db_structure.php:386 db_structure.php:400 libraries/header.inc.php:138 #: libraries/tbl_info.inc.php:60 tbl_structure.php:205 test/theme.php:73 msgid "View" -msgstr "" +msgstr "Vista" #: db_structure.php:437 libraries/db_structure.lib.php:40 #: libraries/server_links.inc.php:90 server_replication.php:31 #: server_replication.php:162 server_status.php:375 #, fuzzy msgid "Replication" -msgstr "Relações" +msgstr "Replicação" #: db_structure.php:441 msgid "Sum" @@ -657,7 +647,7 @@ msgstr "Soma" #: db_structure.php:448 libraries/StorageEngine.class.php:351 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "" +msgstr "%s é o storage engine por defeito neste MySQL server." #: db_structure.php:476 db_structure.php:493 db_structure.php:494 #: libraries/display_tbl.lib.php:2077 libraries/display_tbl.lib.php:2082 @@ -9728,164 +9718,3 @@ msgstr "Renomeia a tabela para " #, fuzzy #~ msgid "Start" #~ msgstr "Sab" - -#, fuzzy -#~| msgid "Displaying Column Comments" -#~ msgid "Display table filter" -#~ msgstr "Mostrando comentários das Colunas" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "As Características adicionais para trabalhar com ligações entre Tabelas " -#~ "foram desactivadas. Para saber porquê carregue %saqui%s." - -#~ msgid "Execute bookmarked query" -#~ msgstr "Executar um query marcado(do marcador)" - -#~ msgid "No tables" -#~ msgstr "Sem tablelas" - -#, fuzzy -#~| msgid "CSV" -#~ msgid "SVG" -#~ msgstr "Dados CSV" - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Introduza os valores para as opções de transformação a usando este " -#~ "formato: 'a', 100, b,'c'...<br />Se por acaso precisar de inserir um " -#~ "backslash (\"\\\") ou uma pelica (\"'\") no meio desses valores, faça-o " -#~ "backslashes (por exemplo '\\\\xyz' ou 'a\\'b')." - -#, fuzzy -#~| msgid "" -#~| "Please enter the values for transformation options using this format: " -#~| "'a', 100, b,'c'...<br />If you ever need to put a backslash (\"\\\") or " -#~| "a single quote (\"'\") amongst those values, precede it with a backslash " -#~| "(for example '\\\\xyz' or 'a\\'b')." -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Introduza os valores para as opções de transformação a usando este " -#~ "formato: 'a', 100, b,'c'...<br />Se por acaso precisar de inserir um " -#~ "backslash (\"\\\") ou uma pelica (\"'\") no meio desses valores, faça-o " -#~ "backslashes (por exemplo '\\\\xyz' ou 'a\\'b')." - -#, fuzzy -#~ msgid "New table" -#~ msgstr "Sem tablelas" - -#, fuzzy -#~ msgid "server name" -#~ msgstr "Nome do Utilizador" - -#, fuzzy -#~ msgid "database name" -#~ msgstr "Base de Dados" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Editar páginas PDF" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Formato dos dados do dicionário" - -#, fuzzy -#~ msgid "PMA database" -#~ msgstr "Sem bases de dados" - -#, fuzzy -#~ msgid "yes" -#~ msgstr "Sim" - -#, fuzzy -#~| msgid "Add AUTO_INCREMENT value" -#~ msgid "<code>AUTO_INCREMENT</code>" -#~ msgstr "Adicionar valor AUTO_INCREMENT" - -#, fuzzy -#~| msgid "Dump %s row(s) starting at record # %s" -#~ msgid "Dump %s row(s) starting at row # %s" -#~ msgstr "Exporta %s registos começando em %s." - -#~ msgid "remember template" -#~ msgstr "Lembrar-se do modelo" - -#~ msgid "Add into comments" -#~ msgstr "Adicionar aos comentários" - -#, fuzzy -#~ msgid "Export triggers" -#~ msgstr "Tipo de Exportação" - -#, fuzzy -#~ msgid "Export views" -#~ msgstr "Tipo de Exportação" - -#, fuzzy -#~ msgid "Actions" -#~ msgstr "Acções" - -#, fuzzy -#~| msgid "Enabled" -#~ msgctxt "BLOB repository" -#~ msgid "Enabled" -#~ msgstr "Activado" - -#, fuzzy -#~ msgid "Disable" -#~ msgstr "Desactidado" - -#, fuzzy -#~ msgctxt "BLOB repository" -#~ msgid "Repair" -#~ msgstr "Reparar tabela" - -#, fuzzy -#~| msgid "Disabled" -#~ msgctxt "BLOB repository" -#~ msgid "Disabled" -#~ msgstr "Desactidado" - -#, fuzzy -#~ msgid "Enable" -#~ msgstr "Activado" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " -#~ "extension. Please check your PHP configuration." -#~ msgstr "" -#~ "não é possível carregar a extensão %s ;<br />verifique a configuração do " -#~ "PHP por favor" - -#~ msgid "" -#~ "Couldn't load the iconv or recode extension needed for charset " -#~ "conversion. Either configure PHP to enable these extensions or disable " -#~ "charset conversion in phpMyAdmin." -#~ msgstr "" -#~ "Não é possível carregar <i>iconv</i> ou recodificar a extensão necessária " -#~ "para a conversão do Mapa de Caracteres, configure o php de modo a " -#~ "permitir utilizar estas extensões ou desligue a conversão do mapa de " -#~ "caracteres no phpmyadmin." - -#~ msgid "" -#~ "Couldn't use the iconv, libiconv, or recode_string functions, although " -#~ "the necessary extensions appear to be loaded. Check your PHP " -#~ "configuration." -#~ msgstr "" -#~ "Não é possível usar <i>iconv</i> nem <i>libiconv</i> nem a função " -#~ "<i>recode_string</i> enquanto a extensão reportar que está ligada. " -#~ "Confira a configuração do seu php." diff --git a/po/tr.po b/po/tr.po index df867bf..dfd3b51 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-09 00:49+0200\n" +"PO-Revision-Date: 2010-12-17 01:17+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -7048,34 +7048,29 @@ msgid "Page creation failed" msgstr "Sayfa oluşturma başarısız" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "sayfa" +msgstr "Sayfa" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Dosyadan içe aktar" +msgstr "Seçili sayfadan içe aktar" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Ölçeklemek için içe/dışa aktar" +msgstr "Seçili sayfaya aktar" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Yeni bir indeks oluştur" +msgstr "Yeni bir sayfa oluştur ve ona aktar" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "Yeni ad" +msgstr "Yeni sayfa adı: " #: pmd_pdf.php:114 msgid "Export/Import to scale" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-872-gc3db2ad
by Marc Delisle 19 Dec '10

19 Dec '10

The branch, master has been updated via c3db2ade118cd21b38771335bda2e2b258432bb7 (commit) from 386581bcb68c2754f99f42ee398a897351c6a12a (commit) - Log ----------------------------------------------------------------- commit c3db2ade118cd21b38771335bda2e2b258432bb7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 19 05:49:38 2010 -0500 Makes sense to use MaxRows instead of a hard-coded value ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index fd9c882..4b07400 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -21,7 +21,6 @@ require_once './libraries/header_http.inc.php'; /** * Displays the frame */ -$per_page = 200; require_once './libraries/transformations.lib.php'; // Transformations $cfgRelation = PMA_getRelationsParam(); $foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE); @@ -32,7 +31,7 @@ if (!isset($pos)) { $pos = 0; } -$foreign_limit = 'LIMIT ' . $pos . ', ' . $per_page . ' '; +$foreign_limit = 'LIMIT ' . $pos . ', ' . $GLOBALS['cfg']['MaxRows'] . ' '; if (isset($foreign_navig) && $foreign_navig == __('Show all')) { unset($foreign_limit); } @@ -53,15 +52,15 @@ $showall = ''; if (is_array($foreignData['disp_row'])) { - if ($cfg['ShowAll'] && ($foreignData['the_total'] > $per_page)) { + if ($cfg['ShowAll'] && ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows'])) { $showall = '<input type="submit" name="foreign_navig" value="' . __('Show all') . '" />'; } - $session_max_rows = $per_page; + $session_max_rows = $GLOBALS['cfg']['MaxRows']; $pageNow = @floor($pos / $session_max_rows) + 1; $nbTotalPage = @ceil($foreignData['the_total'] / $session_max_rows); - if ($foreignData['the_total'] > $per_page) { + if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) { $gotopage = PMA_pageselector( 'browse_foreigners.php?field=' . urlencode($field) . '&' . PMA_generate_common_url($db, $table) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-871-g386581b
by Marc Delisle 19 Dec '10

19 Dec '10

The branch, master has been updated via 386581bcb68c2754f99f42ee398a897351c6a12a (commit) from 02b9dc80089d3277f5c96d526d0b9fca8c189cb3 (commit) - Log ----------------------------------------------------------------- commit 386581bcb68c2754f99f42ee398a897351c6a12a Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 19 05:42:40 2010 -0500 This is not a primary key but a row number ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 18 +++++++++--------- js/tbl_change.js | 4 ++-- tbl_change.php | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index ef7cf2c..fd9c882 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -39,13 +39,13 @@ if (isset($foreign_navig) && $foreign_navig == __('Show all')) { $foreignData = PMA_getForeignData($foreigners, $field, $override_total, isset($foreign_filter) ? $foreign_filter : '', $foreign_limit); -if (isset($pk)) { - $pk_uri = '&pk=' . urlencode($pk); +if (isset($rownumber)) { + $rownumber_param = '&rownumber=' . urlencode($rownumber); ?> -<input type="hidden" name="pk" value="<?php echo htmlspecialchars($pk); ?>" /> +<input type="hidden" name="rownumber" value="<?php echo htmlspecialchars($rownumber); ?>" /> <?php } else { - $pk_uri = ''; + $rownumber_param = ''; } $gotopage = ''; @@ -65,7 +65,7 @@ if (is_array($foreignData['disp_row'])) { $gotopage = PMA_pageselector( 'browse_foreigners.php?field=' . urlencode($field) . '&' . PMA_generate_common_url($db, $table) - . $pk_uri . + . $rownumber_param . '&fieldkey=' . (isset($fieldkey) ? urlencode($fieldkey) : '') . '&foreign_filter=' . (isset($foreign_filter) ? urlencode($foreign_filter) : '') . '&', @@ -102,8 +102,8 @@ if (is_array($foreignData['disp_row'])) { if (opener && opener.document && opener.document.insertForm) { var field = 'fields'; - <?php if (isset($pk)) { ?> - var element_name = field + '[multi_edit][<?php echo htmlspecialchars($pk); ?>][' + fieldmd5 + ']'; + <?php if (isset($rownumber)) { ?> + var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']'; <?php } else { ?> var element_name = field + '[]'; <?php } ?> @@ -141,8 +141,8 @@ if (is_array($foreignData['disp_row'])) { <input type="hidden" name="field" value="<?php echo htmlspecialchars($field); ?>" /> <input type="hidden" name="fieldkey" value="<?php echo isset($fieldkey) ? htmlspecialchars($fieldkey) : ''; ?>" /> -<?php if (isset($pk)) { ?> -<input type="hidden" name="pk" value="<?php echo htmlspecialchars($pk); ?>" /> +<?php if (isset($rownumber)) { ?> +<input type="hidden" name="rownumber" value="<?php echo htmlspecialchars($rownumber); ?>" /> <?php } ?> <span class="formelement"> <label for="input_foreign_filter"><?php echo __('Search') . ':'; ?></label> diff --git a/js/tbl_change.js b/js/tbl_change.js index 90d28fe..41aecd0 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -430,10 +430,10 @@ $(document).ready(function() { .find('.foreign_values_anchor') .each(function() { $anchor = $(this); - var new_value = 'pk=' + new_row_index; + var new_value = 'rownumber=' + new_row_index; // needs improvement in case something else inside // the href contains this pattern - var new_href = $anchor.attr('href').replace(/pk=\d+/, new_value); + var new_href = $anchor.attr('href').replace(/rownumber=\d+/, new_value); $anchor.attr('href', new_href ); }); diff --git a/tbl_change.php b/tbl_change.php index 60f3bf5..eff5ead 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -285,7 +285,7 @@ foreach ($rows as $row_id => $vrow) { } $jsvkey = $row_id; - $browse_foreigners_uri = '&pk=' . $row_id; + $rownumber_param = '&rownumber=' . $row_id; $vkey = '[multi_edit][' . $jsvkey . ']'; $vresult = (isset($result) && is_array($result) && isset($result[$row_id]) ? $result[$row_id] : $result); @@ -659,7 +659,7 @@ foreach ($rows as $row_id => $vrow) { tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" value="<?php echo htmlspecialchars($data); ?>" /> - <a class="hide foreign_values_anchor" target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes,resizable=yes'); return false;" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $browse_foreigners_uri); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a> + <a class="hide foreign_values_anchor" target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes,resizable=yes'); return false;" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $rownumber_param); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a> <?php } elseif (is_array($foreignData['disp_row'])) { echo $backup_field . "\n"; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-870-g02b9dc8
by Marc Delisle 18 Dec '10

18 Dec '10

The branch, master has been updated via 02b9dc80089d3277f5c96d526d0b9fca8c189cb3 (commit) from 45ec0da621e96c108bc70395eb01ad9495f281d0 (commit) - Log ----------------------------------------------------------------- commit 02b9dc80089d3277f5c96d526d0b9fca8c189cb3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 18 08:47:50 2010 -0500 "Continue insertion" feature did not work with "Browse foreign values" links ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 25 +++++++++++++++++++++---- tbl_change.php | 12 ++---------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index 758add1..90d28fe 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -258,6 +258,9 @@ function unNullify(urlField, multi_edit) */ $(document).ready(function() { + // these were hidden via the "hide" class + $('.foreign_values_anchor').show(); + /** * Handles all current checkboxes for Null * @@ -363,10 +366,15 @@ $(document).ready(function() { */ var last_row = $("#insertForm").find(".insertRowTable:last"); + // need to access this at more than one level + // (also needs improvement because it should be calculated + // just once per cloned row, not once per column) + var new_row_index = 0; + //Clone the insert tables $(last_row) .clone() - .insertBefore("#insertForm > fieldset") + .insertBefore("#actions_panel") .find('input[name*=multi_edit],select[name*=multi_edit]') .each(function() { @@ -387,7 +395,7 @@ $(document).ready(function() { var old_row_index = parseInt(old_row_index_string.match(/\d+/)[0]); /** calculate next index i.e. 11 */ - var new_row_index = old_row_index + 1; + new_row_index = old_row_index + 1; /** generate the new name i.e. funcs[multi_edit][11][foobarbaz] */ var new_name = name_parts[0] + '[' + new_row_index + ']' + name_parts[1]; @@ -417,8 +425,17 @@ $(document).ready(function() { ); }) .end(); - - }); + }) + .end() + .find('.foreign_values_anchor') + .each(function() { + $anchor = $(this); + var new_value = 'pk=' + new_row_index; + // needs improvement in case something else inside + // the href contains this pattern + var new_href = $anchor.attr('href').replace(/pk=\d+/, new_value); + $anchor.attr('href', new_href ); + }); //Insert/Clone the ignore checkboxes if(curr_rows == 1 ) { diff --git a/tbl_change.php b/tbl_change.php index eaf0bc3..60f3bf5 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -659,15 +659,7 @@ foreach ($rows as $row_id => $vrow) { tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" value="<?php echo htmlspecialchars($data); ?>" /> - <script type="text/javascript"> - //<![CDATA[ - document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes,resizable=yes\'); return false"'); - document.write(' href="browse_foreigners.php?'); - document.write('<?php echo PMA_generate_common_url($db, $table); ?>'); - document.writeln('&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $browse_foreigners_uri); ?>">'); - document.writeln('<?php echo str_replace("'", "\'", $titles['Browse']); ?></a>'); - //]]> - </script> + <a class="hide foreign_values_anchor" target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes,resizable=yes'); return false;" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&field=<?php echo PMA_escapeJsString(urlencode($field['Field']) . $browse_foreigners_uri); ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a> <?php } elseif (is_array($foreignData['disp_row'])) { echo $backup_field . "\n"; @@ -1015,7 +1007,7 @@ $(function() { ?> <br /> - <fieldset> + <fieldset id="actions_panel"> <table border="0" cellpadding="5" cellspacing="0"> <tr> <td valign="middle" nowrap="nowrap"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-869-g45ec0da
by Marc Delisle 17 Dec '10

17 Dec '10

The branch, master has been updated via 45ec0da621e96c108bc70395eb01ad9495f281d0 (commit) from 4a71a1e5f1eee17a5ef2349e9a62cbcab7ec4971 (commit) - Log ----------------------------------------------------------------- commit 45ec0da621e96c108bc70395eb01ad9495f281d0 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 17 09:31:42 2010 -0500 Problems with latest fix and SET columns ----------------------------------------------------------------------- Summary of changes: libraries/tbl_replace_fields.inc.php | 61 +++++++++++++-------------------- tbl_change.php | 2 +- 2 files changed, 25 insertions(+), 38 deletions(-) diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 3ba08c4..84377bf 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -69,44 +69,31 @@ if (false !== $possibly_uploaded_val) { // $key contains the md5() of the fieldname if (0 === strlen($val)) { - // default - $val = "''"; - - switch ($type) { - case 'enum': - // if we have an enum, then construct the value - case 'set': - // if we have a set, then construct the value - case 'foreign': - // if we have a foreign key, then construct the value - if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { - $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); - $val = "'" . PMA_sqlAddslashes($val) . "'"; - } - break; - case 'protected': - // here we are in protected mode (asked in the config) - // so tbl_change has put this special value in the - // fields array, so we do not change the field value - // but we can still handle field upload - - // when in UPDATE mode, do not alter field's contents. When in INSERT - // mode, insert empty field because no values were submitted. If protected - // blobs where set, insert original fields content. - if (! empty($prot_row[$me_fields_name[$key]])) { - $val = '0x' . bin2hex($prot_row[$me_fields_name[$key]]); - } else { - $val = ''; - } - - break; - default: - // best way to avoid problems in strict mode (works also in non-strict mode) - if (isset($me_auto_increment) && isset($me_auto_increment[$key])) { - $val = 'NULL'; - } - break; + // best way to avoid problems in strict mode (works also in non-strict mode) + if (isset($me_auto_increment) && isset($me_auto_increment[$key])) { + $val = 'NULL'; + } else { + $val = "''"; + } + } elseif ($type == 'set') { + if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { + $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); + $val = "'" . PMA_sqlAddslashes($val) . "'"; } + } elseif ($type == 'protected') { + // here we are in protected mode (asked in the config) + // so tbl_change has put this special value in the + // fields array, so we do not change the field value + // but we can still handle field upload + + // when in UPDATE mode, do not alter field's contents. When in INSERT + // mode, insert empty field because no values were submitted. If protected + // blobs where set, insert original fields content. + if (! empty($prot_row[$me_fields_name[$key]])) { + $val = '0x' . bin2hex($prot_row[$me_fields_name[$key]]); + } else { + $val = ''; + } } elseif ($type == 'bit') { $val = preg_replace('/[^01]/', '0', $val); $val = "b'" . PMA_sqlAddslashes($val) . "'"; diff --git a/tbl_change.php b/tbl_change.php index 6b4446e..eaf0bc3 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -804,7 +804,7 @@ foreach ($rows as $row_id => $vrow) { echo $backup_field . "\n"; ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="set" /> - <select name="fields<?php echo $field_name_appendix; ?>" + <select name="fields<?php echo $field_name_appendix . '[]'; ?>" class="textfield" size="<?php echo $select_size; ?>" multiple="multiple" <?php echo $unnullify_trigger; ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-868-g4a71a1e
by Marc Delisle 16 Dec '10

16 Dec '10

The branch, master has been updated via 4a71a1e5f1eee17a5ef2349e9a62cbcab7ec4971 (commit) from 62fd44d51e2ca500300fd992c3be4ab070f7a76c (commit) - Log ----------------------------------------------------------------- commit 4a71a1e5f1eee17a5ef2349e9a62cbcab7ec4971 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 16 11:37:24 2010 -0500 bug #3138572 "Continue insertion" problems ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 6 +++--- libraries/tbl_replace_fields.inc.php | 8 +++----- tbl_change.php | 21 +++++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 4cfa543..ef7cf2c 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -98,12 +98,12 @@ if (is_array($foreignData['disp_row'])) { <script type="text/javascript"> //<![CDATA[ self.focus(); - function formupdate(field, key) { + function formupdate(fieldmd5, key) { if (opener && opener.document && opener.document.insertForm) { - var field = 'field_' + field; + var field = 'fields'; <?php if (isset($pk)) { ?> - var element_name = field + '[multi_edit][<?php echo htmlspecialchars($pk); ?>][]'; + var element_name = field + '[multi_edit][<?php echo htmlspecialchars($pk); ?>][' + fieldmd5 + ']'; <?php } else { ?> var element_name = field + '[]'; <?php } ?> diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 935587d..3ba08c4 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -68,8 +68,6 @@ if (false !== $possibly_uploaded_val) { } // $key contains the md5() of the fieldname - $f = 'field_' . $key; - if (0 === strlen($val)) { // default $val = "''"; @@ -81,8 +79,8 @@ if (false !== $possibly_uploaded_val) { // if we have a set, then construct the value case 'foreign': // if we have a foreign key, then construct the value - if (! empty($_REQUEST[$f]['multi_edit'][$rownumber])) { - $val = implode(',', $_REQUEST[$f]['multi_edit'][$rownumber]); + if (! empty($_REQUEST['fields']['multi_edit'][$rownumber][$key])) { + $val = implode(',', $_REQUEST['fields']['multi_edit'][$rownumber][$key]); $val = "'" . PMA_sqlAddslashes($val) . "'"; } break; @@ -129,5 +127,5 @@ if (false !== $possibly_uploaded_val) { $val = "''"; } } // end else (field value in the form) -unset($type, $f); +unset($type); ?> diff --git a/tbl_change.php b/tbl_change.php index edbddb0..6b4446e 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -411,8 +411,6 @@ foreach ($rows as $row_id => $vrow) { // Use an MD5 as an array index to avoid having special characters in the name atttibute (see bug #1746964 ) $field_name_appendix = $vkey . '[' . $field['Field_md5'] . ']'; - $field_name_appendix_md5 = $field['Field_md5'] . $vkey . '[]'; - if ($field['Type'] == 'datetime' && ! isset($field['Default']) @@ -656,9 +654,7 @@ foreach ($rows as $row_id => $vrow) { ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="foreign" /> - <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" - value="" id="field_<?php echo ($idindex); ?>_3A" /> - <input type="text" name="field_<?php echo $field_name_appendix_md5; ?>" + <input type="text" name="fields<?php echo $field_name_appendix; ?>" class="textfield" <?php echo $unnullify_trigger; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3" @@ -678,10 +674,9 @@ foreach ($rows as $row_id => $vrow) { ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="foreign" /> - <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" - value="" id="field_<?php echo $idindex; ?>_3A" /> - <select name="field_<?php echo $field_name_appendix_md5; ?>" + <select name="fields<?php echo $field_name_appendix; ?>" <?php echo $unnullify_trigger; ?> + class="textfield" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3"> <?php echo PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $data, $cfg['ForeignKeyMaxLimit']); ?> @@ -744,8 +739,9 @@ foreach ($rows as $row_id => $vrow) { // show dropdown or radio depend on length if (strlen($field['Type']) > 20) { ?> - <select name="field_<?php echo $field_name_appendix_md5; ?>" + <select name="fields<?php echo $field_name_appendix; ?>" <?php echo $unnullify_trigger; ?> + class="textfield" tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" id="field_<?php echo ($idindex); ?>_3"> <option value=""> </option> @@ -772,7 +768,8 @@ foreach ($rows as $row_id => $vrow) { $j = 0; foreach ($field_enum_values as $enum_value) { echo ' '; - echo '<input type="radio" name="field_' . $field_name_appendix_md5 . '"'; + echo '<input type="radio" name="fields' . $field_name_appendix . '"'; + echo ' class="textfield"'; echo ' value="' . $enum_value['html'] . '"'; echo ' id="field_' . ($idindex) . '_3_' . $j . '"'; echo $unnullify_trigger; @@ -807,8 +804,8 @@ foreach ($rows as $row_id => $vrow) { echo $backup_field . "\n"; ?> <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="set" /> - <input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" /> - <select name="field_<?php echo $field_name_appendix_md5; ?>" + <select name="fields<?php echo $field_name_appendix; ?>" + class="textfield" size="<?php echo $select_size; ?>" multiple="multiple" <?php echo $unnullify_trigger; ?> tabindex="<?php echo ($tabindex + $tabindex_for_value); ?>" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-867-g62fd44d
by Michal Čihař 16 Dec '10

16 Dec '10

The branch, master has been updated via 62fd44d51e2ca500300fd992c3be4ab070f7a76c (commit) via 6ba0ee62f589b6d7570daeb7da92f3f72e65c145 (commit) via b5deff1c9f8f7fd8ed8e8d46762d3039701a56e2 (commit) via f8f1de61bef5c504a212ebeb37c637ad121aa8ca (commit) via 8a24231004ce1b3bd6ac8b54a48d5f9633166eac (commit) via 8464670489cb85ebe7c11a29850f2dec98416231 (commit) via 7232aed1160483aaf4580b3634e865ca182161fc (commit) via 0790536797f3004a9315dddb7cd43bbc2a9bf52f (commit) via 35827f22f44e8c9fda7dc3367cb122ef4e8c152c (commit) via d60ba5d2e93fb3ffa924af7da50f1e6a9afa35ae (commit) via b201492806a98bf943e1a7d4aa4c0f1c90d76877 (commit) via ad5549831ddd3fa6a9e67a89b14b92259d1b375c (commit) via 0d8371d0535fde1ffe9deaeb6caa45bb674ada63 (commit) via dc2b1847aaac26bad17a461942908eedd7d20d0e (commit) via 9c15bbe3d64bad1937348bcb6058c3dc14c1c3f3 (commit) via 3aff11fdd626e9dbc3871f2896d3d81bcc9114c3 (commit) via e8a7dd01a2d5d8a0ff26c1ce2526187a46d62778 (commit) via 9c8db77d9f1cba7b94069d8ec9a27119f2a9780f (commit) via 1161235a98e4e6040634c8627ffd3c7128a96e05 (commit) via 88975e07c93f6a01ea4db5a35164271766ee1295 (commit) via 82fa07a19955a4229459fc7f7b3dc40fa2c6b963 (commit) via ebf0324f22e6f6ba4f5a337e2b37405ebdf8445f (commit) via ddf0f29b3251b547dfc1373a232551a45bd780a1 (commit) via 3e1ae88faaee4d25afcece2310bd951977aa49c6 (commit) via 52a3b77eb8e6ba06b10d5746edda31f6e3a3a093 (commit) via f74f294e838e1514b47fd2330d632b037e949548 (commit) via 00c6b82ae7b22e0c84a8461f090bf992f45c45cc (commit) via 4d26da6cfd9256e5a021c4e3bf7d71506f671d09 (commit) via f50b2991d2aeaf838c4b9ec1769454068bd0c985 (commit) via 1aa24c87dabb00ea8aca4beb06a63104940c861c (commit) via 3ec261a4e11fec21ec5a3de90c3175f0444c43e8 (commit) via 089ce7155b3bfd233b9a06126a751a056459a5c2 (commit) via 8970d181c7607e72e76826396840ff20dc5a5694 (commit) via b0acb02695cced80febea15a7cc32f57723d42e8 (commit) via 76db77c0ca94c412945ac50e60c9cdc55dc6b3f7 (commit) via 1d88a1ddf11bb1114670da45dc8d013ed589df47 (commit) via 0aaa0769370916b7a9108a5441fbf54c8188c2f6 (commit) via 15af1dead0281d214c4a1edf7bd48857d201cfe2 (commit) via e6f9a7086a28494db47d19ba223593d09c3e4463 (commit) via cf0a87de6152dec78375bb31417e7710b1e5c7b7 (commit) via 2617ce57429671a446e8f89af4a99648004e1a56 (commit) via 3087237f3a439aa0a4bb3caca77385ab334b1de2 (commit) via 8fd78e7924b300bfa7b78706bacfe6f0a7e7df95 (commit) via 39734d025766178be271d850554b5219b79ec8b5 (commit) via 167bdc60b13c37f5825f754f2b5ac697bffc38a7 (commit) via 5fc01e2bffee3ba73412aa48c77bd55e52269351 (commit) via 4261e517dd861aff0da00da24c9c29f4ddfdccad (commit) via e2a9fc2b72be9a62890853f16252ed03f4203f89 (commit) via 5f868061fad5485b8b18753c7d992b24d526d340 (commit) via fef6f755976c798b57c3c4fa5478bae3cbec984d (commit) via 56bf16f91fac5093cb82b481e4af4d82b8b75d12 (commit) via 52067d5d89459aa10273e92573f0ffe0d8ad42dd (commit) via ff0b9e0ef6c6fafd04f1a12f799b3f01e6f90f22 (commit) via df058023ea452cec358a916aca9af96b7018f5a6 (commit) via bcc90ddfaddac5a1abaa39c2f98478e46a5ec0c9 (commit) via ca1c8a6b051982783a71cdef933cceb01e10423b (commit) via 35a48503e83c7b0f0b9efcfbf28a9777aa90a711 (commit) via 50ec4f0fc567de0b4e678d65d638f3ea5052e069 (commit) via 011aa8c866cf114330a9fd20097174f21fc27959 (commit) via 8c5e52c9c2973e112b41427ba5c2379f2106858c (commit) via bceb8d076625b17e9f9f484896e1d7ed99de02a2 (commit) from 92008fc9b1677fada4c41bc89dc5a29e6f584684 (commit) - Log ----------------------------------------------------------------- commit 62fd44d51e2ca500300fd992c3be4ab070f7a76c Author: Michal Čihař <michal(a)cihar.com> Date: Thu Dec 16 09:05:45 2010 +0100 Fix format string. commit 6ba0ee62f589b6d7570daeb7da92f3f72e65c145 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:40:07 2010 +0200 Translation update done using Pootle. commit b5deff1c9f8f7fd8ed8e8d46762d3039701a56e2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:39:39 2010 +0200 Translation update done using Pootle. commit f8f1de61bef5c504a212ebeb37c637ad121aa8ca Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:39:30 2010 +0200 Translation update done using Pootle. commit 8a24231004ce1b3bd6ac8b54a48d5f9633166eac Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:39:18 2010 +0200 Translation update done using Pootle. commit 8464670489cb85ebe7c11a29850f2dec98416231 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:38:45 2010 +0200 Translation update done using Pootle. commit 7232aed1160483aaf4580b3634e865ca182161fc Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:38:23 2010 +0200 Translation update done using Pootle. commit 0790536797f3004a9315dddb7cd43bbc2a9bf52f Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:37:59 2010 +0200 Translation update done using Pootle. commit 35827f22f44e8c9fda7dc3367cb122ef4e8c152c Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:37:15 2010 +0200 Translation update done using Pootle. commit d60ba5d2e93fb3ffa924af7da50f1e6a9afa35ae Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:36:07 2010 +0200 Translation update done using Pootle. commit b201492806a98bf943e1a7d4aa4c0f1c90d76877 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:35:49 2010 +0200 Translation update done using Pootle. commit ad5549831ddd3fa6a9e67a89b14b92259d1b375c Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 02:34:54 2010 +0200 Translation update done using Pootle. commit 0d8371d0535fde1ffe9deaeb6caa45bb674ada63 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 01:33:44 2010 +0200 Translation update done using Pootle. commit dc2b1847aaac26bad17a461942908eedd7d20d0e Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 01:14:36 2010 +0200 Translation update done using Pootle. commit 9c15bbe3d64bad1937348bcb6058c3dc14c1c3f3 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:44 2010 +0200 Translation update done using Pootle. commit 3aff11fdd626e9dbc3871f2896d3d81bcc9114c3 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:35 2010 +0200 Translation update done using Pootle. commit e8a7dd01a2d5d8a0ff26c1ce2526187a46d62778 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:25 2010 +0200 Translation update done using Pootle. commit 9c8db77d9f1cba7b94069d8ec9a27119f2a9780f Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:21 2010 +0200 Translation update done using Pootle. commit 1161235a98e4e6040634c8627ffd3c7128a96e05 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:10 2010 +0200 Translation update done using Pootle. commit 88975e07c93f6a01ea4db5a35164271766ee1295 Author: Domen <dbc334(a)gmail.com> Date: Thu Dec 16 00:56:03 2010 +0200 Translation update done using Pootle. commit 82fa07a19955a4229459fc7f7b3dc40fa2c6b963 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:54:12 2010 +0200 Translation update done using Pootle. commit ebf0324f22e6f6ba4f5a337e2b37405ebdf8445f Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:41:57 2010 +0200 Translation update done using Pootle. commit ddf0f29b3251b547dfc1373a232551a45bd780a1 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:37:02 2010 +0200 Translation update done using Pootle. commit 3e1ae88faaee4d25afcece2310bd951977aa49c6 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:18:16 2010 +0200 Translation update done using Pootle. commit 52a3b77eb8e6ba06b10d5746edda31f6e3a3a093 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:16:42 2010 +0200 Translation update done using Pootle. commit f74f294e838e1514b47fd2330d632b037e949548 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:16:28 2010 +0200 Translation update done using Pootle. commit 00c6b82ae7b22e0c84a8461f090bf992f45c45cc Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:15:09 2010 +0200 Translation update done using Pootle. commit 4d26da6cfd9256e5a021c4e3bf7d71506f671d09 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:13:50 2010 +0200 Translation update done using Pootle. commit f50b2991d2aeaf838c4b9ec1769454068bd0c985 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:13:41 2010 +0200 Translation update done using Pootle. commit 1aa24c87dabb00ea8aca4beb06a63104940c861c Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:12:43 2010 +0200 Translation update done using Pootle. commit 3ec261a4e11fec21ec5a3de90c3175f0444c43e8 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:11:47 2010 +0200 Translation update done using Pootle. commit 089ce7155b3bfd233b9a06126a751a056459a5c2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:09:33 2010 +0200 Translation update done using Pootle. commit 8970d181c7607e72e76826396840ff20dc5a5694 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:08:07 2010 +0200 Translation update done using Pootle. commit b0acb02695cced80febea15a7cc32f57723d42e8 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:07:36 2010 +0200 Translation update done using Pootle. commit 76db77c0ca94c412945ac50e60c9cdc55dc6b3f7 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:06:54 2010 +0200 Translation update done using Pootle. commit 1d88a1ddf11bb1114670da45dc8d013ed589df47 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:06:13 2010 +0200 Translation update done using Pootle. commit 0aaa0769370916b7a9108a5441fbf54c8188c2f6 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:04:16 2010 +0200 Translation update done using Pootle. commit 15af1dead0281d214c4a1edf7bd48857d201cfe2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:03:17 2010 +0200 Translation update done using Pootle. commit e6f9a7086a28494db47d19ba223593d09c3e4463 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:00:40 2010 +0200 Translation update done using Pootle. commit cf0a87de6152dec78375bb31417e7710b1e5c7b7 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Thu Dec 16 00:00:01 2010 +0200 Translation update done using Pootle. commit 2617ce57429671a446e8f89af4a99648004e1a56 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:59:33 2010 +0200 Translation update done using Pootle. commit 3087237f3a439aa0a4bb3caca77385ab334b1de2 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:58:33 2010 +0200 Translation update done using Pootle. commit 8fd78e7924b300bfa7b78706bacfe6f0a7e7df95 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:48:51 2010 +0200 Translation update done using Pootle. commit 39734d025766178be271d850554b5219b79ec8b5 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:46:28 2010 +0200 Translation update done using Pootle. commit 167bdc60b13c37f5825f754f2b5ac697bffc38a7 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:44:05 2010 +0200 Translation update done using Pootle. commit 5fc01e2bffee3ba73412aa48c77bd55e52269351 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 23:40:40 2010 +0200 Translation update done using Pootle. commit 4261e517dd861aff0da00da24c9c29f4ddfdccad Merge: e2a9fc2b72be9a62890853f16252ed03f4203f89 92008fc9b1677fada4c41bc89dc5a29e6f584684 Author: Pootle server <pootle(a)cihar.com> Date: Wed Dec 15 20:40:08 2010 +0100 Merge remote branch 'origin/master' commit e2a9fc2b72be9a62890853f16252ed03f4203f89 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:33:34 2010 +0200 Translation update done using Pootle. commit 5f868061fad5485b8b18753c7d992b24d526d340 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:31:31 2010 +0200 Translation update done using Pootle. commit fef6f755976c798b57c3c4fa5478bae3cbec984d Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:30:23 2010 +0200 Translation update done using Pootle. commit 56bf16f91fac5093cb82b481e4af4d82b8b75d12 Author: Olexiy Zagorskyi <zalex_ua(a)i.ua> Date: Wed Dec 15 20:29:38 2010 +0200 Translation update done using Pootle. commit 52067d5d89459aa10273e92573f0ffe0d8ad42dd Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:21 2010 +0200 Translation update done using Pootle. commit ff0b9e0ef6c6fafd04f1a12f799b3f01e6f90f22 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:12 2010 +0200 Translation update done using Pootle. commit df058023ea452cec358a916aca9af96b7018f5a6 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:07 2010 +0200 Translation update done using Pootle. commit bcc90ddfaddac5a1abaa39c2f98478e46a5ec0c9 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:14:02 2010 +0200 Translation update done using Pootle. commit ca1c8a6b051982783a71cdef933cceb01e10423b Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:56 2010 +0200 Translation update done using Pootle. commit 35a48503e83c7b0f0b9efcfbf28a9777aa90a711 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:38 2010 +0200 Translation update done using Pootle. commit 50ec4f0fc567de0b4e678d65d638f3ea5052e069 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:19 2010 +0200 Translation update done using Pootle. commit 011aa8c866cf114330a9fd20097174f21fc27959 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 19:13:00 2010 +0200 Translation update done using Pootle. commit 8c5e52c9c2973e112b41427ba5c2379f2106858c Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 16:12:18 2010 +0200 Translation update done using Pootle. commit bceb8d076625b17e9f9f484896e1d7ed99de02a2 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 16:11:35 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 136 +++------------------------------------------------------- po/fr.po | 19 +++----- po/sl.po | 23 ++++------ po/uk.po | 103 +++++++++++++++++++------------------------- 4 files changed, 68 insertions(+), 213 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 44934b1..d18ef9f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-08 12:48+0200\n" +"PO-Revision-Date: 2010-12-15 19:14+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -7000,34 +7000,29 @@ msgid "Page creation failed" msgstr "Page creation failed" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "pages" +msgstr "Page" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Import from file" +msgstr "Import from selected page" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Export/Import to scale" +msgstr "Export to selected page" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Create a new index" +msgstr "Create a page and export to it" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "New name" +msgstr "New page name: " #: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -9804,120 +9799,3 @@ msgstr "Rename view to" #~ msgid "Disable Statistics" #~ msgstr "Disable Statistics" - -#~| msgid "Hide query box" -#~ msgid "Hide query chart" -#~ msgstr "Hide query chart" - -#~ msgid "Start" -#~ msgstr "Start" - -#~ msgid "Stop" -#~ msgstr "Stop" - -#~ msgid "Display table filter" -#~ msgstr "Display table filter" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." - -#~ msgid "Ignore duplicate rows" -#~ msgstr "Ignore duplicate rows" - -#~ msgid "Execute bookmarked query" -#~ msgstr "Execute bookmarked query" - -#~ msgid "No tables" -#~ msgstr "No tables" - -#~ msgid "Field navigation using Ctrl+Arrows" -#~ msgstr "Field navigation using Ctrl+Arrows" - -#~ msgid "Toggle Query Box Visibility" -#~ msgstr "Toggle Query Box Visibility" - -#~ msgid "SVG" -#~ msgstr "SVG" - -#~ msgid "DIA" -#~ msgstr "DIA" - -#~ msgid "VISIO" -#~ msgstr "VISIO" - -#~ msgid "EPS" -#~ msgstr "EPS" - -#~ msgid "" -#~ "This [a@?page=form&formset=features#tab_Security]option[/a] should be " -#~ "enabled if your web server supports it" -#~ msgstr "" -#~ "This [a@?page=form&formset=features#tab_Security]option[/a] should be " -#~ "enabled if your web server supports it" - -#~ msgid "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." -#~ msgstr "" -#~ "Enter each value in a separate field, enclosed in single quotes. If you " -#~ "ever need to put a backslash (\"\\\") or a single quote (\"'\") amongst " -#~ "those values, precede it with a backslash (for example '\\\\xyz' or 'a" -#~ "\\'b')." - -#~ msgid "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." -#~ msgstr "" -#~ "Enter each value in a separate field. If you ever need to put a backslash " -#~ "(\"\\\") or a single quote (\"'\") amongst those values, precede it with " -#~ "a backslash (for example '\\\\xyz' or 'a\\'b')." - -#~ msgid "Debug PHP" -#~ msgstr "Debug PHP" - -#~ msgid "New table" -#~ msgstr "New table" - -#~ msgid "server name" -#~ msgstr "server name" - -#~ msgid "database name" -#~ msgstr "database name" - -#~ msgid "Edit PDF Pages" -#~ msgstr "Edit PDF Pages" - -#~ msgid "Data Dictionary Format" -#~ msgstr "Data Dictionary Format" - -#~ msgid "Method" -#~ msgstr "Method" - -#~ msgid "no" -#~ msgstr "no" - -#~ msgid "Enter login options for signon authentication" -#~ msgstr "Enter login options for signon authentication" - -#~ msgid "Signon login options" -#~ msgstr "Signon login options" - -#~ msgid "PMA database" -#~ msgstr "PMA database" - -#~ msgid "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" -#~ msgstr "" -#~ "SQL queries settings, for SQL Query box options see [a@?page=form&" -#~ "formset=main_frame#tab_Sql_box]Navigation frame[/a] settings" - -#~ msgid "yes" -#~ msgstr "yes" diff --git a/po/fr.po b/po/fr.po index 5309141..e59c981 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-14 18:08+0200\n" +"PO-Revision-Date: 2010-12-15 19:13+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" @@ -7085,34 +7085,29 @@ msgid "Page creation failed" msgstr "Échec de création de page" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "pages" +msgstr "Page" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Importer depuis le fichier" +msgstr "Importer depuis la page sélectionnée" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Exporter/Importer à l'échelle" +msgstr "Exporter vers la page sélectionnée" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Créer un nouvel index" +msgstr "Créer une page et y exporter" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "Nouveau nom" +msgstr "Nom de la nouvelle page : " #: pmd_pdf.php:114 msgid "Export/Import to scale" diff --git a/po/sl.po b/po/sl.po index 533bc8f..9a8d641 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-12 13:02+0200\n" +"PO-Revision-Date: 2010-12-16 00:56+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" -"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" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:36 browse_foreigners.php:57 @@ -7038,34 +7038,29 @@ msgid "Page creation failed" msgstr "Ustvarjanje strani je spodletelo" #: pmd_pdf.php:89 -#, fuzzy #| msgid "pages" msgid "Page" -msgstr "strani" +msgstr "Stran" #: pmd_pdf.php:99 -#, fuzzy #| msgid "Import from file" msgid "Import from selected page" -msgstr "Uvozi iz datoteke" +msgstr "Uvozi z izbrane strani" #: pmd_pdf.php:100 -#, fuzzy #| msgid "Export/Import to scale" msgid "Export to selected page" -msgstr "Izvozi/Uvozi v razmerju" +msgstr "Izvozi na izbrano stran" #: pmd_pdf.php:102 -#, fuzzy #| msgid "Create a new index" msgid "Create a page and export to it" -msgstr "Ustvari nov indeks" +msgstr "Ustvari stran in izvozi nanjo" #: pmd_pdf.php:111 -#, fuzzy #| msgid "New name" msgid "New page name: " -msgstr "Novo ime" +msgstr "Ime nove strani: " #: pmd_pdf.php:114 msgid "Export/Import to scale" diff --git a/po/uk.po b/po/uk.po index 86a8683..93a63f3 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-14 11:27-0500\n" -"PO-Revision-Date: 2010-12-15 01:52+0200\n" +"PO-Revision-Date: 2010-12-16 02:40+0200\n" "Last-Translator: Olexiy Zagorskyi <zalex_ua(a)i.ua>\n" "Language-Team: ukrainian <uk(a)li.org>\n" "Language: uk\n" @@ -298,7 +298,7 @@ msgstr "Лише дані" #: db_operations.php:491 msgid "CREATE DATABASE before copying" -msgstr "" +msgstr "Перед копіюванням створити базу даних (CREATE DATABASE)" #: db_operations.php:494 libraries/config/messages.inc.php:122 #: libraries/config/messages.inc.php:123 libraries/config/messages.inc.php:125 @@ -310,11 +310,11 @@ msgstr "Додати %s" #: db_operations.php:498 libraries/config/messages.inc.php:115 #: tbl_operations.php:296 tbl_operations.php:540 msgid "Add AUTO_INCREMENT value" -msgstr "" +msgstr "Додати AUTO_INCREMENT значення" #: db_operations.php:502 tbl_operations.php:547 msgid "Add constraints" -msgstr "" +msgstr "Додати constraints" #: db_operations.php:515 msgid "Switch to copied database" @@ -331,7 +331,7 @@ msgid "Collation" msgstr "Порівняння" #: db_operations.php:548 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The additional features for working with linked tables have been " #| "deactivated. To find out why click %shere%s." @@ -339,8 +339,8 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." msgstr "" -"Додаткова можливість роботи із залінкованими таблицями деактивована. Для " -"того, щоб довідатись чому, натисніть %sтут%s." +"Сховище конфігурації phpMyAdmin деактивовано. Для того, щоб довідатись чому, " +"натисніть %sтут%s." #: db_operations.php:581 #, fuzzy @@ -356,7 +356,7 @@ msgstr "Схема зв'язків" #: server_synchronize.php:421 server_synchronize.php:864 tbl_tracking.php:586 #: test/theme.php:74 msgid "Table" -msgstr "таблиця " +msgstr "Таблиця" #: db_printview.php:103 libraries/build_html_for_db.lib.php:30 #: libraries/db_structure.lib.php:47 libraries/header_printview.inc.php:62 @@ -467,7 +467,7 @@ msgstr "Видалити" #: libraries/tbl_properties.inc.php:778 server_privileges.php:298 #: tbl_change.php:928 tbl_indexes.php:248 tbl_select.php:284 msgid "Or" -msgstr "або" +msgstr "Або" #: db_qbe.php:526 msgid "Modify" @@ -527,12 +527,13 @@ msgid "Search results for \"<i>%s</i>\" %s:" msgstr "Результати пошуку \"<i>%s</i>\" %s:" #: db_search.php:248 -#, fuzzy, php-format +#, php-format #| msgid "%s match(es) inside table <i>%s</i>" msgid "%s match inside table <i>%s</i>" msgid_plural "%s matches inside table <i>%s</i>" msgstr[0] "%s співпадіння у таблиці <i>%s</i>" msgstr[1] "%s співпадіння у таблиці <i>%s</i>" +msgstr[2] "%s співпадінь у таблиці <i>%s</i>" #: db_search.php:255 libraries/common.lib.php:2818 #: libraries/common.lib.php:2996 libraries/common.lib.php:2997 @@ -911,7 +912,7 @@ msgstr "Назад" #: index.php:183 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser." -msgstr "Для роботи phpMyAdmin потрібно браузер з підтримкою <b>фреймів</b>." +msgstr "phpMyAdmin є більш зручним в браузері з підтримкою <b>фреймів</b>." #: js/messages.php:25 server_synchronize.php:343 server_synchronize.php:355 #: server_synchronize.php:371 server_synchronize.php:378 @@ -992,28 +993,24 @@ msgid "The passwords aren't the same!" msgstr "Паролі не однакові!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" msgstr "Додати нового користувача" #: js/messages.php:53 -#, fuzzy #| msgid "Create" msgid "Create User" -msgstr "Створити" +msgstr "Створити користувача" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" msgstr "Перезавантаження прав" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Усунути відмічених користувачів" +msgstr "Видалити відмічених користувачів" #: js/messages.php:56 tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" @@ -1096,10 +1093,9 @@ msgid "Searching" msgstr "Шукати" #: js/messages.php:84 -#, fuzzy #| msgid "in query" msgid "Hide query box" -msgstr "по запиту" +msgstr "Сховати блок запиту" #: js/messages.php:85 #, fuzzy @@ -1444,10 +1440,9 @@ msgid "Hour" msgstr "" #: js/messages.php:208 -#, fuzzy #| msgid "in use" msgid "Minute" -msgstr "використовується" +msgstr "Хвилина" #: js/messages.php:209 #, fuzzy @@ -1885,13 +1880,13 @@ msgid "" "semicolon is missing somewhere.<br />If you receive a blank page, everything " "is fine." msgstr "" -"phpMyAdmin не може прочитати ваш конфігураційний файл <br />Це може статися " -"у тому випадку, коли php натрапить на синтаксичну помилку (parse error) у " -"ньому, або не може знайти самого файлу.<br />Завантажте конфігураційний файл " -"безпосередньо за допомогою посилання поданого нижче і прочитайте отримані " -"повідомлення про помилки (php error messages). Найчастіше десь у файлі " -"просто бракує лапок чи двокрапки. <br />Якщо Ви отримаєте порожню сторінку, " -"- значить все в порядку." +"phpMyAdmin не може прочитати ваш конфігураційний файл!<br />Це може статися " +"у тому випадку, коли PHP натрапить на синтаксичну помилку у ньому, або не " +"може знайти самого файлу.<br />Завантажте конфігураційний файл безпосередньо " +"за допомогою посилання поданого нижче і прочитайте отримані повідомлення " +"про помилки (PHP error messages). Найчастіше десь у файлі просто бракує " +"лапок чи крапки з комою. <br />Якщо Ви отримаєте порожню сторінку - значить " +"все в порядку." #: libraries/common.inc.php:586 #, php-format @@ -1904,7 +1899,7 @@ msgid "" "configuration file!" msgstr "" "Змінна <tt>$cfg['PmaAbsoluteUri']</tt> ПОВИННА бути встановлена у Вашому " -"конфіґураційному файлі!" +"конфігураційному файлі!" #: libraries/common.inc.php:621 #, php-format @@ -2130,10 +2125,10 @@ msgid "Browse your computer:" msgstr "" #: libraries/common.lib.php:2963 -#, fuzzy, php-format +#, php-format #| msgid "web server upload directory" msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "каталог веб-сервера для завантаження файлів (upload directory)" +msgstr "Виберіть з каталога веб-сервера для завантаження файлів <b>%s</b>:" #: libraries/common.lib.php:2975 libraries/sql_query_form.lib.php:496 #: tbl_change.php:925 @@ -2253,10 +2248,9 @@ msgid "SQL Validator is disabled" msgstr "" #: libraries/config/FormDisplay.class.php:764 -#, fuzzy #| msgid "Link not found" msgid "SOAP extension not found" -msgstr "Лінк не знайдено" +msgstr "SOA розширення не знайдено" #: libraries/config/FormDisplay.class.php:772 #, php-format @@ -2613,11 +2607,10 @@ msgstr "" #: libraries/config/messages.inc.php:138 libraries/export/htmlword.php:23 #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 -#, fuzzy #| msgid "%s table" #| msgid_plural "%s tables" msgid "Dump table" -msgstr "%s таблиця" +msgstr "Дамп таблиці" #: libraries/config/messages.inc.php:88 libraries/export/latex.php:31 msgid "Include table caption" @@ -2998,10 +2991,9 @@ msgid "Customize links shown in SQL Query boxes" msgstr "" #: libraries/config/messages.inc.php:214 -#, fuzzy #| msgid "Server variables and settings" msgid "SQL queries settings" -msgstr "Змінні сервера та налаштування" +msgstr "Налаштування SQL запитів" #: libraries/config/messages.inc.php:215 #, fuzzy @@ -3490,10 +3482,9 @@ msgid "Query window height" msgstr "Вікно запиту" #: libraries/config/messages.inc.php:339 -#, fuzzy #| msgid "Query window" msgid "Query window width (in pixels)" -msgstr "Вікно запиту" +msgstr "Ширина вікна запиту (в пікселях)" #: libraries/config/messages.inc.php:340 #, fuzzy @@ -4450,16 +4441,14 @@ msgid "Custom - display all possible options" msgstr "" #: libraries/display_export.lib.php:137 -#, fuzzy #| msgid "Databases" msgid "Database(s):" -msgstr "Бази Даних" +msgstr "База(и) даних:" #: libraries/display_export.lib.php:139 -#, fuzzy #| msgid "Tables" msgid "Table(s):" -msgstr "Таблиць" +msgstr "Таблиця(ь):" #: libraries/display_export.lib.php:149 #, fuzzy @@ -4682,20 +4671,20 @@ msgstr "рядків з" #: libraries/display_tbl.lib.php:314 msgid "horizontal" -msgstr " горизонтально " +msgstr " горизонтальному" #: libraries/display_tbl.lib.php:315 msgid "horizontal (rotated headers)" -msgstr "горизонтально (rotated headers)" +msgstr "горизонтальному (повернуті заголовки)" #: libraries/display_tbl.lib.php:316 msgid "vertical" -msgstr " вертикально " +msgstr "вертикальному" #: libraries/display_tbl.lib.php:322 #, php-format msgid "in %s mode and repeat headers after %s cells" -msgstr "-го %s і дублювати заголовки через кожні %s рядків " +msgstr "в %s режимі і дублювати заголовки через кожні %s рядків " #: libraries/display_tbl.lib.php:510 msgid "Sort by key" @@ -5236,10 +5225,9 @@ msgid "(continued)" msgstr "" #: libraries/export/latex.php:15 -#, fuzzy #| msgid "Table structure for table" msgid "Structure of table @TABLE@" -msgstr "Структура таблиці" +msgstr "Структура таблиці @TABLE@" #: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 @@ -6373,8 +6361,8 @@ msgid "" "The SQL validator could not be initialized. Please check if you have " "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" -"Не можу запустити перевірку SQL. Прошу проконтролювати чи заінстальовано " -"необхідні php extensions як описано в %sдокументації%s." +"Не можу запустити перевірку SQL. Прошу проконтролювати чи інстальовані " +"необхідні PHP extensions як описано в %sдокументації%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" @@ -6459,8 +6447,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Немає опису для цього перетворення.<br />Прошу питатися автора, що робить %" -"s." +"Немає опису для цього перетворення.<br />Будь ласка запитайте автора, що " +"робить %s." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -6579,9 +6567,9 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Показує посилання, поле містить назву файлу. Перша опція - префікс " -"посилання, подібно до \"http://www.example.com/\". Друга опція - заголовок для " -"посилання." +"Показує картинку та посилання; поле містить назву файлу. Перша опція - " +"префікс посилання, подібно до \"http://www.example.com/\". Друга та третя " +"опції це відповідно висота та ширина в пікселях." #: libraries/transformations/text_plain__link.inc.php:9 #| msgid "" @@ -9278,10 +9266,9 @@ msgid "Empty the table (TRUNCATE)" msgstr "" #: tbl_operations.php:682 -#, fuzzy #| msgid "No databases" msgid "Delete the table (DROP)" -msgstr "БД відсутні" +msgstr "Видалити таюлицю (DROP)" #: tbl_operations.php:703 msgid "Partition maintenance" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-806-g92008fc
by Marc Delisle 15 Dec '10

15 Dec '10

The branch, master has been updated via 92008fc9b1677fada4c41bc89dc5a29e6f584684 (commit) via 3b7a23ca21988099e4f1a5e4d1832dfc4540e4fa (commit) from d33594fcb96520b9d9bf0be672d3b48ab72d9146 (commit) - Log ----------------------------------------------------------------- commit 92008fc9b1677fada4c41bc89dc5a29e6f584684 Author: Marc Delisle <marc(a)infomarc.info> Date: Wed Dec 15 13:26:33 2010 -0500 Avoid recreating a jQuery object Remove tab characters commit 3b7a23ca21988099e4f1a5e4d1832dfc4540e4fa Author: dylfin <dylfin(a)gmail.com> Date: Wed Dec 15 13:16:28 2010 -0500 Fix clear button Script was adapted to use jquery Fix input box for all browsers ----------------------------------------------------------------------- Summary of changes: js/navigation.js | 36 ++++++------------------ navigation.php | 2 +- themes/darkblue_orange/css/theme_right.css.php | 10 ++++-- themes/original/css/theme_left.css.php | 10 ++++-- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/js/navigation.js b/js/navigation.js index 280117f..ed6dcb1 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -141,36 +141,18 @@ function PMA_setCookie(name, value, expires, path, domain, secure) { /** * hide all LI elements with second A tag which doesn`t contain requested value * - * @param string value requested value + * @param string value requested value * */ function fast_filter(value){ - var oTarget = document.getElementById("subel0"); - if(!oTarget || !document.getElementById('fast_filter')) return false; - if(value!=document.getElementById('fast_filter').value) return false; - document.getElementById('fast_filter').disabled=true; - for(var iCh in oTarget.childNodes){ - var oCh = oTarget.childNodes.item(iCh); - if(!oCh) continue; - if(oCh.nodeName=="LI"){ - if(value=="") oCh.style.display=""; - else{ - var i=0; - for(var iA in oCh.childNodes){ - var oA = oCh.childNodes.item(iA); - if(!oA) continue; - if(oA.nodeName=="A"){ - if(i==0) i = 1; - else{ - if(oA.innerHTML.indexOf(value)==-1) oCh.style.display="none"; - else oCh.style.display=""; - } - } - } - } - } - } - document.getElementById('fast_filter').disabled=false; + $("#subel0 a[class!='tableicon']").each(function(idx,elem){ + $elem = $(elem); + if (value && $elem.html().indexOf(value) == -1) { + $elem.parent().hide(); + } else { + $elem.parent().show(); + } + }); } /** diff --git a/navigation.php b/navigation.php index d312a0c..fdb6502 100644 --- a/navigation.php +++ b/navigation.php @@ -289,8 +289,8 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { if ($table_count >= $GLOBALS['cfg']['LeftDisplayTableFilterMinimum']) { ?> <span id="NavFilter"> - <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" /> <span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span> + <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" /> </span> <?php } diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index e36f770..438e04d 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1402,14 +1402,16 @@ table#serverconnection_trg_local { color: black; cursor: pointer; padding: 0; - margin: 0; + margin: 3px 5px 0 -23px; position: relative; - right: 3ex; + float: right; } #fast_filter { - width: 85%; - padding: 0.1em; + width: 100%; + padding:2px 0px; + margin:0; + border:0; } /** * Validation error message styles diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 0fcaf21..9bb3c39 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -247,12 +247,14 @@ div#left_tableList ul ul { color: black; cursor: pointer; padding: 0; - margin: 0; + margin: 3px 5px 0 -23px; position: relative; - right: 3ex; + float: right; } #fast_filter { - width: 85%; - padding: 0.1em; + width: 100%; + padding:2px 0px; + margin:0; + border:0; } hooks/post-receive -- phpMyAdmin

1 0