summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2019-03-14 16:46:50 +0100
committerJean Delvare <jdelvare@suse.de>2019-03-14 16:46:50 +0100
commitbe54a7108e5be5a946bf25d70c2d79ad3b44746d (patch)
tree6375d704afd9f59869d88d0832a4b1605263e7bf
parent2c99e786897486863df15ee39dc52c745dd32dbf (diff)
downloadquilt-be54a7108e5be5a946bf25d70c2d79ad3b44746d.tar.gz
Resync translation files
Also update one string for the setup command (one sentence removed).
-rw-r--r--po/de.po93
-rw-r--r--po/fr.po93
-rw-r--r--po/ja.po92
-rw-r--r--po/quilt.pot89
-rw-r--r--po/ru.po91
5 files changed, 223 insertions, 235 deletions
diff --git a/po/de.po b/po/de.po
index bab5a68..dd10eb4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -186,7 +186,7 @@ msgstr ""
msgid "No next patch\\n"
msgstr "Kein folgender Patch\\n"
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:618
msgid "Patch %s is currently applied\\n"
msgstr "Patch %s ist momentan angewandt\\n"
@@ -627,11 +627,11 @@ msgstr ""
"--backup\n"
"\tErzeugen einer Sicherungskopie von patch als patch~.\n"
-#: quilt/header.in:167
+#: quilt/header.in:170
msgid "Replaced header of patch %s\\n"
msgstr "Header von Patch %s ersetzt\\n"
-#: quilt/header.in:170
+#: quilt/header.in:173
msgid "Appended text to header of patch %s\\n"
msgstr "Text an Header von Patch %s angefügt\\n"
@@ -689,7 +689,7 @@ msgstr ""
"\tdiese Option angegeben werden. Diese Option ist nur in Kombination mit\n"
"\t-f wirksam.\n"
-#: quilt/import.in:73
+#: quilt/import.in:73 quilt/mail.in:463
msgid "Patch %s does not exist\\n"
msgstr "Patch %s existiert nicht\\n"
@@ -867,27 +867,27 @@ msgstr ""
"Die Envelope-Adresse konnte nicht festgestellt werden. Bitte verwenden Sie --"
"sender."
-#: quilt/mail.in:460
+#: quilt/mail.in:466
msgid "Unable to extract a subject header from %s\\n"
msgstr "Es konnte keine Subject-Kopfzeile aus %s extrahiert werden\\n"
-#: quilt/mail.in:484
+#: quilt/mail.in:492
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Die Patches %s haben dieselben Subject-Kopfzeilen.\\n"
-#: quilt/mail.in:493
+#: quilt/mail.in:501
msgid "File %s does not exist\\n"
msgstr "Datei %s existiert nicht\\n"
-#: quilt/mail.in:553
+#: quilt/mail.in:561
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
-#: quilt/mail.in:556
+#: quilt/mail.in:564
msgid "Introduction has no subject header\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
-#: quilt/mail.in:670
+#: quilt/mail.in:677
msgid "Introduction saved as %s\\n"
msgstr "Einleitung gespeichert als %s\\n"
@@ -1055,7 +1055,7 @@ msgstr ""
"\tJeden Patch automatisch neu erzeugen, bevor seine Anwendung rückgängig\n"
"gemacht wird.\n"
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:930
msgid "Failed to copy files to temporary directory\\n"
msgstr "Dateien konnten nicht in temporäres Verzeichnis kopiert werden\\n"
@@ -1073,7 +1073,7 @@ msgstr "Patch %s scheint leer zu sein; wird entfernt\\n"
msgid "Removing patch %s\\n"
msgstr "Entfernen von Patch %s\\n"
-#: quilt/pop.in:216 quilt/push.in:373
+#: quilt/pop.in:216 quilt/push.in:376
msgid "Options %s and %s are mutually exclusive\\n"
msgstr "Optionen %s und %s können nicht kombiniert werden\\n"
@@ -1085,11 +1085,11 @@ msgstr "Patch %s muss zuerst aktualisiert werden (refresh).\\n"
msgid "No patch removed\\n"
msgstr "Kein Patch entfernt\\n"
-#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:527
msgid "No patches applied\\n"
msgstr "Keine Patches angewandt\\n"
-#: quilt/pop.in:279 quilt/push.in:437
+#: quilt/pop.in:279 quilt/push.in:440
msgid "Now at patch %s\\n"
msgstr "Jetzt in Patch %s\\n"
@@ -1188,39 +1188,39 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
-#: quilt/push.in:183
+#: quilt/push.in:186
msgid "Applying patch %s\\n"
msgstr "Anwenden von Patch %s\\n"
-#: quilt/push.in:217
+#: quilt/push.in:220
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Patch %s existiert nicht; leerer Patch wird angewandt\\n"
-#: quilt/push.in:221
+#: quilt/push.in:224
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Patch %s scheint leer zu sein; angewandt\\n"
-#: quilt/push.in:225
+#: quilt/push.in:228
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (refresh))\\n"
-#: quilt/push.in:235
+#: quilt/push.in:238
msgid "Patch %s can be reverse-applied\\n"
msgstr "Patch %s kann umgekehrt angewandt werden\\n"
-#: quilt/push.in:238
+#: quilt/push.in:241
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:293
+#: quilt/push.in:296
msgid "Patch %s is already applied; check your series file\\n"
msgstr "Patch %s wurde bereits angewandt; überprüfen Sie Ihre series-Datei\\n"
-#: quilt/push.in:405
+#: quilt/push.in:408
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
+#: quilt/push.in:416
msgid "No patch applied\\n"
msgstr "Kein Patch angewandt\\n"
@@ -1489,39 +1489,39 @@ 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:231 quilt/scripts/patchfns.in:525
+#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540
msgid "%s is not a regular file\\n"
msgstr "%s ist keine reguläre Datei\\n"
-#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
+#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511
msgid "No patches in series\\n"
msgstr "Keine Patches in der series-Datei\\n"
-#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
+#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513
msgid "No series file found\\n"
msgstr "Keine series-Datei gefunden\\n"
-#: quilt/scripts/patchfns.in:554
+#: quilt/scripts/patchfns.in:569
msgid "Patch %s is not in series\\n"
msgstr "Patch %s ist nicht in der series-Datei\\n"
-#: quilt/scripts/patchfns.in:582
+#: quilt/scripts/patchfns.in:597
msgid "Patch %s is not applied\\n"
msgstr "Patch %s ist nicht angewandt\\n"
-#: quilt/scripts/patchfns.in:619
+#: quilt/scripts/patchfns.in:634
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:764
+#: quilt/scripts/patchfns.in:779
msgid "Diff failed on file '%s', aborting\\n"
msgstr "Diff gegen Datei '%s' fehlgeschlagen, Abbruch.\\n"
-#: quilt/scripts/patchfns.in:929
+#: quilt/scripts/patchfns.in:948
msgid "Failed to patch temporary files\\n"
msgstr "Patch konnte nicht auf temporäre Dateien angewandt werden\\n"
-#: quilt/scripts/patchfns.in:972
+#: quilt/scripts/patchfns.in:991
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 "
@@ -1534,17 +1534,17 @@ msgstr ""
"der Version von quilt, die zur Erstellung des Arbeitsverzeichnisses "
"verwendet wurde.\\n"
-#: quilt/scripts/patchfns.in:1045
+#: quilt/scripts/patchfns.in:1064
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
msgstr ""
"Sie müssen '%s' (aus dem Paket %s) installieren, um 'quilt %s' nutzen zu "
"können\\n"
-#: quilt/scripts/patchfns.in:1124
+#: quilt/scripts/patchfns.in:1143
msgid "Cannot change into parent directory %s/\\n"
msgstr "Wechsel in übergeordnetes Verzeichnis %s/ nicht möglich\\n"
-#: quilt/scripts/patchfns.in:1165
+#: quilt/scripts/patchfns.in:1184
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
@@ -1552,7 +1552,7 @@ msgstr ""
"Das Arbeitsverzeichnis wurde von einer älteren quilt-Version erstellt. Bitte "
"führen Sie \\`quilt upgrade' aus.\\n"
-#: quilt/scripts/patchfns.in:1173
+#: quilt/scripts/patchfns.in:1192
msgid ""
"The series file no longer matches the applied patches. Please run 'quilt pop "
"-a'.\\n"
@@ -1626,7 +1626,7 @@ msgstr "Verzeichnis %s existiert\\n"
msgid "File %s exists\\n"
msgstr "Datei %s existiert\\n"
-#: quilt/setup.in:266
+#: quilt/setup.in:274
msgid ""
"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
"slow|--fast] {specfile|seriesfile}\\n"
@@ -1634,7 +1634,7 @@ msgstr ""
"Aufruf: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--"
"fuzz=N] [--slow|--fast] {spec-datei|series-datei}\\n"
-#: quilt/setup.in:269
+#: quilt/setup.in:277
msgid ""
"\n"
"Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1657,8 +1657,7 @@ msgid ""
"\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"
+"\ttarget directory.\n"
msgstr ""
"\n"
"Initialisiert einen Quellbaum aus einer rpm-spec-Datei oder einer quilt-\n"
@@ -1684,29 +1683,27 @@ msgstr ""
"\n"
"--fast\tEine alternative, schnellere Methode zur Verarbeitung der spec-\n"
"\tDatei verwenden. Dabei erzeugt rpmbuild ein Arbeitsverzeichnis\n"
-"\tdirekt im Zielverzeichnis. Wenn die Ausgabe in eine series-Datei\n"
-"\terfolgt, wird davon ausgegangen, dass alle Archive vorher händisch\n"
-"\textrahiert wurden.\n"
+"\tdirekt im Zielverzeichnis.\n"
-#: quilt/setup.in:373
+#: quilt/setup.in:380
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:376
+#: quilt/setup.in:383
msgid "The -v option will show rpm's output\\n"
msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
-#: quilt/setup.in:432 quilt/setup.in:444
+#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467
msgid "File %s not found\\n"
msgstr "Datei %s nicht gefunden\\n"
-#: quilt/setup.in:435 quilt/setup.in:447
+#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470
msgid "Unpacking archive %s\\n"
msgstr "Entpacken des Archivs %s\\n"
-#: quilt/setup.in:457
+#: quilt/setup.in:480
msgid "Trying alternative patches and series names..."
msgstr "Versuch alternativer patches- und series-Namen ..."
diff --git a/po/fr.po b/po/fr.po
index c790e68..07b1c36 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -182,7 +182,7 @@ msgstr ""
msgid "No next patch\\n"
msgstr "Pas de patch suivant\\n"
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:618
msgid "Patch %s is currently applied\\n"
msgstr "Le patch %s est actuellement appliqué\\n"
@@ -625,11 +625,11 @@ msgstr ""
"\tCrée une sauvegarde de la version originale du patch en tant\n"
"\tque patch~.\n"
-#: quilt/header.in:167
+#: quilt/header.in:170
msgid "Replaced header of patch %s\\n"
msgstr "En-tête du patch %s remplacé\\n"
-#: quilt/header.in:170
+#: quilt/header.in:173
msgid "Appended text to header of patch %s\\n"
msgstr "Texte ajouté à la fin de l'en-tête du patch %s\\n"
@@ -688,7 +688,7 @@ msgstr ""
"\ten-têtes, cette option doit être spécifiée. Cette option n'est\n"
"\teffective que lorsque -f est utilisé.\n"
-#: quilt/import.in:73
+#: quilt/import.in:73 quilt/mail.in:463
msgid "Patch %s does not exist\\n"
msgstr "Le patch %s n'existe pas\\n"
@@ -865,28 +865,28 @@ msgstr "Message d'introduction déjà spécifié"
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:460
+#: quilt/mail.in:466
msgid "Unable to extract a subject header from %s\\n"
msgstr "Impossible d'extraire une ligne de sujet de %s\\n"
-#: quilt/mail.in:484
+#: quilt/mail.in:492
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Les patches %s ont des sujets dupliqués.\\n"
-#: quilt/mail.in:493
+#: quilt/mail.in:501
msgid "File %s does not exist\\n"
msgstr "Le fichier %s n'existe pas\\n"
-#: quilt/mail.in:553
+#: quilt/mail.in:561
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:556
+#: quilt/mail.in:564
msgid "Introduction has no subject header\\n"
msgstr "L'introduction ne contient pas de ligne de sujet\\n"
-#: quilt/mail.in:670
+#: quilt/mail.in:677
msgid "Introduction saved as %s\\n"
msgstr "Introduction sauvegardée en tant que %s\\n"
@@ -1055,7 +1055,7 @@ msgstr ""
"--refresh\n"
"\tRafraichit automatiquement chaque patch avant de l'enlever.\n"
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:930
msgid "Failed to copy files to temporary directory\\n"
msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n"
@@ -1073,7 +1073,7 @@ msgstr "Le patch %s semble vide, enlevé\\n"
msgid "Removing patch %s\\n"
msgstr "Retrait de %s\\n"
-#: quilt/pop.in:216 quilt/push.in:373
+#: quilt/pop.in:216 quilt/push.in:376
msgid "Options %s and %s are mutually exclusive\\n"
msgstr "Les options %s et %s sont mutuellement exclusives\\n"
@@ -1085,11 +1085,11 @@ msgstr "Le patch %s doit être rafraichi au préalable.\\n"
msgid "No patch removed\\n"
msgstr "Aucun patch retiré\\n"
-#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:527
msgid "No patches applied\\n"
msgstr "Aucun patch n'est appliqué\\n"
-#: quilt/pop.in:279 quilt/push.in:437
+#: quilt/pop.in:279 quilt/push.in:440
msgid "Now at patch %s\\n"
msgstr "Le patch %s est maintenant au sommet\\n"
@@ -1192,40 +1192,40 @@ msgstr ""
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:183
+#: quilt/push.in:186
msgid "Applying patch %s\\n"
msgstr "Application de %s\\n"
-#: quilt/push.in:217
+#: quilt/push.in:220
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n"
-#: quilt/push.in:221
+#: quilt/push.in:224
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
-#: quilt/push.in:225
+#: quilt/push.in:228
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
-#: quilt/push.in:235
+#: quilt/push.in:238
msgid "Patch %s can be reverse-applied\\n"
msgstr "Le patch %s peut être appliqué à l'envers\\n"
-#: quilt/push.in:238
+#: quilt/push.in:241
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:293
+#: quilt/push.in:296
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:405
+#: quilt/push.in:408
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
+#: quilt/push.in:416
msgid "No patch applied\\n"
msgstr "Aucun patch appliqué\\n"
@@ -1491,39 +1491,39 @@ 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:231 quilt/scripts/patchfns.in:525
+#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540
msgid "%s is not a regular file\\n"
msgstr "%s n'est pas un fichier régulier\\n"
-#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
+#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511
msgid "No patches in series\\n"
msgstr "Aucun patch dans la série\\n"
-#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
+#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513
msgid "No series file found\\n"
msgstr "Fichier de série non trouvé\\n"
-#: quilt/scripts/patchfns.in:554
+#: quilt/scripts/patchfns.in:569
msgid "Patch %s is not in series\\n"
msgstr "Le patch %s n'est pas dans la série\\n"
-#: quilt/scripts/patchfns.in:582
+#: quilt/scripts/patchfns.in:597
msgid "Patch %s is not applied\\n"
msgstr "Le patch %s n'est pas appliqué\\n"
-#: quilt/scripts/patchfns.in:619
+#: quilt/scripts/patchfns.in:634
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:764
+#: quilt/scripts/patchfns.in:779
msgid "Diff failed on file '%s', aborting\\n"
msgstr "Le diff a échoué sur le fichier «%s». Abandon.\\n"
-#: quilt/scripts/patchfns.in:929
+#: quilt/scripts/patchfns.in:948
msgid "Failed to patch temporary files\\n"
msgstr "Impossible de patcher les fichiers temporaires\\n"
-#: quilt/scripts/patchfns.in:972
+#: quilt/scripts/patchfns.in:991
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 "
@@ -1535,15 +1535,15 @@ 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:1045
+#: quilt/scripts/patchfns.in:1064
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
msgstr "Vous devez installer '%s' (paquet %s) pour utiliser « quilt %s »\\n"
-#: quilt/scripts/patchfns.in:1124
+#: quilt/scripts/patchfns.in:1143
msgid "Cannot change into parent directory %s/\\n"
msgstr "Impossible de remplacer le répertoire de travail en cours par %s/\\n"
-#: quilt/scripts/patchfns.in:1165
+#: quilt/scripts/patchfns.in:1184
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
@@ -1551,7 +1551,7 @@ msgstr ""
"Votre arbre a été créé par une vieille version de quilt. Veuillez \n"
"utiliser « quilt upgrade ».\\n"
-#: quilt/scripts/patchfns.in:1173
+#: quilt/scripts/patchfns.in:1192
msgid ""
"The series file no longer matches the applied patches. Please run 'quilt pop "
"-a'.\\n"
@@ -1625,7 +1625,7 @@ msgstr "Le répertoire %s existe\\n"
msgid "File %s exists\\n"
msgstr "Le fichier %s existe\\n"
-#: quilt/setup.in:266
+#: quilt/setup.in:274
msgid ""
"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
"slow|--fast] {specfile|seriesfile}\\n"
@@ -1633,7 +1633,7 @@ msgstr ""
"Usage : quilt setup [-d répertoire_source] [-v] [--sourcedir répertoire] [--"
"fuzz=N] [--slow|--fast] {fichier_spec|fichier_séries}\\n"
-#: quilt/setup.in:269
+#: quilt/setup.in:277
msgid ""
"\n"
"Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1656,8 +1656,7 @@ msgid ""
"\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"
+"\ttarget directory.\n"
msgstr ""
"\n"
"Initialise un arbre de sources à partir d'un fichier de\n"
@@ -1682,28 +1681,26 @@ msgstr ""
"\n"
"--fast\tUtilise une méthode alternative, plus rapide, pour traiter le\n"
"\tfichier de spécification rpm. Dans ce mode, rpmbuild travaille\n"
-"\tdirectement dans le répertoire de destination. Si l'entrée est un\n"
-"\tfichier de série quilt, il est supposé que toutes les archives ont\n"
-"\tdéjà été extraites manuellement.\n"
+"\tdirectement dans le répertoire de destination.\n"
-#: quilt/setup.in:373
+#: quilt/setup.in:380
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:376
+#: quilt/setup.in:383
msgid "The -v option will show rpm's output\\n"
msgstr "L'option -v montre les affichages de rpm\\\\n"
-#: quilt/setup.in:432 quilt/setup.in:444
+#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467
msgid "File %s not found\\n"
msgstr "Le fichier %s est introuvable\\n"
-#: quilt/setup.in:435 quilt/setup.in:447
+#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470
msgid "Unpacking archive %s\\n"
msgstr "Désarchivage de %s\\n"
-#: quilt/setup.in:457
+#: quilt/setup.in:480
msgid "Trying alternative patches and series names..."
msgstr "Tentative d'utilisation des noms de patches et séries alternatifs..."
diff --git a/po/ja.po b/po/ja.po
index 7b1c30a..55d1447 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:603
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:618
msgid "Patch %s is currently applied\\n"
msgstr "パッチ %s は現在適用されています\\n"
@@ -602,11 +602,11 @@ msgstr ""
"--backup\n"
"\t古いバージョンのパッチのバックアップコピーをパッチ~として作成する。\n"
-#: quilt/header.in:167
+#: quilt/header.in:170
msgid "Replaced header of patch %s\\n"
msgstr "パッチ %s のヘッダを変更しました\\n"
-#: quilt/header.in:170
+#: quilt/header.in:173
msgid "Appended text to header of patch %s\\n"
msgstr "パッチ %s のヘッダに追加しました\\n"
@@ -663,7 +663,7 @@ msgstr ""
"\tがある場合は必ずこのオプションを指定する必要がある。このオプショ\n"
"\tンは -fが指定された時のみ有効。\n"
-#: quilt/import.in:73
+#: quilt/import.in:73 quilt/mail.in:463
msgid "Patch %s does not exist\\n"
msgstr "パッチ %s が存在しません\\n"
@@ -835,27 +835,27 @@ msgstr ""
"エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n"
"を使用してください。"
-#: quilt/mail.in:460
+#: quilt/mail.in:466
msgid "Unable to extract a subject header from %s\\n"
msgstr "%s から件名を取り出せません。\\n"
-#: quilt/mail.in:484
+#: quilt/mail.in:492
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "パッチ %s の件名が重複しています。\\n"
-#: quilt/mail.in:493
+#: quilt/mail.in:501
msgid "File %s does not exist\\n"
msgstr "ファイル %s が存在しません\\n"
-#: quilt/mail.in:553
+#: quilt/mail.in:561
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "概要文に件名部分がありません(%s として保存されました)\\n"
-#: quilt/mail.in:556
+#: quilt/mail.in:564
msgid "Introduction has no subject header\\n"
msgstr "概要文に件名部分がありません\\n"
-#: quilt/mail.in:670
+#: quilt/mail.in:677
msgid "Introduction saved as %s\\n"
msgstr "概要文は %s という名前で保存されました\\n"
@@ -1016,7 +1016,7 @@ msgstr ""
"--refresh\n"
"\tパッチを外す前に自動的にパッチを更新する。\n"
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:930
msgid "Failed to copy files to temporary directory\\n"
msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n"
@@ -1034,7 +1034,7 @@ msgstr "パッチ %s は、空のようです。はずします\\n"
msgid "Removing patch %s\\n"
msgstr "パッチ %s をはずします\\n"
-#: quilt/pop.in:216 quilt/push.in:373
+#: quilt/pop.in:216 quilt/push.in:376
msgid "Options %s and %s are mutually exclusive\\n"
msgstr "オプション %s と %s は、同時に使用できません\\n"
@@ -1046,11 +1046,11 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n"
msgid "No patch removed\\n"
msgstr "適用されているパッチはありません\\n"
-#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:527
msgid "No patches applied\\n"
msgstr "適用されているパッチはありません\\n"
-#: quilt/pop.in:279 quilt/push.in:437
+#: quilt/pop.in:279 quilt/push.in:440
msgid "Now at patch %s\\n"
msgstr "現在位置はパッチ %s です\\n"
@@ -1146,41 +1146,41 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr "ユーザによって中断されました。パッチ %s は適用されていません。\\n"
-#: quilt/push.in:183
+#: quilt/push.in:186
msgid "Applying patch %s\\n"
msgstr "パッチ %s を適用しています\\n"
-#: quilt/push.in:217
+#: quilt/push.in:220
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n"
-#: quilt/push.in:221
+#: quilt/push.in:224
msgid "Patch %s appears to be empty; applied\\n"
msgstr "パッチ %s は空のようですが、適用しました\\n"
-#: quilt/push.in:225
+#: quilt/push.in:228
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
"パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n"
-#: quilt/push.in:235
+#: quilt/push.in:238
msgid "Patch %s can be reverse-applied\\n"
msgstr "パッチ %s は、反転して適用することができます\\n"
-#: quilt/push.in:238
+#: quilt/push.in:241
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n"
-#: quilt/push.in:293
+#: quilt/push.in:296
msgid "Patch %s is already applied; check your series file\\n"
msgstr ""
"パッチ %s はすでに適用されています。シリーズファイルを確認してください\\n"
-#: quilt/push.in:405
+#: quilt/push.in:408
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
-#: quilt/push.in:413
+#: quilt/push.in:416
msgid "No patch applied\\n"
msgstr "パッチはひとつも適用されませんでした\\n"
@@ -1440,40 +1440,40 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます
msgid "Delivery address `%s' is invalid\n"
msgstr "配送先のアドレス `%s' が不正です\n"
-#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
+#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540
msgid "%s is not a regular file\\n"
msgstr "%s は普通のファイルではありません\\n"
-#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
+#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511
msgid "No patches in series\\n"
msgstr "シリーズに登録されているパッチがありません\\n"
-#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
+#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513
msgid "No series file found\\n"
msgstr "シリーズファイルが見つかりません\\n"
-#: quilt/scripts/patchfns.in:554
+#: quilt/scripts/patchfns.in:569
msgid "Patch %s is not in series\\n"
msgstr "パッチ %s は seriesの中にありません\\n"
-#: quilt/scripts/patchfns.in:582
+#: quilt/scripts/patchfns.in:597
msgid "Patch %s is not applied\\n"
msgstr "パッチ %s は適用されていません\\n"
-#: quilt/scripts/patchfns.in:619
+#: quilt/scripts/patchfns.in:634
msgid "File series fully applied, ends at patch %s\\n"
msgstr ""
"seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n"
-#: quilt/scripts/patchfns.in:764
+#: quilt/scripts/patchfns.in:779
msgid "Diff failed on file '%s', aborting\\n"
msgstr "ファイル'%s'の差分に失敗しました。異常終了します\\n"
-#: quilt/scripts/patchfns.in:929
+#: quilt/scripts/patchfns.in:948
msgid "Failed to patch temporary files\\n"
msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n"
-#: quilt/scripts/patchfns.in:972
+#: quilt/scripts/patchfns.in:991
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 "
@@ -1485,17 +1485,17 @@ msgstr ""
"ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
"すべてのパッチを pop してください。\\n"
-#: quilt/scripts/patchfns.in:1045
+#: quilt/scripts/patchfns.in:1064
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
msgstr ""
"'%s' (%s パッケージ) がインストールされていないと、'quilt %s' は利用できませ"
"ん\\n"
-#: quilt/scripts/patchfns.in:1124
+#: quilt/scripts/patchfns.in:1143
msgid "Cannot change into parent directory %s/\\n"
msgstr "上のディレクトリー %s に変更できません/\\n"
-#: quilt/scripts/patchfns.in:1165
+#: quilt/scripts/patchfns.in:1184
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
@@ -1503,7 +1503,7 @@ msgstr ""
"現在作業中のディレクトリは古いバージョンの quiltによって作られたもので"
"す。'quilt upgrade'を実行してください。\\n"
-#: quilt/scripts/patchfns.in:1173
+#: quilt/scripts/patchfns.in:1192
msgid ""
"The series file no longer matches the applied patches. Please run 'quilt pop "
"-a'.\\n"
@@ -1577,7 +1577,7 @@ msgstr "ディレクトリ %s は、すでに存在します\\n"
msgid "File %s exists\\n"
msgstr "ファイル %s は、すでに存在します\\n"
-#: quilt/setup.in:266
+#: quilt/setup.in:274
msgid ""
"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
"slow|--fast] {specfile|seriesfile}\\n"
@@ -1585,7 +1585,7 @@ msgstr ""
"使い方: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
"slow|--fast] {specfile|seriesfile}\\n"
-#: quilt/setup.in:269
+#: quilt/setup.in:277
msgid ""
"\n"
"Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1608,8 +1608,7 @@ msgid ""
"\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"
+"\ttarget directory.\n"
msgstr ""
"\n"
"rpmの specファイルまたは quiltの seriesファイルを使って、ソースツリー\n"
@@ -1632,28 +1631,27 @@ msgstr ""
"\n"
"--fast\t別の、速い spec ファイルの処理方法を使用。このモードでは\n"
"\trpmbuild はターゲットディレクトリで作業ツリーの生成を指示され\n"
-"\tる。もし入力がシリーズファイルの場合、すべてのアーカイブは事前\n"
-"\tに展開されていることが期待される。\n"
+"\tる。\n"
-#: quilt/setup.in:373
+#: quilt/setup.in:380
msgid "The %%prep section of %s failed; results may be incomplete\\n"
msgstr ""
"%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま"
"す\\n"
-#: quilt/setup.in:376
+#: quilt/setup.in:383
msgid "The -v option will show rpm's output\\n"
msgstr "-vオプションを使って、rpmの出力を表示できます"
-#: quilt/setup.in:432 quilt/setup.in:444
+#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467
msgid "File %s not found\\n"
msgstr "ファイル %s が見つかりません"
-#: quilt/setup.in:435 quilt/setup.in:447
+#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470
msgid "Unpacking archive %s\\n"
msgstr "アーカイブ %s を展開しています\\n"
-#: quilt/setup.in:457
+#: quilt/setup.in:480
msgid "Trying alternative patches and series names..."
msgstr "別名の patches と series を試します..."
diff --git a/po/quilt.pot b/po/quilt.pot
index 4fba01a..4465ff3 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:603
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:618
msgid "Patch %s is currently applied\\n"
msgstr ""
@@ -399,11 +399,11 @@ msgid ""
"\tCreate a backup copy of the old version of a patch as patch~.\n"
msgstr ""
-#: quilt/header.in:167
+#: quilt/header.in:170
msgid "Replaced header of patch %s\\n"
msgstr ""
-#: quilt/header.in:170
+#: quilt/header.in:173
msgid "Appended text to header of patch %s\\n"
msgstr ""
@@ -437,7 +437,7 @@ msgid ""
"\tmust be specified. This option is only effective when -f is used.\n"
msgstr ""
-#: quilt/import.in:73
+#: quilt/import.in:73 quilt/mail.in:463
msgid "Patch %s does not exist\\n"
msgstr ""
@@ -554,27 +554,27 @@ msgstr ""
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
-#: quilt/mail.in:460
+#: quilt/mail.in:466
msgid "Unable to extract a subject header from %s\\n"
msgstr ""
-#: quilt/mail.in:484
+#: quilt/mail.in:492
msgid "Patches %s have duplicate subject headers.\\n"
msgstr ""
-#: quilt/mail.in:493
+#: quilt/mail.in:501
msgid "File %s does not exist\\n"
msgstr ""
-#: quilt/mail.in:553
+#: quilt/mail.in:561
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr ""
-#: quilt/mail.in:556
+#: quilt/mail.in:564
msgid "Introduction has no subject header\\n"
msgstr ""
-#: quilt/mail.in:670
+#: quilt/mail.in:677
msgid "Introduction saved as %s\\n"
msgstr ""
@@ -682,7 +682,7 @@ msgid ""
"\tAutomatically refresh every patch before it gets unapplied.\n"
msgstr ""
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:930
msgid "Failed to copy files to temporary directory\\n"
msgstr ""
@@ -698,7 +698,7 @@ msgstr ""
msgid "Removing patch %s\\n"
msgstr ""
-#: quilt/pop.in:216 quilt/push.in:373
+#: quilt/pop.in:216 quilt/push.in:376
msgid "Options %s and %s are mutually exclusive\\n"
msgstr ""
@@ -710,11 +710,11 @@ msgstr ""
msgid "No patch removed\\n"
msgstr ""
-#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:527
msgid "No patches applied\\n"
msgstr ""
-#: quilt/pop.in:279 quilt/push.in:437
+#: quilt/pop.in:279 quilt/push.in:440
msgid "Now at patch %s\\n"
msgstr ""
@@ -774,39 +774,39 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr ""
-#: quilt/push.in:183
+#: quilt/push.in:186
msgid "Applying patch %s\\n"
msgstr ""
-#: quilt/push.in:217
+#: quilt/push.in:220
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr ""
-#: quilt/push.in:221
+#: quilt/push.in:224
msgid "Patch %s appears to be empty; applied\\n"
msgstr ""
-#: quilt/push.in:225
+#: quilt/push.in:228
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr ""
-#: quilt/push.in:235
+#: quilt/push.in:238
msgid "Patch %s can be reverse-applied\\n"
msgstr ""
-#: quilt/push.in:238
+#: quilt/push.in:241
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr ""
-#: quilt/push.in:293
+#: quilt/push.in:296
msgid "Patch %s is already applied; check your series file\\n"
msgstr ""
-#: quilt/push.in:405
+#: quilt/push.in:408
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr ""
-#: quilt/push.in:413
+#: quilt/push.in:416
msgid "No patch applied\\n"
msgstr ""
@@ -991,39 +991,39 @@ msgstr ""
msgid "Delivery address `%s' is invalid\n"
msgstr ""
-#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
+#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540
msgid "%s is not a regular file\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
+#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511
msgid "No patches in series\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
+#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513
msgid "No series file found\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:554
+#: quilt/scripts/patchfns.in:569
msgid "Patch %s is not in series\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:582
+#: quilt/scripts/patchfns.in:597
msgid "Patch %s is not applied\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:619
+#: quilt/scripts/patchfns.in:634
msgid "File series fully applied, ends at patch %s\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:764
+#: quilt/scripts/patchfns.in:779
msgid "Diff failed on file '%s', aborting\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:929
+#: quilt/scripts/patchfns.in:948
msgid "Failed to patch temporary files\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:972
+#: quilt/scripts/patchfns.in:991
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 "
@@ -1031,21 +1031,21 @@ msgid ""
"downgrading.\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:1045
+#: quilt/scripts/patchfns.in:1064
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:1124
+#: quilt/scripts/patchfns.in:1143
msgid "Cannot change into parent directory %s/\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:1165
+#: quilt/scripts/patchfns.in:1184
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:1173
+#: quilt/scripts/patchfns.in:1192
msgid ""
"The series file no longer matches the applied patches. Please run 'quilt pop "
"-a'.\\n"
@@ -1109,13 +1109,13 @@ msgstr ""
msgid "File %s exists\\n"
msgstr ""
-#: quilt/setup.in:266
+#: quilt/setup.in:274
msgid ""
"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
"slow|--fast] {specfile|seriesfile}\\n"
msgstr ""
-#: quilt/setup.in:269
+#: quilt/setup.in:277
msgid ""
"\n"
"Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1138,27 +1138,26 @@ msgid ""
"\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"
+"\ttarget directory.\n"
msgstr ""
-#: quilt/setup.in:373
+#: quilt/setup.in:380
msgid "The %%prep section of %s failed; results may be incomplete\\n"
msgstr ""
-#: quilt/setup.in:376
+#: quilt/setup.in:383
msgid "The -v option will show rpm's output\\n"
msgstr ""
-#: quilt/setup.in:432 quilt/setup.in:444
+#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467
msgid "File %s not found\\n"
msgstr ""
-#: quilt/setup.in:435 quilt/setup.in:447
+#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470
msgid "Unpacking archive %s\\n"
msgstr ""
-#: quilt/setup.in:457
+#: quilt/setup.in:480
msgid "Trying alternative patches and series names..."
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index cab1da5..fee19e5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -186,7 +186,7 @@ msgstr ""
msgid "No next patch\\n"
msgstr "Отсутствует следующий патч\\n"
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:603
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:618
msgid "Patch %s is currently applied\\n"
msgstr "Патч %s применён\\n"
@@ -615,11 +615,11 @@ msgstr ""
"--backup\n"
"\tСоздать резервную копию старой версии патча в файле имя_патча~.\n"
-#: quilt/header.in:167
+#: quilt/header.in:170
msgid "Replaced header of patch %s\\n"
msgstr "Заменён заголовок патча %s\\n"
-#: quilt/header.in:170
+#: quilt/header.in:173
msgid "Appended text to header of patch %s\\n"
msgstr "Добавлен текст к заголовку патча %s\\n"
@@ -677,7 +677,7 @@ msgstr ""
"\tдолжна быть указана. Эта опция имеет эффект только, когда используется -"
"f.\n"
-#: quilt/import.in:73
+#: quilt/import.in:73 quilt/mail.in:463
msgid "Patch %s does not exist\\n"
msgstr "Патч %s не существует\\n"
@@ -849,27 +849,27 @@ msgstr "Вводное сообщение уже указано"
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr "Не удалось определить адрес отправителя. Используйте опцию --sender."
-#: quilt/mail.in:460
+#: quilt/mail.in:466
msgid "Unable to extract a subject header from %s\\n"
msgstr "Не удалось извлечь тему письма из %s\\n"
-#: quilt/mail.in:484
+#: quilt/mail.in:492
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "У патчей %s дублируются заголовки темы.\\n"
-#: quilt/mail.in:493
+#: quilt/mail.in:501
msgid "File %s does not exist\\n"
msgstr "Файл %s не существует\\n"
-#: quilt/mail.in:553
+#: quilt/mail.in:561
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Во введении нет заголовка Subject (сохранено как %s)\\n"
-#: quilt/mail.in:556
+#: quilt/mail.in:564
msgid "Introduction has no subject header\\n"
msgstr "Во введении нет заголовка Subject\\n"
-#: quilt/mail.in:670
+#: quilt/mail.in:677
msgid "Introduction saved as %s\\n"
msgstr "Введение сохранено как %s\\n"
@@ -1030,7 +1030,7 @@ msgstr ""
"--refresh\n"
"\tАвтоматически обновить каждый патч перед его откатом.\n"
-#: quilt/pop.in:103 quilt/scripts/patchfns.in:911
+#: quilt/pop.in:103 quilt/scripts/patchfns.in:930
msgid "Failed to copy files to temporary directory\\n"
msgstr "Не удалось скопировать файлы во временную директорию\\n"
@@ -1048,7 +1048,7 @@ msgstr "Похоже, патч %s пуст, удаление\\n"
msgid "Removing patch %s\\n"
msgstr "Удаление патча %s\\n"
-#: quilt/pop.in:216 quilt/push.in:373
+#: quilt/pop.in:216 quilt/push.in:376
msgid "Options %s and %s are mutually exclusive\\n"
msgstr "Опции %s и %s — взаимоисключающие\\n"
@@ -1060,11 +1060,11 @@ msgstr "Сначала нужно обновить патч %s.\\n"
msgid "No patch removed\\n"
msgstr "Не удалено ни одного патча\\n"
-#: quilt/pop.in:272 quilt/scripts/patchfns.in:512
+#: quilt/pop.in:272 quilt/scripts/patchfns.in:527
msgid "No patches applied\\n"
msgstr "Нет применённых патчей\\n"
-#: quilt/pop.in:279 quilt/push.in:437
+#: quilt/pop.in:279 quilt/push.in:440
msgid "Now at patch %s\\n"
msgstr "Текущий патч: %s\\n"
@@ -1160,39 +1160,39 @@ msgstr ""
msgid "Interrupted by user; patch %s was not applied.\\n"
msgstr "Прервано пользователем; патч %s не был наложен.\\n"
-#: quilt/push.in:183
+#: quilt/push.in:186
msgid "Applying patch %s\\n"
msgstr "Наложение патча %s\\n"
-#: quilt/push.in:217
+#: quilt/push.in:220
msgid "Patch %s does not exist; applied empty patch\\n"
msgstr "Патч %s не существует; наложен пустой патч\\n"
-#: quilt/push.in:221
+#: quilt/push.in:224
msgid "Patch %s appears to be empty; applied\\n"
msgstr "Похоже, патч %s пуст; наложен\\n"
-#: quilt/push.in:225
+#: quilt/push.in:228
msgid "Applied patch %s (forced; needs refresh)\\n"
msgstr "Наложен патч %s (принудительно; следует сделать refresh)\\n"
-#: quilt/push.in:235
+#: quilt/push.in:238
msgid "Patch %s can be reverse-applied\\n"
msgstr "Патч %s может быть наложен в обратную сторону\\n"
-#: quilt/push.in:238
+#: quilt/push.in:241
msgid "Patch %s does not apply (enforce with -f)\\n"
msgstr "Патч %s не удаётся наложить (принудить с -f)\\n"
-#: quilt/push.in:293
+#: quilt/push.in:296
msgid "Patch %s is already applied; check your series file\\n"
msgstr "Патч %s уже наложен; проверьте свой файл series\\n"
-#: quilt/push.in:405
+#: quilt/push.in:408
msgid "The topmost patch %s needs to be refreshed first.\\n"
msgstr "Сначала необходимо обновить самый верхний патч %s.\\n"
-#: quilt/push.in:413
+#: quilt/push.in:416
msgid "No patch applied\\n"
msgstr "Нет наложенных патчей\\n"
@@ -1451,39 +1451,39 @@ msgstr "Отображаемое имя «%s» содержит непарные
msgid "Delivery address `%s' is invalid\n"
msgstr "Некорректный адрес назначения «%s»\n"
-#: quilt/scripts/patchfns.in:231 quilt/scripts/patchfns.in:525
+#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540
msgid "%s is not a regular file\\n"
msgstr "%s не является обычным файлом\\n"
-#: quilt/scripts/patchfns.in:479 quilt/scripts/patchfns.in:496
+#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511
msgid "No patches in series\\n"
msgstr "Нет патчей в файле series\\n"
-#: quilt/scripts/patchfns.in:481 quilt/scripts/patchfns.in:498
+#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513
msgid "No series file found\\n"
msgstr "Файл series не найден\\n"
-#: quilt/scripts/patchfns.in:554
+#: quilt/scripts/patchfns.in:569
msgid "Patch %s is not in series\\n"
msgstr "Патча %s нет в файле series\\n"
-#: quilt/scripts/patchfns.in:582
+#: quilt/scripts/patchfns.in:597
msgid "Patch %s is not applied\\n"
msgstr "Патч %s не наложен\\n"
-#: quilt/scripts/patchfns.in:619
+#: quilt/scripts/patchfns.in:634
msgid "File series fully applied, ends at patch %s\\n"
msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n"
-#: quilt/scripts/patchfns.in:764
+#: quilt/scripts/patchfns.in:779
msgid "Diff failed on file '%s', aborting\\n"
msgstr "Не удалось выполнить diff на файле «%s», завершение\\n"
-#: quilt/scripts/patchfns.in:929
+#: quilt/scripts/patchfns.in:948
msgid "Failed to patch temporary files\\n"
msgstr "Не удалось применить патч к временным файлам\\n"
-#: quilt/scripts/patchfns.in:972
+#: quilt/scripts/patchfns.in:991
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 "
@@ -1495,15 +1495,15 @@ msgstr ""
"отмените все патчи, используя версию quilt, которая использовалась для их "
"наложения, прежде чем использовать эту версию.\\n"
-#: quilt/scripts/patchfns.in:1045
+#: quilt/scripts/patchfns.in:1064
msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n"
msgstr "Нужно установить «%s» (из пакета %s), чтобы использовать «quilt %s»\\n"
-#: quilt/scripts/patchfns.in:1124
+#: quilt/scripts/patchfns.in:1143
msgid "Cannot change into parent directory %s/\\n"
msgstr "Невозможно перейти в родительскую директорию %s/\\n"
-#: quilt/scripts/patchfns.in:1165
+#: quilt/scripts/patchfns.in:1184
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
@@ -1511,7 +1511,7 @@ msgstr ""
"Рабочее дерево было создано более старой версией quilt. Пожалуйста, "
"выполните «quilt upgrade».\\n"
-#: quilt/scripts/patchfns.in:1173
+#: quilt/scripts/patchfns.in:1192
msgid ""
"The series file no longer matches the applied patches. Please run 'quilt pop "
"-a'.\\n"
@@ -1585,7 +1585,7 @@ msgstr "Директория %s существует\\n"
msgid "File %s exists\\n"
msgstr "Файл %s существует\\n"
-#: quilt/setup.in:266
+#: quilt/setup.in:274
msgid ""
"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--"
"slow|--fast] {specfile|seriesfile}\\n"
@@ -1593,7 +1593,7 @@ msgstr ""
"Синтаксис: quilt setup [-d префикс-пути] [-v] [--sourcedir путь] [--fuzz=N] "
"[--slow|--fast] {файл-spec|файл-series}\\n"
-#: quilt/setup.in:269
+#: quilt/setup.in:277
msgid ""
"\n"
"Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1616,8 +1616,7 @@ msgid ""
"\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"
+"\ttarget directory.\n"
msgstr ""
"\n"
"Инициализирует дерево исходных кодов из спецификации rpm или файла series.\n"
@@ -1643,27 +1642,25 @@ msgstr ""
"--fast\tИспользовать альтернативный, более быстрый метод обработки файла "
"spec. В этом\n"
"\tрежиме rpmbuild генерирует рабочее дерево прямо в целевой директории.\n"
-"\tЕсли на ввод дан файл series, предполагается, что все архивы были\n"
-"\tуже распакованы вручную.\n"
-#: quilt/setup.in:373
+#: quilt/setup.in:380
msgid "The %%prep section of %s failed; results may be incomplete\\n"
msgstr ""
"Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n"
-#: quilt/setup.in:376
+#: quilt/setup.in:383
msgid "The -v option will show rpm's output\\n"
msgstr "Опция -v покажет вывод rpm\\n"
-#: quilt/setup.in:432 quilt/setup.in:444
+#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467
msgid "File %s not found\\n"
msgstr "Файл %s не найден\\n"
-#: quilt/setup.in:435 quilt/setup.in:447
+#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470
msgid "Unpacking archive %s\\n"
msgstr "Распаковка архива %s\\n"
-#: quilt/setup.in:457
+#: quilt/setup.in:480
msgid "Trying alternative patches and series names..."
msgstr "Попытка использовать альтернативные имена для series и patches…"