Git
Threads by month
- ----- 2025 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
June 2011
- 7 participants
- 281 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2918-g2da4004
by Michal Čihař 02 Jun '11
by Michal Čihař 02 Jun '11
02 Jun '11
The branch, master has been updated
via 2da400447c6993d46b969a1c9c863fd81817f67e (commit)
from 834cefc2fda28d4d3e8a219a85759a5fb0e888d6 (commit)
- Log -----------------------------------------------------------------
commit 2da400447c6993d46b969a1c9c863fd81817f67e
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 11:52:51 2011 +0200
Update Czech translation
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index eb4febf..9b8ceb9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2208,17 +2208,15 @@ msgstr "Obojí"
#: libraries/config.values.php:47
msgid "Nowhere"
-msgstr ""
+msgstr "Nikde"
#: libraries/config.values.php:47
msgid "Left"
-msgstr ""
+msgstr "Nalevo"
#: libraries/config.values.php:47
-#, fuzzy
-#| msgid "Height"
msgid "Right"
-msgstr "Výška"
+msgstr "Napravo"
#: libraries/config.values.php:75
msgid "Open"
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. ab450ea1dbcad60c755df1d80bb16093010ee0fa
by Michal Čihař 02 Jun '11
by Michal Čihař 02 Jun '11
02 Jun '11
The branch, master has been updated
via ab450ea1dbcad60c755df1d80bb16093010ee0fa (commit)
via e5e682d51c1e4bd0a182424fe08dcfa42de2455c (commit)
via 55e798dfd6fde949355b1e97b66f498af3d934dc (commit)
via f08f63b56dc9cb72f09845a8cfd15261efb8d577 (commit)
via 059352f2d3390f2dde8b2ba10c9492c52d42b010 (commit)
via 0afa932c5c80970028c2cf5d7b46df6ae51a466e (commit)
via 9855847f9e4a27ac72592930295fb0c2cd1017a7 (commit)
via 036d1a972ff403d78612d0605caec4ef6638c199 (commit)
via 1a1f0601a630d8d51a615da68b54f77ba1a99e0c (commit)
via e8ce773da0eb043ea35679c2717f86084c773c4a (commit)
via 320024125e7619757e071ca4104657018b38978e (commit)
via f48a1dccbb0b07bd2481e9f89af145c9daea4054 (commit)
via f1c234f8f74ac36ae3b5abc4f1056bc3b049cb1f (commit)
via 3c8afb03ed17149c5229a20b57b931d5b21621d8 (commit)
via a33747e692d9c459fd2715071c13ab19f84b9c79 (commit)
via b367106135f89a1486170d065b93401576daec2d (commit)
via 6aa82791b91ecb360d4899b75d03209e88fcc8f5 (commit)
via 3c468d0a3ada1f85ca562363e7829a0d9b67d904 (commit)
via e7045c7a958ab88147e02e4b658b445134af741a (commit)
via d373d7e55d8fa1289cc7436b1f868559361137ea (commit)
via fe5424535734d2e4245e5ad819ca5b43b496cc40 (commit)
via 61bd72b7c21f43c3ab045c23384dc670d8cc82fd (commit)
via b03eb78094cbd276e237bde487d277795bb268fa (commit)
via e3eaccd0e6bd20143e125311e172b6912c3818ab (commit)
via 10b435a19ae929e639d714f74707fee067d9573e (commit)
via 0ba53967c94addf052b1f18fd9baa13a8794318c (commit)
via 57873ba869ad04cd9264aa5ddb8998573468eae8 (commit)
via 1f2b4f324f8b41c573ed56b64bef351440cee437 (commit)
via 6ea40f2e83f117d359a68e58d6c4eaca0a4a5b79 (commit)
via b1c88bcd4f020e73d506d5f4f41cb888893159c7 (commit)
via 8e40e5cbde8347f1a3885be75304be72429b5b92 (commit)
via 9326aef2934c2cc371671cf77dc6198f0896c6f0 (commit)
via 0f80d7d8d4f8927270fa49fb6c93be65a0e0bf5b (commit)
via 8ecf4fdef357d42abc6c03eec4240e161ac4b73c (commit)
via 9e4844a579b65ae76b2c1a8545c8a3be57892453 (commit)
via debfb76b3908c6a8cc05744a15241cfed1f2ede9 (commit)
via a4c5fad5d0875f28dea3b215d910bfe555a33104 (commit)
via b6b0b4b353fb898a4d1aa07be1f456f64b8ec327 (commit)
via fb74887fd49bc3ec6960f23f4ca1e608478884eb (commit)
via fcbc1f25ec6fcc34da5d01c7975fd60b7878147a (commit)
via 400f5b631d102c3464dc8a169e50211f47997bd7 (commit)
via c3aa206e39f8c2beea1935539101771971a15918 (commit)
via 2d92f266fa667fc0de0d5a2b47506fbfe05990ba (commit)
via 42585ad4d9447ac5267829b9f5587f8adf391b89 (commit)
via 0010d03a1feaab1603167be830f57095ea82e257 (commit)
via bbb5ec6377843185dcfaf9d7e8661a56999deafb (commit)
from ad8f73c17a81ab82d5cbfae2151529177e971001 (commit)
- Log -----------------------------------------------------------------
commit ab450ea1dbcad60c755df1d80bb16093010ee0fa
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:51:21 2011 +0200
Translation update done using Pootle.
commit e5e682d51c1e4bd0a182424fe08dcfa42de2455c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:50:41 2011 +0200
Translation update done using Pootle.
commit 55e798dfd6fde949355b1e97b66f498af3d934dc
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:50:14 2011 +0200
Translation update done using Pootle.
commit f08f63b56dc9cb72f09845a8cfd15261efb8d577
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:49:45 2011 +0200
Translation update done using Pootle.
commit 059352f2d3390f2dde8b2ba10c9492c52d42b010
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:48:56 2011 +0200
Translation update done using Pootle.
commit 0afa932c5c80970028c2cf5d7b46df6ae51a466e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:48:38 2011 +0200
Translation update done using Pootle.
commit 9855847f9e4a27ac72592930295fb0c2cd1017a7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:48:21 2011 +0200
Translation update done using Pootle.
commit 036d1a972ff403d78612d0605caec4ef6638c199
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:47:58 2011 +0200
Translation update done using Pootle.
commit 1a1f0601a630d8d51a615da68b54f77ba1a99e0c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:47:14 2011 +0200
Translation update done using Pootle.
commit e8ce773da0eb043ea35679c2717f86084c773c4a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:46:37 2011 +0200
Translation update done using Pootle.
commit 320024125e7619757e071ca4104657018b38978e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:46:15 2011 +0200
Translation update done using Pootle.
commit f48a1dccbb0b07bd2481e9f89af145c9daea4054
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:46:02 2011 +0200
Translation update done using Pootle.
commit f1c234f8f74ac36ae3b5abc4f1056bc3b049cb1f
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:45:19 2011 +0200
Translation update done using Pootle.
commit 3c8afb03ed17149c5229a20b57b931d5b21621d8
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:44:58 2011 +0200
Translation update done using Pootle.
commit a33747e692d9c459fd2715071c13ab19f84b9c79
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:44:42 2011 +0200
Translation update done using Pootle.
commit b367106135f89a1486170d065b93401576daec2d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:44:22 2011 +0200
Translation update done using Pootle.
commit 6aa82791b91ecb360d4899b75d03209e88fcc8f5
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:43:50 2011 +0200
Translation update done using Pootle.
commit 3c468d0a3ada1f85ca562363e7829a0d9b67d904
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:43:00 2011 +0200
Translation update done using Pootle.
commit e7045c7a958ab88147e02e4b658b445134af741a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:42:31 2011 +0200
Translation update done using Pootle.
commit d373d7e55d8fa1289cc7436b1f868559361137ea
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:42:06 2011 +0200
Translation update done using Pootle.
commit fe5424535734d2e4245e5ad819ca5b43b496cc40
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:41:28 2011 +0200
Translation update done using Pootle.
commit 61bd72b7c21f43c3ab045c23384dc670d8cc82fd
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:40:47 2011 +0200
Translation update done using Pootle.
commit b03eb78094cbd276e237bde487d277795bb268fa
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:40:25 2011 +0200
Translation update done using Pootle.
commit e3eaccd0e6bd20143e125311e172b6912c3818ab
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:40:00 2011 +0200
Translation update done using Pootle.
commit 10b435a19ae929e639d714f74707fee067d9573e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:39:18 2011 +0200
Translation update done using Pootle.
commit 0ba53967c94addf052b1f18fd9baa13a8794318c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:38:47 2011 +0200
Translation update done using Pootle.
commit 57873ba869ad04cd9264aa5ddb8998573468eae8
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:38:15 2011 +0200
Translation update done using Pootle.
commit 1f2b4f324f8b41c573ed56b64bef351440cee437
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:37:49 2011 +0200
Translation update done using Pootle.
commit 6ea40f2e83f117d359a68e58d6c4eaca0a4a5b79
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:37:17 2011 +0200
Translation update done using Pootle.
commit b1c88bcd4f020e73d506d5f4f41cb888893159c7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:36:40 2011 +0200
Translation update done using Pootle.
commit 8e40e5cbde8347f1a3885be75304be72429b5b92
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:36:13 2011 +0200
Translation update done using Pootle.
commit 9326aef2934c2cc371671cf77dc6198f0896c6f0
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:35:46 2011 +0200
Translation update done using Pootle.
commit 0f80d7d8d4f8927270fa49fb6c93be65a0e0bf5b
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:35:13 2011 +0200
Translation update done using Pootle.
commit 8ecf4fdef357d42abc6c03eec4240e161ac4b73c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:34:36 2011 +0200
Translation update done using Pootle.
commit 9e4844a579b65ae76b2c1a8545c8a3be57892453
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:33:10 2011 +0200
Translation update done using Pootle.
commit debfb76b3908c6a8cc05744a15241cfed1f2ede9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:31:51 2011 +0200
Translation update done using Pootle.
commit a4c5fad5d0875f28dea3b215d910bfe555a33104
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:31:24 2011 +0200
Translation update done using Pootle.
commit b6b0b4b353fb898a4d1aa07be1f456f64b8ec327
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:30:52 2011 +0200
Translation update done using Pootle.
commit fb74887fd49bc3ec6960f23f4ca1e608478884eb
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:30:23 2011 +0200
Translation update done using Pootle.
commit fcbc1f25ec6fcc34da5d01c7975fd60b7878147a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:29:22 2011 +0200
Translation update done using Pootle.
commit 400f5b631d102c3464dc8a169e50211f47997bd7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:28:58 2011 +0200
Translation update done using Pootle.
commit c3aa206e39f8c2beea1935539101771971a15918
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:26:45 2011 +0200
Translation update done using Pootle.
commit 2d92f266fa667fc0de0d5a2b47506fbfe05990ba
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:26:01 2011 +0200
Translation update done using Pootle.
commit 42585ad4d9447ac5267829b9f5587f8adf391b89
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:25:29 2011 +0200
Translation update done using Pootle.
commit 0010d03a1feaab1603167be830f57095ea82e257
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:24:19 2011 +0200
Translation update done using Pootle.
commit bbb5ec6377843185dcfaf9d7e8661a56999deafb
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Thu Jun 2 11:22:19 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/ja.po | 278 ++++++++++++++++++++++++++++----------------------------------
1 files changed, 124 insertions(+), 154 deletions(-)
diff --git a/po/ja.po b/po/ja.po
index b1e5968..4521378 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-30 11:20+0300\n"
-"PO-Revision-Date: 2011-05-31 12:02+0200\n"
+"PO-Revision-Date: 2011-06-02 11:51+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: Japan <jp(a)li.org>\n"
"Language: ja\n"
@@ -718,9 +718,8 @@ msgid ""
"has read and write access to it. <a href=\"#faq1_26\">FAQ 1.26</a> can help "
"with this."
msgstr ""
-"他のプラットフォームでは、単純にフォルダを作成し、Web サーバに対して読み書き"
-"アクセス権があるか確認します。<a href=\"#faq1_26\">FAQ 1.26</a> も役立つで"
-"しょう。"
+"他のプラットフォームでは、単純にフォルダを作成し、ウェブサーバに対して読み書きアクセス権があるか確認します。<a href=\"#faq1_26\">FAQ "
+"1.26</a> も役立つでしょう。"
#. type: Content of: <html><body><div><ol><li><ul><li>
#: orig-docs/Documentation.html:269
@@ -834,13 +833,11 @@ msgid ""
"code> file which can help you achieve this in <code>contrib</code> directory "
"in phpMyAdmin."
msgstr ""
-"一般的には、インストールしている phpMyAdmin を公開されている場合、検索エンジ"
-"ンロボットに自動的に収集されないようにするために、それらからのアクセスに対し"
-"てを保護することをお勧めします。そのためには、<code>robots.txt</code> ファイ"
-"ルを Web サーバのルートに置くか、もしくは、Web サーバの設定によりアクセス制限"
-"を行います。phpMyAdmin の <code>contrib</code> ディレクトリ内に、<code>."
-"htaccess</code> ファイルのサンプルがあります。これは、その設定を行うための参"
-"考になるでしょう。"
+"一般的には、インストールしている phpMyAdmin を公開されている場合、検索エンジンロボットに自動的に収集されないようにするために、それらからのア"
+"クセスに対してを保護することをお勧めします。そのためには、<code>robots.txt</code> "
+"ファイルをウェブサーバのルートに置くか、もしくは、ウェブサーバの設定によりアクセス制限を行います。phpMyAdmin の "
+"<code>contrib</code> ディレクトリ内に、<code>.htaccess</code> "
+"ファイルのサンプルがあります。これは、その設定を行うための参考になるでしょう。"
#. type: Content of: <html><body><div><h3>
#: orig-docs/Documentation.html:324
@@ -1405,9 +1402,7 @@ msgstr "Swekey 認証"
msgid ""
"The Swekey is a low cost authentication USB key that can be used in web "
"applications."
-msgstr ""
-"Swekey は、Web アプリケーションで使用することができる低コストの USB 認証キー"
-"です。"
+msgstr "Swekey は、ウェブアプリケーションで使用することができる低コストの USB 認証キーです。"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:545
@@ -1442,11 +1437,10 @@ msgid ""
"etc</tt>). A self documented sample file is provided in the <tt>contrib</tt> "
"directory. Feel free to use it with your own users' information."
msgstr ""
-"その後、各ユーザと Swekey ID が関連付けられている <tt>swekey.conf</tt> ファイ"
-"ルを作成する必要があります。このファイルを Web サーバのドキュメントルート外に"
-"置いておくことが重要です(上の例では、<tt>/etc</tt> にあります)。これのサン"
-"プルファイルが <tt>contrib</tt> ディレクトリにあります。これらはユーザ情報で"
-"はありますが、管理者が見たりしても特に問題はありません。"
+"その後、各ユーザと Swekey ID が関連付けられている <tt>swekey.conf</tt> "
+"ファイルを作成する必要があります。このファイルをウェブサーバのドキュメントルート外に置いておくことが重要です(上の例では、<tt>/etc</tt> "
+"にあります)。これのサンプルファイルが <tt>contrib</tt> "
+"ディレクトリにあります。これらはユーザ情報ではありますが、管理者が見たりしても特に問題はありません。"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:560
@@ -5975,6 +5969,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>にします。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2214
@@ -6014,7 +6010,7 @@ msgstr "$cfg['TitleDefault'] 文字列"
msgid ""
"Allows you to specify window's title bar. You can use <a href="
"\"#faq6_27\">format string expansion</a>."
-msgstr ""
+msgstr "ウィンドウのタイトルバーを指定することができます。<a href=\"#faq6_27\">書式の拡張</a>が使用できます。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2227
@@ -6069,13 +6065,12 @@ msgstr "$cfg['ThemeManager'] boolean"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2242
-#, fuzzy
msgid ""
"Enables user-selectable themes. See <a href=\"#faqthemes\"> <abbr title="
"\"Frequently Asked Questions\">FAQ</abbr> 2.7</a>."
msgstr ""
-"ユーザがテーマを選択できるようにします。<a href=\"#faqthemes\">FAQ 2.7</a> を"
-"ご覧ください。"
+"ユーザがテーマを選択できるようにします。<a href=\"#faqthemes\"> <abbr title=\"よくある質問\">FAQ</abbr> "
+"2.7</a> をご覧ください。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2245
@@ -6120,6 +6115,8 @@ msgid ""
"specify any. You can use standard <a href=\"#faq6_27\">format string "
"expansion</a>."
msgstr ""
+"ユーザが指定しなかった時の、クエリボックスに表示されるデフォルトのクエリ。標準の<a "
+"href=\"#faq6_27\">書式の拡張</a>を使用することができます。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2259
@@ -6128,16 +6125,15 @@ msgstr "$cfg['SQP']['fmtType'] 文字列 [<tt>html</tt>|<tt>none</tt>]"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2261
-#, fuzzy
msgid ""
"The main use of the new <abbr title=\"structured query language\">SQL</abbr> "
"Parser is to pretty-print <abbr title=\"structured query language\">SQL</"
"abbr> queries. By default we use HTML to format the query, but you can "
"disable this by setting this variable to <tt>'none'</tt>."
msgstr ""
-"新しい SQL パーサの主な用途は SQL クエリを読みやすくすることです。デフォルト"
-"では HTML を使ってクエリを整形しますが、この変数を <tt>「none」</tt> にすると"
-"この機能を無効にできます。"
+"新しい <abbr title=\"structured query language\">SQL</abbr> パーサの主な用途は <abbr "
+"title=\"structured query language\">SQL</abbr> クエリを読みやすくすることです。デフォルトでは HTML "
+"を使ってクエリを整形しますが、この変数を <tt>「none」</tt> にするとこの機能を無効にできます。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2266
@@ -6155,16 +6151,16 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2268
-#, fuzzy
msgid ""
"For the pretty-printing of <abbr title=\"structured query language\">SQL</"
"abbr> queries, under some cases the part of a query inside a bracket is "
"indented. By changing <tt>$cfg['SQP']['fmtInd']</tt> you can change the "
"amount of this indent."
msgstr ""
-"SQL クエリを読みやすくするために、場合によってはブラケット( [ ] )に囲まれた"
-"クエリの一部がインデントされるのですが、<tt>$cfg['SQP']['fmtInd']</tt> を変更"
-"すると、このインデントの量を変更できます。"
+"<abbr title=\"structured query language\">SQL</abbr> "
+"クエリを読みやすくするために、場合によってはブラケット( [ ] "
+")で囲まれたクエリの一部がインデントされるのですが、<tt>$cfg['SQP']['fmtInd']</tt> "
+"を変更することで、このインデントの量を変更することができます。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2271
@@ -6178,18 +6174,17 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2275
msgid "$cfg['SQP']['fmtColor'] array of string tuples"
-msgstr "$cfg['SQP']['fmtColor'] string 組の array"
+msgstr "$cfg['SQP']['fmtColor'] 文字列の連想配列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2276
-#, fuzzy
msgid ""
"This array is used to define the colours for each type of element of the "
"pretty-printed <abbr title=\"structured query language\">SQL</abbr> queries. "
"The tuple format is"
msgstr ""
-"SQL クエリを読みやすくするために各要素につける色の定義に利用します。色を定義"
-"するペア文字列の書式は次の通りです。"
+"<abbr title=\"structured query language\">SQL</abbr> "
+"クエリを読みやすくするために各要素の色定義に、この配列を使用します。色を定義するペア文字列の書式は次の通りです。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2278
@@ -6312,11 +6307,12 @@ msgstr "<b>alpha_reservedWord</b> その他の予約語に一致する識別子"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: orig-docs/Documentation.html:2302
-#, fuzzy
msgid ""
"<b>alpha_variable</b> Identifiers matching a <abbr title=\"structured query "
"language\">SQL</abbr> variable <tt>\"@foo\"</tt>"
-msgstr "<b>alpha_variable</b> SQL 変数 <tt>「 @foo 」</tt>に一致する識別子"
+msgstr ""
+"<b>alpha_variable</b> <abbr title=\"structured query language\">SQL</abbr> 変数 "
+"<tt>「 @foo 」</tt>に一致する識別子"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: orig-docs/Documentation.html:2303
@@ -6355,28 +6351,26 @@ msgstr "$cfg['SQLValidator']['use'] boolean"
#. type: Content of: <html><body><div><dl><dd><dl><dd>
#: orig-docs/Documentation.html:2313
-#, fuzzy
msgid ""
"phpMyAdmin now supports use of the <a href=\"http://developer.mimer.com/"
"validator/index.htm\">Mimer <abbr title=\"structured query language\">SQL</"
"abbr> Validator</a> service, as originally published on <a href=\"http://"
"developers.slashdot.org/article.pl?sid=02/02/19/1720246\">Slashdot</a>."
msgstr ""
-"phpMyAdmin は <a href=\"http://developer.mimer.com/validator/index.htm"
-"\">Mimer SQL Validator</a> サービスをサポートするようになりました。これは当"
-"初 <a href=\"http://developers.slashdot.org/article.pl?"
-"sid=02/02/19/1720246\">Slashdot</a> で公開されていたものです。"
+"phpMyAdmin は <a href=\"http://developer.mimer.com/validator/index.htm\">Mimer "
+"<abbr title=\"structured query language\">SQL</abbr> "
+"検証</a>サービスをサポートするようになりました。これは当初 <a href=\"http://developers.slashdot.org/arti"
+"cle.pl?sid=02/02/19/1720246\">Slashdot</a> で公開されていたものです。"
#. type: Content of: <html><body><div><dl><dd><dl><dd>
#: orig-docs/Documentation.html:2317
-#, fuzzy
msgid ""
"For help in setting up your system to use the service, see the <a href="
"\"#faqsqlvalidator\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> "
"6.14</a>."
msgstr ""
-"このサービスをお使いのシステムに設定する方法については、<a href="
-"\"#faqsqlvalidator\">FAQ 6.14</a> をご覧ください。"
+"このサービスをお使いのシステムに設定する方法については、<a href=\"#faqsqlvalidator\"><abbr "
+"title=\"よくある質問\">FAQ</abbr> 6.14</a> をご覧ください。"
#. type: Content of: <html><body><div><dl><dd><dl><dt>
#: orig-docs/Documentation.html:2321
@@ -6394,17 +6388,15 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><dl><dd>
#: orig-docs/Documentation.html:2323
-#, fuzzy
msgid ""
"The SOAP service allows you to log in with <tt>anonymous</tt> and any "
"password, so we use those by default. Instead, if you have an account with "
"them, you can put your login details here, and it will be used in place of "
"the anonymous login."
msgstr ""
-"SOAP サービスを使うと <tt>anonymous</tt> (匿名)ユーザでもパスワードによらず"
-"ログインできるため、デフォルトではそのようになっていますが、SQL Validator の"
-"アカウントがあるなら、ログイン情報をここに記入すると、匿名でログインするかわ"
-"りにその情報でログインするようになります。"
+"SOAP サービスを使うと <tt>anonymous</tt> "
+"(匿名)ユーザでパスワードによらずログインできるため、デフォルトではそのようになっています。SQL "
+"検証のアカウントをお持ちであれば、ログイン情報をここに記入することで、匿名でログインする代わりにその情報でログインするようになります。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2330
@@ -6426,7 +6418,7 @@ msgstr "$cfg['DBG']['sql'] boolean"
msgid ""
"Enable logging queries and execution times to be displayed in the bottom of "
"main page (right frame)."
-msgstr ""
+msgstr "メインページ(右フレーム)の下部に、クエリと実行時間の表示を有効にします。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2338
@@ -6490,14 +6482,14 @@ msgstr "$cfg['RestrictFunctions'] 配列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2355
-#, fuzzy
msgid ""
"Functions preferred for column meta types as defined in <a href="
"\"#cfg_RestrictColumnTypes\" class=\"configrule\">$cfg['RestrictColumnTypes']"
"</a>. In most cases you don't need to edit this."
msgstr ""
-"<code>$cfg['RestrictColumnTypes']</code> で定義されたカラムのメタ種別が利用す"
-"る関数一覧です。ほとんどの場合、この値を修正する必要はありません。"
+"<a href=\"#cfg_RestrictColumnTypes\" "
+"class=\"configrule\">$cfg['RestrictColumnTypes']</a> "
+"で定義されたカラムのメタ種別が利用する関数一覧です。ほとんどの場合、この値を修正する必要はありません。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2359
@@ -6506,7 +6498,6 @@ msgstr "$cfg['DefaultFunctions'] 配列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2360
-#, fuzzy
msgid ""
"Functions selected by default when inserting/changing row, Functions are "
"defined for meta types from <a href=\"#cfg_RestrictColumnTypes\" class="
@@ -6514,10 +6505,10 @@ msgid ""
"<code>first_timestamp</code>, which is used for first timestamp column in "
"table."
msgstr ""
-"行を挿入/修正するときにデフォルトで選択される関数です。この関数は <code>$cfg"
-"['RestrictColumnTypes']</code> のメタ種別ごとに定義します。"
-"<code>first_timestamp</code> については、テーブル内の最初の timestamp カラム"
-"に適用されます。"
+"行を挿入/修正するときにデフォルトで選択される関数です。この関数は <a href=\"#cfg_RestrictColumnTypes\" "
+"class=\"configrule\">$cfg['RestrictColumnTypes']</a> "
+"のメタ種別ごとに定義します。<code>first_timestamp</code> については、テーブル内の最初の timestamp "
+"カラムに適用されます。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2366
@@ -6536,15 +6527,13 @@ msgstr "$cfg['TextOperators'] 配列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:2371
-#, fuzzy
msgid ""
"Operators available for search operations on character columns. Note that "
"we put <code>LIKE</code> by default instead of <code>LIKE %...%</code>, to "
"avoid unintended performance problems in case of huge tables."
msgstr ""
-"文字フィールドの検索に利用できる演算子です。 なお、デフォルトは <code>LIKE "
-"%...%</code> ではなく <code>LIKE</code> としてあります。これはテーブルが巨大"
-"な場合に不用意にパフォーマンスの問題を起こさないようにするためです。"
+"文字カラムの検索に利用できる演算子です。 なお、デフォルトは <code>LIKE %...%</code> ではなく "
+"<code>LIKE</code> としてあります。これはテーブルが巨大な場合に不用意にパフォーマンスの問題を起こさないようにするためです。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2376
@@ -6566,7 +6555,7 @@ msgstr "$cfg['NullOperators'] 配列"
msgid ""
"Additional operators available for search operations when the column can be "
"null."
-msgstr "カラムがヌル (null) になりうるときに利用できる追加の検索用演算子です。"
+msgstr "カラムが NULL になりうるときに利用できる追加の検索用演算子です。"
#. type: Content of: <html><body><div><h2>
#: orig-docs/Documentation.html:2386
@@ -6616,7 +6605,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2403
-#, fuzzy
msgid ""
"Say you have a column 'filename' which contains a filename. Normally you "
"would see in phpMyAdmin only this filename. Using transformations you can "
@@ -6626,24 +6614,21 @@ msgid ""
"strings to append/prepend to a string or the format you want the output "
"stored in."
msgstr ""
-"たとえば、ファイル名を入れる「filename」というフィールドがあるとします。ふつ"
-"う phpMyAdmin ではこのファイル名しか表示されませんが、変換機能を使うと、この"
-"ファイル名を HTML リンクに変換できます。phpMyAdmin システムの内部でそのフィー"
-"ルドのリンクをクリックすると、新しいブラウザウインドウにそのファイルが表示さ"
-"れます。変換オプションを使えば、その文字列の前後に付け加える文字列や、出力を"
+"たとえば、ファイル名を入れる「filename」というカラムがあるとします。ふつう phpMyAdmin "
+"ではこのファイル名しか表示されませんが、変換機能を使うと、このファイル名を HTML リンクに変換できます。phpMyAdmin システムの内部でそのカ"
+"ラムのリンクをクリックすると、新しいブラウザウインドウにそのファイルが表示されます。変換オプションを使えば、その文字列の前後に付け加える文字列や、出力を"
"保存する形式も指定できます。"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2410
-#, fuzzy
msgid ""
"For a general overview of all available transformations and their options, "
"you can consult your <i><www.your-host.com>/<your-install-dir>/"
"transformation_overview.php</i> installation."
msgstr ""
-"利用できるすべての変換機能とそのオプションについての概略は <i><お使いのホ"
-"スト>/<インストールしたディレクトリ>/libraries/transformations/"
-"overview.php</i> をご覧ください。"
+"利用できるすべての変換機能とそのオプションについての概略は "
+"<i><お使いのホスト>/<インストールしたディレクトリ>/transformation_overview.php</i> "
+"をご覧ください。"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2415
@@ -6663,7 +6648,6 @@ msgstr "2. 使い方"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2421
-#, fuzzy
msgid ""
"Go to your <i>tbl_structure.php</i> page (i.e. reached through clicking on "
"the 'Structure' link for a table). There click on "Change" (or "
@@ -6671,25 +6655,19 @@ msgid ""
"They are called 'MIME-type', 'Browser transformation' and 'Transformation "
"options'."
msgstr ""
-"<i>tbl_properties.inc.php</i> ページに行きます(テーブルの「プロパティ"
-"(properties)」リンクをクリックしていけばたどり着きます)。「修正"
-"(Change)」(あるいは修正アイコン)をクリックすると、行末に新しいフィールド"
-"が 3 つ表示されます。それぞれ「MIME タイプ(MIME-type)」、「ブラウザ変換"
-"(Browser transformation)」、「変換オプション(Transformation options)」と"
-"いう名がついています。"
+"<i>tbl_structure.php</i> ページに行きます(テーブルの「構造」リンクをクリックでたどり着きます)。「変更」(あるいは変更アイコン"
+")をクリックすると、項目の最後の方に新しいフィールドが 3 つ表示されます。それぞれ「MIME "
+"タイプ」、「ブラウザ変換」、「変換オプション」という名がついています。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:2428
-#, fuzzy
msgid ""
"The field 'MIME-type' is a drop-down field. Select the MIME-type that "
"corresponds to the column's contents. Please note that transformations are "
"inactive as long as no MIME-type is selected."
msgstr ""
-"「MIME タイプ(MIME-type)」フィールドはドロップダウンになっています。選択肢"
-"としては、フィールドを空にしておくか、「auto」にできます[この機能はまだ実装さ"
-"れていません]。ご注意ください。MIME タイプ(MIME-type)を選択しないと変換機能"
-"は有効になりません。"
+"「MIME タイプ」フィールドはドロップダウンになっています。カラムの内容に対応した MIME タイプを選択してください。なお、MIME "
+"タイプを選択しないと変換機能は有効になりませんので注意ください。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:2432
@@ -6835,7 +6813,7 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2485
msgid "There are 5 possible file names:"
-msgstr "ファイル名には 5 通りの可能性があります:"
+msgstr "ファイル名には 5 通りの可能性があります。"
#. type: Content of: <html><body><div><ol><li>
#: orig-docs/Documentation.html:2487
@@ -7255,7 +7233,6 @@ msgstr "<a href=\"#faq1_3\">1.3 (該当しなくなったため取り下げ)。<
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2653
-#, fuzzy
msgid ""
"<a href=\"#faq1_4\">1.4 Using phpMyAdmin on <abbr title=\"Internet "
"Information Services\">IIS</abbr>, I'm displayed the error message: ""
@@ -7263,22 +7240,24 @@ msgid ""
"application misbehaved by not returning a complete set of <abbr title="
"\"HyperText Transfer Protocol\">HTTP</abbr> headers ...".</a>"
msgstr ""
-"[<a href=\"#faq1_4\">1.4</a>] phpMyAdmin を IIS 上で使うと、「The specified "
-"CGI application misbehaved by not returning a complete set of HTTP headers..."
-"(指定した CGI にはエラーがあります。HTTP ヘッダが不完全です)」というエラー"
-"メッセージが表示されます。"
+"<a href=\"#faq1_4\">1.4 phpMyAdmin を <abbr title=\"Internet Information "
+"Services\">IIS</abbr> 上で使うと、「The specified <abbr title=\"Common Gateway "
+"Interface\">CGI</abbr> application misbehaved by not returning a complete set "
+"of <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> headers ...(指定した "
+"<abbr title=\"Common Gateway Interface\">CGI</abbr> にはエラーがあります。<abbr "
+"title=\"HyperText Transfer Protocol\">HTTP</abbr> "
+"ヘッダが不完全です。)」というエラーメッセージが表示されます。</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2660
-#, fuzzy
msgid ""
"You just forgot to read the <i>install.txt</i> file from the php "
"distribution. Have a look at the last message in this <a href=\"http://bugs."
"php.net/bug.php?id=12061\">bug report</a> from the official PHP bug database."
msgstr ""
-"php の配布ファイルに入っている <i>install.txt</i> を読み忘れたのでしょう。こ"
-"ちらの<a href=\"http://bugs.php.net/bug.php?id=12061\">バグレポート</a>の最後"
-"のメッセージをご覧ください。出典は PHP のオフィシャルバグデータベースです。"
+"PHP の配布ファイルに入っている <i>install.txt</i> を読み忘れたのでしょう。こちらの<a "
+"href=\"http://bugs.php.net/bug.php?id=12061\">バグレポート</a>の最後のメッセージをご覧ください。出典は "
+"PHP のオフィシャルバグデータベースです。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2666
@@ -7317,7 +7296,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2679
-#, fuzzy
msgid ""
"This seems to be a PWS bug. Filippo Simoncini found a workaround (at this "
"time there is no better fix): remove or comment the <tt>DOCTYPE</tt> "
@@ -7325,10 +7303,10 @@ msgid ""
"<i>libraries/header_printview.inc.php</i>, <i>index.php</i>, <i>navigation."
"php</i> and <i>libraries/common.lib.php</i>."
msgstr ""
-"PWS のバグのようです。Filippo Simoncini が回避策を見つけています(現時点では"
-"これ以上の対応策はありません)。<i>header.inc.php</i>、<i>header_printview."
-"inc.php</i>、<i>index.php</i>、<i>left.php</i>、<i>libraries/common.lib.php</"
-"i> の <tt>DOCTYPE</tt> 宣言(2 行)を削除するか、コメントにしてください。"
+"PWS のバグのようです。Filippo Simoncini が次に述べる回避策を見つけています(現時点ではこれ以上の対応策はありません)。<i>lib"
+"raries/header.inc.php</i>、<i>libraries/header_printview.inc.php</i>、<i>index"
+".php</i>、<i>navigation.php</i>、<i>libraries/common.lib.php</i> の "
+"<tt>DOCTYPE</tt> 宣言(2 行)を削除するかコメントにしてください。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2686
@@ -7379,9 +7357,8 @@ msgid ""
"We recommend the following setup for Apache servers running in safe mode, to "
"enable uploads of files while being reasonably secure:"
msgstr ""
-"Apache サーバをセーフモードで走らせる場合は次のようにセットアップすることをお"
-"すすめします。こうすると、ファイルのアップロードを可能にしながらある程度のセ"
-"キュリティも確保できます:"
+"Apache サーバをセーフモードで走らせる場合は次のようにセットアップすることをお勧めします。こうすると、ファイルのアップロードを可能にしながらある程"
+"度のセキュリティも確保できます。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:2705
@@ -7461,7 +7438,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2732
-#, fuzzy
msgid ""
"Since version 2.2.4, phpMyAdmin supports servers with open_basedir "
"restrictions. However you need to create temporary directory and configure "
@@ -7469,12 +7445,11 @@ msgid ""
"The uploaded files will be moved there, and after execution of your <abbr "
"title=\"structured query language\">SQL</abbr> commands, removed."
msgstr ""
-"バージョン 2.2.4 以降、phpMyAdmin はサーバの open_basedir 制限をサポートして"
-"います。この制限下でもカレントディレクトリ(「.」)にあるファイルが開けるよう"
-"なら、必要なのは phpMyAdmin をインストールしたディレクトリに「一時」ディレク"
-"トリを作って、パーミッションを 777 にし、phpMyAdmin のディレクトリと同じオー"
-"ナーにすることだけです。アップロードしたファイルはそこに移され、SQL コマンド"
-"の実行が終わったら削除されます。"
+"バージョン 2.2.4 以降、phpMyAdmin はサーバの open_basedir "
+"制限をサポートしています。しかしながら、一時ディレクトリを作成して、<a href=\"#cfg_TempDir\" "
+"class=\"configrule\">$cfg['TempDir']</a> "
+"にそのディレクトリを設定する必要があります。アップロードしたファイルはそこに移され、<abbr title=\"structured query "
+"language\">SQL</abbr> コマンドの実行が終わったら削除されます。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2739
@@ -8407,6 +8382,8 @@ msgid ""
"then my connection is redirected back to http. What can cause this behavior?"
"</a>"
msgstr ""
+"<a href=\"#faq1_39\">1.39 https を経由して接続すると、ログインすることはできますが、接続が http "
+"にリダイレクトされてしまいます。何が原因でこの現象が発生するのですか?</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:3104
@@ -8416,6 +8393,10 @@ msgid ""
"mod/mod_ssl.html#ssloptions\">http://httpd.apache.org/docs/2.0/mod/mod_ssl."
"html#ssloptions</a>."
msgstr ""
+"Apache の設定で <tt>SSLOptions</tt> と <tt>StdEnvVars</tt> "
+"が有効になっていることを確認してください。<a href=\"http://httpd.apache.org/docs/2.0/mod/mod_ssl.h"
+"tml#ssloptions\">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions"
+"</a>を参照してください。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:3108
@@ -8491,13 +8472,11 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:3135
-#, fuzzy
msgid ""
"<a href=\"#faq1_41\">1.41 When I view a database and ask to see its "
"privileges, I get an error about an unknown column.</a>"
msgstr ""
-"[<a href=\"#faq1_29\">1.29</a>] テーブルを作成したりフィールドを修正したりす"
-"ると、エラーが出てフィールドが複製されてしまいます。"
+"<a href=\"#faq1_41\">1.41 データベースを表示しその権限を参照しようとすると、未知のカラムに関するエラーが表示されます。</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:3138
@@ -8505,6 +8484,8 @@ msgid ""
"The MySQL server's privilege tables are not up to date, you need to run the "
"<tt>mysql_upgrade</tt> command on the server."
msgstr ""
+"MySQL サーバの権限テーブルが最新の状態にされていないません。サーバ上で <tt>mysql_upgrade</tt> "
+"コマンドを実行する必要があります。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:3145
@@ -8665,14 +8646,13 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:3202
-#, fuzzy
msgid ""
"Have also a look at the <a href=\"http://dev.mysql.com/doc/en/can-not-"
"connect-to-server.html\"> corresponding section of the MySQL documentation</"
"a>."
msgstr ""
-"また、<a href=\"http://www.mysql.com/doc/C/a/Can_not_connect_to_server.html"
-"\" target=\"_blank\">MySQL 文書の該当セクション</a>もご覧ください。"
+"また、<a href=\"http://dev.mysql.com/doc/refman/4.1/ja/can-not-connect-to-"
+"server.html\">MySQL ドキュメントの該当セクション</a>もご覧ください。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:3207
@@ -8913,7 +8893,7 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:3291
msgid "Here are a few points to check:"
-msgstr "確認すべき点はいくつかあります:"
+msgstr "確認すべき点はいくつかあります。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:3293
@@ -9036,7 +9016,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:3344
-#, fuzzy
msgid ""
"Compressed dumps are built in memory and because of this are limited to "
"php's memory limit. For GZip/BZip2 exports this can be overcome since 2.5.4 "
@@ -9045,11 +9024,10 @@ msgid ""
"this way, so if you need Zip files for larger dump, you have to use another "
"way."
msgstr ""
-"圧縮されたダンプがメモリ上に生成されるのが php のメモリ制限にひっかかる原因で"
-"す。GZip/BZip2 エクスポートについては 2.5.4 以降 <tt>$cfg['CompressOnFly']</"
-"tt> を使うとこの問題を克服できます(デフォルトで有効になっています)。Zip エ"
-"クスポートはオン・ザ・フライ生成できませんので、大きめのダンプの Zip ファイル"
-"が必要な場合、別の方法をとる必要があります。"
+"圧縮されたダンプがメモリ上に生成されるために、PHP のメモリ制限にひっかかるのが原因です。GZip/BZip2 エクスポートについては 2.5.4 "
+"以降 <a href=\"#cfg_CompressOnFly\" class=\"configrule\">$cfg['CompressOnFly']</a> "
+"(逐次圧縮)を使うとこの問題を克服できます(デフォルトで有効になっています)。Zip エクスポートではこの方法が行えませんので、大きめのダンプの "
+"Zip ファイルが必要な場合、別の方法をとる必要があります。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:3352
@@ -9219,7 +9197,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:3419
-#, fuzzy
msgid ""
"Due to a surrounding form-container (for multi-row delete checkboxes), no "
"nested forms can be put inside the table where phpMyAdmin displays the "
@@ -9231,15 +9208,12 @@ msgid ""
"effectively use transformations, see our <a href=\"http://www.phpmyadmin.net/"
"home_page/docs.php\">Link section</a> on the official phpMyAdmin-homepage."
msgstr ""
-"phpMyAdmin が結果を表示するテーブルは(複数列削除チェックボックス用の)フォー"
-"ムコンテナに囲まれているため、そのなかにネストするフォームを置くことはできま"
-"せん。ただし、tbl_row_delete.php を対象とした親フォームのコンテナはそのまま残"
-"して、そのなかに独自の入力要素のみ加えるようにすれば、どんなフォームでもテー"
-"ブルのなかに入れられます。送信用の input フィールドをカスタマイズするとフォー"
-"ムのデータは表示しているページに再送されますので、変換機能のなかで "
-"$HTTP_POST_VARS を有効にしてください。 変換機能の効果的な使い方のチュートリア"
-"ルについては phpMyAdmin のオフィシャルホームページの <a href=\"http://www."
-"phpmyadmin.net/home_page/docs.php\">Link セクション</a>をご覧ください。"
+"phpMyAdmin が結果を表示するテーブルは(複数列削除チェックボックス用の)フォームコンテナに囲まれているため、その中に入れ子にするフォームを置く"
+"ことはできません。ただし、tbl_row_delete.php "
+"を対象とした親フォームのコンテナはそのまま残して、その中に独自の入力要素のみ加えるようにすれば、どんなフォームでもテーブルの中に入れられます。送信用の "
+"input フィールドをカスタマイズするとフォームのデータは表示しているページに再送されますので、変換機能のなかで $HTTP_POST_VARS "
+"を有効にしてください。 変換機能の効果的な使い方のチュートリアルについては phpMyAdmin のオフィシャルホームページの <a "
+"href=\"http://www.phpmyadmin.net/home_page/docs.php\">Link セクション</a>をご覧ください。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:3432
@@ -13117,11 +13091,9 @@ msgid ""
"text, images, and other information typically located on a web page at a "
"website on the World Wide Web."
msgstr ""
-"<a href=\"http://ja.wikipedia.org/wiki/"
-"%E3%82%A6%E3%82%A7%E3%83%96%E3%83%96%E3%83%A9%E3%82%A6%E3%82%B6\">ブラウザ"
-"(ウェブブラウザ)</a> - World Wide Web 上の Web サイトで Web ページに一般的"
-"に置かれているテキスト、画像、その他の情報をユーザに対して表示や双方向通信す"
-"ることができるアプリケーション"
+"<a href=\"http://ja.wikipedia.org/wiki/%E3%82%A6%E3%82%A7%E3%83%96%E3%83%96%"
+"E3%83%A9%E3%82%A6%E3%82%B6\">ブラウザ(ウェブブラウザ)</a> - World Wide Web "
+"上のウェブサイトでウェブページに一般的に置かれているテキスト、画像、その他の情報をユーザに対して表示や双方向通信することができるアプリケーション"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5000
@@ -13141,10 +13113,9 @@ msgid ""
"</a> - an important World Wide Web technology that enables a client web "
"browser to request data from a program executed on the Web server."
msgstr ""
-"<a href=\"http://ja.wikipedia.org/wiki/Common_Gateway_Interface\">CGI "
-"(Common Gateway Interface)</a> - Web サーバー上で実行されるプログラムでクライ"
-"アントの Web ブラウザのデータを要求に応えることができる重要な World Wide Web "
-"技術"
+"<a href=\"http://ja.wikipedia.org/wiki/Common_Gateway_Interface\">CGI (Common "
+"Gateway Interface)</a> - "
+"ウェブサーバー上で実行されるプログラムでクライアントのウェブブラウザのデータを要求に応えることができる重要な World Wide Web 技術"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5006
@@ -13280,7 +13251,7 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5038
msgid "GD2 - look at <a href=\"#gd\">GD Graphics Library</a>."
-msgstr "GD2 - → <a href=\"#gd\">GD Graphics Library</a>"
+msgstr "GD2 - → <a href=\"#gd\">GD グラフィックライブラリ</a>"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5039
@@ -13572,10 +13543,9 @@ msgid ""
"used mainly for developing server-side applications and dynamic web content, "
"and more recently, a broader range of software applications."
msgstr ""
-"<a href=\"http://ja.wikipedia.org/wiki/PHP:_Hypertext_Preprocessor\">PHP</a> "
-"- 「PHP: Hypertext Preprocessor」の略称。オープンソース。主にサーバ側のアプリ"
-"ケーション開発と動的な Web コンテンツのために使用されるリフレクションプログラ"
-"ミング言語。最近では、ソフトウェアアプリケーションの広い範囲で使われている。"
+"<a href=\"http://ja.wikipedia.org/wiki/PHP:_Hypertext_Preprocessor\">PHP</a> - "
+"「PHP: Hypertext Preprocessor」の略称。オープンソース。主にサーバ側のアプリケーション開発と動的なウェブコンテンツのために使"
+"用されるリフレクションプログラミング言語。最近では、ソフトウェアアプリケーションの広い範囲で使われている。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5114
@@ -13724,9 +13694,9 @@ msgid ""
"computer (program) that is responsible for accepting HTTP requests from "
"clients and serving them Web pages."
msgstr ""
-"<a href=\"http://ja.wikipedia.org/wiki/Web%E3%82%B5%E3%83%BC%E3%83%90\">ウェ"
-"ブサーバ</a> - クライアントからの HTTP 要求の受け入れおよびそれらに対する "
-"Web ページの提供を行っているコンピュータ(プログラム)"
+"<a href=\"http://ja.wikipedia.org/wiki/Web%E3%82%B5%E3%83%BC%E3%83%"
+"90\">ウェブサーバ</a> - クライアントからの HTTP "
+"要求の受け入れおよびそれらに対するウェブページの提供を行っているコンピュータ(プログラム)"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5154
@@ -13910,7 +13880,7 @@ msgstr "バージョン @@VER@@"
#. type: Plain text
#: orig-docs/README:7
msgid "A set of PHP-scripts to manage MySQL over the web."
-msgstr "Web 上で MySQL を管理することができる PHP プログラムです。"
+msgstr "ウェブ上で MySQL を管理することができる PHP プログラムです。"
#. type: Plain text
#: orig-docs/README:9
@@ -13986,8 +13956,8 @@ msgid ""
"phpMyAdmin is intended to handle the administration of MySQL over the web. "
"For a summary of features, please see the Documentation.txt/.html file."
msgstr ""
-"phpMyAdmin は Web 上で MySQL の管理を処理するためのものです。機能の概要につい"
-"ては、Documentation.txt/.html ファイルをご覧ください。"
+"phpMyAdmin はウェブ上で MySQL の管理を処理するためのものです。機能の概要については、Documentation.txt/.html "
+"ファイルをご覧ください。"
#. type: Title -
#: orig-docs/README:57
hooks/post-receive
--
phpMyAdmin localized documentation
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2916-g78b6f3d
by Michal Čihař 02 Jun '11
by Michal Čihař 02 Jun '11
02 Jun '11
The branch, master has been updated
via 78b6f3d6bade0c066f7a4916932c795b0eeaf471 (commit)
via d5f18d4e7f12fa656423b00594315e44ec1d82f7 (commit)
via 860250f02026360caf2291b27c8b51a0ca7e3cb2 (commit)
from 604c57631365736bdc8378b27f06d84c1855e5b6 (commit)
- Log -----------------------------------------------------------------
commit 78b6f3d6bade0c066f7a4916932c795b0eeaf471
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 11:43:12 2011 +0200
Mark directories as such in .gitignore
commit d5f18d4e7f12fa656423b00594315e44ec1d82f7
Merge: 604c57631365736bdc8378b27f06d84c1855e5b6 860250f02026360caf2291b27c8b51a0ca7e3cb2
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 11:41:31 2011 +0200
Merge branch 'integration'
Conflicts:
libraries/config/setup.forms.php
libraries/config/user_preferences.forms.php
commit 860250f02026360caf2291b27c8b51a0ca7e3cb2
Author: Rouslan Placella <rouslan(a)placella.com>
Date: Fri May 20 17:17:52 2011 +0100
Fix bug #3302961 - Row check boxes missing when table row links are disabled
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 14 +++---
Documentation.html | 10 ++--
js/sql.js | 2 +-
libraries/config.default.php | 18 ++----
libraries/config.values.php | 1 +
libraries/config/messages.inc.php | 5 +-
libraries/config/setup.forms.php | 3 +-
libraries/config/user_preferences.forms.php | 3 +-
libraries/display_tbl.lib.php | 77 ++++++++++++++++++---------
9 files changed, 75 insertions(+), 58 deletions(-)
diff --git a/.gitignore b/.gitignore
index b492910..dda2e0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,14 @@
# Directory for creating releases
-release
+/release/
# Configuration files
config.inc.php
config.header.inc.php
config.footer.inc.php
# Upload/save dirs
-upload
-save
+/upload/
+/save/
# For setup script
-config
+/config/
# ctags
tags
# Editor files
@@ -22,12 +22,12 @@ phpmyadmin.wpj
.idea
*.sw[op]
# Locales
-locale
+/locale/
# Backups
*~
# Javascript sources
-sources
+/sources/
# API documentation
-apidoc
+/apidoc/
# Demo server
revision-info.php
diff --git a/Documentation.html b/Documentation.html
index 2ff0881..ed6a5ca 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1934,14 +1934,12 @@ $cfg['TrustedProxies'] =
<dd>Maximum number of characters shown in any non-numeric field on browse view.
Can be turned off by a toggle button on the browse page.</dd>
- <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean
- <span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight'] </span>boolean
+ <dt><span id="cfg_RowActionLinks">$cfg['RowActionLinks'] </span>string
</dt>
<dd>Defines the place where table row links (Edit, Inline edit, Copy,
- Delete) would be put when
- tables contents are displayed (you may have them displayed both at the
- left and at the right).
- "Left" and "right" are parsed as "top"
+ Delete) would be put when tables contents are displayed (you may
+ have them displayed at the left side, right side, both sides or nowhere).
+ "left" and "right" are parsed as "top"
and "bottom" with vertical display mode.</dd>
<dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] string</dt>
diff --git a/js/sql.js b/js/sql.js
index 32a5bba..b334b5f 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -66,7 +66,7 @@ function appendInlineAnchor() {
if (disp_mode == 'vertical') {
// there can be one or two tr containing this class, depending
- // on the ModifyDeleteAtLeft and ModifyDeleteAtRight cfg parameters
+ // on the RowActionLinks cfg parameter
$('#table_results tr')
.find('.edit_row_anchor')
.removeClass('edit_row_anchor')
diff --git a/libraries/config.default.php b/libraries/config.default.php
index aa883d2..c804dcc 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2249,20 +2249,14 @@ $cfg['CharTextareaRows'] = 2;
$cfg['LimitChars'] = 50;
/**
- * show edit/delete links on left side of browse
- * (or at the top with vertical browse)
+ * Where to show the edit/inline_edit/delete links in browse mode
+ * Possible values are 'left', 'right', 'both' and 'none';
+ * which will be interpreted as 'top', 'bottom', 'both' and 'none'
+ * respectively for vertical display mode
*
- * @global boolean $cfg['ModifyDeleteAtLeft']
+ * @global string $cfg['RowActionLinks']
*/
-$cfg['ModifyDeleteAtLeft'] = true;
-
-/**
- * show edit/delete links on right side of browse
- * (or at the bottom with vertical browse)
- *
- * @global boolean $cfg['ModifyDeleteAtRight']
- */
-$cfg['ModifyDeleteAtRight'] = false;
+$cfg['RowActionLinks'] = 'left';
/**
* default display direction (horizontal|vertical|horizontalflipped)
diff --git a/libraries/config.values.php b/libraries/config.values.php
index d884e59..0e72064 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -44,6 +44,7 @@ $cfg_db['LeftFrameDBSeparator'] = 'short_string';
$cfg_db['LeftFrameTableSeparator'] = 'short_string';
$cfg_db['NavigationBarIconic'] = array(true => __('Yes'), false => __('No'), 'both' => __('Both'));
$cfg_db['Order'] = array('ASC', 'DESC', 'SMART');
+$cfg_db['RowActionLinks'] = array('none' => __('Nowhere'), 'left' => __('Left'), 'right' => __('Right'), 'both' => __('Both'));
$cfg_db['ProtectBinary'] = array(false, 'blob', 'all');
$cfg_db['DefaultDisplay'] = array('horizontal', 'vertical', 'horizontalflipped');
$cfg_db['CharEditing'] = array('input', 'textarea');
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 034214c..e76b52e 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -314,9 +314,8 @@ $strConfigMcryptDisableWarning_desc = __('Disable the default warning that is di
$strConfigMcryptDisableWarning_name = __('mcrypt warning');
$strConfigMemoryLimit_desc = __('The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)');
$strConfigMemoryLimit_name = __('Memory limit');
-$strConfigModifyDeleteAtLeft_desc = __('These are Edit, Inline edit, Copy and Delete links');
-$strConfigModifyDeleteAtLeft_name = __('Show table row links on left side');
-$strConfigModifyDeleteAtRight_name = __('Show table row links on right side');
+$strConfigRowActionLinks_desc = __('These are Edit, Inline edit, Copy and Delete links');
+$strConfigRowActionLinks_name = __('Where to show the table row links');
$strConfigNaturalOrder_desc = __('Use natural order for sorting table and database names');
$strConfigNaturalOrder_name = __('Natural order');
$strConfigNavigationBarIconic_desc = __('Use only icons, only text or both');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 5cf5111..0754091 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -199,8 +199,7 @@ $forms['Main_frame']['Browse'] = array(
'BrowseMarkerEnable',
'RepeatCells',
'LimitChars',
- 'ModifyDeleteAtLeft',
- 'ModifyDeleteAtRight',
+ 'RowActionLinks',
'DefaultDisplay',
'RememberSorting');
$forms['Main_frame']['Edit'] = array(
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 68619c9..003f508 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -109,8 +109,7 @@ $forms['Main_frame']['Browse'] = array(
'BrowseMarkerEnable',
'RepeatCells',
'LimitChars',
- 'ModifyDeleteAtLeft',
- 'ModifyDeleteAtRight',
+ 'RowActionLinks',
'DefaultDisplay',
'RememberSorting');
$forms['Main_frame']['Edit'] = array(
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index ca8041b..c9e04f3 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -661,7 +661,8 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... at the left column of the result table header if possible
// and required
- elseif ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && $is_display['text_btn'] == '1') {
+ elseif (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && $is_display['text_btn'] == '1') {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
@@ -677,7 +678,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
}
// ... elseif no button, displays empty(ies) col(s) if required
- elseif ($GLOBALS['cfg']['ModifyDeleteAtLeft']
+ elseif (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
&& ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')) {
$vertical_display['emptypre'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 0;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
@@ -691,6 +692,12 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
} // end vertical mode
}
+ // ... elseif display an empty column if the actions links are disabled to match the rest of the table
+ elseif ($GLOBALS['cfg']['RowActionLinks'] == 'none' && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ echo '<td></td>';
+ }
+
// 2. Displays the fields' name
// 2.0 If sorting links should be used, checks if the query is a "JOIN"
// statement (see 2.1.3)
@@ -912,9 +919,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 3. Displays the needed checkboxes at the right
// column of the result table header if possible and required...
- if ($GLOBALS['cfg']['ModifyDeleteAtRight']
- && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
- && $is_display['text_btn'] == '1') {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn')
+ && $is_display['text_btn'] == '1') {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 1;
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
@@ -933,7 +940,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// ... elseif no button, displays empty columns if required
// (unless coming from Browse mode print view)
- elseif ($GLOBALS['cfg']['ModifyDeleteAtRight']
+ elseif (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
&& ($is_display['edit_lnk'] == 'nn' && $is_display['del_lnk'] == 'nn')
&& (!$GLOBALS['is_header_sent'])) {
$vertical_display['emptyafter'] = ($is_display['edit_lnk'] != 'nn' && $is_display['del_lnk'] != 'nn') ? 4 : 1;
@@ -1249,13 +1256,20 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
} // end if (1.2.2)
// 1.3 Displays the links at left if required
- if ($GLOBALS['cfg']['ModifyDeleteAtLeft']
- && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
if (! isset($js_conf)) {
$js_conf = '';
}
echo PMA_generateCheckboxAndLinks('left', $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, 'l', $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf);
+ } else if (($GLOBALS['cfg']['RowActionLinks'] == 'none')
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ if (! isset($js_conf)) {
+ $js_conf = '';
+ }
+ echo PMA_generateCheckboxAndLinks('none', $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, 'l', $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf);
} // end if (1.3)
} // end if (1)
@@ -1465,13 +1479,13 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
} // end for (2)
// 3. Displays the modify/delete links on the right if required
- if ($GLOBALS['cfg']['ModifyDeleteAtRight']
- && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
- || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
- if (! isset($js_conf)) {
- $js_conf = '';
- }
- echo PMA_generateCheckboxAndLinks('right', $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, 'r', $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf);
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
+ || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) {
+ if (! isset($js_conf)) {
+ $js_conf = '';
+ }
+ echo PMA_generateCheckboxAndLinks('right', $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, 'r', $edit_url, $copy_url, $edit_anchor_class, $edit_str, $copy_str, $del_str, $js_conf);
} // end if (3)
if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal'
@@ -1551,15 +1565,19 @@ function PMA_displayVerticalTable()
global $vertical_display;
// Displays "multi row delete" link at top if required
- if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['row_delete']) && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] != 'right')
+ && is_array($vertical_display['row_delete']) && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
+ if ($GLOBALS['cfg']['RowActionLinks'] == 'none') {
+ // if we are not showing the RowActionLinks, then we need to show the Multi-Row-Action checkboxes
+ echo '<th></th>' . "\n";
+ }
echo $vertical_display['textbtn'];
$foo_counter = 0;
foreach ($vertical_display['row_delete'] as $val) {
if (($foo_counter != 0) && ($_SESSION['tmp_user_values']['repeat_cells'] != 0) && !($foo_counter % $_SESSION['tmp_user_values']['repeat_cells'])) {
echo '<th></th>' . "\n";
}
-
echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '_left', $val);
$foo_counter++;
} // end while
@@ -1567,7 +1585,8 @@ function PMA_displayVerticalTable()
} // end if
// Displays "edit" link at top if required
- if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1585,7 +1604,8 @@ function PMA_displayVerticalTable()
} // end if
// Displays "copy" link at top if required
- if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1603,7 +1623,8 @@ function PMA_displayVerticalTable()
} // end if
// Displays "delete" link at top if required
- if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'left' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1640,7 +1661,8 @@ function PMA_displayVerticalTable()
} // end while
// Displays "multi row delete" link at bottom if required
- if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['row_delete']) && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && is_array($vertical_display['row_delete']) && (count($vertical_display['row_delete']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
echo $vertical_display['textbtn'];
$foo_counter = 0;
@@ -1656,7 +1678,8 @@ function PMA_displayVerticalTable()
} // end if
// Displays "edit" link at bottom if required
- if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1674,7 +1697,8 @@ function PMA_displayVerticalTable()
} // end if
// Displays "copy" link at bottom if required
- if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -1692,7 +1716,8 @@ function PMA_displayVerticalTable()
} // end if
// Displays "delete" link at bottom if required
- if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
+ if (($GLOBALS['cfg']['RowActionLinks'] == 'right' || $GLOBALS['cfg']['RowActionLinks'] == 'both')
+ && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
@@ -2680,6 +2705,8 @@ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no,
$ret .= PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, '');
$ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_right', '', '', '');
+ } else { // $position == 'none'
+ $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_left', '', '', '');
}
return $ret;
}
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2913-g604c576
by Michal Čihař 02 Jun '11
by Michal Čihař 02 Jun '11
02 Jun '11
The branch, master has been updated
via 604c57631365736bdc8378b27f06d84c1855e5b6 (commit)
via fd6c41216dec3521cde053d3c3f14bc4edd878d6 (commit)
via 9b421d5c054fc7b09a8a2656a1bf9815f9340537 (commit)
via 80ce84d35731bfc0f54b365813eb89ec26777162 (commit)
via 8ce04eccc9b2f793dc3743b3ba115fb4dadfa4b7 (commit)
via 2e1e5175be119fd11a5461287f8b3f265b0e47ba (commit)
via ce8849c1c1fa7962bda7650c5d75e3ac4b761bd2 (commit)
via 73b2a3ba45368a0e3b0d34e7a0205e8c2c58adb4 (commit)
via 588b26e0ba37e0137694b6d94875959d21d70f3e (commit)
via 04891dd9f3bf768eef159a650d096199d0249493 (commit)
via 8aaa7796801f498760f3d3ed576c862b79d04154 (commit)
via 0186b3b2d490731b17a988ab12811abacdc55350 (commit)
from e41623789455b13994b044ad382b07bfc81dbf1c (commit)
- Log -----------------------------------------------------------------
commit 604c57631365736bdc8378b27f06d84c1855e5b6
Merge: e41623789455b13994b044ad382b07bfc81dbf1c fd6c41216dec3521cde053d3c3f14bc4edd878d6
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 10:34:48 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit fd6c41216dec3521cde053d3c3f14bc4edd878d6
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:34:34 2011 +0200
Translation update done using Pootle.
commit 9b421d5c054fc7b09a8a2656a1bf9815f9340537
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:34:09 2011 +0200
Translation update done using Pootle.
commit 80ce84d35731bfc0f54b365813eb89ec26777162
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:34:00 2011 +0200
Translation update done using Pootle.
commit 8ce04eccc9b2f793dc3743b3ba115fb4dadfa4b7
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:33:35 2011 +0200
Translation update done using Pootle.
commit 2e1e5175be119fd11a5461287f8b3f265b0e47ba
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:33:04 2011 +0200
Translation update done using Pootle.
commit ce8849c1c1fa7962bda7650c5d75e3ac4b761bd2
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:32:14 2011 +0200
Translation update done using Pootle.
commit 73b2a3ba45368a0e3b0d34e7a0205e8c2c58adb4
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:31:45 2011 +0200
Translation update done using Pootle.
commit 588b26e0ba37e0137694b6d94875959d21d70f3e
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:31:22 2011 +0200
Translation update done using Pootle.
commit 04891dd9f3bf768eef159a650d096199d0249493
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:30:59 2011 +0200
Translation update done using Pootle.
commit 8aaa7796801f498760f3d3ed576c862b79d04154
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:30:51 2011 +0200
Translation update done using Pootle.
commit 0186b3b2d490731b17a988ab12811abacdc55350
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Jun 2 10:30:35 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index fd23e47..6d44213 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-31 17:50+0200\n"
-"PO-Revision-Date: 2011-05-31 17:53+0200\n"
+"PO-Revision-Date: 2011-06-02 10:34+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -1615,10 +1615,9 @@ msgstr[1] "Vloženy %1$d řádky."
msgstr[2] "Vloženo %1$d řádek."
#: libraries/RecentTable.class.php:113
-#, fuzzy
#| msgid "Could not save configuration"
msgid "Could not save recent table"
-msgstr "Nepodařilo se uložit nastavení"
+msgstr "Nepodařilo se uložit nedávnou tabulku"
#: libraries/RecentTable.class.php:148
#| msgid "Count tables"
@@ -1626,10 +1625,9 @@ msgid "Recent tables"
msgstr "Nedávné tabulky"
#: libraries/RecentTable.class.php:154
-#, fuzzy
#| msgid "There are no configured servers"
msgid "There are no recent tables"
-msgstr "Žádné servery nejsou nastaveny"
+msgstr "Nebyly nalezeny žádné nedávné tabulky"
#: libraries/StorageEngine.class.php:194
msgid ""
@@ -1671,7 +1669,7 @@ msgstr "Tabulka %s byla přejmenována na %s"
#: libraries/Table.class.php:1250
msgid "Could not save table UI preferences"
-msgstr ""
+msgstr "Nepodařilo se uložit nastavení prohlížení tabulky"
#: libraries/Theme.class.php:160
#, php-format
@@ -3324,10 +3322,10 @@ msgid "Enable highlighting"
msgstr "Povolit zvýrazňování"
#: libraries/config/messages.inc.php:286
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Maximum number of recently used tables; set 0 to disable"
-msgstr "Nejvyšší počet tabulek zobrazených v seznamu tabulek"
+msgstr ""
+"Nejvyšší počet tabulek v seznamu nedávných tabulek; nastavte 0 pro vypnutí"
#: libraries/config/messages.inc.php:287
#| msgid "Untracked tables"
@@ -3619,7 +3617,7 @@ msgstr "Nástroje pro konverzi znakových sad"
#: libraries/config/messages.inc.php:349
msgid "When browsing tables, the sorting of each table is remembered"
-msgstr ""
+msgstr "Při procházení tabulek se pro každou uloží nastavené řazení"
#: libraries/config/messages.inc.php:350
#| msgid "Rename table to"
@@ -3902,7 +3900,6 @@ msgid "Server port"
msgstr "Port serveru"
#: libraries/config/messages.inc.php:408
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
@@ -3910,8 +3907,8 @@ msgid ""
"Leave blank for no \"persistent\" recently used tables across sessions, "
"suggested: [kbd]pma_recent[/kbd]"
msgstr ""
-"Nechte prázdné pro vypnutí podpory pro uživatelské nastavení v databázi, "
-"výchozí nastavení: [kbd]pma_config[/kbd]"
+"Nechte prázdné pro vypnutí \"trvalého\" ukládání nedávných tabulek, výchozí "
+"nastavení: [kbd]pma_recent[/kbd]"
#: libraries/config/messages.inc.php:409
#| msgid "Recall user name"
@@ -3995,7 +3992,6 @@ msgid "Display columns table"
msgstr "Tabulka s popisem polí"
#: libraries/config/messages.inc.php:425
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
@@ -4003,8 +3999,8 @@ msgid ""
"Leave blank for no \"persistent\" tables'UI preferences across sessions, "
"suggested: [kbd]pma_table_uiprefs[/kbd]"
msgstr ""
-"Nechte prázdné pro vypnutí podpory pro uživatelské nastavení v databázi, "
-"výchozí nastavení: [kbd]pma_config[/kbd]"
+"Nechte prázdné pro vypnutí podpory pro \"trvalé\" ukládání nastavení "
+"procházení tabulek, výchozí nastavení: [kbd]pma_uiprefs[/kbd]"
#: libraries/config/messages.inc.php:426
#| msgid "User preferences storage table"
@@ -6222,14 +6218,13 @@ msgid "SQL history"
msgstr "SQL historie"
#: libraries/relation.lib.php:143
-#, fuzzy
#| msgid "Persistent connections"
msgid "Persistent recently used tables"
-msgstr "Trvalé připojení"
+msgstr "Trvalé nedávné tabulky"
#: libraries/relation.lib.php:147
msgid "Persistent tables' UI preferences"
-msgstr ""
+msgstr "Trvalé nastavení procházení"
#: libraries/relation.lib.php:155
msgid "User preferences"
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2901-ge416237
by Michal Čihař 02 Jun '11
by Michal Čihař 02 Jun '11
02 Jun '11
The branch, master has been updated
via e41623789455b13994b044ad382b07bfc81dbf1c (commit)
via 465a223c5ed1c091c905a8b2a5c7efd58a175540 (commit)
via 8c1fbf450500a6903aab062c837139baf3a7296b (commit)
from f8f43dab23d11c00df88376709d39fed78287a00 (commit)
- Log -----------------------------------------------------------------
commit e41623789455b13994b044ad382b07bfc81dbf1c
Merge: f8f43dab23d11c00df88376709d39fed78287a00 465a223c5ed1c091c905a8b2a5c7efd58a175540
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 09:05:27 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1-40-g465a223
by Michal Čihař 02 Jun '11
by Michal Čihař 02 Jun '11
02 Jun '11
The branch, QA_3_4 has been updated
via 465a223c5ed1c091c905a8b2a5c7efd58a175540 (commit)
via 8c1fbf450500a6903aab062c837139baf3a7296b (commit)
from 8926cf025080a8123ca536f54e47d8fb51bacccd (commit)
- Log -----------------------------------------------------------------
commit 465a223c5ed1c091c905a8b2a5c7efd58a175540
Merge: 8926cf025080a8123ca536f54e47d8fb51bacccd 8c1fbf450500a6903aab062c837139baf3a7296b
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 09:04:55 2011 +0200
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
1
0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2911-gf8f43da
by Michal Čihař 02 Jun '11
by Michal Čihař 02 Jun '11
02 Jun '11
The branch, master has been updated
via f8f43dab23d11c00df88376709d39fed78287a00 (commit)
via a3dc3d670aa04365c226062f304fba1e6ae7fb04 (commit)
via 8926cf025080a8123ca536f54e47d8fb51bacccd (commit)
via c5074118f27326cc06ac2a03c5cbd526c6cf58c7 (commit)
via 8badf568791a7e6dd25e1efb53d7b97940910d7c (commit)
via a3c24963d29101b6adc6ab76c50a6a3281dec65f (commit)
via 1e512c92221a3b7573869a8497d2020ace9cb5c6 (commit)
via ddfd30f61789f211b9937b188466da54916046d3 (commit)
via faacc9f44a4c8f116033e69d1a86942e05eeeb9c (commit)
via 95ef694aa54295b681be23c8dfb632454320bf84 (commit)
via 9df02a2de1227dd70e1e677b05f298af85cbf5fe (commit)
via d0b2bbd79a4b726f7ec9d09f543c90a59df46649 (commit)
via 48e317bf9f17ce06383671dfc5148c7e1bf54dd4 (commit)
via 0a3eb585949118dc72efff0d2b2caaa7d2c691eb (commit)
via 110cd1d9510c83d58c4a011f2638722e9ca3c3d9 (commit)
via 37730336b5d9e9b38b41a2c72de0dd988ca4bbb8 (commit)
via bd57ae0518b17443a1f77b9efd7953b20469392d (commit)
via ca76ab6c4f7662e55eb7e49432609683222d112e (commit)
via 896d36bb1e411d4f0068ee1ff14f2f5df8ceb2dd (commit)
via 37fe0228a8841db4a9789f93151cd9ecc52875f1 (commit)
via c4907b50e7a79e06ffb1003e4da1db4b1dee719b (commit)
via ff106fb0c78a8b4db49e078be08b8af9299bcb4e (commit)
via 07e0cd4e9fa9d86611914ade7d0f36c3b39a43eb (commit)
via ef6adf8f41dd73115e4c4638e3618345fdd3751b (commit)
via 24a13cf47dd014a70c9dea0c4ca46c0663fc42c8 (commit)
via 81a7baccf7f44b9758de7611e0f42696757f97f1 (commit)
via 199ab87203a82659d3a96ded35ca2e7580f5dd9f (commit)
via 47491e2461c39c8e4d94fbdd81367c69abc060a1 (commit)
via 89f70fe0b517c2bc538d7eef5d085bb3cd4656d5 (commit)
via b4e24a2065f45b4b99c37fb3734e8899ca9f6123 (commit)
via 027bf5e7e7ffa8b3155f777d5d853e8bbd25309d (commit)
via f41cd5d1f715664ae73965dac2c50ee97b272a57 (commit)
via d1dde1c469078f2e8fd6962900bca23ccba70ed2 (commit)
via 134bc8f1b5e192d7b549ce72618aa9b73418f79e (commit)
via 18b0d2e30054d047f5e01a4881afb9732609a741 (commit)
via 6b7c4df3797453762e888b229fcdc21248c940d1 (commit)
via 0ed32976355395a3da36be8cdf8c37537ca9c221 (commit)
via 5e98e3d3d9ce30e910292799e6c4136ed5500781 (commit)
via 5b122953ac4f21adbc471ca498a88108002138c0 (commit)
via f6fb62e736678d8ae7bf5c307f7c05b8bdd66dc0 (commit)
via f0a12a3e5d52acfe7b5a9e3dbc71cf7c898f9ba5 (commit)
via 5bf6068c0fdb2410a14fa9b9f18070888d101c70 (commit)
via aa142ef6a26b1378fc939a905a862c7d00bea585 (commit)
via 602bc92ef974ea0d33c4eb6a3ef5202e15104d11 (commit)
via a30dc625abf4cbb4cc02ed8e48c470c368e70a6d (commit)
via 3d337a480e3c44860270fb7e5013a8b6a591c149 (commit)
via fa10b9aaabef972c2d8d8bf1a8f90bfc60eee710 (commit)
via 7ce5608725bf00addf5dc605e75ba7f46003f9d1 (commit)
via f4b6660b4798b9405216700012e6280b1b637a6f (commit)
via a8dab2952389d2298765ca6baaf413295fddea79 (commit)
via 90c3cebd90a754781ba600bd1b5f266ee381c337 (commit)
via d02ea9d7024e6224393793a712c7bae2af9199ac (commit)
via 96c62fdde5a7fc8940e4d1a228f0d7d8621ab546 (commit)
via 1ea7fbfdecae7d9561284eed2cbbc7e48e4d48aa (commit)
from d4892728458b6090a148f1f12dd41c4add336fb8 (commit)
- Log -----------------------------------------------------------------
commit f8f43dab23d11c00df88376709d39fed78287a00
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 08:39:57 2011 +0200
Merge missing translations from QA_3_4
commit a3dc3d670aa04365c226062f304fba1e6ae7fb04
Merge: a3c24963d29101b6adc6ab76c50a6a3281dec65f 8926cf025080a8123ca536f54e47d8fb51bacccd
Author: Michal Čihař <mcihar(a)novell.com>
Date: Thu Jun 2 08:38:08 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
commit a3c24963d29101b6adc6ab76c50a6a3281dec65f
Merge: 1e512c92221a3b7573869a8497d2020ace9cb5c6 d4892728458b6090a148f1f12dd41c4add336fb8
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Jun 2 02:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 1e512c92221a3b7573869a8497d2020ace9cb5c6
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:43:58 2011 +0200
Translation update done using Pootle.
commit ddfd30f61789f211b9937b188466da54916046d3
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:43:48 2011 +0200
Translation update done using Pootle.
commit faacc9f44a4c8f116033e69d1a86942e05eeeb9c
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:43:37 2011 +0200
Translation update done using Pootle.
commit 95ef694aa54295b681be23c8dfb632454320bf84
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:42:55 2011 +0200
Translation update done using Pootle.
commit 9df02a2de1227dd70e1e677b05f298af85cbf5fe
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:42:38 2011 +0200
Translation update done using Pootle.
commit d0b2bbd79a4b726f7ec9d09f543c90a59df46649
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:42:12 2011 +0200
Translation update done using Pootle.
commit 48e317bf9f17ce06383671dfc5148c7e1bf54dd4
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:42:05 2011 +0200
Translation update done using Pootle.
commit 0a3eb585949118dc72efff0d2b2caaa7d2c691eb
Author: Domen <dbc334(a)gmail.com>
Date: Wed Jun 1 23:42:00 2011 +0200
Translation update done using Pootle.
commit 110cd1d9510c83d58c4a011f2638722e9ca3c3d9
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:34:27 2011 +0200
Translation update done using Pootle.
commit 37730336b5d9e9b38b41a2c72de0dd988ca4bbb8
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:34:02 2011 +0200
Translation update done using Pootle.
commit bd57ae0518b17443a1f77b9efd7953b20469392d
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:32:43 2011 +0200
Translation update done using Pootle.
commit ca76ab6c4f7662e55eb7e49432609683222d112e
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:31:35 2011 +0200
Translation update done using Pootle.
commit 896d36bb1e411d4f0068ee1ff14f2f5df8ceb2dd
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:31:17 2011 +0200
Translation update done using Pootle.
commit 37fe0228a8841db4a9789f93151cd9ecc52875f1
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:29:56 2011 +0200
Translation update done using Pootle.
commit c4907b50e7a79e06ffb1003e4da1db4b1dee719b
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:26:39 2011 +0200
Translation update done using Pootle.
commit ff106fb0c78a8b4db49e078be08b8af9299bcb4e
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:26:16 2011 +0200
Translation update done using Pootle.
commit 07e0cd4e9fa9d86611914ade7d0f36c3b39a43eb
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:25:34 2011 +0200
Translation update done using Pootle.
commit ef6adf8f41dd73115e4c4638e3618345fdd3751b
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:24:53 2011 +0200
Translation update done using Pootle.
commit 24a13cf47dd014a70c9dea0c4ca46c0663fc42c8
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:23:57 2011 +0200
Translation update done using Pootle.
commit 81a7baccf7f44b9758de7611e0f42696757f97f1
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:23:46 2011 +0200
Translation update done using Pootle.
commit 199ab87203a82659d3a96ded35ca2e7580f5dd9f
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:23:26 2011 +0200
Translation update done using Pootle.
commit 47491e2461c39c8e4d94fbdd81367c69abc060a1
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:23:14 2011 +0200
Translation update done using Pootle.
commit 89f70fe0b517c2bc538d7eef5d085bb3cd4656d5
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:22:54 2011 +0200
Translation update done using Pootle.
commit b4e24a2065f45b4b99c37fb3734e8899ca9f6123
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:22:37 2011 +0200
Translation update done using Pootle.
commit 027bf5e7e7ffa8b3155f777d5d853e8bbd25309d
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:22:15 2011 +0200
Translation update done using Pootle.
commit f41cd5d1f715664ae73965dac2c50ee97b272a57
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:20:48 2011 +0200
Translation update done using Pootle.
commit d1dde1c469078f2e8fd6962900bca23ccba70ed2
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:20:28 2011 +0200
Translation update done using Pootle.
commit 134bc8f1b5e192d7b549ce72618aa9b73418f79e
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:16:26 2011 +0200
Translation update done using Pootle.
commit 18b0d2e30054d047f5e01a4881afb9732609a741
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:16:04 2011 +0200
Translation update done using Pootle.
commit 6b7c4df3797453762e888b229fcdc21248c940d1
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:15:01 2011 +0200
Translation update done using Pootle.
commit 0ed32976355395a3da36be8cdf8c37537ca9c221
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:14:42 2011 +0200
Translation update done using Pootle.
commit 5e98e3d3d9ce30e910292799e6c4136ed5500781
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:13:21 2011 +0200
Translation update done using Pootle.
commit 5b122953ac4f21adbc471ca498a88108002138c0
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:11:46 2011 +0200
Translation update done using Pootle.
commit f6fb62e736678d8ae7bf5c307f7c05b8bdd66dc0
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:11:10 2011 +0200
Translation update done using Pootle.
commit f0a12a3e5d52acfe7b5a9e3dbc71cf7c898f9ba5
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:10:25 2011 +0200
Translation update done using Pootle.
commit 5bf6068c0fdb2410a14fa9b9f18070888d101c70
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:08:40 2011 +0200
Translation update done using Pootle.
commit aa142ef6a26b1378fc939a905a862c7d00bea585
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:08:02 2011 +0200
Translation update done using Pootle.
commit 602bc92ef974ea0d33c4eb6a3ef5202e15104d11
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:05:52 2011 +0200
Translation update done using Pootle.
commit a30dc625abf4cbb4cc02ed8e48c470c368e70a6d
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:03:56 2011 +0200
Translation update done using Pootle.
commit 3d337a480e3c44860270fb7e5013a8b6a591c149
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:03:37 2011 +0200
Translation update done using Pootle.
commit fa10b9aaabef972c2d8d8bf1a8f90bfc60eee710
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:03:14 2011 +0200
Translation update done using Pootle.
commit 7ce5608725bf00addf5dc605e75ba7f46003f9d1
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:02:56 2011 +0200
Translation update done using Pootle.
commit f4b6660b4798b9405216700012e6280b1b637a6f
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:02:38 2011 +0200
Translation update done using Pootle.
commit a8dab2952389d2298765ca6baaf413295fddea79
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 22:00:09 2011 +0200
Translation update done using Pootle.
commit 90c3cebd90a754781ba600bd1b5f266ee381c337
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 21:59:06 2011 +0200
Translation update done using Pootle.
commit d02ea9d7024e6224393793a712c7bae2af9199ac
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 21:57:19 2011 +0200
Translation update done using Pootle.
commit 96c62fdde5a7fc8940e4d1a228f0d7d8621ab546
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 21:57:04 2011 +0200
Translation update done using Pootle.
commit 1ea7fbfdecae7d9561284eed2cbbc7e48e4d48aa
Author: Victor Volkov <hanut(a)php-myadmin.ru>
Date: Wed Jun 1 21:56:13 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/ru.po | 120 +--
po/sl.po | 26 +-
po/zh_TW.po | 3439 +++++++++++++++++++++++++++++------------------------------
3 files changed, 1741 insertions(+), 1844 deletions(-)
diff --git a/po/ru.po b/po/ru.po
index a4ca306..fe93587 100644
--- a/po/ru.po
+++ b/po/ru.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-05-31 17:50+0200\n"
-"PO-Revision-Date: 2011-03-13 21:17+0200\n"
+"PO-Revision-Date: 2011-06-01 22:34+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"
-"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"
+"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"
#: browse_foreigners.php:35 browse_foreigners.php:53
@@ -713,22 +713,19 @@ msgid "Analyze table"
msgstr "Анализ таблицы"
#: db_structure.php:521
-#, fuzzy
#| msgid "Go to table"
msgid "Add prefix to table"
-msgstr "Перейти к таблице"
+msgstr "Добавить префикс таблицы"
#: db_structure.php:523 libraries/mult_submits.inc.php:246
-#, fuzzy
#| msgid "Replace table data with file"
msgid "Replace table prefix"
-msgstr "Заместить данные таблицы данными из файла"
+msgstr "Заменить префикс таблицы"
#: db_structure.php:525 libraries/mult_submits.inc.php:246
-#, fuzzy
#| msgid "Replace table data with file"
msgid "Copy table with prefix"
-msgstr "Заместить данные таблицы данными из файла"
+msgstr "Копировать таблицу с префиксом"
#: db_structure.php:574 libraries/schema/User_Schema.class.php:387
msgid "Data Dictionary"
@@ -979,16 +976,14 @@ msgid "You are about to DESTROY a complete database!"
msgstr "База данных будет полностью УДАЛЕНА!"
#: js/messages.php:32
-#, fuzzy
#| msgid "You are about to DESTROY a complete database!"
msgid "You are about to DESTROY a complete table!"
-msgstr "База данных будет полностью УДАЛЕНА!"
+msgstr "Таблица будет полностью УДАЛЕНА!"
#: js/messages.php:33
-#, fuzzy
#| msgid "You are about to DESTROY a complete database!"
msgid "You are about to TRUNCATE a complete table!"
-msgstr "База данных будет полностью УДАЛЕНА!"
+msgstr "Таблица будет полностью ОЧИЩЕНА от данных!"
#: js/messages.php:34
msgid "Dropping Event"
@@ -1125,33 +1120,30 @@ msgid "Searching"
msgstr "Поиск"
#: js/messages.php:84
-#, fuzzy
#| msgid "Hide search criteria"
msgid "Hide search results"
-msgstr "Скрыть параметры поиска"
+msgstr "Скрыть результаты поиска"
#: js/messages.php:85
-#, fuzzy
#| msgid "Show search criteria"
msgid "Show search results"
-msgstr "Отобразить параметры поиска"
+msgstr "Отобразить результаты поиска"
#: js/messages.php:86
-#, fuzzy
#| msgid "Browse"
msgid "Browsing"
-msgstr "Обзор"
+msgstr "Просмотр"
#: js/messages.php:87
-#, fuzzy
#| msgid "Deleting %s"
msgid "Deleting"
-msgstr "Удаление %s"
+msgstr "Удаление"
#: js/messages.php:90
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
msgstr ""
+"Замечание: если файл содержит множество таблиц, они будут объединены в одну"
#: js/messages.php:93
msgid "Hide query box"
@@ -1223,6 +1215,8 @@ msgid ""
"You haven't saved the changes in the layout. They will be lost if you don't "
"save them.Do you want to continue?"
msgstr ""
+"Вы не сохранили изменения в раскладке. Без сохранения, они будут потеряны. "
+"Продолжить?"
#: js/messages.php:115
msgid "Add an option for column "
@@ -1259,10 +1253,9 @@ msgid ", latest stable version:"
msgstr ", последняя стабильная версия:"
#: js/messages.php:129
-#, fuzzy
#| msgid "Jump to database"
msgid "up to date"
-msgstr "Перейти к базе данных"
+msgstr "актуально"
#. l10n: Display text for calendar close link
#: js/messages.php:147
@@ -1638,22 +1631,19 @@ msgstr[1] "Добавлено %1$d строки."
msgstr[2] "Добавлено %1$d строк."
#: libraries/RecentTable.class.php:113
-#, fuzzy
#| msgid "Could not save configuration"
msgid "Could not save recent table"
-msgstr "Не получилось сохранить настройки"
+msgstr "Не удалось сохранить последнюю таблицу"
#: libraries/RecentTable.class.php:148
-#, fuzzy
#| msgid "Count tables"
msgid "Recent tables"
-msgstr "Подсчитывать таблицы"
+msgstr "Недавние таблицы"
#: libraries/RecentTable.class.php:154
-#, fuzzy
#| msgid "There are no configured servers"
msgid "There are no recent tables"
-msgstr "Отсутствуют настроенные сервера"
+msgstr "Отсутствуют недавние таблицы"
#: libraries/StorageEngine.class.php:194
msgid ""
@@ -1696,7 +1686,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
@@ -3362,16 +3352,16 @@ msgid "Enable highlighting"
msgstr "Включить подсветку"
#: libraries/config/messages.inc.php:286
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Maximum number of recently used tables; set 0 to disable"
-msgstr "Максимальное количество таблиц отображаемых в списке"
+msgstr ""
+"Максимальное количество недавно использованных таблиц; для отключения "
+"установить 0"
#: libraries/config/messages.inc.php:287
-#, fuzzy
#| msgid "Untracked tables"
msgid "Recently used tables"
-msgstr "Неотслеживаемые таблицы"
+msgstr "Недавно использованные таблицы"
#: libraries/config/messages.inc.php:288
msgid "Use less graphically intense tabs"
@@ -3666,13 +3656,12 @@ msgstr "Механизм перекодирования"
#: libraries/config/messages.inc.php:349
msgid "When browsing tables, the sorting of each table is remembered"
-msgstr ""
+msgstr "При просмотре таблиц, запоминается сортировка каждой таблицы"
#: libraries/config/messages.inc.php:350
-#, fuzzy
#| msgid "Rename table to"
msgid "Remember table's sorting"
-msgstr "Переименовать таблицу в"
+msgstr "Запоминать сортировку таблиц"
#: libraries/config/messages.inc.php:351
msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature"
@@ -3958,7 +3947,6 @@ msgid "Server port"
msgstr "Порт сервера"
#: libraries/config/messages.inc.php:408
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
@@ -3966,14 +3954,13 @@ msgid ""
"Leave blank for no \"persistent\" recently used tables across sessions, "
"suggested: [kbd]pma_recent[/kbd]"
msgstr ""
-"Для отключения возможности хранения пользовательских настроек в базе данных "
-"оставьте поле пустым. Рекомендуется: [kbd]pma_config[/kbd]"
+"Для отключения возможности просмотра недавно использованных таблиц, оставьте "
+"поле пустым. Рекомендуется: [kbd]pma_recent[/kbd]"
#: libraries/config/messages.inc.php:409
-#, fuzzy
#| msgid "Recall user name"
msgid "Recently used table"
-msgstr "Выводить имя пользователя"
+msgstr "Недавно использованная таблица"
#: libraries/config/messages.inc.php:410
msgid ""
@@ -4054,7 +4041,6 @@ msgid "Display columns table"
msgstr "Таблица с описаниями полей"
#: libraries/config/messages.inc.php:425
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
@@ -4062,14 +4048,13 @@ msgid ""
"Leave blank for no \"persistent\" tables'UI preferences across sessions, "
"suggested: [kbd]pma_table_uiprefs[/kbd]"
msgstr ""
-"Для отключения возможности хранения пользовательских настроек в базе данных "
-"оставьте поле пустым. Рекомендуется: [kbd]pma_config[/kbd]"
+"Для отключения возможности хранения настроек интерфейса таблиц, оставьте "
+"поле пустым. Рекомендуется: [kbd]pma_table_uiprefs[/kbd]"
#: libraries/config/messages.inc.php:426
-#, fuzzy
#| msgid "User preferences storage table"
msgid "UI preferences table"
-msgstr "Таблица хранения настроек пользователя"
+msgstr "Таблица хранения настроек интерфейса"
#: libraries/config/messages.inc.php:427
msgid ""
@@ -4719,10 +4704,9 @@ msgstr "Совместимо с MySQL 4.0"
#: libraries/display_create_database.lib.php:21
#: libraries/display_create_database.lib.php:39
-#, fuzzy
#| msgid "Create new database"
msgid "Create database"
-msgstr "Новая база данных"
+msgstr "Создать базу данных"
#: libraries/display_create_database.lib.php:33
msgid "Create"
@@ -6046,14 +6030,13 @@ msgid "Convert to Kana"
msgstr "Конвертировать в Кану"
#: libraries/mult_submits.inc.php:249
-#, fuzzy
#| msgid "Fr"
msgid "From"
-msgstr "Пт"
+msgstr "От"
#: libraries/mult_submits.inc.php:252
msgid "To"
-msgstr ""
+msgstr "До"
#: libraries/mult_submits.inc.php:257 libraries/mult_submits.inc.php:271
#: libraries/sql_query_form.lib.php:439
@@ -6062,13 +6045,12 @@ msgstr "Выполнить"
#: libraries/mult_submits.inc.php:263
msgid "Add table prefix"
-msgstr ""
+msgstr "Добавить префикс таблицы"
#: libraries/mult_submits.inc.php:266
-#, fuzzy
#| msgid "Add index"
msgid "Add prefix"
-msgstr "Добавить индекс"
+msgstr "Добавить префикс"
#: libraries/mult_submits.inc.php:477 tbl_replace.php:331
msgid "No change"
@@ -6327,14 +6309,13 @@ msgid "SQL history"
msgstr "История SQL-запросов"
#: libraries/relation.lib.php:143
-#, fuzzy
#| msgid "Persistent connections"
msgid "Persistent recently used tables"
-msgstr "Постоянные соединения"
+msgstr "Недавно использованные таблицы"
#: libraries/relation.lib.php:147
msgid "Persistent tables' UI preferences"
-msgstr ""
+msgstr "Настройки интерфейса часто используемых таблиц"
#: libraries/relation.lib.php:155
msgid "User preferences"
@@ -8130,7 +8111,7 @@ msgid "Unable to change master"
msgstr "Невозможно изменить головной сервер"
#: server_replication.php:72
-#, fuzzy, php-format
+#, php-format
#| msgid "Master server changed succesfully to %s"
msgid "Master server changed successfully to %s"
msgstr "Головной сервер успешно изменён на %s"
@@ -9301,16 +9282,18 @@ msgid "Insecure connection"
msgstr "Небезопасное соединение"
#: setup/frames/index.inc.php:92
-#, fuzzy
#| msgid "Configuration storage"
msgid "Configuration saved."
-msgstr "Хранение конфигурации"
+msgstr "Конфигурация сохранена."
#: setup/frames/index.inc.php:93
msgid ""
"Configuration saved to file config/config.inc.php in phpMyAdmin top level "
"directory, copy it to top level one and delete directory config to use it."
msgstr ""
+"Настройки сохранены в файл config/config.inc.php от корневого каталога "
+"phpMyAdmin, скопируйте его в корневой каталог и удалите после этого "
+"директорию config."
#: setup/frames/index.inc.php:100 setup/frames/menu.inc.php:15
msgid "Overview"
@@ -10177,22 +10160,19 @@ msgid "Version %s snapshot (SQL code)"
msgstr "Обзор версии %s (SQL код)"
#: tbl_tracking.php:382
-#, fuzzy
#| msgid "Track these data definition statements:"
msgid "Tracking data definition successfully deleted"
-msgstr "Отслеживать выражения определяющие структуру:"
+msgstr "Данные слежения успешно удалены"
#: tbl_tracking.php:384 tbl_tracking.php:401
-#, fuzzy
#| msgid "Gather errors"
msgid "Query error"
-msgstr "Собирать ошибки"
+msgstr "Ошибка запроса"
#: tbl_tracking.php:399
-#, fuzzy
#| msgid "Track these data manipulation statements:"
msgid "Tracking data manipulation successfully deleted"
-msgstr "Отслеживать выражения изменяющие данные:"
+msgstr "Данные слежения успешно удалены"
#: tbl_tracking.php:411
msgid "Tracking statements"
@@ -10204,16 +10184,14 @@ msgid "Show %s with dates from %s to %s by user %s %s"
msgstr "Вывести %s с датой от %s до %s пользователя %s %s"
#: tbl_tracking.php:432
-#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data row from report"
-msgstr "Удалить данные слежения за таблицей"
+msgstr "Удалить строку данных слежения за таблицей"
#: tbl_tracking.php:443
-#, fuzzy
#| msgid "No databases"
msgid "No data"
-msgstr "Базы данных отсутствуют"
+msgstr "Нет данных"
#: tbl_tracking.php:453 tbl_tracking.php:510
msgid "Date"
diff --git a/po/sl.po b/po/sl.po
index 9bc6dfe..9813c60 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-05-31 17:50+0200\n"
-"PO-Revision-Date: 2011-05-27 22:35+0200\n"
+"PO-Revision-Date: 2011-06-01 23:43+0200\n"
"Last-Translator: Domen <dbc334(a)gmail.com>\n"
"Language-Team: slovenian <sl(a)li.org>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"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
@@ -1619,22 +1619,19 @@ msgstr[2] "Vstavljene so %1$d vrstice."
msgstr[3] "Vstavljenih je %1$d vrstic."
#: libraries/RecentTable.class.php:113
-#, fuzzy
#| msgid "Could not save configuration"
msgid "Could not save recent table"
-msgstr "Ne morem shraniti konfiguracije"
+msgstr "Ne morem shraniti nedavne tabele"
#: libraries/RecentTable.class.php:148
-#, fuzzy
#| msgid "Count tables"
msgid "Recent tables"
-msgstr "Preštej tabele"
+msgstr "Nedavne tabele"
#: libraries/RecentTable.class.php:154
-#, fuzzy
#| msgid "There are no configured servers"
msgid "There are no recent tables"
-msgstr "Ni konfiguriranih strežnikov"
+msgstr "Ni nobenih nedavnih tabel"
#: libraries/StorageEngine.class.php:194
msgid ""
@@ -3340,10 +3337,9 @@ msgid "Maximum number of recently used "