- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1787-gaa38371
by Michal Čihař 06 Dec '10

06 Dec '10

The branch, master has been updated via aa38371c48976ef6e14581f3e189bf1632ba6cff (commit) via f392e8392186d33c97ce7d4e3a8fb0dfd2aefde4 (commit) via a6cf2972d3e585d39c562629fed23e3499c5ef37 (commit) via 01b1c82424018129285f4eec12598896e1fddcfc (commit) via 527d0e4ca20ed7ed29fd2093e066581cf91d90fb (commit) via c1f29b412ff3897662fab7d28fcca48ebf80d143 (commit) via e6914ceed5523aaad5e3f1a2719defee31c8eb14 (commit) via b25462bc8596726d76685924067406b61e29f055 (commit) via 011230e16efaa57074b7bb293eb873a27e0e5915 (commit) via fc4ea41b60d279dcf63fd8beac1d335e3c2cd32a (commit) via 1c6d0e099672c89682e5fbb9b935956ff9c9148b (commit) via 4f43e18cdaf598d70fd1f41ae4f6836724f4d15c (commit) via b649871c414bb590f9386de6ac1962ef455acbbd (commit) via c68cb18cda75a01be5a09f20c200df82da532b3b (commit) via 0974e9cfcec9ea83ca156124dc547ad279e73615 (commit) via 88918ec4bfcfb269a782cd829327631ce5fb9797 (commit) via 9de74c1950d290f42c6bea1af4e297278e5f7338 (commit) via f83f808c99ac9cda99a0777be5133dde2f5a92b8 (commit) via e327727569b630c69214ac08babf8c3dd94be28d (commit) via bde178d19bdaaf2d1736699a1e620f101f9c109e (commit) via 6ac46872f0a0f5d8b5cb73a5b91451426633db14 (commit) via ed90fae762c1c255b28f21ddc847c980d0f1abb8 (commit) via 9e8342f08b44203d81e72861beec85efe017532a (commit) via faa1ce310a5b03e3616c3e7b99731a80f29479f9 (commit) via 87e493632c898ca8bfea044fc98ac5c4016ced08 (commit) via 1f86c4801b555d9fafb64a7fda5a6421b8424805 (commit) via 85688e14bad9e8c2f012b313ac801aed7f9b9c27 (commit) via 15ef3645d4a911b28546fc63815fb7464ce65f88 (commit) via 11bce9f74d71645e10dfb3b302758c7dd4fdcfac (commit) via c30528c5f5d350208b06f85ae3204016c0431e2d (commit) via 545fd8329bc180ab84e79576aadc32ec3c338463 (commit) via 71de9933450c6c4f8323d813edfc062a38762994 (commit) via 0c484dd7cb7f4aef993eeed1ab86b35d2255ec78 (commit) via c122c53ac3633602eae0d6db7f8d1c3a026be0db (commit) via 9e6a96bc39907d5f385c2efcced2ee705924ea4c (commit) via b6fd4168ad6b33cbc571fecb14eb4619d6d6a9a3 (commit) via 3b27ece1a283c2c5b443d059f7c51d1668c89d9c (commit) via b9f339d545b97a88a69997141da0becd93ef1ca0 (commit) via d6b1f72a15ac2715ee5f58c4fc94da58f4201079 (commit) via 32150de3c4077a4479b9dafda31702843868c4d1 (commit) via dbbcd3db8a273b504febe276ac9ba29069675ce7 (commit) via 6187e7fc7fe48e1b640b69c3b9cab0be6ac5fc68 (commit) via 5e22fe3fcaf8b98202abdb4ddb15b549485ce954 (commit) via 402adca6ad62abc2702d10d377d57d9fd654ffee (commit) via 50b66866ac2666d390d8e595f407722db3fd7eb4 (commit) via b04141a0d2abf42c1163c6c6707cac0080d72ddb (commit) via b0f8ae0ab5c8d60328ac0a172ccb5add46bf5692 (commit) via 3338bf0f7af82c5dfc8cdc3396505c1681b11ff1 (commit) via a5397f1802a60adbea96219344227034a769676f (commit) via 92e3d50eb0b3d4b79d1f1da3cd5a055e4e963376 (commit) via 8c8f5f536df447242171aec2f9161d3c90c87f5a (commit) via 9d2efd8b334a83aac450ba1ca1edb6aa7fd368de (commit) via 8fad04af2ce6742e6989db8138bc8b12a75008a6 (commit) via 92ba230b72ad756ebb7b2a7e1ede75601d050b91 (commit) via be2e752f2ef3cc7ff5b527181243142c656db7b3 (commit) via 484419051bc8f11984f3a943b4877f97507e95f6 (commit) via c0a9f9abb3b60fc26fff47698a8bd9af78143b7d (commit) via ef0efc9d0de9a9a15d0f04bf58e16ebbd37b2655 (commit) via 695bcb31b703ed7fddc78b5081eb30ee17c82e34 (commit) via bb69f70a55b9b8b638043d195d8400343331d5c4 (commit) via cddac2910b52657f6c99f94f87db8c282742e11e (commit) via 265639ad6e3dbe1652678bca53ba5366c1ab4020 (commit) via 8633f5d36d0a19211221a4ae281c0111b70f0d88 (commit) via 8453fab5a63c5aa4e5272b86c1fdccb6452d6f23 (commit) via b36b3ae52cddce97718edc6be54abd2e6bd8b6b2 (commit) via 9878509e679c9090bf46b81898296a0cfc2f493b (commit) via eaa1cf1773fc0351fde2025737f2c590f0ed23ab (commit) via 9ddc20eacf35440c88dd5e8dba17af3b9adf136c (commit) via 9f357dc62952ccf14571c42f44e7a5ddf484eb0c (commit) via fea0aae1c7331f3f74eacf83ba876459a09a5750 (commit) via 5a26c7e6fdd320c6eaba944855281fb6c68176c6 (commit) via 6c0cef4fa02defad0af8c6dda4a867e03fefb8b0 (commit) via 7559800af616f2b1e1d91ee554e905d11b2c7ed1 (commit) via d8eaec6cec0cff2365eea4a517a9f6d33cff3b35 (commit) via f74cf3849f822ef7506d8320334fef7d3205a676 (commit) from e9e7c3b8050d86990a231ce5934c2f43f7b450e1 (commit) - Log ----------------------------------------------------------------- commit aa38371c48976ef6e14581f3e189bf1632ba6cff Merge: e9e7c3b8050d86990a231ce5934c2f43f7b450e1 f392e8392186d33c97ce7d4e3a8fb0dfd2aefde4 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Dec 6 09:50:04 2010 +0100 Merge remote branch 'pootle/master' Conflicts: po/el.po po/en_GB.po po/fr.po po/nl.po commit f392e8392186d33c97ce7d4e3a8fb0dfd2aefde4 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:35:49 2010 +0200 Translation update done using Pootle. commit a6cf2972d3e585d39c562629fed23e3499c5ef37 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:35:05 2010 +0200 Translation update done using Pootle. commit 01b1c82424018129285f4eec12598896e1fddcfc Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:33:58 2010 +0200 Translation update done using Pootle. commit 527d0e4ca20ed7ed29fd2093e066581cf91d90fb Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:33:46 2010 +0200 Translation update done using Pootle. commit c1f29b412ff3897662fab7d28fcca48ebf80d143 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:33:37 2010 +0200 Translation update done using Pootle. commit e6914ceed5523aaad5e3f1a2719defee31c8eb14 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:33:31 2010 +0200 Translation update done using Pootle. commit b25462bc8596726d76685924067406b61e29f055 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:33:22 2010 +0200 Translation update done using Pootle. commit 011230e16efaa57074b7bb293eb873a27e0e5915 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:33:09 2010 +0200 Translation update done using Pootle. commit fc4ea41b60d279dcf63fd8beac1d335e3c2cd32a Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:32:42 2010 +0200 Translation update done using Pootle. commit 1c6d0e099672c89682e5fbb9b935956ff9c9148b Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:31:57 2010 +0200 Translation update done using Pootle. commit 4f43e18cdaf598d70fd1f41ae4f6836724f4d15c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:31:20 2010 +0200 Translation update done using Pootle. commit b649871c414bb590f9386de6ac1962ef455acbbd Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:31:13 2010 +0200 Translation update done using Pootle. commit c68cb18cda75a01be5a09f20c200df82da532b3b Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:30:50 2010 +0200 Translation update done using Pootle. commit 0974e9cfcec9ea83ca156124dc547ad279e73615 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:30:38 2010 +0200 Translation update done using Pootle. commit 88918ec4bfcfb269a782cd829327631ce5fb9797 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:30:30 2010 +0200 Translation update done using Pootle. commit 9de74c1950d290f42c6bea1af4e297278e5f7338 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:30:18 2010 +0200 Translation update done using Pootle. commit f83f808c99ac9cda99a0777be5133dde2f5a92b8 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:30:00 2010 +0200 Translation update done using Pootle. commit e327727569b630c69214ac08babf8c3dd94be28d Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:29:37 2010 +0200 Translation update done using Pootle. commit bde178d19bdaaf2d1736699a1e620f101f9c109e Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:29:27 2010 +0200 Translation update done using Pootle. commit 6ac46872f0a0f5d8b5cb73a5b91451426633db14 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:27:11 2010 +0200 Translation update done using Pootle. commit ed90fae762c1c255b28f21ddc847c980d0f1abb8 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:26:56 2010 +0200 Translation update done using Pootle. commit 9e8342f08b44203d81e72861beec85efe017532a Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:26:37 2010 +0200 Translation update done using Pootle. commit faa1ce310a5b03e3616c3e7b99731a80f29479f9 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:25:59 2010 +0200 Translation update done using Pootle. commit 87e493632c898ca8bfea044fc98ac5c4016ced08 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:25:29 2010 +0200 Translation update done using Pootle. commit 1f86c4801b555d9fafb64a7fda5a6421b8424805 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:25:20 2010 +0200 Translation update done using Pootle. commit 85688e14bad9e8c2f012b313ac801aed7f9b9c27 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:25:00 2010 +0200 Translation update done using Pootle. commit 15ef3645d4a911b28546fc63815fb7464ce65f88 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:24:51 2010 +0200 Translation update done using Pootle. commit 11bce9f74d71645e10dfb3b302758c7dd4fdcfac Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:24:43 2010 +0200 Translation update done using Pootle. commit c30528c5f5d350208b06f85ae3204016c0431e2d Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:24:08 2010 +0200 Translation update done using Pootle. commit 545fd8329bc180ab84e79576aadc32ec3c338463 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:23:50 2010 +0200 Translation update done using Pootle. commit 71de9933450c6c4f8323d813edfc062a38762994 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:23:27 2010 +0200 Translation update done using Pootle. commit 0c484dd7cb7f4aef993eeed1ab86b35d2255ec78 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:23:11 2010 +0200 Translation update done using Pootle. commit c122c53ac3633602eae0d6db7f8d1c3a026be0db Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:23:01 2010 +0200 Translation update done using Pootle. commit 9e6a96bc39907d5f385c2efcced2ee705924ea4c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:22:37 2010 +0200 Translation update done using Pootle. commit b6fd4168ad6b33cbc571fecb14eb4619d6d6a9a3 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:22:23 2010 +0200 Translation update done using Pootle. commit 3b27ece1a283c2c5b443d059f7c51d1668c89d9c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:22:11 2010 +0200 Translation update done using Pootle. commit b9f339d545b97a88a69997141da0becd93ef1ca0 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:21:34 2010 +0200 Translation update done using Pootle. commit d6b1f72a15ac2715ee5f58c4fc94da58f4201079 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:21:29 2010 +0200 Translation update done using Pootle. commit 32150de3c4077a4479b9dafda31702843868c4d1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:15:49 2010 +0200 Translation update done using Pootle. commit dbbcd3db8a273b504febe276ac9ba29069675ce7 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:15:21 2010 +0200 Translation update done using Pootle. commit 6187e7fc7fe48e1b640b69c3b9cab0be6ac5fc68 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:15:04 2010 +0200 Translation update done using Pootle. commit 5e22fe3fcaf8b98202abdb4ddb15b549485ce954 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:14:22 2010 +0200 Translation update done using Pootle. commit 402adca6ad62abc2702d10d377d57d9fd654ffee Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:13:45 2010 +0200 Translation update done using Pootle. commit 50b66866ac2666d390d8e595f407722db3fd7eb4 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:13:26 2010 +0200 Translation update done using Pootle. commit b04141a0d2abf42c1163c6c6707cac0080d72ddb Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:10:24 2010 +0200 Translation update done using Pootle. commit b0f8ae0ab5c8d60328ac0a172ccb5add46bf5692 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:00:33 2010 +0200 Translation update done using Pootle. commit 3338bf0f7af82c5dfc8cdc3396505c1681b11ff1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 23:00:18 2010 +0200 Translation update done using Pootle. commit a5397f1802a60adbea96219344227034a769676f Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:58:16 2010 +0200 Translation update done using Pootle. commit 92e3d50eb0b3d4b79d1f1da3cd5a055e4e963376 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:47:23 2010 +0200 Translation update done using Pootle. commit 8c8f5f536df447242171aec2f9161d3c90c87f5a Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:46:54 2010 +0200 Translation update done using Pootle. commit 9d2efd8b334a83aac450ba1ca1edb6aa7fd368de Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:45:55 2010 +0200 Translation update done using Pootle. commit 8fad04af2ce6742e6989db8138bc8b12a75008a6 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:43:33 2010 +0200 Translation update done using Pootle. commit 92ba230b72ad756ebb7b2a7e1ede75601d050b91 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:41:29 2010 +0200 Translation update done using Pootle. commit be2e752f2ef3cc7ff5b527181243142c656db7b3 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:40:46 2010 +0200 Translation update done using Pootle. commit 484419051bc8f11984f3a943b4877f97507e95f6 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:39:29 2010 +0200 Translation update done using Pootle. commit c0a9f9abb3b60fc26fff47698a8bd9af78143b7d Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:39:06 2010 +0200 Translation update done using Pootle. commit ef0efc9d0de9a9a15d0f04bf58e16ebbd37b2655 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:38:48 2010 +0200 Translation update done using Pootle. commit 695bcb31b703ed7fddc78b5081eb30ee17c82e34 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:38:35 2010 +0200 Translation update done using Pootle. commit bb69f70a55b9b8b638043d195d8400343331d5c4 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:37:30 2010 +0200 Translation update done using Pootle. commit cddac2910b52657f6c99f94f87db8c282742e11e Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:36:05 2010 +0200 Translation update done using Pootle. commit 265639ad6e3dbe1652678bca53ba5366c1ab4020 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:35:15 2010 +0200 Translation update done using Pootle. commit 8633f5d36d0a19211221a4ae281c0111b70f0d88 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:34:56 2010 +0200 Translation update done using Pootle. commit 8453fab5a63c5aa4e5272b86c1fdccb6452d6f23 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:33:47 2010 +0200 Translation update done using Pootle. commit b36b3ae52cddce97718edc6be54abd2e6bd8b6b2 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:32:53 2010 +0200 Translation update done using Pootle. commit 9878509e679c9090bf46b81898296a0cfc2f493b Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 4 22:32:27 2010 +0200 Translation update done using Pootle. commit eaa1cf1773fc0351fde2025737f2c590f0ed23ab Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Sat Dec 4 17:14:07 2010 +0200 Translation update done using Pootle. commit 9ddc20eacf35440c88dd5e8dba17af3b9adf136c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Sat Dec 4 17:13:35 2010 +0200 Translation update done using Pootle. commit 9f357dc62952ccf14571c42f44e7a5ddf484eb0c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Sat Dec 4 17:13:10 2010 +0200 Translation update done using Pootle. commit fea0aae1c7331f3f74eacf83ba876459a09a5750 Merge: 5a26c7e6fdd320c6eaba944855281fb6c68176c6 d370730eff1b8e8e69369e54a51726a839058ba4 Author: Pootle server <pootle(a)cihar.com> Date: Sat Dec 4 14:40:07 2010 +0100 Merge remote branch 'origin/master' commit 5a26c7e6fdd320c6eaba944855281fb6c68176c6 Merge: 6c0cef4fa02defad0af8c6dda4a867e03fefb8b0 9d9d88b83f82a2026336f19140c23a313d75bd56 Author: Pootle server <pootle(a)cihar.com> Date: Sat Dec 4 12:40:22 2010 +0100 Merge remote branch 'origin/master' commit 6c0cef4fa02defad0af8c6dda4a867e03fefb8b0 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 3 19:38:05 2010 +0200 Translation update done using Pootle. commit 7559800af616f2b1e1d91ee554e905d11b2c7ed1 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 3 19:37:57 2010 +0200 Translation update done using Pootle. commit d8eaec6cec0cff2365eea4a517a9f6d33cff3b35 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 3 19:36:55 2010 +0200 Translation update done using Pootle. commit f74cf3849f822ef7506d8320334fef7d3205a676 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 3 19:36:18 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 11 ++-- po/en_GB.po | 13 ++--- po/fr.po | 11 ++-- po/nl.po | 158 +++++++++++++++++++++++++---------------------------------- 4 files changed, 83 insertions(+), 110 deletions(-) diff --git a/po/el.po b/po/el.po index 225e6c3..2dd0402 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-alpha3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-04 15:22+0100\n" -"PO-Revision-Date: 2010-11-27 01:15+0200\n" +"PO-Revision-Date: 2010-12-04 17:14+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -546,10 +546,10 @@ msgid "Delete" msgstr "Διαγραφή" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα" +msgstr "Διαγραφή ταιριασμάτων για τον πίνακα %s;" #: db_search.php:273 #, php-format @@ -6949,10 +6949,9 @@ msgid "Filter" msgstr "Φίλτρο" #: navigation.php:292 -#, fuzzy #| msgid "Alter table order by" msgid "filter tables by name" -msgstr "Αλλαγή ταξινόμησης Πίνακα κατά" +msgstr "φιλτράρισμα πινάκων κατά όνομα" #: navigation.php:293 setup/frames/index.inc.php:219 msgid "Clear" diff --git a/po/en_GB.po b/po/en_GB.po index c0fe2dd..945cb53 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-alpha3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-04 15:22+0100\n" -"PO-Revision-Date: 2010-11-26 12:01+0200\n" -"Last-Translator: Michal Čihař <michal(a)cihar.com>\n" +"PO-Revision-Date: 2010-12-03 19:38+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" @@ -546,10 +546,10 @@ msgid "Delete" msgstr "Delete" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Delete tracking data for this table" +msgstr "Delete the matches for the %s table?" #: db_search.php:273 #, php-format @@ -6845,10 +6845,9 @@ msgid "Filter" msgstr "Filter" #: navigation.php:292 -#, fuzzy #| msgid "table name" msgid "filter tables by name" -msgstr "table name" +msgstr "filter tables by name" #: navigation.php:293 setup/frames/index.inc.php:219 msgid "Clear" diff --git a/po/fr.po b/po/fr.po index da00f38..ab57797 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-alpha3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-04 15:22+0100\n" -"PO-Revision-Date: 2010-11-26 19:23+0200\n" +"PO-Revision-Date: 2010-12-03 19:36+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" @@ -547,10 +547,10 @@ msgid "Delete" msgstr "Effacer" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Supprimer les données de suivi de cette table" +msgstr "Supprimer de la table %s les occurences?" #: db_search.php:273 #, php-format @@ -6929,10 +6929,9 @@ msgid "Filter" msgstr "Filtre" #: navigation.php:292 -#, fuzzy #| msgid "Alter table order by" msgid "filter tables by name" -msgstr "Ordonner la table par" +msgstr "filtrer par nom de table" #: navigation.php:293 setup/frames/index.inc.php:219 msgid "Clear" diff --git a/po/nl.po b/po/nl.po index 5a8c030..795a5b5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-alpha3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-04 15:22+0100\n" -"PO-Revision-Date: 2010-12-03 17:10+0200\n" +"PO-Revision-Date: 2010-12-04 23:35+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" "MIME-Version: 1.0\n" @@ -945,7 +945,7 @@ msgstr "U staat op het punt een complete database te VERWIJDEREN!" #: js/messages.php:32 msgid "Dropping Event" -msgstr "" +msgstr "Gebeurtenis komt te vervallen" #: js/messages.php:33 msgid "Dropping Procedure" @@ -957,7 +957,7 @@ msgstr "Tracking data voor deze tabel wordt verwijderd" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Primaire sleutel/index wordt verwijderd" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1034,15 +1034,15 @@ msgstr "Bezig met verwerken" #: js/messages.php:65 msgid "Error in Processing Request" -msgstr "" +msgstr "Fout tijdens het verwerken van de opdracht" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Kolom komt te vervallen" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Primaire sleutel wordt toegevoegd" #: js/messages.php:68 libraries/relation.lib.php:81 pmd_general.php:388 #: pmd_general.php:545 pmd_general.php:593 pmd_general.php:669 @@ -1051,26 +1051,23 @@ msgid "OK" msgstr "Correct" #: js/messages.php:71 -#, fuzzy #| msgid "Rename database to" msgid "Renaming Databases" -msgstr "Hernoem database naar" +msgstr "Database hernoemen" #: js/messages.php:72 msgid "Reload Database" msgstr "Ververs database" #: js/messages.php:73 -#, fuzzy #| msgid "Copy database to" msgid "Copying Database" -msgstr "Kopieer database naar" +msgstr "Database kopiëren" #: js/messages.php:74 -#, fuzzy #| msgid "Charset" msgid "Changing Charset" -msgstr "Karakterset" +msgstr "Karakterset aanpassen" #: js/messages.php:75 msgid "Table must have at least one column" @@ -1120,7 +1117,7 @@ msgstr "Kies weer te geven veld" #: js/messages.php:98 msgid "Add an option for column " -msgstr "" +msgstr "Voeg een optie toe voor komom " #: js/messages.php:101 msgid "Generate password" @@ -1714,11 +1711,11 @@ msgstr "PBMS connectie mislukt:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS BLOB info ophalen mislukt" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "ophalen van BLOB Content-type mislukt" #: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1801,10 +1798,9 @@ msgid "Query execution time comparison (in microseconds)" msgstr "Vergelijking van query uitvoer tijden ( in microseconden)" #: libraries/chart.lib.php:83 -#, fuzzy #| msgid "Query results operations" msgid "Query results" -msgstr "Query resultaat bewerkingen" +msgstr "Query resultaten" #: libraries/chart.lib.php:109 msgid "No data found for the chart." @@ -1816,7 +1812,7 @@ msgstr "De GD-extensie is vereist voor het tonen van grafieken." #: libraries/chart.lib.php:252 msgid "JSON encoder is needed for chart tooltips." -msgstr "" +msgstr "JSON encoder vereist voor het tonen van zwevende tips bij een grafiek." #: libraries/common.inc.php:576 msgid "" @@ -1849,10 +1845,10 @@ msgstr "" "configuratiebestand!" #: libraries/common.inc.php:622 -#, fuzzy, php-format +#, php-format #| msgid "Invalid server index: \"%s\"" msgid "Invalid server index: %s" -msgstr "Ongeldige serverindex: \"%s\"" +msgstr "Ongeldige serverindex: %s" #: libraries/common.inc.php:629 #, php-format @@ -1910,10 +1906,9 @@ msgid "MySQL said: " msgstr "MySQL retourneerde: " #: libraries/common.lib.php:1071 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "Failed to connect to SQL validator!" -msgstr "Er kan geen verbinding worden gemaakt met de server" +msgstr "Er kan geen verbinding worden gemaakt met de SQL-validator" #: libraries/common.lib.php:1112 libraries/config/messages.inc.php:459 msgid "Explain SQL" @@ -2073,7 +2068,7 @@ msgstr "Handelingen" #: libraries/common.lib.php:2950 msgid "Browse your computer:" -msgstr "" +msgstr "Blader op uw eigen pc:" #: libraries/common.lib.php:2963 #, fuzzy, php-format @@ -2103,7 +2098,6 @@ msgstr "gegevens" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 -#, fuzzy #| msgid "Structure and data" msgid "structure and data" msgstr "Structuur en gegevens" @@ -2121,13 +2115,11 @@ msgid "Custom - like above, but without the quick/custom choice" msgstr "Uitgebreid - als bovenstaande maar zonder snel/uitgebreid keuze" #: libraries/config.values.php:119 -#, fuzzy #| msgid "Complete inserts" msgid "complete inserts" -msgstr "Invoegen voltooid" +msgstr "Volledige inserts " #: libraries/config.values.php:120 -#, fuzzy #| msgid "Extended inserts" msgid "extended inserts" msgstr "Uitgebreide invoegingen" @@ -2174,10 +2166,9 @@ msgstr "Ontbrekende data voor %s" #: libraries/config/FormDisplay.class.php:727 #: libraries/config/FormDisplay.class.php:731 -#, fuzzy #| msgid "Variable" msgid "unavailable" -msgstr "Variabelen" +msgstr "onbeschikbaar" #: libraries/config/FormDisplay.class.php:728 #: libraries/config/FormDisplay.class.php:732 @@ -2200,20 +2191,21 @@ msgid "SQL Validator is disabled" msgstr "" #: libraries/config/FormDisplay.class.php:764 -#, fuzzy #| msgid "PHP extension to use" msgid "SOAP extension not found" -msgstr "PHP-extensie" +msgstr "PHP SOAP-extensie niet gevonden" #: libraries/config/FormDisplay.class.php:772 -#, fuzzy, php-format +#, php-format #| msgid "Maximum tables" msgid "maximum %s" -msgstr "Maximum aantal tabellen" +msgstr "maximum %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" msgstr "" +"Deze instelling is uitgeschakeld, het is niet van toepassing op uw " +"configuratie" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:83 #: libraries/relation.lib.php:90 pmd_relation_new.php:68 @@ -2232,7 +2224,7 @@ msgstr "Herstel standaard waarde" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "Sta gebruikers toe deze waarde aan te passen" #: libraries/config/FormDisplay.tpl.php:332 #: libraries/schema/User_Schema.class.php:317 @@ -2265,10 +2257,14 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"Door deze optie in te schakelen is het toegestaan om phpMyAdmin vanuit een " +"pagina op een ander domein in een frame te openen. Een potentieel " +"[strong]beveiligingslek[/strong] wat cross-frame scripting aanvallen " +"mogelijk kan maken" #: libraries/config/messages.inc.php:20 msgid "Allow third party framing" -msgstr "" +msgstr "Framing van derden toestaan" #: libraries/config/messages.inc.php:21 msgid "Show "Drop database" link to normal users" @@ -2331,7 +2327,6 @@ msgstr "" "vullen." #: libraries/config/messages.inc.php:31 -#, fuzzy #| msgid "CHAR fields editing" msgid "CHAR columns editing" msgstr "CHAR velden bewerken" @@ -2388,23 +2383,24 @@ msgstr "Bevestig 'DROP'-queries" #: libraries/config/messages.inc.php:42 msgid "Debug SQL" -msgstr "" +msgstr "Debug SQL" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "Databases display options" msgid "Default display direction" -msgstr "Weergave opties voor databases" +msgstr "Standaard weergave richting" #: 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] of een getal dat aangeeft tot " +"hoeveel velden de verticale weergave moet worden toegepast" #: libraries/config/messages.inc.php:45 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "Weergave richting voor toevoegen/bewerken van kolommen" #: libraries/config/messages.inc.php:46 msgid "Tab that is displayed when entering a database" @@ -2431,10 +2427,9 @@ msgid "Default table tab" msgstr "Standaard tabel tabblad" #: libraries/config/messages.inc.php:52 -#, fuzzy #| msgid "Show binary contents as HEX" msgid "Show binary contents as HEX by default" -msgstr "Toon binaire-inhoud als HEX" +msgstr "Toon binaire-inhoud standaard als HEX" #: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" @@ -2458,7 +2453,7 @@ msgstr "Toon servers als een lijst" #: libraries/config/messages.inc.php:58 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Bewerk SQL-queries in popup venster" #: libraries/config/messages.inc.php:59 #, fuzzy @@ -2467,26 +2462,24 @@ msgid "Edit in window" msgstr "Bewerk volgende rij" #: libraries/config/messages.inc.php:60 -#, fuzzy #| msgid "Display Features" msgid "Display errors" -msgstr "Toon Opties" +msgstr "Toon foutmeldingen" #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Ignore errors" msgid "Gather errors" -msgstr "Negeer foutmeldingen" +msgstr "Verzamel foutmeldingen" #: libraries/config/messages.inc.php:62 msgid "Show icons for warning, error and information messages" msgstr "" +"Toon iconen voor waarschuwingen, foutmeldingen en informatieve berichten" #: libraries/config/messages.inc.php:63 -#, fuzzy #| msgid "Ignore errors" msgid "Iconic errors" -msgstr "Negeer foutmeldingen" +msgstr "Foutmeldingen met iconen" #: libraries/config/messages.inc.php:64 msgid "" @@ -2526,7 +2519,6 @@ msgstr "Compressie" #: libraries/export/latex.php:71 libraries/export/ods.php:24 #: libraries/export/odt.php:57 libraries/export/texytext.php:27 #: libraries/export/xls.php:24 libraries/export/xlsx.php:24 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Put columns names in the first row" msgstr "Plaats veldnamen in de eerste rij" @@ -2534,7 +2526,6 @@ msgstr "Plaats veldnamen in de eerste rij" #: libraries/config/messages.inc.php:71 libraries/config/messages.inc.php:236 #: libraries/config/messages.inc.php:243 libraries/import/csv.php:73 #: libraries/import/ldi.php:41 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed by" msgstr "Velden ingesloten door" @@ -2542,7 +2533,6 @@ msgstr "Velden ingesloten door" #: libraries/config/messages.inc.php:72 libraries/config/messages.inc.php:237 #: libraries/config/messages.inc.php:244 libraries/import/csv.php:77 #: libraries/import/ldi.php:42 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped by" msgstr "Velden ontweken door" @@ -2556,7 +2546,6 @@ msgid "Replace NULL by" msgstr "Vervang NULL door" #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:80 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove CRLF characters within columns" msgstr "Verwijder CRLF tekens uit veld-waarden" @@ -2564,10 +2553,9 @@ msgstr "Verwijder CRLF tekens uit veld-waarden" #: 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 "Regels beëindigd door" +msgstr "Velden beëindigd door" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:235 #: libraries/import/csv.php:81 libraries/import/ldi.php:43 @@ -2575,7 +2563,6 @@ msgid "Lines terminated by" msgstr "Regels beëindigd door" #: libraries/config/messages.inc.php:78 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition" msgstr "Excel editie" @@ -2630,10 +2617,9 @@ msgid "Relations" msgstr "Relaties" #: libraries/config/messages.inc.php:101 -#, fuzzy #| msgid "Export type" msgid "Export method" -msgstr "Export type" +msgstr "Export methode" #: libraries/config/messages.inc.php:110 libraries/config/messages.inc.php:112 msgid "Save on server" @@ -2686,10 +2672,9 @@ msgid "Maximal length of created query" msgstr "Maximale lengte van de gemaakte query" #: libraries/config/messages.inc.php:133 -#, fuzzy #| msgid "Export tables" msgid "Export type" -msgstr "Exporteer tabellen" +msgstr "Export type" #: libraries/config/messages.inc.php:134 libraries/export/sql.php:50 msgid "Enclose export in a transaction" @@ -2755,11 +2740,11 @@ msgstr "CSV gegevens" #: libraries/config/messages.inc.php:155 msgid "Developer" -msgstr "" +msgstr "Ontwikkelaar" #: libraries/config/messages.inc.php:156 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Instellingen voor phpMyAdmin ontwikkelaars" #: libraries/config/messages.inc.php:157 msgid "Edit mode" @@ -2783,14 +2768,13 @@ msgid "Features" msgstr "Opties" #: libraries/config/messages.inc.php:163 -#, fuzzy #| msgid "Generate" msgid "General" -msgstr "Genereer" +msgstr "Algemeen" #: libraries/config/messages.inc.php:164 msgid "Set some commonly used options" -msgstr "" +msgstr "Enkele veel gebruikte opties" #: libraries/config/messages.inc.php:165 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2850,13 +2834,12 @@ msgstr "Hoofdframe" #: libraries/config/messages.inc.php:181 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:183 -#, fuzzy #| msgid "Open Document Text" msgid "Open Document" -msgstr "Open Document Tekst" +msgstr "Open Document" #: libraries/config/messages.inc.php:185 msgid "Other core settings" @@ -2867,10 +2850,9 @@ msgid "Settings that didn't fit enywhere else" msgstr "Instellingen die onder geen andere categorie pasten" #: libraries/config/messages.inc.php:187 -#, fuzzy #| msgid "Page number:" msgid "Page titles" -msgstr "Paginanummer:" +msgstr "Paginatitels" #: libraries/config/messages.inc.php:188 msgid "" @@ -2907,16 +2889,14 @@ msgid "Basic settings" msgstr "Basis instellingen" #: libraries/config/messages.inc.php:194 -#, fuzzy #| msgid "Authentication type" msgid "Authentication" -msgstr "Authenticatie type" +msgstr "Authenticatie" #: libraries/config/messages.inc.php:195 -#, fuzzy #| msgid "Authentication type" msgid "Authentication settings" -msgstr "Authenticatie type" +msgstr "Authenticatie instellingen" #: libraries/config/messages.inc.php:196 msgid "Server configuration" @@ -2935,13 +2915,11 @@ msgid "Enter server connection parameters" msgstr "Geef de server verbindingsparameters" #: libraries/config/messages.inc.php:199 -#, fuzzy #| msgid "Configuration: %s" msgid "Configuration storage" -msgstr "Configuratie: %s" +msgstr "Configuratie opslag" #: libraries/config/messages.inc.php:200 -#, fuzzy #| msgid "" #| "Configure phpMyAdmin database to gain access to additional features, see " #| "[a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] " @@ -2951,16 +2929,15 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" -"Configureer de phpMyAdmin database om toegang te krijgen tot extra " -"functionaliteit, zie [a@../Documentation.html#linked-tables]linked-tables " -"infrastructure[/a] in de documentatie" +"Configureer de phpMyAdmin configuratie opslag om toegang te krijgen tot " +"extra functionaliteit, zie [a@../Documentation.html#linked-tables]phpMyAdmin " +"configuratie opslag[/a] in de documentatie" #: libraries/config/messages.inc.php:201 msgid "Changes tracking" msgstr "Wijzigingen bijhouden" #: libraries/config/messages.inc.php:202 -#, fuzzy #| msgid "" #| "Tracking of changes made in database. Requires configured PMA database." msgid "" @@ -2968,7 +2945,7 @@ msgid "" "storage." msgstr "" "Bijhouden van wijzigingen in de database. Dit vereist een geconfigureerde " -"PMA database." +"phpMyAdmin configuratie opslag." #: libraries/config/messages.inc.php:203 msgid "Customize export options" @@ -6923,7 +6900,6 @@ msgstr "" "toegepast." #: libraries/transformations/text_plain__imagelink.inc.php:9 -#, fuzzy #| msgid "" #| "Displays an image and a link; the field contains the filename. The first " #| "option is a URL prefix like \"http://www.example.com/\". The second and " @@ -6934,11 +6910,10 @@ msgid "" "third options are the width and the height in pixels." msgstr "" "Toont een plaatje en een link, het veld bevat de bestandsnaam. De eerste " -"optie is een prefix als \"http://domein.com/\", de tweede optie is de " +"optie is een prefix als \"http://www.example.com/\", de tweede optie is de " "breedte in pixels, de derde is de hoogte." #: libraries/transformations/text_plain__link.inc.php:9 -#, fuzzy #| msgid "" #| "Displays a link; the field contains the filename. The first option is a " #| "URL prefix like \"http://www.example.com/\". The second option is a title " @@ -6949,7 +6924,8 @@ msgid "" "the link." msgstr "" "Toont een link, het veld bevat de bestandsnaam. De eerste optie is een " -"prefix als \"http://domein.com/\", de tweede optie is de titel voor de link." +"prefix als \"http://www.example.com/\", de tweede optie is de titel voor de " +"link." #: libraries/transformations/text_plain__longToIpv4.inc.php:9 #, fuzzy @@ -7136,7 +7112,6 @@ msgstr "" "eerder dan in phpMyAdmin is ingesteld." #: main.php:279 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime(a)]session.gc_maxlifetime[/a] is lower that " @@ -7146,10 +7121,11 @@ msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" -"De PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime(a)]session.gc_maxlifetime[/a] is lager dan de " -"ingestelde cookie geldigheid in phpMyAdmin. Hierdoor verloopt uw sessie " -"eerder dan in phpMyAdmin is ingesteld." +"De PHP parameter " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime(a)]session.gc_maxlifetime[/a] is lager dan de ingestelde cookie " +"geldigheid in phpMyAdmin. Hierdoor verloopt uw sessie eerder dan in " +"phpMyAdmin is ingesteld." #: main.php:287 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1712-ge9e7c3b
by Marc Delisle 05 Dec '10

