- Switch from echo to printf for all translations: This is more

  stable than having expansions in messages that might change
  independent of the message.
- Add print_patch function and always use it when printing patch
  names. Remove -n options from various scripts and use a global
  switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch
  names with and without directory prefix. Depending on user
  experience this switch may eventually go away.
- Add --diffstat option to refresh command: If given, this option
  inserts diffstat statistics at the end of the patch header, or
  refreshes the existing diffstat output. No special tags in the
  path file (%diffstat or the like) are needed.
- Minor fix inserting changelog into RPM specfile.

1 files changed, 381 insertions, 246 deletions

diff --git a/po/fr.po b/po/fr.po
index 7e26e02..5ec3d19 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -44,10 +44,12 @@ msgstr ""
 "\tpotentiel."
 
 #: ../quilt/add.in:22
-msgid "Usage: quilt add [-p patch] {file} ..."
+#, fuzzy
+msgid "Usage: quilt add [-p patch] {file} ...\\n"
 msgstr "Usage : quilt add [-p patch] {fichier} ..."
 
 #: ../quilt/add.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Add one or more files to the topmost or named patch.  Files must be\n"
@@ -55,7 +57,7 @@ msgid ""
 "patches already applied on top of the specified patch cannot be added.\n"
 "\n"
 "-p patch\n"
-"\tPatch to add files to."
+"\tPatch to add files to.\n"
 msgstr ""
 "\n"
 "Ajoute un ou plusieurs fichiers au patch indiqué ou à celui au sommet.\n"
@@ -66,50 +68,60 @@ msgstr ""
 "-p patch\n"
 "\tPatch auquel les fichiers doivent être ajoutés."
 
-#: ../quilt/add.in:54 ../quilt/diff.in:147 ../quilt/diff.in:158
-#: ../quilt/remove.in:52
-msgid "Patch $2 is not in series"
-msgstr "Le patch $2 n'est pas dans la série"
-
-#: ../quilt/add.in:75 ../quilt/applied.in:72 ../quilt/refresh.in:125
-#: ../quilt/remove.in:73
-msgid "Patch $patch is not applied"
-msgstr "Le patch $patch n'est pas appliqué"
-
-#: ../quilt/add.in:82 ../quilt/delete.in:67 ../quilt/diff.in:227
-#: ../quilt/files.in:75 ../quilt/fold.in:78 ../quilt/fork.in:64
-#: ../quilt/pop.in:181 ../quilt/push.in:179 ../quilt/push.in:215
-#: ../quilt/refresh.in:132 ../quilt/remove.in:80
-msgid "No patches applied"
+#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
+#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/files.in:69
+#: ../quilt/next.in:62 ../quilt/pop.in:128 ../quilt/previous.in:62
+#: ../quilt/push.in:145 ../quilt/refresh.in:129 ../quilt/remove.in:53
+#: ../quilt/unapplied.in:62
+#, fuzzy
+msgid "Patch %s is not in series\\n"
+msgstr "Le patch $1 n'est pas dans la série"
+
+#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/files.in:89
+#: ../quilt/pop.in:149 ../quilt/refresh.in:135 ../quilt/remove.in:74
+#, fuzzy
+msgid "Patch %s is not applied\\n"
+msgstr "Le patch n'est pas appliqué"
+
+#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
+#: ../quilt/files.in:76 ../quilt/fold.in:79 ../quilt/fork.in:65
+#: ../quilt/pop.in:182 ../quilt/push.in:182 ../quilt/push.in:218
+#: ../quilt/refresh.in:143 ../quilt/remove.in:81
+#, fuzzy
+msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué"
 
 #: ../quilt/add.in:92
-msgid "File $SUBDIR$file is already in patch $patch"
+#, fuzzy
+msgid "File %s is already in patch %s\\n"
 msgstr "Le fichier $SUBDIR$file est déjà dans le patch $patch"
 
-#: ../quilt/add.in:99 ../quilt/remove.in:98
-msgid "File $SUBDIR$file modified by patch $next_patch"
+#: ../quilt/add.in:100 ../quilt/remove.in:100
+#, fuzzy
+msgid "File %s modified by patch %s\\n"
 msgstr "Le fichier $SUBDIR$file est modifié par le patch $next_patch"
 
-#: ../quilt/add.in:106
-msgid "Failed to back up file $SUBDIR$file"
+#: ../quilt/add.in:108
+#, fuzzy
+msgid "Failed to back up file %s\\n"
 msgstr "Impossible de faire une copie de sécurité de $SUBDIR$file"
 
-#: ../quilt/add.in:117
-msgid "File $SUBDIR$file added to patch $patch"
+#: ../quilt/add.in:119
+#, fuzzy
+msgid "File %s added to patch %s\\n"
 msgstr "Le fichier $SUBDIR$file a été ajouté au patch $patch"
 
 #: ../quilt/applied.in:22
-msgid "Usage: quilt applied [-n] [patch]"
-msgstr "Usage : quilt applied [-n] [patch]"
+#, fuzzy
+msgid "Usage: quilt applied [patch]\\n"
+msgstr "Usage : quilt unapplied [patch]"
 
 #: ../quilt/applied.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print a list of applied patches, or all patches up to and including the\n"
 "specified patch in the file series.\n"
-"\n"
-"-n\tPrint patch file names instead of patch names."
 msgstr ""
 "\n"
 "Affiche la liste des patches appliqués, ou la liste de tous les patches\n"
@@ -117,45 +129,44 @@ msgstr ""
 "\n"
 "-n\tAffiche les noms des fichiers de patch au lieu des noms de patch."
 
