The branch, master has been updated via f4b86a21d0364e57db51a884904df36899a9702b (commit) via c36df906f0a02512904d1c066f902fc980df3659 (commit) via bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 (commit) via 2e6421038a300f153e48a8446f0b43f55a0b5e4e (commit) via 1657409d567c68adf9d8e8554e07ff819f001b2c (commit) via c3cd4aba622989f00399bc951bb90259925adfa8 (commit) via 44991badfc02064516b3f2fbe9699ca820e6a6c8 (commit) via 233092543b40e8094c084fe47a5ce0689e948928 (commit) via 2abffe5682209c8e5a75d3330f5980271fd0ad11 (commit) via 43f18b93cf531bf4e1390318cb8a96f153a80ede (commit) via 3c75861e5145b3323b039f7d3a16b8475d63a2c4 (commit) via 9d9c1fc90430cdd330707e973b5d6d729c1e339d (commit) from 8f262140fa95c1ed5d3279d05c9c07acac26423e (commit)
- Log ----------------------------------------------------------------- commit f4b86a21d0364e57db51a884904df36899a9702b Merge: 8f262140fa95c1ed5d3279d05c9c07acac26423e c36df906f0a02512904d1c066f902fc980df3659 Author: Michal Čihař mcihar@suse.cz Date: Tue Aug 2 16:51:07 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit c36df906f0a02512904d1c066f902fc980df3659 Merge: bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba Author: Pootle server pootle@cihar.com Date: Tue Aug 2 16:40:26 2011 +0200
Merge remote-tracking branch 'origin/master'
commit bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 16:09:12 2011 +0200
Translation update done using Pootle.
commit 2e6421038a300f153e48a8446f0b43f55a0b5e4e Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 16:08:30 2011 +0200
Translation update done using Pootle.
commit 1657409d567c68adf9d8e8554e07ff819f001b2c Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 16:08:01 2011 +0200
Translation update done using Pootle.
commit c3cd4aba622989f00399bc951bb90259925adfa8 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 16:06:47 2011 +0200
Translation update done using Pootle.
commit 44991badfc02064516b3f2fbe9699ca820e6a6c8 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 15:55:07 2011 +0200
Translation update done using Pootle.
commit 233092543b40e8094c084fe47a5ce0689e948928 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 15:54:54 2011 +0200
Translation update done using Pootle.
commit 2abffe5682209c8e5a75d3330f5980271fd0ad11 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 15:47:59 2011 +0200
Translation update done using Pootle.
commit 43f18b93cf531bf4e1390318cb8a96f153a80ede Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 15:46:46 2011 +0200
Translation update done using Pootle.
commit 3c75861e5145b3323b039f7d3a16b8475d63a2c4 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 15:45:17 2011 +0200
Translation update done using Pootle.
commit 9d9c1fc90430cdd330707e973b5d6d729c1e339d Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 2 15:43:18 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ja.po | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/po/ja.po b/po/ja.po index 902574b..a6d0479 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 12:41+0200\n" +"PO-Revision-Date: 2011-08-02 16:09+0200\n" "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n" "Language-Team: japanese jp@li.org\n" "Language: ja\n" @@ -1230,11 +1230,13 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log は有効になっていますが、サーバは %d " +"秒より長くかかるクエリだけをログに記録します。お使いのシステムによっては、long_query_time を 0～2 秒に設定したほうがいいでしょう。"
#: js/messages.php:121 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time は %d 秒に設定されています。"
#: js/messages.php:122 msgid "" @@ -1267,7 +1269,7 @@ msgstr "%s を無効にする" #: js/messages.php:130 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "long_query_time を %d 秒に設定する"
#: js/messages.php:131 msgid "" @@ -9780,10 +9782,9 @@ msgid "Start Monitor" msgstr "モニタ開始"
#: server_status.php:1328 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "はじめに" +msgstr "使用方法／セットアップ"
#: server_status.php:1332 msgid "Done rearranging/editing charts" @@ -9810,10 +9811,9 @@ msgid "Clear monitor config" msgstr "モニタ設定のクリア"
#: server_status.php:1363 -#, fuzzy #| msgid "Introduction" msgid "Monitor Instructions" -msgstr "はじめに" +msgstr "モニタの使用方法"
#: server_status.php:1364 #| msgid "" @@ -9833,7 +9833,7 @@ msgid "" msgstr "" "phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output " "を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log " -"を大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。" +"は大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。"
#: server_status.php:1371 msgid "" @@ -9923,10 +9923,9 @@ msgid "Loading logs" msgstr "ログの読み込み"
#: server_status.php:1448 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "統計を表示する" +msgstr "ログの統計"
#: server_status.php:1449 #| msgid "Select page" @@ -9945,7 +9944,7 @@ msgstr "" msgid "" "<p>Choose from which log you want the statistics to be generated from.</p> " "Results are grouped by query text." -msgstr "" +msgstr "<p>ログの統計元を選択することができます。</p>結果はクエリ文でグループ化されます。"
#: server_status.php:1465 #, fuzzy
hooks/post-receive