Resync translation files

1 files changed, 115 insertions, 61 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 ""