Git May 2011

git@phpmyadmin.net

7 participants
287 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-36-geb52f22
by Michal Čihař 23 May '11

23 May '11

The branch, QA_3_4 has been updated via eb52f22eb013a12f25f23225a15cb29ba0825f86 (commit) from 548b62e93f2281805aff12f286e4df011c8791c4 (commit) - Log ----------------------------------------------------------------- commit eb52f22eb013a12f25f23225a15cb29ba0825f86 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 13:19:43 2011 +0200 bug #3276001 [core] Avoid caching of index.php. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + index.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bed539..07a810a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ - bug #3305517 [config] Config for export compression not used - bug #3305883 [interface] Table is dropped regardless of confirmation - [auth] Fixed error handling for signon auth method. +- bug #3276001 [core] Avoid caching of index.php. 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/index.php b/index.php index 5d19758..5f78320 100644 --- a/index.php +++ b/index.php @@ -89,7 +89,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; // start output -header('Content-Type: text/html; charset=' . $GLOBALS['charset']); +include ('./libraries/header_http.inc.php'); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1888-g6f1302a
by Michal Čihař 23 May '11

23 May '11

The branch, master has been updated via 6f1302a4dbe899754d64b421eb6baf7148c0ccb1 (commit) via 1ec75facafab7fc88e486a20222c07c88730a925 (commit) via 0c2a2a6220b8f1084c70f7dfdd14b4ab4fc4f4a4 (commit) via 1300510d3686b40adefafb7f1778a6f06d0a553a (commit) via 452669a1746898a08129d3a555ac4b1ec084b423 (commit) from ea10000042cfc3f5cc3415cf17d096b93f290ed4 (commit) - Log ----------------------------------------------------------------- commit 6f1302a4dbe899754d64b421eb6baf7148c0ccb1 Merge: ea10000042cfc3f5cc3415cf17d096b93f290ed4 1ec75facafab7fc88e486a20222c07c88730a925 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 12:01:09 2011 +0200 Merge remote-tracking branch 'origin/QA_3_3' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. d2f75009d2204c171dfcd64999f8809a8bd1319a
by Michal Čihař 23 May '11

23 May '11

