From a7fd33a23af5f390e4a5d9753c8236b6cda10f7b Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Wed, 29 Feb 2012 18:12:29 +0100
Subject: Resync translation files.

---
 po/ja.po | 85 ++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 37 deletions(-)

(limited to 'po/ja.po')

diff --git a/po/ja.po b/po/ja.po
index 67792cc..a6f7567 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,19 +13,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
 
-#: bin/quilt.in:32
+#: bin/quilt.in:36
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "使い方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 
-#: bin/quilt.in:33
+#: bin/quilt.in:37
 msgid "       quilt --version"
 msgstr "       quilt --version"
 
-#: bin/quilt.in:35
+#: bin/quilt.in:39
 msgid "Commands are:"
 msgstr "コマンド一覧:"
 
-#: bin/quilt.in:40
+#: bin/quilt.in:44
 msgid ""
 "\n"
 "Global options:\n"
@@ -178,7 +178,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "次のパッチはありません\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:617
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:583
 msgid "Patch %s is currently applied\\n"
 msgstr "パッチ %s は現在適用されています\\n"
 
@@ -319,7 +319,7 @@ msgstr ""
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397
+#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
@@ -710,16 +710,18 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n"
 
 #: quilt/mail.in:24
+#, fuzzy
 msgid ""
-"Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
-"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
-"[--reply-to message] [first_patch [last_patch]]\\n"
+"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
+"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
+"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
 msgstr ""
 "使い方: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
 "sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
 "[--reply-to message] [first_patch [last_patch]]\\n"
 
 #: quilt/mail.in:27
+#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from a specified range of patches, or all patches in\n"
@@ -734,6 +736,9 @@ msgid ""
 "\tused, the editor will not be invoked, and the patches will be\n"
 "\tprocessed immediately.\n"
 "\n"
+"-M file\n"
+"\tLike the -m option, but read the introduction from file.\n"
+"\n"
 "--prefix prefix\n"
 "\tUse an alternate prefix in the bracketed part of the subjects\n"
 "\tgenerated. Defaults to \\`patch'.\n"
@@ -802,33 +807,33 @@ msgstr ""
 "--reply-to メッセージ\n"
 "\t指定されたメッセージへのリプライとなるように、適切なヘッダを追加。\n"
 
-#: quilt/mail.in:285
+#: quilt/mail.in:302
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n"
 "を使用してください。"
 
-#: quilt/mail.in:425
+#: quilt/mail.in:446
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "%s から件名を取り出せません。\\n"
 
-#: quilt/mail.in:449
+#: quilt/mail.in:470
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "パッチ %s の件名が重複しています。\\n"
 
-#: quilt/mail.in:458
+#: quilt/mail.in:479
 msgid "File %s does not exist\\n"
 msgstr "ファイル %s が存在しません\\n"
 
-#: quilt/mail.in:518
+#: quilt/mail.in:539
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr "序文に件名がありません(%s として保存されました)\\n"
 
-#: quilt/mail.in:521
+#: quilt/mail.in:542
 msgid "Introduction has no subject header\\n"
 msgstr "序文に件名がありません\\n"
 
-#: quilt/mail.in:624
+#: quilt/mail.in:654
 msgid "Introduction saved as %s\\n"
 msgstr "序文は %s という名前で保存されました\\n"
 
@@ -837,10 +842,12 @@ msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n"
 msgstr "使い方: quilt new [-p n | -p ab] {パッチ名}\\n"
 
 #: quilt/new.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Create a new patch with the specified file name, and insert it after the\n"
-"topmost patch.\n"
+"topmost patch. The name can be prefixed with a sub-directory name, allowing\n"
+"for grouping related patches together.\n"
 "\n"
 "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n"
 "\n"
@@ -870,22 +877,26 @@ msgstr ""
 "たディレクトリより上のディレクトリを Quilt が間違って選んでしまった場\n"
 "合は、正しい場所に %s ディレクトリを作成すること。\n"
 
-#: quilt/new.in:75
+#: quilt/new.in:76
 msgid ""
 "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n"
 msgstr ""
 "-p%s でパッチを作成することができません。-p0、-p1 または -pab を指定してくだ"
 "さい\\n"
 
-#: quilt/new.in:90 quilt/refresh.in:185
+#: quilt/new.in:89
+msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n"
+msgstr ""
+
+#: quilt/new.in:97 quilt/refresh.in:185
 msgid "Patch %s exists already\\n"
 msgstr "パッチ %s は、すでに存在します\\n"
 
-#: quilt/new.in:101 quilt/refresh.in:342
+#: quilt/new.in:108 quilt/refresh.in:342
 msgid "Failed to create patch %s\\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
 
-#: quilt/new.in:104
+#: quilt/new.in:111
 msgid "Patch %s is now on top\\n"
 msgstr "パッチ %s を最上位にしました\\n"
 
@@ -969,11 +980,11 @@ msgstr ""
 "\n"
 "-v\t詳細に表示。\n"
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:919
+#: quilt/pop.in:100 quilt/scripts/patchfns.in:886
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
-#: quilt/pop.in:116 quilt/scripts/patchfns.in:937
+#: quilt/pop.in:116 quilt/scripts/patchfns.in:904
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
@@ -999,7 +1010,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
 msgid "No patch removed\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop.in:261 quilt/scripts/patchfns.in:526
+#: quilt/pop.in:261 quilt/scripts/patchfns.in:492
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
@@ -1369,46 +1380,46 @@ msgstr "%s への変更(パッチ %s 内)を元に戻すことに失敗しまし
 msgid "Changes to %s in patch %s reverted\\n"
 msgstr "%s への変更 (パッチ %s 内) を元に戻しました"
 
-#: quilt/scripts/edmail.in:83
+#: quilt/scripts/edmail.in:96
 #, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
 msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます\n"
 
-#: quilt/scripts/edmail.in:101
+#: quilt/scripts/edmail.in:114
 #, perl-format
 msgid "Delivery address `%s' is invalid\n"
 msgstr "配送先のアドレス `%s' が不正です\n"
 
-#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539
+#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505
 msgid "%s is not a regular file\\n"
 msgstr "%s は普通のファイルではありません\\n"
 
-#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510
+#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476
 msgid "No patches in series\\n"
 msgstr "シリーズに登録されているパッチがありません\\n"
 
-#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512
+#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478
 msgid "No series file found\\n"
 msgstr "シリーズファイルが見つかりません\\n"
 
-#: quilt/scripts/patchfns.in:568
+#: quilt/scripts/patchfns.in:534
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/scripts/patchfns.in:596
+#: quilt/scripts/patchfns.in:562
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
-#: quilt/scripts/patchfns.in:633
+#: quilt/scripts/patchfns.in:599
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
 
-#: quilt/scripts/patchfns.in:655
+#: quilt/scripts/patchfns.in:632
 msgid "Patch %s does not exist\\n"
 msgstr "パッチ %s が存在しません\\n"
 
-#: quilt/scripts/patchfns.in:978
+#: quilt/scripts/patchfns.in:945
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1420,7 +1431,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:1122
+#: quilt/scripts/patchfns.in:1089
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1536,11 +1547,11 @@ msgstr ""
 msgid "The -v option will show rpm's output\\n"
 msgstr "-vオプションを使って、rpmの出力を表示できます"
 
-#: quilt/setup.in:189
+#: quilt/setup.in:195
 msgid "File %s not found\\n"
 msgstr "ファイル %s が見つかりません"
 
-#: quilt/setup.in:192
+#: quilt/setup.in:198
 msgid "Unpacking archive %s\\n"
 msgstr "アーカイブ %s を展開しています\\n"
 
-- 
cgit