Resync translation files

5 files changed, 544 insertions, 295 deletions

diff --git a/po/de.po b/po/de.po
index 923074d..9f18f6d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -183,7 +183,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Kein Patch %s\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:604
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
 msgid "Patch %s is currently applied\\n"
 msgstr "Patch %s ist momentan angewandt\\n"
 
@@ -330,7 +330,7 @@ msgstr ""
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
 
@@ -829,37 +829,37 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n"
 
-#: quilt/mail.in:192 quilt/mail.in:200
+#: quilt/mail.in:204 quilt/mail.in:212
 #, fuzzy
 msgid "Introduction message already specified"
 msgstr "Einleitung gespeichert als %s\\n"
 
-#: quilt/mail.in:305
+#: quilt/mail.in:310
 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:450
+#: quilt/mail.in:455
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n"
 
-#: quilt/mail.in:474
+#: quilt/mail.in:479
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n"
 
-#: quilt/mail.in:483
+#: quilt/mail.in:488
 msgid "File %s does not exist\\n"
 msgstr "Datei %s existiert nicht\\n"
 
-#: quilt/mail.in:543
+#: quilt/mail.in:548
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
 
-#: quilt/mail.in:546
+#: quilt/mail.in:551
 msgid "Introduction has no subject header\\n"
 msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
 
-#: quilt/mail.in:660
+#: quilt/mail.in:665
 msgid "Introduction saved as %s\\n"
 msgstr "Einleitung gespeichert als %s\\n"
 
@@ -963,10 +963,12 @@ msgstr ""
 "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n"
 
 #: quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
+#, fuzzy
+msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n"
 msgstr "Verwendung: quilt pop [-afRqv] [num|patch]\\n"
 
 #: quilt/pop.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -987,6 +989,9 @@ msgid ""
 "-q\tQuiet operation.\n"
 "\n"
 "-v\tVerbose operation.\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 "\n"
 "Entferne Patches vom Stapel der angewandten Patches. Es kann eine Anzahl\n"
@@ -1007,37 +1012,41 @@ msgstr ""
 "\n"
 "-v\tViele Meldungen ausgeben.\n"
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:880
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
 
-#: quilt/pop.in:125
+#: quilt/pop.in:128
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 "Patch %s kann nicht entfernt werden (Patch aktualisieren oder entfernen "
 "erzwingen mit -f)\\n"
 
-#: quilt/pop.in:150
+#: quilt/pop.in:153
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "Patch %s scheint leer zu sein; wird entfernt\\n"
 
-#: quilt/pop.in:155
+#: quilt/pop.in:158
 msgid "Removing patch %s\\n"
 msgstr "Entferne patch %s\\n"
 
-#: quilt/pop.in:226
+#: quilt/pop.in:216 quilt/push.in:373
+msgid "Options %s and %s are mutually exclusive\\n"
+msgstr ""
+
+#: quilt/pop.in:238
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 
-#: quilt/pop.in:236
+#: quilt/pop.in:248
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: quilt/pop.in:252 quilt/scripts/patchfns.in:513
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
-#: quilt/pop.in:259 quilt/push.in:422
+#: quilt/pop.in:279 quilt/push.in:437
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -1056,9 +1065,10 @@ msgstr ""
 "Patch in der series-Datei aus.\n"
 
 #: quilt/push.in:24
+#, fuzzy
 msgid ""
 "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [num|patch]\\n"
+"color[=always|auto|never]] [--refresh] [num|patch]\\n"
 msgstr ""
 "Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
 "color[=always|auto|never]] [num|patch]\\n"
@@ -1078,8 +1088,7 @@ msgid ""
 "\n"
 "-q\tQuiet operation.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
-"\tapply the patch interactively: the patch utility may ask questions.\n"
+"-f\tForce apply, even if the patch has rejects.\n"
 "\n"
 "-v\tVerbose operation.\n"
 "\n"
@@ -1095,6 +1104,9 @@ msgid ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch after it was successfully applied.\n"
 msgstr ""
 "\n"
 "Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n"
@@ -1120,43 +1132,48 @@ msgstr ""
 "--color[=always|auto|never]\n"
 "\tSyntax-Einfärbung aktivieren (immer, automatisch, nie).\n"
 
-#: quilt/push.in:68
+#: quilt/push.in:70
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
 
-#: quilt/push.in:181
+#: quilt/push.in:183
 msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:217
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:221
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Patch %s scheint leer zu sein; angewandt\\n"
 
-#: quilt/push.in:223
+#: quilt/push.in:225
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n"
 
-#: quilt/push.in:233
+#: quilt/push.in:235
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Patch %s kann verkehrt angewandt werden\\n"
 
-#: quilt/push.in:236
+#: quilt/push.in:238
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
 
-#: quilt/push.in:291
+#: quilt/push.in:293
 #, fuzzy
 msgid "Patch %s is already applied; check your series file\\n"
 msgstr "Patch %s existiert bereits, bitte einen anderen Namen wählen\\n"
 
-#: quilt/push.in:396
+#: quilt/push.in:405
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 
+#: quilt/push.in:413
+#, fuzzy
+msgid "No patch applied\\n"
+msgstr "Keine Patches angewandt\\n"
+
 #: quilt/refresh.in:22
 msgid ""
 "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
@@ -1429,36 +1446,36 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n"
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Zustelladresse `%s' ist ungültig\n"
 
-#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526
+#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
 #, fuzzy
 msgid "%s is not a regular file\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497
+#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
 msgid "No patches in series\\n"
 msgstr "Keine Patches in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499
+#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
 msgid "No series file found\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:554
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:583
+#: quilt/scripts/patchfns.in:582
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/scripts/patchfns.in:620
+#: quilt/scripts/patchfns.in:619
 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:898
+#: quilt/scripts/patchfns.in:902
 msgid "Failed to patch temporary files\\n"
 msgstr "Konnte temporäre Dateien nicht patchen\\n"
 
-#: quilt/scripts/patchfns.in:941
+#: 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 "
@@ -1471,7 +1488,11 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:1094
+#: quilt/scripts/patchfns.in:1018
+msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1138
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1479,6 +1500,12 @@ msgstr ""
 "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. "
 "Bitte führen Sie \\`quilt upgrade' aus.\\n"
 
+#: quilt/scripts/patchfns.in:1146
+msgid ""
+"The series file no longer matches the applied patches. Please run 'quilt pop "
+"-a'.\\n"
+msgstr ""
+
 #: quilt/scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
@@ -1537,24 +1564,24 @@ msgstr ""
 "\n"
 "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n"
 
-#: quilt/setup.in:35 quilt/setup.in:55
+#: quilt/setup.in:38 quilt/setup.in:58
 msgid "Directory %s exists\\n"
 msgstr "Verzeichnis %s existiert\\n"
 