The branch, master has been updated via d2f75009d2204c171dfcd64999f8809a8bd1319a (commit) via 26bb3abde05c47327e78fa8999836b35ddabe4a2 (commit) via 7fe5409a8736fe66cc07ba30ee3cf3ca649deb4a (commit) via 83bd15e77693f6e58d3884ad0b4ac62d0edd985f (commit) via 5923080d9dde6160608adc6b03948b261b95dcf6 (commit) via 19ca40eae807bed1234f78f57f47f812cd074adc (commit) via adb66418f8d28842831ed6e432235fe37f5b9dd7 (commit) via 5c3b08548f4ff26692162fe211f1cd0aa4725d6f (commit) via 5b06c3e90fcaac8fb2e72afc2397310f254e5dad (commit) via 87d68d9c685dfcbd33d945bf36af8f8a2eb28dd8 (commit) via 45bae0e634c728169d0247e4ce92c3958107ec90 (commit) via 6a0c68c1d6a66f7691fa7e17f7ede9f58dd500b1 (commit) via f96be2ee716abc6b4f58e64ffb56825ebc6083e9 (commit) via af0a02d9bf0039c8b26c8b7933b3cb4c7a264918 (commit) via 29338f9b6e50ab162713fdf4e1d4632562e88036 (commit) via 2dd72e3af6a17b0b52a1276adbf8f5fdaa0cf49e (commit) via f057887d3a9af06c4b19946785a48fc9db1762b6 (commit) via 6e44adfcbc36809c190235fce1b92c7b661860a9 (commit) via 6d49134e02b34893dc9addd2601704c33dc9c647 (commit) via 31998f5c07c5dcd8b3f529ebeabe5634da41009e (commit) via de8e8ae3bc6836a015cbc09bb66c31dbe30cd04f (commit) via a4b66da367816122c03a998b294f0b37de2895bc (commit) via 698159e21cbaf73d67abd33fb6b6b3fad6042837 (commit) via bdeb8504583d0aac91fd5912a767691938c9c559 (commit) via be5abbbe7f915ee22920a8c7e3f035c60c46dc4e (commit) via 409fbc256b3e0f045e1317c771ed6f642f81c0ca (commit) via 4970ff188da8f6a0e943844c997e2e01485d2548 (commit) via 55872c08f7d174efdce39035bcac8ec43c547335 (commit) via 1521f2e3ede8f10d8636eca3cd0c543b6481a0e2 (commit) via bba89a553f46284c1b2dd1ca44b8a003ae1b2123 (commit) via 48519dfa8f2cff0ec41f12259f3384771733dbcc (commit) via 059b38dee6f086c2fcf06752afe5c977f6ef91d1 (commit) via 20a44a5e6ec0c1193e6d2f3c16b255280b9e9ee6 (commit) via b6255da8a54e9b9befe2cb198f8869482f37c81e (commit) via c65b07a07bff5341448ae2d29c8cf5f1335c8f31 (commit) via 92c9f325556f1bf2fe0f025248f23865f2029559 (commit) via 4db1c3afb88dc5d0c822cf1bebe3c42fc46ae202 (commit) via 679364943688a67d98b84c16294d88958a6e95a7 (commit) via 1718cfa2acb98ae847e19ed9e8511a3b945b4d32 (commit) via 2c4e45fcb327196480dc0712e9c18e27c234655d (commit) via bab46bba9efd160a67121f64b09207ad94908c26 (commit) via 669311907785bc1a4e5d5bc11d1d893a20bde9ba (commit) via 71926d8f8444727600123d27e5cc3e163979fbc2 (commit) via e0f0d3f702269d9a4f3c2a5aee5e6bcd075e165d (commit) via afff505b4819a0bf1727026345b48da09f75ee6b (commit) via 1f611c024a734e05aefa1b77d0abc7edbbce1e8e (commit) via 738f3bf23f3d08188856e3d8269190ee911fa618 (commit) via a66ab7d9c9269506f7f4ec1599def64cf09cc67c (commit) via f48d8952704c548fa1dc37ddd2834aa362d73e38 (commit) via acdaeee06966f78f7efbbbf757d448bfbd65779c (commit) via 9822def101eef3b6326a350510ea0817a0a39ca0 (commit) via ff43179ee081e5af7ce4a833c31712584e26b9b8 (commit) via 965176a0d704c356f8d9a3b7e40c79822a629411 (commit) via 6c1e6fae09c3e9a6187a7c6ef449166c89dbf93b (commit) via 352b2d17f6e1662800324f2661368e465009c953 (commit) via 9150f8f8bc7ccc1c762b9eea07a359be3f712683 (commit) via 17981a27570c424db0098a63a20a57f1e857837c (commit) via a66c330410f1bd764867689014b0d145326d6290 (commit) via 95283b6a935fdfb44a71097c257db546d27dd14b (commit) via 5192fa1aad43dce2ab6488463a9b341709f26175 (commit) via 18addac3eb35b50fcace90cc4e778c752e888229 (commit) via e476a55bc00907a9392344f6a182e382169dec9f (commit) via aa04b975ec1c7ef9b8a73cdbda436b14e9a90632 (commit) via 6453decec16051ddba22bf2e714fa8e572d9c0ac (commit) via d49e03ec2b1d90ec6856d86811c7e907eba231e1 (commit) via 0d4daca08da82cb3ec7459c2b8f979f4ec303adf (commit) via 5e14f89b15f7791224c247ed4144767f7ca503e5 (commit) via e2568103702ac5603a0c7a9ce8dce67bb4fd167c (commit) via 03a86f5eb1886a2d4ba4561670956dfdddd61eb3 (commit) via e3f33cf81a49d787648b27d00cfce1f6979fe352 (commit) via 855dacff00b2a05dfb3b36cab2429237b7b5a799 (commit) via 3ebdc39964a4f50cf63d4bc7bf6b77b48776f13f (commit) via 8682aa1547adb2ebc6d62d38ee6f76dba706bd61 (commit) via a672c1d63434d43d6fda4e6810e742bf4cee302f (commit) via a94247eec3c624ad7b01985487742d3a60d0c8ee (commit) via e4b5bc2f9380d81c32703ead9c2eab8efce15fdf (commit) via 18b8d7b71c46957e474bf3dfdbbc742c22a405b9 (commit) via 30d29a7af0f5a2a49bb5d1903c9b562ac0657f23 (commit) via cfa93caf9ee53efcd82f320ba3b383eaf52754d5 (commit) via d3732682942f94ecfc852555b3d378c8551b4f3d (commit) via 792e6adfcb5d5e1b60f477e2107a899cc841a22f (commit) via 8c0f93cd849cfd2ce7d3b73e98e0bd9b13d14b75 (commit) via d754e9bf1f561c29ec0354f53f9755f5a366e86d (commit) via 2bf38ad27e04f0106022b869b6b7c72314f86a2c (commit) via ba3cd8d01bd3aee2d51b933265068cb7f9188e0a (commit) via 9b4738f7e5497046d387efe313b2ed2ec0409e0e (commit) via b1e227a0227728a13dce7d5acecb070e32a0ccfd (commit) via 7ce9b2ab3c434be1233b2dd373a02315d791cd4a (commit) via 946457758ac758122bd5553640c677c03e7299bc (commit) via cfe7d2058ef73e56a1a14e34bbe100e2b5bcf9a7 (commit) via 08a0098543c2724ee9e796a293089094fd149c6c (commit) via 78a71e0c94719c24df3319c14e76d53fa09220af (commit) via 6e968c39a035eb100729a9875d3b06af3127a04b (commit) via f13d13ba1f7aef7205c80c3c3e940180e2f7ca2e (commit) via 2133c5bc0e928312f92272a7e61ca78eef205d8d (commit) via d09790e82b4db8fd5479aff3835be86b05ce4d2a (commit) via 3f2be824c4c6246ab526d4d66d7669dc9dbda69b (commit) via 7feb4102037f544e7ef7705c7188d4887d9f2e82 (commit) via 32140cdd74842c1debd22f37c909d70e3acf2035 (commit) via 004a31fa7b41facdedb5cd2336d01d344bcfa957 (commit) via df2d2c0b712d944fe5d582f6e35ef579b268ca71 (commit) via fd5e92927088bf6e89f813996b791f2c03323fe6 (commit) via 8717642208557dec780a3846cb7846e8e1b97b12 (commit) via 1eeaf3bdca0fe634632040976d54e145a3eac8c3 (commit) via 4c506fe464e9910c4a0fd446d96a15db93d71e31 (commit) via d84953198fbaf6bbcca80503af9531c87f39b538 (commit) via 9f0c762ceffcb51c4fab3a55b7e0e1d67996a28a (commit) via d087abf33313e3625bbe50df8cd4ebb8ef342f32 (commit) via d1690798c8a393bed46e44f621586a19478750a3 (commit) via 563032ef3510f1bb1abde761f4acfcfd7b9c8dbf (commit) via 9ad3522d4e96056fbd10449aed514f9a0fde47c8 (commit) via 4a3a7acebcd30bdc63300293fcbea72aec3959ff (commit) via 2de7216fee8937a5d7fd00d198b60b546a66cbb8 (commit) via e1995deb2851b581a48e31aa4d1d05e1510a65ce (commit) via 56b070d26d5e33dd35f1e0075ec25410abd4d07c (commit) via d79bce6675b1c26f98d1e859940d38c62faffa6b (commit) via ac51b0a8c45e5fab9adf4b2e5f41fc6c985ae097 (commit) via 66e761fdf2997708147aa467d3d167b9e0441393 (commit) via 6073d4b9a735984c3d89bc8e91d224ac00d804ee (commit) via 5fde0be78ea581c352bec626d2342de20883ebd2 (commit) via b8382f2396893dcfde984abe901c325653925b4c (commit) from 63b91e7a3b6dbea6beb9c30a56fd75784b371795 (commit) - Log ----------------------------------------------------------------- commit d2f75009d2204c171dfcd64999f8809a8bd1319a Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 10:42:29 2011 +0200 Update commit 26bb3abde05c47327e78fa8999836b35ddabe4a2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:35:26 2011 +0200 Translation update done using Pootle. commit 7fe5409a8736fe66cc07ba30ee3cf3ca649deb4a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:34:59 2011 +0200 Translation update done using Pootle. commit 83bd15e77693f6e58d3884ad0b4ac62d0edd985f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:34:08 2011 +0200 Translation update done using Pootle. commit 5923080d9dde6160608adc6b03948b261b95dcf6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:33:33 2011 +0200 Translation update done using Pootle. commit 19ca40eae807bed1234f78f57f47f812cd074adc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:33:02 2011 +0200 Translation update done using Pootle. commit adb66418f8d28842831ed6e432235fe37f5b9dd7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:32:35 2011 +0200 Translation update done using Pootle. commit 5c3b08548f4ff26692162fe211f1cd0aa4725d6f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:32:13 2011 +0200 Translation update done using Pootle. commit 5b06c3e90fcaac8fb2e72afc2397310f254e5dad Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:31:59 2011 +0200 Translation update done using Pootle. commit 87d68d9c685dfcbd33d945bf36af8f8a2eb28dd8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:31:18 2011 +0200 Translation update done using Pootle. commit 45bae0e634c728169d0247e4ce92c3958107ec90 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:31:01 2011 +0200 Translation update done using Pootle. commit 6a0c68c1d6a66f7691fa7e17f7ede9f58dd500b1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:30:46 2011 +0200 Translation update done using Pootle. commit f96be2ee716abc6b4f58e64ffb56825ebc6083e9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:29:31 2011 +0200 Translation update done using Pootle. commit af0a02d9bf0039c8b26c8b7933b3cb4c7a264918 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:28:20 2011 +0200 Translation update done using Pootle. commit 29338f9b6e50ab162713fdf4e1d4632562e88036 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:27:28 2011 +0200 Translation update done using Pootle. commit 2dd72e3af6a17b0b52a1276adbf8f5fdaa0cf49e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:26:58 2011 +0200 Translation update done using Pootle. commit f057887d3a9af06c4b19946785a48fc9db1762b6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:24:48 2011 +0200 Translation update done using Pootle. commit 6e44adfcbc36809c190235fce1b92c7b661860a9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:23:20 2011 +0200 Translation update done using Pootle. commit 6d49134e02b34893dc9addd2601704c33dc9c647 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:21:15 2011 +0200 Translation update done using Pootle. commit 31998f5c07c5dcd8b3f529ebeabe5634da41009e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:20:48 2011 +0200 Translation update done using Pootle. commit de8e8ae3bc6836a015cbc09bb66c31dbe30cd04f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:20:13 2011 +0200 Translation update done using Pootle. commit a4b66da367816122c03a998b294f0b37de2895bc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:19:48 2011 +0200 Translation update done using Pootle. commit 698159e21cbaf73d67abd33fb6b6b3fad6042837 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:19:12 2011 +0200 Translation update done using Pootle. commit bdeb8504583d0aac91fd5912a767691938c9c559 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:19:05 2011 +0200 Translation update done using Pootle. commit be5abbbe7f915ee22920a8c7e3f035c60c46dc4e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:19:01 2011 +0200 Translation update done using Pootle. commit 409fbc256b3e0f045e1317c771ed6f642f81c0ca Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:18:22 2011 +0200 Translation update done using Pootle. commit 4970ff188da8f6a0e943844c997e2e01485d2548 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:17:58 2011 +0200 Translation update done using Pootle. commit 55872c08f7d174efdce39035bcac8ec43c547335 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:17:03 2011 +0200 Translation update done using Pootle. commit 1521f2e3ede8f10d8636eca3cd0c543b6481a0e2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:16:19 2011 +0200 Translation update done using Pootle. commit bba89a553f46284c1b2dd1ca44b8a003ae1b2123 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:15:57 2011 +0200 Translation update done using Pootle. commit 48519dfa8f2cff0ec41f12259f3384771733dbcc Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:15:26 2011 +0200 Translation update done using Pootle. commit 059b38dee6f086c2fcf06752afe5c977f6ef91d1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:14:33 2011 +0200 Translation update done using Pootle. commit 20a44a5e6ec0c1193e6d2f3c16b255280b9e9ee6 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:14:13 2011 +0200 Translation update done using Pootle. commit b6255da8a54e9b9befe2cb198f8869482f37c81e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:13:43 2011 +0200 Translation update done using Pootle. commit c65b07a07bff5341448ae2d29c8cf5f1335c8f31 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:13:02 2011 +0200 Translation update done using Pootle. commit 92c9f325556f1bf2fe0f025248f23865f2029559 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:12:45 2011 +0200 Translation update done using Pootle. commit 4db1c3afb88dc5d0c822cf1bebe3c42fc46ae202 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:12:16 2011 +0200 Translation update done using Pootle. commit 679364943688a67d98b84c16294d88958a6e95a7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:11:23 2011 +0200 Translation update done using Pootle. commit 1718cfa2acb98ae847e19ed9e8511a3b945b4d32 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:11:09 2011 +0200 Translation update done using Pootle. commit 2c4e45fcb327196480dc0712e9c18e27c234655d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:10:25 2011 +0200 Translation update done using Pootle. commit bab46bba9efd160a67121f64b09207ad94908c26 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:10:04 2011 +0200 Translation update done using Pootle. commit 669311907785bc1a4e5d5bc11d1d893a20bde9ba Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:09:35 2011 +0200 Translation update done using Pootle. commit 71926d8f8444727600123d27e5cc3e163979fbc2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:09:22 2011 +0200 Translation update done using Pootle. commit e0f0d3f702269d9a4f3c2a5aee5e6bcd075e165d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:09:07 2011 +0200 Translation update done using Pootle. commit afff505b4819a0bf1727026345b48da09f75ee6b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:07:25 2011 +0200 Translation update done using Pootle. commit 1f611c024a734e05aefa1b77d0abc7edbbce1e8e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:07:12 2011 +0200 Translation update done using Pootle. commit 738f3bf23f3d08188856e3d8269190ee911fa618 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:06:19 2011 +0200 Translation update done using Pootle. commit a66ab7d9c9269506f7f4ec1599def64cf09cc67c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:04:59 2011 +0200 Translation update done using Pootle. commit f48d8952704c548fa1dc37ddd2834aa362d73e38 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:04:28 2011 +0200 Translation update done using Pootle. commit acdaeee06966f78f7efbbbf757d448bfbd65779c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:03:29 2011 +0200 Translation update done using Pootle. commit 9822def101eef3b6326a350510ea0817a0a39ca0 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:02:59 2011 +0200 Translation update done using Pootle. commit ff43179ee081e5af7ce4a833c31712584e26b9b8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:02:07 2011 +0200 Translation update done using Pootle. commit 965176a0d704c356f8d9a3b7e40c79822a629411 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:01:51 2011 +0200 Translation update done using Pootle. commit 6c1e6fae09c3e9a6187a7c6ef449166c89dbf93b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:01:20 2011 +0200 Translation update done using Pootle. commit 352b2d17f6e1662800324f2661368e465009c953 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 04:00:48 2011 +0200 Translation update done using Pootle. commit 9150f8f8bc7ccc1c762b9eea07a359be3f712683 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 03:59:46 2011 +0200 Translation update done using Pootle. commit 17981a27570c424db0098a63a20a57f1e857837c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 03:59:09 2011 +0200 Translation update done using Pootle. commit a66c330410f1bd764867689014b0d145326d6290 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 03:58:49 2011 +0200 Translation update done using Pootle. commit 95283b6a935fdfb44a71097c257db546d27dd14b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Sun May 22 03:57:55 2011 +0200 Translation update done using Pootle. commit 5192fa1aad43dce2ab6488463a9b341709f26175 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Sat May 21 21:17:25 2011 +0200 Translation update done using Pootle. commit 18addac3eb35b50fcace90cc4e778c752e888229 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:56:52 2011 +0200 Translation update done using Pootle. commit e476a55bc00907a9392344f6a182e382169dec9f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:42:59 2011 +0200 Translation update done using Pootle. commit aa04b975ec1c7ef9b8a73cdbda436b14e9a90632 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:42:49 2011 +0200 Translation update done using Pootle. commit 6453decec16051ddba22bf2e714fa8e572d9c0ac Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:40:55 2011 +0200 Translation update done using Pootle. commit d49e03ec2b1d90ec6856d86811c7e907eba231e1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:40:46 2011 +0200 Translation update done using Pootle. commit 0d4daca08da82cb3ec7459c2b8f979f4ec303adf Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:38:10 2011 +0200 Translation update done using Pootle. commit 5e14f89b15f7791224c247ed4144767f7ca503e5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:38:00 2011 +0200 Translation update done using Pootle. commit e2568103702ac5603a0c7a9ce8dce67bb4fd167c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:37:44 2011 +0200 Translation update done using Pootle. commit 03a86f5eb1886a2d4ba4561670956dfdddd61eb3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:37:41 2011 +0200 Translation update done using Pootle. commit e3f33cf81a49d787648b27d00cfce1f6979fe352 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:36:27 2011 +0200 Translation update done using Pootle. commit 855dacff00b2a05dfb3b36cab2429237b7b5a799 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:36:23 2011 +0200 Translation update done using Pootle. commit 3ebdc39964a4f50cf63d4bc7bf6b77b48776f13f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:34:18 2011 +0200 Translation update done using Pootle. commit 8682aa1547adb2ebc6d62d38ee6f76dba706bd61 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:34:02 2011 +0200 Translation update done using Pootle. commit a672c1d63434d43d6fda4e6810e742bf4cee302f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:29:51 2011 +0200 Translation update done using Pootle. commit a94247eec3c624ad7b01985487742d3a60d0c8ee Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:29:27 2011 +0200 Translation update done using Pootle. commit e4b5bc2f9380d81c32703ead9c2eab8efce15fdf Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:29:18 2011 +0200 Translation update done using Pootle. commit 18b8d7b71c46957e474bf3dfdbbc742c22a405b9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:29:05 2011 +0200 Translation update done using Pootle. commit 30d29a7af0f5a2a49bb5d1903c9b562ac0657f23 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:28:53 2011 +0200 Translation update done using Pootle. commit cfa93caf9ee53efcd82f320ba3b383eaf52754d5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:28:38 2011 +0200 Translation update done using Pootle. commit d3732682942f94ecfc852555b3d378c8551b4f3d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:28:05 2011 +0200 Translation update done using Pootle. commit 792e6adfcb5d5e1b60f477e2107a899cc841a22f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:28:02 2011 +0200 Translation update done using Pootle. commit 8c0f93cd849cfd2ce7d3b73e98e0bd9b13d14b75 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:27:05 2011 +0200 Translation update done using Pootle. commit d754e9bf1f561c29ec0354f53f9755f5a366e86d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:27:03 2011 +0200 Translation update done using Pootle. commit 2bf38ad27e04f0106022b869b6b7c72314f86a2c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:18:51 2011 +0200 Translation update done using Pootle. commit ba3cd8d01bd3aee2d51b933265068cb7f9188e0a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:15:14 2011 +0200 Translation update done using Pootle. commit 9b4738f7e5497046d387efe313b2ed2ec0409e0e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:15:05 2011 +0200 Translation update done using Pootle. commit b1e227a0227728a13dce7d5acecb070e32a0ccfd Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:14:24 2011 +0200 Translation update done using Pootle. commit 7ce9b2ab3c434be1233b2dd373a02315d791cd4a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:14:16 2011 +0200 Translation update done using Pootle. commit 946457758ac758122bd5553640c677c03e7299bc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 11:13:53 2011 +0200 Translation update done using Pootle. commit cfe7d2058ef73e56a1a14e34bbe100e2b5bcf9a7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 10:43:07 2011 +0200 Translation update done using Pootle. commit 08a0098543c2724ee9e796a293089094fd149c6c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 10:34:02 2011 +0200 Translation update done using Pootle. commit 78a71e0c94719c24df3319c14e76d53fa09220af Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat May 21 10:33:41 2011 +0200 Translation update done using Pootle. commit 6e968c39a035eb100729a9875d3b06af3127a04b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:18:03 2011 +0200 Translation update done using Pootle. commit f13d13ba1f7aef7205c80c3c3e940180e2f7ca2e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:16:49 2011 +0200 Translation update done using Pootle. commit 2133c5bc0e928312f92272a7e61ca78eef205d8d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:16:40 2011 +0200 Translation update done using Pootle. commit d09790e82b4db8fd5479aff3835be86b05ce4d2a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:16:29 2011 +0200 Translation update done using Pootle. commit 3f2be824c4c6246ab526d4d66d7669dc9dbda69b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:16:16 2011 +0200 Translation update done using Pootle. commit 7feb4102037f544e7ef7705c7188d4887d9f2e82 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:16:01 2011 +0200 Translation update done using Pootle. commit 32140cdd74842c1debd22f37c909d70e3acf2035 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:15:40 2011 +0200 Translation update done using Pootle. commit 004a31fa7b41facdedb5cd2336d01d344bcfa957 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:15:29 2011 +0200 Translation update done using Pootle. commit df2d2c0b712d944fe5d582f6e35ef579b268ca71 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:14:25 2011 +0200 Translation update done using Pootle. commit fd5e92927088bf6e89f813996b791f2c03323fe6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:14:14 2011 +0200 Translation update done using Pootle. commit 8717642208557dec780a3846cb7846e8e1b97b12 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:13:29 2011 +0200 Translation update done using Pootle. commit 1eeaf3bdca0fe634632040976d54e145a3eac8c3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:13:17 2011 +0200 Translation update done using Pootle. commit 4c506fe464e9910c4a0fd446d96a15db93d71e31 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:13:04 2011 +0200 Translation update done using Pootle. commit d84953198fbaf6bbcca80503af9531c87f39b538 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:12:06 2011 +0200 Translation update done using Pootle. commit 9f0c762ceffcb51c4fab3a55b7e0e1d67996a28a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:11:58 2011 +0200 Translation update done using Pootle. commit d087abf33313e3625bbe50df8cd4ebb8ef342f32 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:10:00 2011 +0200 Translation update done using Pootle. commit d1690798c8a393bed46e44f621586a19478750a3 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:09:52 2011 +0200 Translation update done using Pootle. commit 563032ef3510f1bb1abde761f4acfcfd7b9c8dbf Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:08:11 2011 +0200 Translation update done using Pootle. commit 9ad3522d4e96056fbd10449aed514f9a0fde47c8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:07:55 2011 +0200 Translation update done using Pootle. commit 4a3a7acebcd30bdc63300293fcbea72aec3959ff Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:07:38 2011 +0200 Translation update done using Pootle. commit 2de7216fee8937a5d7fd00d198b60b546a66cbb8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:06:36 2011 +0200 Translation update done using Pootle. commit e1995deb2851b581a48e31aa4d1d05e1510a65ce Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 23:06:17 2011 +0200 Translation update done using Pootle. commit 56b070d26d5e33dd35f1e0075ec25410abd4d07c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 22:37:24 2011 +0200 Translation update done using Pootle. commit d79bce6675b1c26f98d1e859940d38c62faffa6b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 22:34:12 2011 +0200 Translation update done using Pootle. commit ac51b0a8c45e5fab9adf4b2e5f41fc6c985ae097 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 22:34:00 2011 +0200 Translation update done using Pootle. commit 66e761fdf2997708147aa467d3d167b9e0441393 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 22:33:50 2011 +0200 Translation update done using Pootle. commit 6073d4b9a735984c3d89bc8e91d224ac00d804ee Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 22:22:54 2011 +0200 Translation update done using Pootle. commit 5fde0be78ea581c352bec626d2342de20883ebd2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 22:22:43 2011 +0200 Translation update done using Pootle. commit b8382f2396893dcfde984abe901c325653925b4c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri May 20 20:51:17 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/es/Documentation.html | 6 +- output/ja/Documentation.html | 243 ++++++++++++++++++------------------------ output/ja/TODO | 2 +- output/tr/Documentation.html | 174 ++++++++++++++++--------------- po/es.po | 5 +- po/ja.po | 236 ++++++++++++++++++++++------------------- po/tr.po | 116 ++++++++++++++++---- 7 files changed, 421 insertions(+), 361 deletions(-) diff --git a/output/es/Documentation.html b/output/es/Documentation.html index 9a246f6..0819b42 100644 --- a/output/es/Documentation.html +++ b/output/es/Documentation.html @@ -1376,9 +1376,9 @@ bases de datos para el marco de navegación. </dd> <dt>cadena <span id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span></dt> - <dd>Name of session which will be used for signon authentication method. You -should use something different than <code>phpMyAdmin</code>, because this is -session which phpMyAdmin uses internally. + <dd>El nombre de la sesión a utilizar para el método de autenticación +signon. Deberías de utilizar algo distinto a <code>phpMyAdmin</code> ya que +ese es el nombre de sesión phpMyAdmin utiliza internamente. </dd> <dt>cadena <span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span></dt> diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html index 4a17dc1..b75ce52 100644 --- a/output/ja/Documentation.html +++ b/output/ja/Documentation.html @@ -55,7 +55,7 @@ class="myadmin">MyAdmin</span></a> 3.5.0-dev ドキュメント href="http://www.phpmyadmin.net/documentation/">phpMyAdminドキュメント</a>の翻訳版です。<a href="https://l10n.cihar.com/projects/pmadoc/">翻訳サーバ</a>にて翻訳作業に貢献することができます。 </p> -<ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin ホームページ</a></li> +<ul><li><a href="http://www.phpmyadmin.net/">phpMyAdmin オフィシャルサイト</a></li> <li><a href="https://sourceforge.net/projects/phpmyadmin/">SourceForge phpMyAdmin プロジェクトページ</a></li> <li><a href="http://wiki.phpmyadmin.net">オフィシャル phpMyAdmin wiki</a></li> @@ -342,7 +342,7 @@ you might find near the end of your configuration file.</p> <h3 id="authentication_modes">認証モードの使い方</h3> <ul><li><b>マルチユーザ環境</b>では、ユーザが自分のデータベースにアクセスできるよう、また他人のデータベースにいたずらできないよう、<abbr -title="HyperText Transfer Protocol">HTTP</abbr>／クッキー認証モードにするのがお奨めです。<br /> +title="HyperText Transfer Protocol">HTTP</abbr>／クッキー認証モードにするのがお勧めです。<br /> ただし、ご注意ください。マイクロソフトの Internet Explorer は、クッキーに関しては本当にバグが多いようです。少なくともバージョン 6 まではそうです。<br /> また、<b>シングルユーザ環境</b>であっても <abbr title="HyperText Transfer @@ -355,8 +355,7 @@ href="#controluser">「管理ユーザ」</a>は別かもしれませんが）ただし、忘れてはなりません。HTTPS プロトコルを使わない限り、パスワードはプレーンテキストのままやりとりされます。<br /> また、クッキーモードでは、blowfish アルゴリズムで暗号化されてはいますが、パスワードは一時的にクッキーに保管されます。</li> - <li id="pmausr">Note: this section is only applicable if your MySQL server is running with -<tt>--skip-show-database</tt>.<br /><br /> + <li id="pmausr">注：この項目は、MySQL サーバが <tt>--skip-show-database</tt> を適用して稼動している場合のみに使用できます。<br /><br /> 「HTTP」／「クッキー」モードでは管理ユーザが必要です。このユーザは <i>`mysql`.`user` (`Password` 以外の全カラム)</i>、<i>`mysql`.`db` (全カラム)</i>、<i>`mysql`.`host` @@ -366,10 +365,9 @@ class="configrule">$cfg['Servers'][$i]['controluser']</a></tt> と <tt><a href="#cfg_Servers_controlpass" class="configrule">$cfg['Servers'][$i]['controlpass']</a></tt> 項目には<a href="#controluser">管理ユーザ</a>の情報を登録しなければなりません。<br /> - The following example assumes you want to use <tt>pma</tt> as the -controluser and <tt>pmapass</tt> as the controlpass, but <b>this is only an -example: use something else in your file!</b> Input these statements from -the phpMyAdmin SQL Query window or mysql command–line client.<br /> + 下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt> +を管理パスワードと想定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてください！</b> phpMyAdmin の SQL +クエリウィンドウまたは mysql コマンドラインクライアントからこれらのコマンドを入力します。<br /> もちろん MySQL サーバのホストがウェブサーバのホストと異なる場合は <tt>localhost</tt> をウェブサーバのホストで差し替える必要があります。 @@ -431,8 +429,7 @@ title="HyperText Transfer Protocol">HTTP</abbr>」認証モードと <i>.htacces <ul><li><abbr title="HyperText Transfer Protocol">HTTP</abbr> 認証のかわりに利用できます（たとえば <abbr title="Internet Information Services">IIS</abbr> を稼動させている場合など）。</li> <li>もちろんユーザがブラウザのクッキーを有効にしている必要がありますが、現在では全ての認証方式でクッキーが必要となっています。</li> - <li>With this mode, the user can truly log out of phpMyAdmin and log in back -with the same username.</li> + <li>このモードでは、ユーザは phpMyAdmin のログアウトが確実に行え、同じユーザー名でログインし直すことができます。</li> <li>任意のサーバにログインしたい場合は、<a href="#AllowArbitraryServer" class="configrule">$cfg['AllowArbitraryServer']</a> ディレクティブをご覧ください。</li> <li><a href="#require">「必要なもの」</a>の章にも書いてある通り、<tt>mcrypt</tt> @@ -602,7 +599,7 @@ MySQL サーバでもほぼ確実に利用できるためです。ソケット <tt><i>mysql</i></tt> : 古典的な MySQL 拡張です。現時点ではおすすめできるデフォルトの方法です。<br /><br /> <tt><i>mysqli</i></tt> : MySQL 拡張の改良版です。この拡張は PHP 5.0.0 で利用できるようになりました。MySQL -4.1.x 以降が稼動しているサーバに接続する場合はお奨めです。</dd> +4.1.x 以降が稼動しているサーバに接続する場合はお勧めです。</dd> <dt id="cfg_Servers_compress">$cfg['Servers'][$i]['compress'] boolean</dt> <dd>MySQL サーバとの接続に圧縮プロトコルを使うかどうかが入ります（実験段階です）。<br /> @@ -1071,7 +1068,7 @@ superuser.<br /><br /> このチェック機能はこの変数を false にすることで無効にできます。無効にするとパフォーマンスが向上します。<br /><br /> - 確実にテーブル構造が最新になっているときは FALSE にするのがおすすめです。</dd> + 確実にテーブル構造が最新になっているときは FALSE にするのがお勧めです。</dd> <dt><span id="cfg_Servers_AllowRoot">$cfg['Servers'][$i]['AllowRoot']</span> boolean</dt> <dd>ルートのアクセスを許可するかどうか。これは下記の規則を簡略化しただけのものです。 @@ -1112,7 +1109,7 @@ detecting IP address behind proxies. <dt id="servers_allowdeny_rules"> <span id="cfg_Servers_AllowDeny_rules">$cfg['Servers'][$i]['AllowDeny']['rules']</span> -strings の array +文字列の配列 </dt> <dd>この規則の一般的なフォーマットは次の通りです。 @@ -1122,8 +1119,8 @@ strings の array すべてのユーザに一致させたいのであれば、<i>username</i> フィールドにワイルドカードとして <tt>'%'</tt> を入れることもできます。<br /> - また、<i>ipmask</i> -フィールドでもいくつかショートカットが利用できます（ご注意ください。SERVER_ADDRESSの部分はどんなサーバでも利用できるとは限りません）： + また、<i>ipmask</i> フィールドでもいくつかショートカットが利用できます（SERVER_ADDRESS +の部分はどんなウェブサーバでも利用できるとは限りませんので注意してください）。 <pre> 'all' -> 0.0.0.0/0 'localhost' -> 127.0.0.1/8 @@ -1136,18 +1133,17 @@ strings の array と、適用順が <tt>「allow,deny」</tt> ないし <tt>「explicit」</tt> の場合は <tt>「deny % from all」</tt> と等価になります。<br /><br /> - For the <abbr title="Internet Protocol">IP</abbr> matching system, the -following work:<br /> - <tt>xxx.xxx.xxx.xxx</tt> (an exact <abbr title="Internet Protocol">IP</abbr> -address)<br /> - <tt>xxx.xxx.xxx.[yyy-zzz]</tt> (an <abbr title="Internet Protocol">IP</abbr> -address range)<br /> - <tt>xxx.xxx.xxx.xxx/nn</tt> (CIDR, Classless Inter-Domain Routing type <abbr -title="Internet Protocol">IP</abbr> addresses)<br /> - ただし、下記は利用できません：<br /> - <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt> (partial <abbr title="Internet -Protocol">IP</abbr> address range)<br /> - Also IPv6 addresses are not supported. + <abbr title="インターネット・プロトコル">IP</abbr> のマッチング規則としては、下記が利用できます。<br /> + <tt>xxx.xxx.xxx.xxx</tt> （単一の <abbr title="インターネット・プロトコル">IP</abbr> +アドレスそのもの）<br /> + <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>（<abbr title="インターネット・プロトコル">IP</abbr> +アドレスの範囲指定）<br /> + <tt>xxx.xxx.xxx.xxx/nn</tt> （CIDR（Classless Inter-Domain Routing）タイプの <abbr +title="インターネット・プロトコル">IP</abbr> アドレス）<br /> + ただし、以下は利用できません。<br /> + <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>（<abbr title="インターネット・プロトコル">IP</abbr> +アドレスの一部範囲指定）<br /> + それと、IPv6 アドレスもサポートしていません。 </dd> <dt><span id="cfg_Servers_DisableIS">$cfg['Servers'][$i]['DisableIS']</span> boolean</dt> @@ -1283,7 +1279,7 @@ might limit session validity and if session is lost, login cookie is also invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> not lower than the value of $cfg['LoginCookieValidity'].</dd> - <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [秒数]</dt> + <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] 整数 [秒数]</dt> <dd>Define how long login cookie should be stored in browser. Default 0 means that it will be kept for existing session. This is recommended for not trusted environments.</dd> @@ -1300,9 +1296,8 @@ from other server, when you are using more of them.</dd> <dd>複数のクエリを含む文のクエリのひとつが失敗したときに処理を続けるかどうかを定義します。デフォルトでは処理を中止します。</dd> <dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] boolean</dt> - <dd>Define whether phpMyAdmin will output the results of each query of a -multi-query statement embedded into the <abbr title="structured query -language">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>.</dd> + <dd>マルチクエリを含む文のそれぞれのクエリの結果を <abbr title="structured query language">SQL</abbr> +出力のなかにインラインコメントとして埋め込むかどうかを定義します。デフォルトは <tt>TRUE</tt> です。</dd> <dt id="AllowArbitraryServer"> <span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span> boolean</dt> @@ -1315,10 +1310,10 @@ Protocol">HTTP</abbr> サーバが置かれているファイアウォールの </dd> <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> - <dd>Whether to display errors from PHP or not.</dd> + <dd>PHP からのエラーを表示するかどうか。</dd> <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt> - <dd>Whether to gather errors from PHP or not.</dd> + <dd>PHP からのエラーを収集するかどうか。</dd> <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> <dd>Defines whether to use a select-based menu and display only the current @@ -1334,12 +1329,12 @@ href="#cfg_LeftFrameDBSeparator" class="configrule">$cfg['LeftFrameDBSeparator']</a> もご覧ください。 </dd> - <dt id="cfg_LeftFrameDBSeparator">$cfg['LeftFrameDBSeparator'] string または array</dt> + <dt id="cfg_LeftFrameDBSeparator">$cfg['LeftFrameDBSeparator'] 文字列または配列</dt> <dd>The string used to separate the parts of the database name when showing them in a tree. Alternatively you can specify more strings in an array and all of them will be used as a separator.</dd> - <dt id="cfg_LeftFrameTableSeparator">$cfg['LeftFrameTableSeparator'] string</dt> + <dt id="cfg_LeftFrameTableSeparator">$cfg['LeftFrameTableSeparator'] 文字列</dt> <dd>Defines a string to be used to nest table spaces. Defaults to '__'. This means if you have tables like 'first__second__third' this will be shown as a three-level hierarchy like: first > second > third. If set to FALSE @@ -1347,7 +1342,7 @@ or empty, the feature is disabled. NOTE: You should not use this separator at the beginning or end of a table name or multiple times after another without any other characters in between.</dd> - <dt id="cfg_LeftFrameTableLevel">$cfg['LeftFrameTableLevel'] string</dt> + <dt id="cfg_LeftFrameTableLevel">$cfg['LeftFrameTableLevel'] 文字列</dt> <dd>テーブルを上記の区切り文字で分割表示する際に何層まで表示するかを定義します。</dd> <dt id="cfg_ShowTooltip">$cfg['ShowTooltip'] boolean</dt> @@ -1475,7 +1470,7 @@ edit/insert mode. The user can toggle this setting from the interface. </dd> <dt id="cfg_CharEditing">$cfg['CharEditing'] 文字列</dt> - <dd>CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義します。可能な値は次の通りです： + <dd>CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義します。可能な値は次の通りです。 <ul><li>input - テキストのサイズを MySQL のカラムのサイズまでに制限できますが、カラムに改行があると問題になります。</li> <li>textarea - カラムに改行があっても問題ありませんが、長さの制限はできません。</li> </ul> @@ -1808,22 +1803,17 @@ you click the database or table name, then the Import tab. ユーザごとにディレクトリを変えたい場合は、%u を使うとユーザ名に置換されます。<br /><br /> - ご注意ください。ファイル名にはかならず「.sql」（圧縮形式のサポートが有効になっている場合は「sql.bz2」や「sql.gz」）という拡張子でなければなりません。<br /><br /> + 拡張子に注意してください。ファイル名の末尾は必ず「.sql」（圧縮形式のサポートが有効になっている場合は「.sql.bz2」や「.sql.gz」）でなければなりません。<br /><br /> - This feature is useful when your file is too big to be uploaded via <abbr -title="HyperText Transfer Protocol">HTTP</abbr>, or when file uploads are -disabled in PHP.<br /><br /> + この機能は <abbr title="HyperText Transfer Protocol">HTTP</abbr> +でアップロードするには大きすぎるファイルがあるときや、PHP のファイルアップロード機能が無効になっている場合に便利です。<br /><br /> - #-#-#-#-# Documentation_ja.html:1149 Documentation_ja.html:1158 #-#-#-#-# -ご注意ください。PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin -スクリプトのオーナーと同じユーザがオーナーになっている必要があります。 -#-#-#-#-# Documentation_ja.html:1169 #-#-#-#-# -また、PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin -スクリプトのオーナーと同じユーザがオーナーになっている必要があります。 + このディレクトリのオーナに注意してください。PHP がセーフモードになっている場合、phpMyAdmin +スクリプトのオーナと同じユーザがオーナになっていなければなりません。 <br /><br /> - See also <a href="#faq1_16"> <abbr title="Frequently Asked -Questions">FAQ</abbr> 1.16</a> for alternatives. + また、別の方法もあります。<a href="#faq1_16"><abbr title="よくある質問">FAQ</abbr> +1.16</a>をご覧ください。 </dd> <dt id="cfg_SaveDir">$cfg['SaveDir'] 文字列</dt> @@ -1832,15 +1822,10 @@ Questions">FAQ</abbr> 1.16</a> for alternatives. ユーザごとにディレクトリを変えたい場合は、%u を使うとユーザ名に置換されます。<br /><br /> - Please note that the directory must exist and has to be writable for the -user running webserver.<br /><br /> + 書き込み権限にご注意ください。このディレクトリはウェブサーバの実行ユーザが書き込みできるようになっている必要があります。<br /><br /> - #-#-#-#-# Documentation_ja.html:1149 Documentation_ja.html:1158 #-#-#-#-# -ご注意ください。PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin -スクリプトのオーナーと同じユーザがオーナーになっている必要があります。 -#-#-#-#-# Documentation_ja.html:1169 #-#-#-#-# -また、PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin -スクリプトのオーナーと同じユーザがオーナーになっている必要があります。 + このディレクトリのオーナに注意してください。PHP がセーフモードになっている場合、phpMyAdmin +スクリプトのオーナと同じユーザがオーナになっていなければなりません。 </dd> <dt id="cfg_TempDir">$cfg['TempDir'] 文字列</dt> @@ -2366,22 +2351,18 @@ information about the transformation. Currently following keys can be used: <li><a href="#faqsynchronization">同期</a></li> </ol> -<p> Please have a look at our <a -href="http://www.phpmyadmin.net/home_page/docs.php">Link section</a> on the -official phpMyAdmin homepage for in-depth coverage of phpMyAdmin's features -and or interface.</p> +<p> phpMyAdmin の機能やインタフェースの詳細については phpMyAdmin のオフィシャルページにある <a +href="http://www.phpmyadmin.net/home_page/docs.php">Link セクション</a> をご覧ください。</p> <h3 id="faqserver">サーバ</h3> <h4 id="faq1_1"> - <a href="#faq1_1">1.1 My server is crashing each time a specific action is -required or phpMyAdmin sends a blank page or a page full of cryptic -characters to my browser, what can I do?</a></h4> + <a href="#faq1_1">1.1 +特定のアクションが要求されるたびにサーバがクラッシュしたり、ブラウザに空白のページや暗号のような文字だらけのページが表示されます。どうしたらよいのでしょうか？</a></h4> -<p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGzip']</a> -directive to <tt>FALSE</tt> in your <i>config.inc.php</i> file and the -<tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php -configuration file.<br /></p> +<p> <i>config.inc.php</i> ファイルの <a href="#cfg_OBGzip" +class="configrule">$cfg['OBGzip']</a> ディレクティブを <tt>FALSE</tt> に、PHP の設定ファイルの +<tt>zlib.output_compression</tt> ディレクティブを <tt>Off</tt> にしてみてください。<br /></p> <h4 id="faq1_2"> <a href="#faq1_2">1.2 phpMyAdmin を使うと Apache サーバがクラッシュします。</a></h4> @@ -2431,10 +2412,9 @@ declarations (2 lines) from the scripts <i>libraries/header.inc.php</i>, <a href="#faq1_7">1.7 どうすればダンプや <abbr title="comma separated values">CSV</abbr> エクスポートを GZip ないし Bzip 圧縮できるのでしょうか？動いていないようなんですが。</a></h4> -<p> These features are based on the <tt>gzencode()</tt> and -<tt>bzcompress()</tt> PHP functions to be more independent of the platform -(Unix/Windows, Safe Mode or not, and so on). So, you must have Zlib/Bzip2 -support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>).<br /></p> +<p> これらの機能はプラットフォーム（Unix か Windows か、セーフモードかどうか、など）からの独立性を高めるために PHP の +<tt>gzencode()</tt> と <tt>bzcompress()</tt> 関数をベースにしています。そのため、Zlib/Bzip2 +サポート (<tt>--with-zlib</tt> と <tt>--with-bz2</tt>) が必要です。<br /></p> <h4 id="faq1_8"> <a href="#faq1_8">1.8 テーブルにテキストファイルを挿入できません。セーフモードになっているというエラーが出ます。</a></h4> @@ -2459,7 +2439,7 @@ support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>).<br /></p> <a href="#faq1_10">1.10 セキュアサーバ上で稼動させている phpMyAdmin のファイルアップロードで困っています。ブラウザは Internet Explorer、サーバは Apache を使っています。</a></h4> -<p> phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に次の行を追加してください：</p> +<p> phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に以下の行を追加してください。</p> <pre>SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown</pre> @@ -2577,7 +2557,7 @@ these files.</p> <h4 id="faqmysql"> <a href="#faqmysql">1.20 「cannot load MySQL extension, please check PHP -Configuration（MySQL エクステンションをロードできません。PHP の設定をチェックしてください）」というエラーが出ます。</a></h4> +Configuration（MySQL 拡張を読み込めません。PHP の設定をチェックしてください）」というエラーが出ます。</a></h4> <p> PHP が MySQL サーバに接続する際には「MySQL 拡張」という MySQL の関数セットを必要とします。この拡張は PHP の配布ファイルに含まれている（コンパイルで組み込まれている）こともありますが、そうでない場合、動的に読み込む必要があります。拡張名はたぶん @@ -2695,9 +2675,8 @@ SetInputFilter PHP </p> <h4 id="faq1_32"> - <a href="#faq1_32">1.32 Can I use <abbr title="HyperText Transfer -Protocol">HTTP</abbr> authentication with <abbr title="Internet Information -Services">IIS</abbr>?</a></h4> + <a href="#faq1_32"><abbr title="Internet Information Services">IIS</abbr> でも +<abbr title="HyperText Transfer Protocol">HTTP</abbr> 認証を利用できますか？</a></h4> <p> はい。以下の手順は phpMyAdmin 2.6.1 と、<abbr title="Internet Information Services">IIS</abbr> 5.1 の <abbr title="Internet Server Application @@ -2715,7 +2694,7 @@ enabled.) Click <tt>OK</tt>.</li> <h4 id="faq1_33"> <a href="#faq1_33">1.33 64 ビットのシステムで PHP 5.0.4 を稼動させているときの mysqli -エクステンションに問題がありませんか？</a></h4> +拡張に問題がありませんか？</a></h4> <p> はい。この問題は phpMyAdmin にも影響を与えますので（「Call to undefined function pma_reloadnavigation（未定義の関数 pma_reloadnavigation の呼び出し）」）、PHP @@ -3656,7 +3635,7 @@ Format">PDF</abbr> スキーマを作れるのでしょう。</a></h4> <li>1 ページめの <abbr title="Portable Document Format">PDF</abbr> ページの名前を入力して「実行する (Go)」をクリックします。お望みなら「自動レイアウト (automatic layout)」機能を利用して、リンクされているすべてのテーブルを新しいページに配置することもできます。</li> - <li>新しいページの名前を選択して（「修正（Edit）」のラジオボタンが選択されているのを確かめて）、「実行（Go）」をクリックします。</li> + <li>新しいページの名前を選択して（「修正 (Edit)」のラジオボタンが選択されているのを確かめて）、「実行する (Go)」をクリックします。</li> <li>リストからテーブルを選択して、座標を入力し、「保存（Save）」をクリックします。<br /> 座標は相対座標です。図表の大きさはページにあわせて自動的に調整されます。最初にテーブルを配置するときは適当な（たとえば50×50のような）座標を選んでおいてください。「保存（Save）」をクリックしてからは、<a href="#wysiwyg">グラフィカルエディタ</a>を利用して要素を正確に配置することもできます。</li> @@ -4030,23 +4009,20 @@ href="https://sourceforge.net/projects/phpmyadmin/forums">https://sourceforge.ne <h4 id="faq7_2"> <a href="#faq7_2">7.2 メッセージを別の言語に翻訳したい／既存の翻訳を修正したいのですが、まずはどうすればよいでしょうか？</a></h4> -<p> Always use latest Git version of the po file to translate. You can -optionally translate online at our <a -href="http://l10n.cihar.com/">translation server</a> where you can also get -the latest po files and merge them with your translations. For creating a -new translation simply use <code>po/phpmyadmin.pot</code> and generate -<code>po/LANG_CODE.po</code> for your language (you can use <code>msginit -i -po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> to -do this) or ask on the mailing list to add the translation to the web -interface. More details are available on <a -href="http://wiki.phpmyadmin.net/pma/Gettext_for_translators">our wiki</a>. +<p> 翻訳する po ファイルは必ず Git の最新版をお使いください。<a +href="http://l10n.cihar.com/">翻訳サーバ</a>にてオンラインでいつでも翻訳することができます。また、翻訳サーバを通して、最新の +po +ファイルを入手したり、翻訳したものをマージすることもできます。新規の翻訳を作成するには、<code>po/phpmyadmin.pot</code> +を用いて新規用の <code>po/LANG_CODE.po</code> を生成します（この作業は <code>msginit -i +po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> +とすれば行えます）。もしくは、メーリングリストにてウェブインターフェース用の新規翻訳の追加を依頼してください。詳細は <a +href="http://wiki.phpmyadmin.net/pma/Gettext_for_translators">wiki</a> +をご覧ください。 </p> <p> - Please note that we try not to use HTML entities like &eacute; in the -translations, since we define the right character set in the file. With -HTML entities, the text on JavaScript messages would not display correctly. -However there are some entities that need to be there: quotes, non-breakable -spaces, ampersands, less than, greater than. + エンティティに注意するようにしてください。phpMyAdmin の翻訳では &eacute; のような HTML +エンティティは利用せず、ファイルに適切な文字セットを定義するようにしています。HTML エンティティを使うと JavaScript +のメッセージテキストが正しく表示できないためです。ただし、いくつかのエンティティは使う必要があります。クォート（&quot;）、分離されては困るスペース（&nbsp;）、＆（&amp;）、＜（&lt;）、＞（&gt;）です。 </p> <p> 翻訳は sourceforge.net の<a @@ -4060,18 +4036,15 @@ href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpmy </p> <p> - Documentation is being translated using po4a and gettext (see <a -href="http://www.phpmyadmin.net/home_page/docs.php">documentation</a> for -existing translations). To start, checkout <a + 現在、ドキュメントは po4a と gettext を用いて翻訳されています（翻訳されているものは <a +href="http://www.phpmyadmin.net/home_page/docs.php">Documentation</a> +を参照してください）。翻訳を始めるには、Git から <a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized…"><code>localized_docs/po</code></a> -from Git, or just go to the <a -href="https://l10n.cihar.com/projects/pmadoc/">translation server</a> and -translate it online. If your language is missing, just contact <a -href="mailto:michal@cihar.com">Michal Čihař</a>; he will add -it. If you prefer to directly translate the po files, please put updated -ones into our <a -href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation -tracker</a>. +をチェックアウトします。もしくは、<a +href="https://l10n.cihar.com/projects/pmadoc/">翻訳サーバ</a>にてオンライン翻訳するのもいいでしょう。翻訳したい言語がない場合は、<a +href="mailto:michal@cihar.com">Michal Čihař</a> +と連絡を取ってみてください。多分、彼が追加してくれます。直接 po ファイルを翻訳したい場合には、<a +href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">翻訳トラッカー</a>に翻訳したものをアップロードしてください。 </p> <h4 id="faq7_3"> @@ -4564,7 +4537,7 @@ Zigmantas, "Manuzhai". </p> -<h3>Original Credits of Version 2.1.0</h3> +<h3>バージョン 2.1.0 当時の貢献者一覧</h3> <p> このソフトのベースとなったのは Peter Kuppelwieser の MySQL-Webadmin です。PHP3 を使ってウェブベースの @@ -4628,17 +4601,15 @@ should have written their names here. default name of Apache's directory-level configuration file.</li> <li><a href="http://www.wikipedia.org/wiki/Blowfish_%28cipher%29">Blowfish</a> - a keyed, symmetric block cipher, designed in 1993 by Bruce Schneier.</li> - <li><a href="http://en.wikipedia.org/wiki/Web_browser">Browser (Web Browser)</a> -- a software application that enables a user to display and interact with -text, images, and other information typically located on a web page at a -website on the World Wide Web.</li> - <li><a href="http://www.wikipedia.org/wiki/Bzip2">bzip2</a> - a free -software/open source data compression algorithm and program developed by -Julian Seward.</li> - <li><a href="http://www.wikipedia.org/wiki/CGI">CGI (Common Gateway -Interface)</a> - an important World Wide Web technology that enables a -client web browser to request data from a program executed on the Web -server.</li> + <li><a +href="http://ja.wikipedia.org/wiki/%E3%82%A6%E3%82%A7%E3%83%96%E3%83%96%E3%83%A9%…">ブラウザ（ウェブブラウザ）</a> +- World Wide Web 上の Web サイトで Web +ページに一般的に置かれているテキスト、画像、その他の情報をユーザに対して表示や双方向通信することができるアプリケーション</li> + <li><a href="http://ja.wikipedia.org/wiki/Bzip2">bzip2</a> - Julian Seward +により開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよびプログラム</li> + <li><a href="http://ja.wikipedia.org/wiki/Common_Gateway_Interface">CGI (Common +Gateway Interface)</a> - Web サーバー上で実行されるプログラムでクライアントの Web +ブラウザのデータを要求に応えることができる重要な World Wide Web 技術</li> <li><a href="http://www.wikipedia.org/wiki/Changelog">Changelog</a> - a log or record of changes made to a project.</li> <li><a @@ -4669,12 +4640,11 @@ field or group of fields in a database record that point to a key field or group of fields forming a key of another database record in some (usually different) table.</li> <li><a href="http://www.fpdf.org/">FPDF (FreePDF)</a> - フリーの PDF ライブラリ</li> - <li><a id="gd" href="http://www.wikipedia.org/wiki/GD_Graphics_Library"> GD -Graphics Library</a> - a library by Thomas Boutell and others for -dynamically manipulating images.</li> - <li>GD2 - look at <a href="#gd">GD Graphics Library</a>.</li> - <li><a href="http://www.wikipedia.org/wiki/Gzip">gzip</a> - gzip is short for -GNU zip, a GNU free software file compression program.</li> + <li><a id="gd" href="http://ja.wikipedia.org/wiki/GD_Graphics_Library">GD +グラフィックライブラリ</a> - Thomas Boutell 他によって開発された動的に画像を操作するためのライブラリ</li> + <li>GD2 - → <a href="#gd">GD Graphics Library</a></li> + <li><a href="http://ja.wikipedia.org/wiki/Gzip">gzip</a> - GNU zip の略称で、GNU +フリーソフトウェアファイル圧縮プログラムのこと</li> <li><a href="http://ja.wikipedia.org/wiki/%E3%83%9B%E3%82%B9%E3%83%88%E3%82%B3%E3%83%B3%…">ホスト</a> - コンピュータネットワークに接続された任意のマシンのこと。ホスト名を持っているノード。</li> @@ -4711,14 +4681,12 @@ Services (IIS).</li> <li><a href="http://www.wikipedia.org/wiki/LaTeX">L<sup>A</sup>T<sub><big>E</big></sub>X</a> - a document preparation system for the T<sub>E</sub>X typesetting program.</li> - <li><a href="http://www.wikipedia.org/wiki/Mac">Mac (Apple Macintosh)</a> - line -of personal computers is designed, developed, manufactured, and marketed by -Apple Computer.</li> + <li><a href="http://ja.wikipedia.org/wiki/Macintosh">Mac (Apple Macintosh)</a> - +Apple Computer が設計、開発、製造、販売しているパソコンの一製品</li> <li><a id="glossar_mac_os_x" -href="http://www.wikipedia.org/wiki/Mac_OS_X"><acronym title="Apple -Macintosh">Mac</acronym> <abbr title="operating system">OS</abbr> X</a> - -the operating system which is included with all currently shipping Apple -Macintosh computers in the consumer and professional markets.</li> +href="http://ja.wikipedia.org/wiki/Mac_OS_X"><acronym title="Apple +Macintosh">Mac</acronym> <abbr title="オペレーティング・システム">OS</abbr> X</a> - +一般消費者および専門家の市場向けに現在出荷されている全ての Apple Macintosh コンピュータに含まれているオペレーティングシステム</li> <li><a href="http://www.wikipedia.org/wiki/MCrypt">MCrypt</a> - a cryptographic library.</li> <li><a href="http://php.net/mcrypt">mcrypt</a> - the MCrypt PHP extension.</li> @@ -4726,9 +4694,10 @@ library.</li> Mail Extensions)</a> - an Internet Standard for the format of e-mail.</li> <li><a href="http://www.wikipedia.org/wiki/module">module</a> - some sort of extension for the Apache Webserver.</li> - <li><a href="http://www.wikipedia.org/wiki/MySQL">MySQL</a> - a multithreaded, -multi-user, SQL (Structured Query Language) Database Management System -(DBMS).</li> + <li><a href="http://ja.wikipedia.org/wiki/MySQL">MySQL</a> - +マルチスレッド、マルチユーザー、<abbr title="structured query +language">SQL</abbr>が使えるデータベース管理システム (<abbr title="Database Management +System">DBMS</abbr>)</li> <li><a href="http://php.net/mysqli">mysqli</a> - 改良された MySQL クライアントの PHP 拡張モジュール</li> <li><a href="http://php.net/mysql">mysql</a> - MySQL クライアントの PHP 拡張モジュール</li> <li><a href="http://ja.wikipedia.org/wiki/OpenDocument">OpenDocument</a> - @@ -4781,8 +4750,8 @@ identified by a label or key or by it?s position in relation to other items.</li <li>Table type</li> <li><a href="http://www.wikipedia.org/wiki/Tar_%28file_format%29">tar</a> - a type of archive file format: the Tape ARchive format.</li> - <li><a href="http://www.wikipedia.org/wiki/TCP">TCP (Transmission Control -Protocol)</a> - one of the core protocols of the Internet protocol suite.</li> + <li><a href="http://ja.wikipedia.org/wiki/Transmission_Control_Protocol">TCP +(Transmission Control Protocol)</a> - インターネット・プロトコル群の中核となるプロトコルの一つ</li> <li><a href="http://www.acko.net/node/56">UFPDF</a> - FPDF 用の Unicode/UTF-8 拡張</li> <li><a href="http://www.wikipedia.org/wiki/URL">URL (Uniform Resource Locator)</a> - a sequence of characters, conforming to a standardized @@ -4798,8 +4767,8 @@ different kinds of data.</li> <li><a href="http://ja.wikipedia.org/wiki/ZIP_%28%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E3…">ZIP</a> - 一般的なデータ圧縮とアーカイブ形式</li> - <li><a href="http://www.wikipedia.org/wiki/Zlib">zlib</a> - an open-source, -cross-platform data compression library by Jean-loup Gailly and Mark Adler.</li> + <li><a href="http://ja.wikipedia.org/wiki/Zlib">zlib</a> - Jean-loup Gailly および +Mark Adlerによるオープンソースでクロスプラットフォームのデータ圧縮ライブラリ</li> </ul> </div> diff --git a/output/ja/TODO b/output/ja/TODO index 917d064..0bf19e1 100644 --- a/output/ja/TODO +++ b/output/ja/TODO @@ -1,7 +1,7 @@ phpMyAdmin - ToDo ================= -We are currently using the Sourceforge Tracker as Todo list: +現在は Todo リストとして Sourceforge のトラッカーを使用しています。 http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html index 190ba85..5db501f 100644 --- a/output/tr/Documentation.html +++ b/output/tr/Documentation.html @@ -1361,9 +1361,9 @@ tablo sayılarını saymak. <dt><span id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span> dizgi</dt> - <dd>Name of session which will be used for signon authentication method. You -should use something different than <code>phpMyAdmin</code>, because this is -session which phpMyAdmin uses internally. + <dd>Oturum açma kimlik doğrulaması yöntemi için kullanılacak oturumun +adı. <code>phpMyAdmin</code>'den farklı bir şey kullanmalısınız çünkü bu +phpMyAdmin'in dahili olarak kullandığı oturumdur. </dd> <dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span> dizgi</dt> @@ -1890,122 +1890,128 @@ edilir.</li> <dt id="cfg_CheckConfigurationPermissions">$cfg['CheckConfigurationPermissions'] boolean</dt> <dd> - We normally check the permissions on the configuration file to ensure it's -not world writable. However, phpMyAdmin could be installed on a NTFS -filesystem mounted on a non-Windows server, in which case the permissions -seems wrong but in fact cannot be detected. In this case a sysadmin would -set this parameter to <tt>FALSE</tt>. Default is <tt>TRUE</tt>. + Biz normal olarak herkes tarafından yazılabilir olmadığından emin olmak için +yapılandırma dosyasındaki izinleri kontrol ederiz. Ancak phpMyAdmin, izinler +yanlış göründüğü ama aslında algılanamadığı durumda, Windows olmayan +sunucuya bağlanmış NTFS dosya sistemi üzerine kurulabilir. Bu durumda +sysadmin bu parametreyi <tt>FALSE</tt> olarak ayarlayacaktır. Varsayılan +<tt>TRUE</tt>'dur. </dd> - <dt id="cfg_LinkLengthLimit">$cfg['LinkLengthLimit'] integer</dt> + <dt id="cfg_LinkLengthLimit">$cfg['LinkLengthLimit'] tam sayı</dt> <dd> - Limit for length of URL in links. When length would be above this limit, it -is replaced by form with button. This is required as some web servers (IIS) -have problems with long URLs. Default is <code>1000</code>. + Bağlantılardaki URL uzunluğu için sınırdır. Uzunluk bu sınırın üzerinde +olduğunda, düğmeyle birlikte form tarafından değiştirilir. Bu uzun URL'lerle +sorunları olan bazı web sunucuları (IIS) için gerekir. Varsayılan +<code>1000</code>'dir. </dd> - <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt> - <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>. + <dt id="cfg_NaviWidth">$cfg['NaviWidth'] tam sayı</dt> + <dd>Piksel olarak rehber çerçeve +genişliği. <tt>themes/themename/layout.inc.php</tt>'ye bakın. </dd> - <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS -color for background]<br /> - <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS -color for background] + <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> dizgi [arkaplan +için CSS rengi]<br /> + <span id="cfg_MainBackground">$cfg['MainBackground']</span> dizgi [arkaplan +için CSS rengi] </dt> - <dd>The background styles used for both the frames. See -<tt>themes/themename/layout.inc.php</tt>.</dd> + <dd>Her iki çerçeve için kullanılan arkaplan +stilleri. <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd> - <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br /> - <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS -color]</dt> - <dd>The style used for the pointer in the navi frame. See -<tt>themes/themename/layout.inc.php</tt>.</dd> + <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] dizgi [arkaplan için CSS rengi]<br /> + <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> dizgi [CSS +rengi]</dt> + <dd>Rehber çerçevedeki imleç için kulanılan +stil. <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd> <dt id="cfg_LeftPointerEnable">$cfg['LeftPointerEnable'] boolean</dt> - <dd>A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight is -<tt>FALSE</tt>).</dd> + <dd><tt>TRUE</tt> değeri rehber imleçi etkinleştirir (LeftFrameLight +<tt>FALSE</tt> iken).</dd> - <dt id="cfg_Border">$cfg['Border'] integer</dt> - <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>. + <dt id="cfg_Border">$cfg['Border'] tam sayı</dt> + <dd>Tabloların kenar boyutudur. <tt>themes/themename/layout.inc.php</tt>'ye +bakın. </dd> - <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br /> - <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt> - <dd>The style used for table headers. See -<tt>themes/themename/layout.inc.php</tt>.</dd> + <dt id="cfg_ThBackground">$cfg['ThBackground'] dizgi [arkaplan için CSS rengi]<br /> + <span id="cfg_ThColor">$cfg['ThColor']</span> dizgi [CSS rengi]</dt> + <dd>Tablo başlıkları için kullanılan +stil. <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd> - <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt> - <dd>The color (HTML) #1 for table rows. See -<tt>themes/themename/layout.inc.php</tt>. + <dt id="cfg_BgcolorOne">$cfg['BgOne'] dizgi [CSS rengi]</dt> + <dd>Tablo satırları için renk (HTML) +#1. <tt>themes/themename/layout.inc.php</tt>'ye bakın. </dd> - <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt> - <dd>The color (HTML) #2 for table rows. See -<tt>themes/themename/layout.inc.php</tt>. + <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] dizgi [CSS rengi]</dt> + <dd>Tablo satırları için renk (HTML) +#2. <tt>themes/themename/layout.inc.php</tt>'ye bakın. </dd> - <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground'] -</span>string [CSS color]<br /> - <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string -[CSS color]<br /> - <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground'] -</span>string [CSS color]<br /> - <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string -[CSS color] + <dt><span +id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground']</span> +dizgi [CSS rengi]<br /> + <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor']</span> dizgi +[CSS rengi]<br /> + <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground']</span> +dizgi [CSS rengi]<br /> + <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor']</span> dizgi [CSS +rengi] </dt> - <dd>The colors (HTML) uses for the pointer and the marker in browse mode.<br /> - The former feature highlights the row over which your mouse is passing and -the latter lets you visually mark/unmark rows by clicking on -them. Highlighting / marking a column is done by hovering over / clicking -the column's header (outside of the text).<br /> - See <tt>themes/themename/layout.inc.php</tt>.</dd> + <dd>Gözatma kipinde imleç ve işaretleyici için kullanılan renkler (HTML).<br /> + Biçimlendirici özelliği, farenizle üstünden geçerken satırı vurgular ve +sonrasında onlara tıklayarak görsel olarak işaretlemenize/işareti +kaldırmanıza izin verir. Sütunun başlığının (metnin dışına) üzerinde kalmak +/ tıklamak, sütunun vurgulanmasını / işaretlenmesini yapar.<br /> + <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd> - <dt id="cfg_FontFamily">$cfg['FontFamily'] string</dt> - <dd>You put here a valid CSS font family value, for example <tt>arial, + <dt id="cfg_FontFamily">$cfg['FontFamily'] dizgi</dt> + <dd>Buraya geçerli bir CSS yazı tipi ailesi değeri koyun, örneğin <tt>arial, sans-serif</tt>.<br /> - See <tt>themes/themename/layout.inc.php</tt>.</dd> + <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd> - <dt id="cfg_FontFamilyFixed">$cfg['FontFamilyFixed'] string</dt> - <dd>You put here a valid CSS font family value, for example -<tt>monospace</tt>. This one is used in textarea.<br /> - See <tt>themes/themename/layout.inc.php</tt>.</dd> + <dt id="cfg_FontFamilyFixed">$cfg['FontFamilyFixed'] dizgi</dt> + <dd>Buraya geçerli bir CSS yazı tipi ailesi değeri koyun, örneğin +<tt>monospace</tt>. Bu metin alanında kullanılır.<br /> + <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd> <dt id="cfg_BrowsePointerEnable">$cfg['BrowsePointerEnable'] boolean</dt> - <dd>Whether to activate the browse pointer or not.</dd> + <dd>Gözatma imlecini etkinleştirir ya da etkinleştirmez.</dd> <dt id="cfg_BrowseMarkerEnable">$cfg['BrowseMarkerEnable'] boolean</dt> - <dd>Whether to activate the browse marker or not.</dd> + <dd>Gözatma işaretleyicisini etkinleştirir ya da etkinleştirmez.</dd> - <dt><span id="cfg_TextareaCols">$cfg['TextareaCols'] </span>integer<br /> - <span id="cfg_TextareaRows">$cfg['TextareaRows'] </span>integer<br /> - <span id="cfg_CharTextareaCols">$cfg['CharTextareaCols'] </span>integer<br /> - <span id="cfg_CharTextareaRows">$cfg['CharTextareaRows'] </span>integer + <dt><span id="cfg_TextareaCols">$cfg['TextareaCols']</span> tam sayı<br /> + <span id="cfg_TextareaRows">$cfg['TextareaRows']</span> tam sayı<br /> + <span id="cfg_CharTextareaCols">$cfg['CharTextareaCols']</span> tam sayı<br /> + <span id="cfg_CharTextareaRows">$cfg['CharTextareaRows']</span> tam sayı </dt> - <dd>Number of columns and rows for the textareas.<br /> - This value will be emphasized (*2) for <abbr title="structured query -language">SQL</abbr> query textareas and (*1.25) for <abbr title="structured -query language">SQL</abbr> textareas inside the query window.<br /> - The Char* values are used for CHAR and VARCHAR editing (if configured via <a -href="#cfg_CharEditing">$cfg['CharEditing']</a>).</dd> - - <dt><span id="cfg_LongtextDoubleTextarea">$cfg['LongtextDoubleTextarea'] -</span>boolean + <dd>Metin alanı için sütun ve satır sayısı.<br /> + Bu değer, sorgu penceresi içerisindeki abbr title="structured query +language">SQL</abbr> sorgu metin alanı için (*2) ve <abbr title="structured +query language">SQL</abbr> metin alanı için (*1.25) olan önemi +belirtecektir.<br /> + Char* değerleri CHAR ve VARCHAR düzenlemesi için kullanılır (eğer <a +href="#cfg_CharEditing">$cfg['CharEditing']</a> yapılandırılmışsa).</dd> + + <dt><span id="cfg_LongtextDoubleTextarea">$cfg['LongtextDoubleTextarea']</span> +boolean </dt> - <dd>Defines whether textarea for LONGTEXT columns should have double size.</dd> + <dd>LONGTEXT sütunlar için metin alanının çift boyut olup olmayacağını tanımlar.</dd> - <dt><span id="cfg_TextareaAutoSelect">$cfg['TextareaAutoSelect'] </span>boolean + <dt><span id="cfg_TextareaAutoSelect">$cfg['TextareaAutoSelect']</span> boolean </dt> - <dd>Defines if the whole textarea of the query box will be selected on click.</dd> + <dd>Sorgu kutusunun bütün metin alanı tıklamayla seçilecekse tanımlar.</dd> - <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt> - <dd>Maximum number of characters shown in any non-numeric field on browse view. -Can be turned off by a toggle button on the browse page.</dd> + <dt id="cfg_LimitChars">$cfg['LimitChars'] tam sayı</dt> + <dd>Gözatma görünümünde sayısal olmayan herhangi bir alanda gösterilen en fazla +karakter sayısı. Gözatma sayfasında bir geçiş düğmesiyle kapatılabilir.</dd> - <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean -<span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight'] -</span>boolean + <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft']</span> boolean +<span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight']</span> +boolean </dt> <dd>Defines the place where table row links (Edit, Inline edit, Copy, Delete) would be put when tables contents are displayed (you may have them displayed diff --git a/po/es.po b/po/es.po index 72be2fc..15bf6f7 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-20 08:29+0300\n" -"PO-Revision-Date: 2011-05-03 14:09+0200\n" +"PO-Revision-Date: 2011-05-21 21:17+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -3431,6 +3431,9 @@ msgid "" "should use something different than <code>phpMyAdmin</code>, because this is " "session which phpMyAdmin uses internally." msgstr "" +"El nombre de la sesión a utilizar para el método de autenticación signon. " +"Deberías de utilizar algo distinto a <code>phpMyAdmin</code> ya que ese es " +"el nombre de sesión phpMyAdmin utiliza internamente." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1286 diff --git a/po/ja.po b/po/ja.po index 5916b55..7ba8b0e 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-20 08:29+0300\n" -"PO-Revision-Date: 2011-05-19 10:55+0200\n" +"PO-Revision-Date: 2011-05-22 04:35+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: Japan <jp(a)li.org>\n" "Language: ja\n" @@ -99,7 +99,7 @@ msgstr "<a href=\"Documentation.html#glossary\">用語集</a>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:43 msgid "<a href=\"http://www.phpmyadmin.net/\"> phpMyAdmin homepage</a>" -msgstr "<a href=\"http://www.phpmyadmin.net/\"> phpMyAdmin ホームページ</a>" +msgstr "<a href=\"http://www.phpmyadmin.net/\">phpMyAdmin オフィシャルサイト</a>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:45 @@ -963,9 +963,8 @@ msgid "" "where you want to give users access to their own database and don't want " "them to play around with others." msgstr "" -"<b>マルチユーザ環境</b>では、ユーザが自分のデータベースにアクセスできるよう、" -"また他人のデータベースにいたずらできないよう、<abbr title=\"HyperText " -"Transfer Protocol\">HTTP</abbr>／クッキー認証モードにするのがお奨めです。" +"<b>マルチユーザ環境</b>では、ユーザが自分のデータベースにアクセスできるよう、また他人のデータベースにいたずらできないよう、<abbr " +"title=\"HyperText Transfer Protocol\">HTTP</abbr>／クッキー認証モードにするのがお勧めです。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:381 @@ -1024,6 +1023,7 @@ msgid "" "Note: this section is only applicable if your MySQL server is running with " "<tt>--skip-show-database</tt>." msgstr "" +"注：この項目は、MySQL サーバが <tt>--skip-show-database</tt> を適用して稼動している場合のみに使用できます。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:400 @@ -1058,16 +1058,15 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:412 -#, fuzzy msgid "" "The following example assumes you want to use <tt>pma</tt> as the " "controluser and <tt>pmapass</tt> as the controlpass, but <b>this is only an " "example: use something else in your file!</b> Input these statements from " "the phpMyAdmin SQL Query window or mysql command–line client." msgstr "" -"下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt> を管理パスワードと想" -"定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてく" -"ださい！</b>" +"下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt> " +"を管理パスワードと想定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてください！</b> phpMyAdmin の SQL " +"クエリウィンドウまたは mysql コマンドラインクライアントからこれらのコマンドを入力します。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:417 @@ -1252,13 +1251,10 @@ msgstr "" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:491 -#, fuzzy msgid "" "With this mode, the user can truly log out of phpMyAdmin and log in back " "with the same username." -msgstr "" -"このモードでは、ユーザが本当に phpMyAdmin からログアウトしたり、同じユーザ名" -"で再ログインしたりできます。" +msgstr "このモードでは、ユーザは phpMyAdmin のログアウトが確実に行え、同じユーザー名でログインし直すことができます。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:493 @@ -1806,9 +1802,8 @@ msgid "" "available with php 5.0.0 and is the recommended way to connect to a server " "running MySQL 4.1.x or newer." msgstr "" -"<tt><i>mysqli</i></tt> : MySQL 拡張の改良版です。この拡張は PHP 5.0.0 で利用" -"できるようになりました。MySQL 4.1.x 以降が稼動しているサーバに接続する場合は" -"お奨めです。" +"<tt><i>mysqli</i></tt> : MySQL 拡張の改良版です。この拡張は PHP 5.0.0 で利用できるようになりました。MySQL " +"4.1.x 以降が稼動しているサーバに接続する場合はお勧めです。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:708 @@ -2935,8 +2930,7 @@ msgstr "" msgid "" "Recommended to set to FALSE, when you are sure, your table structure is up " "to date." -msgstr "" -"確実にテーブル構造が最新になっているときは FALSE にするのがおすすめです。" +msgstr "確実にテーブル構造が最新になっているときは FALSE にするのがお勧めです。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1193 @@ -3049,8 +3043,8 @@ msgid "" "<span id=\"cfg_Servers_AllowDeny_rules\">$cfg['Servers'][$i]['AllowDeny']" "['rules']</span> array of strings" msgstr "" -"<span id=\"cfg_Servers_AllowDeny_rules\">$cfg['Servers'][$i]['AllowDeny']" -"['rules']</span> strings の array" +"<span id=\"cfg_Servers_AllowDeny_rules\">$cfg['Servers'][$i]['AllowDeny']['rul" +"es']</span> 文字列の配列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1235 @@ -3079,9 +3073,8 @@ msgid "" "(please note that those containing SERVER_ADDRESS might not be available on " "all webservers):" msgstr "" -"また、<i>ipmask</i> フィールドでもいくつかショートカットが利用できます（ご注" -"意ください。SERVER_ADDRESSの部分はどんなサーバでも利用できるとは限りませ" -"ん）：" +"また、<i>ipmask</i> フィールドでもいくつかショートカットが利用できます（SERVER_ADDRESS " +"の部分はどんなウェブサーバでも利用できるとは限りませんので注意してください）。" #. type: Content of: <html><body><div><dl><dd><pre> #: orig-docs/Documentation.html:1247 @@ -3093,6 +3086,11 @@ msgid "" "'localnetB' -> SERVER_ADDRESS/16\n" "'localnetC' -> SERVER_ADDRESS/24\n" msgstr "" +"'all' -> 0.0.0.0/0\n" +"'localhost' -> 127.0.0.1/8\n" +"'localnetA' -> SERVER_ADDRESS/8\n" +"'localnetB' -> SERVER_ADDRESS/16\n" +"'localnetC' -> SERVER_ADDRESS/24\n" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1254 @@ -3109,55 +3107,56 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1259 -#, fuzzy msgid "" "For the <abbr title=\"Internet Protocol\">IP</abbr> matching system, the " "following work:" -msgstr "IP のマッチング規則としては、下記が利用できます：" +msgstr "<abbr title=\"インターネット・プロトコル\">IP</abbr> のマッチング規則としては、下記が利用できます。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1261 -#, fuzzy msgid "" "<tt>xxx.xxx.xxx.xxx</tt> (an exact <abbr title=\"Internet Protocol\">IP</" "abbr> address)" -msgstr "<tt>xxx.xxx.xxx.xxx</tt> （単一の IP アドレスそのもの）" +msgstr "" +"<tt>xxx.xxx.xxx.xxx</tt> （単一の <abbr title=\"インターネット・プロトコル\">IP</abbr> " +"アドレスそのもの）" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1262 -#, fuzzy msgid "" "<tt>xxx.xxx.xxx.[yyy-zzz]</tt> (an <abbr title=\"Internet Protocol\">IP</" "abbr> address range)" -msgstr "<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>（IP アドレスの一部範囲指定）" +msgstr "" +"<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>（<abbr title=\"インターネット・プロトコル\">IP</abbr> " +"アドレスの範囲指定）" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1263 -#, fuzzy msgid "" "<tt>xxx.xxx.xxx.xxx/nn</tt> (CIDR, Classless Inter-Domain Routing type <abbr " "title=\"Internet Protocol\">IP</abbr> addresses)" msgstr "" -"<tt>xxx.xxx.xxx.xxx/nn</tt> （CIDR（Classless Inter-Domain Routing）タイプの " -"IP アドレス）" +"<tt>xxx.xxx.xxx.xxx/nn</tt> （CIDR（Classless Inter-Domain Routing）タイプの <abbr " +"title=\"インターネット・プロトコル\">IP</abbr> アドレス）" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1264 msgid "But the following does not work:" -msgstr "ただし、下記は利用できません：" +msgstr "ただし、以下は利用できません。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1265 -#, fuzzy msgid "" "<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt> (partial <abbr title=\"Internet Protocol" "\">IP</abbr> address range)" -msgstr "<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>（IP アドレスの一部範囲指定）" +msgstr "" +"<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>（<abbr title=\"インターネット・プロトコル\">IP</abbr> " +"アドレスの一部範囲指定）" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1267 msgid "Also IPv6 addresses are not supported." -msgstr "" +msgstr "それと、IPv6 アドレスもサポートしていません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1269 @@ -3584,7 +3583,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1401 msgid "$cfg['LoginCookieStore'] integer [number of seconds]" -msgstr "$cfg['LoginCookieStore'] integer [秒数]" +msgstr "$cfg['LoginCookieStore'] 整数 [秒数]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1402 @@ -3638,14 +3637,13 @@ msgstr "$cfg['VerboseMultiSubmit'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1420 -#, fuzzy msgid "" "Define whether phpMyAdmin will output the results of each query of a multi-" "query statement embedded into the <abbr title=\"structured query language" "\">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>." msgstr "" -"複数のクエリを含む文のそれぞれのクエリの結果を SQL 出力のなかにインラインコメ" -"ントとして埋め込むかどうかを定義します。デフォルトは <tt>TRUE</tt> です。" +"マルチクエリを含む文のそれぞれのクエリの結果を <abbr title=\"structured query language\">SQL</abbr> " +"出力のなかにインラインコメントとして埋め込むかどうかを定義します。デフォルトは <tt>TRUE</tt> です。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1425 @@ -3682,9 +3680,8 @@ msgstr "$cfg['Error_Handler']['display'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1435 -#, fuzzy msgid "Whether to display errors from PHP or not." -msgstr "表示マーカを有効にするかどうか。" +msgstr "PHP からのエラーを表示するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1437 @@ -3693,9 +3690,8 @@ msgstr "$cfg['Error_Handler']['gather'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1438 -#, fuzzy msgid "Whether to gather errors from PHP or not." -msgstr "表示マーカを有効にするかどうか。" +msgstr "PHP からのエラーを収集するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1440 @@ -3736,7 +3732,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1453 msgid "$cfg['LeftFrameDBSeparator'] string or array" -msgstr "$cfg['LeftFrameDBSeparator'] string または array" +msgstr "$cfg['LeftFrameDBSeparator'] 文字列または配列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1455 @@ -3750,7 +3746,7 @@ msgstr "データベース名をツリー表示するときに利用する区切 #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1459 msgid "$cfg['LeftFrameTableSeparator'] string" -msgstr "$cfg['LeftFrameTableSeparator'] string" +msgstr "$cfg['LeftFrameTableSeparator'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1460 @@ -3773,7 +3769,7 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1468 msgid "$cfg['LeftFrameTableLevel'] string" -msgstr "$cfg['LeftFrameTableLevel'] string" +msgstr "$cfg['LeftFrameTableLevel'] 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1469 @@ -4208,9 +4204,7 @@ msgstr "$cfg['CharEditing'] 文字列" msgid "" "Defines which type of editing controls should be used for CHAR and VARCHAR " "columns. Possible values are:" -msgstr "" -"CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義しま" -"す。可能な値は次の通りです：" +msgstr "CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義します。可能な値は次の通りです。" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:1613 @@ -5315,19 +5309,18 @@ msgid "" "".sql.bz2" or ".sql.gz" if support for compressed " "formats is enabled)." msgstr "" -"ご注意ください。ファイル名にはかならず「.sql」（圧縮形式のサポートが有効に" -"なっている場合は「sql.bz2」や「sql.gz」）という拡張子でなければなりません。" +"拡張子に注意してください。ファイル名の末尾は必ず「.sql」（圧縮形式のサポートが有効になっている場合は「.sql.bz2」や「.sql.gz」）でなけ" +"ればなりません。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1975 -#, fuzzy msgid "" "This feature is useful when your file is too big to be uploaded via <abbr " "title=\"HyperText Transfer Protocol\">HTTP</abbr>, or when file uploads are " "disabled in PHP." msgstr "" -"この機能は HTTP でアップロードするには大きすぎるファイルがあるときや、PHP の" -"ファイルアップロード機能が無効になっている場合に便利です。" +"この機能は <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> " +"でアップロードするには大きすぎるファイルがあるときや、PHP のファイルアップロード機能が無効になっている場合に便利です。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1979 orig-docs/Documentation.html:1998 @@ -5335,22 +5328,17 @@ msgid "" "Please note that if PHP is running in safe mode, this directory must be " "owned by the same user as the owner of the phpMyAdmin scripts." msgstr "" -"#-#-#-#-# Documentation_ja.html:1149 Documentation_ja.html:1158 #-#-#-#-#\n" -"ご注意ください。PHP がセーフモードになっている場合、このディレクトリは " -"phpMyAdmin スクリプトのオーナーと同じユーザがオーナーになっている必要がありま" -"す。\n" -"#-#-#-#-# Documentation_ja.html:1169 #-#-#-#-#\n" -"また、PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin スク" -"リプトのオーナーと同じユーザがオーナーになっている必要があります。" +"このディレクトリのオーナに注意してください。PHP がセーフモードになっている場合、phpMyAdmin " +"スクリプトのオーナと同じユーザがオーナになっていなければなりません。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1983 -#, fuzzy msgid "" "See also <a href=\"#faq1_16\"> <abbr title=\"Frequently Asked Questions" "\">FAQ</abbr> 1.16</a> for alternatives." msgstr "" -"また、別の方法もあります。<a href=\"#faq1_16\">FAQ 1.16</a>をご覧ください。" +"また、別の方法もあります。<a href=\"#faq1_16\"><abbr title=\"よくある質問\">FAQ</abbr> " +"1.16</a>をご覧ください。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1988 @@ -5364,13 +5352,10 @@ msgstr "ダンプを保存するディレクトリ名。" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1995 -#, fuzzy msgid "" "Please note that the directory must exist and has to be writable for the " "user running webserver." -msgstr "" -"ご注意ください。このディレクトリはウェブサーバの実行ユーザが書き込みできるよ" -"うになっている必要があります。" +msgstr "書き込み権限にご注意ください。このディレクトリはウェブサーバの実行ユーザが書き込みできるようになっている必要があります。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2002 @@ -6955,15 +6940,13 @@ msgstr "<a href=\"#faqsynchronization\">同期</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2573 -#, fuzzy msgid "" "Please have a look at our <a href=\"http://www.phpmyadmin.net/home_page/docs." "php\">Link section</a> on the official phpMyAdmin homepage for in-depth " "coverage of phpMyAdmin's features and or interface." msgstr "" -"phpMyAdmin の機能やインタフェースの詳細については phpMyAdmin のオフィシャル" -"ホームページにある <a href=\"http://www.phpmyadmin.net/home_page/docs.php" -"\">Link セクション</a> をご覧ください。" +"phpMyAdmin の機能やインタフェースの詳細については phpMyAdmin のオフィシャルページにある <a " +"href=\"http://www.phpmyadmin.net/home_page/docs.php\">Link セクション</a> をご覧ください。" #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:2578 @@ -6972,28 +6955,25 @@ msgstr "サーバ" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2581 -#, fuzzy msgid "" "<a href=\"#faq1_1\">1.1 My server is crashing each time a specific action is " "required or phpMyAdmin sends a blank page or a page full of cryptic " "characters to my browser, what can I do?</a>" msgstr "" -"[<a href=\"#faq1_1\">1.1</a>] PHP 4+ を走らせているのですが、特定のアクション" -"が要求されるたびにサーバがクラッシュしたり、ブラウザに空白のページや暗号のよ" -"うな文字だらけのページが表示されます。どうしたらよいのでしょう。" +"<a href=\"#faq1_1\">1.1 特定のアクションが要求されるたびにサーバがクラッシュしたり、ブラウザに空白のページや暗号のような文字だらけの" +"ページが表示されます。どうしたらよいのでしょうか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2585 -#, fuzzy msgid "" "Try to set the <a href=\"#cfg_OBGzip\" class=\"configrule\">$cfg['OBGzip']</" "a> directive to <tt>FALSE</tt> in your <i>config.inc.php</i> file and the " "<tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php " "configuration file." msgstr "" -"<i>config.inc.php</i> ファイルの <tt>$cfg['OBGzip']</tt> ディレクティブを " -"<tt>FALSE</tt> に、php の設定ファイルの <tt>zlib.output_compression</tt> ディ" -"レクティブを <tt>Off</tt> にしてみてください。" +"<i>config.inc.php</i> ファイルの <a href=\"#cfg_OBGzip\" " +"class=\"configrule\">$cfg['OBGzip']</a> ディレクティブを <tt>FALSE</tt> に、PHP の設定ファイルの " +"<tt>zlib.output_compression</tt> ディレクティブを <tt>Off</tt> にしてみてください。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2591 @@ -7122,17 +7102,15 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2641 -#, fuzzy msgid "" "These features are based on the <tt>gzencode()</tt> and <tt>bzcompress()</" "tt> PHP functions to be more independent of the platform (Unix/Windows, Safe " "Mode or not, and so on). So, you must have Zlib/Bzip2 support (<tt>--with-" "zlib</tt> and <tt>--with-bz2</tt>)." msgstr "" -"これらの機能はプラットフォーム（Unix か Windows か、セーフモードかどうか、な" -"ど）からの独立性を高めるために PHP の <tt>gzencode()</tt> と <tt>bzcompress()" -"</tt> 関数をベースにしています。そのため、PHP4  ≧ 4.0.4 と Zlib/" -"Bzip2 サポート（<tt>--with-zlib</tt> と <tt>--with-bz2</tt>）が必要です。" +"これらの機能はプラットフォーム（Unix か Windows か、セーフモードかどうか、など）からの独立性を高めるために PHP の " +"<tt>gzencode()</tt> と <tt>bzcompress()</tt> 関数をベースにしています。そのため、Zlib/Bzip2 " +"サポート (<tt>--with-zlib</tt> と <tt>--with-bz2</tt>) が必要です。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2647 @@ -7214,15 +7192,13 @@ msgstr "" msgid "" "As suggested by "Rob M" in the phpWizard forum, add this line to " "your <i>httpd.conf</i>:" -msgstr "" -"phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に次の行" -"を追加してください：" +msgstr "phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に以下の行を追加してください。" #. type: Content of: <html><body><div><pre> #: orig-docs/Documentation.html:2675 -#, fuzzy, no-wrap +#, no-wrap msgid "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown" -msgstr "    <tt>SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown</tt>" +msgstr "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2677 @@ -7528,8 +7504,7 @@ msgid "" "extension, please check PHP Configuration".</a>" msgstr "" "<a href=\"#faqmysql\">1.20 「cannot load MySQL extension, please check PHP " -"Configuration（MySQL エクステンションをロードできません。PHP の設定をチェック" -"してください）」というエラーが出ます。</a>" +"Configuration（MySQL 拡張を読み込めません。PHP の設定をチェックしてください）」というエラーが出ます。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2799 @@ -7875,13 +7850,13 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2935 -#, fuzzy msgid "" "<a href=\"#faq1_32\">1.32 Can I use <abbr title=\"HyperText Transfer Protocol" "\">HTTP</abbr> authentication with <abbr title=\"Internet Information " "Services\">IIS</abbr>?</a>" msgstr "" -"HTTP 認証のかわりに利用できます（たとえば IIS を走らせている場合など）。" +"<a href=\"#faq1_32\"><abbr title=\"Internet Information Services\">IIS</abbr> でも " +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> 認証を利用できますか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2937 @@ -7934,8 +7909,8 @@ msgid "" "<a href=\"#faq1_33\">1.33 Is there a problem with the mysqli extension when " "running PHP 5.0.4 on 64-bit systems?</a>" msgstr "" -"<a href=\"#faq1_33\">1.33 64 ビットのシステムで PHP 5.0.4 を稼動させていると" -"きの mysqli エクステンションに問題がありませんか？</a>" +"<a href=\"#faq1_33\">1.33 64 ビットのシステムで PHP 5.0.4 を稼動させているときの mysqli " +"拡張に問題がありませんか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2954 @@ -10363,9 +10338,7 @@ msgstr "" msgid "" "Select the name of the new page (making sure the Edit radio button is " "selected) and click Go." -msgstr "" -"新しいページの名前を選択して（「修正（Edit）」のラジオボタンが選択されている" -"のを確かめて）、「実行（Go）」をクリックします。" +msgstr "新しいページの名前を選択して（「修正 (Edit)」のラジオボタンが選択されているのを確かめて）、「実行する (Go)」をクリックします。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:3945 @@ -11429,10 +11402,17 @@ msgid "" "on <a href=\"http://wiki.phpmyadmin.net/pma/Gettext_for_translators\">our " "wiki</a>." msgstr "" +"翻訳する po ファイルは必ず Git の最新版をお使いください。<a href=\"http://l10n.cihar.com/\">翻訳サーバ</a>に" +"てオンラインでいつでも翻訳することができます。また、翻訳サーバを通して、最新の po " +"ファイルを入手したり、翻訳したものをマージすることもできます。新規の翻訳を作成するには、<code>po/phpmyadmin.pot</code> " +"を用いて新規用の <code>po/LANG_CODE.po</code> を生成します（この作業は <code>msginit -i " +"po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> " +"とすれば行えます）。もしくは、メーリングリストにてウェブインターフェース用の新規翻訳の追加を依頼してください。詳細は <a " +"href=\"http://wiki.phpmyadmin.net/pma/Gettext_for_translators\">wiki</a> " +"をご覧ください。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4354 -#, fuzzy msgid "" "Please note that we try not to use HTML entities like &eacute; in the " "translations, since we define the right character set in the file. With " @@ -11440,12 +11420,10 @@ msgid "" "However there are some entities that need to be there: quotes, non-breakable " "spaces, ampersands, less than, greater than." msgstr "" -"ご注意ください。phpMyAdmin の翻訳では &eacute; のような HTML エンティティ" -"は利用せず、ファイルに適切な文字セットを定義するようにしています。HTML エン" -"ティティを使うと JavaScript のメッセージテキストが正しく表示できないためで" -"す。ただし、いくつかのエンティティは使う必要があります。クオート（&" -"quot;）、分離されては困るスペース（&nbsp;）、＆（&amp;）、＜（&" -"lt;）、＞（&gt;）です。" +"エンティティに注意するようにしてください。phpMyAdmin の翻訳では &eacute; のような HTML " +"エンティティは利用せず、ファイルに適切な文字セットを定義するようにしています。HTML エンティティを使うと JavaScript のメッセージテキスト" +"が正しく表示できないためです。ただし、いくつかのエンティティは使う必要があります。クォート（&quot;）、分離されては困るスペース（&" +"nbsp;）、＆（&amp;）、＜（&lt;）、＞（&gt;）です。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4362 @@ -11485,6 +11463,16 @@ msgid "" "our <a href=\"https://sourceforge.net/tracker/?group_id=23067&" "atid=387645\">translation tracker</a>." msgstr "" +"現在、ドキュメントは po4a と gettext を用いて翻訳されています（翻訳されているものは <a " +"href=\"http://www.phpmyadmin.net/home_page/docs.php\">Documentation</a> " +"を参照してください）。翻訳を始めるには、Git から <a href=\"http://phpmyadmin.git.sourceforge.net/gi" +"t/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po\"><code>localized_docs/p" +"o</code></a> をチェックアウトします。もしくは、<a href=\"https://l10n.cihar.com/projects/pmado" +"c/\">翻訳サーバ</a>にてオンライン翻訳するのもいいでしょう。翻訳したい言語がない場合は、<a " +"href=\"mailto:michal@cihar.com\">Michal Čihař</a> " +"と連絡を取ってみてください。多分、彼が追加してくれます。直接 po ファイルを翻訳したい場合には、<a href=\"https://sourceforg" +"e.net/tracker/?group_id=23067&atid=387645\">翻訳トラッカー</a>に翻訳したものをアップロードしてくだ" +"さい。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4383 @@ -12669,7 +12657,7 @@ msgstr "" #. type: Content of: <html><body><div><h3> #: orig-docs/Documentation.html:4881 msgid "Original Credits of Version 2.1.0" -msgstr "" +msgstr "バージョン 2.1.0 当時の貢献者一覧" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4884 @@ -12831,6 +12819,9 @@ msgid "" "text, images, and other information typically located on a web page at a " "website on the World Wide Web." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/%E3%82%A6%E3%82%A7%E3%83%96%E3%83%96%" +"E3%83%A9%E3%82%A6%E3%82%B6\">ブラウザ（ウェブブラウザ）</a> - World Wide Web 上の Web サイトで " +"Web ページに一般的に置かれているテキスト、画像、その他の情報をユーザに対して表示や双方向通信することができるアプリケーション" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4951 @@ -12839,6 +12830,8 @@ msgid "" "open source data compression algorithm and program developed by Julian " "Seward." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Bzip2\">bzip2</a> - Julian Seward " +"により開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよびプログラム" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4954 @@ -12847,6 +12840,9 @@ msgid "" "</a> - an important World Wide Web technology that enables a client web " "browser to request data from a program executed on the Web server." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Common_Gateway_Interface\">CGI (Common " +"Gateway Interface)</a> - Web サーバー上で実行されるプログラムでクライアントの Web " +"ブラウザのデータを要求に応えることができる重要な World Wide Web 技術" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4957 @@ -12967,11 +12963,13 @@ msgid "" "Graphics Library</a> - a library by Thomas Boutell and others for " "dynamically manipulating images." msgstr "" +"<a id=\"gd\" href=\"http://ja.wikipedia.org/wiki/GD_Graphics_Library\">GD " +"グラフィックライブラリ</a> - Thomas Boutell 他によって開発された動的に画像を操作するためのライブラリ" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4989 msgid "GD2 - look at <a href=\"#gd\">GD Graphics Library</a>." -msgstr "" +msgstr "GD2 - → <a href=\"#gd\">GD Graphics Library</a>" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4990 @@ -12979,6 +12977,8 @@ msgid "" "<a href=\"http://www.wikipedia.org/wiki/Gzip\">gzip</a> - gzip is short for " "GNU zip, a GNU free software file compression program." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Gzip\">gzip</a> - GNU zip の略称で、GNU " +"フリーソフトウェアファイル圧縮プログラムのこと" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4993 @@ -13116,6 +13116,8 @@ msgid "" "line of personal computers is designed, developed, manufactured, and " "marketed by Apple Computer." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Macintosh\">Mac (Apple Macintosh)</a> - " +"Apple Computer が設計、開発、製造、販売しているパソコンの一製品" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5029 @@ -13126,6 +13128,10 @@ msgid "" "currently shipping Apple Macintosh computers in the consumer and " "professional markets." msgstr "" +"<a id=\"glossar_mac_os_x\" " +"href=\"http://ja.wikipedia.org/wiki/Mac_OS_X\"><acronym title=\"Apple " +"Macintosh\">Mac</acronym> <abbr title=\"オペレーティング・システム\">OS</abbr> X</a> - " +"一般消費者および専門家の市場向けに現在出荷されている全ての Apple Macintosh コンピュータに含まれているオペレーティングシステム" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5032 @@ -13161,6 +13167,10 @@ msgid "" "multi-user, SQL (Structured Query Language) Database Management System " "(DBMS)." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/MySQL\">MySQL</a> - " +"マルチスレッド、マルチユーザー、<abbr title=\"structured query " +"language\">SQL</abbr>が使えるデータベース管理システム (<abbr title=\"Database Management " +"System\">DBMS</abbr>)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/nt of: <html><body><div><ul><li>�ス管理システム (<abbr title=\"Database Management "��ピュータに含まれているオペレーティングシステム"��"ス（&"困るスペース（&nbsp;）、＆（&amp;）、＜（&lt;）、＞（&gt;）です。��!�!��I��I�x4?�+��I�"�"�+�"�+��I��"�+ϊ�I��/��+�"�+ ��+�$��+�)��+�$�+x4?�+��I��I��"�+�!�!��I��I��+��I�"�"�+�"�+��I��"�+ϊ�I��I��I��C�+�p��I��"�+�$�+��I��I��"�+GHIJKMNOP��I��I�H��+��I�"�"�+�"�+��I�0/��+�"�+@?�+��+ ��+�$��+�)��+�$�+H��+��I�Ё�I��"�+8��+��I��I��"�+(��+��I�0��I��"�+��+��I�`��I��"�+ �.��+�"�+�)��+�|�I��8��+�"�+�$��+��I�y8��+�"�+ ��+0��I�Z8��+�"�+��+@?�+��+ ��+�D?�+�$��+�)��+�$�+�-��+��I��I��"�+#%')*-.035678:<=��I��I�pk��+Ѕ�I�"�"�+8O?�+�"�+�D?�+�I?�+�$�+cf�i�+��I�pk��+Ѕ�I��I��"�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�Bo�+@��I�FP�+FP�+?�l�+��I�`��I� ��I��i�+�"�+�C�+��I�BP�+P��I�ϊ�I��,D�+��I��BP�+��I��"�Documentation.html:5043 @@ -13338,6 +13348,8 @@ msgid "" "<a href=\"http://www.wikipedia.org/wiki/TCP\">TCP (Transmission Control " "Protocol)</a> - one of the core protocols of the Internet protocol suite." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Transmission_Control_Protocol\">TCP " +"(Transmission Control Protocol)</a> - インターネット・プロトコル群の中核となるプロトコルの一つ" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5096 @@ -13393,6 +13405,8 @@ msgid "" "<a href=\"http://www.wikipedia.org/wiki/Zlib\">zlib</a> - an open-source, " "cross-platform data compression library by Jean-loup Gailly and Mark Adler." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Zlib\">zlib</a> - Jean-loup Gailly および " +"Mark Adlerによるオープンソースでクロスプラットフォームのデータ圧縮ライブラリ" #. type: Content of: <html><body><ul><li> #: orig-docs/Documentation.html:5118 @@ -13520,18 +13534,18 @@ msgstr "phpMyAdmin - ToDo" #. type: Plain text #: orig-docs/TODO:5 msgid "We are currently using the Sourceforge Tracker as Todo list:" -msgstr "" +msgstr "現在は Todo リストとして Sourceforge のトラッカーを使用しています。" #. type: Plain text #: orig-docs/TODO:7 #, no-wrap msgid " http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n" -msgstr "" +msgstr " http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n" #. type: Plain text #: orig-docs/TODO:8 msgid "-- swix/20010704" -msgstr "" +msgstr "-- swix/20010704" #. type: Title = #: orig-docs/README:2 diff --git a/po/tr.po b/po/tr.po index 29c2591..32d9d93 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-20 08:29+0300\n" -"PO-Revision-Date: 2011-05-16 22:41+0200\n" +"PO-Revision-Date: 2011-05-21 11:56+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -3406,6 +3406,9 @@ msgid "" "should use something different than <code>phpMyAdmin</code>, because this is " "session which phpMyAdmin uses internally." msgstr "" +"Oturum açma kimlik doğrulaması yöntemi için kullanılacak oturumun adı. " +"<code>phpMyAdmin</code>'den farklı bir şey kullanmalısınız çünkü bu " +"phpMyAdmin'in dahili olarak kullandığı oturumdur." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1286 @@ -5005,7 +5008,6 @@ msgstr "no - GD 2 işlevi kullanılamaz" msgid "$cfg['CheckConfigurationPermissions'] boolean" msgstr "$cfg['CheckConfigurationPermissions'] boolean" -# Biz normal olarak herkes tarafından yazılabilir olmadığından emin olmak için yapılandırma dosyasındaki yetkileri kontrol ederiz #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1787 msgid "" @@ -5015,11 +5017,17 @@ msgid "" "seems wrong but in fact cannot be detected. In this case a sysadmin would " "set this parameter to <tt>FALSE</tt>. Default is <tt>TRUE</tt>." msgstr "" +"Biz normal olarak herkes tarafından yazılabilir olmadığından emin olmak için " +"yapılandırma dosyasındaki izinleri kontrol ederiz. Ancak phpMyAdmin, " +"izinler yanlış göründüğü ama aslında algılanamadığı durumda, Windows olmayan " +"sunucuya bağlanmış NTFS dosya sistemi üzerine kurulabilir. Bu durumda " +"sysadmin bu parametreyi <tt>FALSE</tt> olarak ayarlayacaktır. Varsayılan " +"<tt>TRUE</tt>'dur." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1794 msgid "$cfg['LinkLengthLimit'] integer" -msgstr "" +msgstr "$cfg['LinkLengthLimit'] tam sayı" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1796 @@ -5028,17 +5036,23 @@ msgid "" "is replaced by form with button. This is required as some web servers (IIS) " "have problems with long URLs. Default is <code>1000</code>." msgstr "" +"Bağlantılardaki URL uzunluğu için sınırdır. Uzunluk bu sınırın üzerinde " +"olduğunda, düğmeyle birlikte form tarafından değiştirilir. Bu uzun URL'lerle " +"sorunları olan bazı web sunucuları (IIS) için gerekir. Varsayılan " +"<code>1000</code>'dir." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1802 msgid "$cfg['NaviWidth'] integer" -msgstr "" +msgstr "$cfg['NaviWidth'] tam sayı" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1803 msgid "" "Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>." msgstr "" +"Piksel olarak rehber çerçeve genişliği. " +"<tt>themes/themename/layout.inc.php</tt>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1806 @@ -5046,6 +5060,8 @@ msgid "" "<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> string [CSS " "color for background]" msgstr "" +"<span id=\"cfg_NaviBackground\">$cfg['NaviBackground']</span> dizgi [arkaplan " +"için CSS rengi]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1807 @@ -5053,6 +5069,8 @@ msgid "" "<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> string [CSS " "color for background]" msgstr "" +"<span id=\"cfg_MainBackground\">$cfg['MainBackground']</span> dizgi [arkaplan " +"için CSS rengi]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1809 @@ -5060,11 +5078,13 @@ msgid "" "The background styles used for both the frames. See <tt>themes/themename/" "layout.inc.php</tt>." msgstr "" +"Her iki çerçeve için kullanılan arkaplan stilleri. " +"<tt>themes/themename/layout.inc.php</tt>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1812 msgid "$cfg['NaviPointerBackground'] string [CSS color for background]" -msgstr "" +msgstr "$cfg['NaviPointerBackground'] dizgi [arkaplan için CSS rengi]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1813 @@ -5072,6 +5092,8 @@ msgid "" "<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> string " "[CSS color]" msgstr "" +"<span id=\"cfg_NaviPointerColor\">$cfg['NaviPointerColor']</span> dizgi [CSS " +"rengi]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1814 @@ -5079,11 +5101,13 @@ msgid "" "The style used for the pointer in the navi frame. See <tt>themes/themename/" "layout.inc.php</tt>." msgstr "" +"Rehber çerçevedeki imleç için kulanılan stil. " +"<tt>themes/themename/layout.inc.php</tt>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1817 msgid "$cfg['LeftPointerEnable'] boolean" -msgstr "" +msgstr "$cfg['LeftPointerEnable'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1818 @@ -5091,27 +5115,31 @@ msgid "" "A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight is " "<tt>FALSE</tt>)." msgstr "" +"<tt>TRUE</tt> değeri rehber imleçi etkinleştirir (LeftFrameLight " +"<tt>FALSE</tt> iken)." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1821 msgid "$cfg['Border'] integer" -msgstr "" +msgstr "$cfg['Border'] tam sayı" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1822 msgid "" "The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>." msgstr "" +"Tabloların kenar boyutudur. <tt>themes/themename/layout.inc.php</tt>'ye " +"bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1825 msgid "$cfg['ThBackground'] string [CSS color for background]" -msgstr "" +msgstr "$cfg['ThBackground'] dizgi [arkaplan için CSS rengi]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1826 msgid "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> string [CSS color]" -msgstr "" +msgstr "<span id=\"cfg_ThColor\">$cfg['ThColor']</span> dizgi [CSS rengi]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1827 @@ -5119,11 +5147,13 @@ msgid "" "The style used for table headers. See <tt>themes/themename/layout.inc.php</" "tt>." msgstr "" +"Tablo başlıkları için kullanılan stil. " +"<tt>themes/themename/layout.inc.php</tt>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1830 msgid "$cfg['BgOne'] string [CSS color]" -msgstr "" +msgstr "$cfg['BgOne'] dizgi [CSS rengi]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1831 @@ -5131,11 +5161,13 @@ msgid "" "The color (HTML) #1 for table rows. See <tt>themes/themename/layout.inc.php</" "tt>." msgstr "" +"Tablo satırları için renk (HTML) #1. " +"<tt>themes/themename/layout.inc.php</tt>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1834 msgid "$cfg['BgTwo'] string [CSS color]" -msgstr "" +msgstr "$cfg['BgTwo'] dizgi [CSS rengi]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1835 @@ -5143,6 +5175,8 @@ msgid "" "The color (HTML) #2 for table rows. See <tt>themes/themename/layout.inc.php</" "tt>." msgstr "" +"Tablo satırları için renk (HTML) #2. " +"<tt>themes/themename/layout.inc.php</tt>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1838 @@ -5150,6 +5184,9 @@ msgid "" "<span id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground'] </" "span>string [CSS color]" msgstr "" +"<span " +"id=\"cfg_BrowsePointerBackground\">$cfg['BrowsePointerBackground']</span> " +"dizgi [CSS rengi]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1839 @@ -5157,6 +5194,8 @@ msgid "" "<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor'] </span>string " "[CSS color]" msgstr "" +"<span id=\"cfg_BrowsePointerColor\">$cfg['BrowsePointerColor']</span> dizgi " +"[CSS rengi]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1840 @@ -5164,6 +5203,8 @@ msgid "" "<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground'] </" "span>string [CSS color]" msgstr "" +"<span id=\"cfg_BrowseMarkerBackground\">$cfg['BrowseMarkerBackground']</span> " +"dizgi [CSS rengi]" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1841 @@ -5171,11 +5212,13 @@ msgid "" "<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor'] </span>string " "[CSS color]" msgstr "" +"<span id=\"cfg_BrowseMarkerColor\">$cfg['BrowseMarkerColor']</span> dizgi [CSS " +"rengi]" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1843 msgid "The colors (HTML) uses for the pointer and the marker in browse mode." -msgstr "" +msgstr "Gözatma kipinde imleç ve işaretleyici için kullanılan renkler (HTML)." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1844 @@ -5185,17 +5228,21 @@ msgid "" "Highlighting / marking a column is done by hovering over / clicking the " "column's header (outside of the text)." msgstr "" +"Biçimlendirici özelliği, farenizle üstünden geçerken satırı vurgular ve " +"sonrasında onlara tıklayarak görsel olarak işaretlemenize/işareti " +"kaldırmanıza izin verir. Sütunun başlığının (metnin dışına) üzerinde kalmak " +"/ tıklamak, sütunun vurgulanmasını / işaretlenmesini yapar." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1848 orig-docs/Documentation.html:1854 #: orig-docs/Documentation.html:1859 msgid "See <tt>themes/themename/layout.inc.php</tt>." -msgstr "" +msgstr "<tt>themes/themename/layout.inc.php</tt>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1851 msgid "$cfg['FontFamily'] string" -msgstr "" +msgstr "$cfg['FontFamily'] dizgi" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1852 @@ -5203,11 +5250,13 @@ msgid "" "You put here a valid CSS font family value, for example <tt>arial, sans-" "serif</tt>." msgstr "" +"Buraya geçerli bir CSS yazı tipi ailesi değeri koyun, örneğin <tt>arial, " +"sans-serif</tt>." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1856 msgid "$cfg['FontFamilyFixed'] string" -msgstr "" +msgstr "$cfg['FontFamilyFixed'] dizgi" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1857 @@ -5215,53 +5264,57 @@ msgid "" "You put here a valid CSS font family value, for example <tt>monospace</tt>. " "This one is used in textarea." msgstr "" +"Buraya geçerli bir CSS yazı tipi ailesi değeri koyun, örneğin " +"<tt>monospace</tt>. Bu metin alanında kullanılır." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1861 msgid "$cfg['BrowsePointerEnable'] boolean" -msgstr "" +msgstr "$cfg['BrowsePointerEnable'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1862 msgid "Whether to activate the browse pointer or not." -msgstr "" +msgstr "Gözatma imlecini etkinleştirir ya da etkinleştirmez." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1864 msgid "$cfg['BrowseMarkerEnable'] boolean" -msgstr "" +msgstr "$cfg['BrowseMarkerEnable'] boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1865 msgid "Whether to activate the browse marker or not." -msgstr "" +msgstr "Gözatma işaretleyicisini etkinleştirir ya da etkinleştirmez." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1867 msgid "<span id=\"cfg_TextareaCols\">$cfg['TextareaCols'] </span>integer" -msgstr "" +msgstr "<span id=\"cfg_TextareaCols\">$cfg['TextareaCols']</span> tam sayı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1868 msgid "<span id=\"cfg_TextareaRows\">$cfg['TextareaRows'] </span>integer" -msgstr "" +msgstr "<span id=\"cfg_TextareaRows\">$cfg['TextareaRows']</span> tam sayı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1869 msgid "" "<span id=\"cfg_CharTextareaCols\">$cfg['CharTextareaCols'] </span>integer" msgstr "" +"<span id=\"cfg_CharTextareaCols\">$cfg['CharTextareaCols']</span> tam sayı" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1870 msgid "" "<span id=\"cfg_CharTextareaRows\">$cfg['CharTextareaRows'] </span>integer" msgstr "" +"<span id=\"cfg_CharTextareaRows\">$cfg['CharTextareaRows']</span> tam sayı" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1872 msgid "Number of columns and rows for the textareas." -msgstr "" +msgstr "Metin alanı için sütun ve satır sayısı." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1873 @@ -5270,6 +5323,10 @@ msgid "" "language\">SQL</abbr> query textareas and (*1.25) for <abbr title=" "\"structured query language\">SQL</abbr> textareas inside the query window." msgstr "" +"Bu değer, sorgu penceresi içerisindeki abbr title=\"structured query " +"language\">SQL</abbr> sorgu metin alanı için (*2) ve <abbr title=\"structured " +"query language\">SQL</abbr> metin alanı için (*1.25) olan önemi " +"belirtecektir." #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1875 @@ -5277,6 +5334,8 @@ msgid "" "The Char* values are used for CHAR and VARCHAR editing (if configured via <a " "href=\"#cfg_CharEditing\">$cfg['CharEditing']</a>)." msgstr "" +"Char* değerleri CHAR ve VARCHAR düzenlemesi için kullanılır (eğer <a " +"href=\"#cfg_CharEditing\">$cfg['CharEditing']</a> yapılandırılmışsa)." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1878 @@ -5284,28 +5343,32 @@ msgid "" "<span id=\"cfg_LongtextDoubleTextarea\">$cfg['LongtextDoubleTextarea'] </" "span>boolean" msgstr "" +"<span id=\"cfg_LongtextDoubleTextarea\">$cfg['LongtextDoubleTextarea']</span> " +"boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1880 msgid "Defines whether textarea for LONGTEXT columns should have double size." msgstr "" +"LONGTEXT sütunlar için metin alanının çift boyut olup olmayacağını tanımlar." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1882 msgid "" "<span id=\"cfg_TextareaAutoSelect\">$cfg['TextareaAutoSelect'] </span>boolean" msgstr "" +"<span id=\"cfg_TextareaAutoSelect\">$cfg['TextareaAutoSelect']</span> boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1884 msgid "" "Defines if the whole textarea of the query box will be selected on click." -msgstr "" +msgstr "Sorgu kutusunun bütün metin alanı tıklamayla seçilecekse tanımlar." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1887 msgid "$cfg['LimitChars'] integer" -msgstr "" +msgstr "$cfg['LimitChars'] tam sayı" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1888 @@ -5313,6 +5376,8 @@ msgid "" "Maximum number of characters shown in any non-numeric field on browse view. " "Can be turned off by a toggle button on the browse page." msgstr "" +"Gözatma görünümünde sayısal olmayan herhangi bir alanda gösterilen en fazla " +"karakter sayısı. Gözatma sayfasında bir geçiş düğmesiyle kapatılabilir." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1891 @@ -5321,6 +5386,9 @@ msgid "" "span>boolean <span id=\"cfg_ModifyDeleteAtRight\">$cfg" "['ModifyDeleteAtRight'] </span>boolean" msgstr "" +"<span id=\"cfg_ModifyDeleteAtLeft\">$cfg['ModifyDeleteAtLeft']</span> boolean " +"<span id=\"cfg_ModifyDeleteAtRight\">$cfg['ModifyDeleteAtRight']</span> " +"boolean" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1894 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1883-gea10000
by Michal Čihař 23 May '11

