The branch, master has been updated via 41d061ab0a627f6bdbff652c9db24cc5602f3b8c (commit) via f4d2f96e71c5c71b4f68cb139647888985371e5b (commit) via 6d28fe5faf02906f86b8b82f86283376858d7235 (commit) via 0c55b9ef2a4ca5ff72c7ec821fa9cd240112a1d8 (commit) via 318af17c653ae4401d3fd8555de55fd3a580bb1d (commit) via 93ea6cd618f59e92ffc6866e4b2b35768ab362c2 (commit) via 16332a1dd573a6c37adfa995450a1f397372b34a (commit) via 0115ff0e71093234da8547bb8aa26116c53b6762 (commit) via e24c45901afd26ea6ec50dad8151d1666f6769f8 (commit) via 365f8c80a383f6a72b5c240c25e4e58d8899b542 (commit) via 2fbd5e53074d80417bcfb3882ef9dc3530e34948 (commit) via a49dabe0989d55a2d0addee91bddb3d0d99666f5 (commit) via 695821f3d5acb1888f5a1eef3a0adaa374ea5e07 (commit) via c6afe0501372daa83f8fe3781bc55f3a44c112be (commit) via 24400a6f2745c4e9659901c4ce4fb12e0901fe57 (commit) via 1a7c24f999e16c4e1433f18b63a4dd31ffccc7a2 (commit) via 8567db0fd1fc4855082a98644ba1c6ef72d5bf1e (commit) via 592da54ec19a81a857b78ce1828f7797b52f44a3 (commit) from 1433b4c3319a58c05e46ed8aca851ef0f8b76266 (commit)

- Log ----------------------------------------------------------------- commit 41d061ab0a627f6bdbff652c9db24cc5602f3b8c Merge: 1433b4c f4d2f96 Author: Michal Čihař michal@cihar.com Date: Tue Aug 23 12:05:40 2011 +0200

Merge remote-tracking branch 'pootle/master'

commit f4d2f96e71c5c71b4f68cb139647888985371e5b Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 12:01:29 2011 +0200

Translation update done using Pootle.

commit 6d28fe5faf02906f86b8b82f86283376858d7235 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 12:01:05 2011 +0200

Translation update done using Pootle.

commit 0c55b9ef2a4ca5ff72c7ec821fa9cd240112a1d8 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 12:00:50 2011 +0200

Translation update done using Pootle.

commit 318af17c653ae4401d3fd8555de55fd3a580bb1d Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 12:00:41 2011 +0200

Translation update done using Pootle.

commit 93ea6cd618f59e92ffc6866e4b2b35768ab362c2 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:59:53 2011 +0200

Translation update done using Pootle.

commit 16332a1dd573a6c37adfa995450a1f397372b34a Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:51:26 2011 +0200

Translation update done using Pootle.

commit 0115ff0e71093234da8547bb8aa26116c53b6762 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:51:08 2011 +0200

Translation update done using Pootle.

commit e24c45901afd26ea6ec50dad8151d1666f6769f8 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:50:38 2011 +0200

Translation update done using Pootle.

commit 365f8c80a383f6a72b5c240c25e4e58d8899b542 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:49:25 2011 +0200

Translation update done using Pootle.

commit 2fbd5e53074d80417bcfb3882ef9dc3530e34948 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:47:08 2011 +0200

Translation update done using Pootle.

commit a49dabe0989d55a2d0addee91bddb3d0d99666f5 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:45:47 2011 +0200

Translation update done using Pootle.

commit 695821f3d5acb1888f5a1eef3a0adaa374ea5e07 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:41:57 2011 +0200

Translation update done using Pootle.

commit c6afe0501372daa83f8fe3781bc55f3a44c112be Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:40:21 2011 +0200

Translation update done using Pootle.

commit 24400a6f2745c4e9659901c4ce4fb12e0901fe57 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:38:02 2011 +0200

Translation update done using Pootle.

commit 1a7c24f999e16c4e1433f18b63a4dd31ffccc7a2 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:32:16 2011 +0200

Translation update done using Pootle.

commit 8567db0fd1fc4855082a98644ba1c6ef72d5bf1e Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:31:08 2011 +0200

Translation update done using Pootle.

