The branch, master has been updated via 64c50006c390630090eac92ec4caebda988f41d2 (commit) via 2191ca891e389790d11262ad06ca33eefde142b6 (commit) via 7932b5daa754d4dd943c37b286ba3cdfdd305577 (commit) via 07e1d3b2e13debc7b7954b9f236d6ec0c9c94e67 (commit) via a982873fc0416e1351b0c846c79f9f439611d1b6 (commit) via 8b7494307b84022d2d3cf45e460e3ffd268d2912 (commit) via 7c4e50ed5111301acebba6d0adfc11a9b80f9d6a (commit) via 91ce60621013f4837b68557584143458997e9d9f (commit) via bc0a48b83438e16539fc71a36b383b5bfff1cb4d (commit) via 52983a00fe039f70668672cc44975dce2474ff42 (commit) via e0f8fd5d41e48cca02f9be129c55afb1c589d664 (commit) via 6bce33cd54953024c6e4d27dd0c11a78598d50eb (commit) from a01662dd4ac363c6bb1663ac6b81d7e797114503 (commit)
- Log ----------------------------------------------------------------- commit 64c50006c390630090eac92ec4caebda988f41d2 Merge: 2191ca891e389790d11262ad06ca33eefde142b6 a01662dd4ac363c6bb1663ac6b81d7e797114503 Author: Pootle server pootle@cihar.com Date: Mon Jun 27 12:40:04 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 2191ca891e389790d11262ad06ca33eefde142b6 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 12:34:39 2011 +0200
Translation update done using Pootle.
commit 7932b5daa754d4dd943c37b286ba3cdfdd305577 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 12:32:36 2011 +0200
Translation update done using Pootle.
commit 07e1d3b2e13debc7b7954b9f236d6ec0c9c94e67 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 12:32:08 2011 +0200
Translation update done using Pootle.
commit a982873fc0416e1351b0c846c79f9f439611d1b6 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 12:28:40 2011 +0200
Translation update done using Pootle.
commit 8b7494307b84022d2d3cf45e460e3ffd268d2912 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 12:25:17 2011 +0200
Translation update done using Pootle.
commit 7c4e50ed5111301acebba6d0adfc11a9b80f9d6a Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 12:23:39 2011 +0200
Translation update done using Pootle.
commit 91ce60621013f4837b68557584143458997e9d9f Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 12:18:25 2011 +0200
Translation update done using Pootle.
commit bc0a48b83438e16539fc71a36b383b5bfff1cb4d Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 11:59:18 2011 +0200
Translation update done using Pootle.
commit 52983a00fe039f70668672cc44975dce2474ff42 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 11:59:08 2011 +0200
Translation update done using Pootle.
commit e0f8fd5d41e48cca02f9be129c55afb1c589d664 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 11:58:37 2011 +0200
Translation update done using Pootle.
commit 6bce33cd54953024c6e4d27dd0c11a78598d50eb Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Mon Jun 27 11:57:38 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/ja.po | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/po/ja.po b/po/ja.po index 7b1faa8..06b7204 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-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-23 12:13+0200\n" +"PO-Revision-Date: 2011-06-27 12:34+0200\n" "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n" "Language-Team: japanese jp@li.org\n" "Language: ja\n" @@ -521,10 +521,10 @@ msgstr "返り値が空でした(行数0)"
#: db_routines.php:192 db_routines.php:297 db_routines.php:302 #: db_routines.php:326 -#, fuzzy, php-format +#, php-format #| msgid "The following queries have been executed:" msgid "The following query has failed: "%s"" -msgstr "次のクエリが実行されます：" +msgstr "クエリの実行に失敗しました：『%s』"
#: db_routines.php:193 db_routines.php:298 db_routines.php:303 #: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:609 @@ -538,7 +538,7 @@ msgstr "要求処理中でのエラー"
#: db_routines.php:211 db_routines.php:243 db_routines.php:271 #: db_routines.php:410 -#, fuzzy, php-format +#, php-format #| msgid "No routine with name %s found in database %s" msgid "No routine with name %1$s found in database %2$s" msgstr "データベース %2$s に %1$s という名前のルーチンはありません" @@ -1304,7 +1304,7 @@ msgstr "削除中"
#: js/messages.php:122 msgid "The definition of a stored function must contain a RETURN statement!" -msgstr "" +msgstr "ストアドファンクションの定義には、RETURN 文を含めなければなりません！"
#: js/messages.php:123 msgid "Value too long in the form!" @@ -2082,10 +2082,9 @@ msgid "Check Privileges" msgstr "特権をチェックする"
#: libraries/common.inc.php:587 -#, fuzzy #| msgid "Could not save configuration" msgid "Failed to read configuration file" -msgstr "設定が保存できません" +msgstr "設定ファイルの読み込みに失敗しました"
#: libraries/common.inc.php:588 msgid "" @@ -4734,10 +4733,9 @@ msgid "Turn it off" msgstr ""
#: libraries/db_events.inc.php:141 -#, fuzzy #| msgid "Add a new Event" msgid "Add an event" -msgstr "新しいイベントを追加する" +msgstr "イベントを追加する"
#: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43 #: libraries/db_links.inc.php:44 @@ -4821,26 +4819,23 @@ msgid "Add parameter" msgstr "パラメータを追加する"
#: libraries/db_routines.lib.php:710 -#, fuzzy #| msgid "Remove database" msgid "Remove last parameter" -msgstr "データベースの削除" +msgstr "最後のパラメータを削除する"
#: libraries/db_routines.lib.php:715 libraries/db_routines.lib.php:1217 msgid "Return type" msgstr "返り値の種類"
#: libraries/db_routines.lib.php:721 -#, fuzzy #| msgid "Length/Values" msgid "Return length/values" -msgstr "長さ/値" +msgstr "返り値の長さ/値"
#: libraries/db_routines.lib.php:726 -#, fuzzy #| msgid "Table options" msgid "Return options" -msgstr "テーブルオプション" +msgstr "返り値のオプション"
#: libraries/db_routines.lib.php:745 msgid "Definition" @@ -5402,10 +5397,9 @@ msgid "Event" msgstr "イベント"
#: libraries/display_triggers.inc.php:120 -#, fuzzy #| msgid "Add a new Trigger" msgid "Add a trigger" -msgstr "新しいトリガを追加する" +msgstr "トリガを追加する"
#: libraries/engines/bdb.lib.php:20 main.php:211 msgid "Version information" @@ -7152,10 +7146,9 @@ msgid "PARTITION definition" msgstr "パーティションの定義"
#: libraries/tbl_properties.inc.php:776 -#, fuzzy #| msgid "+ Add a new value" msgid "+ Add a value" -msgstr "+ 新しい値を追加する" +msgstr "+ 値を追加する"
#: libraries/transformations/application_octetstream__download.inc.php:9 msgid "" @@ -9446,7 +9439,7 @@ msgstr ""
#: server_variables.php:58 msgid "Setting variable failed" -msgstr "" +msgstr "変数の設定に失敗しました"
#: server_variables.php:77 msgid "Server variables and settings"
hooks/post-receive