Resync translation files.

5 files changed, 240 insertions, 194 deletions

diff --git a/po/de.po b/po/de.po
index 3fedef0..eb9864c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,19 +14,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: bin/quilt.in:32
+#: bin/quilt.in:36
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-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 "Vorhandene Befehle:"
 
-#: bin/quilt.in:40
+#: bin/quilt.in:44
 msgid ""
 "\n"
 "Global options:\n"
@@ -52,7 +52,8 @@ msgstr ""
 "\n"
 "--quiltrc datei\n"
 "\tVerwende die angegebene Konfigurationsdatei statt ~/.quiltrc (oder\n"
-"\t@ETCDIR@/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-Dokumentation\n"
+"\t@ETCDIR@/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-"
+"Dokumentation\n"
 "\tfür mögliche Einstellungen. Der Dateiname \\`-' bedeutet, dass keine\n"
 "\tResource-Datei eingelesen werden soll.\n"
 "\n"
@@ -181,7 +182,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Kein Patch %s\\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 "Patch %s ist momentan angewandt\\n"
 
@@ -320,14 +321,13 @@ msgstr ""
 msgid ""
 "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
 msgstr ""
-"Kann kein Diff mit -p%s erzeugen, bitte -p0, -p1 oder -pab verwenden."
-"\\n"
+"Kann kein Diff mit -p%s erzeugen, bitte -p0, -p1 oder -pab verwenden.\\n"
 
 #: quilt/diff.in:241
 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 "Patch %s ist nicht vor Patch %s angewandt\\n"
 
@@ -732,9 +732,9 @@ msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\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 ""
 "Verwendung: quilt mail {--mbox datei|--send} [-m text] [--prefix prefix] [--"
 "sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
@@ -756,6 +756,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"
@@ -819,32 +822,32 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n"
 
-#: quilt/mail.in:285
+#: quilt/mail.in:302
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender."
 
-#: quilt/mail.in:425
+#: quilt/mail.in:446
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n"
 
-#: quilt/mail.in:449
+#: quilt/mail.in:470
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n"
 
-#: quilt/mail.in:458
+#: quilt/mail.in:479
 msgid "File %s does not exist\\n"
 msgstr "Datei %s existiert nicht\\n"
 
-#: quilt/mail.in:518
+#: quilt/mail.in:539
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
 
-#: quilt/mail.in:521
+#: quilt/mail.in:542
 msgid "Introduction has no subject header\\n"
 msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
 
-#: quilt/mail.in:624
+#: quilt/mail.in:654
 msgid "Introduction saved as %s\\n"
 msgstr "Einleitung gespeichert als %s\\n"
 
@@ -857,7 +860,8 @@ msgstr "Verwendung: quilt new [-p n|-p ab] {patchname}\\n"
 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"
@@ -882,23 +886,27 @@ msgstr ""
 "im vorgesehenen Wurzelverzeichnis, falls Quilt ein Verzeichnis zu weit oben\n"
 "im Verzeichnisbaum verwendet.\n"
 
-#: quilt/new.in:75
+#: quilt/new.in:76
 #, fuzzy
 msgid ""
 "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n"
 msgstr ""
-"Kann Patches mit Level -p%s nicht aktualisieren, bitte -p0, -p1 "
-"oder -pab angeben\\n"
+"Kann Patches mit Level -p%s nicht aktualisieren, bitte -p0, -p1 oder -pab "
+"angeben\\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 "Patch %s existiert bereits\\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 "Konnte Patch %s nicht erzeugen\\n"
 
-#: quilt/new.in:104
+#: quilt/new.in:111
 msgid "Patch %s is now on top\\n"
 msgstr "Der oberste Patch ist jetzt %s\\n"
 
@@ -981,11 +989,11 @@ msgstr ""
 "\n"
 "-v\tViele Meldungen ausgeben.\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 "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\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 "Konnte temporäre Dateien nicht patchen\\n"
 