23 May '11

The branch, master has been updated via ea10000042cfc3f5cc3415cf17d096b93f290ed4 (commit) via 548b62e93f2281805aff12f286e4df011c8791c4 (commit) via 181705cbd1a497b809788701e2557b48a36e2788 (commit) via adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 (commit) via 05f65f2bca45054912fb5cf3681fd1e293279347 (commit) via 6b1dd6caf623085a09b8354feff54aa02f271390 (commit) via bacc729edaa16f87e952c60cd164bb62cd2b0044 (commit) via ededdf64076367b0efc3f9d68963e9722c475e1e (commit) via b8deb3c7b93cb2951a8ff0267456b0ce23615a20 (commit) via f74b49611a46415f0838af35d5aa035d8ae7bcd5 (commit) via a95fe95dc246616319e52b6de68897d4e0ad670e (commit) via c9174049b18adb420a55ec34ee5b5674316c8ce1 (commit) via e61df1134372c8959be7aa6b736384bd159c0b51 (commit) via 4072219f1e50b5e6252d4bd1d209f9520999c8e4 (commit) via c32f8efc177599879876f27a85385a2ed29280d4 (commit) via 5e4c1d0fa2c939735d583d74d08b1d34c14f71da (commit) via 0d54a65512ac49433103e4b6763729cbf094e937 (commit) via 4e23a4b33f8d56dc7e2af41c498eff150e9f13c0 (commit) via 965425b326691ff245cf4534ab8b71a1a8f07dd4 (commit) via 165f6d88e6de92f63495ad1a7eb73215454b49ce (commit) via 0658795aa0976273b075fdc3312af0e41d8ca05f (commit) via 21f6e699a0b266abc06ae8e247282083a0e8f356 (commit) via 99fe3292e972e820c06eb220ef5c9e9cf8ba3eff (commit) via d4b262fa70eb4921495c12f7998a95a5834032df (commit) via 651c3e562a421985206217c640855fcd4c1410a8 (commit) via 2c5a515ad6be2a21a7500ba4c00cc87ae7ee9885 (commit) via 48bb25e66bea212ca87383cd8631890821fe7695 (commit) via 8deff43c9436e06550de63efd62a8cfa4f1d2915 (commit) via 84817e4c0641dd9386fe7d9c3163fe80fdca8d75 (commit) via 30d050cd5125b4a856d3fd6ab222157bdcc1125a (commit) via 69e263e24373c1d48370a47954b89a4e4df18fc5 (commit) via 387eaf26583fe0499cae22e86d2526499d170884 (commit) via 90b76c465373144d1451ce4ea30507ec83934ae8 (commit) via 1b0f4a680a7665c7c6f26cbf081ba31d24e097c2 (commit) via 77a6618c517139f62bb9965d58a314f8e489429b (commit) via 6471e199707ac6e01764f71a191f2a561ff66123 (commit) via 836370dc20f4dc6664a747007a4364631ba6c1fd (commit) via d59f9c46dfbce26421a3c5381d1da745e7fa77c6 (commit) via 76642eb191cda2299d850b3d0912dbb59edbd4b3 (commit) via 15be3999e7883c6f7415af04832d51298b407617 (commit) via 814bfe3549865b6d779902e1a8c17975ff135e41 (commit) via a1a89b5d8d11a883d5dd9aabe545bc2b22c1982b (commit) via 1e24c60b91dd79e471d7c43c8fa363aa5fc7299e (commit) via fac2dc5490b6f83c531c20ac3adb728fe23b0386 (commit) via fb31a7aa26437039e49486b980cc5e6818b9ed44 (commit) via df37f5d3dcd7eab13f423dfa9ad158b952daa42b (commit) via e837ab44313942a4e372e1676417badd2829c446 (commit) via 1adda706ac75a5dbb659bfb8b284a4ce47ce9583 (commit) via 7e0c1155b13354794aef8a0c25decd6db366dbb1 (commit) via 293fa1c9166ab83dd6dc3bd6806e1a09ba99ebbb (commit) via 7898fff63f74d3bfd29d277c247836b15ad25d05 (commit) via 01bcd1d08abc182eaca48ddc532cdf0dd29378c7 (commit) via 694179cd5af071d1779ea25ed673a8a6dc17d360 (commit) via 91f658f2f18befea59de33e7635a0e24f2e9431a (commit) via 516b9294d21f9e6a1607c57a3cfa69348f9e586f (commit) via 8606177287d2040939d22a8a935a679ea356308f (commit) via 8d5e5c5d0beed6073c70ca3b827aa00060712faa (commit) via ca62aa55b8ae674985e695454f13d6c653df84f7 (commit) via 7a88287bafc64177e10e6e481dc57aebe7367b1e (commit) via 57f96c11635e0ef29e0858ec8a08a5ce1e7b779d (commit) via 4846f05f1f392aafbea3fbab4f5c048ec422bc72 (commit) via d727a040e44f91ea0dbd2f881365117ca81101c9 (commit) via 6c3ee9e419e037e776be4c03ea2484634e70bb0f (commit) via f3c6c3f76d90f43fa9e2e8cba97157f77b2f2017 (commit) via 7aebe026446177813337d1238160c25949f99b3f (commit) via 05450347f4fe4dbe3d20b0bce97428b899e0ee9b (commit) via 325d65d8fe7be268cecbb81cfa4e0f8d23b89c00 (commit) via bfdc27058bb3ac7affa883f9d4fc548ce859564a (commit) via a9cc7165b0cfe562d47660247e49b02eaba893db (commit) via 1e11a70f71af68c095c5bae1a91bea035b30ce4b (commit) via 07cdf59d649d274a5a13dd6f658e09ee9f2bfe3a (commit) via 4cb91e92c24d5e23d2b73b636c7a9b9b4323f613 (commit) via ba51526222702d8df76b728f0d1720f1805082b0 (commit) from 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a (commit) - Log ----------------------------------------------------------------- commit ea10000042cfc3f5cc3415cf17d096b93f290ed4 Merge: 181705cbd1a497b809788701e2557b48a36e2788 548b62e93f2281805aff12f286e4df011c8791c4 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 10:41:11 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' commit 181705cbd1a497b809788701e2557b48a36e2788 Merge: 05f65f2bca45054912fb5cf3681fd1e293279347 adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 10:39:33 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' commit 05f65f2bca45054912fb5cf3681fd1e293279347 Merge: 6b1dd6caf623085a09b8354feff54aa02f271390 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a Author: Pootle server <pootle(a)cihar.com> Date: Sun May 22 20:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit 6b1dd6caf623085a09b8354feff54aa02f271390 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:33:25 2011 +0200 Translation update done using Pootle. commit bacc729edaa16f87e952c60cd164bb62cd2b0044 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:32:23 2011 +0200 Translation update done using Pootle. commit ededdf64076367b0efc3f9d68963e9722c475e1e Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:30:48 2011 +0200 Translation update done using Pootle. commit b8deb3c7b93cb2951a8ff0267456b0ce23615a20 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:29:32 2011 +0200 Translation update done using Pootle. commit f74b49611a46415f0838af35d5aa035d8ae7bcd5 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:29:04 2011 +0200 Translation update done using Pootle. commit a95fe95dc246616319e52b6de68897d4e0ad670e Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:28:35 2011 +0200 Translation update done using Pootle. commit c9174049b18adb420a55ec34ee5b5674316c8ce1 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:28:25 2011 +0200 Translation update done using Pootle. commit e61df1134372c8959be7aa6b736384bd159c0b51 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:28:08 2011 +0200 Translation update done using Pootle. commit 4072219f1e50b5e6252d4bd1d209f9520999c8e4 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:27:45 2011 +0200 Translation update done using Pootle. commit c32f8efc177599879876f27a85385a2ed29280d4 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:27:05 2011 +0200 Translation update done using Pootle. commit 5e4c1d0fa2c939735d583d74d08b1d34c14f71da Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:26:01 2011 +0200 Translation update done using Pootle. commit 0d54a65512ac49433103e4b6763729cbf094e937 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:25:28 2011 +0200 Translation update done using Pootle. commit 4e23a4b33f8d56dc7e2af41c498eff150e9f13c0 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:25:04 2011 +0200 Translation update done using Pootle. commit 965425b326691ff245cf4534ab8b71a1a8f07dd4 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:24:21 2011 +0200 Translation update done using Pootle. commit 165f6d88e6de92f63495ad1a7eb73215454b49ce Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:23:57 2011 +0200 Translation update done using Pootle. commit 0658795aa0976273b075fdc3312af0e41d8ca05f Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:23:22 2011 +0200 Translation update done using Pootle. commit 21f6e699a0b266abc06ae8e247282083a0e8f356 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:21:56 2011 +0200 Translation update done using Pootle. commit 99fe3292e972e820c06eb220ef5c9e9cf8ba3eff Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:20:55 2011 +0200 Translation update done using Pootle. commit d4b262fa70eb4921495c12f7998a95a5834032df Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:20:34 2011 +0200 Translation update done using Pootle. commit 651c3e562a421985206217c640855fcd4c1410a8 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:20:23 2011 +0200 Translation update done using Pootle. commit 2c5a515ad6be2a21a7500ba4c00cc87ae7ee9885 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:19:18 2011 +0200 Translation update done using Pootle. commit 48bb25e66bea212ca87383cd8631890821fe7695 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:18:55 2011 +0200 Translation update done using Pootle. commit 8deff43c9436e06550de63efd62a8cfa4f1d2915 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:18:34 2011 +0200 Translation update done using Pootle. commit 84817e4c0641dd9386fe7d9c3163fe80fdca8d75 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:18:02 2011 +0200 Translation update done using Pootle. commit 30d050cd5125b4a856d3fd6ab222157bdcc1125a Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:17:31 2011 +0200 Translation update done using Pootle. commit 69e263e24373c1d48370a47954b89a4e4df18fc5 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:16:51 2011 +0200 Translation update done using Pootle. commit 387eaf26583fe0499cae22e86d2526499d170884 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:15:49 2011 +0200 Translation update done using Pootle. commit 90b76c465373144d1451ce4ea30507ec83934ae8 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:14:48 2011 +0200 Translation update done using Pootle. commit 1b0f4a680a7665c7c6f26cbf081ba31d24e097c2 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:14:34 2011 +0200 Translation update done using Pootle. commit 77a6618c517139f62bb9965d58a314f8e489429b Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:12:33 2011 +0200 Translation update done using Pootle. commit 6471e199707ac6e01764f71a191f2a561ff66123 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:11:34 2011 +0200 Translation update done using Pootle. commit 836370dc20f4dc6664a747007a4364631ba6c1fd Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:11:08 2011 +0200 Translation update done using Pootle. commit d59f9c46dfbce26421a3c5381d1da745e7fa77c6 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:09:55 2011 +0200 Translation update done using Pootle. commit 76642eb191cda2299d850b3d0912dbb59edbd4b3 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:09:21 2011 +0200 Translation update done using Pootle. commit 15be3999e7883c6f7415af04832d51298b407617 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:07:54 2011 +0200 Translation update done using Pootle. commit 814bfe3549865b6d779902e1a8c17975ff135e41 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:07:31 2011 +0200 Translation update done using Pootle. commit a1a89b5d8d11a883d5dd9aabe545bc2b22c1982b Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:07:09 2011 +0200 Translation update done using Pootle. commit 1e24c60b91dd79e471d7c43c8fa363aa5fc7299e Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:06:39 2011 +0200 Translation update done using Pootle. commit fac2dc5490b6f83c531c20ac3adb728fe23b0386 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:05:50 2011 +0200 Translation update done using Pootle. commit fb31a7aa26437039e49486b980cc5e6818b9ed44 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:05:27 2011 +0200 Translation update done using Pootle. commit df37f5d3dcd7eab13f423dfa9ad158b952daa42b Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:04:32 2011 +0200 Translation update done using Pootle. commit e837ab44313942a4e372e1676417badd2829c446 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:04:14 2011 +0200 Translation update done using Pootle. commit 1adda706ac75a5dbb659bfb8b284a4ce47ce9583 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:03:50 2011 +0200 Translation update done using Pootle. commit 7e0c1155b13354794aef8a0c25decd6db366dbb1 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:03:27 2011 +0200 Translation update done using Pootle. commit 293fa1c9166ab83dd6dc3bd6806e1a09ba99ebbb Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:01:38 2011 +0200 Translation update done using Pootle. commit 7898fff63f74d3bfd29d277c247836b15ad25d05 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 20:01:06 2011 +0200 Translation update done using Pootle. commit 01bcd1d08abc182eaca48ddc532cdf0dd29378c7 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 19:58:36 2011 +0200 Translation update done using Pootle. commit 694179cd5af071d1779ea25ed673a8a6dc17d360 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 19:57:20 2011 +0200 Translation update done using Pootle. commit 91f658f2f18befea59de33e7635a0e24f2e9431a Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 19:55:41 2011 +0200 Translation update done using Pootle. commit 516b9294d21f9e6a1607c57a3cfa69348f9e586f Merge: 8606177287d2040939d22a8a935a679ea356308f 6619e39d639bd994f5efe05e2766836cc1945145 Author: Pootle server <pootle(a)cihar.com> Date: Sun May 22 10:40:07 2011 +0200 Merge remote-tracking branch 'origin/master' commit 8606177287d2040939d22a8a935a679ea356308f Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 09:04:33 2011 +0200 Translation update done using Pootle. commit 8d5e5c5d0beed6073c70ca3b827aa00060712faa Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 09:03:50 2011 +0200 Translation update done using Pootle. commit ca62aa55b8ae674985e695454f13d6c653df84f7 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 09:01:10 2011 +0200 Translation update done using Pootle. commit 7a88287bafc64177e10e6e481dc57aebe7367b1e Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 09:00:19 2011 +0200 Translation update done using Pootle. commit 57f96c11635e0ef29e0858ec8a08a5ce1e7b779d Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:59:03 2011 +0200 Translation update done using Pootle. commit 4846f05f1f392aafbea3fbab4f5c048ec422bc72 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:58:33 2011 +0200 Translation update done using Pootle. commit d727a040e44f91ea0dbd2f881365117ca81101c9 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:56:16 2011 +0200 Translation update done using Pootle. commit 6c3ee9e419e037e776be4c03ea2484634e70bb0f Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:55:37 2011 +0200 Translation update done using Pootle. commit f3c6c3f76d90f43fa9e2e8cba97157f77b2f2017 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:55:24 2011 +0200 Translation update done using Pootle. commit 7aebe026446177813337d1238160c25949f99b3f Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:54:56 2011 +0200 Translation update done using Pootle. commit 05450347f4fe4dbe3d20b0bce97428b899e0ee9b Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:44:16 2011 +0200 Translation update done using Pootle. commit 325d65d8fe7be268cecbb81cfa4e0f8d23b89c00 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:42:42 2011 +0200 Translation update done using Pootle. commit bfdc27058bb3ac7affa883f9d4fc548ce859564a Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:41:49 2011 +0200 Translation update done using Pootle. commit a9cc7165b0cfe562d47660247e49b02eaba893db Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:41:17 2011 +0200 Translation update done using Pootle. commit 1e11a70f71af68c095c5bae1a91bea035b30ce4b Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:40:45 2011 +0200 Translation update done using Pootle. commit 07cdf59d649d274a5a13dd6f658e09ee9f2bfe3a Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:40:00 2011 +0200 Translation update done using Pootle. commit 4cb91e92c24d5e23d2b73b636c7a9b9b4323f613 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:39:23 2011 +0200 Translation update done using Pootle. commit ba51526222702d8df76b728f0d1720f1805082b0 Author: Martin Lacina <martin(a)whistler.sk> Date: Sun May 22 08:37:40 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/auth/signon.auth.lib.php | 41 +++++++--- po/sk.po | 145 ++++++++++++++++++----------------- scripts/signon.php | 15 ++-- 4 files changed, 113 insertions(+), 89 deletions(-) diff --git a/ChangeLog b/ChangeLog index 99bc2dc..4ad5111 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ - bug #3305606 [interface] Show all button wraps on privileges page - bug #3305517 [config] Config for export compression not used - bug #3305883 [interface] Table is dropped regardless of confirmation +- [auth] Fixed error handling for signon auth method. 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 3e0d64b..0735020 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -202,18 +202,35 @@ function PMA_auth_set_user() */ function PMA_auth_fails() { - if (! empty($GLOBALS['login_without_password_is_forbidden'])) { - $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)'); - } elseif (! empty($GLOBALS['allowDeny_forbidden'])) { - $_SESSION['PMA_single_signon_error_message'] = __('Access denied'); - } elseif (! empty($GLOBALS['no_activity'])) { - $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); - } elseif (PMA_DBI_getError()) { - $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); - } elseif (isset($php_errormsg)) { - $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; - } else { - $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); + /* Session name */ + $session_name = $GLOBALS['cfg']['Server']['SignonSession']; + + /* Does session exist? */ + if (isset($_COOKIE[$session_name])) { + /* End current session */ + $old_session = session_name(); + $old_id = session_id(); + session_write_close(); + + /* Load single signon session */ + session_name($session_name); + session_id($_COOKIE[$session_name]); + session_start(); + + /* Set error message */ + if (! empty($GLOBALS['login_without_password_is_forbidden'])) { + $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)'); + } elseif (! empty($GLOBALS['allowDeny_forbidden'])) { + $_SESSION['PMA_single_signon_error_message'] = __('Access denied'); + } elseif (! empty($GLOBALS['no_activity'])) { + $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); + } elseif (PMA_DBI_getError()) { + $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); + } elseif (isset($php_errormsg)) { + $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; + } else { + $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); + } } PMA_auth(); } // end of the 'PMA_auth_fails()' function diff --git a/po/sk.po b/po/sk.po index eb8345f..68daedb 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-18 13:54+0200\n" +"PO-Revision-Date: 2011-05-22 20:33+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.5\n" @@ -641,7 +641,7 @@ msgstr "Celkom" #: db_structure.php:455 libraries/StorageEngine.class.php:351 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "Na tomto MySQL servri je prednastaveným úložným systémom %s." +msgstr "Na tomto MySQL serveri je prednastaveným úložným systémom %s." #: db_structure.php:483 db_structure.php:500 db_structure.php:501 #: libraries/display_tbl.lib.php:2178 libraries/display_tbl.lib.php:2183 @@ -1631,7 +1631,7 @@ msgstr "Úložný systém %s je na tomto MySQL serveri dostupný." #: libraries/StorageEngine.class.php:357 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "Úložný systém %s bol vypnutý na tomto MySQL servri." +msgstr "Úložný systém %s na tomto MySQL serveri bol vypnutý." #: libraries/StorageEngine.class.php:361 #, php-format @@ -1891,7 +1891,7 @@ msgstr "Skontrolovať oprávnenia" #: libraries/chart.lib.php:40 msgid "Query statistics" -msgstr "Štatistika dopytu" +msgstr "Štatistika dopytov" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" @@ -3859,6 +3859,8 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links" "[/a] support, suggested: [kbd]pma_relation[/kbd]" msgstr "" +"Nechajte prázdne pre vypnutie [a@http://wiki.phpmyadmin.net/pma/relation" +"]relation-links[/a] podpory, navrhované: [kbd]pma_relation[/kbd]" #: libraries/config/messages.inc.php:404 msgid "Relation table" @@ -3977,6 +3979,8 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" "kbd]" msgstr "" +"Nechajte prázdne pre vypnutie podpory pre sledovanie SQL dopytov, " +"navrhované: [kbd]pma_tracking[/kbd]" #: libraries/config/messages.inc.php:427 msgid "SQL query tracking table" @@ -4016,25 +4020,29 @@ msgstr "" #: libraries/config/messages.inc.php:435 msgid "Verbose check" -msgstr "" +msgstr "Podrobná kontrola" #: libraries/config/messages.inc.php:436 msgid "" "A user-friendly description of this server. Leave blank to display the " "hostname instead." msgstr "" +"Užívateľsky prívetivý popis tohto servera. Ak necháte prízdne, zobrazí sa " +"namiesto popisu meno servera." #: libraries/config/messages.inc.php:437 msgid "Verbose name of this server" -msgstr "" +msgstr "Dlhé meno tohto servera" #: libraries/config/messages.inc.php:438 msgid "Whether a user should be displayed a "show all (rows)" button" msgstr "" +"Či sa bude užívateľovi zobrazovať tlačidlo "zobraziť všetky " +"(riadky)"" #: libraries/config/messages.inc.php:439 msgid "Allow to display all the rows" -msgstr "" +msgstr "Povoliť zobraziť všetky riadky" #: libraries/config/messages.inc.php:440 msgid "" @@ -4045,11 +4053,11 @@ msgstr "" #: libraries/config/messages.inc.php:441 msgid "Show password change form" -msgstr "" +msgstr "Zobraziť formulár na zmenu hesla" #: libraries/config/messages.inc.php:442 msgid "Show create database form" -msgstr "" +msgstr "Zobraziť formulár na vytvorenie databázy" #: libraries/config/messages.inc.php:443 msgid "" @@ -4063,43 +4071,44 @@ msgstr "Zobraziť typy polí" #: libraries/config/messages.inc.php:445 msgid "Display the function fields in edit/insert mode" -msgstr "" +msgstr "Zobraziť zoznam funkcií v móde úprav" #: libraries/config/messages.inc.php:446 msgid "Show function fields" -msgstr "" +msgstr "Zobraziť zoznam funkcií" #: libraries/config/messages.inc.php:447 msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" msgstr "" +"Zobraziť odkaz na výstup " +"[a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] funkcie" #: libraries/config/messages.inc.php:448 msgid "Show phpinfo() link" -msgstr "" +msgstr "Zobraziť odkaz na phpinfo()" #: libraries/config/messages.inc.php:449 msgid "Show detailed MySQL server information" -msgstr "" +msgstr "Zobraziť podrobné informácie o MySQL serveri" #: libraries/config/messages.inc.php:450 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" msgstr "" #: libraries/config/messages.inc.php:451 -#, fuzzy msgid "Show SQL queries" -msgstr "Zobraziť kompletné dopyty" +msgstr "Zobraziť SQL dopyty" #: libraries/config/messages.inc.php:452 msgid "Allow to display database and table statistics (eg. space usage)" msgstr "" +"Povoliť zobrazenie štatistík o databázach a tabuľkách (napr. využité miesto)" #: libraries/config/messages.inc.php:453 -#, fuzzy msgid "Show statistics" -msgstr "Štatistika riadku" +msgstr "Zobraziť štatistiky" #: libraries/config/messages.inc.php:454 msgid "" @@ -4109,7 +4118,7 @@ msgstr "" #: libraries/config/messages.inc.php:455 msgid "Display database comment instead of its name" -msgstr "" +msgstr "Zobraziť komentár k databáze namiesto mena" #: libraries/config/messages.inc.php:456 msgid "" @@ -4121,7 +4130,7 @@ msgstr "" #: libraries/config/messages.inc.php:457 msgid "Display table comment instead of its name" -msgstr "" +msgstr "Zobraziť komentár k tabuľke namiesto mena" #: libraries/config/messages.inc.php:458 msgid "Display table comments in tooltips" @@ -4133,9 +4142,8 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:460 -#, fuzzy msgid "Skip locked tables" -msgstr "Zobraziť otvorené tabuľky" +msgstr "Preskočiť zamknuté tabuľky" #: libraries/config/messages.inc.php:465 msgid "Requires SQL Validator to be enabled" @@ -4156,10 +4164,12 @@ msgid "" "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be " "installed" msgstr "" +"[strong]Varovanie:[/strong] vyžaduje nainštalované rozšírenia PHP SOAP alebo " +"PEAR SOAP" #: libraries/config/messages.inc.php:469 msgid "Enable SQL Validator" -msgstr "" +msgstr "Povoliť kontrolovanie SQL" #: libraries/config/messages.inc.php:470 msgid "" @@ -4180,7 +4190,7 @@ msgstr "" #: libraries/config/messages.inc.php:473 msgid "Suggest new database name" -msgstr "" +msgstr "Navrhnúť meno novej databázy" #: libraries/config/messages.inc.php:474 msgid "A warning is displayed on the main page if Suhosin is detected" @@ -4188,7 +4198,7 @@ msgstr "" #: libraries/config/messages.inc.php:475 msgid "Suhosin warning" -msgstr "" +msgstr "Varovanie Suhosin rozšírenia" #: libraries/config/messages.inc.php:476 msgid "" @@ -4208,15 +4218,15 @@ msgstr "" #: libraries/config/messages.inc.php:479 msgid "Textarea rows" -msgstr "" +msgstr "Riadkov v textovej oblasti" #: libraries/config/messages.inc.php:480 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Popis okna prehliadača pri výbere databázy" #: libraries/config/messages.inc.php:482 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Popis okna prehliadača keď nie je nič vybrané" #: libraries/config/messages.inc.php:483 msgid "Default title" @@ -4224,11 +4234,11 @@ msgstr "Východzí popis" #: libraries/config/messages.inc.php:484 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Popis okna prehliadača keď je vybraný server" #: libraries/config/messages.inc.php:486 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Popis okna prehliadača keď je vybraná tabuľka" #: libraries/config/messages.inc.php:488 msgid "" @@ -4244,19 +4254,19 @@ msgstr "" #: libraries/config/messages.inc.php:490 msgid "Directory on server where you can upload files for import" -msgstr "" +msgstr "Adresár na serveri, kde môžete nahrať súbor pre import" #: libraries/config/messages.inc.php:491 msgid "Upload directory" -msgstr "" +msgstr "Adresár pre nahrávanie" #: libraries/config/messages.inc.php:492 msgid "Allow for searching inside the entire database" -msgstr "" +msgstr "Povoliť prehľadávať celú databázu" #: libraries/config/messages.inc.php:493 msgid "Use database search" -msgstr "" +msgstr "Použiť databázové vyhľadávanie" #: libraries/config/messages.inc.php:494 msgid "" @@ -4266,7 +4276,7 @@ msgstr "" #: libraries/config/messages.inc.php:495 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Povoliť záložku Pre vývojára v nastaveniach" #: libraries/config/messages.inc.php:496 msgid "" @@ -4281,11 +4291,11 @@ msgstr "" #: libraries/config/messages.inc.php:498 setup/frames/index.inc.php:241 msgid "Check for latest version" -msgstr "" +msgstr "Skontrolovať najnovšiu verziu" #: libraries/config/messages.inc.php:499 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Povoliť kontrolu poslednej verzie na hlavnej stránke phpMyAdmina" #: libraries/config/messages.inc.php:500 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4293,7 +4303,7 @@ msgstr "" #: setup/lib/index.lib.php:161 setup/lib/index.lib.php:164 #: setup/lib/index.lib.php:200 msgid "Version check" -msgstr "" +msgstr "Kontrola verzie" #: libraries/config/messages.inc.php:501 msgid "" @@ -4331,14 +4341,14 @@ msgstr "CSV pomocou LOAD DATA" #: libraries/config/user_preferences.forms.php:245 libraries/export/xls.php:17 #: libraries/import/xls.php:20 msgid "Excel 97-2003 XLS Workbook" -msgstr "" +msgstr "Excel 97-2003 XLS pracovný zošit" #: libraries/config/setup.forms.php:252 libraries/config/setup.forms.php:347 #: libraries/config/user_preferences.forms.php:155 #: libraries/config/user_preferences.forms.php:249 #: libraries/export/xlsx.php:17 libraries/import/xlsx.php:20 msgid "Excel 2007 XLSX Workbook" -msgstr "" +msgstr "Excel 2007 XLSX pracovný zošit" #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:356 #: libraries/config/user_preferences.forms.php:158 @@ -4380,9 +4390,8 @@ msgid "Open Document Text" msgstr "Open Document Text" #: libraries/config/validate.lib.php:202 libraries/config/validate.lib.php:209 -#, fuzzy msgid "Could not connect to MySQL server" -msgstr "Nepodarilo sa pripojiť k zdroju" +msgstr "Nepodarilo sa pripojiť k MySQL serveru" #: libraries/config/validate.lib.php:234 msgid "Empty username while using config authentication method" @@ -4407,7 +4416,7 @@ msgstr "" #: libraries/config/validate.lib.php:367 #, php-format msgid "Incorrect IP address: %s" -msgstr "" +msgstr "Nesprávna IP adresa: %s" #. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. #: libraries/core.lib.php:264 @@ -4439,7 +4448,7 @@ msgstr "Databáza vyzerá prázdna!" #: libraries/db_links.inc.php:66 libraries/relation.lib.php:143 #: libraries/tbl_links.inc.php:90 msgid "Tracking" -msgstr "" +msgstr "Sledovanie" #: libraries/db_links.inc.php:71 msgid "Query" @@ -4461,7 +4470,7 @@ msgstr "" #: libraries/db_routines.inc.php:37 msgid "Return type" -msgstr "" +msgstr "Návratový typ" #: libraries/db_structure.lib.php:48 libraries/display_tbl.lib.php:1923 msgid "" @@ -4486,7 +4495,7 @@ msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)" #: libraries/dbi/mysql.dbi.lib.php:370 tbl_structure.php:703 msgid "Details..." -msgstr "" +msgstr "Podrobnosti..." #: libraries/display_change_password.lib.php:29 main.php:94 #: user_password.php:119 user_password.php:137 @@ -4514,10 +4523,9 @@ msgstr "Kompatibilné s MySQL 4.0" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" -msgstr "Vytvoriť novú databázu" +msgstr "Vytvoriť databázu" #: libraries/display_create_database.lib.php:33 msgid "Create" @@ -4590,7 +4598,7 @@ msgstr "Počet riadkov:" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Začať od riadku:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4598,7 +4606,7 @@ msgstr "" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" -msgstr "" +msgstr "Výstup:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 #, php-format @@ -4639,7 +4647,7 @@ msgstr "" #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "použiť aj pre budúce exporty" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:517 @@ -4703,7 +4711,7 @@ msgstr "" #: libraries/display_import.lib.php:76 msgid "The file is being processed, please be patient." -msgstr "" +msgstr "Súbor sa spracováva, buďte prosím trpezliví." #: libraries/display_import.lib.php:98 msgid "" @@ -4732,7 +4740,7 @@ msgstr "Súbor na importovanie:" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Súbor môže byť komprimovaný (%s) alebo nekomprimovaný." #: libraries/display_import.lib.php:158 msgid "" @@ -6375,7 +6383,7 @@ msgstr "Cieľová databáza" #: libraries/sql_query_form.lib.php:224 #, php-format msgid "Run SQL query/queries on server %s" -msgstr "Spustiť SQL príkaz(y) na servri %s" +msgstr "Spustiť SQL príkaz(y) na serveri %s" #: libraries/sql_query_form.lib.php:241 libraries/sql_query_form.lib.php:265 #, php-format @@ -6384,9 +6392,8 @@ msgstr "Spustiť SQL dopyt/dopyty na databázu %s" #: libraries/sql_query_form.lib.php:297 navigation.php:276 #: setup/frames/index.inc.php:231 -#, fuzzy msgid "Clear" -msgstr "Kalendár" +msgstr "Vyčistiť" #: libraries/sql_query_form.lib.php:302 msgid "Columns" @@ -6570,7 +6577,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Získať viac miesta pre úpravy" #: libraries/tbl_properties.inc.php:396 msgctxt "for default" @@ -6789,7 +6796,7 @@ msgstr "Overenie MySQL spojenia" #: main.php:119 msgid "Appearance Settings" -msgstr "" +msgstr "Nastavenia vzhľadu" #: main.php:146 prefs_manage.php:274 msgid "More settings" @@ -6838,9 +6845,8 @@ msgid "Contribute" msgstr "Prispejte" #: main.php:218 -#, fuzzy msgid "Get support" -msgstr "Exportovať" +msgstr "Získať podporu" #: main.php:219 msgid "List of changes" @@ -7152,7 +7158,7 @@ msgstr "Zmeny boli uložené" #: prefs_forms.php:78 msgid "Cannot save settings, submitted form contains errors" -msgstr "" +msgstr "Nepodarilo sa uložiť nastavenia, odoslaný formulár obsahuje chyby" #: prefs_manage.php:80 msgid "Could not import configuration" @@ -7164,7 +7170,7 @@ msgstr "" #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Prajete si načítať zostávajúce nastavenia?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" @@ -7184,7 +7190,7 @@ msgstr "" #: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "" +msgstr "Nemáte žiadne uložené nastavenia!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" @@ -7212,7 +7218,7 @@ msgstr "" #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." @@ -8680,12 +8686,12 @@ msgid "" "<b>Server traffic</b>: These tables show the network traffic statistics of " "this MySQL server since its startup." msgstr "" -"<b>Traffic serveru</b>: Tieto tabuľky zobrazujú štatistiky sieťového " -"trafficu na tomto MySQL serveri od jeho štartu." +"<b>Vyťaženie servera</b>: Tieto tabuľky zobrazujú štatistiky sieťovej " +"premávky na tomto MySQL serveri od jeho štartu." #: server_status.php:514 msgid "Traffic" -msgstr "Prevádzka" +msgstr "Vyťaženie" #: server_status.php:514 msgid "" @@ -8745,13 +8751,12 @@ msgid "Query type" msgstr "Typ dopytu" #: server_status.php:725 server_status.php:726 -#, fuzzy msgid "Show query chart" -msgstr "SQL dopyt" +msgstr "Zobraziť graf dopytov" #: server_status.php:727 msgid "Note: Generating the query chart can take a long time." -msgstr "" +msgstr "Poznámka: Generovanie grafu dopytov môže trvať dlhý čas." #: server_status.php:872 msgid "Replication status" diff --git a/scripts/signon.php b/scripts/signon.php index acb5f7d..e585625 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -11,14 +11,15 @@ * @subpackage Example */ +/* Need to have cookie visible from parent directory */ +session_set_cookie_params(0, '/', '', 0); +/* Create signon session */ +$session_name = 'SignonSession'; +session_name($session_name); +session_start(); + /* Was data posted? */ if (isset($_POST['user'])) { - /* Need to have cookie visible from parent directory */ - session_set_cookie_params(0, '/', '', 0); - /* Create signon session */ - $session_name = 'SignonSession'; - session_name($session_name); - session_start(); /* Store there credentials */ $_SESSION['PMA_single_signon_user'] = $_POST['user']; $_SESSION['PMA_single_signon_password'] = $_POST['password']; @@ -47,7 +48,7 @@ if (isset($_POST['user'])) { <body> <?php if (isset($_SESSION['PMA_single_signon_error_message'])) { - echo '<p class="error">' . $_SESSION['PMA_single_signon_message'] . '</p>'; + echo '<p class="error">' . $_SESSION['PMA_single_signon_error_message'] . '</p>'; } ?> <form action="signon.php" method="post"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-35-g548b62e
by Michal Čihař 23 May '11