-#: quilt/setup.in:61
+#: quilt/setup.in:64
 msgid "File %s exists\\n"
 msgstr "Datei %s existiert\\n"
 
-#: quilt/setup.in:102
+#: quilt/setup.in:264
+#, fuzzy
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
-"{specfile|seriesfile}\\n"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
+"slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 "Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--"
 "fuzz=N] {spec-datei|series-datei}\\n"
 
-#: quilt/setup.in:105
-#, fuzzy
+#: quilt/setup.in:267
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1568,37 +1595,38 @@ msgid ""
 "\n"
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
-msgstr ""
-"\n"
-"Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt "
-"series-Datei.\n"
 "\n"
-"-d\tOptionaler Pfad-Präfix für den erzeugten Quellbaum.\n"
+"--slow\tUse the original, slow method to process the spec file. This is the\n"
+"\tdefault for now, but that might change in the future. In this mode,\n"
+"\trpmbuild generates a working tree in a temporary directory while all\n"
+"\tits actions are recorded, and then everything is replayed from scratch\n"
+"\tin the target directory.\n"
 "\n"
-"--sourcedir\n"
-"\tVerzeichnis, das die Paketquellen enthält. (Default: \\`.'.)\n"
-"\n"
-"-v\tAusführliche Ausgabe.\n"
+"--fast\tUse an alternative, faster method to process the spec file. In this\n"
+"\tmode, rpmbuild is told to generate a working tree directly in the\n"
+"\ttarget directory. If the input is a series file, it is assumed that\n"
+"\tall archives have been extracted manually beforehand.\n"
+msgstr ""
 
-#: quilt/setup.in:176
+#: quilt/setup.in:371
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Der %%prep-Abschnitt von %s ist fehlgeschlagen; die Ergebnisse sind "
 "möglicherweise unvollständig\\n"
 
-#: quilt/setup.in:179
+#: quilt/setup.in:374
 msgid "The -v option will show rpm's output\\n"
 msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
 
-#: quilt/setup.in:231 quilt/setup.in:243
+#: quilt/setup.in:428 quilt/setup.in:440
 msgid "File %s not found\\n"
 msgstr "Datei %s nicht gefunden\\n"
 
-#: quilt/setup.in:234 quilt/setup.in:246
+#: quilt/setup.in:431 quilt/setup.in:443
 msgid "Unpacking archive %s\\n"
 msgstr "Entpacke Archiv %s\\n"
 
-#: quilt/setup.in:255
+#: quilt/setup.in:453
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
@@ -1702,6 +1730,32 @@ msgstr ""
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Initializes a source tree from an rpm spec file or a quilt series file.\n"
+#~ "\n"
+#~ "-d\tOptional path prefix for the resulting source tree.\n"
+#~ "\n"
+#~ "--sourcedir\n"
+#~ "\tDirectory that contains the package sources. Defaults to \\`.'.\n"
+#~ "\n"
+#~ "-v\tVerbose debug output.\n"
+#~ "\n"
+#~ "--fuzz=N\n"
+#~ "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt "
+#~ "series-Datei.\n"
+#~ "\n"
+#~ "-d\tOptionaler Pfad-Präfix für den erzeugten Quellbaum.\n"
+#~ "\n"
+#~ "--sourcedir\n"
+#~ "\tVerzeichnis, das die Paketquellen enthält. (Default: \\`.'.)\n"
+#~ "\n"
+#~ "-v\tAusführliche Ausgabe.\n"
+
 #~ msgid ""
 #~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 72dc867..d2fd7e2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -183,7 +183,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Pas de patch suivant\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:604
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
 msgid "Patch %s is currently applied\\n"
 msgstr "Le patch %s est actuellement appliqué\\n"
 
@@ -332,7 +332,7 @@ msgstr ""
 msgid "No snapshot to diff against\\n"
 msgstr "Pas d'instantané avec lequel comparer\\n"
 
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Le patch %s n'est pas appliqué avant %s\\n."
 
@@ -842,36 +842,36 @@ msgstr ""
 "--reply-to message\n"
 "\tAjoute les en-têtes appropriés pour répondre au message spécifié.\n"
 
-#: quilt/mail.in:192 quilt/mail.in:200
+#: quilt/mail.in:204 quilt/mail.in:212
 msgid "Introduction message already specified"
 msgstr "Message d'introduction déjà spécifié"
 
-#: quilt/mail.in:305
+#: quilt/mail.in:310
 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:450
+#: quilt/mail.in:455
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "Impossible d'extraire une ligne de sujet de %s\\n"
 
-#: quilt/mail.in:474
+#: quilt/mail.in:479
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "Les patches %s ont des sujets dupliqués.\\n"
 
-#: quilt/mail.in:483
+#: quilt/mail.in:488
 msgid "File %s does not exist\\n"
 msgstr "Le fichier %s n'existe pas\\n"
 
-#: quilt/mail.in:543
+#: quilt/mail.in:548
 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:546
+#: quilt/mail.in:551
 msgid "Introduction has no subject header\\n"
 msgstr "L'introduction ne contient pas de ligne de sujet\\n"
 
-#: quilt/mail.in:660
+#: quilt/mail.in:665
 msgid "Introduction saved as %s\\n"
 msgstr "Introduction sauvegardée en tant que %s\\n"
 
@@ -989,10 +989,12 @@ msgstr ""
 "\t«auto» n'est activé par défaut que si la sortie est un tty.\n"
 
 #: quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
+#, fuzzy
+msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n"
 msgstr "Usage : quilt pop [-afRqv] [num|patch]\\n"
 
 #: quilt/pop.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -1013,6 +1015,9 @@ msgid ""
 "-q\tQuiet operation.\n"
 "\n"
 "-v\tVerbose operation.\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 "\n"
 "Retire un ou plusieurs patches de la pile. Si aucun argument n'est \n"
@@ -1034,37 +1039,41 @@ msgstr ""
 "\n"
 "-v\tOpère verbeusement.\n"
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:880
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n"
 
-#: quilt/pop.in:125
+#: quilt/pop.in:128
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 "Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -"
 "f)\\n"
 
-#: quilt/pop.in:150
+#: quilt/pop.in:153
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "Le patch %s semble vide, enlevé\\n"
 
-#: quilt/pop.in:155
+#: quilt/pop.in:158
 msgid "Removing patch %s\\n"
 msgstr "Retrait de %s\\n"
 
-#: quilt/pop.in:226
+#: quilt/pop.in:216 quilt/push.in:373
+msgid "Options %s and %s are mutually exclusive\\n"
+msgstr ""
+
+#: quilt/pop.in:238
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Le patch %s doit être rafraichi au préalable.\\n"
 
-#: quilt/pop.in:236
+#: quilt/pop.in:248
 msgid "No patch removed\\n"
 msgstr "Aucun patch retiré\\n"
 