@@ -1011,7 +1019,7 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\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 "Keine Patches angewandt\\n"
 
@@ -1038,8 +1046,8 @@ msgid ""
 "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color"
 "[=always|auto|never]] [num|patch]\\n"
 msgstr ""
-"Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color"
-"[=always|auto|never]] [num|patch]\\n"
+"Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
+"color[=always|auto|never]] [num|patch]\\n"
 
 #: quilt/push.in:27
 #, fuzzy
@@ -1385,46 +1393,46 @@ msgstr "Konnte Änderungen an %s in Patch %s nicht zurücknehmen\\n"
 msgid "Changes to %s in patch %s reverted\\n"
 msgstr "Änderungen an %s in Patch %s zurückgenommen\\n"
 
-#: quilt/scripts/edmail.in:83
+#: quilt/scripts/edmail.in:96
 #, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
 msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n"
 
-#: quilt/scripts/edmail.in:101
+#: quilt/scripts/edmail.in:114
 #, perl-format
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Zustelladresse `%s' ist ungültig\n"
 
-#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539
+#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505
 #, fuzzy
 msgid "%s is not a regular file\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\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 "Keine Patches in der series-Datei\\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 ""
 
-#: quilt/scripts/patchfns.in:568
+#: quilt/scripts/patchfns.in:534
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:596
+#: quilt/scripts/patchfns.in:562
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/scripts/patchfns.in:633
+#: quilt/scripts/patchfns.in:599
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 
-#: quilt/scripts/patchfns.in:655
+#: quilt/scripts/patchfns.in:632
 msgid "Patch %s does not exist\\n"
 msgstr "Patch %s existiert nicht\\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 "
@@ -1437,7 +1445,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\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"
@@ -1510,8 +1518,8 @@ msgid ""
 "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
 "{specfile|seriesfile}\\n"
 msgstr ""
-"Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] "
-"[--fuzz=N] {spec-datei|series-datei}\\n"
+"Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--"
+"fuzz=N] {spec-datei|series-datei}\\n"
 
 #: quilt/setup.in:78
 #, fuzzy
@@ -1550,11 +1558,11 @@ msgstr ""
 msgid "The -v option will show rpm's output\\n"
 msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
 
-#: quilt/setup.in:189
+#: quilt/setup.in:195
 msgid "File %s not found\\n"
 msgstr "Datei %s nicht gefunden\\n"
 
-#: quilt/setup.in:192
+#: quilt/setup.in:198
 msgid "Unpacking archive %s\\n"
 msgstr "Entpacke Archiv %s\\n"
 
diff --git a/po/fr.po b/po/fr.po
index 47c1685..6dab694 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,19 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bin/quilt.in:32
+#: bin/quilt.in:36
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "Usage : quilt [--trace[=verbose]] [--quiltrc=XX] commande [-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 "Les commandes sont :"
 
-#: bin/quilt.in:40
+#: bin/quilt.in:44
 msgid ""
 "\n"
 "Global options:\n"
@@ -181,7 +181,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Pas de patch suivant\\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 "Le patch %s est actuellement appliqué\\n"
 
@@ -328,7 +328,7 @@ msgstr ""
 msgid "No snapshot to diff against\\n"
 msgstr "Pas d'instantané avec lequel comparer\\n"
 
-#: 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 "Le patch %s n'est pas appliqué avant %s\\n."
 
@@ -732,16 +732,18 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de série.\\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 ""
 "Usage : quilt mail {--mbox fichier|--send} [-m texte] [--prefix préfixe] [--"
 "sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
 "[--reply-to message] [premier_patch [dernier_patch]]\\n"
 
 #: quilt/mail.in:27
+#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from a specified range of patches, or all patches in\n"
@@ -756,6 +758,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"
@@ -828,32 +833,32 @@ msgstr ""
 "--reply-to message\n"
 "\tAjoute les en-têtes appropriés pour répondre au message spécifié.\n"
 
-#: quilt/mail.in:285
+#: quilt/mail.in:302
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr "Impossible de déterminer l'adresse d'expéditeur. Utilisez --sender."
 
-#: quilt/mail.in:425
+#: quilt/mail.in:446
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "Impossible d'extraire une ligne de sujet de %s\\n"
 
-#: quilt/mail.in:449
+#: quilt/mail.in:470
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "Les patches %s ont des sujets dupliqués.\\n"
 
-#: quilt/mail.in:458
+#: quilt/mail.in:479
 msgid "File %s does not exist\\n"
 msgstr "Le fichier %s n'existe pas\\n"
 
-#: quilt/mail.in:518
+#: quilt/mail.in:539
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 "L'introduction n'a pas de ligne de sujet (sauvegardé en tant que %s)\\n"
 
-#: quilt/mail.in:521
+#: quilt/mail.in:542
 msgid "Introduction has no subject header\\n"
 msgstr "L'introduction ne contient pas de ligne de sujet\\n"
 
-#: quilt/mail.in:624
+#: quilt/mail.in:654
 msgid "Introduction saved as %s\\n"
 msgstr "Introduction sauvegardée en tant que %s\\n"
 
@@ -862,10 +867,12 @@ msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n"
 msgstr "Usage : quilt new [-p n|-p ab] {nom_de_patch}\\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"
@@ -895,22 +902,26 @@ msgstr ""
 "répertoire devant être la racine si quilt choisi un répertoire trop haut\n"
 "dans l'arborescence.\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 ""
 "Impossible de créer des patchs avec -p%s. Veuillez spécifier -p0, -p1 ou -"
 "pab à la place.\\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 "Le patch %s existe déjà\\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 "Impossible de créer le patch %s\\n"
 
-#: quilt/new.in:104
+#: quilt/new.in:111
 msgid "Patch %s is now on top\\n"
 msgstr "Le patch %s est maintenant au sommet\\n"
 
@@ -999,11 +1010,11 @@ msgstr ""
 "\n"
 "-v\tOpère verbeusement.\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 "Impossible de copier les fichiers dans le répertoire temporaire\\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 "Impossible de patcher les fichiers temporaires\\n"
 
@@ -1029,7 +1040,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:261 quilt/scripts/patchfns.in:526
+#: quilt/pop.in:261 quilt/scripts/patchfns.in:492
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué\\n"
 
@@ -1409,45 +1420,45 @@ msgstr "Impossible de restaurer le fichier %s du patch %s.\\n"
 msgid "Changes to %s in patch %s reverted\\n"
 msgstr "Modifications de %s dans le patch %s annulées\\n"
 
-#: quilt/scripts/edmail.in:83
+#: quilt/scripts/edmail.in:96
 #, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
 msgstr "Le nom `%s' est mal parenthésé\n"
 