23 May '11

The branch, QA_3_4 has been updated via 548b62e93f2281805aff12f286e4df011c8791c4 (commit) from adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 (commit) - Log ----------------------------------------------------------------- commit 548b62e93f2281805aff12f286e4df011c8791c4 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 10:40:26 2011 +0200 Update po files ----------------------------------------------------------------------- Summary of changes: po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 105 +++++++++++++++++++++++++++++++------------------------ po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 63 files changed, 121 insertions(+), 108 deletions(-) diff --git a/po/af.po b/po/af.po index 4bcb300..b4ec79f 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index b716a17..93ff613 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" diff --git a/po/az.po b/po/az.po index a22e342..f31bff5 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index 0557710..9cb4502 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index c096453..481987d 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 778ce57..23eb015 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" diff --git a/po/bn.po b/po/bn.po index c6d2efd..3510ea6 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/bs.po b/po/bs.po index aab0ca6..6b62306 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 9e52bee..b7bfacb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 743d5b0..db57130 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index b81a06e..f88d081 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index fcf770b..50db740 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" diff --git a/po/de.po b/po/de.po index 7e13d59..1c37fb6 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index 27e1be0..b9aca15 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index 5a206eb..c2ab85d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index 551dc8a..eec3207 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index 6fcd3e4..6cff2d4 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index c0f76b0..5b03610 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index 97d7832..04e72de 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index 5a3c340..a502ff3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" diff --git a/po/fr.po b/po/fr.po index 13eff66..b9867fa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 29f2fc4..052e874 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index e066b52..cac00da 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index 411212a..962682c 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index 06bf7d6..1ac83fd 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index 37e66b8..87c3062 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" diff --git a/po/id.po b/po/id.po index 18ddb7e..aa339d0 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Repoct-Id-Version: phpMyAdmin 3.4.2-dev\n"sourceforge.net\n"-----------m [172.29.30.125]6��p��+ T�6�"aP�+��P�+�^�6�_�6��hP�+��Q�+�tq�+�Xm�+_�6��p��+ T�6��R�6��}P�+6 ��!�!�^�6�_�6�xm�+ U�6�"aP�+~P�+�^�6��`P�+�^�6��+�hP�+��+��+� ��+��Q�+xm�+ U�6��S�6��}P�+�!�!�^�6�_�6��L�+V�6�"aP�+~P�+�^�6��`P�+�^�6��^�6��^�6�{q�+�p�_�6��hP�+��Q�+V�6��T�6��}P�+GHIJKMNOP�^�6�_�6�H�#�+�W�6�"aP�+~P�+�^�6�0��+�hP�+ m�+��+��+��+� ��+��Q�+H�#�+�W�6��U�6��}P�+8�#�+�W�6�V�6��}P�+(�#�+�W�6�@V�6��}P�+�#�+�W�6�pV�6��}P�+ ��+�hP�+� ��+�P�6��+�gP�+��+W�6�y�+�gP�+��+@W�6�Z�+�gP�+��+ m�+��+��+�$m�+��+� ��+��Q�+� ��+�X�6��W�6��}P�+#%')*-.035678:<=�^�6�_�6�pK��+�Y�6�"aP�+8/m�+�hP�+�$m�+�)m�+��Q�+cf��+_�6�pK��+�Y�6��X�6��}P�+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�"��+P`�6�F04�+F04�+?u��+`�6�pW�6�0[�6��+�gP�+�tq�+�a�6�B04�+``�6��^�6��r�+_�6��B04�+_�6��}P�rt-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" diff --git a/po/it.po b/po/it.po index 2d60785..add88e8 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index bcfe71c..29a38b6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index 9941a82..afa9aae 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index fc019e1..687b3fb 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index 78d59d0..43efc2d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index e74f550..5239951 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index 993a9b9..4311a5d 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index e14f263..e1a2fbe 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index c028ea1..cf9d7d3 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 02b9ad0..8707dc2 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index a9414f1..f823b52 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 1c0ffa7..b7e1b7e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index 5b51d66..e271d2a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index 28e2aca..535452f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 14ddc75..e93ba1d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" diff --git a/po/ro.po b/po/ro.po index f3e0f02..dade929 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 5385fdb..3ccba4b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index b784534..c95b51e 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index 2b0fce3..abb5b01 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" @@ -4016,6 +4016,8 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links" "[/a] support, suggested: [kbd]pma_relation[/kbd]" msgstr "" +"Nechajte prázdne pre vypnutie [a@http://wiki.phpmyadmin.net/pma/relation]" +"relation-links[/a] podpory, navrhované: [kbd]pma_relation[/kbd]" #: libraries/config/messages.inc.php:404 #, fuzzy @@ -4140,6 +4142,8 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/" "kbd]" msgstr "" +"Nechajte prázdne pre vypnutie podpory pre sledovanie SQL dopytov, " +"navrhované: [kbd]pma_tracking[/kbd]" #: libraries/config/messages.inc.php:427 msgid "SQL query tracking table" @@ -4180,25 +4184,29 @@ msgstr "" #: libraries/config/messages.inc.php:435 msgid "Verbose check" -msgstr "" +msgstr "Podrobná kontrola" #: libraries/config/messages.inc.php:436 msgid "" "A user-friendly description of this server. Leave blank to display the " "hostname instead." msgstr "" +"Užívateľsky prívetivý popis tohto servera. Ak necháte prízdne, zobrazí sa " +"namiesto popisu meno servera." #: libraries/config/messages.inc.php:437 msgid "Verbose name of this server" -msgstr "" +msgstr "Dlhé meno tohto servera" #: libraries/config/messages.inc.php:438 msgid "Whether a user should be displayed a "show all (rows)" button" msgstr "" +"Či sa bude užívateľovi zobrazovať tlačidlo "zobraziť všetky (riadky)" +""" #: libraries/config/messages.inc.php:439 msgid "Allow to display all the rows" -msgstr "" +msgstr "Povoliť zobraziť všetky riadky" #: libraries/config/messages.inc.php:440 msgid "" @@ -4209,11 +4217,11 @@ msgstr "" #: libraries/config/messages.inc.php:441 msgid "Show password change form" -msgstr "" +msgstr "Zobraziť formulár na zmenu hesla" #: libraries/config/messages.inc.php:442 msgid "Show create database form" -msgstr "" +msgstr "Zobraziť formulár na vytvorenie databázy" #: libraries/config/messages.inc.php:443 msgid "" @@ -4229,25 +4237,27 @@ msgstr "Zobraziť otvorené tabuľky" #: libraries/config/messages.inc.php:445 msgid "Display the function fields in edit/insert mode" -msgstr "" +msgstr "Zobraziť zoznam funkcií v móde úprav" #: libraries/config/messages.inc.php:446 msgid "Show function fields" -msgstr "" +msgstr "Zobraziť zoznam funkcií" #: libraries/config/messages.inc.php:447 msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" msgstr "" +"Zobraziť odkaz na výstup [a@http://php.net/manual/function.phpinfo.php]" +"phpinfo()[/a] funkcie" #: libraries/config/messages.inc.php:448 msgid "Show phpinfo() link" -msgstr "" +msgstr "Zobraziť odkaz na phpinfo()" #: libraries/config/messages.inc.php:449 msgid "Show detailed MySQL server information" -msgstr "" +msgstr "Zobraziť podrobné informácie o MySQL serveri" #: libraries/config/messages.inc.php:450 msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed" @@ -4261,6 +4271,7 @@ msgstr "Zobraziť kompletné dopyty" #: libraries/config/messages.inc.php:452 msgid "Allow to display database and table statistics (eg. space usage)" msgstr "" +"Povoliť zobrazenie štatistík o databázach a tabuľkách (napr. využité miesto)" #: libraries/config/messages.inc.php:453 #, fuzzy @@ -4275,7 +4286,7 @@ msgstr "" #: libraries/config/messages.inc.php:455 msgid "Display database comment instead of its name" -msgstr "" +msgstr "Zobraziť komentár k databáze namiesto mena" #: libraries/config/messages.inc.php:456 msgid "" @@ -4287,7 +4298,7 @@ msgstr "" #: libraries/config/messages.inc.php:457 msgid "Display table comment instead of its name" -msgstr "" +msgstr "Zobraziť komentár k tabuľke namiesto mena" #: libraries/config/messages.inc.php:458 msgid "Display table comments in tooltips" @@ -4322,10 +4333,12 @@ msgid "" "[strong]Warning:[/strong] requires PHP SOAP extension or PEAR SOAP to be " "installed" msgstr "" +"[strong]Varovanie:[/strong] vyžaduje nainštalované rozšírenia PHP SOAP alebo " +"PEAR SOAP" #: libraries/config/messages.inc.php:469 msgid "Enable SQL Validator" -msgstr "" +msgstr "Povoliť kontrolovanie SQL" #: libraries/config/messages.inc.php:470 msgid "" @@ -4347,7 +4360,7 @@ msgstr "" #: libraries/config/messages.inc.php:473 msgid "Suggest new database name" -msgstr "" +msgstr "Navrhnúť meno novej databázy" #: libraries/config/messages.inc.php:474 msgid "A warning is displayed on the main page if Suhosin is detected" @@ -4355,7 +4368,7 @@ msgstr "" #: libraries/config/messages.inc.php:475 msgid "Suhosin warning" -msgstr "" +msgstr "Varovanie Suhosin rozšírenia" #: libraries/config/messages.inc.php:476 msgid "" @@ -4377,15 +4390,15 @@ msgstr "" #: libraries/config/messages.inc.php:479 msgid "Textarea rows" -msgstr "" +msgstr "Riadkov v textovej oblasti" #: libraries/config/messages.inc.php:480 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Popis okna prehliadača pri výbere databázy" #: libraries/config/messages.inc.php:482 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Popis okna prehliadača keď nie je nič vybrané" #: libraries/config/messages.inc.php:483 #, fuzzy @@ -4395,11 +4408,11 @@ msgstr "Predvolené" #: libraries/config/messages.inc.php:484 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Popis okna prehliadača keď je vybraný server" #: libraries/config/messages.inc.php:486 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Popis okna prehliadača keď je vybraná tabuľka" #: libraries/config/messages.inc.php:488 msgid "" @@ -4415,19 +4428,19 @@ msgstr "" #: libraries/config/messages.inc.php:490 msgid "Directory on server where you can upload files for import" -msgstr "" +msgstr "Adresár na serveri, kde môžete nahrať súbor pre import" #: libraries/config/messages.inc.php:491 msgid "Upload directory" -msgstr "" +msgstr "Adresár pre nahrávanie" #: libraries/config/messages.inc.php:492 msgid "Allow for searching inside the entire database" -msgstr "" +msgstr "Povoliť prehľadávať celú databázu" #: libraries/config/messages.inc.php:493 msgid "Use database search" -msgstr "" +msgstr "Použiť databázové vyhľadávanie" #: libraries/config/messages.inc.php:494 msgid "" @@ -4437,7 +4450,7 @@ msgstr "" #: libraries/config/messages.inc.php:495 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Povoliť záložku Pre vývojára v nastaveniach" #: libraries/config/messages.inc.php:496 msgid "" @@ -4452,11 +4465,11 @@ msgstr "" #: libraries/config/messages.inc.php:498 setup/frames/index.inc.php:229 msgid "Check for latest version" -msgstr "" +msgstr "Skontrolovať najnovšiu verziu" #: libraries/config/messages.inc.php:499 msgid "Enables check for latest version on main phpMyAdmin page" -msgstr "" +msgstr "Povoliť kontrolu poslednej verzie na hlavnej stránke phpMyAdmina" #: libraries/config/messages.inc.php:500 setup/lib/index.lib.php:118 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142 @@ -4464,7 +4477,7 @@ msgstr "" #: setup/lib/index.lib.php:161 setup/lib/index.lib.php:164 #: setup/lib/index.lib.php:200 msgid "Version check" -msgstr "" +msgstr "Kontrola verzie" #: libraries/config/messages.inc.php:501 msgid "" @@ -4504,14 +4517,14 @@ msgstr "CSV pomocou LOAD DATA" #: libraries/config/user_preferences.forms.php:245 libraries/export/xls.php:17 #: libraries/import/xls.php:20 msgid "Excel 97-2003 XLS Workbook" -msgstr "" +msgstr "Excel 97-2003 XLS pracovný zošit" #: libraries/config/setup.forms.php:252 libraries/config/setup.forms.php:347 #: libraries/config/user_preferences.forms.php:155 #: libraries/config/user_preferences.forms.php:249 #: libraries/export/xlsx.php:17 libraries/import/xlsx.php:20 msgid "Excel 2007 XLSX Workbook" -msgstr "" +msgstr "Excel 2007 XLSX pracovný zošit" #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:356 #: libraries/config/user_preferences.forms.php:158 @@ -4582,7 +4595,7 @@ msgstr "" #: libraries/config/validate.lib.php:367 #, php-format msgid "Incorrect IP address: %s" -msgstr "" +msgstr "Nesprávna IP adresa: %s" #. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. #: libraries/core.lib.php:264 @@ -4614,7 +4627,7 @@ msgstr "Databáza vyzerá prázdna!" #: libraries/db_links.inc.php:66 libraries/relation.lib.php:143 #: libraries/tbl_links.inc.php:90 msgid "Tracking" -msgstr "" +msgstr "Sledovanie" #: libraries/db_links.inc.php:71 msgid "Query" @@ -4636,7 +4649,7 @@ msgstr "" #: libraries/db_routines.inc.php:37 msgid "Return type" -msgstr "" +msgstr "Návratový typ" #: libraries/db_structure.lib.php:48 libraries/display_tbl.lib.php:1923 msgid "" @@ -4659,7 +4672,7 @@ msgstr "(alebo soket lokálneho MySQL servra nie je správne nastavený)" #: libraries/dbi/mysql.dbi.lib.php:370 tbl_structure.php:703 msgid "Details..." -msgstr "" +msgstr "Podrobnosti..." #: libraries/display_change_password.lib.php:29 main.php:94 #: user_password.php:119 user_password.php:137 @@ -4781,7 +4794,7 @@ msgstr "Počet polí" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Začať od riadku:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4789,7 +4802,7 @@ msgstr "" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" -msgstr "" +msgstr "Výstup:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 #, fuzzy, php-format @@ -4838,7 +4851,7 @@ msgstr "" #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "použiť aj pre budúce exporty" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:517 @@ -4917,7 +4930,7 @@ msgstr "" #: libraries/display_import.lib.php:76 msgid "The file is being processed, please be patient." -msgstr "" +msgstr "Súbor sa spracováva, buďte prosím trpezliví." #: libraries/display_import.lib.php:98 msgid "" @@ -4952,7 +4965,7 @@ msgstr "Súbor na importovanie" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Súbor môže byť komprimovaný (%s) alebo nekomprimovaný." #: libraries/display_import.lib.php:158 msgid "" @@ -6857,7 +6870,7 @@ msgstr "" #: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Získať viac miesta pre úpravy" #: libraries/tbl_properties.inc.php:396 #, fuzzy @@ -7118,7 +7131,7 @@ msgstr "Overenie MySQL spojenia" #: main.php:119 msgid "Appearance Settings" -msgstr "" +msgstr "Nastavenia vzhľadu" #: main.php:146 prefs_manage.php:274 #, fuzzy @@ -7517,7 +7530,7 @@ msgstr "Zmeny boli uložené" #: prefs_forms.php:78 msgid "Cannot save settings, submitted form contains errors" -msgstr "" +msgstr "Nepodarilo sa uložiť nastavenia, odoslaný formulár obsahuje chyby" #: prefs_manage.php:80 #, fuzzy @@ -7531,7 +7544,7 @@ msgstr "" #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Prajete si načítať zostávajúce nastavenia?" #: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" @@ -7553,7 +7566,7 @@ msgstr "" #: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "" +msgstr "Nemáte žiadne uložené nastavenia!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" @@ -7581,7 +7594,7 @@ msgstr "" #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." @@ -9145,7 +9158,7 @@ msgstr "SQL dopyt" #: server_status.php:727 msgid "Note: Generating the query chart can take a long time." -msgstr "" +msgstr "Poznámka: Generovanie grafu dopytov môže trvať dlhý čas." #: server_status.php:872 msgid "Replication status" diff --git a/po/sl.po b/po/sl.po index 513738c..8851a53 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index 3129383..2ab948d 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index fce4777..c9c1f1a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 3b97248..6fbde20 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index 05ff9e5..6b3f5c6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index e4b385c..2d83950 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 5a84918..3295f2f 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index 066021a..6315dc7 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index 5a44d68..414be82 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index 312572f..5b19dc5 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index 90eaa22..0680a03 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index 9acd5b8..7a03d20 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index 2ded270..7031624 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 991d146..842b84f 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 3bafea2..a9c48e7 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 874000e..4b8a168 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5d5e7b2..17a1037 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.1-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-16 10:31+0200\n" "PO-Revision-Date: 2010-11-05 14:13+0200\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-34-gadc6de0
by Michal Čihař 23 May '11

23 May '11

The branch, QA_3_4 has been updated via adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 (commit) from e936257d44ba2103c03986dd7253519480e46fac (commit) - Log ----------------------------------------------------------------- commit adc6de06850e57cdb0118f9ca6f3d90f4bba47a8 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 23 10:33:14 2011 +0200 [auth] Fixed error handling for signon auth method. The message is now stored in caller session data and properly displayed in example script. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/auth/signon.auth.lib.php | 41 +++++++++++++++++++++++++---------- scripts/signon.php | 15 +++++++------ 3 files changed, 38 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02db359..0bed539 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ - bug #3305606 [interface] Show all button wraps on privileges page - bug #3305517 [config] Config for export compression not used - bug #3305883 [interface] Table is dropped regardless of confirmation +- [auth] Fixed error handling for signon auth method. 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index 3e0d64b..0735020 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -202,18 +202,35 @@ function PMA_auth_set_user() */ function PMA_auth_fails() { - if (! empty($GLOBALS['login_without_password_is_forbidden'])) { - $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)'); - } elseif (! empty($GLOBALS['allowDeny_forbidden'])) { - $_SESSION['PMA_single_signon_error_message'] = __('Access denied'); - } elseif (! empty($GLOBALS['no_activity'])) { - $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); - } elseif (PMA_DBI_getError()) { - $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); - } elseif (isset($php_errormsg)) { - $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; - } else { - $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); + /* Session name */ + $session_name = $GLOBALS['cfg']['Server']['SignonSession']; + + /* Does session exist? */ + if (isset($_COOKIE[$session_name])) { + /* End current session */ + $old_session = session_name(); + $old_id = session_id(); + session_write_close(); + + /* Load single signon session */ + session_name($session_name); + session_id($_COOKIE[$session_name]); + session_start(); + + /* Set error message */ + if (! empty($GLOBALS['login_without_password_is_forbidden'])) { + $_SESSION['PMA_single_signon_error_message'] = __('Login without a password is forbidden by configuration (see AllowNoPassword)'); + } elseif (! empty($GLOBALS['allowDeny_forbidden'])) { + $_SESSION['PMA_single_signon_error_message'] = __('Access denied'); + } elseif (! empty($GLOBALS['no_activity'])) { + $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); + } elseif (PMA_DBI_getError()) { + $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); + } elseif (isset($php_errormsg)) { + $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; + } else { + $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); + } } PMA_auth(); } // end of the 'PMA_auth_fails()' function diff --git a/scripts/signon.php b/scripts/signon.php index acb5f7d..e585625 100644 --- a/scripts/signon.php +++ b/scripts/signon.php @@ -11,14 +11,15 @@ * @subpackage Example */ +/* Need to have cookie visible from parent directory */ +session_set_cookie_params(0, '/', '', 0); +/* Create signon session */ +$session_name = 'SignonSession'; +session_name($session_name); +session_start(); + /* Was data posted? */ if (isset($_POST['user'])) { - /* Need to have cookie visible from parent directory */ - session_set_cookie_params(0, '/', '', 0); - /* Create signon session */ - $session_name = 'SignonSession'; - session_name($session_name); - session_start(); /* Store there credentials */ $_SESSION['PMA_single_signon_user'] = $_POST['user']; $_SESSION['PMA_single_signon_password'] = $_POST['password']; @@ -47,7 +48,7 @@ if (isset($_POST['user'])) { <body> <?php if (isset($_SESSION['PMA_single_signon_error_message'])) { - echo '<p class="error">' . $_SESSION['PMA_single_signon_message'] . '</p>'; + echo '<p class="error">' . $_SESSION['PMA_single_signon_error_message'] . '</p>'; } ?> <form action="signon.php" method="post"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1810-g21c3493
by Madhura Jayaratne 22 May '11

22 May '11

The branch, master has been updated via 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a (commit) via e936257d44ba2103c03986dd7253519480e46fac (commit) from 6619e39d639bd994f5efe05e2766836cc1945145 (commit) - Log ----------------------------------------------------------------- commit 21c3493d3c5564c3dfd5ba9e39596b25e2f6569a Merge: 6619e39d639bd994f5efe05e2766836cc1945145 e936257d44ba2103c03986dd7253519480e46fac Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 22:41:55 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 7 ++++++- libraries/sql_query_form.lib.php | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6dcd985..99bc2dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ - patch #3303813 [setup] Define a label that was missing - bug #3305606 [interface] Show all button wraps on privileges page - bug #3305517 [config] Config for export compression not used +- bug #3305883 [interface] Table is dropped regardless of confirmation 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/js/sql.js b/js/sql.js index 13fade0..32a5bba 100644 --- a/js/sql.js +++ b/js/sql.js @@ -263,10 +263,15 @@ $(document).ready(function() { */ $("#sqlqueryform.ajax").live('submit', function(event) { event.preventDefault(); + + $form = $(this); + if (! checkSqlQuery($form[0])) { + return false; + } + // remove any div containing a previous error message $('.error').remove(); - $form = $(this); var $msgbox = PMA_ajaxShowMessage(); PMA_prepareForAjaxRequest($form); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 9852e0a..25f67cd 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -119,8 +119,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') if ($GLOBALS['cfg']['AjaxEnable']) { echo ' class="ajax"'; } - echo ' id="sqlqueryform"' - .' onsubmit="return checkSqlQuery(this)" name="sqlform">' . "\n"; + echo ' id="sqlqueryform" name="sqlform">' . "\n"; } if ($is_querywindow) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-33-ge936257
by Madhura Jayaratne 22 May '11

22 May '11

The branch, QA_3_4 has been updated via e936257d44ba2103c03986dd7253519480e46fac (commit) from 16305005c58e57b4f89150fe01b93f9071131601 (commit) - Log ----------------------------------------------------------------- commit e936257d44ba2103c03986dd7253519480e46fac Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 22:01:47 2011 +0530 bug #3305883 [interface] Table is dropped regardless of confirmation ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 7 ++++++- libraries/sql_query_form.lib.php | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3942083..02db359 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ - patch #3303813 [setup] Define a label that was missing - bug #3305606 [interface] Show all button wraps on privileges page - bug #3305517 [config] Config for export compression not used +- bug #3305883 [interface] Table is dropped regardless of confirmation 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/js/sql.js b/js/sql.js index 13fade0..32a5bba 100644 --- a/js/sql.js +++ b/js/sql.js @@ -263,10 +263,15 @@ $(document).ready(function() { */ $("#sqlqueryform.ajax").live('submit', function(event) { event.preventDefault(); + + $form = $(this); + if (! checkSqlQuery($form[0])) { + return false; + } + // remove any div containing a previous error message $('.error').remove(); - $form = $(this); var $msgbox = PMA_ajaxShowMessage(); PMA_prepareForAjaxRequest($form); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 9852e0a..25f67cd 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -119,8 +119,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') if ($GLOBALS['cfg']['AjaxEnable']) { echo ' class="ajax"'; } - echo ' id="sqlqueryform"' - .' onsubmit="return checkSqlQuery(this)" name="sqlform">' . "\n"; + echo ' id="sqlqueryform" name="sqlform">' . "\n"; } if ($is_querywindow) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. e44eb2866f5210b701416b82c29af918841ec666
by Marc Delisle 22 May '11

22 May '11

The branch, master has been updated via e44eb2866f5210b701416b82c29af918841ec666 (commit) from a1be72d541e6f3d1283065bb91f8f3c3e4fc0359 (commit) - Log ----------------------------------------------------------------- commit e44eb2866f5210b701416b82c29af918841ec666 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun May 22 06:28:04 2011 -0400 PMASA-2011-3 and -4 ----------------------------------------------------------------------- Summary of changes: templates/security/{PMASA-2011-2 => PMASA-2011-3} | 34 +++++++------- templates/security/PMASA-2011-4 | 50 +++++++++++++++++++++ 2 files changed, 68 insertions(+), 16 deletions(-) copy templates/security/{PMASA-2011-2 => PMASA-2011-3} (50%) create mode 100644 templates/security/PMASA-2011-4 diff --git a/templates/security/PMASA-2011-2 b/templates/security/PMASA-2011-3 similarity index 50% copy from templates/security/PMASA-2011-2 copy to templates/security/PMASA-2011-3 index 8dfca27..cb973dd 100644 --- a/templates/security/PMASA-2011-2 +++ b/templates/security/PMASA-2011-3 @@ -3,55 +3,57 @@ <py:def function="announcement_id"> -PMASA-2011-2 +PMASA-2011-3 </py:def> <py:def function="announcement_date"> -2011-02-11 +2011-05-22 </py:def> <py:def function="announcement_summary"> -SQL query could be executed under another user. +XSS vulnerability on Tracking page </py:def> <py:def function="announcement_description"> -It was possible to create a bookmark which would be executed unintentionally by other users. +It was possible to create a crafted table name that leads to XSS. </py:def> <py:def function="announcement_severity"> -We consider this vulnerability to be critical. +We consider this vulnerability to be serious. </py:def> <py:def function="announcement_mitigation"> -To use this vulnerability, phpMyAdmin configuration storage needs to be -set up and enabled and bookmarks function needs to be enabled. +This vulnerability works in the context of a shared phpMyAdmin installation. +The attacker needs to convince a victim to go to the Tracking page that +relates to the crafted table. </py:def> <py:def function="announcement_affected"> -The 2.11.x and 3.3.x versions are affected. +The 3.3.x and 3.4.0 versions are affected. </py:def> <py:def function="announcement_solution"> -Upgrade to phpMyAdmin 3.3.9.2 or newer (2.11.11.3 or newer for the older -family) or apply the related patch listed below. +Upgrade to phpMyAdmin 3.3.10.1 or 3.4.1 or apply the related patch listed below. </py:def>  <py:def function="announcement_references"> -This issue was found by <a href="http://cihar.com/">Michal Čihař</a>. +This issue was found by a person who wishes to be known as "dave b". </py:def>  -<py:def function="announcement_cve">CVE-2011-0987</py:def> +<py:def function="announcement_cve">CVE-2011-XXXX</py:def> -<py:def function="announcement_cwe">661 89</py:def> +<py:def function="announcement_cwe">661 79</py:def> <py:def function="announcement_commits"> -a5464b4daff0059cdf8c9e5f4d54a80e2dd2a5b0 +7e10c132a3887c8ebfd7a8eee356b28375f1e287 +d3ccf798fdbd4f8a89d4088130637d8dee918492 </py:def> -<py:def function="announcement_commits_2_11"> -2fa4c8d97a92ae0d4e2051d5d18a18688c31f84f +<py:def function="announcement_commits_3_3_10"> +1300510d3686b40adefafb7f1778a6f06d0a553a +452669a1746898a08129d3a555ac4b1ec084b423 </py:def> <xi:include href="_page.tpl" /> diff --git a/templates/security/PMASA-2011-4 b/templates/security/PMASA-2011-4 new file mode 100644 index 0000000..1ebbfda --- /dev/null +++ b/templates/security/PMASA-2011-4 @@ -0,0 +1,50 @@ + +<html xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip=""> + + +<py:def function="announcement_id"> +PMASA-2011-4 +</py:def> + +<py:def function="announcement_date"> +2011-05-22 +</py:def> + +<py:def function="announcement_summary"> +URL redirection to untrusted site +</py:def> + +<py:def function="announcement_description"> +It was possible to redirect to an arbitrary, untrusted site, leading to +a possible phishing attack. +</py:def> + +<py:def function="announcement_severity"> +We consider this vulnerability to be serious. +</py:def> + +<py:def function="announcement_affected"> +The 3.4.0 version is affected. +</py:def> + +<py:def function="announcement_solution"> +Upgrade to phpMyAdmin 3.4.1 or apply the related patch listed below. +</py:def> + + +<py:def function="announcement_references"> +This issue was found by Kian Mohageri. +</py:def> + + +<py:def function="announcement_cve">CVE-2011-XXXX</py:def> + +<py:def function="announcement_cwe">661 601</py:def> + +<py:def function="announcement_commits"> +b7a8179eb6bf0f1643970ac57a70b5b513a1cd4f +ecfc8ba4f7b4ea612c58ab5726054ed0f28e200d +</py:def> + +<xi:include href="_page.tpl" /> +</html> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1808-g6619e39
by Madhura Jayaratne 22 May '11

22 May '11

The branch, master has been updated via 6619e39d639bd994f5efe05e2766836cc1945145 (commit) via 16305005c58e57b4f89150fe01b93f9071131601 (commit) from 633f63004bfd3fd587dd8c164486dc302accafb2 (commit) - Log ----------------------------------------------------------------- commit 6619e39d639bd994f5efe05e2766836cc1945145 Merge: 633f63004bfd3fd587dd8c164486dc302accafb2 16305005c58e57b4f89150fe01b93f9071131601 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun May 22 13:06:05 2011 +0530 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_export.lib.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9650f0..6dcd985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ - bug #3303869 [interface] Unnecessary scrolling on Databases page - patch #3303813 [setup] Define a label that was missing - bug #3305606 [interface] Show all button wraps on privileges page +- bug #3305517 [config] Config for export compression not used 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 88c80af..2460042 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -296,7 +296,9 @@ if(isset($_GET['sql_query'])) { ?> <?php if(isset($_GET['compression'])) { - $selected_compression = $_GET['compression']; + $selected_compression = $_GET['compression']; + } elseif (isset($cfg['Export']['compression'])) { + $selected_compression = $cfg['Export']['compression']; } else { $selected_compression = "none"; } hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git May 2011