- Add --no-index option to diff and refresh commands: Suppress

  Index: lines in the patch. From Jean Delvare <khali@linux-fr.org>.

1 files changed, 35 insertions, 28 deletions

diff --git a/po/ja.po b/po/ja.po
index 747a8a7..2cfa993 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -72,22 +72,22 @@ msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n"
 
 #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76
-#: ../quilt/diff.in:155 ../quilt/diff.in:166 ../quilt/graph.in:116
+#: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116
 #: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62
-#: ../quilt/push.in:311 ../quilt/refresh.in:141 ../quilt/remove.in:53
+#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53
 #: ../quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: ../quilt/add.in:99 ../quilt/diff.in:231 ../quilt/graph.in:121
-#: ../quilt/pop.in:254 ../quilt/refresh.in:147 ../quilt/remove.in:74
+#: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121
+#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
-#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:239
+#: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247
 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72
 #: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349
-#: ../quilt/refresh.in:155 ../quilt/remove.in:81
+#: ../quilt/refresh.in:162 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
@@ -157,7 +157,8 @@ msgstr "パッチ %sを削除することに失敗しました。\\n"
 #, fuzzy
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
-"patch] [--snapshot] [--diff=utility] [--sort] [--color] [file ...]\\n"
+"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] "
+"[--color] [file ...]\\n"
 msgstr ""
 "使い方: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-"
 "P パッチ] [--snapshot] [--diff=utility] [--color] [ファイル ...]\\n"
@@ -180,6 +181,9 @@ msgid ""
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\n"
+"--no-index\n"
+"\tDo not output Index: lines.\n"
+"\n"
 "-z\tWrite to standard output the changes that have been made\n"
 "\trelative to the topmost or specified patch.\n"
 "\n"
@@ -242,48 +246,48 @@ msgstr ""
 "--color[=always|auto|never]\n"
 "\tシンタックスの色付け指定。\n"
 
-#: ../quilt/diff.in:223
+#: ../quilt/diff.in:231
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "オプション \\`-c patch'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n"
 
-#: ../quilt/diff.in:250
+#: ../quilt/diff.in:258
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n"
 
-#: ../quilt/diff.in:285 ../quilt/files.in:122
+#: ../quilt/diff.in:293 ../quilt/files.in:122
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
-#: ../quilt/diff.in:334
+#: ../quilt/diff.in:342
 msgid "Cannot change into directory %s\\n"
 msgstr "ディレクトリ %s に移動できません\\n"
 
-#: ../quilt/diff.in:341 ../quilt/pop.in:114
+#: ../quilt/diff.in:349 ../quilt/pop.in:114
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
-#: ../quilt/diff.in:352
+#: ../quilt/diff.in:360
 msgid "Cannot change to temporary directory\\n"
 msgstr "テンポラリディレクトリに移動できません\\n"
 
-#: ../quilt/diff.in:371 ../quilt/pop.in:138
+#: ../quilt/diff.in:379 ../quilt/pop.in:138
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
-#: ../quilt/diff.in:377
+#: ../quilt/diff.in:385
 msgid "Cannot change to source directory\\n"
 msgstr "ソースディレクトリに移動できません\\n"
 
-#: ../quilt/diff.in:395
+#: ../quilt/diff.in:403
 msgid "File %s is not being modified\\n"
 msgstr "ファイル %sは変更されていません\\n"
 
-#: ../quilt/diff.in:415 ../quilt/refresh.in:194
+#: ../quilt/diff.in:423 ../quilt/refresh.in:201
 msgid "Diff failed, aborting\\n"
 msgstr "差分に失敗しました。異常終了します\\n"
 
-#: ../quilt/diff.in:422
+#: ../quilt/diff.in:430
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "最近のパッチが、パッチ %s内のファイルを変更しています\\n"
 
@@ -845,8 +849,8 @@ msgstr ""
 #: ../quilt/refresh.in:22
 #, fuzzy
 msgid ""
-"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--sort] [--"
-"backup] [--strip-trailing-whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
+"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
 msgstr ""
 "使い方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
 "[パッチ]\\n"
@@ -877,6 +881,9 @@ msgid ""
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\t\n"
+"--no-index\n"
+"\tDo not output Index: lines.\n"
+"\n"
 "--diffstat\n"
 "\tAdd a diffstat section to the patch header, or replace the\n"
 "\texisting diffstat section.\n"
@@ -923,31 +930,31 @@ msgstr ""
 "\tバックアップ用のコピーとして古いバージョンのパッチを patch~の\n"
 "\t形で作成する。\n"
 
-#: ../quilt/refresh.in:166
+#: ../quilt/refresh.in:173
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "-p%sではリフレッシュすることができません。-p0または -p1を指定してください\\n"
 
-#: ../quilt/refresh.in:200
+#: ../quilt/refresh.in:207
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "より最近のパッチがパッチ %sのファイルに変更を加えています。リフレッシュを実行"
 "する場合は -f オプションを使用してください。\\n"
 
-#: ../quilt/refresh.in:207
+#: ../quilt/refresh.in:214
 msgid "Nothing in patch %s\\n"
 msgstr "パッチ %s にはなにも含まれていません\\n"
 
-#: ../quilt/refresh.in:221
+#: ../quilt/refresh.in:228
 msgid "Warning: %s adds trailing whitespace\\n"
 msgstr ""
 
-#: ../quilt/refresh.in:283
+#: ../quilt/refresh.in:290
 msgid "Patch %s is unchanged\\n"
 msgstr "パッチ % に変更はありません\\n"
 
-#: ../quilt/refresh.in:297
+#: ../quilt/refresh.in:304
 msgid "Refreshed patch %s\\n"
 msgstr "パッチ %s をリフレッシュしました\\n"
 
@@ -1142,7 +1149,7 @@ msgstr ""
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
 
-#: ../scripts/patchfns.in:738
+#: ../scripts/patchfns.in:741
 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 "
@@ -1154,7 +1161,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: ../scripts/patchfns.in:815
+#: ../scripts/patchfns.in:818
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"