-#: quilt/scripts/edmail.in:101
+#: quilt/scripts/edmail.in:114
 #, perl-format
 msgid "Delivery address `%s' is invalid\n"
 msgstr "L'adresse de destination `%s' est invalide\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'est pas un fichier régulier\\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 "Aucun patch dans la série\\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 "Fichier de série non trouvé"
 
-#: quilt/scripts/patchfns.in:568
+#: quilt/scripts/patchfns.in:534
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la série\\n"
 
-#: quilt/scripts/patchfns.in:596
+#: quilt/scripts/patchfns.in:562
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
-#: quilt/scripts/patchfns.in:633
+#: quilt/scripts/patchfns.in:599
 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:655
+#: quilt/scripts/patchfns.in:632
 msgid "Patch %s does not exist\\n"
 msgstr "Le patch %s n'existe pas\\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 "
@@ -1459,7 +1470,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:1122
+#: quilt/scripts/patchfns.in:1089
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1573,11 +1584,11 @@ msgstr ""
 msgid "The -v option will show rpm's output\\n"
 msgstr "L'option -v montre les affichages de rpm\\\\n"
 
-#: quilt/setup.in:189
+#: quilt/setup.in:195
 msgid "File %s not found\\n"
 msgstr "Le fichier %s est introuvable\\n"
 
