- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-18-g7ff4cb0
by Michal Čihař 13 Jun '11

13 Jun '11

The branch, QA_3_4 has been updated via 7ff4cb07cccd093ceea296f964f6c8b00a5e7654 (commit) from 20118f89cf9a84f019d77c748e8eb7d390781669 (commit) - Log ----------------------------------------------------------------- commit 7ff4cb07cccd093ceea296f964f6c8b00a5e7654 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jun 13 08:52:17 2011 +0200 Update from master ----------------------------------------------------------------------- Summary of changes: po/bg.po | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/po/bg.po b/po/bg.po index 75b39fb..a66fe5f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1597,7 +1597,7 @@ msgstr "Прегледът не е достъпен." #: libraries/Theme.class.php:383 msgid "take it" -msgstr "" +msgstr "взимам я" #: libraries/Theme_Manager.class.php:109 #, php-format @@ -1636,6 +1636,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" +"Изглежда не се създали конфигурационен файл. Вероятно ще искате да " +"използвате %1$sскрипта за настройки%2$s, за да го създадете" #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2704,11 +2706,11 @@ msgstr "" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "Преглеждане" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "Персонализиране на преглеждането" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 @@ -2735,11 +2737,11 @@ msgstr "Настройки за разработчици на phpMyAdmin" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "Редактиране" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "Персонализиране на редактирането" #: libraries/config/messages.inc.php:163 msgid "Export defaults" @@ -6980,11 +6982,11 @@ msgstr "Импортиране на файлове" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Импорт от хранилището на браузъра" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Настройки ще бъдат импортирани от локалното хранилище на браузъра." #: prefs_manage.php:254 msgid "You have no saved settings!" @@ -6996,7 +6998,7 @@ msgstr "Тази функционалност не се поддържа от в #: prefs_manage.php:263 msgid "Merge with current configuration" -msgstr "" +msgstr "Сливане с текущите настройки" #: prefs_manage.php:277 #, php-format @@ -7007,7 +7009,7 @@ msgstr "" #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Запис в хранилището на браузъра" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7015,7 +7017,7 @@ msgstr "" #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Съществуващи настройки ще бъдат презаписани!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3388-g26309da
by Michal Čihař 13 Jun '11

13 Jun '11