-#: ../quilt/applied.in:67 ../quilt/files.in:68 ../quilt/next.in:66
-#: ../quilt/pop.in:127 ../quilt/previous.in:66 ../quilt/push.in:143
-#: ../quilt/unapplied.in:66
-msgid "Patch $1 is not in series"
-msgstr "Le patch $1 n'est pas dans la série"
+#: ../quilt/applied.in:67
+#, fuzzy
+msgid "Patch is not applied\\n"
+msgstr "Le patch n'est pas appliqué"
 
 #: ../quilt/delete.in:22
-msgid "Usage: quilt delete [patch]"
+#, fuzzy
+msgid "Usage: quilt delete [patch]\\n"
 msgstr "Usage : quilt delete [patch]"
 
 #: ../quilt/delete.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
 "patch is applied, quilt will attempt to remove it first. (Only the\n"
-"topmost patch can be removed right now.)"
+"topmost patch can be removed right now.)\n"
 msgstr ""
 "\n"
 "Efface le patch spécifié (ou celui au sommet de la pile) de la série \n"
 "actuelle. Si le patch est appliqué, quilt tentera de le retirer avant.\n"
 "(Seul le patch au sommet peut être retiré pour l'instant)."
 
-#: ../quilt/delete.in:75
-msgid "Patch $patch is not in series"
-msgstr "Le patch $patch n'est pas dans la série"
-
-#: ../quilt/delete.in:84
-msgid "Patch $patch is currently applied"
+#: ../quilt/delete.in:85
+#, fuzzy
+msgid "Patch %s is currently applied\\n"
 msgstr "Le patch $patch est appliqué"
 
-#: ../quilt/delete.in:90
-msgid "Failed to remove patch $patch"
+#: ../quilt/delete.in:92
+#, fuzzy
+msgid "Failed to remove patch %s\\n"
 msgstr "Impossible de retirer le patch $patch"
 
 #: ../quilt/diff.in:22
 #, fuzzy
 msgid ""
-"Usage: quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [--snapshot] [--"
-"diff=utility] [--color] [file ...]"
+"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
+"patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n"
 msgstr ""
 "Usage : quilt diff [-p n] [-c patch|-z] [-R] [-P patch] [--snapshot] [--"
 "diff=programme] [fichier ...]"
@@ -200,7 +211,7 @@ msgid ""
 "\tis invoked with the original and new file name as arguments.\n"
 "\n"
 "--color[=always|auto|never]\n"
-"\tUse syntax coloring."
+"\tUse syntax coloring.\n"
 msgstr ""
 "\n"
 "Produit un diff du ou des fichiers spécifiés par le patch spécifié (ou à\n"
@@ -235,84 +246,93 @@ msgstr ""
 "\tSupprime les timestamps des entêtes du patch (comme si\n"
 "        QUILT_DIFF_NO_TIMESTAMPS valait \"yes\")."
 
-#: ../quilt/diff.in:212
-msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined."
+#: ../quilt/diff.in:213
+#, fuzzy
+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:220
-msgid "Patch $last_patch is not applied"
-msgstr "Le patch $last_patch ne semble pas appliqué"
-
-#: ../quilt/diff.in:238
-msgid ""
-"Cannot diff patches with -p$opt_strip_level, please specify -p0 or -p1 "
-"instead"
+#: ../quilt/diff.in:240
+#, fuzzy
+msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de créer des patches avec -p$opt_strip_level. Veuillez spécifier -"
 "p0 ou -p1 à la place"
 
-#: ../quilt/diff.in:272
-msgid "Patch $first_patch not applied before $last_patch."
+#: ../quilt/diff.in:275
+#, fuzzy
+msgid "Patch %s not applied before patch %s\\n"
 msgstr "Le patch $first_patch n'est pas appliqué avant $last_patch."
 
-#: ../quilt/diff.in:306
-msgid "Cannot change into $QUILT_PC/$last_patch"
-msgstr "Impossible d'entrer dans $QUILT_PC/$last_patch"
+#: ../quilt/diff.in:311
+#, fuzzy
+msgid "Cannot change into directory %s\\n"
+msgstr "Impossible d'entrer dans le répertoire source"
 
-#: ../quilt/diff.in:312 ../scripts/rpatch.in:62
-msgid "Failed to copy files to temporary directory"
+#: ../quilt/diff.in:318 ../scripts/rpatch.in:62
+#, fuzzy
+msgid "Failed to copy files to temporary directory\\n"
 msgstr "Impossible de copier les fichiers dans le répertoire temporaire"
 
-#: ../quilt/diff.in:323
-msgid "Cannot change to temporary directory"
+#: ../quilt/diff.in:329
+#, fuzzy
+msgid "Cannot change to temporary directory\\n"
 msgstr "Impossible d'entrer dans le répertoire temporaire"
 
-#: ../quilt/diff.in:342 ../scripts/rpatch.in:85
-msgid "Failed to patch temporary files"
+#: ../quilt/diff.in:348 ../scripts/rpatch.in:85
+#, fuzzy
+msgid "Failed to patch temporary files\\n"
 msgstr "Impossible de patcher les fichiers temporaires"
 
-#: ../quilt/diff.in:348
-msgid "Cannot change to source directory"
+#: ../quilt/diff.in:354
+#, fuzzy
+msgid "Cannot change to source directory\\n"
 msgstr "Impossible d'entrer dans le répertoire source"
 
-#: ../quilt/diff.in:366
-msgid "File $file is not being modified."
+#: ../quilt/diff.in:372
+#, fuzzy
+msgid "File %s is not being modified\\n"
 msgstr "Le fichier $file n'est pas modifié."
 
