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

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

4 files changed, 140 insertions, 112 deletions

diff --git a/po/de.po b/po/de.po
index 0ca04c4..58aa512 100644
--- a/po/de.po
+++ b/po/de.po
@@ -72,22 +72,22 @@ msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Die Datei %s befindet sich unter dem Verzeichnis %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 "Patch %s ist nicht in der series-Datei enthalten\\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 "Patch %s ist nicht angewandt\\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 "Keine Patches angewandt\\n"
 
@@ -157,7 +157,8 @@ msgstr "Konnte Patch %s nicht entfernen\\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 ""
 "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-"
 "R] [-P patch] [--snapshot] [--diff=programm] [--color] [datei ...]\\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"
@@ -244,51 +248,51 @@ msgstr ""
 "--color[=always|auto|never]\n"
 "\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie).\n"
 
-#: ../quilt/diff.in:223
+#: ../quilt/diff.in:231
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht "
 "kombiniert werden.\\n"
 
-#: ../quilt/diff.in:250
+#: ../quilt/diff.in:258
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden."
 "\\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 "Patch %s ist nicht vor Patch %s angewandt\\n"
 
-#: ../quilt/diff.in:334
+#: ../quilt/diff.in:342
 msgid "Cannot change into directory %s\\n"
 msgstr "Kann nicht in Verzeichnis %s wechseln\\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 "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
 
-#: ../quilt/diff.in:352
+#: ../quilt/diff.in:360
 msgid "Cannot change to temporary directory\\n"
 msgstr "Kann nicht in temporäres Verzeichnis wechseln\\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 "Konnte temporäre Dateien nicht patchen\\n"
 
-#: ../quilt/diff.in:377
+#: ../quilt/diff.in:385
 msgid "Cannot change to source directory\\n"
 msgstr "Kann nicht in Quellverzeichnis wechseln\\n"
 
-#: ../quilt/diff.in:395
+#: ../quilt/diff.in:403
 msgid "File %s is not being modified\\n"
 msgstr "Datei %s wird nicht verändert.\\n"
 
-#: ../quilt/diff.in:415 ../quilt/refresh.in:194
+#: ../quilt/diff.in:423 ../quilt/refresh.in:201
 msgid "Diff failed, aborting\\n"
 msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 
-#: ../quilt/diff.in:422
+#: ../quilt/diff.in:430
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "Später angewandte Patches verändern Dateien von %s\\n"
 
@@ -850,8 +854,8 @@ msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 #: ../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 ""
 "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--"
 "backup] [patch]\\n"
@@ -882,6 +886,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"
@@ -931,32 +938,32 @@ msgstr ""
 "--backup\n"
 "\tErzeuge ein Backup der alten Version von patch als patch~.\n"
 
-#: ../quilt/refresh.in:166
+#: ../quilt/refresh.in:173
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -"
 "p1 angeben\\n"
 
-#: ../quilt/refresh.in:200
+#: ../quilt/refresh.in:207
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f "
 "erzwingen.\\n"
 
-#: ../quilt/refresh.in:207
+#: ../quilt/refresh.in:214
 msgid "Nothing in patch %s\\n"
 msgstr "Patch %s is leer\\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 "Patch %s ist unverändert\\n"
 
-#: ../quilt/refresh.in:297
+#: ../quilt/refresh.in:304
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s aufgefrischt\\n"
 
@@ -1153,7 +1160,7 @@ msgstr ""
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\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 "
@@ -1166,7 +1173,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\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"
diff --git a/po/fr.po b/po/fr.po
index b1886b1..9b6930d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -74,22 +74,22 @@ msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Le fichier %s n'est pas dans le patch %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 "Le patch %s n'est pas dans la s�rie\\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 "Le patch %s n'est pas appliqu�\\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 "Aucun patch n'est appliqu�\\n"
 
@@ -159,7 +159,8 @@ msgstr "Impossible de retirer le patch %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 ""
 "Usage : quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-"
 "P patch] [--snapshot] [--diff=utilitaire] [--color] [fichier ...]\\n"
@@ -182,6 +183,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"
@@ -254,50 +258,50 @@ msgstr ""
 "\tColorise la syntaxe toujours (�always�), de mani�re automatique (�auto�)\n"
 "\tou jamais (�never�).\n"
 
-#: ../quilt/diff.in:223
+#: ../quilt/diff.in:231
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Les options �-c patch�, �--snapshot� et �-z� ne peuvent pas �tre combin�es."
 
-#: ../quilt/diff.in:250
+#: ../quilt/diff.in:258
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de cr�er des patches avec -p%s. Veuillez sp�cifier -p0 ou -p1 � "
 "la place\\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 "Le patch %s n'est pas appliqu� avant %s\\n."
 
-#: ../quilt/diff.in:334
+#: ../quilt/diff.in:342
 msgid "Cannot change into directory %s\\n"
 msgstr "Impossible d'entrer dans le r�pertoire %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 "Impossible de copier les fichiers dans le r�pertoire temporaire\\n"
 
-#: ../quilt/diff.in:352
+#: ../quilt/diff.in:360
 msgid "Cannot change to temporary directory\\n"
 msgstr "Impossible d'entrer dans le r�pertoire temporaire\\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 "Impossible de patcher les fichiers temporaires\\n"
 