The branch, master has been updated via 26309dab64bf1d12da53dc843e0be57950660c19 (commit) via 6638d55941afd903afd98f467900c7a35b3e05bd (commit) via 924412a6c064e7d494e628c2440269e599383b4d (commit) via 5bd68c816e31cf6f178ea82e4ea17c84a06cce84 (commit) via 7385e208580aea56eed56b84baec60bc5915d380 (commit) via b3da88a5004908f634494a83b2904b0d76cdffe5 (commit) via 455ead2a40ea118eda8c8ec69b02b7383afaa675 (commit) via 597bd2fdb93123b43f24983e467c71aa3ca684df (commit) via 3f2aea9f154cfee90dc62f5211e0a587a108d230 (commit) via 8629a023ec4c46b36a5db081a80ef7cd42787942 (commit) via 7e809b9049e2eeff5615f1a25d156e31aa7dc0e6 (commit) via 6adf04837d3031549df7f2b3a71c7c711526f7b3 (commit) via 2c72b8da7eb0e75711a5bb4ca8c4156370431918 (commit) via 7222290858a0b8a2fff81a869570be42182dbd12 (commit) via 3f8e99754f8fafb161fdba13247748687c1667d1 (commit) via 043be57506cf4cdd7cfb690e0e5b8e877969de8a (commit) via 4f894fdea3151a5ff9ce9c1f08fc10079c90a553 (commit) via c229c45c1225566d03caa925352e474203ef5a22 (commit) via 5f86388dda13a97a452133124e91556e39c504d4 (commit) via 50e52f40d3df3dded87580443c0093c94fc67636 (commit) via 6fc90101ef90fd1d5d069e8d35522b6dd7d27c94 (commit) via 0f561df611835622db68ac980a1a17e6b9685163 (commit) via 83e68c748284dd362f4f0328b874b75beb6a5321 (commit) via 4a7653239928b970ed5231d8e08adc20f0f9c365 (commit) via f0bb0047fd013c40714e857f90a44939f4b35cbe (commit) via 1db44625195b952c6fc905bb3a32f0b6450a9103 (commit) via 81cdc55c48940b92b3bc46fa919508621e48dd4a (commit) via 701dfb287e7cf5e100167059401577e399affa43 (commit) via cdbf0b5780c9c5fb88aa148dde4b3588663d333c (commit) via 52f0c0031a7b830a4c5afd8f2d2dcb426f06b3cc (commit) via 1994d15b670b60d58b679bd28753a88bdc2799f7 (commit) via 449997606f0f2bc1ce05f047fa28cdcd0457a129 (commit) via 0552e3843f7738b0fa5b5407669c21f71371056b (commit) via d21ad24e331086fcec2b926dd27bd2cb1f8d1111 (commit) via 7a6ad35f2fcd1989496306e18c65a73fa8243071 (commit) via 505448c01322b620119a1552f4fad4dc620cd45c (commit) via d03ed4581f79a7dbe13ee9b03d594ec86a2ce467 (commit) via b48a4fbf9694a4eb83f1ceacfbe65ec5cca5ba03 (commit) via 6c34080a5f4d114d4a6b8955fde341574a403e65 (commit) via ef3ac2e3dc914eaf056d5d76b1039ec3a5547c80 (commit) via 09f480fb2d96e247a1129ddffad5fd13eb236f49 (commit) via f67b4d8c1f69e2857bb170b56c4f2b9bfc2684d5 (commit) via 4e7105230a489216e55cc8781e27cbbe6ea6d4e3 (commit) via af8840daee0308764befaf68a01c9671db94df9d (commit) via 7b6e75a68c68a094a4328468dc3179e4a32e0f87 (commit) via ffe2eac57fadd5fe9af6c37b065f0cafae539a5a (commit) via 1959168a2fdff7e5203086e43faf385575813aca (commit) via e0c1c4b458955d8bac3885ee6a803b83c959088c (commit) via 6f66699ca5350fb8da4de74ca217e8c725ba8704 (commit) via c33c8660712cd3c619d7165251c7143a2f738e03 (commit) via 8a36b8441b12403b78281b25b6359c688d393152 (commit) via e3949be9f0a80b7ec5d06f34e7b832ef325eab2d (commit) via 814a352efd28065385255deaa8e0057f5acaf6ab (commit) via 05b8974425b7202dc2f93122cf5a759c8adb6d5c (commit) via 9573954addf270fb067b378347130a27920104f2 (commit) via 83a895bd11024be936e2c543d693ea5563427fca (commit) via 874535d36b50aa0101a110d0a1003d51ecbad7c8 (commit) via 0c817f30037168b89bfb72965f2b3df1aad446e8 (commit) via 46b649929f1237753df29e67d9c151e7494d7acc (commit) via e2904e0c2cfdc763530af1545826bbc9be45e5ae (commit) via b0da5fdcbbee63a3d908b1ab4d59cfe2ec65052d (commit) via d1bd8677f30161421d18e215c374706654d9306e (commit) via c7c3def3c971036cc06341dc46384a2ce97efeff (commit) via 914783e085bd8fcf545eb8c26b25a10e3fcaf52c (commit) via fb021f98c3ca16307700820cd259deccdcc8419e (commit) via 1a5a82e468e0421e7e3e10c96e6da15137265e7d (commit) via cfb14e50c457b89de23f3db92afe40f71958b1d4 (commit) via 217338f21196c20f7245cb7242cb30a635112ce6 (commit) via 7a1ccb81416831f3e6d524ffc53eaeb8abe6398a (commit) via dead14ef30487d3d5c669c594747857b4b9b8113 (commit) via 6a6840f98424df97c866279df34601f224d60c1d (commit) via d3e72447bb548fcf1598e22ace786b7970452421 (commit) via c4900cac8a9b4cdab0d82979927c7245aafc16ff (commit) via b5319a4a984b34dee5c8dd47a529cd58650d9617 (commit) via 7f59b0027c5b278e8fe7b7dfd772ab8d289ad224 (commit) via bcc7282f35e658e4e8f67eeac8412f744ca40e31 (commit) via c24d36436f5fe6e0de79ab9ae2e19d8d2cc450b2 (commit) via a6361f718becdb92a0db018153aad14cdc6f658b (commit) via 29d5e9bc5a66273a7ae0debe8f664260c92f1b67 (commit) via e1e81c0914b50f34b02636973da63885c987bbf4 (commit) via 407f1c7d052873e1bbd2f32f8e7524bc65396244 (commit) via 2c73ec9ec4c7c6e5c7b9e8118037b7317d0ac478 (commit) via 58b3e78d8fe105b77c589ce46de4dc89a706437b (commit) via 3a24c80b85daeaef3834a9137cde6835e3a4201c (commit) via 80bf93d5a1dd5fc0a2f83030d7223e54b5187248 (commit) from 54c062c0ad19db67250fde19eff7f44f31429e74 (commit) - Log ----------------------------------------------------------------- commit 26309dab64bf1d12da53dc843e0be57950660c19 Author: star <star(a)origin.club.tw> Date: Sun Jun 12 05:41:24 2011 +0200 Translation update done using Pootle. commit 6638d55941afd903afd98f467900c7a35b3e05bd Author: star <star(a)origin.club.tw> Date: Sun Jun 12 05:41:07 2011 +0200 Translation update done using Pootle. commit 924412a6c064e7d494e628c2440269e599383b4d Author: star <star(a)origin.club.tw> Date: Sun Jun 12 05:40:37 2011 +0200 Translation update done using Pootle. commit 5bd68c816e31cf6f178ea82e4ea17c84a06cce84 Author: star <star(a)origin.club.tw> Date: Sun Jun 12 05:40:00 2011 +0200 Translation update done using Pootle. commit 7385e208580aea56eed56b84baec60bc5915d380 Author: star <star(a)origin.club.tw> Date: Sun Jun 12 05:39:30 2011 +0200 Translation update done using Pootle. commit b3da88a5004908f634494a83b2904b0d76cdffe5 Author: star <star(a)origin.club.tw> Date: Sun Jun 12 05:37:23 2011 +0200 Translation update done using Pootle. commit 455ead2a40ea118eda8c8ec69b02b7383afaa675 Author: Domen <dbc334(a)gmail.com> Date: Fri Jun 10 22:40:28 2011 +0200 Translation update done using Pootle. commit 597bd2fdb93123b43f24983e467c71aa3ca684df Author: Domen <dbc334(a)gmail.com> Date: Fri Jun 10 22:40:16 2011 +0200 Translation update done using Pootle. commit 3f2aea9f154cfee90dc62f5211e0a587a108d230 Author: Domen <dbc334(a)gmail.com> Date: Fri Jun 10 22:39:18 2011 +0200 Translation update done using Pootle. commit 8629a023ec4c46b36a5db081a80ef7cd42787942 Merge: 7e809b9049e2eeff5615f1a25d156e31aa7dc0e6 54c062c0ad19db67250fde19eff7f44f31429e74 Author: Pootle server <pootle(a)cihar.com> Date: Fri Jun 10 20:40:08 2011 +0200 Merge remote-tracking branch 'origin/master' commit 7e809b9049e2eeff5615f1a25d156e31aa7dc0e6 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:29:52 2011 +0200 Translation update done using Pootle. commit 6adf04837d3031549df7f2b3a71c7c711526f7b3 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:29:24 2011 +0200 Translation update done using Pootle. commit 2c72b8da7eb0e75711a5bb4ca8c4156370431918 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:28:03 2011 +0200 Translation update done using Pootle. commit 7222290858a0b8a2fff81a869570be42182dbd12 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:26:42 2011 +0200 Translation update done using Pootle. commit 3f8e99754f8fafb161fdba13247748687c1667d1 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:23:23 2011 +0200 Translation update done using Pootle. commit 043be57506cf4cdd7cfb690e0e5b8e877969de8a Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:20:46 2011 +0200 Translation update done using Pootle. commit 4f894fdea3151a5ff9ce9c1f08fc10079c90a553 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:20:23 2011 +0200 Translation update done using Pootle. commit c229c45c1225566d03caa925352e474203ef5a22 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:14:59 2011 +0200 Translation update done using Pootle. commit 5f86388dda13a97a452133124e91556e39c504d4 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:13:54 2011 +0200 Translation update done using Pootle. commit 50e52f40d3df3dded87580443c0093c94fc67636 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:11:41 2011 +0200 Translation update done using Pootle. commit 6fc90101ef90fd1d5d069e8d35522b6dd7d27c94 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:09:00 2011 +0200 Translation update done using Pootle. commit 0f561df611835622db68ac980a1a17e6b9685163 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:08:20 2011 +0200 Translation update done using Pootle. commit 83e68c748284dd362f4f0328b874b75beb6a5321 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:07:01 2011 +0200 Translation update done using Pootle. commit 4a7653239928b970ed5231d8e08adc20f0f9c365 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:04:21 2011 +0200 Translation update done using Pootle. commit f0bb0047fd013c40714e857f90a44939f4b35cbe Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:02:13 2011 +0200 Translation update done using Pootle. commit 1db44625195b952c6fc905bb3a32f0b6450a9103 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:02:03 2011 +0200 Translation update done using Pootle. commit 81cdc55c48940b92b3bc46fa919508621e48dd4a Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:01:49 2011 +0200 Translation update done using Pootle. commit 701dfb287e7cf5e100167059401577e399affa43 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 23:01:16 2011 +0200 Translation update done using Pootle. commit cdbf0b5780c9c5fb88aa148dde4b3588663d333c Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 22:59:03 2011 +0200 Translation update done using Pootle. commit 52f0c0031a7b830a4c5afd8f2d2dcb426f06b3cc Merge: 1994d15b670b60d58b679bd28753a88bdc2799f7 cd5cddb2e4324094eae365e01422e8d165d372e8 Author: Pootle server <pootle(a)cihar.com> Date: Thu Jun 9 22:40:05 2011 +0200 Merge remote-tracking branch 'origin/master' commit 1994d15b670b60d58b679bd28753a88bdc2799f7 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 22:37:59 2011 +0200 Translation update done using Pootle. commit 449997606f0f2bc1ce05f047fa28cdcd0457a129 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 22:37:02 2011 +0200 Translation update done using Pootle. commit 0552e3843f7738b0fa5b5407669c21f71371056b Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 22:35:30 2011 +0200 Translation update done using Pootle. commit d21ad24e331086fcec2b926dd27bd2cb1f8d1111 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 22:34:03 2011 +0200 Translation update done using Pootle. commit 7a6ad35f2fcd1989496306e18c65a73fa8243071 Author: stefan <stefan(a)inkopsforum.se> Date: Thu Jun 9 22:33:35 2011 +0200 Translation update done using Pootle. commit 505448c01322b620119a1552f4fad4dc620cd45c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 9 22:13:26 2011 +0200 Translation update done using Pootle. commit d03ed4581f79a7dbe13ee9b03d594ec86a2ce467 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 9 22:12:52 2011 +0200 Translation update done using Pootle. commit b48a4fbf9694a4eb83f1ceacfbe65ec5cca5ba03 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 9 22:12:19 2011 +0200 Translation update done using Pootle. commit 6c34080a5f4d114d4a6b8955fde341574a403e65 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 9 22:12:10 2011 +0200 Translation update done using Pootle. commit ef3ac2e3dc914eaf056d5d76b1039ec3a5547c80 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 9 22:11:47 2011 +0200 Translation update done using Pootle. commit 09f480fb2d96e247a1129ddffad5fd13eb236f49 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Jun 9 17:25:28 2011 +0200 Translation update done using Pootle. commit f67b4d8c1f69e2857bb170b56c4f2b9bfc2684d5 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Jun 9 17:25:07 2011 +0200 Translation update done using Pootle. commit 4e7105230a489216e55cc8781e27cbbe6ea6d4e3 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Jun 9 17:24:53 2011 +0200 Translation update done using Pootle. commit af8840daee0308764befaf68a01c9671db94df9d Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Jun 9 17:24:13 2011 +0200 Translation update done using Pootle. commit 7b6e75a68c68a094a4328468dc3179e4a32e0f87 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Jun 9 17:23:53 2011 +0200 Translation update done using Pootle. commit ffe2eac57fadd5fe9af6c37b065f0cafae539a5a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Thu Jun 9 17:23:41 2011 +0200 Translation update done using Pootle. commit 1959168a2fdff7e5203086e43faf385575813aca Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 9 17:00:56 2011 +0200 Translation update done using Pootle. commit e0c1c4b458955d8bac3885ee6a803b83c959088c Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 9 17:00:25 2011 +0200 Translation update done using Pootle. commit 6f66699ca5350fb8da4de74ca217e8c725ba8704 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 9 17:00:19 2011 +0200 Translation update done using Pootle. commit c33c8660712cd3c619d7165251c7143a2f738e03 Merge: 8a36b8441b12403b78281b25b6359c688d393152 412bb22b3944339e77d0f2f5437955a80c44862a Author: Pootle server <pootle(a)cihar.com> Date: Thu Jun 9 10:40:09 2011 +0200 Merge remote-tracking branch 'origin/master' commit 8a36b8441b12403b78281b25b6359c688d393152 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:35:25 2011 +0200 Translation update done using Pootle. commit e3949be9f0a80b7ec5d06f34e7b832ef325eab2d Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:33:46 2011 +0200 Translation update done using Pootle. commit 814a352efd28065385255deaa8e0057f5acaf6ab Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:30:21 2011 +0200 Translation update done using Pootle. commit 05b8974425b7202dc2f93122cf5a759c8adb6d5c Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:24:57 2011 +0200 Translation update done using Pootle. commit 9573954addf270fb067b378347130a27920104f2 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:24:15 2011 +0200 Translation update done using Pootle. commit 83a895bd11024be936e2c543d693ea5563427fca Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:23:16 2011 +0200 Translation update done using Pootle. commit 874535d36b50aa0101a110d0a1003d51ecbad7c8 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:22:38 2011 +0200 Translation update done using Pootle. commit 0c817f30037168b89bfb72965f2b3df1aad446e8 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:22:12 2011 +0200 Translation update done using Pootle. commit 46b649929f1237753df29e67d9c151e7494d7acc Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:21:11 2011 +0200 Translation update done using Pootle. commit e2904e0c2cfdc763530af1545826bbc9be45e5ae Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:20:16 2011 +0200 Translation update done using Pootle. commit b0da5fdcbbee63a3d908b1ab4d59cfe2ec65052d Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:19:35 2011 +0200 Translation update done using Pootle. commit d1bd8677f30161421d18e215c374706654d9306e Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:18:52 2011 +0200 Translation update done using Pootle. commit c7c3def3c971036cc06341dc46384a2ce97efeff Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:17:11 2011 +0200 Translation update done using Pootle. commit 914783e085bd8fcf545eb8c26b25a10e3fcaf52c Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:16:42 2011 +0200 Translation update done using Pootle. commit fb021f98c3ca16307700820cd259deccdcc8419e Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:16:26 2011 +0200 Translation update done using Pootle. commit 1a5a82e468e0421e7e3e10c96e6da15137265e7d Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:15:59 2011 +0200 Translation update done using Pootle. commit cfb14e50c457b89de23f3db92afe40f71958b1d4 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:14:35 2011 +0200 Translation update done using Pootle. commit 217338f21196c20f7245cb7242cb30a635112ce6 Author: stoyanster <stoyanster(a)gmail.com> Date: Thu Jun 9 09:12:21 2011 +0200 Translation update done using Pootle. commit 7a1ccb81416831f3e6d524ffc53eaeb8abe6398a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:25:18 2011 +0200 Translation update done using Pootle. commit dead14ef30487d3d5c669c594747857b4b9b8113 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:24:54 2011 +0200 Translation update done using Pootle. commit 6a6840f98424df97c866279df34601f224d60c1d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:23:04 2011 +0200 Translation update done using Pootle. commit d3e72447bb548fcf1598e22ace786b7970452421 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:22:17 2011 +0200 Translation update done using Pootle. commit c4900cac8a9b4cdab0d82979927c7245aafc16ff Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:20:52 2011 +0200 Translation update done using Pootle. commit b5319a4a984b34dee5c8dd47a529cd58650d9617 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:20:44 2011 +0200 Translation update done using Pootle. commit 7f59b0027c5b278e8fe7b7dfd772ab8d289ad224 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:20:17 2011 +0200 Translation update done using Pootle. commit bcc7282f35e658e4e8f67eeac8412f744ca40e31 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:19:36 2011 +0200 Translation update done using Pootle. commit c24d36436f5fe6e0de79ab9ae2e19d8d2cc450b2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:18:36 2011 +0200 Translation update done using Pootle. commit a6361f718becdb92a0db018153aad14cdc6f658b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 9 00:18:15 2011 +0200 Translation update done using Pootle. commit 29d5e9bc5a66273a7ae0debe8f664260c92f1b67 Merge: e1e81c0914b50f34b02636973da63885c987bbf4 90099b7b5de240e5789ea8bfd29fcb03e867d825 Author: Pootle server <pootle(a)cihar.com> Date: Wed Jun 8 20:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit e1e81c0914b50f34b02636973da63885c987bbf4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:30:14 2011 +0200 Translation update done using Pootle. commit 407f1c7d052873e1bbd2f32f8e7524bc65396244 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:29:47 2011 +0200 Translation update done using Pootle. commit 2c73ec9ec4c7c6e5c7b9e8118037b7317d0ac478 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:29:28 2011 +0200 Translation update done using Pootle. commit 58b3e78d8fe105b77c589ce46de4dc89a706437b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:26:35 2011 +0200 Translation update done using Pootle. commit 3a24c80b85daeaef3834a9137cde6835e3a4201c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:26:12 2011 +0200 Translation update done using Pootle. commit 80bf93d5a1dd5fc0a2f83030d7223e54b5187248 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Wed Jun 8 16:26:07 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/bg.po | 38 ++++++++++++++++-------------- po/en_GB.po | 13 ++++------ po/es.po | 21 +++++++--------- po/fr.po | 10 +++----- po/ru.po | 30 ++++++++++------------- po/sl.po | 25 +++++++++----------- po/sv.po | 73 +++++++++++++++++++++++----------------------------------- po/tr.po | 12 +++++----- po/zh_TW.po | 16 +++++------- 9 files changed, 104 insertions(+), 134 deletions(-) diff --git a/po/bg.po b/po/bg.po index af57057..ce8b95c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-08 08:42+0200\n" +"PO-Revision-Date: 2011-06-09 09:35+0200\n" "Last-Translator: <stoyanster(a)gmail.com>\n" "Language-Team: bulgarian <bg(a)li.org>\n" "Language: bg\n" @@ -1673,7 +1673,7 @@ msgstr "Прегледът не е достъпен." #: libraries/Theme.class.php:383 msgid "take it" -msgstr "" +msgstr "взимам я" #: libraries/Theme_Manager.class.php:109 #, php-format @@ -1712,6 +1712,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the %" "1$ssetup script%2$s to create one." msgstr "" +"Изглежда не се създали конфигурационен файл. Вероятно ще искате да " +"използвате %1$sскрипта за настройки%2$s, за да го създадете" #: libraries/auth/config.auth.lib.php:115 msgid "" @@ -2813,11 +2815,11 @@ msgstr "" #: libraries/config/messages.inc.php:154 msgid "Browse mode" -msgstr "" +msgstr "Преглеждане" #: libraries/config/messages.inc.php:155 msgid "Customize browse mode" -msgstr "" +msgstr "Персонализиране на преглеждането" #: libraries/config/messages.inc.php:157 libraries/config/messages.inc.php:159 #: libraries/config/messages.inc.php:176 libraries/config/messages.inc.php:187 @@ -2844,11 +2846,11 @@ msgstr "Настройки за разработчици на phpMyAdmin" #: libraries/config/messages.inc.php:162 msgid "Edit mode" -msgstr "" +msgstr "Редактиране" #: libraries/config/messages.inc.php:163 msgid "Customize edit mode" -msgstr "" +msgstr "Персонализиране на редактирането" #: libraries/config/messages.inc.php:165 msgid "Export defaults" @@ -3040,7 +3042,7 @@ msgstr "" #: libraries/config/messages.inc.php:213 libraries/config/messages.inc.php:218 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "SQL заявкаи" +msgstr "SQL заявки" #: libraries/config/messages.inc.php:215 msgid "SQL Query box" @@ -3076,7 +3078,7 @@ msgstr "" #: libraries/config/messages.inc.php:224 msgid "Tabs" -msgstr "Табулатори" +msgstr "Подпрозорци" #: libraries/config/messages.inc.php:225 msgid "Choose how you want tabs to work" @@ -4857,7 +4859,7 @@ msgstr "Връзките не са намерени" #: libraries/engines/bdb.lib.php:20 main.php:211 msgid "Version information" -msgstr "Информация за весията" +msgstr "Весия" #: libraries/engines/innodb.lib.php:22 msgid "Data home directory" @@ -5701,7 +5703,7 @@ msgstr "Знаков набор" #: libraries/mysql_charsets.lib.php:206 libraries/mysql_charsets.lib.php:407 #: tbl_change.php:552 msgid "Binary" -msgstr "Двоично" +msgstr "двоичен" #: libraries/mysql_charsets.lib.php:218 msgid "Bulgarian" @@ -5717,7 +5719,7 @@ msgstr "Традиционен китайски" #: libraries/mysql_charsets.lib.php:228 libraries/mysql_charsets.lib.php:414 msgid "case-insensitive" -msgstr "нечувствително към регистъра" +msgstr "нечувствителен към регистъра" #: libraries/mysql_charsets.lib.php:231 libraries/mysql_charsets.lib.php:416 msgid "case-sensitive" @@ -6732,7 +6734,7 @@ msgstr "Web сървър" #: main.php:187 msgid "MySQL client version" -msgstr "Версия на MySQL клиент" +msgstr "MySQL клиент" #: main.php:189 msgid "PHP extension" @@ -7074,11 +7076,11 @@ msgstr "Импорт от файл" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Импорт от хранилището на браузъра" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Настройки ще бъдат импортирани от локалното хранилище на браузъра." #: prefs_manage.php:254 msgid "You have no saved settings!" @@ -7090,7 +7092,7 @@ msgstr "Тази функционалност не се поддържа от в #: prefs_manage.php:263 msgid "Merge with current configuration" -msgstr "" +msgstr "Сливане с текущите настройки" #: prefs_manage.php:277 #, php-format @@ -7101,7 +7103,7 @@ msgstr "" #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Запис в хранилището на браузъра" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7109,7 +7111,7 @@ msgstr "" #: prefs_manage.php:308 msgid "Existing settings will be overwritten!" -msgstr "" +msgstr "Съществуващи настройки ще бъдат презаписани!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." @@ -7172,7 +7174,7 @@ msgstr "Информация" #: server_collations.php:39 msgid "Character Sets and Collations" -msgstr "Набори от знаци и колации" +msgstr "Знакови набори и колации" #: server_databases.php:64 msgid "No databases selected." diff --git a/po/en_GB.po b/po/en_GB.po index 330618a..0cd76f6 100644 --- a/po/en_GB.po +++ b/po/en_GB.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-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-07 12:36+0200\n" +"PO-Revision-Date: 2011-06-09 22:12+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1023,10 +1023,9 @@ msgstr "The passwords aren't the same!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Any user" +msgstr "Add user" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1788,10 +1787,9 @@ msgid "Wrong username/password. Access denied." msgstr "Wrong username/password. Access denied." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Config authentication" +msgstr "Can not find signon authentication script:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -7965,10 +7963,9 @@ msgid "wildcard" msgstr "wildcard" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "View %s has been dropped" +msgstr "User has been added." #: server_processlist.php:29 #, php-format diff --git a/po/es.po b/po/es.po index fb8f5de..2e3d62b 100644 --- a/po/es.po +++ b/po/es.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-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-03 21:27+0200\n" +"PO-Revision-Date: 2011-06-09 17:25+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: spanish <es(a)li.org>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1036,10 +1036,9 @@ msgstr "¡Las contraseñas no coinciden!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Cualquier usuario" +msgstr "Agregar usuario" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1111,10 +1110,9 @@ msgid "Create Table" msgstr "Crear tabla" #: js/messages.php:82 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Usar tablas" +msgstr "Insertar tablas" #: js/messages.php:85 msgid "Searching" @@ -1811,10 +1809,9 @@ msgstr "" "El nombre de usuario o la contraseña es incorrecto. El acceso fue denegado." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Autenticación por configuración" +msgstr "No se pudo encontrar el script de autenticación «signon»" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2619,12 +2616,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Desactivar las operaciones masivas de mantenimiento en tablas como " +"optimización y reparación de las tablas seleccionadas de una base de datos." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Mantenimiento de la tabla" +msgstr "Dsactivar mantenimiento de muchas tabla" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -8148,10 +8146,9 @@ msgid "wildcard" msgstr "comodín" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "Se descartó el modo de visualización %s" +msgstr "Se agregó el usuario." #: server_processlist.php:29 #, php-format diff --git a/po/fr.po b/po/fr.po index f4b2828..07ca5a4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-07 12:48+0200\n" +"PO-Revision-Date: 2011-06-09 22:13+0200\n" "Last-Translator: Marc Delisle <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1036,10 +1036,9 @@ msgstr "Les mots de passe doivent être identiques !" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Tout utilisateur" +msgstr "Ajouter un utilisateur" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1805,10 +1804,9 @@ msgid "Wrong username/password. Access denied." msgstr "Erreur d'utilisateur/mot de passe. Accès refusé." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Mode d'authentification « config »" +msgstr "Ne peut trouver le script d'authentification pour le mode signon:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format diff --git a/po/ru.po b/po/ru.po index 42830b7..a474517 100644 --- a/po/ru.po +++ b/po/ru.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-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-01 22:34+0200\n" +"PO-Revision-Date: 2011-06-09 00:25+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" @@ -1034,10 +1034,9 @@ msgstr "Некорректное подтверждение пароля!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Любой пользователь" +msgstr "Добавить пользователя" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1109,10 +1108,9 @@ msgid "Create Table" msgstr "Создать таблицу" #: js/messages.php:82 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Использовать таблицы" +msgstr "Вставить таблицу" #: js/messages.php:85 msgid "Searching" @@ -1804,10 +1802,9 @@ msgid "Wrong username/password. Access denied." msgstr "Данные для входа не верны. В доступе отказано." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Авторизация через конфигурационный файл" +msgstr "Не найден скрипт авторизации методом signon:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2228,17 +2225,16 @@ msgstr "Оба" #: libraries/config.values.php:47 msgid "Nowhere" -msgstr "" +msgstr "Нигде" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "Налево" #: libraries/config.values.php:47 -#, fuzzy #| msgid "Height" msgid "Right" -msgstr "Высота" +msgstr "Направо" #: libraries/config.values.php:75 msgid "Open" @@ -2607,12 +2603,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Отключить массовые операции обслуживания, такие как оптимизация или " +"восстановление выбранных таблиц базы данных." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Обслуживание таблицы" +msgstr "Отключить операции обслуживания таблиц" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -3548,7 +3545,7 @@ msgstr "Это ссылки Редактировать, Редактироват #: libraries/config/messages.inc.php:320 msgid "Where to show the table row links" -msgstr "" +msgstr "Где вывести ссылки строки таблицы" #: libraries/config/messages.inc.php:321 msgid "Use natural order for sorting table and database names" @@ -8075,10 +8072,9 @@ msgid "wildcard" msgstr "Групповой символ" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "Представление %s было удалено" +msgstr "Пользователь был добавлен." #: server_processlist.php:29 #, php-format diff --git a/po/sl.po b/po/sl.po index 852b6f9..7c2bb54 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ 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-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-05 21:27+0200\n" +"PO-Revision-Date: 2011-06-10 22:40+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -1032,10 +1032,9 @@ msgstr "Gesli se ne ujemata!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Kateri koli uporabnik" +msgstr "Dodaj uporabnika" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1107,10 +1106,9 @@ msgid "Create Table" msgstr "Ustvari tabelo" #: js/messages.php:82 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Uporabi tabele" +msgstr "Vstavi tabelo" #: js/messages.php:85 msgid "Searching" @@ -1801,10 +1799,9 @@ msgid "Wrong username/password. Access denied." msgstr "Napačno uporabniško ime/geslo. Dostop zavrnjen." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Overitev preko konfiguracije" +msgstr "Ne morem najti overitvenega skripta signon:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2599,12 +2596,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Onemogoči množične operacije vzdrževanja tabel, kot je optimiranje ali " +"popravljanje izbranih tabel zbirke podatkov." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Vzdrževanje tabele" +msgstr "Onemogoči množično vzdrževanje tabel" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -8012,10 +8010,9 @@ msgid "wildcard" msgstr "nadomestni znak" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "Pogled %s je zavržen" +msgstr "Uporabnik je dodan." #: server_processlist.php:29 #, php-format diff --git a/po/sv.po b/po/sv.po index 1d5635c..e23bc7d 100644 --- a/po/sv.po +++ b/po/sv.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-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-05-30 20:24+0200\n" +"PO-Revision-Date: 2011-06-09 23:29+0200\n" "Last-Translator: <stefan(a)inkopsforum.se>\n" "Language-Team: swedish <sv(a)li.org>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1022,10 +1022,9 @@ msgstr "Lösenorden överensstämmer inte!" #: js/messages.php:54 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Vilken användare som helst" +msgstr "Lägg till en användare" #: js/messages.php:55 msgid "Reloading Privileges" @@ -1097,10 +1096,9 @@ msgid "Create Table" msgstr "Skapa tabell" #: js/messages.php:82 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Använd tabeller" +msgstr "Lägg till en tabell" #: js/messages.php:85 msgid "Searching" @@ -1607,22 +1605,19 @@ msgstr[0] "%1$d rad infogad." msgstr[1] "%1$d rader infogade." #: libraries/RecentTable.class.php:113 -#, fuzzy #| msgid "Could not save configuration" msgid "Could not save recent table" -msgstr "Kunde inte spara konfigurationen" +msgstr "Kunde inte spara den senaste tabellen" #: libraries/RecentTable.class.php:148 -#, fuzzy #| msgid "Count tables" msgid "Recent tables" -msgstr "Räkna tabeller" +msgstr "De senaste tabellerna" #: libraries/RecentTable.class.php:154 -#, fuzzy #| msgid "There are no configured servers" msgid "There are no recent tables" -msgstr "Det finns inga konfigurerade servrar" +msgstr "Det finns inga nya tabeller" #: libraries/StorageEngine.class.php:194 msgid "" @@ -1666,7 +1661,7 @@ msgstr "Tabell %s har döpts om till %s" #: libraries/Table.class.php:1250 msgid "Could not save table UI preferences" -msgstr "" +msgstr "Kunde inte spara UI inställningarna för tabellen" #: libraries/Theme.class.php:160 #, php-format @@ -1794,10 +1789,9 @@ msgid "Wrong username/password. Access denied." msgstr "Felaktigt användarnamn/lösenord. Åtkomst nekad." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Config autentisering" +msgstr "Kan du inte hitta scriptet för iverifiering av inloggning." #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2213,17 +2207,16 @@ msgstr "Båda" #: libraries/config.values.php:47 msgid "Nowhere" -msgstr "" +msgstr "Ingenstans" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "Vänster" #: libraries/config.values.php:47 -#, fuzzy #| msgid "Height" msgid "Right" -msgstr "Höjd" +msgstr "Höger" #: libraries/config.values.php:75 msgid "Open" @@ -2590,12 +2583,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Inaktivera tabellen underhåll av en mängd operationer, som att optimera " +"eller reparera den valda tabeller i en databas." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Tabellunderhåll" +msgstr "Inaktivera underhåll av många tabeller" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -3356,15 +3350,13 @@ msgid "Enable highlighting" msgstr "Aktivera framhävning" #: libraries/config/messages.inc.php:288 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Maximum number of recently used tables; set 0 to disable" -msgstr "Maximalt antal tabeller som visas i tabellista" +msgstr "Maximalt antal nyligen använa tabeller, ange 0 för att avaktivera" #: libraries/config/messages.inc.php:289 -#, fuzzy msgid "Recently used tables" -msgstr "Nuvarande anslutning" +msgstr "Nyligen använda tabeller" #: libraries/config/messages.inc.php:290 msgid "Use less graphically intense tabs" @@ -3519,7 +3511,7 @@ msgstr "Dessa är redigera, infogad redigering, kopiera och ta bort länkar" #: libraries/config/messages.inc.php:320 msgid "Where to show the table row links" -msgstr "" +msgstr "Var länkarna i tabellraden visas" #: libraries/config/messages.inc.php:321 msgid "Use natural order for sorting table and database names" @@ -3649,13 +3641,12 @@ msgstr "Omvandlingsmotor" #: libraries/config/messages.inc.php:350 msgid "When browsing tables, the sorting of each table is remembered" -msgstr "" +msgstr "Vid bläddring i tabeller, är sorteringen av varje tabell ihågkommen" #: libraries/config/messages.inc.php:351 -#, fuzzy #| msgid "Rename table to" msgid "Remember table's sorting" -msgstr "Döp om tabellen till" +msgstr "Kom ihåg tabellens sortering" #: libraries/config/messages.inc.php:352 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature" @@ -3933,7 +3924,6 @@ msgid "Server port" msgstr "Serverport" #: libraries/config/messages.inc.php:409 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -3941,13 +3931,12 @@ msgid "" "Leave blank for no \"persistent\" recently used tables across sessions, " "suggested: [kbd]pma_recent[/kbd]" msgstr "" -"Lämna tomt för iatt inte spara användarinställningar i databasen, förslag: " -"[kbd]pma_config[/kbd]" +"Lämna tomt för iatt inte spara nyligen använda användarinställningar " +"tabeller för alla sessioner i databasen, förslag: [kbd]pma_config[/kbd]" #: libraries/config/messages.inc.php:410 -#, fuzzy msgid "Recently used table" -msgstr "Nuvarande anslutning" +msgstr "Nyligen använd tabell" #: libraries/config/messages.inc.php:411 msgid "" @@ -4025,7 +4014,6 @@ msgid "Display columns table" msgstr "Visa tabellkolumner" #: libraries/config/messages.inc.php:426 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -4033,14 +4021,13 @@ msgid "" "Leave blank for no \"persistent\" tables'UI preferences across sessions, " "suggested: [kbd]pma_table_uiprefs[/kbd]" msgstr "" -"Lämna tomt för iatt inte spara användarinställningar i databasen, förslag: " -"[kbd]pma_config[/kbd]" +"Lämna tomt för iatt inte spara nyligen använda användarinställningstabeller " +"för alla sessioner, förslag: [kbd]pma_config[/kbd]" #: libraries/config/messages.inc.php:427 -#, fuzzy #| msgid "User preferences storage table" msgid "UI preferences table" -msgstr "Användarinställningar lagringstabell" +msgstr "Tabell för inställningar av användargränssnittet" #: libraries/config/messages.inc.php:428 msgid "" @@ -6252,14 +6239,13 @@ msgid "SQL history" msgstr "SQL-historik" #: libraries/relation.lib.php:143 -#, fuzzy #| msgid "Persistent connections" msgid "Persistent recently used tables" -msgstr "Bestående anslutningar" +msgstr "Beständiga, nyligen använda tabeller" #: libraries/relation.lib.php:147 msgid "Persistent tables' UI preferences" -msgstr "" +msgstr "Bestående tabeller för inställninar av användargränssnittet" #: libraries/relation.lib.php:155 msgid "User preferences" @@ -8002,10 +7988,9 @@ msgid "wildcard" msgstr "jokertecken" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "Vyn %s har tagits bort" +msgstr "En användare har skapats." #: server_processlist.php:29 #, php-format diff --git a/po/tr.po b/po/tr.po index 61c405c..2bac6df 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-08 16:25+0200\n" +"PO-Revision-Date: 2011-06-08 16:30+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -3978,11 +3978,11 @@ msgstr "" #: libraries/config/messages.inc.php:416 msgid "Signon session name" -msgstr "Oturum açma oturumu adı" +msgstr "Oturumu açma oturum adı" #: libraries/config/messages.inc.php:417 msgid "Signon URL" -msgstr "Oturum açma URL'si" +msgstr "Oturumu açma URL'si" #: libraries/config/messages.inc.php:418 msgid "Socket on which MySQL server is listening, leave empty for default" @@ -4474,7 +4474,7 @@ msgstr "HTTP kimlik doğrulaması" #: libraries/config/setup.forms.php:51 msgid "Signon authentication" -msgstr "Oturum kaydı kimlik doğrulaması" +msgstr "Oturumu açma kimlik doğrulaması" #: libraries/config/setup.forms.php:244 #: libraries/config/user_preferences.forms.php:146 libraries/import/ldi.php:34 @@ -4545,13 +4545,13 @@ msgstr "Yapılandırma kimlik doğrulaması yöntemi kullanırken kullanıcı ad #: libraries/config/validate.lib.php:238 msgid "Empty signon session name while using signon authentication method" msgstr "" -"Oturum kaydı kimlik doğrulaması yöntemi kullanırken oturum kaydı oturumu adı " +"Oturumu açma kimlik doğrulaması yöntemi kullanırken oturumu açma oturum adı " "boş" #: libraries/config/validate.lib.php:242 msgid "Empty signon URL while using signon authentication method" msgstr "" -"Oturum kaydı kimlik doğrulaması yöntemi kullanırken oturum kaydı URL'si boş" +"Oturumu açma kimlik doğrulaması yöntemi kullanırken oturumu açma URL'si boş" #: libraries/config/validate.lib.php:276 msgid "Empty phpMyAdmin control user while using pmadb" diff --git a/po/zh_TW.po b/po/zh_TW.po index d8f6dba..785594b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-07 06:41-0400\n" -"PO-Revision-Date: 2011-06-08 05:26+0200\n" -"Last-Translator: <u1104003(a)gmail.com>\n" +"PO-Revision-Date: 2011-06-12 05:41+0200\n" +"Last-Translator: <star(a)origin.club.tw>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -1633,7 +1633,7 @@ msgstr "已將資料表 %s 改名爲 %s" #: libraries/Table.class.php:1250 msgid "Could not save table UI preferences" -msgstr "" +msgstr "無法儲存表格介面使用者喜好設定" #: libraries/Theme.class.php:160 #, php-format @@ -1756,10 +1756,9 @@ msgid "Wrong username/password. Access denied." msgstr "帳號/密碼錯誤。拒絕訪問" #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Config 認證" +msgstr "無法找到對應的認證指令" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2172,17 +2171,16 @@ msgstr "全部" #: libraries/config.values.php:47 msgid "Nowhere" -msgstr "" +msgstr "全部皆否" #: libraries/config.values.php:47 msgid "Left" -msgstr "" +msgstr "左" #: libraries/config.values.php:47 -#, fuzzy #| msgid "Height" msgid "Right" -msgstr "高" +msgstr "右" #: libraries/config.values.php:75 msgid "Open" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4-security, deleted. RELEASE_3_4_2-17-ge49ab1b
by Herman van Rink 12 Jun '11