-#: quilt/pop.in:252 quilt/scripts/patchfns.in:513
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué\\n"
 
-#: quilt/pop.in:259 quilt/push.in:422
+#: quilt/pop.in:279 quilt/push.in:437
 msgid "Now at patch %s\\n"
 msgstr "Le patch %s est maintenant au sommet\\n"
 
@@ -1085,14 +1094,16 @@ msgstr ""
 "-n\tAffiche le nom de fichier au lieu du nom de patch.\n"
 
 #: quilt/push.in:24
+#, fuzzy
 msgid ""
 "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [num|patch]\\n"
+"color[=always|auto|never]] [--refresh] [num|patch]\\n"
 msgstr ""
 "Usage : quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
 "color[=always|auto|never]] [num|patch]\\n"
 
 #: quilt/push.in:27
+#, fuzzy
 msgid ""
 "\n"
 "Apply patch(es) from the series file.  Without options, the next patch\n"
@@ -1106,8 +1117,7 @@ msgid ""
 "\n"
 "-q\tQuiet operation.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
-"\tapply the patch interactively: the patch utility may ask questions.\n"
+"-f\tForce apply, even if the patch has rejects.\n"
 "\n"
 "-v\tVerbose operation.\n"
 "\n"
@@ -1123,6 +1133,9 @@ msgid ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch after it was successfully applied.\n"
 msgstr ""
 "\n"
 "Applique un ou plusieurs patches de la série.  Si aucun argument n'est\n"
@@ -1157,43 +1170,48 @@ msgstr ""
 "\tautomatique («auto») ou jamais («never»).\n"
 "\t«auto» n'est activé par défaut que si la sortie est un tty.\n"
 
-#: quilt/push.in:68
+#: quilt/push.in:70
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n"
 
-#: quilt/push.in:181
+#: quilt/push.in:183
 msgid "Applying patch %s\\n"
 msgstr "Application de %s\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:217
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:221
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
 
-#: quilt/push.in:223
+#: quilt/push.in:225
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
 
-#: quilt/push.in:233
+#: quilt/push.in:235
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Le patch %s peut être appliqué à l'envers\\n"
 
-#: quilt/push.in:236
+#: quilt/push.in:238
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n"
 
-#: quilt/push.in:291
+#: quilt/push.in:293
 msgid "Patch %s is already applied; check your series file\\n"
 msgstr "Le patch %s est déjà appliqué. Vérifiez votre fichier series.\\n"
 
-#: quilt/push.in:396
+#: quilt/push.in:405
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
 
+#: quilt/push.in:413
+#, fuzzy
+msgid "No patch applied\\n"
+msgstr "Aucun patch n'est appliqué\\n"
+
 #: quilt/refresh.in:22
 msgid ""
 "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
@@ -1460,35 +1478,35 @@ msgstr "Le nom `%s' est mal parenthésé\n"
 msgid "Delivery address `%s' is invalid\n"
 msgstr "L'adresse de destination `%s' est invalide\n"
 
-#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526
+#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
 msgid "%s is not a regular file\\n"
 msgstr "%s n'est pas un fichier régulier\\n"
 
-#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497
+#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
 msgid "No patches in series\\n"
 msgstr "Aucun patch dans la série\\n"
 
-#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499
+#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
 msgid "No series file found\\n"
 msgstr "Fichier de série non trouvé\\n"
 
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:554
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la série\\n"
 
-#: quilt/scripts/patchfns.in:583
+#: quilt/scripts/patchfns.in:582
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
-#: quilt/scripts/patchfns.in:620
+#: quilt/scripts/patchfns.in:619
 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:898
+#: quilt/scripts/patchfns.in:902
 msgid "Failed to patch temporary files\\n"
 msgstr "Impossible de patcher les fichiers temporaires\\n"
 
-#: quilt/scripts/patchfns.in:941
+#: 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 "
@@ -1500,7 +1518,11 @@ 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:1094
+#: quilt/scripts/patchfns.in:1018
+msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1138
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1508,6 +1530,12 @@ msgstr ""
 "Votre arbre a été créé par une vieille version de quilt. Veuillez \n"
 "utiliser « quilt upgrade ».\\n"
 
+#: quilt/scripts/patchfns.in:1146
+msgid ""
+"The series file no longer matches the applied patches. Please run 'quilt pop "
+"-a'.\\n"
+msgstr ""
+
 #: quilt/scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
@@ -1566,23 +1594,24 @@ msgstr ""
 "\n"
 "-v\tAffichage verbeux, plus simple à lire.\n"
 
-#: quilt/setup.in:35 quilt/setup.in:55
+#: quilt/setup.in:38 quilt/setup.in:58
 msgid "Directory %s exists\\n"
 msgstr "Le répertoire %s existe\\n"
 
-#: quilt/setup.in:61
+#: quilt/setup.in:64
 msgid "File %s exists\\n"
 msgstr "Le fichier %s existe\\n"
 