-#: quilt/setup.in:192
+#: quilt/setup.in:198
 msgid "Unpacking archive %s\\n"
 msgstr "Désarchivage de %s\\n"
 
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"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 33da106..940843b 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -1,16 +1,16 @@
-#: bin/quilt.in:32
+#: bin/quilt.in:36
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr ""
 
-#: bin/quilt.in:33
+#: bin/quilt.in:37
 msgid "       quilt --version"
 msgstr ""
 
-#: 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"
@@ -119,7 +119,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr ""
 
-#: 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 ""
 
@@ -211,7 +211,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 ""
 
@@ -483,9 +483,9 @@ msgstr ""
 
 #: quilt/mail.in:24
 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.in:27
@@ -503,6 +503,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"
@@ -533,31 +536,31 @@ msgid ""
 "\tAdd the appropriate headers to reply to the specified message.\n"
 msgstr ""
 
-#: quilt/mail.in:285
+#: quilt/mail.in:302
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:425
+#: quilt/mail.in:446
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:449
+#: quilt/mail.in:470
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:458
+#: quilt/mail.in:479
 msgid "File %s does not exist\\n"
 msgstr ""
 
-#: quilt/mail.in:518
+#: quilt/mail.in:539
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 
-#: quilt/mail.in:521
+#: quilt/mail.in:542
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:624
+#: quilt/mail.in:654
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
@@ -569,7 +572,8 @@ msgstr ""
 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"
@@ -584,20 +588,24 @@ msgid ""
 "in the directory tree.\n"
 msgstr ""
 
-#: quilt/new.in:75
+#: quilt/new.in:76
 msgid ""
 "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n"
 msgstr ""
 
-#: 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 ""
 
-#: quilt/new.in:101 quilt/refresh.in:342
+#: quilt/new.in:108 quilt/refresh.in:342
 msgid "Failed to create patch %s\\n"
 msgstr ""
 
-#: quilt/new.in:104
+#: quilt/new.in:111
 msgid "Patch %s is now on top\\n"
 msgstr ""
 
@@ -653,11 +661,11 @@ msgid ""
 "-v\tVerbose operation.\n"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
@@ -681,7 +689,7 @@ msgstr ""
 msgid "No patch removed\\n"
 msgstr ""
 
-#: quilt/pop.in:261 quilt/scripts/patchfns.in:526
+#: quilt/pop.in:261 quilt/scripts/patchfns.in:492
 msgid "No patches applied\\n"
 msgstr ""
 
@@ -941,45 +949,45 @@ msgstr ""
 msgid "Changes to %s in patch %s reverted\\n"
 msgstr ""
 
-#: quilt/scripts/edmail.in:83
+#: quilt/scripts/edmail.in:96
 #, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
 msgstr ""
 
-#: quilt/scripts/edmail.in:101
+#: quilt/scripts/edmail.in:114
 #, perl-format
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: quilt/scripts/patchfns.in:568
+#: quilt/scripts/patchfns.in:534
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:596
+#: quilt/scripts/patchfns.in:562
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:633
+#: quilt/scripts/patchfns.in:599
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:655
+#: quilt/scripts/patchfns.in:632
 msgid "Patch %s does not exist\\n"
 msgstr ""
 
-#: 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 "
@@ -987,7 +995,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: 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"
@@ -1079,11 +1087,11 @@ msgstr ""
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:189
+#: quilt/setup.in:195
 msgid "File %s not found\\n"
 msgstr ""
 