12 Jun '11

The branch, QA_3_4-security has been deleted was e49ab1bfe13119633c6bf94eb7439ecb0d28841d ----------------------------------------------------------------------- e49ab1bfe13119633c6bf94eb7439ecb0d28841d Minor xss reported by Aung Khant ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4-security, created. RELEASE_3_4_2-17-ge49ab1b
by Herman van Rink 10 Jun '11

10 Jun '11

The branch, QA_3_4-security has been created at e49ab1bfe13119633c6bf94eb7439ecb0d28841d (commit) - Log ----------------------------------------------------------------- commit e49ab1bfe13119633c6bf94eb7439ecb0d28841d Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Jun 10 21:43:16 2011 +0200 Minor xss reported by Aung Khant commit bbccc368173294f8d713a0f4dbfca28560811b33 Author: Herman van Rink <rink(a)initfour.nl> Date: Fri Jun 10 21:38:43 2011 +0200 Minor xss reported by Aung Khant ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3303-g54c062c
by Marc Delisle 10 Jun '11

10 Jun '11

The branch, master has been updated via 54c062c0ad19db67250fde19eff7f44f31429e74 (commit) via 20118f89cf9a84f019d77c748e8eb7d390781669 (commit) via c422694746d75d0fdb54fa7b11afa2156e4de8dc (commit) from cd5cddb2e4324094eae365e01422e8d165d372e8 (commit) - Log ----------------------------------------------------------------- commit 54c062c0ad19db67250fde19eff7f44f31429e74 Merge: cd5cddb2e4324094eae365e01422e8d165d372e8 20118f89cf9a84f019d77c748e8eb7d390781669 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jun 10 12:55:02 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 565b1d3..288e572 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ - bug #3307616 [edit] Inline edit updates multiple duplicate rows - patch #3311539 [edit] Inline edit does not escape backslashes - bug #3313210 [interface] Columns class sometimes changed for nothing +- patch #3313326 [interface] Some tooltips do not disappear 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/functions.js b/js/functions.js index fdae296..765f887 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2029,7 +2029,7 @@ $(document).ready(function() { $(this).qtip({ content: tooltip_text, show: { delay: 0 }, - hide: { when: 'unfocus', delay: 0 }, + hide: { delay: 1000 }, style: { background: '#ffffcc' } }); }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-17-g20118f8
by Marc Delisle 10 Jun '11