commit 592da54ec19a81a857b78ce1828f7797b52f44a3 Author: Yuichiro yuichiro@pop07.odn.ne.jp Date: Tue Aug 23 11:30:45 2011 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/ja.po | 40 ++++++++++++++++++---------------------- 1 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/po/ja.po b/po/ja.po index b4c9511..45c3ea9 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-08-23 11:03+0200\n" -"PO-Revision-Date: 2011-08-22 12:15+0200\n" +"PO-Revision-Date: 2011-08-23 12:01+0200\n" "Last-Translator: Yuichiro yuichiro@pop07.odn.ne.jp\n" "Language-Team: japanese jp@li.org\n" "Language: ja\n" @@ -868,24 +868,23 @@ msgstr "空間データ" #: gis_data_editor.php:172 gis_data_editor.php:194 gis_data_editor.php:240 #: gis_data_editor.php:290 js/messages.php:288 msgid "Point" -msgstr "" +msgstr "座標"

#: gis_data_editor.php:173 gis_data_editor.php:195 gis_data_editor.php:241 #: gis_data_editor.php:291 js/messages.php:286 msgid "X" -msgstr "" +msgstr "X"

#: gis_data_editor.php:175 gis_data_editor.php:197 gis_data_editor.php:243 #: gis_data_editor.php:293 js/messages.php:287 msgid "Y" -msgstr "" +msgstr "Y"

#: gis_data_editor.php:202 gis_data_editor.php:246 gis_data_editor.php:296 #: js/messages.php:294 -#, fuzzy #| msgid "Add routine" msgid "Add a point" -msgstr "ルーチンを追加する" +msgstr "座標を追加する"

#: gis_data_editor.php:218 js/messages.php:289 #, fuzzy @@ -1766,19 +1765,19 @@ msgstr "検索"

#: js/messages.php:264 msgid "Each point represents a data row." -msgstr "" +msgstr "プロット点は、それぞれの行のデータを表します。"

#: js/messages.php:266 msgid "Hovering over a point will show its label." -msgstr "" +msgstr "プロット点にマウスカーソルを重ねると、そのラベルが表示されます。"

#: js/messages.php:268 msgid "Use mousewheel to zoom in or out of the plot." -msgstr "" +msgstr "マウスホイールでズームの調整ができます。"

#: js/messages.php:270 msgid "Click and drag the mouse to navigate the plot." -msgstr "" +msgstr "ドラッグすることでプロットのスクロールが行えます。"

#: js/messages.php:272 msgid "Click reset zoom link to come back to original state." @@ -1786,25 +1785,24 @@ msgstr ""

#: js/messages.php:274 msgid "Click a data point to view and possibly edit the data row." -msgstr "" +msgstr "プロット点をクリックすることで、行のデータの閲覧と編集が可能です。"

#: js/messages.php:276 msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "" +msgstr "グラフの右下をドラッグすることで、大きさの調整が行えます。"

#: js/messages.php:278 msgid "Strings are converted into integer for plotting" -msgstr "" +msgstr "文字列データは、数値に変換されてからプロットされます。"

#: js/messages.php:280 -#, fuzzy #| msgid "Add/Delete columns" msgid "Select two columns" -msgstr "カラムを追加・削除する" +msgstr "カラムを 2 つ選択してください"

#: js/messages.php:281 msgid "Select two different columns" -msgstr "" +msgstr "異なるカラムを 2 つ選択してください"

#: js/messages.php:284 tbl_change.php:316 tbl_indexes.php:211 #: tbl_indexes.php:238 @@ -8023,10 +8021,9 @@ msgid "Table Search" msgstr "テーブル検索"

#: libraries/tbl_select.lib.php:208 tbl_change.php:993 -#, fuzzy #| msgid "Insert" msgid "Edit/Insert" -msgstr "挿入" +msgstr "編集／挿入"

#: libraries/transformations/application_octetstream__download.inc.php:10 msgid "" @@ -11275,7 +11272,7 @@ msgstr "行のサイズ "

#: tbl_printview.php:388 tbl_structure.php:900 msgid "Next autoindex" -msgstr "" +msgstr "次の自動付番"

#: tbl_relation.php:276 #, php-format @@ -11301,7 +11298,7 @@ msgstr "外部キー制約"

#: tbl_select.php:92 msgid "Do a "query by example" (wildcard: "%")" -msgstr ""query by example"を実行 (ワイルドカード: "%")" +msgstr "定型問い合わせ (ワイルドカード: "%")"

#: tbl_select.php:186 msgid "Select columns (at least one):" @@ -11569,10 +11566,9 @@ msgid "Create version" msgstr "バージョンを作成"

#: tbl_zoom_select.php:141 -#, fuzzy #| msgid "Do a "query by example" (wildcard: "%")" msgid "Do a "query by example" (wildcard: "%") for two different columns" -msgstr ""query by example"を実行 (ワイルドカード: "%")" +msgstr "異なる 2 つのカラムによる定型問い合わせ (ワイルドカード: "%")"

#: tbl_zoom_select.php:152 msgid "Additional search criteria"

hooks/post-receive