The branch, master has been updated via 73a49f639ab87e671e5cc91fb7c9628a7a0b0d52 (commit) via 4bd819899d2ee765597b725d92ba7538d9d8fcc7 (commit) via d51634b117c02c090a9655a78b2526b6e18259e0 (commit) via 99f88e2148ebeb61a36c930c836fe2c7cb424b1e (commit) via 2a90b350b12cef76d571bfd0b2c218cfaef9a6f0 (commit) via 1f3d0eeaab7b3d801539b3b62ca244aaa2837faf (commit) via ec4008260020ad81685139dae03dfb5c9fd4dbd8 (commit) via 92a433f183150e98548d17af2055db87edb8ccb8 (commit) via f9247ae0fa0a0bd0b70bd8cc0446a72e38c83f03 (commit) via d0a65741ff3c1b4e371685fb78e6832feb49e683 (commit) via ddebf9934cae6f72fae00ecc7c5bc5dc39a5f561 (commit) via 2f1a57b4cb733c7eff6ec6c75297a19a3a03c4ce (commit) via 52c3201d9b0d69a03286afa4196a107f76cb59fb (commit) via 39c625c2c811d22ba206437c7179426adc9913b2 (commit) from ccfd008f52f18cb92279650ebd24c49a484d91d3 (commit)
- Log ----------------------------------------------------------------- commit 73a49f639ab87e671e5cc91fb7c9628a7a0b0d52 Merge: ccfd008f52f18cb92279650ebd24c49a484d91d3 4bd819899d2ee765597b725d92ba7538d9d8fcc7 Author: Michal Čihař mcihar@suse.cz Date: Fri Jun 17 14:13:36 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/ja.po
commit 4bd819899d2ee765597b725d92ba7538d9d8fcc7 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:46:29 2011 +0200
Translation update done using Pootle.
commit d51634b117c02c090a9655a78b2526b6e18259e0 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:36:18 2011 +0200
Translation update done using Pootle.
commit 99f88e2148ebeb61a36c930c836fe2c7cb424b1e Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:29:32 2011 +0200
Translation update done using Pootle.
commit 2a90b350b12cef76d571bfd0b2c218cfaef9a6f0 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:29:06 2011 +0200
Translation update done using Pootle.
commit 1f3d0eeaab7b3d801539b3b62ca244aaa2837faf Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:28:32 2011 +0200
Translation update done using Pootle.
commit ec4008260020ad81685139dae03dfb5c9fd4dbd8 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:28:07 2011 +0200
Translation update done using Pootle.
commit 92a433f183150e98548d17af2055db87edb8ccb8 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:27:46 2011 +0200
Translation update done using Pootle.
commit f9247ae0fa0a0bd0b70bd8cc0446a72e38c83f03 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:27:08 2011 +0200
Translation update done using Pootle.
commit d0a65741ff3c1b4e371685fb78e6832feb49e683 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:26:49 2011 +0200
Translation update done using Pootle.
commit ddebf9934cae6f72fae00ecc7c5bc5dc39a5f561 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:26:43 2011 +0200
Translation update done using Pootle.
commit 2f1a57b4cb733c7eff6ec6c75297a19a3a03c4ce Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:25:44 2011 +0200
Translation update done using Pootle.
commit 52c3201d9b0d69a03286afa4196a107f76cb59fb Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:22:35 2011 +0200
Translation update done using Pootle.
commit 39c625c2c811d22ba206437c7179426adc9913b2 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Fri Jun 17 12:22:26 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ja.po | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/po/ja.po b/po/ja.po index 31d3d5e..e147c04 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-06-17 10:58+0200\n" -"PO-Revision-Date: 2011-06-15 12:47+0200\n" +"PO-Revision-Date: 2011-06-17 12:46+0200\n" "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n" "Language-Team: japanese jp@li.org\n" "Language: ja\n" @@ -1061,17 +1061,16 @@ msgstr "リアルタイムでのトラフィックグラフ"
#: js/messages.php:67 server_status.php:419 msgid "Live conn./process chart" -msgstr "" +msgstr "リアルタイムでの接続／プロセスグラフ"
#: js/messages.php:68 server_status.php:438 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "クエリをグラフで表示" +msgstr "リアルタイムでのクエリグラフ"
#: js/messages.php:70 msgid "Static data" -msgstr "" +msgstr "統計データ"
#. l10n: Total number of queries #: js/messages.php:72 libraries/build_html_for_db.lib.php:45 @@ -1105,10 +1104,9 @@ msgid "kB received since last refresh" msgstr ""
#: js/messages.php:82 -#, fuzzy #| msgid "Server traffic" msgid "Server traffic (in kB)" -msgstr "サーバのトラフィック" +msgstr "サーバのトラフィック（単位：kB）"
#: js/messages.php:83 msgid "Connections since last refresh" @@ -1119,10 +1117,9 @@ msgid "Processes" msgstr "プロセス"
#: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "接続" +msgstr "接続／プロセス"
#: js/messages.php:86 msgid "Issued queries since last refresh" @@ -2169,7 +2166,7 @@ msgstr "先頭" #: libraries/display_tbl.lib.php:308 server_binlog.php:154 #: server_binlog.php:156 msgid "Previous" -msgstr "前" +msgstr "前へ"
#: libraries/common.lib.php:2310 libraries/common.lib.php:2313 #: libraries/display_tbl.lib.php:387 @@ -3496,9 +3493,7 @@ msgid "" "Number of rows displayed when browsing a result set. If the result set " "contains more rows, "Previous" and "Next" links will be " "shown." -msgstr "" -"結果セットの表示行数。結果セットの行数の方が多い場合は「前（Previous）／次" -"（Next）」のリンクが表示されます。" +msgstr "結果セットの表示行数。結果セットの行数の方が多い場合は「前へ／次へ」のリンクが表示されます。"
#: libraries/config/messages.inc.php:311 msgid "Maximum number of rows to display" @@ -8197,14 +8192,14 @@ msgid "Refresh rate" msgstr "再描画間隔"
#: server_status.php:31 -#, fuzzy, php-format +#, php-format #| msgid "minutes" msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "分"
#: server_status.php:33 -#, fuzzy, php-format +#, php-format #| msgid "second" msgid "%d second" msgid_plural "%d seconds" @@ -8291,7 +8286,7 @@ msgstr "全ての状態変数"
#: server_status.php:455 msgid "Containing the word:" -msgstr "含まれている文字：" +msgstr "含まれている文字:"
#: server_status.php:460 msgid "Show only alert values" @@ -8327,12 +8322,12 @@ msgstr "クエリ種別" #. l10n: # = Amount of queries #: server_status.php:554 msgid "#" -msgstr "" +msgstr "クエリ数"
#: server_status.php:618 #, php-format msgid "Network traffic since startup: %s" -msgstr "起動してからのネットワークトラフィック：%s" +msgstr "起動以後のネットワークトラフィック：%s"
#: server_status.php:626 #, php-format @@ -8875,9 +8870,8 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" -"クエリキャッシュ内の空きメモリのブロック数。この値が高い場合は 断片化が起こっ" -"ていることを示しています。FLUSH QUERY CACHE 文を発行することによって解決でき" -"るかもしれません。" +"クエリキャッシュ内の空きメモリのブロック数。この値が高い場合は 断片化が起こっていることを示しています。FLUSH QUERY CACHE " +"文を発行することによって解消されるかもしれません。"
#: server_status.php:930 msgid "The amount of free memory for query cache."
hooks/post-receive