-#: ../quilt/diff.in:386 ../quilt/refresh.in:164
-msgid "Diff failed, aborting."
+#: ../quilt/diff.in:392 ../quilt/refresh.in:175
+#, fuzzy
+msgid "Diff failed, aborting\\n"
 msgstr "Le diff a échoué. Abandon."
 
-#: ../quilt/diff.in:393
-msgid "More recent patches modify files in $last_patch."
+#: ../quilt/diff.in:399
+#, fuzzy
+msgid "More recent patches modify files in patch %s\\n"
 msgstr "Un patch plus recent modifie des fichiers communs à $last_patch."
 
 #: ../quilt/edit.in:13
-msgid "Usage: quilt edit file ..."
+#, fuzzy
+msgid "Usage: quilt edit file ...\\n"
 msgstr "Usage : quilt edit {fichier} ..."
 
 #: ../quilt/edit.in:16
+#, fuzzy
 msgid ""
 "\n"
 "Edit the specified file(s) in $EDITOR after adding it (them) to the\n"
-"topmost patch."
+"topmost patch.\n"
 msgstr ""
 "\n"
 "Édite le(s) fichier(s) spécifiés au sein de $EDITOR après addition au patch\n"
 "du sommet."
 
 #: ../quilt/files.in:22
-msgid "Usage: quilt files [-v] [patch]"
+#, fuzzy
+msgid "Usage: quilt files [-v] [patch]\\n"
 msgstr "Usage : quilt files [-v] [patch]"
 
 #: ../quilt/files.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print the list of files that the topmost or specified patch changes.\n"
 "\n"
-"-v\tVerbose, more user friendly output."
+"-v\tVerbose, more user friendly output.\n"
 msgstr ""
 "\n"
 "\n"
@@ -321,19 +341,18 @@ msgstr ""
 "\n"
 "-v\tAffichage verbeux, plus simple à lire."
 
-#: ../quilt/files.in:84
-msgid "Patch is not applied (no verbose output)"
+#: ../quilt/files.in:85
+#, fuzzy
+msgid "Patch %s is not applied (no verbose output)\\n"
 msgstr "Le patch n'est pas appliqué (affichage non verbeux)"
 
-#: ../quilt/files.in:87
-msgid "Patch is not applied"
-msgstr "Le patch n'est pas appliqué"
-
 #: ../quilt/fold.in:22
-msgid "Usage: quilt fold [-p strip-level]"
+#, fuzzy
+msgid "Usage: quilt fold [-p strip-level]\\n"
 msgstr "Usage : quilt fold [-p strip-level]"
 
 #: ../quilt/fold.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Integrate the patch read from standard input into the topmost patch:\n"
@@ -343,7 +362,7 @@ msgid ""
 "\n"
 "-p strip-level\n"
 "\tThe number of pathname components to strip from file names\n"
-"\twhen applying patchfile."
+"\twhen applying patchfile.\n"
 msgstr ""
 "\n"
 "Intégrer le patch lu depuis l'entrée standard dans le patch au sommet :\n"
@@ -355,21 +374,24 @@ msgstr ""
 "\tNombre de niveaux de répertoires à retirer lors de l'application du \n"
 "\tpatch (1 par défaut)."
 
-#: ../quilt/fold.in:114
-msgid "File $file may be corrupted"
+#: ../quilt/fold.in:115
+#, fuzzy
+msgid "File %s may be corrupted\\n"
 msgstr "Le fichier $file est peut-être corrompu"
 
 #: ../quilt/fork.in:22
-msgid "Usage: quilt fork [new_name]"
+#, fuzzy
+msgid "Usage: quilt fork [new_name]\\n"
 msgstr "Usage : quilt fork [{nouveau_nom}]"
 
 #: ../quilt/fork.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Fork the topmost patch. If new_name is missing, the name of the\n"
 "forked patch will be the current patch name, followed by \\\"-2\\\".\n"
 "If the patch name already ends in a dash-and-number, the number is\n"
-"further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff)."
+"further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n"
 msgstr ""
 "\n"
 "Fork (c-à-d duplique) le patch au sommet.\n"
@@ -378,20 +400,24 @@ msgstr ""
 "un tiret et un nombre, ce nombre sera incrémenté. (ex: patch.diff,\n"
 "patch-2.diff, patch-3.diff)."
 
-#: ../quilt/fork.in:90
-msgid "Patch $new_patch exists already, please choose a new name"
+#: ../quilt/fork.in:91
+#, fuzzy
+msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "Le patch $new_patch existe déjà, veuillez choisir un nouveau nom"
 
-#: ../quilt/fork.in:101
-msgid "Fork of $top_patch to $new_patch failed"
+#: ../quilt/fork.in:103
+#, fuzzy
+msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Le fork de $top_patch en $new_patch a échoué"
 
-#: ../quilt/fork.in:105
-msgid "Fork of $top_patch created as $new_patch"
+#: ../quilt/fork.in:109
+#, fuzzy
+msgid "Fork of patch %s created as %s\\n"
 msgstr "Le fork de $top_patch a été créé en tant que $new_patch"
 
 #: ../quilt/import.in:22
-msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ..."
+#, fuzzy
+msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ..."
 
 #: ../quilt/import.in:25
@@ -407,7 +433,7 @@ msgid ""
 "\tPatch filename to use inside quilt. This option can only be\n"
 "\tused when importing a single patch.\n"
 "\n"
-"-f\tOverwite/update existing patches."
+"-f\tOverwite/update existing patches.\n"
 msgstr ""
 "\n"
 "Importe des patchs externes.\n"