-#: ../quilt/diff.in:377
+#: ../quilt/diff.in:385
 msgid "Cannot change to source directory\\n"
 msgstr "Impossible d'entrer dans le r�pertoire source\\n"
 
-#: ../quilt/diff.in:395
+#: ../quilt/diff.in:403
 msgid "File %s is not being modified\\n"
 msgstr "Le fichier %s n'est pas modifi�.\\n"
 
-#: ../quilt/diff.in:415 ../quilt/refresh.in:194
+#: ../quilt/diff.in:423 ../quilt/refresh.in:201
 msgid "Diff failed, aborting\\n"
 msgstr "Le diff a �chou�. Abandon.\\n"
 
-#: ../quilt/diff.in:422
+#: ../quilt/diff.in:430
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "Un patch plus recent modifie des fichiers communs � %s.\\n"
 
@@ -815,8 +819,8 @@ msgstr "La s�rie est compl�tement appliqu�e. Le dernier patch est %s.\\n"
 #: ../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 ""
 "Usage : quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
 "[patch]\\n"
@@ -847,6 +851,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"
@@ -895,32 +902,32 @@ msgstr ""
 "\tCr�e une copie de sauvegarde du patch en ajoutant ~ � la fin de \n"
 "\tson nom.\n"
 
-#: ../quilt/refresh.in:166
+#: ../quilt/refresh.in:173
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de rafra�chir des patchs avec -p%s. Veuillez sp�cifier -p0 ou -p1 "
 "� la place.\\n"
 
-#: ../quilt/refresh.in:200
+#: ../quilt/refresh.in:207
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 "Des fichiers plus r�cents modifient les m�mes fichiers que %s.\n"
 "Forcez le rafra�chissement avec -f.\\n"
 
-#: ../quilt/refresh.in:207
+#: ../quilt/refresh.in:214
 msgid "Nothing in patch %s\\n"
 msgstr "Le patch %s ne contient rien\\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 "Le patch %s n'a pas �t� modifi�\\n"
 
-#: ../quilt/refresh.in:297
+#: ../quilt/refresh.in:304
 msgid "Refreshed patch %s\\n"
 msgstr "Le patch %s a �t� rafraichi.\\n"
 
@@ -1118,7 +1125,7 @@ msgstr ""
 "version utilis�e pour cr�er cet arbre de travail, ou effacez le r�pertoire\n"
 "%s et r�appliquez compl�tement vos patchs.\\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 "
@@ -1130,7 +1137,7 @@ msgstr ""
 "format %s (inclus). Veuillez retirer vos patches avec la version \n"
 "utilis�e pour les appliquer avant d'installer une version plus ancienne.\\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"
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"
diff --git a/po/quilt.pot b/po/quilt.pot
index 52edb17..57613a8 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -40,22 +40,22 @@ msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr ""
 
 #: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -117,7 +117,8 @@ msgstr ""
 #: ../quilt/diff.in:24
 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.in:28
@@ -137,6 +138,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"
@@ -164,47 +168,47 @@ msgid ""
 "--sort\tSort files by their name instead of preserving the original order.\n"
 msgstr ""
 
-#: ../quilt/diff.in:223
+#: ../quilt/diff.in:231
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 
-#: ../quilt/diff.in:250
+#: ../quilt/diff.in:258
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../quilt/diff.in:334
+#: ../quilt/diff.in:342
 msgid "Cannot change into directory %s\\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../quilt/diff.in:352
+#: ../quilt/diff.in:360
 msgid "Cannot change to temporary directory\\n"
 msgstr ""
 
-#: ../quilt/diff.in:371 ../quilt/pop.in:138
+#: ../quilt/diff.in:379 ../quilt/pop.in:138
 msgid "Failed to patch temporary files\\n"
 msgstr ""
 
-#: ../quilt/diff.in:377
+#: ../quilt/diff.in:385
 msgid "Cannot change to source directory\\n"
 msgstr ""
 
-#: ../quilt/diff.in:395
+#: ../quilt/diff.in:403
 msgid "File %s is not being modified\\n"
 msgstr ""
 
-#: ../quilt/diff.in:415 ../quilt/refresh.in:194
+#: ../quilt/diff.in:423 ../quilt/refresh.in:201
 msgid "Diff failed, aborting\\n"
 msgstr ""
 
-#: ../quilt/diff.in:422
+#: ../quilt/diff.in:430
 msgid "More recent patches modify files in patch %s\\n"
 msgstr ""
 
@@ -609,8 +613,8 @@ msgstr ""
 
 #: ../quilt/refresh.in:22
 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.in:26
@@ -638,6 +642,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"
@@ -653,28 +660,28 @@ msgid ""
 "\tStrip trailing whitespace at the end of lines of the generated patch.\n"
 msgstr ""
 
-#: ../quilt/refresh.in:166
+#: ../quilt/refresh.in:173
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 
-#: ../quilt/refresh.in:200
+#: ../quilt/refresh.in:207
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
 
-#: ../quilt/refresh.in:207
+#: ../quilt/refresh.in:214
 msgid "Nothing in patch %s\\n"
 msgstr ""
 
-#: ../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 ""
 
-#: ../quilt/refresh.in:297
+#: ../quilt/refresh.in:304
 msgid "Refreshed patch %s\\n"
 msgstr ""
 
@@ -824,7 +831,7 @@ msgid ""
 "patches from scratch.\\n"
 msgstr ""
 
-#: ../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 "
@@ -832,7 +839,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: ../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"