- quilt/diff.in, quilt/refresh.in: Add `-p ab' options which

  produce a/file and b/file filenams in headers instead of
  dir.orig/file and dir/file, similar to BK, git, hg patches.
- Only touch .pc/$patch/.timestamp when a path actually is being
  refreshed.

1 files changed, 65 insertions, 29 deletions

diff --git a/po/fr.po b/po/fr.po
index 81baf6c..796116a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -177,11 +177,11 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Pas de patch suivant\\n"
 
-#: quilt/delete.in:95 quilt/scripts/patchfns.in:442
+#: quilt/delete.in:95 quilt/scripts/patchfns.in:461
 msgid "No patches in series\\n"
 msgstr "Aucun patch dans la série\\n"
 
-#: quilt/delete.in:101 quilt/scripts/patchfns.in:540
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:559
 msgid "Patch %s is currently applied\\n"
 msgstr "Le patch %s est actuellement appliqué\\n"
 
@@ -212,6 +212,7 @@ msgstr ""
 "sort] [--color] [fichier ...]\\n"
 
 #: quilt/diff.in:28
+#, fuzzy
 msgid ""
 "\n"
 "Produces a diff of the specified file(s) in the topmost or specified\n"
@@ -220,6 +221,10 @@ msgid ""
 "\n"
 "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n"
 "\n"
+"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n"
+"\toriginal and new filenames instead of the default\n"
+"\tdir.orig/file and dir/file names.\n"
+"\n"
 "-u, -U num, -c, -C num\n"
 "\tCreate a unified diff (-u, -U) with num lines of context. Create\n"
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
@@ -303,40 +308,40 @@ msgstr ""
 "--sort\tTrie les fichiers par leur nom au lieu de préserver leur ordre\n"
 "\td'origine.\n"
 
-#: quilt/diff.in:213
+#: quilt/diff.in:217
 msgid ""
 "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées."
 "\\n"
 
-#: quilt/diff.in:225
+#: quilt/diff.in:231
 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:258 quilt/files.in:105
+#: quilt/diff.in:265 quilt/files.in:105
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Le patch %s n'est pas appliqué avant %s\\n."
 
-#: quilt/diff.in:308 quilt/pop.in:98
+#: quilt/diff.in:315 quilt/pop.in:98
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n"
 
-#: quilt/diff.in:332 quilt/pop.in:122
+#: quilt/diff.in:339 quilt/pop.in:122
 msgid "Failed to patch temporary files\\n"
 msgstr "Impossible de patcher les fichiers temporaires\\n"
 
-#: quilt/diff.in:351
+#: quilt/diff.in:358
 msgid "File %s is not being modified\\n"
 msgstr "Le fichier %s n'est pas modifié.\\n"
 
-#: quilt/diff.in:371 quilt/refresh.in:177
+#: quilt/diff.in:378 quilt/refresh.in:184
 msgid "Diff failed, aborting\\n"
 msgstr "Le diff a échoué. Abandon.\\n"
 
-#: quilt/diff.in:378
+#: quilt/diff.in:385
 msgid "Warning: more recent patches modify files in patch %s\\n"
 msgstr "Attention: un patch plus recent modifie des fichiers communs à %s\\n"
 
@@ -953,7 +958,7 @@ msgstr "Le patch %s doit être rafraichi au préalable.\\n"
 msgid "No patch removed\\n"
 msgstr "Aucun patch retiré\\n"
 
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:474
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué\\n"
 
@@ -1090,6 +1095,7 @@ msgstr ""
 "[patch]\\n"
 
 #: quilt/refresh.in:26
+#, fuzzy
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -1106,6 +1112,10 @@ msgid ""
 "\n"
 "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n"
 "\n"
+"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n"
+"\toriginal and new filenames instead of the default\n"
+"\tdir.orig/file and dir/file names.\n"
+"\n"
 "-u, -U num, -c, -C num\n"
 "\tCreate a unified diff (-u, -U) with num lines of context. Create\n"
 "\ta context diff (-c, -C) with num lines of context. The number of\n"
@@ -1174,35 +1184,35 @@ msgstr ""
 "--strip-trailing-whitespace\n"
 "\tSupprime les espaces à la fin des lignes.\n"
 
-#: quilt/refresh.in:149
+#: quilt/refresh.in:155
 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:183
+#: quilt/refresh.in:190
 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:189
+#: quilt/refresh.in:196
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
 "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n"
 "certains fichiers sont masqués.\\n"
 
-#: quilt/refresh.in:195
+#: quilt/refresh.in:202
 msgid "Nothing in patch %s\\n"
 msgstr "Le patch %s ne contient rien\\n"
 
-#: quilt/refresh.in:272
+#: quilt/refresh.in:279
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s inchangé\\n"
 
-#: quilt/refresh.in:277
+#: quilt/refresh.in:285
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s rafraîchi\\n"
 
@@ -1294,23 +1304,23 @@ msgstr "Le fichier %s a disparu !\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "Impossible de renommer %s en %s : %s\n"
 
-#: quilt/scripts/patchfns.in:491
+#: quilt/scripts/patchfns.in:510
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la série\\n"
 
-#: quilt/scripts/patchfns.in:519
+#: quilt/scripts/patchfns.in:538
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
-#: quilt/scripts/patchfns.in:556
+#: quilt/scripts/patchfns.in:575
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n"
 
-#: quilt/scripts/patchfns.in:578
+#: quilt/scripts/patchfns.in:597
 msgid "Patch %s does not exist\\n"
 msgstr "Le patch %s n'existe pas\\n"
 
-#: quilt/scripts/patchfns.in:833
+#: quilt/scripts/patchfns.in:857
 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 "
@@ -1322,7 +1332,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"
 
-#: quilt/scripts/patchfns.in:918
+#: quilt/scripts/patchfns.in:942
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1336,36 +1346,62 @@ msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
 msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n"
 
 #: quilt/scripts/remove-trailing-ws.in:65
-#: quilt/scripts/remove-trailing-ws.in:92
+#: quilt/scripts/remove-trailing-ws.in:92 quilt/scripts/remove-ws.in:88
+#: quilt/scripts/remove-ws.in:124
 #, perl-format
 msgid "%s: I'm confused.\n"
 msgstr "%s : Je suis confus.\n"
 
-#: quilt/scripts/remove-trailing-ws.in:113
+#: quilt/scripts/remove-trailing-ws.in:113 quilt/scripts/remove-ws.in:166
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
 msgstr "Attention : espaces à la fin de la ligne %s de %s\n"
 
-#: quilt/scripts/remove-trailing-ws.in:116
+#: quilt/scripts/remove-trailing-ws.in:116 quilt/scripts/remove-ws.in:169
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
 msgstr "Attention : espaces à la fin des lignes %s de %s\n"
 
-#: quilt/scripts/remove-trailing-ws.in:120
+#: quilt/scripts/remove-trailing-ws.in:120 quilt/scripts/remove-ws.in:180
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
 msgstr "Suppression des espaces à la fin de la ligne %s de %s\n"
 
-#: quilt/scripts/remove-trailing-ws.in:123
+#: quilt/scripts/remove-trailing-ws.in:123 quilt/scripts/remove-ws.in:183
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
 msgstr "Suppression des espaces à la fin des lignes %s de %s\n"
 
-#: quilt/scripts/remove-trailing-ws.in:143
+#: quilt/scripts/remove-trailing-ws.in:143 quilt/scripts/remove-ws.in:203
 #, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "En renommant %s en %s : %s\n"
 
+#: quilt/scripts/remove-ws.in:45
+#, fuzzy, perl-format
+msgid "SYNOPSIS: %s [-p num] [-W tabwidth] [-n] [patch]\n"
+msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n"
+
+#: quilt/scripts/remove-ws.in:159
+#, fuzzy, perl-format
+msgid "Warning: spaces used for indentation in line %s of %s\n"
+msgstr "Attention : espaces à la fin de la ligne %s de %s\n"
+
+#: quilt/scripts/remove-ws.in:162
+#, fuzzy, perl-format
+msgid "Warning: spaces used for indentation in lines %s of %s\n"
+msgstr "Attention : espaces à la fin des lignes %s de %s\n"
+
+#: quilt/scripts/remove-ws.in:173
+#, fuzzy, perl-format
+msgid "Warning: converting space indentation to tabs in line %s of %s\n"
+msgstr "Attention : espaces à la fin de la ligne %s de %s\n"
+
+#: quilt/scripts/remove-ws.in:176
+#, fuzzy, perl-format
+msgid "Warning: converting space indentation to tabs in lines %s of %s\n"
+msgstr "Attention : espaces à la fin des lignes %s de %s\n"
+
 #: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr "Usage : quilt series [-v]\\n"