@@ -422,80 +448,88 @@ msgstr ""
 "\n"
 "-f\tÉcrase/met à jour les patchs existants."
 
-#: ../quilt/import.in:73
-msgid "Option \\`-n' can only be used when importing a single patch"
+#: ../quilt/import.in:74
+#, fuzzy
+msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 "L'option « -n » ne peut être utilisé que lors de l'import d'un seul patch."
 
-#: ../quilt/import.in:90
-msgid "Patch $patch is applied."
-msgstr "Le patch $patch est appliqué."
+#: ../quilt/import.in:92
+#, fuzzy
+msgid "Patch %s is applied\\n"
+msgstr "Le patch n'est pas appliqué"
 
-#: ../quilt/import.in:98
-msgid "Patch $patch exists. Replace with -f."
+#: ../quilt/import.in:100
+#, fuzzy
+msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Le patch $patch existe. Utilisez -f pour le remplacer."
 
-#: ../quilt/import.in:101
-msgid "Replacing patch $patch with new version"
+#: ../quilt/import.in:104
+#, fuzzy
+msgid "Replacing patch %s with new version\\n"
 msgstr "Remplacement du patch $patch avec la nouvelle version"
 
-#: ../quilt/import.in:103
-msgid "Importing patch $patch_file (stored as $patch)"
+#: ../quilt/import.in:107
+#, fuzzy
+msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Import du patch $patch_file (enregistré dans $patch)"
 
-#: ../quilt/import.in:109
-msgid "Failed to import patch $patch"
+#: ../quilt/import.in:115
+#, fuzzy
+msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch $patch"
 
-#: ../quilt/import.in:116
-msgid "Failed to insert $patch in file series."
+#: ../quilt/import.in:122
+#, fuzzy
+msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer $patch dans le fichier de série."
 
 #: ../quilt/new.in:22
-msgid "Usage: quilt new {patchname}"
+#, fuzzy
+msgid "Usage: quilt new {patchname}\\n"
 msgstr "Usage : quilt new {nom_de_patch}"
 
 #: ../quilt/new.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Create a new patch with the specified file name, and insert it after the\n"
-"topmost patch in the patch series file."
+"topmost patch in the patch series file.\n"
 msgstr ""
 "\n"
 "Crée un nouveau patch au nom spécifié, et l'insere après le patch\n"
 "au sommet dans le fichier de série."
 
-#: ../quilt/new.in:63
-msgid ""
-"Warning: directory $(echo $SUBDIR | sed -e 's:[^/]\\+:..:g')$QUILT_PATCHES "
-"exists; ignoring"
+#: ../quilt/new.in:64
+msgid "Warning: directory %s exists; ignoring\\n"
 msgstr ""
-"Attention : le répertoire $(echo $SUBDIR | sed -e 's:[^/]\\+:..:g')"
-"$QUILT_PATCHES existe; ignoré"
 
-#: ../quilt/new.in:70
-msgid "Patch $patch exists already"
+#: ../quilt/new.in:72
+#, fuzzy
+msgid "Patch %s exists already\\n"
 msgstr "Le patch $patch existe déjà"
 
-#: ../quilt/new.in:81
-msgid "Failed to create patch $patch"
+#: ../quilt/new.in:83
+#, fuzzy
+msgid "Failed to create patch %s\\n"
 msgstr "Impossible de crée le patch $patch"
 
-#: ../quilt/new.in:84
-msgid "Patch $patch is now on top"
+#: ../quilt/new.in:86
+#, fuzzy
+msgid "Patch %s is now on top\\n"
 msgstr "Le patch $patch est maintenant au sommet"
 
 #: ../quilt/next.in:22
-msgid "Usage: quilt next [patch]"
+#, fuzzy
+msgid "Usage: quilt next [patch]\\n"
 msgstr "Usage : quilt next [patch]"
 
 #: ../quilt/next.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print the name of the next patch after the specified or topmost patch in\n"
 "the series file.\n"
-"\n"
-"-n\tPrint patch file names instead of patch names."
 msgstr ""
 "\n"
 "Affiche le nom du patch après celui spécifié (ou après celui au sommet)\n"
@@ -504,19 +538,19 @@ msgstr ""
 "-n\tAffiche le nom de fichier au lieu du nom de patch."
 
 #: ../quilt/patches.in:22
-msgid "Usage: quilt patches {file}"
+#, fuzzy
+msgid "Usage: quilt patches {file}\\n"
 msgstr "Usage : quilt patches {fichier}"
 
 #: ../quilt/patches.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print the list of patches that modify the specified file. (Uses a\n"
 "heuristic to determine which files are modified by unapplied patches.\n"
 "Note that this heuristic is much slower than scanning applied patches.)\n"
 "\n"
-"-n\tPrint the patch file names instead of the patch names.\n"
-"\n"
-"-v\tVerbose, more user friendly output."
+"-v\tVerbose, more user friendly output.\n"
 msgstr ""
 "\n"
 "Affiche la liste des patches modifiant le fichier spécifié. \n"
@@ -531,10 +565,12 @@ msgstr ""
 "-v\tAffichage verbeux, plus simple à lire."
 
 #: ../quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]"
+#, fuzzy
+msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
 msgstr "Usage : quilt pop [-afRqv] [num|patch]"
 
 #: ../quilt/pop.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove patch(es) from the series file.  Without options, the topmost\n"
@@ -553,7 +589,7 @@ msgid ""
 "\n"
 "-q\tQuiet operation.\n"
 "\n"
-"-v\tVerbose operation."
+"-v\tVerbose operation.\n"
 msgstr ""
 "\n"
 "Retire un ou plusieurs patches de la pile. Si aucun argument n'est \n"
