[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12887-gae1d967 - Git

4 Aug 2011

The branch, master has been updated
       via  ae1d967043caa926e1db8eafaa5e98ccca0c8f97 (commit)
       via  37d739f1566af5b890471cc6e69399b5226e1fef (commit)
       via  3ff348b7527e666f2e40cf5df4ff7456dcac9090 (commit)
       via  92cfe546dcb01f7c99dae990a38984454201b341 (commit)
       via  caa620e4798726bce6d198d934818d3fd8588f2c (commit)
       via  7dacff102481122a44e7185bcf3b8e1d0c1e667e (commit)
       via  025d97b562113203725a6c8a560032d36cf07a98 (commit)
       via  bfdd44ca03313058738989f78d1a8404be96257a (commit)
       via  255d7051c65af467a1b5557f3d220e2404129f8a (commit)
       via  de77bdd48d014d28392f39f3e3000c27f1d2b9ed (commit)
      from  95e90bbba40f90f183b659d8c2d5db5cdfc415d6 (commit)
- Log -----------------------------------------------------------------
commit ae1d967043caa926e1db8eafaa5e98ccca0c8f97
Merge: 37d739f1566af5b890471cc6e69399b5226e1fef 95e90bbba40f90f183b659d8c2d5db5cdfc415d6
Author: Pootle server pootle@cihar.com
Date:   Thu Aug 4 00:40:13 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 37d739f1566af5b890471cc6e69399b5226e1fef
Merge: 3ff348b7527e666f2e40cf5df4ff7456dcac9090 55c6eacf3e56da064dae69650480d84acd92d5a3
Author: Pootle server pootle@cihar.com
Date:   Wed Aug 3 22:40:08 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 3ff348b7527e666f2e40cf5df4ff7456dcac9090
Merge: 92cfe546dcb01f7c99dae990a38984454201b341 c1f586b9fdc399ddc2cf86faa5a5e05194afa2e5
Author: Pootle server pootle@cihar.com
Date:   Wed Aug 3 18:40:15 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 92cfe546dcb01f7c99dae990a38984454201b341
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Aug 3 12:39:06 2011 +0200
Translation update done using Pootle.
commit caa620e4798726bce6d198d934818d3fd8588f2c
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Aug 3 12:36:20 2011 +0200
Translation update done using Pootle.
commit 7dacff102481122a44e7185bcf3b8e1d0c1e667e
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Aug 3 12:32:40 2011 +0200
Translation update done using Pootle.
commit 025d97b562113203725a6c8a560032d36cf07a98
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Aug 3 12:26:33 2011 +0200
Translation update done using Pootle.
commit bfdd44ca03313058738989f78d1a8404be96257a
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Aug 3 12:20:28 2011 +0200
Translation update done using Pootle.
commit 255d7051c65af467a1b5557f3d220e2404129f8a
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Aug 3 12:04:23 2011 +0200
Translation update done using Pootle.
commit de77bdd48d014d28392f39f3e3000c27f1d2b9ed
Author: Yuichiro yuichiro@pop07.odn.ne.jp
Date:   Wed Aug 3 11:57:18 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/ja.po |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index a6d0479..97d14b9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-30 14:14-0400\n"
-"PO-Revision-Date: 2011-08-02 16:09+0200\n"
+"PO-Revision-Date: 2011-08-03 12:39+0200\n"
 "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n"
 "Language-Team: japanese jp@li.org\n"
 "Language: ja\n"
@@ -1321,6 +1321,8 @@ msgid ""
 "However only the SQL query itself has been used as a grouping criteria, so "
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
+"この列は、グループ化された同一のクエリの数を示しています。しかし、１つの SQL "
+"クエリをグループの基準として使用しています。そのため、開始時刻いったような属性は、他クエリでは異なる場合があります。"
#: js/messages.php:144
 msgid ""
@@ -1328,6 +1330,8 @@ msgid ""
 "same table are also being grouped together, disregarding of the inserted "
 "data."
 msgstr ""
+"INSERT クエリのグループ化が選択されています。そのため、同じテーブルへの INSERT "
+"クエリは挿入されたデータ部は同一のようにみなされて、グループ化が行われます。"
#: js/messages.php:145
 msgid "Log data loaded. Queries executed in this time span:"
@@ -1354,17 +1358,16 @@ msgstr "フィルタ"
#: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "単語／正規表現でクエリをフィルタ："
#: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr "クエリをまとめる（WHERE 句内のデータ部（文字列や数値など）は同一として扱われます）"
+msgstr "WHERE 句内のデータ部（文字列や数値など）は同一として扱いクエリをまとめる"
#: js/messages.php:156
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "挿入する行数"
+msgstr "グループ後の件数："
#: js/messages.php:157
 #| msgid "Total"
@@ -9938,7 +9941,7 @@ msgstr "SELECT、INSERT、UPDATE、DELETE 文のみ取得する"
#: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
-msgstr ""
+msgstr "結果を扱いやすくするために INSERT 文におけるデータ部を同一のように扱う"
#: server_status.php:1462
 msgid ""
@@ -9947,10 +9950,9 @@ msgid ""
 msgstr "<p>ログの統計元を選択することができます。</p>結果はクエリ文でグループ化されます。"
#: server_status.php:1465
-#, fuzzy
 #| msgid "Query type"
 msgid "Query analyzer"
-msgstr "クエリ種別"
+msgstr "クエリの解析"
#: server_status.php:1501
 #, php-format
hooks/post-receive
-- 
phpMyAdmin


    