-#: quilt/setup.in:192
+#: quilt/setup.in:198
 msgid "Unpacking archive %s\\n"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 3b6e344..1119a27 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,19 +17,19 @@ msgstr ""
 "X-Launchpad-Export-Date: 2011-09-20 08:04+0000\n"
 "X-Generator: Launchpad (build 13980)\n"
 
-#: bin/quilt.in:32
+#: bin/quilt.in:36
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "Синтаксис: quilt [--trace[=verbose]] [--quiltrc=XX] команда [-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
 #, fuzzy
 msgid ""
 "\n"
@@ -180,7 +180,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"
 
@@ -324,7 +324,7 @@ msgstr "Невозможно сравнить патчи с -p%s, использ
 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"
 
@@ -697,9 +697,9 @@ msgstr "Не удалось вставить патч %s в файл series\\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} [--from ...] [--to ...] [--"
 "cc ...] [--bcc ...] [--subject ...]\\n"
@@ -719,6 +719,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"
@@ -749,32 +752,32 @@ msgid ""
 "\tAdd the appropriate headers to reply to the specified message.\n"
 msgstr ""
 
-#: quilt/mail.in:285
+#: quilt/mail.in:302
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:425
+#: quilt/mail.in:446
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:449
+#: quilt/mail.in:470
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:458
+#: quilt/mail.in:479
 #, fuzzy
 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 ""
 
-#: quilt/mail.in:521
+#: quilt/mail.in:542
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:624
+#: quilt/mail.in:654
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
@@ -787,7 +790,8 @@ msgstr "Синтаксис: quilt new {имя-патча}\\n"
 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"
@@ -802,21 +806,25 @@ msgid ""
 "in the directory tree.\n"
 msgstr ""
 
-#: quilt/new.in:75
+#: quilt/new.in:76
 #, fuzzy
 msgid ""
 "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n"
 msgstr "Не удалось обновить патчи с -p%s, используйте -p0 или -p1\\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"
 
@@ -900,11 +908,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"
 
@@ -930,7 +938,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"
 
@@ -1296,48 +1304,48 @@ msgstr "Не удалось удалить файл %s из патча %s\\n"
 msgid "Changes to %s in patch %s reverted\\n"
 msgstr "Не удалось вставить патч %s в файл series\\n"
 
-#: quilt/scripts/edmail.in:83
+#: quilt/scripts/edmail.in:96
 #, fuzzy, perl-format
 msgid "Display name `%s' contains unpaired parentheses\n"
 msgstr "Отображаемое имя '%s' содержит непарные скобки\n"
 
-#: quilt/scripts/edmail.in:101
+#: quilt/scripts/edmail.in:114
 #, fuzzy, 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
 #, fuzzy
 msgid "%s is not a regular file\\n"
 msgstr "Патч %s не входит в файл series\\n"
 
-#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510
+#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476
 #, fuzzy
 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 ""
 
-#: quilt/scripts/patchfns.in:568
+#: quilt/scripts/patchfns.in:534
 msgid "Patch %s is not in series\\n"
 msgstr "Патч %s не в серии\\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 "Серия файлов полностью применена, заканчивается на патче %s\\n"
 
-#: quilt/scripts/patchfns.in:655
+#: quilt/scripts/patchfns.in:632
 #, fuzzy
 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 "
@@ -1349,7 +1357,7 @@ msgstr ""
 "отмените все патчи, используя версию quilt, которая использовалась для их "
 "наложения, прежде чем использовать эту версию.\\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"
@@ -1457,12 +1465,12 @@ msgstr ""
 msgid "The -v option will show rpm's output\\n"
 msgstr "Опция -v покажет вывод rpm\\n"
 
-#: quilt/setup.in:189
+#: quilt/setup.in:195
 #, fuzzy
 msgid "File %s not found\\n"
 msgstr "Файл %s не изменяется\\n"
 
-#: quilt/setup.in:192
+#: quilt/setup.in:198
 msgid "Unpacking archive %s\\n"
 msgstr "Распаковка архива %s\\n"