@@ -575,33 +611,32 @@ msgstr ""
 "\n"
 "-v\tOpère verbeusement."
 
-#: ../quilt/pop.in:148
-msgid "Patch $stop_at_patch is not applied."
-msgstr "Le patch $stop_at_patch n'est pas appliqué."
-
-#: ../quilt/pop.in:158
-msgid "No patch removed"
+#: ../quilt/pop.in:159
+#, fuzzy
+msgid "No patch removed\\n"
 msgstr "Aucun patch retiré"
 
-#: ../quilt/pop.in:172 ../quilt/push.in:206
-msgid "Interrupted by user"
+#: ../quilt/pop.in:173 ../quilt/push.in:209
+#, fuzzy
+msgid "Interrupted by user\\n"
 msgstr "Interrompu par l'utilisateur"
 
-#: ../quilt/pop.in:188 ../quilt/push.in:217
-msgid "Now at patch $patch"
+#: ../quilt/pop.in:189 ../quilt/push.in:220
+#, fuzzy
+msgid "Now at patch %s\\n"
 msgstr "Le patch $patch est maintenant au sommet"
 
 #: ../quilt/previous.in:22
-msgid "Usage: quilt previous [-n] [patch]"
+#, fuzzy
+msgid "Usage: quilt previous [patch]\\n"
 msgstr "Usage : quilt previous [-n] [patch]"
 
 #: ../quilt/previous.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print the name of the previous patch before the specified or topmost\n"
 "patch in the series file.\n"
-"\n"
-"-n\tPrint patch file names instead of patch names."
 msgstr ""
 "\n"
 "Affiche le nom du patch avant celui spécifié (ou après celui au sommet)\n"
@@ -610,10 +645,12 @@ msgstr ""
 "-n\tAffiche le nom de fichier au lieu du nom de patch."
 
 #: ../quilt/push.in:22
-msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]"
+#, fuzzy
+msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n"
 msgstr "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]"
 
 #: ../quilt/push.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Apply patch(es) from the series file.  Without options, the next patch\n"
@@ -638,7 +675,7 @@ msgid ""
 "--interactive\n"
 "\tAllow the patch utility to ask how to deal with conflicts. If\n"
 "\tthis option is not given, the option -f will be passed to the \n"
-"\tpatch program."
+"\tpatch program.\n"
 msgstr ""
 "\n"
 "Applique un ou plusieurs patches de la série.  Si aucun argument n'est\n"
@@ -667,32 +704,38 @@ msgstr ""
 "\tSi cette option n'est pas donnée, l'option -f sera passée au \n"
 "\tprogramme patch."
 
-#: ../quilt/push.in:86
-msgid "Patch $stop_at_patch not found in file series"
+#: ../quilt/push.in:87
+#, fuzzy
+msgid "Patch %s not found in file series\\n"
 msgstr "Le patch $stop_at_patch est introuvable dans le fichier de série"
 
-#: ../quilt/push.in:166
-msgid "Patch $stop_at_patch is already applied."
+#: ../quilt/push.in:168
+#, fuzzy
+msgid "Patch %s is already applied\\n"
 msgstr "Le patch $stop_at_patch est déjà appliqué."
 
-#: ../quilt/push.in:184
+#: ../quilt/push.in:187
+#, fuzzy
 msgid ""
-"The topmost patch $top is not in the series file anymore;\n"
+"The topmost patch %s is not in the series file anymore;\n"
 "cannot determine the next patch from the series file.\n"
-"Please pop -f the top patch and check your series file."
+"Please pop -f the top patch and check your series file.\\n"
 msgstr ""
 "Le patch du sommet $top n'apparait plus dans la série;\n"
 "Impossible de déterminer le prochain patch de la série.\n"
 "Veuillez utiliser pop -f pour le patch du sommet, et vérifier \n"
 "votre fichier de série."
 
-#: ../quilt/push.in:190
-msgid "File series fully applied, ends at patch $top"
+#: ../quilt/push.in:193
+#, fuzzy
+msgid "File series fully applied, ends at patch %s\\n"
 msgstr "La série est complètement appliquée. Le dernier patch est $top."
 
 #: ../quilt/refresh.in:22
 #, fuzzy
-msgid "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--backup] [patch]"
+msgid ""
+"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] "
+"[patch]\\n"
 msgstr "Usage : quilt refresh [-p n] [-f] [--no-timestamps] [patch]"
 
 #: ../quilt/refresh.in:26
@@ -721,10 +764,14 @@ msgid ""
 "--no-timestamps\n"
 "\tDo not include file timestamps in patch headers.\n"
 "\t\n"
+"--diffstat\n"
+"\tAdd a diffstat section to the patch header, or replace the\n"
+"\texisting diffstat section.\n"
+"\n"
 "-f\tEnforce refreshing of a patch that is not on top.\n"
 "\n"
 "--backup\n"
-"\tCreate a backup copy of the old version of a patch as patch~."
+"\tCreate a backup copy of the old version of a patch as patch~.\n"
 msgstr ""
 "\n"
 "Rafraîchit un patch appliqué. Si aucun patch n'est spécifié, il s'agit de\n"
@@ -749,48 +796,50 @@ msgstr ""
 "\tSupprime les timestamps des entêtes du patch (comme si\n"
 "        QUILT_DIFF_NO_TIMESTAMPS valait \"yes\")."
 