-#: quilt/setup.in:102
+#: quilt/setup.in:264
+#, fuzzy
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
-"{specfile|seriesfile}\\n"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
+"slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 "Usage : quilt setup [-d répertoire_source] [-v] [--sourcedir répertoire] [--"
 "fuzz=N] {fichier_spec|fichier_séries}\\n"
 
-#: quilt/setup.in:105
+#: quilt/setup.in:267
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1596,39 +1625,37 @@ msgid ""
 "\n"
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
-msgstr ""
 "\n"
-"Initialise un arbre de sources à partir d'un fichier de\n"
-"spécification rpm, ou d'un fichier de série quilt.\n"
+"--slow\tUse the original, slow method to process the spec file. This is the\n"
+"\tdefault for now, but that might change in the future. In this mode,\n"
+"\trpmbuild generates a working tree in a temporary directory while all\n"
+"\tits actions are recorded, and then everything is replayed from scratch\n"
+"\tin the target directory.\n"
 "\n"
-"-d\tPréfixe de chemin optionel (sous-répertoire).\n"
-"\n"
-"--sourcefdir\n"
-"\tRépertoire contenant les sources. Valeur par défaut : \\`.'.\n"
-"\n"
-"-v\tAffichage verbeux pour le debug.\n"
-"\n"
-"--fuzz=N\n"
-"\tDéfinit le niveau maximum de flou (nécessite rpm 4.6 ou supérieur).\n"
+"--fast\tUse an alternative, faster method to process the spec file. In this\n"
+"\tmode, rpmbuild is told to generate a working tree directly in the\n"
+"\ttarget directory. If the input is a series file, it is assumed that\n"
+"\tall archives have been extracted manually beforehand.\n"
+msgstr ""
 
-#: quilt/setup.in:176
+#: quilt/setup.in:371
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "La section %%prep de %s a échoué ; les résultats sont peut-être incomplets\\n"
 
-#: quilt/setup.in:179
+#: quilt/setup.in:374
 msgid "The -v option will show rpm's output\\n"
 msgstr "L'option -v montre les affichages de rpm\\\\n"
 
-#: quilt/setup.in:231 quilt/setup.in:243
+#: quilt/setup.in:428 quilt/setup.in:440
 msgid "File %s not found\\n"
 msgstr "Le fichier %s est introuvable\\n"
 
-#: quilt/setup.in:234 quilt/setup.in:246
+#: quilt/setup.in:431 quilt/setup.in:443
 msgid "Unpacking archive %s\\n"
 msgstr "Désarchivage de %s\\n"
 
-#: quilt/setup.in:255
+#: quilt/setup.in:453
 msgid "Trying alternative patches and series names..."
 msgstr "Tentative d'utilisation des noms de patches et séries alternatifs..."
 
@@ -1732,3 +1759,31 @@ msgstr ""
 "Veuillez retirer tous les patchs en utilisant « quilt pop -a » avec la \n"
 "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"
+
+#~ msgid ""
+#~ "\n"
+#~ "Initializes a source tree from an rpm spec file or a quilt series file.\n"
+#~ "\n"
+#~ "-d\tOptional path prefix for the resulting source tree.\n"
+#~ "\n"
+#~ "--sourcedir\n"
+#~ "\tDirectory that contains the package sources. Defaults to \\`.'.\n"
+#~ "\n"
+#~ "-v\tVerbose debug output.\n"
+#~ "\n"
+#~ "--fuzz=N\n"
+#~ "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Initialise un arbre de sources à partir d'un fichier de\n"
+#~ "spécification rpm, ou d'un fichier de série quilt.\n"
+#~ "\n"
+#~ "-d\tPréfixe de chemin optionel (sous-répertoire).\n"
+#~ "\n"
+#~ "--sourcefdir\n"
+#~ "\tRépertoire contenant les sources. Valeur par défaut : \\`.'.\n"
+#~ "\n"
+#~ "-v\tAffichage verbeux pour le debug.\n"
+#~ "\n"
+#~ "--fuzz=N\n"
+#~ "\tDéfinit le niveau maximum de flou (nécessite rpm 4.6 ou supérieur).\n"
diff --git a/po/ja.po b/po/ja.po
index f04c22d..8e72905 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -178,7 +178,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "次のパッチはありません\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:604
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
 msgid "Patch %s is currently applied\\n"
 msgstr "パッチ %s は現在適用されています\\n"
 
@@ -321,7 +321,7 @@ msgstr ""
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n"
 
@@ -813,38 +813,38 @@ msgstr ""
 "--reply-to メッセージ\n"
 "\t指定されたメッセージへのリプライとなるように、適切なヘッダを追加。\n"
 
-#: quilt/mail.in:192 quilt/mail.in:200
+#: quilt/mail.in:204 quilt/mail.in:212
 #, fuzzy
 msgid "Introduction message already specified"
 msgstr "序文は %s という名前で保存されました\\n"
 
-#: quilt/mail.in:305
+#: quilt/mail.in:310
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n"
 "を使用してください。"
 
-#: quilt/mail.in:450
+#: quilt/mail.in:455
 msgid "Unable to extract a subject header from %s\\n"
 msgstr "%s から件名を取り出せません。\\n"
 
-#: quilt/mail.in:474
+#: quilt/mail.in:479
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr "パッチ %s の件名が重複しています。\\n"
 
-#: quilt/mail.in:483
+#: quilt/mail.in:488
 msgid "File %s does not exist\\n"
 msgstr "ファイル %s が存在しません\\n"
 
-#: quilt/mail.in:543
+#: quilt/mail.in:548
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr "序文に件名がありません(%s として保存されました)\\n"
 
-#: quilt/mail.in:546
+#: quilt/mail.in:551
 msgid "Introduction has no subject header\\n"
 msgstr "序文に件名がありません\\n"
 
-#: quilt/mail.in:660
+#: quilt/mail.in:665
 msgid "Introduction saved as %s\\n"
 msgstr "序文は %s という名前で保存されました\\n"
 
@@ -952,10 +952,12 @@ msgstr ""
 "-v\t詳細で見やすい表示。\n"
 
 #: quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
+#, fuzzy
+msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n"
 msgstr "使い方: quilt pop [-afRqv] [数字|パッチ]\\n"
 
 #: quilt/pop.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -976,6 +978,9 @@ msgid ""
 "-q\tQuiet operation.\n"
 "\n"
 "-v\tVerbose operation.\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 "\n"
 "適用されているパッチスタックからパッチをはずす。オプションが無い場合は\n"
@@ -997,37 +1002,41 @@ msgstr ""
 "\n"
 "-v\t詳細に表示。\n"
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:880
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
 
-#: quilt/pop.in:125
+#: quilt/pop.in:128
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n"
 "けてはずしてください)\\n"
 
-#: quilt/pop.in:150
+#: quilt/pop.in:153
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "パッチ %s は、空のようです。はずします\\n"
 
-#: quilt/pop.in:155
+#: quilt/pop.in:158
 msgid "Removing patch %s\\n"
 msgstr "パッチ %s をはずします\\n"
 
-#: quilt/pop.in:226
+#: quilt/pop.in:216 quilt/push.in:373
+msgid "Options %s and %s are mutually exclusive\\n"
+msgstr ""
+
+#: quilt/pop.in:238
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
 
-#: quilt/pop.in:236
+#: quilt/pop.in:248
 msgid "No patch removed\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop.in:252 quilt/scripts/patchfns.in:513
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop.in:259 quilt/push.in:422
+#: quilt/pop.in:279 quilt/push.in:437
 msgid "Now at patch %s\\n"
 msgstr "現在位置はパッチ %s です\\n"
 
@@ -1046,9 +1055,10 @@ msgstr ""
 "されたパッチの前のパッチ名を表示。\n"
 
 #: quilt/push.in:24
+#, fuzzy
 msgid ""
 "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [num|patch]\\n"
+"color[=always|auto|never]] [--refresh] [num|patch]\\n"
 msgstr ""
 "使い方: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
 "color[=always|auto|never]] [num|patch]\\n"
@@ -1068,8 +1078,7 @@ msgid ""
 "\n"
 "-q\tQuiet operation.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
-"\tapply the patch interactively: the patch utility may ask questions.\n"
+"-f\tForce apply, even if the patch has rejects.\n"
 "\n"
 "-v\tVerbose operation.\n"
 "\n"
@@ -1085,6 +1094,9 @@ msgid ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch after it was successfully applied.\n"
 msgstr ""
 "\n"
 "seriesに登録されているパッチを適用する。オプションが無い場合は series\n"
@@ -1117,44 +1129,49 @@ msgstr ""
 "        シンタックスの色付けを行なう。\n"
 "\n"
 
-#: quilt/push.in:68
+#: quilt/push.in:70
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "ユーザによって中断されました。パッチ %s は適用されていません。\\n"
 
-#: quilt/push.in:181
+#: quilt/push.in:183
 msgid "Applying patch %s\\n"
 msgstr "パッチ %s を適用しています\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:217
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:221
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "パッチ %s は空のようですが、適用しました\\n"
 
-#: quilt/push.in:223
+#: quilt/push.in:225
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 "パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n"
 
-#: quilt/push.in:233
+#: quilt/push.in:235
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "パッチ %s は、反転して適用することができます\\n"
 
-#: quilt/push.in:236
+#: quilt/push.in:238
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n"
 
-#: quilt/push.in:291
+#: quilt/push.in:293
 #, fuzzy
 msgid "Patch %s is already applied; check your series file\\n"
 msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n"
 
-#: quilt/push.in:396
+#: quilt/push.in:405
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
 
+#: quilt/push.in:413
+#, fuzzy
+msgid "No patch applied\\n"
+msgstr "適用されているパッチはありません\\n"
+
 #: quilt/refresh.in:22
 msgid ""
 "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
@@ -1417,36 +1434,36 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます
 msgid "Delivery address `%s' is invalid\n"
 msgstr "配送先のアドレス `%s' が不正です\n"
 
-#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526
+#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
 msgid "%s is not a regular file\\n"
 msgstr "%s は普通のファイルではありません\\n"
 
-#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497
+#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
 msgid "No patches in series\\n"
 msgstr "シリーズに登録されているパッチがありません\\n"
 
-#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499
+#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
 msgid "No series file found\\n"
 msgstr "シリーズファイルが見つかりません\\n"
 
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:554
 msgid "Patch %s is not in series\\n"
 msgstr "パッチ %s は seriesの中にありません\\n"
 
-#: quilt/scripts/patchfns.in:583
+#: quilt/scripts/patchfns.in:582
 msgid "Patch %s is not applied\\n"
 msgstr "パッチ %s は適用されていません\\n"
 
-#: quilt/scripts/patchfns.in:620
+#: quilt/scripts/patchfns.in:619
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
 
-#: quilt/scripts/patchfns.in:898
+#: quilt/scripts/patchfns.in:902
 msgid "Failed to patch temporary files\\n"
 msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
 
-#: quilt/scripts/patchfns.in:941
+#: 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 "
@@ -1458,7 +1475,11 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: quilt/scripts/patchfns.in:1094
+#: quilt/scripts/patchfns.in:1018
+msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1138
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1466,6 +1487,12 @@ msgstr ""
 "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので"
 "す。'quilt upgrade'を実行してください。\\n"
 
+#: quilt/scripts/patchfns.in:1146
+msgid ""
+"The series file no longer matches the applied patches. Please run 'quilt pop "
+"-a'.\\n"
+msgstr ""
+
 #: quilt/scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
@@ -1525,23 +1552,24 @@ msgstr ""
 "-v\t詳細で見やすい表示。\n"
 "\n"
 
-#: quilt/setup.in:35 quilt/setup.in:55
+#: quilt/setup.in:38 quilt/setup.in:58
 msgid "Directory %s exists\\n"
 msgstr "ディレクトリ %s は、すでに存在します\\n"
 
-#: quilt/setup.in:61
+#: quilt/setup.in:64
 msgid "File %s exists\\n"
 msgstr "ファイル %s は、すでに存在します\\n"
 
-#: quilt/setup.in:102
+#: quilt/setup.in:264
+#, fuzzy
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
-"{specfile|seriesfile}\\n"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
+"slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 "使い方: quilt setup [-d path-prefix] [-v] [--sourcedir ディレクトリ] [--"
 "fuzz=N] {specファイル|シリーズファイル}\\n"
 
-#: quilt/setup.in:105
+#: quilt/setup.in:267
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1555,40 +1583,38 @@ msgid ""
 "\n"
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
-msgstr ""
-"\n"
-"rpmの specファイルまたは quiltの seriesファイルを使ってソースツリーを\n"
-"初期化する。\n"
-"\n"
-"-d\tソースツリー用の任意のパスプレフィクス\n"
 "\n"
-"--sourcedir\n"
-"\tパッケージソースが入っているディレクトリ。デフォルトは\\`.'。\n"
-"\n"
-"-v\t詳細なデバッグ表示\n"
+"--slow\tUse the original, slow method to process the spec file. This is the\n"
+"\tdefault for now, but that might change in the future. In this mode,\n"
+"\trpmbuild generates a working tree in a temporary directory while all\n"
+"\tits actions are recorded, and then everything is replayed from scratch\n"
+"\tin the target directory.\n"
 "\n"
-"--fuzz=N\n"
-"\t最大何行のずれを許すか指定する\n"
+"--fast\tUse an alternative, faster method to process the spec file. In this\n"
+"\tmode, rpmbuild is told to generate a working tree directly in the\n"
+"\ttarget directory. If the input is a series file, it is assumed that\n"
+"\tall archives have been extracted manually beforehand.\n"
+msgstr ""
 
-#: quilt/setup.in:176
+#: quilt/setup.in:371
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま"
 "す\\n"
 
-#: quilt/setup.in:179
+#: quilt/setup.in:374
 msgid "The -v option will show rpm's output\\n"
 msgstr "-vオプションを使って、rpmの出力を表示できます"
 
-#: quilt/setup.in:231 quilt/setup.in:243
+#: quilt/setup.in:428 quilt/setup.in:440
 msgid "File %s not found\\n"
 msgstr "ファイル %s が見つかりません"
 
-#: quilt/setup.in:234 quilt/setup.in:246
+#: quilt/setup.in:431 quilt/setup.in:443
 msgid "Unpacking archive %s\\n"
 msgstr "アーカイブ %s を展開しています\\n"
 
-#: quilt/setup.in:255
+#: quilt/setup.in:453
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
@@ -1691,6 +1717,34 @@ msgstr ""
 "トリを削除し、最初からパッチをあて直してください。\\n"
 
 #~ msgid ""
+#~ "\n"
+#~ "Initializes a source tree from an rpm spec file or a quilt series file.\n"
+#~ "\n"
+#~ "-d\tOptional path prefix for the resulting source tree.\n"
+#~ "\n"
+#~ "--sourcedir\n"
+#~ "\tDirectory that contains the package sources. Defaults to \\`.'.\n"
+#~ "\n"
+#~ "-v\tVerbose debug output.\n"
+#~ "\n"
+#~ "--fuzz=N\n"
+#~ "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "rpmの specファイルまたは quiltの seriesファイルを使ってソースツリーを\n"
+#~ "初期化する。\n"
+#~ "\n"
+#~ "-d\tソースツリー用の任意のパスプレフィクス\n"
+#~ "\n"
+#~ "--sourcedir\n"
+#~ "\tパッケージソースが入っているディレクトリ。デフォルトは\\`.'。\n"
+#~ "\n"
+#~ "-v\t詳細なデバッグ表示\n"
+#~ "\n"
+#~ "--fuzz=N\n"
+#~ "\t最大何行のずれを許すか指定する\n"
+
+#~ msgid ""
 #~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 #~ msgstr ""
 #~ "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください"
diff --git a/po/quilt.pot b/po/quilt.pot
index 44d95c0..d907829 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -119,7 +119,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr ""
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:604
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
 msgid "Patch %s is currently applied\\n"
 msgstr ""
 
@@ -211,7 +211,7 @@ msgstr ""
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
 msgid "Patch %s not applied before patch %s\\n"
 msgstr ""
 
@@ -540,35 +540,35 @@ msgid ""
 "\tAdd the appropriate headers to reply to the specified message.\n"
 msgstr ""
 
-#: quilt/mail.in:192 quilt/mail.in:200
+#: quilt/mail.in:204 quilt/mail.in:212
 msgid "Introduction message already specified"
 msgstr ""
 
-#: quilt/mail.in:305
+#: quilt/mail.in:310
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:450
+#: quilt/mail.in:455
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:474
+#: quilt/mail.in:479
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:483
+#: quilt/mail.in:488
 msgid "File %s does not exist\\n"
 msgstr ""
 
-#: quilt/mail.in:543
+#: quilt/mail.in:548
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 
-#: quilt/mail.in:546
+#: quilt/mail.in:551
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:660
+#: quilt/mail.in:665
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
@@ -647,7 +647,7 @@ msgid ""
 msgstr ""
 
 #: quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
+msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n"
 msgstr ""
 
 #: quilt/pop.in:25
@@ -671,37 +671,44 @@ msgid ""
 "-q\tQuiet operation.\n"
 "\n"
 "-v\tVerbose operation.\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:880
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
 msgid "Failed to copy files to temporary directory\\n"
 msgstr ""
 
-#: quilt/pop.in:125
+#: quilt/pop.in:128
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 
-#: quilt/pop.in:150
+#: quilt/pop.in:153
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr ""
 
-#: quilt/pop.in:155
+#: quilt/pop.in:158
 msgid "Removing patch %s\\n"
 msgstr ""
 
-#: quilt/pop.in:226
+#: quilt/pop.in:216 quilt/push.in:373
+msgid "Options %s and %s are mutually exclusive\\n"
+msgstr ""
+
+#: quilt/pop.in:238
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr ""
 
-#: quilt/pop.in:236
+#: quilt/pop.in:248
 msgid "No patch removed\\n"
 msgstr ""
 
-#: quilt/pop.in:252 quilt/scripts/patchfns.in:513
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
 msgid "No patches applied\\n"
 msgstr ""
 
-#: quilt/pop.in:259 quilt/push.in:422
+#: quilt/pop.in:279 quilt/push.in:437
 msgid "Now at patch %s\\n"
 msgstr ""
 
@@ -719,7 +726,7 @@ msgstr ""
 #: quilt/push.in:24
 msgid ""
 "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [num|patch]\\n"
+"color[=always|auto|never]] [--refresh] [num|patch]\\n"
 msgstr ""
 
 #: quilt/push.in:27
@@ -736,8 +743,7 @@ msgid ""
 "\n"
 "-q\tQuiet operation.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
-"\tapply the patch interactively: the patch utility may ask questions.\n"
+"-f\tForce apply, even if the patch has rejects.\n"
 "\n"
 "-v\tVerbose operation.\n"
 "\n"
@@ -753,44 +759,51 @@ msgid ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch after it was successfully applied.\n"
 msgstr ""
 
-#: quilt/push.in:68
+#: quilt/push.in:70
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr ""
 
-#: quilt/push.in:181
+#: quilt/push.in:183
 msgid "Applying patch %s\\n"
 msgstr ""
 
-#: quilt/push.in:215
+#: quilt/push.in:217
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr ""
 
-#: quilt/push.in:219
+#: quilt/push.in:221
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr ""
 
-#: quilt/push.in:223
+#: quilt/push.in:225
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 
-#: quilt/push.in:233
+#: quilt/push.in:235
 msgid "Patch %s can be reverse-applied\\n"
 msgstr ""
 
-#: quilt/push.in:236
+#: quilt/push.in:238
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 
-#: quilt/push.in:291
+#: quilt/push.in:293
 msgid "Patch %s is already applied; check your series file\\n"
 msgstr ""
 
-#: quilt/push.in:396
+#: quilt/push.in:405
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr ""
 
+#: quilt/push.in:413
+msgid "No patch applied\\n"
+msgstr ""
+
 #: quilt/refresh.in:22
 msgid ""
 "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] "
@@ -976,35 +989,35 @@ msgstr ""
 msgid "Delivery address `%s' is invalid\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526
+#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
 msgid "%s is not a regular file\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497
+#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
 msgid "No patches in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499
+#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
 msgid "No series file found\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:554
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:583
+#: quilt/scripts/patchfns.in:582
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:620
+#: quilt/scripts/patchfns.in:619
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:898
+#: quilt/scripts/patchfns.in:902
 msgid "Failed to patch temporary files\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:941
+#: 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 "
@@ -1012,12 +1025,22 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:1094
+#: quilt/scripts/patchfns.in:1018
+msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1138
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
 msgstr ""
 
+#: quilt/scripts/patchfns.in:1146
+msgid ""
+"The series file no longer matches the applied patches. Please run 'quilt pop "
+"-a'.\\n"
+msgstr ""
+
 #: quilt/scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
@@ -1068,21 +1091,21 @@ msgid ""
 "-v\tVerbose, more user friendly output.\n"
 msgstr ""
 
-#: quilt/setup.in:35 quilt/setup.in:55
+#: quilt/setup.in:38 quilt/setup.in:58
 msgid "Directory %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:61
+#: quilt/setup.in:64
 msgid "File %s exists\\n"
 msgstr ""
 
-#: quilt/setup.in:102
+#: quilt/setup.in:264
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
-"{specfile|seriesfile}\\n"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
+"slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 
-#: quilt/setup.in:105
+#: quilt/setup.in:267
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1096,25 +1119,36 @@ msgid ""
 "\n"
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
+"\n"
+"--slow\tUse the original, slow method to process the spec file. This is the\n"
+"\tdefault for now, but that might change in the future. In this mode,\n"
+"\trpmbuild generates a working tree in a temporary directory while all\n"
+"\tits actions are recorded, and then everything is replayed from scratch\n"
+"\tin the target directory.\n"
+"\n"
+"--fast\tUse an alternative, faster method to process the spec file. In this\n"
+"\tmode, rpmbuild is told to generate a working tree directly in the\n"
+"\ttarget directory. If the input is a series file, it is assumed that\n"
+"\tall archives have been extracted manually beforehand.\n"
 msgstr ""
 
-#: quilt/setup.in:176
+#: quilt/setup.in:371
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 
-#: quilt/setup.in:179
+#: quilt/setup.in:374
 msgid "The -v option will show rpm's output\\n"
 msgstr ""
 
-#: quilt/setup.in:231 quilt/setup.in:243
+#: quilt/setup.in:428 quilt/setup.in:440
 msgid "File %s not found\\n"
 msgstr ""
 
-#: quilt/setup.in:234 quilt/setup.in:246
+#: quilt/setup.in:431 quilt/setup.in:443
 msgid "Unpacking archive %s\\n"
 msgstr ""
 
-#: quilt/setup.in:255
+#: quilt/setup.in:453
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index fdec6f3..485e60c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -181,7 +181,7 @@ msgstr ""
 msgid "No next patch\\n"
 msgstr "Отсутствует следующий патч\\n"
 
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:604
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
 msgid "Patch %s is currently applied\\n"
 msgstr "Патч %s применён\\n"
 
@@ -325,7 +325,7 @@ msgstr "Невозможно сравнить патчи с -p%s, использ
 msgid "No snapshot to diff against\\n"
 msgstr ""
 
-#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422
+#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:427
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Патч %s не был применён перед патчем %s\\n"
 
@@ -758,36 +758,36 @@ msgid ""
 "\tAdd the appropriate headers to reply to the specified message.\n"
 msgstr ""
 
-#: quilt/mail.in:192 quilt/mail.in:200
+#: quilt/mail.in:204 quilt/mail.in:212
 msgid "Introduction message already specified"
 msgstr ""
 
-#: quilt/mail.in:305
+#: quilt/mail.in:310
 msgid "Could not determine the envelope sender address. Please use --sender."
 msgstr ""
 
-#: quilt/mail.in:450
+#: quilt/mail.in:455
 msgid "Unable to extract a subject header from %s\\n"
 msgstr ""
 
-#: quilt/mail.in:474
+#: quilt/mail.in:479
 msgid "Patches %s have duplicate subject headers.\\n"
 msgstr ""
 
-#: quilt/mail.in:483
+#: quilt/mail.in:488
 #, fuzzy
 msgid "File %s does not exist\\n"
 msgstr "Файл %s существует\\n"
 
-#: quilt/mail.in:543
+#: quilt/mail.in:548
 msgid "Introduction has no subject header (saved as %s)\\n"
 msgstr ""
 
-#: quilt/mail.in:546
+#: quilt/mail.in:551
 msgid "Introduction has no subject header\\n"
 msgstr ""
 
-#: quilt/mail.in:660
+#: quilt/mail.in:665
 msgid "Introduction saved as %s\\n"
 msgstr ""
 
@@ -879,10 +879,12 @@ msgstr ""
 "-v\tПодробный, более дружественный вывод.\n"
 
 #: quilt/pop.in:22
-msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
+#, fuzzy
+msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n"
 msgstr "Синтаксис: quilt pop [-afRqv] [число|патч]\\n"
 
 #: quilt/pop.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -903,6 +905,9 @@ msgid ""
 "-q\tQuiet operation.\n"
 "\n"
 "-v\tVerbose operation.\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch before it gets unapplied.\n"
 msgstr ""
 "\n"
 "Убрать патчи из стека наложенных патчей. Если не указаны опции,\n"
@@ -923,37 +928,41 @@ msgstr ""
 "\n"
 "-v\tПодробный вывод.\n"
 
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:880
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:884
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Не удалось скопировать файлы во временный каталог\\n"
 
-#: quilt/pop.in:125
+#: quilt/pop.in:128
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 "Не удалось чисто удалить патч %s (обновите его или удалите принудительно с -"
 "f)\\n"
 
-#: quilt/pop.in:150
+#: quilt/pop.in:153
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "Похоже, патч %s пуст, удаление\\n"
 
-#: quilt/pop.in:155
+#: quilt/pop.in:158
 msgid "Removing patch %s\\n"
 msgstr "Удаление патча %s\\n"
 
-#: quilt/pop.in:226
+#: quilt/pop.in:216 quilt/push.in:373
+msgid "Options %s and %s are mutually exclusive\\n"
+msgstr ""
+
+#: quilt/pop.in:238
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Сначала нужно обновить патч %s.\\n"
 
-#: quilt/pop.in:236
+#: quilt/pop.in:248
 msgid "No patch removed\\n"
 msgstr "Не удалено ни одного патча\\n"
 
-#: quilt/pop.in:252 quilt/scripts/patchfns.in:513
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
 msgid "No patches applied\\n"
 msgstr "Нет применённых патчей\\n"
 
-#: quilt/pop.in:259 quilt/push.in:422
+#: quilt/pop.in:279 quilt/push.in:437
 msgid "Now at patch %s\\n"
 msgstr "Текущий патч: %s\\n"
 
@@ -975,7 +984,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
-"color[=always|auto|never]] [num|patch]\\n"
+"color[=always|auto|never]] [--refresh] [num|patch]\\n"
 msgstr "Синтаксис: quilt push [-afqv] [--leave-rejects] [число|патч]\\n"
 
 #: quilt/push.in:27
@@ -993,8 +1002,7 @@ msgid ""
 "\n"
 "-q\tQuiet operation.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
-"\tapply the patch interactively: the patch utility may ask questions.\n"
+"-f\tForce apply, even if the patch has rejects.\n"
 "\n"
 "-v\tVerbose operation.\n"
 "\n"
@@ -1010,6 +1018,9 @@ msgid ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring (auto activates it only if the output is a tty).\n"
+"\n"
+"--refresh\n"
+"\tAutomatically refresh every patch after it was successfully applied.\n"
 msgstr ""
 "\n"
 "Применить патчи из файла series.  Без опций накладывается следующий\n"
@@ -1033,44 +1044,49 @@ msgstr ""
 "--color[=always|auto|never]\n"
 "\tИспользовать подсветку синтаксиса.\n"
 
-#: quilt/push.in:68
+#: quilt/push.in:70
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Прервано пользователем; патч %s не был наложен.\\n"
 
-#: quilt/push.in:181
+#: quilt/push.in:183
 msgid "Applying patch %s\\n"
 msgstr "Наложение патча %s\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:217
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Патч %s не существует; наложен пустой патч\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:221
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Похоже, патч %s пуст; наложен\\n"
 
-#: quilt/push.in:223
+#: quilt/push.in:225
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Применён патч %s (принудительно; следует сделать refresh)\\n"
 
-#: quilt/push.in:233
+#: quilt/push.in:235
 #, fuzzy
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Патч %s применён\\n"
 
-#: quilt/push.in:236
+#: quilt/push.in:238
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Патч %s не применяется (принудить с -f)\\n"
 
-#: quilt/push.in:291
+#: quilt/push.in:293
 #, fuzzy
 msgid "Patch %s is already applied; check your series file\\n"
 msgstr "Патч %s уже применён\\n"
 
-#: quilt/push.in:396
+#: quilt/push.in:405
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Сначала необходимо обновить самый верхний патч %s.\\n"
 
+#: quilt/push.in:413
+#, fuzzy
+msgid "No patch applied\\n"
+msgstr "Нет применённых патчей\\n"
+
 #: quilt/refresh.in:22
 #, fuzzy
 msgid ""
@@ -1333,37 +1349,37 @@ msgstr "Отображаемое имя '%s' содержит непарные �
 msgid "Delivery address `%s' is invalid\n"
 msgstr "Некорректный адрес назначения '%s'\n"
 
-#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526
+#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
 #, fuzzy
 msgid "%s is not a regular file\\n"
 msgstr "Патч %s не входит в файл series\\n"
 
-#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497
+#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
 #, fuzzy
 msgid "No patches in series\\n"
 msgstr "Нет применённых патчей\\n"
 
-#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499
+#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
 msgid "No series file found\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:554
 msgid "Patch %s is not in series\\n"
 msgstr "Патч %s не в серии\\n"
 
-#: quilt/scripts/patchfns.in:583
+#: quilt/scripts/patchfns.in:582
 msgid "Patch %s is not applied\\n"
 msgstr "Патч %s не применён\\n"
 
-#: quilt/scripts/patchfns.in:620
+#: quilt/scripts/patchfns.in:619
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n"
 
-#: quilt/scripts/patchfns.in:898
+#: quilt/scripts/patchfns.in:902
 msgid "Failed to patch temporary files\\n"
 msgstr "Не удалось применить патч к временным файлам\\n"
 
-#: quilt/scripts/patchfns.in:941
+#: 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 "
@@ -1375,7 +1391,11 @@ msgstr ""
 "отмените все патчи, используя версию quilt, которая использовалась для их "
 "наложения, прежде чем использовать эту версию.\\n"
 
-#: quilt/scripts/patchfns.in:1094
+#: quilt/scripts/patchfns.in:1018
+msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:1138
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1383,6 +1403,12 @@ msgstr ""
 "Рабочее дерево было создано более старой версией quilt. Пожалуйста, "
 "выполните 'quilt upgrade'.\\n"
 
+#: quilt/scripts/patchfns.in:1146
+msgid ""
+"The series file no longer matches the applied patches. Please run 'quilt pop "
+"-a'.\\n"
+msgstr ""
+
 #: quilt/scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
@@ -1439,24 +1465,23 @@ msgstr ""
 "\n"
 "-v\tПодробный, более дружественный вывод.\n"
 
-#: quilt/setup.in:35 quilt/setup.in:55
+#: quilt/setup.in:38 quilt/setup.in:58
 msgid "Directory %s exists\\n"
 msgstr "Директория %s существует\\n"
 
-#: quilt/setup.in:61
+#: quilt/setup.in:64
 msgid "File %s exists\\n"
 msgstr "Файл %s существует\\n"
 
-#: quilt/setup.in:102
+#: quilt/setup.in:264
 #, fuzzy
 msgid ""
-"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
-"{specfile|seriesfile}\\n"
+"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
+"slow|--fast] {specfile|seriesfile}\\n"
 msgstr ""
 "Синтаксис: quilt setup [-d префикс-пути] [-v] {файл-spec|файл-series}\\n"
 
-#: quilt/setup.in:105
-#, fuzzy
+#: quilt/setup.in:267
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1470,33 +1495,38 @@ msgid ""
 "\n"
 "--fuzz=N\n"
 "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
-msgstr ""
 "\n"
-"Инициализирует исходное дерево из файла rpm spec или файла quilt series.\n"
+"--slow\tUse the original, slow method to process the spec file. This is the\n"
+"\tdefault for now, but that might change in the future. In this mode,\n"
+"\trpmbuild generates a working tree in a temporary directory while all\n"
+"\tits actions are recorded, and then everything is replayed from scratch\n"
+"\tin the target directory.\n"
 "\n"
-"-d\tопциональный префикс пути (поддиректория).\n"
-"\n"
-"-v\tвывод отладочной информации.\n"
+"--fast\tUse an alternative, faster method to process the spec file. In this\n"
+"\tmode, rpmbuild is told to generate a working tree directly in the\n"
+"\ttarget directory. If the input is a series file, it is assumed that\n"
+"\tall archives have been extracted manually beforehand.\n"
+msgstr ""
 
-#: quilt/setup.in:176
+#: quilt/setup.in:371
 msgid "The %%prep section of %s failed; results may be incomplete\\n"
 msgstr ""
 "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n"
 
-#: quilt/setup.in:179
+#: quilt/setup.in:374
 msgid "The -v option will show rpm's output\\n"
 msgstr "Опция -v покажет вывод rpm\\n"
 
-#: quilt/setup.in:231 quilt/setup.in:243
+#: quilt/setup.in:428 quilt/setup.in:440
 #, fuzzy
 msgid "File %s not found\\n"
 msgstr "Файл %s не изменяется\\n"
 
-#: quilt/setup.in:234 quilt/setup.in:246
+#: quilt/setup.in:431 quilt/setup.in:443
 msgid "Unpacking archive %s\\n"
 msgstr "Распаковка архива %s\\n"
 
-#: quilt/setup.in:255
+#: quilt/setup.in:453
 msgid "Trying alternative patches and series names..."
 msgstr ""
 
@@ -1595,6 +1625,28 @@ msgstr ""
 "использованной при создании этого рабочего дерева, или удалите директорию %s "
 "и примените все патчи с нуля.\\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Initializes a source tree from an rpm spec file or a quilt series file.\n"
+#~ "\n"
+#~ "-d\tOptional path prefix for the resulting source tree.\n"
+#~ "\n"
+#~ "--sourcedir\n"
+#~ "\tDirectory that contains the package sources. Defaults to \\`.'.\n"
+#~ "\n"
+#~ "-v\tVerbose debug output.\n"
+#~ "\n"
+#~ "--fuzz=N\n"
+#~ "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Инициализирует исходное дерево из файла rpm spec или файла quilt series.\n"
+#~ "\n"
+#~ "-d\tопциональный префикс пути (поддиректория).\n"
+#~ "\n"
+#~ "-v\tвывод отладочной информации.\n"
+
 #~ msgid ""
 #~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 #~ msgstr "Не удалось обновить патчи с -p%s, используйте -p0 или -p1\\n"