05 Dec '10

The branch, master has been updated via e9e7c3b8050d86990a231ce5934c2f43f7b450e1 (commit) from 2d68ee897442173789e6254d435c6d7195d239f3 (commit) - Log ----------------------------------------------------------------- commit e9e7c3b8050d86990a231ce5934c2f43f7b450e1 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 5 07:33:39 2010 -0500 clarify comments and variable names ----------------------------------------------------------------------- Summary of changes: libraries/File.class.php | 60 +++++++++++++++++++++++----------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libraries/File.class.php b/libraries/File.class.php index 83f5d14..2c59179 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -259,11 +259,11 @@ class PMA_File * @uses curl_setopt_array() * @uses PMA_File::$_error_message * @uses $_FILES - * @param string $key a numeric key used to identify the different rows - * @param string $primary_key + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ - function setUploadedFromTblChangeRequest($key, $primary = null) + function setUploadedFromTblChangeRequest($key, $rownumber = null) { if (! isset($_FILES['fields_upload_' . $key])) { return false; @@ -271,8 +271,8 @@ class PMA_File $file = $_FILES['fields_upload_' . $key]; - if (null !== $primary) { - $file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($file, $primary); + if (null !== $rownumber) { + $file = PMA_File::fetchUploadedFromTblChangeRequestMultiple($file, $rownumber); } // for blobstreaming @@ -340,11 +340,11 @@ class PMA_File * strips some dimension from the multi-dimensional array from $_FILES * * <code> - * $file['name']['multi_edit'][$primary] = [value] - * $file['type']['multi_edit'][$primary] = [value] - * $file['size']['multi_edit'][$primary] = [value] - * $file['tmp_name']['multi_edit'][$primary] = [value] - * $file['error']['multi_edit'][$primary] = [value] + * $file['name']['multi_edit'][$rownumber] = [value] + * $file['type']['multi_edit'][$rownumber] = [value] + * $file['size']['multi_edit'][$rownumber] = [value] + * $file['tmp_name']['multi_edit'][$rownumber] = [value] + * $file['error']['multi_edit'][$rownumber] = [value] * * // becomes: * @@ -359,17 +359,17 @@ class PMA_File * @access public * @static * @param array $file the array - * @param string $primary + * @param string $rownumber * @return array */ - function fetchUploadedFromTblChangeRequestMultiple($file, $primary) + function fetchUploadedFromTblChangeRequestMultiple($file, $rownumber) { $new_file = array( - 'name' => $file['name']['multi_edit'][$primary], - 'type' => $file['type']['multi_edit'][$primary], - 'size' => $file['size']['multi_edit'][$primary], - 'tmp_name' => $file['tmp_name']['multi_edit'][$primary], - 'error' => $file['error']['multi_edit'][$primary], + 'name' => $file['name']['multi_edit'][$rownumber], + 'type' => $file['type']['multi_edit'][$rownumber], + 'size' => $file['size']['multi_edit'][$rownumber], + 'tmp_name' => $file['tmp_name']['multi_edit'][$rownumber], + 'error' => $file['error']['multi_edit'][$rownumber], ); return $new_file; @@ -382,15 +382,15 @@ class PMA_File * @uses $_REQUEST * @uses PMA_File::setLocalSelectedFile() * @uses is_string() - * @param string $key a numeric key used to identify the different rows - * @param string $primary_key + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ - function setSelectedFromTblChangeRequest($key, $primary = null) + function setSelectedFromTblChangeRequest($key, $rownumber = null) { - if (null !== $primary) { - if (! empty($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary]) - && is_string($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary])) { + if (null !== $rownumber) { + if (! empty($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$rownumber]) + && is_string($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$rownumber])) { // ... whether with multiple rows ... // for blobstreaming $is_bs_upload = FALSE; @@ -404,7 +404,7 @@ class PMA_File if ($is_bs_upload) { $bs_db = $_REQUEST['db']; $bs_table = $_REQUEST['table']; - $tmp_filename = $GLOBALS['cfg']['UploadDir'] . '/' . $_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary]; + $tmp_filename = $GLOBALS['cfg']['UploadDir'] . '/' . $_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$rownumber]; // check if fileinfo library exists if ($PMA_Config->get('FILEINFO_EXISTS')) { @@ -434,7 +434,7 @@ class PMA_File PMA_File::setRecentBLOBReference($blob_url); } // end if ($is_bs_upload) - return $this->setLocalSelectedFile($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary]); + return $this->setLocalSelectedFile($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$rownumber]); } else { return false; } @@ -515,13 +515,13 @@ class PMA_File * @access public * @uses PMA_File::setUploadedFromTblChangeRequest() * @uses PMA_File::setSelectedFromTblChangeRequest() - * @param string $key a numeric key used to identify the different rows - * @param string $primary_key + * @param string $key the md5 hash of the column name + * @param string $rownumber * @return boolean success */ - function checkTblChangeForm($key, $primary_key) + function checkTblChangeForm($key, $rownumber) { - if ($this->setUploadedFromTblChangeRequest($key, $primary_key)) { + if ($this->setUploadedFromTblChangeRequest($key, $rownumber)) { // well done ... $this->_error_message = ''; return true; @@ -531,7 +531,7 @@ class PMA_File $this->_error_message = ''; return true; */ - } elseif ($this->setSelectedFromTblChangeRequest($key, $primary_key)) { + } elseif ($this->setSelectedFromTblChangeRequest($key, $rownumber)) { // well done ... $this->_error_message = ''; return true; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1711-g2d68ee8
by Marc Delisle 05 Dec '10

05 Dec '10

The branch, master has been updated via 2d68ee897442173789e6254d435c6d7195d239f3 (commit) from cc7fe02f3020a90f4ab6aea177879a621a3662fa (commit) - Log ----------------------------------------------------------------- commit 2d68ee897442173789e6254d435c6d7195d239f3 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 5 07:14:52 2010 -0500 clarify variable name ----------------------------------------------------------------------- Summary of changes: libraries/tbl_replace_fields.inc.php | 6 +++--- tbl_replace.php | 34 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index 824d5bc..935587d 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -46,7 +46,7 @@ require_once './libraries/common.inc.php'; require_once './libraries/File.class.php'; $file_to_insert = new PMA_File(); -$file_to_insert->checkTblChangeForm($key, $rowcount); +$file_to_insert->checkTblChangeForm($key, $rownumber); $possibly_uploaded_val = $file_to_insert->getContent(); @@ -81,8 +81,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'][$rowcount])) { - $val = implode(',', $_REQUEST[$f]['multi_edit'][$rowcount]); + if (! empty($_REQUEST[$f]['multi_edit'][$rownumber])) { + $val = implode(',', $_REQUEST[$f]['multi_edit'][$rownumber]); $val = "'" . PMA_sqlAddslashes($val) . "'"; } break; diff --git a/tbl_replace.php b/tbl_replace.php index 7a6ff26..f7371ec 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -167,7 +167,7 @@ $func_no_param = array( 'CURRENT_USER', ); -foreach ($loop_array as $rowcount => $where_clause) { +foreach ($loop_array as $rownumber => $where_clause) { // skip fields to be ignored if (! $using_key && isset($_REQUEST['insert_ignore_' . $where_clause])) { continue; @@ -178,36 +178,36 @@ foreach ($loop_array as $rowcount => $where_clause) { // Map multi-edit keys to single-level arrays, dependent on how we got the fields $me_fields = - isset($_REQUEST['fields']['multi_edit'][$rowcount]) - ? $_REQUEST['fields']['multi_edit'][$rowcount] + isset($_REQUEST['fields']['multi_edit'][$rownumber]) + ? $_REQUEST['fields']['multi_edit'][$rownumber] : array(); $me_fields_name = - isset($_REQUEST['fields_name']['multi_edit'][$rowcount]) - ? $_REQUEST['fields_name']['multi_edit'][$rowcount] + isset($_REQUEST['fields_name']['multi_edit'][$rownumber]) + ? $_REQUEST['fields_name']['multi_edit'][$rownumber] : null; $me_fields_prev = - isset($_REQUEST['fields_prev']['multi_edit'][$rowcount]) - ? $_REQUEST['fields_prev']['multi_edit'][$rowcount] + isset($_REQUEST['fields_prev']['multi_edit'][$rownumber]) + ? $_REQUEST['fields_prev']['multi_edit'][$rownumber] : null; $me_funcs = - isset($_REQUEST['funcs']['multi_edit'][$rowcount]) - ? $_REQUEST['funcs']['multi_edit'][$rowcount] + isset($_REQUEST['funcs']['multi_edit'][$rownumber]) + ? $_REQUEST['funcs']['multi_edit'][$rownumber] : null; $me_fields_type = - isset($_REQUEST['fields_type']['multi_edit'][$rowcount]) - ? $_REQUEST['fields_type']['multi_edit'][$rowcount] + isset($_REQUEST['fields_type']['multi_edit'][$rownumber]) + ? $_REQUEST['fields_type']['multi_edit'][$rownumber] : null; $me_fields_null = - isset($_REQUEST['fields_null']['multi_edit'][$rowcount]) - ? $_REQUEST['fields_null']['multi_edit'][$rowcount] + isset($_REQUEST['fields_null']['multi_edit'][$rownumber]) + ? $_REQUEST['fields_null']['multi_edit'][$rownumber] : null; $me_fields_null_prev = - isset($_REQUEST['fields_null_prev']['multi_edit'][$rowcount]) - ? $_REQUEST['fields_null_prev']['multi_edit'][$rowcount] + isset($_REQUEST['fields_null_prev']['multi_edit'][$rownumber]) + ? $_REQUEST['fields_null_prev']['multi_edit'][$rownumber] : null; $me_auto_increment = - isset($_REQUEST['auto_increment']['multi_edit'][$rowcount]) - ? $_REQUEST['auto_increment']['multi_edit'][$rowcount] + isset($_REQUEST['auto_increment']['multi_edit'][$rownumber]) + ? $_REQUEST['auto_increment']['multi_edit'][$rownumber] : null; // Fetch the current values of a row to use in case we have a protected field hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1708-gd370730
by Dieter Adriaenssens 04 Dec '10

04 Dec '10

The branch, master has been updated via d370730eff1b8e8e69369e54a51726a839058ba4 (commit) from 621d851c5f0dcf063af2120f8984773e580d7a84 (commit) - Log ----------------------------------------------------------------- commit d370730eff1b8e8e69369e54a51726a839058ba4 Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: Sat Dec 4 14:13:51 2010 +0100 bug #3119874, Show integers without decimals on status page ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_status.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a44159..55cbb7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ - patch #3112792 [navi] Left panel table grouping incorrect, thanks to garas - garas - bug #3123433 [interface] Avoid double escaping of MySQL errors. +- bug #3119874 [interface] Show integers without decimals on status page. 3.3.9.0 (not yet released) - bug [doc] Fix references to MySQL doc diff --git a/server_status.php b/server_status.php index 520bb51..de68965 100644 --- a/server_status.php +++ b/server_status.php @@ -793,7 +793,7 @@ if (! empty($section['title'])) { if ('%' === substr($name, -1, 1)) { echo PMA_formatNumber($value, 0, 2) . ' %'; } elseif (is_numeric($value) && $value == (int) $value) { - echo PMA_formatNumber($value, 3, 1); + echo PMA_formatNumber($value, 4, 0); } elseif (is_numeric($value)) { echo PMA_formatNumber($value, 3, 1); } else { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1707-g621d851
by Marc Delisle 04 Dec '10

04 Dec '10

The branch, master has been updated via 621d851c5f0dcf063af2120f8984773e580d7a84 (commit) from 79f320e95104ba4017d1ad78b81c3964c7df4871 (commit) - Log ----------------------------------------------------------------- commit 621d851c5f0dcf063af2120f8984773e580d7a84 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 4 07:02:06 2010 -0500 zend.ze1_compatibility_mode removed in PHP 5.3 ----------------------------------------------------------------------- Summary of changes: libraries/common.inc.php | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index dda4b95..1a140bb 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -57,20 +57,25 @@ require './libraries/Error_Handler.class.php'; $GLOBALS['error_handler'] = new PMA_Error_Handler(); $cfg['Error_Handler']['display'] = TRUE; -// at this point PMA_PHP_INT_VERSION is not yet defined -if (version_compare(phpversion(), '6', 'lt')) { +/* + * This setting was removed in PHP 5.3. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.3', 'lt')) { /** * Avoid object cloning errors */ @ini_set('zend.ze1_compatibility_mode', false); - - /** - * Avoid problems with magic_quotes_runtime - */ - @ini_set('magic_quotes_runtime', false); } /** + * Avoid problems with magic_quotes_runtime + * (in the future, this setting will be removed but it's not yet + * known in which PHP version) + */ +@ini_set('magic_quotes_runtime', false); + +/** * for verification in all procedural scripts under libraries */ define('PHPMYADMIN', true); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1706-g79f320e
by Marc Delisle 04 Dec '10

04 Dec '10

The branch, master has been updated via 79f320e95104ba4017d1ad78b81c3964c7df4871 (commit) from 9d9d88b83f82a2026336f19140c23a313d75bd56 (commit) - Log ----------------------------------------------------------------- commit 79f320e95104ba4017d1ad78b81c3964c7df4871 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 4 06:41:10 2010 -0500 remove author names ----------------------------------------------------------------------- Summary of changes: db_qbe.php | 4 ++-- libraries/common.inc.php | 2 -- libraries/common.lib.php | 4 ---- libraries/ip_allow_deny.lib.php | 2 +- libraries/sqlparser.lib.php | 4 ---- tbl_alter.php | 1 - 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/db_qbe.php b/db_qbe.php index f4f4e85..ea95884 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -246,7 +246,7 @@ for ($x = 0; $x < $col; $x++) { // If they have chosen all fields using the * selector, // then sorting is not available - // Robbat2 - Fix for Bug #570698 + // Fix for Bug #570698 if (isset($Sort[$x]) && isset($Field[$x]) && substr($Field[$x], -2) == '.*') { $Sort[$x] = ''; @@ -936,7 +936,7 @@ for ($x = 0; $x < $col; $x++) { if (!empty($curField[$x]) && !empty($curSort[$x])) { // if they have chosen all fields using the * selector, // then sorting is not available - // Robbat2 - Fix for Bug #570698 + // Fix for Bug #570698 if (substr($curField[$x], -2) != '.*') { $qry_orderby .= $curField[$x] . ' ' . $curSort[$x]; $last_orderby = 1; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index e4ce8c8..dda4b95 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -731,7 +731,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { /** * Lookup server by name - * by Arnold - Helder Hosting * (see FAQ 4.8) */ if (! empty($_REQUEST['server']) && is_string($_REQUEST['server']) @@ -838,7 +837,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { // Based on mod_access in Apache: // http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.… // Look at: "static int check_dir_access(request_rec *r)" - // Robbat2 - May 10, 2002 if (isset($cfg['Server']['AllowDeny']) && isset($cfg['Server']['AllowDeny']['order'])) { diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ca99014..6bfb7c7 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -557,8 +557,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '', } // --- Added to solve bug #641765 - // Robbat2 - 12 January 2003, 9:46PM - // Revised, Robbat2 - 13 January 2003, 2:59PM if (!function_exists('PMA_SQP_isError') || PMA_SQP_isError()) { $formatted_sql = htmlspecialchars($the_query); } elseif (empty($the_query) || trim($the_query) == '') { @@ -578,8 +576,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '', // username/password if (!empty($the_query) && !strstr($the_query, 'connect')) { // --- Added to solve bug #641765 - // Robbat2 - 12 January 2003, 9:46PM - // Revised, Robbat2 - 13 January 2003, 2:59PM if (function_exists('PMA_SQP_isError') && PMA_SQP_isError()) { $error_msg_output .= PMA_SQP_getErrorString() . "\n"; $error_msg_output .= ' ' . "\n"; diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php index 69cab18..30bce24 100644 --- a/libraries/ip_allow_deny.lib.php +++ b/libraries/ip_allow_deny.lib.php @@ -46,7 +46,7 @@ function PMA_getIp() * Based on IP Pattern Matcher * Originally by J.Adams <jna(a)retina.net> * Found on <http://www.php.net/manual/en/function.ip2long.php> - * Modified by Robbat2 <robbat2(a)users.sourceforge.net> + * Modified for phpMyAdmin * * Matches: * xxx.xxx.xxx.xxx (exact) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index a9568c4..a6676e4 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -86,7 +86,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @access public */ - // Added, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_resetError() { global $SQP_errorString; @@ -101,7 +100,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @access public */ - // Added, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_getErrorString() { global $SQP_errorString; @@ -115,7 +113,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * * @access public */ - // Added, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_isError() { global $SQP_errorString; @@ -131,7 +128,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { * @access private * @scope SQL Parser internal */ - // Revised, Robbat2 - 13 Janurary 2003, 2:59PM function PMA_SQP_throwError($message, $sql) { global $SQP_errorString; diff --git a/tbl_alter.php b/tbl_alter.php index ba8c048..b7ab440 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -92,7 +92,6 @@ if (isset($_REQUEST['do_save_data'])) { // To allow replication, we first select the db to use and then run queries // on this db. PMA_DBI_select_db($db) or PMA_mysqlDie(PMA_DBI_getError(), 'USE ' . PMA_backquote($db) . ';', '', $err_url); - // Optimization fix - 2 May 2001 - Robbat2 $sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' ' . implode(', ', $changes) . $key_query; $result = PMA_DBI_try_query($sql_query); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1705-g9d9d88b
by Marc Delisle 04 Dec '10

04 Dec '10

The branch, master has been updated via 9d9d88b83f82a2026336f19140c23a313d75bd56 (commit) from c6d051b65e28b07b5b7980eac29616d3932f360c (commit) - Log ----------------------------------------------------------------- commit 9d9d88b83f82a2026336f19140c23a313d75bd56 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 4 06:35:55 2010 -0500 bug #3119937 cannot upload into a BLOB ----------------------------------------------------------------------- Summary of changes: js/tbl_change.js | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/js/tbl_change.js b/js/tbl_change.js index dc1632a..758add1 100644 --- a/js/tbl_change.js +++ b/js/tbl_change.js @@ -276,8 +276,24 @@ $(document).ready(function() { * Submission of data to be inserted or updated * * @uses PMA_ajaxShowMessage() + * + * This section has been deactivated. Here are the problems that I've + * noticed: + * + * 1. If the form contains a file upload field, the data does not reach + * tbl_replace.php. This is because AJAX does not support file upload. + * As a workaround I tried jquery.form.js version 2.49. The file + * upload worked but afterwards the browser presented a tbl_replace.php + * file and a choice to open or save. + * + * 2. This code can be called if we are editing or inserting. If editing, + * the "and then" action can be "go back to this page" or "edit next + * row", in which cases it makes sense to use AJAX. But the "go back + * to previous page" and "insert another new row" actions, using AJAX + * has no obvious advantage. If inserting, the "go back to previous" + * action needs a page refresh anyway. */ - $("#insertForm").live('submit', function(event) { + $("#insertFormDEACTIVATED").live('submit', function(event) { /** * @var the_form Object referring to the insertion form hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1704-gc6d051b
by Michal Čihař 03 Dec '10

03 Dec '10

The branch, master has been updated via c6d051b65e28b07b5b7980eac29616d3932f360c (commit) via 1adb0bff4c883f9a1378eacd0affb0489c719f30 (commit) via 11e9cd28787adb00bb0a10219730eb747629bcf2 (commit) via c3b120c67abe3e89ab975c378a41263b6210bec2 (commit) via 5d7ed1900a2327959372209b2fda63f977d6bbc9 (commit) via 8f2902975a44d20d68a5678faf61c38d3d0256c3 (commit) via 1b66fcb9d3d5995812672db084c30f6045c447cf (commit) via 4038ceb61d3b5ab703b15b2a9a0f4e167fa453f2 (commit) via 4d8a177a35963f0a9e198fcc6e2a697c6f7e306b (commit) via 5c0d01504a25afa3608570c344500ef9814f7959 (commit) via f4f9c7f5f197ca7390a2d611b827019c1a774a28 (commit) via 244f7404ecb32f70d3ed7273c1d0a616f44c0306 (commit) via 35eeceec1eac29463c185ad4b74e33efa9608a96 (commit) via 72d36016a665be839f378daadcf261eb4f3cdcc8 (commit) via 47efc58805c1f8844ac36374f801d658348f123d (commit) via fed83679737c95f8dc2042711fda12994dd3bb94 (commit) via 254b2b468869c247835d474901294b0ae0f0b3aa (commit) via d898063b5fa841cb77f7a3db66680858ae852bff (commit) via d423c0a2a6f4a03276e73dad392e0a0a075b166a (commit) via 5b76c658e0fe838bc822d062d64f64939c2f2e63 (commit) via 462fd3dc8d47fd16da1e3a508c2a94379f748330 (commit) via d4e3c3c6530341334a7128d4c9303ae4d1c39248 (commit) via d1ae2fe6264856b94eb8daa8cf646320d48da686 (commit) via e06fdf3c3e088c108ca64ae7eaff35469518f937 (commit) via 3364be836af6fda59050ada0158dcba9b6f96a6a (commit) via 4af93e3d0184fb92bbf885f1f5980ebef6a12471 (commit) via 04ba897a836b5ad73076c223b2d061df5ed45569 (commit) via e66a44534e94551142bf87d7bdc2f36c2a39eb4b (commit) via 4093abb7e4fdbd0d7dc777c16fa3f6916b5d33a0 (commit) via 1d13802c96c60f026cf772a27eb17775fa082c91 (commit) via 4a3cf746ebcd3f4707e513fde43c1132b34de433 (commit) via ac9bd7a52161235879b0bd0a193f69b4e765d6d9 (commit) via be570ade164539c64bf8bcbaac480867d51eb8ff (commit) via 596a0bd93f8f76aaadc8a7fdbd7ee45b7d7ddc34 (commit) via aedab73c8ed7e32a0302d98ea32c9830c4a513e4 (commit) via bf47a17ae0edc12eb3d65f95ae4e205c56464de8 (commit) via bedc06ce34c1a0ea709224cbe20e382b32ddfdae (commit) via 88e531080e32939e0d960d4734ac3e945d34e2df (commit) via 8141f8b06c6e27b63f4f2a8096b216219a9c16a4 (commit) via 3cec86bad3893f904c8a83b30ec546df49c063f0 (commit) via fbdce1513fc81e5c0d8fb5f4224bfb53d6ecfe4e (commit) via 25e717fe6a9d4547d4a36efa6f2a110dce89fac7 (commit) via b0f629a04d79b4969bc98d5e5ee994a9e2d91872 (commit) via a5609ea827ff1d85c7fc627da8271c23b042d9fc (commit) via ded1fe485855d8249aa01e0ea5703722a8fd8dc6 (commit) via 18a533ab2beec8a6cc8c740f4a9488bb266e0dd4 (commit) via c566faf3faf7e8ea7c4ef039a4fa0910d563496f (commit) via a3631a19255d78b68c4e58f6d89a87736cf13c58 (commit) via a4cf1cecd2c29dd2b29a5f010542aa22ad4bbd57 (commit) via 4d3089c8154c3ab3abc031f08f77c2c51962ed65 (commit) from e6704b5fa60fa61d74c900024f7fec72511a3a9e (commit) - Log ----------------------------------------------------------------- commit c6d051b65e28b07b5b7980eac29616d3932f360c Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:10:30 2010 +0200 Translation update done using Pootle. commit 1adb0bff4c883f9a1378eacd0affb0489c719f30 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:10:18 2010 +0200 Translation update done using Pootle. commit 11e9cd28787adb00bb0a10219730eb747629bcf2 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:09:55 2010 +0200 Translation update done using Pootle. commit c3b120c67abe3e89ab975c378a41263b6210bec2 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:09:11 2010 +0200 Translation update done using Pootle. commit 5d7ed1900a2327959372209b2fda63f977d6bbc9 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:08:46 2010 +0200 Translation update done using Pootle. commit 8f2902975a44d20d68a5678faf61c38d3d0256c3 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:08:07 2010 +0200 Translation update done using Pootle. commit 1b66fcb9d3d5995812672db084c30f6045c447cf Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:07:42 2010 +0200 Translation update done using Pootle. commit 4038ceb61d3b5ab703b15b2a9a0f4e167fa453f2 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:07:14 2010 +0200 Translation update done using Pootle. commit 4d8a177a35963f0a9e198fcc6e2a697c6f7e306b Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:05:43 2010 +0200 Translation update done using Pootle. commit 5c0d01504a25afa3608570c344500ef9814f7959 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:02:15 2010 +0200 Translation update done using Pootle. commit f4f9c7f5f197ca7390a2d611b827019c1a774a28 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:01:57 2010 +0200 Translation update done using Pootle. commit 244f7404ecb32f70d3ed7273c1d0a616f44c0306 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 17:01:13 2010 +0200 Translation update done using Pootle. commit 35eeceec1eac29463c185ad4b74e33efa9608a96 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:59:35 2010 +0200 Translation update done using Pootle. commit 72d36016a665be839f378daadcf261eb4f3cdcc8 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:58:39 2010 +0200 Translation update done using Pootle. commit 47efc58805c1f8844ac36374f801d658348f123d Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:58:11 2010 +0200 Translation update done using Pootle. commit fed83679737c95f8dc2042711fda12994dd3bb94 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:57:26 2010 +0200 Translation update done using Pootle. commit 254b2b468869c247835d474901294b0ae0f0b3aa Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:56:06 2010 +0200 Translation update done using Pootle. commit d898063b5fa841cb77f7a3db66680858ae852bff Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:55:11 2010 +0200 Translation update done using Pootle. commit d423c0a2a6f4a03276e73dad392e0a0a075b166a Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:54:38 2010 +0200 Translation update done using Pootle. commit 5b76c658e0fe838bc822d062d64f64939c2f2e63 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:35 2010 +0200 Translation update done using Pootle. commit 462fd3dc8d47fd16da1e3a508c2a94379f748330 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:28 2010 +0200 Translation update done using Pootle. commit d4e3c3c6530341334a7128d4c9303ae4d1c39248 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:16 2010 +0200 Translation update done using Pootle. commit d1ae2fe6264856b94eb8daa8cf646320d48da686 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:53:03 2010 +0200 Translation update done using Pootle. commit e06fdf3c3e088c108ca64ae7eaff35469518f937 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:28 2010 +0200 Translation update done using Pootle. commit 3364be836af6fda59050ada0158dcba9b6f96a6a Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:26 2010 +0200 Translation update done using Pootle. commit 4af93e3d0184fb92bbf885f1f5980ebef6a12471 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:23 2010 +0200 Translation update done using Pootle. commit 04ba897a836b5ad73076c223b2d061df5ed45569 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:19 2010 +0200 Translation update done using Pootle. commit e66a44534e94551142bf87d7bdc2f36c2a39eb4b Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:52:14 2010 +0200 Translation update done using Pootle. commit 4093abb7e4fdbd0d7dc777c16fa3f6916b5d33a0 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:58 2010 +0200 Translation update done using Pootle. commit 1d13802c96c60f026cf772a27eb17775fa082c91 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:50 2010 +0200 Translation update done using Pootle. commit 4a3cf746ebcd3f4707e513fde43c1132b34de433 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:45 2010 +0200 Translation update done using Pootle. commit ac9bd7a52161235879b0bd0a193f69b4e765d6d9 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:37 2010 +0200 Translation update done using Pootle. commit be570ade164539c64bf8bcbaac480867d51eb8ff Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:34 2010 +0200 Translation update done using Pootle. commit 596a0bd93f8f76aaadc8a7fdbd7ee45b7d7ddc34 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:51:25 2010 +0200 Translation update done using Pootle. commit aedab73c8ed7e32a0302d98ea32c9830c4a513e4 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:36:14 2010 +0200 Translation update done using Pootle. commit bf47a17ae0edc12eb3d65f95ae4e205c56464de8 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:20:12 2010 +0200 Translation update done using Pootle. commit bedc06ce34c1a0ea709224cbe20e382b32ddfdae Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:20:03 2010 +0200 Translation update done using Pootle. commit 88e531080e32939e0d960d4734ac3e945d34e2df Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:44 2010 +0200 Translation update done using Pootle. commit 8141f8b06c6e27b63f4f2a8096b216219a9c16a4 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:40 2010 +0200 Translation update done using Pootle. commit 3cec86bad3893f904c8a83b30ec546df49c063f0 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:36 2010 +0200 Translation update done using Pootle. commit fbdce1513fc81e5c0d8fb5f4224bfb53d6ecfe4e Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:19:07 2010 +0200 Translation update done using Pootle. commit 25e717fe6a9d4547d4a36efa6f2a110dce89fac7 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:18:11 2010 +0200 Translation update done using Pootle. commit b0f629a04d79b4969bc98d5e5ee994a9e2d91872 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:17:32 2010 +0200 Translation update done using Pootle. commit a5609ea827ff1d85c7fc627da8271c23b042d9fc Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:17:26 2010 +0200 Translation update done using Pootle. commit ded1fe485855d8249aa01e0ea5703722a8fd8dc6 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:16:56 2010 +0200 Translation update done using Pootle. commit 18a533ab2beec8a6cc8c740f4a9488bb266e0dd4 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:16:40 2010 +0200 Translation update done using Pootle. commit c566faf3faf7e8ea7c4ef039a4fa0910d563496f Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:16:26 2010 +0200 Translation update done using Pootle. commit a3631a19255d78b68c4e58f6d89a87736cf13c58 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:13:16 2010 +0200 Translation update done using Pootle. commit a4cf1cecd2c29dd2b29a5f010542aa22ad4bbd57 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:06:12 2010 +0200 Translation update done using Pootle. commit 4d3089c8154c3ab3abc031f08f77c2c51962ed65 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 16:02:47 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nl.po | 95 +++++++++++++++++++++----------------------------------------- 1 files changed, 32 insertions(+), 63 deletions(-) diff --git a/po/nl.po b/po/nl.po index b8f871b..b478f1e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-12-03 11:04+0200\n" +"PO-Revision-Date: 2010-12-03 17:10+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" "Language: nl\n" @@ -586,7 +586,6 @@ msgid "Inside column:" msgstr "In de kolom:" #: db_structure.php:59 -#, fuzzy #| msgid "No tables found in database." msgid "No tables found in database" msgstr "Geen tabellen gevonden in de database." @@ -804,11 +803,11 @@ msgstr "Database-log" #: enum_editor.php:21 libraries/tbl_properties.inc.php:794 #, php-format msgid "Values for the column \"%s\"" -msgstr "" +msgstr "Waarden voor het de kolom \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:795 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Plaats elke waarde in een log veld." #: export.php:73 msgid "Selected export type has to be saved in file!" @@ -955,16 +954,14 @@ msgid "Dropping Event" msgstr "" #: js/messages.php:33 -#, fuzzy #| msgid "Procedures" msgid "Dropping Procedure" -msgstr "Procedures" +msgstr "Procedure komt te vervallen" #: js/messages.php:35 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Deleting tracking data" -msgstr "Verwijder tracking data voor deze tabel" +msgstr "Tracking data voor deze tabel wordt verwijderd" #: js/messages.php:36 msgid "Dropping Primary Key/Index" @@ -1010,28 +1007,24 @@ msgid "The passwords aren't the same!" msgstr "De wachtwoorden zijn niet gelijk!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" msgstr "Voeg een nieuwe gebruiker toe" #: js/messages.php:53 -#, fuzzy #| msgid "Create version" msgid "Create User" -msgstr "Versie aanmaken" +msgstr "Gebruiker aanmaken" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" msgstr "Bezig de privileges te verversen" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Verwijder de geselecteerde gebruikers" +msgstr "Geselecteerde gebruikers worden verwijderd" #: js/messages.php:56 tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" @@ -1044,16 +1037,14 @@ msgid "Cancel" msgstr "Annuleren" #: js/messages.php:63 -#, fuzzy #| msgid "Load" msgid "Loading" msgstr "Laden" #: js/messages.php:64 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "Processen" +msgstr "Bezig met verwerken" #: js/messages.php:65 msgid "Error in Processing Request" @@ -1080,10 +1071,9 @@ msgid "Renaming Databases" msgstr "Hernoem database naar" #: js/messages.php:72 -#, fuzzy #| msgid "Rename database to" msgid "Reload Database" -msgstr "Hernoem database naar" +msgstr "Ververs database" #: js/messages.php:73 #, fuzzy @@ -1098,41 +1088,35 @@ msgid "Changing Charset" msgstr "Karakterset" #: js/messages.php:75 -#, fuzzy #| msgid "Table must have at least one column." msgid "Table must have at least one column" -msgstr "Tabel moet minimaal één veld hebben." +msgstr "Tabel moet minimaal één kolom hebben." #: js/messages.php:76 -#, fuzzy #| msgid "Create table" msgid "Create Table" msgstr "Maak tabel" #: js/messages.php:81 -#, fuzzy #| msgid "Search" msgid "Searching" msgstr "Zoeken" #: js/messages.php:84 -#, fuzzy #| msgid "SQL Query box" msgid "Hide query box" -msgstr "SQL-query veld" +msgstr "SQL-query veld verbergen" #: js/messages.php:85 -#, fuzzy #| msgid "SQL Query box" msgid "Show query box" -msgstr "SQL-query veld" +msgstr "SQL-query veld tonen" # "Inline" vertaalt naar "rechtstreeks in het document", als het ware binnen iets anders. #: js/messages.php:86 -#, fuzzy #| msgid "Inline" msgid "Inline Edit" -msgstr "Rechtstreeks" +msgstr "Wijzig inline" #: js/messages.php:89 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1152,7 +1136,6 @@ msgid "Please select the primary key or a unique key" msgstr "Selecteer de primaire sleutel of een unieke sleutel" #: js/messages.php:95 pmd_general.php:89 tbl_relation.php:545 -#, fuzzy #| msgid "Choose field to display" msgid "Choose column to display" msgstr "Kies weer te geven veld" @@ -1162,7 +1145,6 @@ msgid "Add an option for column " msgstr "" #: js/messages.php:101 -#, fuzzy #| msgid "Generate Password" msgid "Generate password" msgstr "Genereer wachtwoord" @@ -1172,16 +1154,14 @@ msgid "Generate" msgstr "Genereer" #: js/messages.php:103 -#, fuzzy #| msgid "Change password" msgid "Change Password" msgstr "Wijzig wachtwoord" #: js/messages.php:106 -#, fuzzy #| msgid "Mon" msgid "More" -msgstr "Ma" +msgstr "Meer" #. l10n: Display text for calendar close link #: js/messages.php:116 @@ -1190,7 +1170,6 @@ msgstr "Klaar" #. l10n: Display text for previous month link in calendar #: js/messages.php:118 -#, fuzzy #| msgid "Previous" msgid "Prev" msgstr "Vorige" @@ -1278,7 +1257,6 @@ msgstr "Apr" #. l10n: Short month name #: js/messages.php:148 libraries/common.lib.php:1553 -#, fuzzy #| msgid "May" msgctxt "Short month name" msgid "May" @@ -1389,35 +1367,30 @@ msgstr "Zo" #. l10n: Minimal week day name #: js/messages.php:193 -#, fuzzy #| msgid "Mon" msgid "Mo" msgstr "Ma" #. l10n: Minimal week day name #: js/messages.php:195 -#, fuzzy #| msgid "Tue" msgid "Tu" msgstr "Di" #. l10n: Minimal week day name #: js/messages.php:197 -#, fuzzy #| msgid "Wed" msgid "We" msgstr "Wo" #. l10n: Minimal week day name #: js/messages.php:199 -#, fuzzy #| msgid "Thu" msgid "Th" msgstr "Do" #. l10n: Minimal week day name #: js/messages.php:201 -#, fuzzy #| msgid "Fri" msgid "Fr" msgstr "Vr" @@ -1765,13 +1738,12 @@ msgstr "Authenticeren..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS fout" #: libraries/blobstreaming.lib.php:267 -#, fuzzy #| msgid "Page creation failed" msgid "PBMS connection failed:" -msgstr "Het aanmaken van de pagina is mislukt" +msgstr "PBMS connectie mislukt:" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" @@ -1800,7 +1772,7 @@ msgstr "Download bestand" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "Bestand kon niet worden geopend: %s" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:178 libraries/export/xml.php:36 @@ -1837,16 +1809,14 @@ msgid "Jump to database" msgstr "Ga naar database" #: libraries/build_html_for_db.lib.php:130 -#, fuzzy #| msgid "Master replication" msgid "Not replicated" -msgstr "Master replicatie" +msgstr "Niet gerepliceerd" #: libraries/build_html_for_db.lib.php:136 -#, fuzzy #| msgid "Replication" msgid "Replicated" -msgstr "Replicatie" +msgstr "Gerepliceerd" #: libraries/build_html_for_db.lib.php:150 #, php-format @@ -1858,14 +1828,13 @@ msgid "Check Privileges" msgstr "Controleer privileges" #: libraries/chart.lib.php:40 -#, fuzzy #| msgid "Show statistics" msgid "Query statistics" msgstr "Toon statistieken" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" -msgstr "" +msgstr "Vergelijking van query uitvoer tijden ( in microseconden)" #: libraries/chart.lib.php:83 #, fuzzy @@ -1875,11 +1844,11 @@ msgstr "Query resultaat bewerkingen" #: libraries/chart.lib.php:109 msgid "No data found for the chart." -msgstr "" +msgstr "Geen gegeven beschikbaar voor de grafiek." #: libraries/chart.lib.php:249 msgid "GD extension is needed for charts." -msgstr "" +msgstr "De GD-extensie is vereist voor het tonen van grafieken." #: libraries/chart.lib.php:252 msgid "JSON encoder is needed for chart tooltips." @@ -2165,7 +2134,7 @@ msgstr "structuur" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "gegevens" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2177,15 +2146,15 @@ msgstr "Structuur en gegevens" #: libraries/config.values.php:99 libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Snel - toon enkel de belangrijkste opties" #: libraries/config.values.php:100 libraries/display_export.lib.php:129 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "Uitgebreid - toon alle mogelijke opties" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "Uitgebreid - als bovenstaande maar zonder snel/uitgebreid keuze" #: libraries/config.values.php:119 #, fuzzy @@ -2201,11 +2170,11 @@ msgstr "Uitgebreide invoegingen" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "beide bovenstaande opties" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "geen van bovenstaande opties" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:416 @@ -2232,7 +2201,7 @@ msgstr "Foutieve waarde" #: libraries/config/validate.lib.php:458 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "Waarde moet lager of gelijk zijn aan %s" #: libraries/config/FormDisplay.class.php:535 #, php-format @@ -2250,17 +2219,17 @@ msgstr "Variabelen" #: libraries/config/FormDisplay.class.php:732 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "\"%s\" vereist de %s extensie" #: libraries/config/FormDisplay.class.php:746 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "importeren niet mogelijk, de functie %s mist" #: libraries/config/FormDisplay.class.php:750 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "exporteren niet mogelijk, de functie %s mist" #: libraries/config/FormDisplay.class.php:757 msgid "SQL Validator is disabled" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1654-ge6704b5
by Michal Čihař 03 Dec '10

03 Dec '10

The branch, master has been updated via e6704b5fa60fa61d74c900024f7fec72511a3a9e (commit) via af974b6c09fa659c8944d72aed1afb54b697b60c (commit) via ed2aba109de1321caae9324d81ef3f00a3d91486 (commit) via cf95c4b4b5c92c9cd39fc71e866057e71b31c179 (commit) from 83848da9eaeda858650536516a544691922be526 (commit) - Log ----------------------------------------------------------------- commit e6704b5fa60fa61d74c900024f7fec72511a3a9e Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 11:04:45 2010 +0200 Translation update done using Pootle. commit af974b6c09fa659c8944d72aed1afb54b697b60c Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 11:04:20 2010 +0200 Translation update done using Pootle. commit ed2aba109de1321caae9324d81ef3f00a3d91486 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 11:00:21 2010 +0200 Translation update done using Pootle. commit cf95c4b4b5c92c9cd39fc71e866057e71b31c179 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Dec 3 09:39:53 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nl.po | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/po/nl.po b/po/nl.po index 0d4105f..b8f871b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-12-01 10:52+0200\n" +"PO-Revision-Date: 2010-12-03 11:04+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -339,10 +339,9 @@ msgstr "" "waarom klik %shier%s." #: db_operations.php:581 -#, fuzzy #| msgid "Relational schema" msgid "Edit or export relational schema" -msgstr "Relationeel schema" +msgstr "Bewerk of exporteer relationeel 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 @@ -469,7 +468,6 @@ msgid "Modify" msgstr "Aanpassen" #: db_qbe.php:603 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" msgstr "Toevoegen/Verwijderen Criteria Rij" @@ -550,10 +548,10 @@ msgid "Delete" msgstr "Verwijderen" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Verwijder tracking data voor deze tabel" +msgstr "Verwijder gevonden rijen voor de tabel %s?" #: db_search.php:273 #, php-format @@ -583,10 +581,9 @@ msgid "Inside table(s):" msgstr "In de tabel(len):" #: db_search.php:352 -#, fuzzy #| msgid "Inside field:" msgid "Inside column:" -msgstr "In het veld:" +msgstr "In de kolom:" #: db_structure.php:59 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0ALPHA2-1650-g83848da
by Michal Čihař 02 Dec '10

02 Dec '10

The branch, master has been updated via 83848da9eaeda858650536516a544691922be526 (commit) from 57265808b8e639bb06506851a74e3474521ccb70 (commit) - Log ----------------------------------------------------------------- commit 83848da9eaeda858650536516a544691922be526 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Dec 2 17:30:10 2010 +0100 Czech translation update. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/po/cs.po b/po/cs.po index be9b35c..145930b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-30 12:47-0500\n" -"PO-Revision-Date: 2010-11-21 10:10+0100\n" +"PO-Revision-Date: 2010-12-02 17:30+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -551,10 +551,10 @@ msgid "Delete" msgstr "Odstranit" #: db_search.php:260 -#, fuzzy, php-format +#, php-format #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Odstranit všechny informace o sledování této tabulky" +msgstr "Odstranit nalezené záznamy z tabulky %s?" #: db_search.php:273 #, php-format @@ -618,8 +618,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1940 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -841,8 +841,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1599,8 +1599,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -1785,7 +1785,7 @@ msgstr "Zkontrolovat oprávnění" #: libraries/chart.lib.php:40 msgid "Query statistics" -msgstr "Statistika dotazu" +msgstr "Statistika dotazů" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" @@ -4517,8 +4517,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6437,8 +6437,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6479,8 +6479,8 @@ msgid "" "No description is available for this transformation. Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis. Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -6851,10 +6851,9 @@ msgid "Filter" msgstr "Filtr" #: navigation.php:292 -#, fuzzy #| msgid "table name" msgid "filter tables by name" -msgstr "jméno tabulky" +msgstr "filtrovat tabulky podle jména" #: navigation.php:293 setup/frames/index.inc.php:219 msgid "Clear" @@ -7088,8 +7087,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7541,8 +7540,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9019,8 +9018,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." hooks/post-receive -- phpMyAdmin

1 0