-#: ../quilt/refresh.in:120
-msgid "Patch $opt_patch is not in series"
-msgstr "Le patch $opt_patch est introuvable dans le fichier de série"
-
-#: ../quilt/refresh.in:143
-msgid ""
-"Cannot refresh patches with -p$opt_strip_level, please specify -p0 or -p1 "
-"instead"
+#: ../quilt/refresh.in:154
+#, fuzzy
+msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Impossible de rafraîchir des patchs avec -p$opt_strip_level. Veuillez\n"
 "spécifier -p0 ou -p1 à la place."
 
-#: ../quilt/refresh.in:170
-msgid "More recent patches modify files in $patch. Enforce refresh with -f."
+#: ../quilt/refresh.in:181
+#, fuzzy
+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 $patch.\n"
 "Forcez le rafraîchissement avec -f."
 
-#: ../quilt/refresh.in:177
-msgid "Nothing in patch $patch"
+#: ../quilt/refresh.in:188
+#, fuzzy
+msgid "Nothing in patch %s\\n"
 msgstr "Le patch $patch ne contient rien"
 
-#: ../quilt/refresh.in:202
-msgid "Patch $patch is unchanged"
+#: ../quilt/refresh.in:249
+#, fuzzy
+msgid "Patch %s is unchanged\\n"
 msgstr "Le patch $patch n'a pas été modifié"
 
-#: ../quilt/refresh.in:216
-msgid "Refreshed patch $patch"
+#: ../quilt/refresh.in:263
+#, fuzzy
+msgid "Refreshed patch %s\\n"
 msgstr "Le patch $patch a été rafraichi."
 
 #: ../quilt/remove.in:22
-msgid "Usage: quilt remove [-p patch] {file} ..."
+#, fuzzy
+msgid "Usage: quilt remove [-p patch] {file} ...\\n"
 msgstr "Usage : quilt remove [-p patch] {fichier} ..."
 
 #: ../quilt/remove.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove one or more files from the topmost or named patch.  Files that\n"
 "are modified by patches on top of the specified patch cannot be removed.\n"
 "\n"
 "-p patch\n"
-"\tPatch to remove files from."
+"\tPatch to remove files from.\n"
 msgstr ""
 "\n"
 "Retire un ou plusieurs fichiers du patch au sommet ou du patch spécifié.\n"
@@ -800,30 +849,33 @@ msgstr ""
 "-p patch\n"
 "\tPatch duquel les fichiers doivent être retirés."
 
-#: ../quilt/remove.in:90
-msgid "File $SUBDIR$file is not in patch $patch"
+#: ../quilt/remove.in:91
+#, fuzzy
+msgid "File %s is not in patch %s\\n"
 msgstr "Le fichier $SUBDIR$file n'est pas dans le patch $patch."
 
-#: ../quilt/remove.in:106
-msgid "Failed to remove file $SUBDIR$file from patch $patch"
+#: ../quilt/remove.in:109
+#, fuzzy
+msgid "Failed to remove file %s from patch %s\\n"
 msgstr "Impossible d'enlever le fichier $SUBDIR$file du patch $patch."
 
-#: ../quilt/remove.in:111
-msgid "File $SUBDIR$file removed from patch $patch"
+#: ../quilt/remove.in:115
+#, fuzzy
+msgid "File %s removed from patch %s\\n"
 msgstr "Le fichier $SUBDIR$file a été enlevé du patch $patch."
 
 #: ../quilt/series.in:22
-msgid "Usage: quilt series [-n] [-v]"
+#, fuzzy
+msgid "Usage: quilt series [-v]\\n"
 msgstr "Usage : quilt series [-n] [-v]"
 
 #: ../quilt/series.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print the names of all patches in the series file.\n"
 "\n"
-"-n\tPrint patch file names instead patch names.\n"
-"\n"
-"-v\tVerbose, more user friendly output."
+"-v\tVerbose, more user friendly output.\n"
 msgstr ""
 "\n"
 "Affiche le nom de tous les patches de la série.\n"
@@ -833,18 +885,20 @@ msgstr ""
 "-v\tAffichage verbeux, plus simple à lire."
 
 #: ../quilt/setup.in:27
-msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}"
+#, fuzzy
+msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
 msgstr ""
 "Usage : quilt setup [-d répertoire_source] [-v] {fichier_séries|fichier_spec}"
 
 #: ../quilt/setup.in:30
+#, fuzzy
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
 "\n"
 "-d\toptional path prefix (sub-directory).\n"
 "\n"
-"-v\tverbose debug output."
+"-v\tverbose debug output.\n"
 msgstr ""
 "\n"
 "Initialise un arbre de sources à partir d'un fichier de spécification rpm, "
@@ -854,23 +908,26 @@ msgstr ""
 "\n"
 "-v\taffichage verbeux pour le debug."
 
-#: ../quilt/setup.in:95
-msgid "Directory $prefix$dir/$QUILT_PATCHES exists"
-msgstr "Le répertoire $prefix$dir/$QUILT_PATCHES existe"
+#: ../quilt/setup.in:96
+msgid "Directory %s exists\\n"
+msgstr ""
 
-#: ../quilt/setup.in:100
-msgid "File $prefix$dir/series exists"
-msgstr "Le fichier $prefix$dir/series existe."
+#: ../quilt/setup.in:102
+msgid "File %s exists\\n"
+msgstr ""
 
-#: ../quilt/setup.in:149
-msgid "Unpacking archive $arg1"
+#: ../quilt/setup.in:151
+#, fuzzy
+msgid "Unpacking archive %s\\n"
 msgstr "Désarchivage de $arg1"
 
 #: ../quilt/snapshot.in:22