10 Jun '11

The branch, QA_3_4 has been updated via 20118f89cf9a84f019d77c748e8eb7d390781669 (commit) via c422694746d75d0fdb54fa7b11afa2156e4de8dc (commit) from 2d56821c0f1337ae3fec7e845a396e2b0448fdeb (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b012bf..ee86372 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ - bug #3307616 [edit] Inline edit updates multiple duplicate rows - patch #3311539 [edit] Inline edit does not escape backslashes - bug #3313210 [interface] Columns class sometimes changed for nothing +- patch #3313326 [interface] Some tooltips do not disappear 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/functions.js b/js/functions.js index 8c5bc64..cfbb25f 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1988,7 +1988,7 @@ $(document).ready(function() { $(this).qtip({ content: tooltip_text, show: { delay: 0 }, - hide: { when: 'unfocus', delay: 0 }, + hide: { delay: 1000 }, style: { background: '#ffffcc' } }); }); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3300-gcd5cddb
by Marc Delisle 09 Jun '11

09 Jun '11

The branch, master has been updated via cd5cddb2e4324094eae365e01422e8d165d372e8 (commit) from 412bb22b3944339e77d0f2f5437955a80c44862a (commit) - Log ----------------------------------------------------------------- commit cd5cddb2e4324094eae365e01422e8d165d372e8 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 9 16:09:53 2011 -0400 charset is now hardcoded ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index 0b10484..c31d74c 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -81,7 +81,7 @@ if (is_array($foreignData['disp_row'])) { <head> <title>phpMyAdmin</title> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=right&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3299-g412bb22
by Dieter Adriaenssens 09 Jun '11

09 Jun '11

The branch, master has been updated via 412bb22b3944339e77d0f2f5437955a80c44862a (commit) from 90099b7b5de240e5789ea8bfd29fcb03e867d825 (commit) - Log ----------------------------------------------------------------- commit 412bb22b3944339e77d0f2f5437955a80c44862a Author: Yuichiro <rdeq08(a)users.sourceforge.net> Date: Thu Jun 9 09:09:49 2011 +0200 Fix typo in documentation ----------------------------------------------------------------------- Summary of changes: Documentation.html | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation.html b/Documentation.html index 6f66b64..4db4ec0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1329,7 +1329,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> login credentials. This is alternative approach to session based single signon. The script needs to provide function <code>get_login_credentials</code> which returns list of username and - pasword, accepting single parameter of existing username (can be empty). + password, accepting single parameter of existing username (can be empty). See <code>scripts/signon-script.php</code> for an example. </dd> <dt><span id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span> string</dt> @@ -3533,7 +3533,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension <h4 id="faq3_18"> <a href="#faq3_18">3.18 When I import a CSV file that contains multiple tables, they are lumped together into a single table.</a></h4> <p> - There is no reliable way to differetiate tables in CSV format. For the time being, you will have to break apart CSV files containing multiple tables. + There is no reliable way to differentiate tables in CSV format. For the time being, you will have to break apart CSV files containing multiple tables. </p>  hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3298-g90099b7
by Piotr Przybylski 08 Jun '11

08 Jun '11

The branch, master has been updated via 90099b7b5de240e5789ea8bfd29fcb03e867d825 (commit) from 2a10c7f4aa968122939dcd60123f9819e6c97efb (commit) - Log ----------------------------------------------------------------- commit 90099b7b5de240e5789ea8bfd29fcb03e867d825 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Wed Jun 8 19:23:58 2011 +0200 Remove PMA_STR_binarySearchInArr in favor of isset and in_array ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- libraries/sqlparser.data.php | 3 - libraries/sqlparser.lib.php | 201 ++++++++++++++++++++---------------------- libraries/string.lib.php | 33 ------- 4 files changed, 95 insertions(+), 144 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b09570c..999174b 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -827,7 +827,7 @@ function PMA_backquote($a_name, $do_it = true) if (! $do_it) { global $PMA_SQPdata_forbidden_word; - if(! PMA_STR_binarySearchInArr(strtoupper($a_name), $PMA_SQPdata_forbidden_word, count($PMA_SQPdata_forbidden_word))) { + if(! in_array(strtoupper($a_name), $PMA_SQPdata_forbidden_word)) { return $a_name; } } diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 15fcb58..93132b3 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -11,9 +11,6 @@ * It has been extracted from the lex.h file in the MySQL BK tree * (around 4.0.2) as well as the MySQL documentation. * - * Note: before adding a value in the arrays, ensure that you respect - * proper sorting, especially with underscores. - * * It's easier to use only uppercase for proper sorting. In case of * doubt, use the test case to verify. * diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 46ae2b2..8005886 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -198,8 +198,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ function PMA_SQP_parse($sql) { - global $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type; - global $PMA_SQPdata_function_name, $PMA_SQPdata_forbidden_word; + static $PMA_SQPdata_column_attrib, $PMA_SQPdata_reserved_word, $PMA_SQPdata_column_type; + static $PMA_SQPdata_function_name, $PMA_SQPdata_forbidden_word; global $mysql_charsets, $mysql_collations_flat; // Convert all line feeds to Unix style @@ -211,14 +211,14 @@ if (! defined('PMA_MINIMUM_COMMON')) { return array(); } - // Get counts of some arrays - $PMA_SQPdata_column_attrib_cnt = count($PMA_SQPdata_column_attrib); - $PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name); - $PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word); - $PMA_SQPdata_forbidden_word_cnt = count($PMA_SQPdata_forbidden_word); - $PMA_SQPdata_column_type_cnt = count($PMA_SQPdata_column_type); - $mysql_charsets_count = count($mysql_charsets); - $mysql_collations_count = count($mysql_collations_flat); + // Create local hashtables + if (!isset($PMA_SQPdata_column_attrib_cnt)) { + $PMA_SQPdata_column_attrib = array_flip($GLOBALS['PMA_SQPdata_column_attrib']); + $PMA_SQPdata_function_name = array_flip($GLOBALS['PMA_SQPdata_function_name']); + $PMA_SQPdata_reserved_word = array_flip($GLOBALS['PMA_SQPdata_reserved_word']); + $PMA_SQPdata_forbidden_word = array_flip($GLOBALS['PMA_SQPdata_forbidden_word']); + $PMA_SQPdata_column_type = array_flip($GLOBALS['PMA_SQPdata_column_type']); + } $sql_array = array(); $sql_array['raw'] = $sql; @@ -234,20 +234,19 @@ if (! defined('PMA_MINIMUM_COMMON')) { $digit_hexset = 'x'; $bracket_list = '()[]{}'; $allpunct_list = '-,;:!?/.^~\*&%+<=>|'; - $allpunct_list_pair = array ( - 0 => '!=', - 1 => '&&', - 2 => ':=', - 3 => '<<', - 4 => '<=', - 5 => '<=>', - 6 => '<>', - 7 => '>=', - 8 => '>>', - 9 => '||', - 10 => '==', + $allpunct_list_pair = array( + '!=' => 1, + '&&' => 1, + ':=' => 1, + '<<' => 1, + '<=' => 1, + '<=>' => 1, + '<>' => 1, + '>=' => 1, + '>>' => 1, + '||' => 1, + '==' => 1 ); - $allpunct_list_pair_size = 11; //count($allpunct_list_pair); $quote_list = '\'"`'; $arraysize = 0; @@ -608,7 +607,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { break; } PMA_SQP_arrayAdd($sql_array, 'punct' . $t_suffix, $punct_data, $arraysize); - } elseif ($punct_data == $GLOBALS['sql_delimiter'] || PMA_STR_binarySearchInArr($punct_data, $allpunct_list_pair, $allpunct_list_pair_size)) { + } elseif ($punct_data == $GLOBALS['sql_delimiter'] || isset($allpunct_list_pair[$punct_data])) { // Ok, we have one of the valid combined punct expressions PMA_SQP_arrayAdd($sql_array, 'punct', $punct_data, $arraysize); } else { @@ -705,7 +704,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } elseif (($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) { $t_suffix = '_identifier'; } elseif (($t_next == 'punct_bracket_open_round') - && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_function_name, $PMA_SQPdata_function_name_cnt)) { + && isset($PMA_SQPdata_function_name[$d_cur_upper])) { /** * @todo 2005-10-16: in the case of a CREATE TABLE containing * a TIMESTAMP, since TIMESTAMP() is also a function, it's @@ -717,7 +716,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ $t_suffix = '_functionName'; /* There are functions which might be as well column types */ - } elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_type, $PMA_SQPdata_column_type_cnt)) { + } elseif (isset($PMA_SQPdata_column_type[$d_cur_upper])) { $t_suffix = '_columnType'; /** @@ -745,9 +744,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { // $sql_array[$i-1]['type'] = 'alpha_identifier'; //} - } elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_reserved_word, $PMA_SQPdata_reserved_word_cnt)) { + } elseif (isset($PMA_SQPdata_reserved_word[$d_cur_upper])) { $t_suffix = '_reservedWord'; - } elseif (PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_column_attrib, $PMA_SQPdata_column_attrib_cnt)) { + } elseif (isset($PMA_SQPdata_column_attrib[$d_cur_upper])) { $t_suffix = '_columnAttrib'; // INNODB is a MySQL table type, but in "SHOW INNODB STATUS", // it should be regarded as a reserved word. @@ -764,18 +763,18 @@ if (! defined('PMA_MINIMUM_COMMON')) { || ($d_bef_prev_upper == 'SET' && $d_prev_upper == '=') || ($d_bef_prev_upper == 'CHARSET' && $d_prev_upper == '=') || $d_prev_upper == 'CHARSET' - ) && PMA_STR_binarySearchInArr($d_cur, $mysql_charsets, count($mysql_charsets))) { + ) && in_array($d_cur, $mysql_charsets)) { $t_suffix = '_charset'; } - } elseif (PMA_STR_binarySearchInArr($d_cur, $mysql_charsets, $mysql_charsets_count) - || PMA_STR_binarySearchInArr($d_cur, $mysql_collations_flat, $mysql_collations_count) - || ($d_cur{0} == '_' && PMA_STR_binarySearchInArr(substr($d_cur, 1), $mysql_charsets, $mysql_charsets_count))) { + } elseif (in_array($d_cur, $mysql_charsets) + || in_array($d_cur, $mysql_collations_flat) + || ($d_cur{0} == '_' && in_array(substr($d_cur, 1), $mysql_charsets))) { $t_suffix = '_charset'; } else { // Do nothing } // check if present in the list of forbidden words - if ($t_suffix == '_reservedWord' && PMA_STR_binarySearchInArr($d_cur_upper, $PMA_SQPdata_forbidden_word, $PMA_SQPdata_forbidden_word_cnt)) { + if ($t_suffix == '_reservedWord' && isset($PMA_SQPdata_forbidden_word[$d_cur_upper])) { $sql_array[$i]['forbidden'] = true; } else { $sql_array[$i]['forbidden'] = false; @@ -988,49 +987,42 @@ if (! defined('PMA_MINIMUM_COMMON')) { // 'WHERE' // ); $words_ending_table_ref = array( - 'FOR', - 'GROUP', - 'HAVING', - 'LIMIT', - 'LOCK', - 'ORDER', - 'PROCEDURE', - 'UNION', - 'WHERE' + 'FOR' => 1, + 'GROUP' => 1, + 'HAVING' => 1, + 'LIMIT' => 1, + 'LOCK' => 1, + 'ORDER' => 1, + 'PROCEDURE' => 1, + 'UNION' => 1, + 'WHERE' => 1 ); - $words_ending_table_ref_cnt = 9; //count($words_ending_table_ref); $words_ending_clauses = array( - 'FOR', - 'LIMIT', - 'LOCK', - 'PROCEDURE', - 'UNION' + 'FOR' => 1, + 'LIMIT' => 1, + 'LOCK' => 1, + 'PROCEDURE' => 1, + 'UNION' => 1 ); - $words_ending_clauses_cnt = 5; //count($words_ending_clauses); - - - - // must be sorted $supported_query_types = array( - 'SELECT' + 'SELECT' => 1, /* // Support for these additional query types will come later on. - 'DELETE', - 'INSERT', - 'REPLACE', - 'TRUNCATE', - 'UPDATE' - 'EXPLAIN', - 'DESCRIBE', - 'SHOW', - 'CREATE', - 'SET', - 'ALTER' + 'DELETE' => 1, + 'INSERT' => 1, + 'REPLACE' => 1, + 'TRUNCATE' => 1, + 'UPDATE' => 1, + 'EXPLAIN' => 1, + 'DESCRIBE' => 1, + 'SHOW' => 1, + 'CREATE' => 1, + 'SET' => 1, + 'ALTER' => 1 */ ); - $supported_query_types_cnt = count($supported_query_types); // loop #1 for each token: select_expr, table_ref for SELECT @@ -1120,7 +1112,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // end if (querytype was empty) // Check if we support this type of query - if (!PMA_STR_binarySearchInArr($subresult['querytype'], $supported_query_types, $supported_query_types_cnt)) { + if (!isset($supported_query_types[$subresult['querytype']])) { // Skip ahead to the next one if we don't $seek_queryend = true; continue; @@ -1410,7 +1402,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (($i == $size-1) || ($arr[$i]['type'] == 'alpha_reservedWord' && !$in_group_concat - && PMA_STR_binarySearchInArr($upper_data, $words_ending_table_ref, $words_ending_table_ref_cnt))) { + && isset($words_ending_table_ref[$upper_data]))) { $seen_end_of_table_ref = true; // to be able to save the last table ref, but do not // set it true if we found a word like "ON" that has @@ -1653,7 +1645,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // if we find one of the words that could end the clause - if (PMA_STR_binarySearchInArr($upper_data, $words_ending_clauses, $words_ending_clauses_cnt)) { + if (isset($words_ending_clauses[$upper_data])) { $in_group_by = false; $in_order_by = false; @@ -2134,51 +2126,46 @@ if (! defined('PMA_MINIMUM_COMMON')) { $space_alpha_reserved_word = ' '; $keywords_with_brackets_1before = array( - 'INDEX', - 'KEY', - 'ON', - 'USING' + 'INDEX' => 1, + 'KEY' => 1, + 'ON' => 1, + 'USING' => 1 ); - $keywords_with_brackets_1before_cnt = 4; $keywords_with_brackets_2before = array( - 'IGNORE', - 'INDEX', - 'INTO', - 'KEY', - 'PRIMARY', - 'PROCEDURE', - 'REFERENCES', - 'UNIQUE', - 'USE' + 'IGNORE' => 1, + 'INDEX' => 1, + 'INTO' => 1, + 'KEY' => 1, + 'PRIMARY' => 1, + 'PROCEDURE' => 1, + 'REFERENCES' => 1, + 'UNIQUE' => 1, + 'USE' => 1 ); - // $keywords_with_brackets_2before_cnt = count($keywords_with_brackets_2before); - $keywords_with_brackets_2before_cnt = 9; // These reserved words do NOT get a newline placed near them. $keywords_no_newline = array( - 'AS', - 'ASC', - 'DESC', - 'DISTINCT', - 'DUPLICATE', - 'HOUR', - 'INTERVAL', - 'IS', - 'LIKE', - 'NOT', - 'NULL', - 'ON', - 'REGEXP' + 'AS' => 1, + 'ASC' => 1, + 'DESC' => 1, + 'DISTINCT' => 1, + 'DUPLICATE' => 1, + 'HOUR' => 1, + 'INTERVAL' => 1, + 'IS' => 1, + 'LIKE' => 1, + 'NOT' => 1, + 'NULL' => 1, + 'ON' => 1, + 'REGEXP' => 1 ); - $keywords_no_newline_cnt = 12; // These reserved words introduce a privilege list $keywords_priv_list = array( - 'GRANT', - 'REVOKE' + 'GRANT' => 1, + 'REVOKE' => 1 ); - $keywords_priv_list_cnt = 2; if ($number_of_tokens == -1) { $number_of_tokens = $arr['len']; @@ -2228,9 +2215,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { if (($typearr[1] == 'alpha_functionName') || ($typearr[1] == 'alpha_columnType') || ($typearr[1] == 'punct') || ($typearr[3] == 'digit_integer') || ($typearr[3] == 'digit_hex') || ($typearr[3] == 'digit_float') || (($typearr[0] == 'alpha_reservedWord') - && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 2]['data']), $keywords_with_brackets_2before, $keywords_with_brackets_2before_cnt)) + && isset($keywords_with_brackets_2before[strtoupper($arr[$i - 2]['data'])])) || (($typearr[1] == 'alpha_reservedWord') - && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_with_brackets_1before, $keywords_with_brackets_1before_cnt)) + && isset($keywords_with_brackets_1before[strtoupper($arr[$i - 1]['data'])])) ) { $functionlevel++; $infunction = true; @@ -2420,9 +2407,9 @@ if (! defined('PMA_MINIMUM_COMMON')) { if ((($typearr[1] != 'alpha_reservedWord') || (($typearr[1] == 'alpha_reservedWord') - && PMA_STR_binarySearchInArr(strtoupper($arr[$i - 1]['data']), $keywords_no_newline, $keywords_no_newline_cnt))) + && isset($keywords_no_newline[strtoupper($arr[$i - 1]['data'])]))) && ($typearr[1] != 'punct_level_plus') - && (!PMA_STR_binarySearchInArr($arr[$i]['data'], $keywords_no_newline, $keywords_no_newline_cnt))) { + && (!isset($keywords_no_newline[$arr[$i]['data']]))) { // do not put a space before the first token, because // we use a lot of pattern matching checking for the // first reserved word at beginning of query @@ -2448,7 +2435,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } else { // on first keyword, check if it introduces a // privilege list - if (PMA_STR_binarySearchInArr($arr[$i]['data'], $keywords_priv_list, $keywords_priv_list_cnt)) { + if (isset($keywords_priv_list[$arr[$i]['data']])) { $in_priv_list = true; } } diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 650a2ef..96bfcfc 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -124,37 +124,4 @@ function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false) || ($dot_is_valid != false && $c == '.')); } // end of the "PMA_STR_isSqlIdentifier()" function - -/** - * Binary search of a value in a sorted array - * - * $arr MUST be sorted, due to binary search - * - * @param string string to search for - * @param array sorted array to search into - * @param integer size of sorted array to search into - * - * @return boolean whether the string has been found or not - */ -function PMA_STR_binarySearchInArr($str, $arr, $arrsize) -{ - $top = $arrsize - 1; - $bottom = 0; - $found = false; - - while ($top >= $bottom && $found == false) { - $mid = intval(($top + $bottom) / 2); - $res = strcmp($str, $arr[$mid]); - if ($res == 0) { - $found = true; - } elseif ($res < 0) { - $top = $mid - 1; - } else { - $bottom = $mid + 1; - } - } // end while - - return $found; -} // end of the "PMA_STR_binarySearchInArr()" function - ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 38040434efbeb7e1496205d4c83475689043fea4
by Michal Čihař 08 Jun '11

08 Jun '11

The branch, master has been updated via 38040434efbeb7e1496205d4c83475689043fea4 (commit) via 1cfb91f683f5483a40a35c72e9191c769d1fae83 (commit) via 8d689c9ba58263e2325c5f67f5d52e125978169f (commit) via 77d5410127121df5851f5edeb68c496ac409f6f9 (commit) via a0655f291d095282b0797da00c8e022653b7240b (commit) via d40783120290d4dda77888354ab3c8ae7f3ea3de (commit) via 7bcf30c1838b674046ccbb568fa2073f5cd9746c (commit) via 1d4354adbaf84480a02f0a8f1627b18e8043fa64 (commit) via adbbdb19652b36f0698045130d292f5a09e22a37 (commit) via 8847ae52e045927566a1e7fc2f2a0115bc4311e2 (commit) via 27e0b5535640f527fa9ed6acb3d6bcab208ef548 (commit) via ff1b2b9e403e28e564c63abeb9f9d70ff11f95cd (commit) via b4c9a5f8a90e6bc1cc5b00f2ab71f4fe71c4a1ed (commit) via 1fbd2c7f49768be10a43ea36ed0cc0548dbb5fb7 (commit) via 8256b0d4d4156b6bf6705302d523779c152a1b52 (commit) via 4fd23d77faec41164b9aa4a8a65e5734c76dd662 (commit) via 10d77bebed51d8ff28af8f934a5803018b844ce8 (commit) via efcd145db81adc48d32380d55d1ccc0b146a5275 (commit) via 0db98946b1771a0621514f48cc4f8be33e24c51e (commit) via baa2d05e2df8974e86a0b5e43a29b5f234dd488b (commit) via d099e006f7e88286c19892d020fcd531ed1fbaf9 (commit) via ce570c2aa0b63bd6a9dc14a5b800b0e2908ace75 (commit) from ad68a0c16eadbeae9f54fd1dac0407924aa03a7d (commit) - Log ----------------------------------------------------------------- commit 38040434efbeb7e1496205d4c83475689043fea4 Author: Michal Čihař <mcihar(a)novell.com> Date: Wed Jun 8 16:27:46 2011 +0200 Update commit 1cfb91f683f5483a40a35c72e9191c769d1fae83 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:33:36 2011 +0200 Translation update done using Pootle. commit 8d689c9ba58263e2325c5f67f5d52e125978169f Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:33:17 2011 +0200 Translation update done using Pootle. commit 77d5410127121df5851f5edeb68c496ac409f6f9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:32:28 2011 +0200 Translation update done using Pootle. commit a0655f291d095282b0797da00c8e022653b7240b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:31:37 2011 +0200 Translation update done using Pootle. commit d40783120290d4dda77888354ab3c8ae7f3ea3de Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:30:59 2011 +0200 Translation update done using Pootle. commit 7bcf30c1838b674046ccbb568fa2073f5cd9746c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:30:28 2011 +0200 Translation update done using Pootle. commit 1d4354adbaf84480a02f0a8f1627b18e8043fa64 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:29:56 2011 +0200 Translation update done using Pootle. commit adbbdb19652b36f0698045130d292f5a09e22a37 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:29:33 2011 +0200 Translation update done using Pootle. commit 8847ae52e045927566a1e7fc2f2a0115bc4311e2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:28:52 2011 +0200 Translation update done using Pootle. commit 27e0b5535640f527fa9ed6acb3d6bcab208ef548 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:28:15 2011 +0200 Translation update done using Pootle. commit ff1b2b9e403e28e564c63abeb9f9d70ff11f95cd Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:26:39 2011 +0200 Translation update done using Pootle. commit b4c9a5f8a90e6bc1cc5b00f2ab71f4fe71c4a1ed Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:25:51 2011 +0200 Translation update done using Pootle. commit 1fbd2c7f49768be10a43ea36ed0cc0548dbb5fb7 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:25:17 2011 +0200 Translation update done using Pootle. commit 8256b0d4d4156b6bf6705302d523779c152a1b52 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:25:02 2011 +0200 Translation update done using Pootle. commit 4fd23d77faec41164b9aa4a8a65e5734c76dd662 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:24:39 2011 +0200 Translation update done using Pootle. commit 10d77bebed51d8ff28af8f934a5803018b844ce8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:24:21 2011 +0200 Translation update done using Pootle. commit efcd145db81adc48d32380d55d1ccc0b146a5275 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:23:56 2011 +0200 Translation update done using Pootle. commit 0db98946b1771a0621514f48cc4f8be33e24c51e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:23:41 2011 +0200 Translation update done using Pootle. commit baa2d05e2df8974e86a0b5e43a29b5f234dd488b Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:23:07 2011 +0200 Translation update done using Pootle. commit d099e006f7e88286c19892d020fcd531ed1fbaf9 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:22:30 2011 +0200 Translation update done using Pootle. commit ce570c2aa0b63bd6a9dc14a5b800b0e2908ace75 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 8 11:20:40 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/ja/Documentation.html | 120 +++++++++++++++---------------------- po/ja.po | 134 +++++++++++++++++++---------------------- 2 files changed, 111 insertions(+), 143 deletions(-) diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html index 352f006..9dbadfe 100644 --- a/output/ja/Documentation.html +++ b/output/ja/Documentation.html @@ -536,8 +536,8 @@ href="#cfg_Servers" class="configrule">$cfg['Servers']</a> 配列です。ここにはさまざまなサーバへのログイン情報が格納されます。たとえば、最初の <a href="#cfg_Servers_host" class="configrule">$cfg['Servers'][$i]['host']</a> には最初のサーバのホスト名が、二番目の <a href="#cfg_Servers_host" class="configrule">$cfg['Servers'][$i]['host']</a> -には二番目のサーバのホスト名が入ります。<tt>./libraries/config.default.php</tt> -にはひとつしかサーバ定義がありませんが、必要があれば <tt>./config.inc.php</tt> +には二番目のサーバのホスト名が入ります。<tt>./libraries/config.default.php</tt> には 1 +つしかサーバ定義がありませんが、必要があれば <tt>./config.inc.php</tt> にいくつでも定義を追加できます。<tt>./libraries/config.default.php</tt> から該当ブロックを丸ごと、あるいは必要な部分のみコピーしてください（すべての設定を定義する必要はありません。必要な部分のみ変更してください）。</dd> @@ -621,17 +621,14 @@ class="configrule">$cfg['AllowArbitraryServer']</a></tt> （<tt>$auth_type = '<abbr title="HyperText Transfer Protocol">HTTP</abbr>'</tt>）は 1.3.0 で導入されました。HTTP-Auth を経由することで、あらゆる有効な MySQL ユーザでログインできます。</li> - <li>'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as -introduced in 2.10.0 allows you to log in from prepared PHP session data or -using supplied PHP script. This is useful for implementing single signon -from another application. Sample way how to seed session is in signon -example: <code>scripts/signon.php</code>. There is also alternative example -using OpenID - <code>scripts/openid.php</code> and example for scripts based -solution - <code>scripts/signon-script.php</code>. You need to configure <a -href="#cfg_Servers_SignonSession" class="configrule">session name</a> or <a -href="#cfg_Servers_SignonScript" class="configrule">script to be -executed</a> and <a href="#cfg_Servers_SignonURL" class="configrule">signon -URL</a> to use this authentication method.</li> + <li>「signon」認証モード (<tt>$auth_type = 'signon'</tt>) は、2.10.0 +で導入されました。用意された PHP のセッションデータからか、もしくは PHP +スクリプトを使用してログインすることを許可するものです。これは、別のアプリケーションからシングルサインオンを実装する場合に便利です。シードセッションのやり方のサンプルは、サインオンの例 +(<code>scripts/signon.php</code>) の中にあります。別の例として、OpenID +(<code>scripts/openid.php</code>) を使うのもあります。この認証方式を使用するには、<a +href="#cfg_Servers_SignonSession" class="configrule">セッション名</a>か<a +href="#cfg_Servers_SignonScript" class="configrule">実行されるスクリプト</a>それと<a +href="#cfg_Servers_SignonURL" class="configrule">サインオン URL</a> を設定する必要があります。</li> </ul> 詳細は<a href="#setup">インストールの章</a>の「認証モードの使い方」をご覧ください。 @@ -1134,42 +1131,35 @@ are present. Currently used in some parts of the code, more to come. <dt><span id="cfg_Servers_ShowDatabasesCommand">$cfg['Servers'][$i]['ShowDatabasesCommand']</span> 文字列</dt> - <dd>On a server with a huge number of databases, the default <tt>SHOW -DATABASES</tt> command used to fetch the name of available databases will -probably be too slow, so it can be replaced by faster commands (see -<tt>libraries/config.default.php</tt> for examples). + <dd>膨大な数のデータベースを持つサーバ上で、使用可能なデータベース名を取得するためにデフォルトの SHOW DATABASES +コマンドを使うと、おそらくとても遅くなります。これを回避するために、高速コマンドに置き換えることができます（サンプルは、<tt>libraries/config.default.php</tt> +を参照してください）。 </dd> <dt><span id="cfg_Servers_CountTables">$cfg['Servers'][$i]['CountTables']</span> 論理型</dt> - <dd>Whether to count the number of tables for each database when preparing the -list of databases for the navigation frame. + <dd>ナビゲーションフレームにデータベースのリストを作成したときに、各データベースのテーブル数も表示するかどうか。 </dd> <dt><span -id="cfg_Servers_SignonScript">$cfg['Servers'][$i]['SignonScript']</span> -string</dt> - <dd>Name of PHP script to be sourced and executed to obtain login -credentials. This is alternative approach to session based single -signon. The script needs to provide function -<code>get_login_credentials</code> which returns list of username and -pasword, accepting single parameter of existing username (can be empty). -See <code>scripts/signon-script.php</code> for an example. +id="cfg_Servers_SignonScript">$cfg['Servers'][$i]['SignonScript']</span> 文字列</dt> + <dd>ログイン資格情報を取得するために実行される PHP +スクリプトの名前。これは、セッションに基づくシングルサインオンに代わる手法です。このスクリプトは、ユーザ名とパスワードの一覧を返す関数 +<code>get_login_credentials</code> +を提供していて、単一のパラメータとして存在するユーザ名（空欄も可）を受け入れる必要があります。サンプルは、<code>scripts/signon-script.php</code> +を参照してください。 </dd> <dt><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. Takes effect only if <a -href="#cfg_Servers_SignonScript" class="configrule">SignonScript</a> is not -configured. + <dd>サインオン認証方式に使用されるセッションの名前です。<code>phpMyAdmin</code> という名前は phpMyAdmin +が内部的に使用しているセッションであるため、それとは異なる名前を使用する必要があります。<a +href="#cfg_Servers_SignonScript" class="configrule">SignonScript</a> +を解除しないと、こちらは機能しません。 </dd> <dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span> 文字列</dt> - <dd>URL where user will be redirected to log in for signon authentication -method. Should be absolute including protocol. + <dd>ユーザがサインオン認証方式でログインしてときにリダイレクトされる URL。プロトコルを含む完全な URL にしなければなりません。 </dd> <dt><span id="cfg_Servers_LogoutURL">$cfg['Servers'][$i]['LogoutURL']</span> 文字列</dt> - <dd>URL where user will be redirected after logout (doesn't affect config -authentication method). Should be absolute including protocol. + <dd>ユーザがログアウト後にリダイレクトされる URL（認証方式の設定には影響しません）。プロトコルを含む完全な URL にしなければなりません。 </dd> <dt id="cfg_ServerDefault">$cfg['ServerDefault'] 整数</dt> @@ -1178,9 +1168,8 @@ authentication method). Should be absolute including protocol. サーバが１つしか設定されていない場合、<tt>$cfg['ServerDefault']</tt> はそのサーバに設定「しなければなりません」。</dd> <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] 論理型</dt> - <dd>Defines whether to refresh only parts of certain pages using Ajax -techniques. Applies only where a non-Ajax behavior is possible; for example, -the Designer feature is Ajax-only so this directive does not apply to it.</dd> + <dd>Ajax を使用して特定のページの一部分だけを更新するかどうかを定義します。Ajax +がなくても動作が可能なものにのみ適用されます。例えば、デザイナ機能は Ajax のみなので、この設定は適用されません。</dd> <dt id="cfg_VersionCheck">$cfg['VersionCheck'] 論理型</dt> <dd>javascript を使用した phpMyAdmin メインページ上の最新バージョンの確認を有効にします。</dd> @@ -1192,11 +1181,9 @@ the Designer feature is Ajax-only so this directive does not apply to it.</dd> <dd>（エクスポートページを除く）メインパネルのリストに表示されるテーブル名の最大数。この制限は、軽快モード時のナビゲーションパネルにも適用されます。</dd> <dt id="cfg_MaxCharactersInDisplayedSQL">$cfg['MaxCharactersInDisplayedSQL'] 整数</dt> - <dd>The maximum number of characters when a SQL query is displayed. The default -limit of 1000 should be correct to avoid the display of tons of hexadecimal -codes that represent BLOBs, but some users have real SQL queries that are -longer than 1000 characters. Also, if a query's length exceeds this limit, -this query is not saved in the history.</dd> + <dd>SQL クエリ表示時の最大文字数。デフォルトの制限は 1000 ですが、BLOB を表現する多量の 16 +進コードの表示を回避するためには、このくらいが適切だと思われます。しかし、一部のユーザは 1000 文字よりも長い SQL +クエリを使用します。また、クエリの長さがこの制限を超えている場合、このクエリは履歴に保存されません。</dd> <dt id="cfg_OBGzip">$cfg['OBGzip'] 文字列／論理型</dt> <dd><abbr title="HyperText Transfer Protocol">HTTP</abbr> 転送のスピードアップのために GZip @@ -1400,7 +1387,7 @@ href="#cfg_Servers_verbose">$cfg['Servers'][$i]['verbose']</a></tt> の場合は降順、それ以外は昇順ことで、これがデフォルトです。</dd> <dt id="cfg_DisplayBinaryAsHex">$cfg['DisplayBinaryAsHex'] 論理型 </dt> - <dd>閲覧オプション「バイナリ内容を 16 進数で表示する」かどうかの定義します。デフォルトはチェックされています。</dd> + <dd>表示オプション「バイナリ内容を 16 進数で表示する」かどうかの定義します。デフォルトはチェックされています。</dd> <dt id="cfg_ProtectBinary">$cfg['ProtectBinary'] 論理型または文字列</dt> <dd>テーブルの内容を表示しているときに <tt>BLOB</tt> カラムや <tt>BINARY</tt> @@ -1578,10 +1565,8 @@ $cfg['TrustedProxies'] = <dt id="cfg_DisableMultiTableMaintenance">$cfg['DisableMultiTableMaintenance'] 論理型</dt> <dd> - In the database Structure page, it's possible to mark some tables then -choose an operation like optimizing for many tables. This can slow down a -server; therefore, setting this to <code>true</code> prevents this kind of -multiple maintenance operation. Default is <code>false</code>. + データベースの構造ページにおいて、テーブルをマークして多くのテーブルを最適化するような操作を選択が可能です。この操作はサーバの動作を遅くさせてしまいますので、この値を +<code>true</code> に設定し、この種の複数メンテナンスの操作を防止します。デフォルトは <code>false</code> です。 </dd> <dt id="cfg_NaviWidth">$cfg['NaviWidth'] 整数</dt> @@ -1666,8 +1651,7 @@ href="#cfg_CharEditing">$cfg['CharEditing']</a> でそのように設定され <dd>クリックしたときにクエリボックスの textarea 全体を選択するかどうかを定義します。</dd> <dt id="cfg_LimitChars">$cfg['LimitChars'] 整数</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> + <dd>表示ページで、数字以外のフィールドに表示する最大文字数。表示ページ内のトグルボタンでオフにすることもできます。</dd> <dt><span id="cfg_RowActionLinks">$cfg['RowActionLinks']</span> 文字列 </dt> @@ -1888,7 +1872,7 @@ COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting. <dd>データベースやテーブルの名前を自然な順番でソートします（たとえば、t1、t2、t10）。いまのところ左パネル（ライトモード）とデータベース画面のテーブル一覧に実装されています。</dd> <dt id="cfg_InitialSlidersState">$cfg['InitialSlidersState'] 文字列</dt> - <dd><tt>「closed」</tt>に設定されている場合、折り畳みのデフォルトは閉じた状態です。<tt>「open」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled」</tt>にします。</dd> + <dd><tt>「closed」</tt>に設定した場合、折り畳みは閉じた状態で表示されます。<tt>「open」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>「disabled」</tt>にします。</dd> <dt id="cfg_UserprefsDisallow">$cfg['UserprefsDisallow'] 配列</dt> <dd>Contains names of configuration options (keys in <tt>$cfg</tt> array) that @@ -2444,8 +2428,7 @@ Documentation</a>. relations）」機能を実行できません。私が使っているフォントを認識してくれないようです。</a></h4> <p> 私たちがこの機能を実現するのに利用している「FPDF」ライブラリは、いくつかの特別なファイルがないとフォントを利用できません。<br /> - Please refers to the <a href="http://www.fpdf.org/">FPDF manual</a> to build -these files.</p> + その特別なファイルの作り方は <a href="http://www.fpdf.org/">FPDF マニュアル</a> をご覧ください。</p> <h4 id="faqmysql"> <a href="#faqmysql">1.20 「cannot load MySQL extension, please check PHP @@ -2576,11 +2559,10 @@ Services">IIS</abbr> 5.1 の <abbr title="Internet Server Application Programming Interface">ISAPI</abbr> モードで動かした PHP 4.3.9 で確認しました。</p> <ol><li>お使いの <tt>php.ini</tt> ファイルに <tt>cgi.rfc2616_headers = 0</tt> という設定を加えます。</li> - <li>In <tt>Web Site Properties -> File/Directory Security -> Anonymous -Access</tt> dialog box, check the <tt>Anonymous access</tt> checkbox and -uncheck any other checkboxes (i.e. uncheck <tt>Basic authentication</tt>, -<tt>Integrated Windows authentication</tt>, and <tt>Digest</tt> if it's -enabled.) Click <tt>OK</tt>.</li> + <li><tt>ウェブサイトの「プロパティ」 -> 「ディレクトリセキュリティ」タブ -> +「匿名アクセスおよび認証コントロール」の「編集」</tt>で表示されるダイアログボックスで、<tt>匿名アクセス</tt>のチェックボックスをチェック、それ以外のチェックボックスのチェックを外します（つまり、<tt>基本認証</tt>、<tt>統合 +Windows 認証</tt>、有効になっている場合は<tt>ダイジェスト認証</tt>のチェックを外します）。<tt>OK</tt> +をクリックします。</li> <li><tt>「カスタムエラー」</tt>タブで、<tt>401;1</tt> から <tt>401;5</tt> までを選択し、<tt>「既定値に設定」</tt>ボタンをクリックします。</li> </ol> @@ -2962,11 +2944,11 @@ href="http://bugs.mysql.com/bug.php?id=21704">http://bugs.mysql.com/bug.php?id=2 </p> <h4 id="faq3_5"> - <a href="#faq3_5">3.5 ネストフォルダを使うと、複数の階層を持つものがおかしな表示になることがあります？！</a>(<a + <a href="#faq3_5">3.5 入れ子のフォルダを使うと、複数の階層を持つものがおかしな表示になることがあります？！</a>(<a href="#cfg_LeftFrameTableSeparator" class="configrule">$cfg['LeftFrameTableSeparator']</a>)</h4> -<p> ご注意ください。間に文字をはさまずに区切り文字を連続して使ったり、テーブル名の前後に区切り文字を使ってはいけないのです。どうしてもそうする必要があるなら、別の区切り文字（TableSeparator）を使うか、この機能を無効にすることを検討してください。</p> +<p> 区切り文字の使い方に注意ください。間に文字をはさまずに区切り文字を連続して使ったり、テーブル名の前後に区切り文字を使ってはいけないのです。どうしてもそうする必要があるなら、テーブル区切り文字に別のものを使用するか、この機能を無効にすることを検討してください。</p> <h4 id="faq3_6"> <a href="#faq3_6">3.6 InnoDB では現在サポートされていない機能はありますか。</a></h4> @@ -3612,20 +3594,16 @@ Validator そのものは © 2001 Upright Database Technology です。私 column '...' used in key specification without a key length（BLOB カラム「…」をキーにしようとしましたが、キーの長さが指定されていません）」と言われてしまいます。</a></h4> -<p> The right way to do this, is to create the column without any indexes, then -display the table structure and use the "Create an index" -dialog. On this page, you will be able to choose your BLOB column, and set a -size to the index, which is the condition to create an index on a BLOB -column.</p> +<p> 正しくは、BLOB カラムをインデックスなしで作成したあと、テーブルの構造を表示し「インデックスを作成」ダイアログを使用します。このページ上で、BLOB +カラムを選択して、インデックスにサイズを指定できます。このサイズが BLOB カラムにインデックスを作るときの条件なのです。</p> <h4 id="faq6_16"> <a href="#faq6_16">6.16 どうしたらたくさんの編集フィールドがあるページで簡単に移動できますか。</a></h4> -<p> You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages -with many editing fields (table structure changes, row editing, etc.). You -can also have a look at the directive <a href="#DefaultPropDisplay" -class="configrule">$cfg['DefaultPropDisplay']</a> ('vertical') and see if -this eases up editing for you.</p> +<p> （テーブルの構造を変更したり、行を編集したりなど）編集カラムが多いページでは Ctrl + カーソルキー（Safari の場合は Option + +カーソルキー）を使うと移動できます。また、<a href="#DefaultPropDisplay" +class="configrule">$cfg['DefaultPropDisplay']</a> +ディレクティブの項もご覧ください。「vertical」にしたら編集が楽になるかもしれません。</p> <h4 id="faq6_17"> <a href="#faq6_17">6.17 変換機能：独自の MIME タイプを入力できません！　本当にこの機能は役に立つんですか？</a></h4> diff --git a/po/ja.po b/po/ja.po index 64d052f..d4eb61f 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-06-07 13:29+0300\n" -"PO-Revision-Date: 2011-06-07 11:37+0200\n" +"PO-Revision-Date: 2011-06-08 11:33+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: Japan <jp(a)li.org>\n" "Language: ja\n" @@ -1727,18 +1727,15 @@ msgid "" "<tt>./config.inc.php</tt>, copy that block or needed parts (you don't have " "to define all settings, just those you need to change)." msgstr "" -"バージョン 1.4.2 以降、phpMyAdmin は複数の MySQL サーバを管理できるようになっ" -"ています。そのために追加されたのが <a href=\"#cfg_Servers\" class=" -"\"configrule\">$cfg['Servers']</a> 配列です。ここにはさまざまなサーバへのログ" -"イン情報が格納されます。たとえば、最初の <a href=\"#cfg_Servers_host\" class=" -"\"configrule\">$cfg['Servers'][$i]['host']</a> には最初のサーバのホスト名が、" -"二番目の <a href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers']" -"[$i]['host']</a> には二番目のサーバのホスト名が入ります。<tt>./libraries/" -"config.default.php</tt> にはひとつしかサーバ定義がありませんが、必要があれば " -"<tt>./config.inc.php</tt> にいくつでも定義を追加できます。<tt>./libraries/" -"config.default.php</tt> から該当ブロックを丸ごと、あるいは必要な部分のみコ" -"ピーしてください（すべての設定を定義する必要はありません。必要な部分のみ変更" -"してください）。" +"バージョン 1.4.2 以降、phpMyAdmin は複数の MySQL サーバを管理できるようになっています。そのために追加されたのが <a " +"href=\"#cfg_Servers\" class=\"configrule\">$cfg['Servers']</a> " +"配列です。ここにはさまざまなサーバへのログイン情報が格納されます。たとえば、最初の <a href=\"#cfg_Servers_host\" " +"class=\"configrule\">$cfg['Servers'][$i]['host']</a> には最初のサーバのホスト名が、二番目の <a " +"href=\"#cfg_Servers_host\" class=\"configrule\">$cfg['Servers'][$i]['host']</a> " +"には二番目のサーバのホスト名が入ります。<tt>./libraries/config.default.php</tt> には 1 " +"つしかサーバ定義がありませんが、必要があれば <tt>./config.inc.php</tt> " +"にいくつでも定義を追加できます。<tt>./libraries/config.default.php</tt> " +"から該当ブロックを丸ごと、あるいは必要な部分のみコピーしてください（すべての設定を定義する必要はありません。必要な部分のみ変更してください）。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:663 @@ -2015,7 +2012,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:759 -#, fuzzy msgid "" "'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as " "introduced in 2.10.0 allows you to log in from prepared PHP session data or " @@ -2029,15 +2025,14 @@ msgid "" "executed</a> and <a href=\"#cfg_Servers_SignonURL\" class=\"configrule" "\">signon URL</a> to use this authentication method." msgstr "" -"「signon」認証モード (<tt>$auth_type = 'signon'</tt>) は、2.10.0 で" -"導入されました。用意されている PHP のセッションデータでログインすることを強化" -"するものです。これは、別のアプリケーションからシングルサインオンを実装する場" -"合に便利です。シードセッションのやり方のサンプルは、サインオンの例 " -"(<code>scripts/signon.php</code>) の中にあります。別の例として、OpenID " -"(<code>scripts/openid.php</code>) を使うのもあります。この認証方式を使用する" -"には、<a href=\"#cfg_Servers_SignonSession\" class=\"configrule\">セッション" -"名</a>と<a href=\"#cfg_Servers_SignonURL\" class=\"configrule\">サインオン " -"URL</a> を設定する必要があります。" +"「signon」認証モード (<tt>$auth_type = 'signon'</tt>) は、2.10.0 " +"で導入されました。用意された PHP のセッションデータからか、もしくは PHP スクリプトを使用してログインすることを許可するものです。これは、別のア" +"プリケーションからシングルサインオンを実装する場合に便利です。シードセッションのやり方のサンプルは、サインオンの例 " +"(<code>scripts/signon.php</code>) の中にあります。別の例として、OpenID " +"(<code>scripts/openid.php</code>) を使うのもあります。この認証方式を使用するには、<a " +"href=\"#cfg_Servers_SignonSession\" class=\"configrule\">セッション名</a>か<a " +"href=\"#cfg_Servers_SignonScript\" class=\"configrule\">実行されるスクリプト</a>それと<a " +"href=\"#cfg_Servers_SignonURL\" class=\"configrule\">サインオン URL</a> を設定する必要があります。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:781 @@ -3393,6 +3388,9 @@ msgid "" "too slow, so it can be replaced by faster commands (see <tt>libraries/config." "default.php</tt> for examples)." msgstr "" +"膨大な数のデータベースを持つサーバ上で、使用可能なデータベース名を取得するためにデフォルトの SHOW DATABASES コマンドを使うと、おそらくと" +"ても遅くなります。これを回避するために、高速コマンドに置き換えることができます（サンプルは、<tt>libraries/config.default.p" +"hp</tt> を参照してください）。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1324 @@ -3408,17 +3406,16 @@ msgstr "" msgid "" "Whether to count the number of tables for each database when preparing the " "list of databases for the navigation frame." -msgstr "" +msgstr "ナビゲーションフレームにデータベースのリストを作成したときに、各データベースのテーブル数も表示するかどうか。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1327 -#, fuzzy msgid "" "<span id=\"cfg_Servers_SignonScript\">$cfg['Servers'][$i]['SignonScript']</" "span> string" msgstr "" -"<span id=\"cfg_Servers_SignonSession\">$cfg['Servers'][$i]['SignonSession']</" -"span> 文字列" +"<span " +"id=\"cfg_Servers_SignonScript\">$cfg['Servers'][$i]['SignonScript']</span> 文字列" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1328 @@ -3430,6 +3427,11 @@ msgid "" "username (can be empty). See <code>scripts/signon-script.php</code> for an " "example." msgstr "" +"ログイン資格情報を取得するために実行される PHP " +"スクリプトの名前。これは、セッションに基づくシングルサインオンに代わる手法です。このスクリプトは、ユーザ名とパスワードの一覧を返す関数 " +"<code>get_login_credentials</code> " +"を提供していて、単一のパラメータとして存在するユーザ名（空欄も可）を受け入れる必要があります。サンプルは、<code>scripts/signon-" +"script.php</code> を参照してください。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1335 @@ -3442,7 +3444,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1336 -#, fuzzy msgid "" "Name of session which will be used for signon authentication method. You " "should use something different than <code>phpMyAdmin</code>, because this is " @@ -3450,9 +3451,10 @@ msgid "" "\"#cfg_Servers_SignonScript\" class=\"configrule\">SignonScript</a> is not " "configured." msgstr "" -"サインオン認証方式に使用されるセッションの名前です。<code>phpMyAdmin</code> " -"という名前は phpMyAdmin が内部的に使用しているセッションであるため、それとは" -"異なる名前を使用する必要があります。" +"サインオン認証方式に使用されるセッションの名前です。<code>phpMyAdmin</code> という名前は phpMyAdmin " +"が内部的に使用しているセッションであるため、それとは異なる名前を使用する必要があります。<a " +"href=\"#cfg_Servers_SignonScript\" class=\"configrule\">SignonScript</a> " +"を解除しないと、こちらは機能しません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1342 @@ -3468,7 +3470,7 @@ msgstr "" msgid "" "URL where user will be redirected to log in for signon authentication " "method. Should be absolute including protocol." -msgstr "" +msgstr "ユーザがサインオン認証方式でログインしてときにリダイレクトされる URL。プロトコルを含む完全な URL にしなければなりません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1345 @@ -3484,7 +3486,7 @@ msgstr "" msgid "" "URL where user will be redirected after logout (doesn't affect config " "authentication method). Should be absolute including protocol." -msgstr "" +msgstr "ユーザがログアウト後にリダイレクトされる URL（認証方式の設定には影響しません）。プロトコルを含む完全な URL にしなければなりません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1349 @@ -3524,6 +3526,8 @@ msgid "" "techniques. Applies only where a non-Ajax behavior is possible; for example, " "the Designer feature is Ajax-only so this directive does not apply to it." msgstr "" +"Ajax を使用して特定のページの一部分だけを更新するかどうかを定義します。Ajax " +"がなくても動作が可能なものにのみ適用されます。例えば、デザイナ機能は Ajax のみなので、この設定は適用されません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1363 @@ -3581,6 +3585,9 @@ msgid "" "longer than 1000 characters. Also, if a query's length exceeds this limit, " "this query is not saved in the history." msgstr "" +"SQL クエリ表示時の最大文字数。デフォルトの制限は 1000 ですが、BLOB を表現する多量の 16 " +"進コードの表示を回避するためには、このくらいが適切だと思われます。しかし、一部のユーザは 1000 文字よりも長い SQL " +"クエリを使用します。また、クエリの長さがこの制限を超えている場合、このクエリは履歴に保存されません。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1383 @@ -4407,9 +4414,7 @@ msgstr "$cfg['DisplayBinaryAsHex'] 論理型" msgid "" "Defines whether the "Show binary contents as HEX" browse option is " "ticked by default." -msgstr "" -"閲覧オプション「バイナリ内容を 16 進数で表示する」かどうかの定義します。デ" -"フォルトはチェックされています。" +msgstr "表示オプション「バイナリ内容を 16 進数で表示する」かどうかの定義します。デフォルトはチェックされています。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1648 @@ -5069,6 +5074,9 @@ msgid "" "server; therefore, setting this to <code>true</code> prevents this kind of " "multiple maintenance operation. Default is <code>false</code>." msgstr "" +"データベースの構造ページにおいて、テーブルをマークして多くのテーブルを最適化するような操作を選択が可能です。この操作はサーバの動作を遅くさせてしまいます" +"ので、この値を <code>true</code> に設定し、この種の複数メンテナンスの操作を防止します。デフォルトは " +"<code>false</code> です。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1871 @@ -5399,13 +5407,10 @@ msgstr "$cfg['LimitChars'] 整数" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1957 -#, fuzzy 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 "" -"表示ページで、数字以外のフィールドに表示する最大文字数。表示ページ内のトグル" -"ボタンでオフにすることもできます。" +msgstr "表示ページで、数字以外のフィールドに表示する最大文字数。表示ページ内のトグルボタンでオフにすることもできます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1960 @@ -6081,9 +6086,8 @@ msgid "" "state. A value of <tt>'open'</tt> does the reverse. To completely disable " "all visual sliders, use <tt>'disabled'</tt>." msgstr "" -"<tt>「closed」</tt>に設定されている場合、折り畳みのデフォルトは閉じた状態で" -"す。<tt>「open」</tt>はその逆です。全ての折り畳みを完全に無効にするには、<tt>" -"「disabled」</tt>にします。" +"<tt>「closed」</tt>に設定した場合、折り畳みは閉じた状態で表示されます。<tt>「open」</tt>はその逆です。全ての折り畳みを完全に" +"無効にするには、<tt>「disabled」</tt>にします。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:2235 @@ -7835,13 +7839,10 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2862 -#, fuzzy msgid "" "Please refers to the <a href=\"http://www.fpdf.org/\">FPDF manual</a> to " "build these files." -msgstr "" -"その特別なファイルの作り方は <a href=\"http://www.fpdf.org/\" target=\"_blank" -"\">FPDF マニュアル</a> をご覧ください。" +msgstr "その特別なファイルの作り方は <a href=\"http://www.fpdf.org/\">FPDF マニュアル</a> をご覧ください。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:2866 @@ -8227,7 +8228,6 @@ msgstr "" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:3011 -#, fuzzy msgid "" "In <tt>Web Site Properties -> File/Directory Security -> Anonymous " "Access</tt> dialog box, check the <tt>Anonymous access</tt> checkbox and " @@ -8235,12 +8235,10 @@ msgid "" "<tt>Integrated Windows authentication</tt>, and <tt>Digest</tt> if it's " "enabled.) Click <tt>OK</tt>." msgstr "" -"<tt>Web サイトの「プロパティ」 -> 「ディレクトリセキュリティ」タブ -> 「匿名" -"アクセスおよび認証コントロール」の「編集」</tt>で表示されるダイアログボックス" -"で、<tt>匿名アクセス</tt>のチェックボックスをチェック、それ以外のチェックボッ" -"クスのチェックを外します（つまり、<tt>基本認証</tt>, <tt>統合 Windows 認証</" -"tt>、有効になっている場合は<tt>ダイジェスト認証</tt>のチェックを外します）。" -"<tt>OK</tt>をクリックします。" +"<tt>ウェブサイトの「プロパティ」 -> 「ディレクトリセキュリティ」タブ -> 「匿名アクセスおよび認証コントロール」の「編集」</tt" +">で表示されるダイアログボックスで、<tt>匿名アクセス</tt>のチェックボックスをチェック、それ以外のチェックボックスのチェックを外します（つまり、" +"<tt>基本認証</tt>、<tt>統合 Windows " +"認証</tt>、有効になっている場合は<tt>ダイジェスト認証</tt>のチェックを外します）。<tt>OK</tt> をクリックします。" #. type: Content of: <html><body><div><ol><li> #: orig-docs/Documentation.html:3016 @@ -9288,8 +9286,8 @@ msgid "" "\"#cfg_LeftFrameTableSeparator\" class=\"configrule\">$cfg" "['LeftFrameTableSeparator']</a>)" msgstr "" -"<a href=\"#faq3_5\">3.5 ネストフォルダを使うと、複数の階層を持つものがおかし" -"な表示になることがあります？！</a>(<a href=\"#cfg_LeftFrameTableSeparator\" " +"<a href=\"#faq3_5\">3.5 入れ子のフォルダを使うと、複数の階層を持つものがおかしな表示になることがあります？！</a>(<a " +"href=\"#cfg_LeftFrameTableSeparator\" " "class=\"configrule\">$cfg['LeftFrameTableSeparator']</a>)" #. type: Content of: <html><body><div><p> @@ -9300,10 +9298,8 @@ msgid "" "name. If you have to, think about using another TableSeparator or disabling " "that feature" msgstr "" -"ご注意ください。間に文字をはさまずに区切り文字を連続して使ったり、テーブル名" -"の前後に区切り文字を使ってはいけないのです。どうしてもそうする必要があるな" -"ら、別の区切り文字（TableSeparator）を使うか、この機能を無効にすることを検討" -"してください。" +"区切り文字の使い方に注意ください。間に文字をはさまずに区切り文字を連続して使ったり、テーブル名の前後に区切り文字を使ってはいけないのです。どうしてもそう" +"する必要があるなら、テーブル区切り文字に別のものを使用するか、この機能を無効にすることを検討してください。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3417 @@ -11139,17 +11135,14 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4146 -#, fuzzy msgid "" "The right way to do this, is to create the column without any indexes, then " "display the table structure and use the "Create an index" dialog. " "On this page, you will be able to choose your BLOB column, and set a size to " "the index, which is the condition to create an index on a BLOB column." msgstr "" -"正しくは、BLOB フィールドをインデックスなしで作成したあと、テーブルの構造を表" -"示します。「インデックスを作成（Create an index）」ダイアログを利用すると、" -"BLOB フィールドを選択して、インデックスにサイズを指定できます。このサイズが " -"BLOB フィールドにインデックスをつくるときの条件なのです。" +"正しくは、BLOB カラムをインデックスなしで作成したあと、テーブルの構造を表示し「インデックスを作成」ダイアログを使用します。このページ上で、BLOB " +"カラムを選択して、インデックスにサイズを指定できます。このサイズが BLOB カラムにインデックスを作るときの条件なのです。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4153 @@ -11162,7 +11155,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4156 -#, fuzzy msgid "" "You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages " "with many editing fields (table structure changes, row editing, etc.). You " @@ -11170,12 +11162,10 @@ msgid "" "\"configrule\">$cfg['DefaultPropDisplay']</a> ('vertical') and see if this " "eases up editing for you." msgstr "" -"編集フィールドが多い（テーブルの構造を変更したり、行を編集したりする）ページ" -"ではたいてい Ctrl＋カーソルキー（Safari の場合は Option＋カーソルキー）を使う" -"と移動できるようになっています（設定でこの機能を有効にする必要があります。→ " -"<a href=\"#CtrlArrowsMoving\">$cfg['CtrlArrowsMoving']</a>）。また、<a href=" -"\"#DefaultPropDisplay\">$cfg['DefaultPropDisplay']</a> ディレクティブの項もご" -"覧ください。「vertical」にしたら編集が楽になるかもしれません。" +"（テーブルの構造を変更したり、行を編集したりなど）編集カラムが多いページでは Ctrl + カーソルキー（Safari の場合は Option + " +"カーソルキー）を使うと移動できます。また、<a href=\"#DefaultPropDisplay\" " +"class=\"configrule\">$cfg['DefaultPropDisplay']</a> " +"ディレクティブの項もご覧ください。「vertical」にしたら編集が楽になるかもしれません。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4163 hooks/post-receive -- phpMyAdmin localized documentation

1 0