-msgid "Usage: quilt snapshot [-d]"
+#, fuzzy
+msgid "Usage: quilt snapshot [-d]\\n"
 msgstr "Usage : quilt snapshot [-d]"
 
 #: ../quilt/snapshot.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Take a snapshot of the current working state.  After taking the snapshot,\n"
@@ -878,7 +935,7 @@ msgid ""
 "popping patches.  A diff against the tree at the moment of the\n"
 "snapshot can be generated with \\`quilt diff --snapshot'.\n"
 "\n"
-"-d\tOnly remove current snapshot."
+"-d\tOnly remove current snapshot.\n"
 msgstr ""
 "\n"
 "Prend un instantané de l'état courant du répertoire de travail. Après "
@@ -891,30 +948,32 @@ msgstr ""
 "-d\tSupprime l'instantané actuel et termine."
 
 #: ../quilt/top.in:22
-msgid "Usage: quilt top"
+#, fuzzy
+msgid "Usage: quilt top\\n"
 msgstr "Usage : quilt top"
 
 #: ../quilt/top.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print the name of the topmost patch on the current stack of applied\n"
-"patches."
+"patches.\n"
 msgstr ""
 "\n"
 "Affiche le nom du patch au sommet de la pile des patches actuellement\n"
 "appliqués."
 
 #: ../quilt/unapplied.in:22
-msgid "Usage: quilt unapplied [patch]"
+#, fuzzy
+msgid "Usage: quilt unapplied [patch]\\n"
 msgstr "Usage : quilt unapplied [patch]"
 
 #: ../quilt/unapplied.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Print a list of patches that are not applied, or all patches that follow\n"
 "the specified patch in the series file.\n"
-"\n"
-"-n\tPrint patch file names instead of patch names."
 msgstr ""
 "\n"
 "Affiche la liste de tous les patches non appliqués, ou de tous les patches\n"
@@ -923,10 +982,12 @@ msgstr ""
 "-n\tAffiche les noms de fichier au lieu des noms de patch."
 
 #: ../quilt/upgrade.in:25
-msgid "Usage: quilt upgrade"
+#, fuzzy
+msgid "Usage: quilt upgrade\\n"
 msgstr "Usage : quilt upgrade"
 
 #: ../quilt/upgrade.in:28
+#, fuzzy
 msgid ""
 "\n"
 "Upgrade the meta-data in a working tree from an old version of quilt to the\n"
@@ -934,7 +995,7 @@ msgid ""
 "format\n"
 "has changed, and the working tree still contains old-format meta-data. In "
 "that\n"
-"case, quilt will request to run \\`quilt upgrade'."
+"case, quilt will request to run \\`quilt upgrade'.\n"
 msgstr ""
 "\n"
 "Convertit les méta-données contenues dans un arbre de travail d'une \n"
@@ -944,28 +1005,32 @@ msgstr ""
 "à l'ancien format. Dans ce cas, quilt vous demandera d'utiliser\n"
 "« quilt upgrade » explicitement."
 
-#: ../quilt/upgrade.in:66
+#: ../quilt/upgrade.in:67
+#, fuzzy
 msgid ""
-"The quilt meta-data in $QUILT_PC/ already are have format version "
-"$DB_VERSION; nothing to do"
+"The quilt meta-data in %s already are have format version %s; nothing to do"
+"\\n"
 msgstr ""
 "Les méta-données de quilt dans $QUILT_PC/ sont déjà au format $DB_VERSION ; "
 "rien à faire"
 
-#: ../quilt/upgrade.in:70
-msgid "Converting meta-data to version $DB_VERSION"
+#: ../quilt/upgrade.in:71
+#, fuzzy
+msgid "Converting meta-data to version %s\\n"
 msgstr "Conversion des méta-donées au format v$DB_VERSION... "
 
-#: ../quilt/upgrade.in:101
-msgid "Conversion failed"
+#: ../quilt/upgrade.in:102
+#, fuzzy
+msgid "Conversion failed\\n"
 msgstr "Échec de la convertion"
 
-#: ../quilt/upgrade.in:102
+#: ../quilt/upgrade.in:103
+#, fuzzy
 msgid ""
 "\n"
 "Please remove all patches using \\`quilt pop -a' from the quilt version used "
-"to create this working tree, or remove the $QUILT_PC directory and apply the "
-"patches from scratch."
+"to create this working tree, or remove the %s directory and apply the "
+"patches from scratch.\\n"
 msgstr ""
 "\n"
 "Veuillez retirer tous les patchs en utilisant « quilt pop -a » avec la \n"
@@ -973,44 +1038,53 @@ msgstr ""
 "$QUILT_PC et réappliquez complètement vos patchs."
 
 #: ../scripts/apatch.in:22
-msgid "Usage: $0 [-fqv] patchname"
+#, fuzzy
+msgid "Usage: $0 [-fqv] patchname\\n"
 msgstr "Usage : $0 [-fqv] patchname"
 
 #: ../scripts/apatch.in:29
-msgid "Interrupted by user; patch $patch was not applied."
+#, fuzzy
+msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Interrompu par l'utilisateur ; le patch $patch n'a pas été appliqué."
 
-#: ../scripts/apatch.in:40
-msgid "Patch file $patch_file appears to be empty"
-msgstr "Le fichier de patch $patch_file semble vide"
+#: ../scripts/apatch.in:41
+#, fuzzy
+msgid "Patch %s appears to be empty\\n"
+msgstr "Le patch $patch semble vide. Il a été appliqué."
 
-#: ../scripts/apatch.in:80
-msgid "Applying $patch"
+#: ../scripts/apatch.in:81
+#, fuzzy
+msgid "Applying patch %s\\n"
 msgstr "Application de $patch"
 
-#: ../scripts/apatch.in:116
-msgid "Patch $patch appears to be empty, applied"
+#: ../scripts/apatch.in:117
+#, fuzzy
+msgid "Patch %s appears to be empty, applied\\n"
 msgstr "Le patch $patch semble vide. Il a été appliqué."
 
-#: ../scripts/apatch.in:119
-msgid "Applied $patch (forced; needs refresh)"
+#: ../scripts/apatch.in:121
+#, fuzzy
+msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "$patch a été appliqué (forcé ; vous devriez le rafraîchir)"
 
-#: ../scripts/apatch.in:123
-msgid "Patch $patch does not apply (enforce with -f)"
+#: ../scripts/apatch.in:126
+#, fuzzy
+msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 "Le patch $patch ne s'applique pas proprement (forcez l'application avec -f)"
 
-#: ../scripts/apatch.in:180 ../scripts/rpatch.in:178
-msgid "The topmost patch $top needs to be refreshed first."
+#: ../scripts/apatch.in:184
+#, fuzzy
+msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Le patch au sommet $top doit être rafraichi au préalable."
 
-#: ../scripts/patchfns.in:702
+#: ../scripts/patchfns.in:700
+#, fuzzy
 msgid ""
-"The quilt meta-data in this tree has version $version, but this version of "
-"quilt can only handle meta-data formats up to and including version "
-"$DB_VERSION. Please pop all the patches using the version of quilt used to "
-"push them before downgrading."
+"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 "
+"all the patches using the version of quilt used to push them before "
+"downgrading.\\n"
 msgstr ""
 "Les méta-données de quilt dans cet arbre de travail sont au format \n"
 "v$version, mais cette version de quilt ne peut traiter que jusqu'au \n"
@@ -1018,22 +1092,83 @@ msgstr ""
 "version utilisée pour les appliquer avant d'installer une version\n"
 "plus ancienne."
 
-#: ../scripts/patchfns.in:764
+#: ../scripts/patchfns.in:765
+#, fuzzy
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
-"upgrade'."
+"upgrade'.\\n"
 msgstr ""
 "Votre arbre a été créé par une vieille version de quilt. Veuillez \n"
 "utiliser « quilt upgrade »."
 
 #: ../scripts/rpatch.in:22
-msgid "Usage: $0 [-fRq] patchname"
+#, fuzzy
+msgid "Usage: $0 [-fRq] patchname\\n"
 msgstr "Usage: $0 [-fRq] nom_de_patch"
 
 #: ../scripts/rpatch.in:100
-msgid "Patch $patch does not remove cleanly (enforce with -f)."
+#, fuzzy
+msgid "Patch %s does not remove cleanly (enforce with -f)\\n"
 msgstr "Le patch $patch ne se retire pas proprement (forcez avec -f)"
 
-#: ../scripts/rpatch.in:122
-msgid "Removing $patch"
+#: ../scripts/rpatch.in:123
+#, fuzzy
+msgid "Removing patch %s\\n"
 msgstr "Retrait de $patch"
+
+#: ../scripts/rpatch.in:179
+#, fuzzy
+msgid "Patch %s needs to be refreshed first.\\n"
+msgstr "Le patch au sommet $top doit être rafraichi au préalable."
+
+#, fuzzy
+#~ msgid "Patch %s is not applied.\\n"
+#~ msgstr "Le patch n'est pas appliqué"
+
+#, fuzzy
+#~ msgid "Diff failed, aborting.\\n"
+#~ msgstr "Le diff a échoué. Abandon."
+
+#, fuzzy
+#~ msgid "Patch file $patch_file appears to be empty\\n"
+#~ msgstr "Le fichier de patch $patch_file semble vide"
+
+#~ msgid "Patch $2 is not in series"
+#~ msgstr "Le patch $2 n'est pas dans la série"
+
+#~ msgid "Patch $patch is not applied"
+#~ msgstr "Le patch $patch n'est pas appliqué"
+
+#~ msgid "Usage: quilt applied [-n] [patch]"
+#~ msgstr "Usage : quilt applied [-n] [patch]"
+
+#~ msgid "Patch $patch is not in series"
+#~ msgstr "Le patch $patch n'est pas dans la série"
+
+#~ msgid "Patch $last_patch is not applied"
+#~ msgstr "Le patch $last_patch ne semble pas appliqué"
+
+#~ msgid "Cannot change into $QUILT_PC/$last_patch"
+#~ msgstr "Impossible d'entrer dans $QUILT_PC/$last_patch"
+
+#~ msgid "Patch $patch is applied."
+#~ msgstr "Le patch $patch est appliqué."
+
+#~ msgid ""
+#~ "Warning: directory $(echo $SUBDIR | sed -e 's:[^/]\\+:..:g')"
+#~ "$QUILT_PATCHES exists; ignoring"
+#~ msgstr ""
+#~ "Attention : le répertoire $(echo $SUBDIR | sed -e 's:[^/]\\+:..:g')"
+#~ "$QUILT_PATCHES existe; ignoré"
+
+#~ msgid "Patch $stop_at_patch is not applied."
+#~ msgstr "Le patch $stop_at_patch n'est pas appliqué."
+
+#~ msgid "Patch $opt_patch is not in series"
+#~ msgstr "Le patch $opt_patch est introuvable dans le fichier de série"
+
+#~ msgid "Directory $prefix$dir/$QUILT_PATCHES exists"
+#~ msgstr "Le répertoire $prefix$dir/$QUILT_PATCHES existe"
+
+#~ msgid "File $prefix$dir/series exists"
+#~ msgstr "Le fichier $prefix$dir/series existe."