summaryrefslogtreecommitdiffstats
path: root/po/de.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/de.po')
-rw-r--r--po/de.po100
1 files changed, 54 insertions, 46 deletions
diff --git a/po/de.po b/po/de.po
index 3fedef0..eb9864c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,19 +14,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10\n"
-#: bin/quilt.in:32
+#: bin/quilt.in:36
msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..."
-#: bin/quilt.in:33
+#: bin/quilt.in:37
msgid " quilt --version"
msgstr " quilt --version"
-#: bin/quilt.in:35
+#: bin/quilt.in:39
msgid "Commands are:"
msgstr "Vorhandene Befehle:"
-#: bin/quilt.in:40
+#: bin/quilt.in:44
msgid ""
"\n"
"Global options:\n"
@@ -52,7 +52,8 @@ msgstr ""
"\n"
"--quiltrc datei\n"
"\tVerwende die angegebene Konfigurationsdatei statt ~/.quiltrc (oder\n"
-"\t@ETCDIR@/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-Dokumentation\n"
+"\t@ETCDIR@/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-"
+"Dokumentation\n"
"\tfür mögliche Einstellungen. Der Dateiname \\`-' bedeutet, dass keine\n"
"\tResource-Datei eingelesen werden soll.\n"
"\n"
@@ -181,7 +182,7 @@ msgstr ""
msgid "No next patch\\n"
msgstr "Kein Patch %s\\n"
-#: quilt/delete.in:102 quilt/scripts/patchfns.in:617
+#: quilt/delete.in:102 quilt/scripts/patchfns.in:583
msgid "Patch %s is currently applied\\n"
msgstr "Patch %s ist momentan angewandt\\n"
@@ -320,14 +321,13 @@ msgstr ""
msgid ""
"Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n"
msgstr ""
-"Kann kein Diff mit -p%s erzeugen, bitte -p0, -p1 oder -pab verwenden."
-"\\n"
+"Kann kein Diff mit -p%s erzeugen, bitte -p0, -p1 oder -pab verwenden.\\n"
#: quilt/diff.in:241
msgid "No snapshot to diff against\\n"
msgstr ""
-#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397
+#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418
msgid "Patch %s not applied before patch %s\\n"
msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
@@ -732,9 +732,9 @@ msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
#: quilt/mail.in:24
#, fuzzy
msgid ""
-"Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
-"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
-"[--reply-to message] [first_patch [last_patch]]\\n"
+"Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] "
+"[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--"
+"subject ...] [--reply-to message] [first_patch [last_patch]]\\n"
msgstr ""
"Verwendung: quilt mail {--mbox datei|--send} [-m text] [--prefix prefix] [--"
"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
@@ -756,6 +756,9 @@ msgid ""
"\tused, the editor will not be invoked, and the patches will be\n"
"\tprocessed immediately.\n"
"\n"
+"-M file\n"
+"\tLike the -m option, but read the introduction from file.\n"
+"\n"
"--prefix prefix\n"
"\tUse an alternate prefix in the bracketed part of the subjects\n"
"\tgenerated. Defaults to \\`patch'.\n"
@@ -819,32 +822,32 @@ msgstr ""
"--to, --cc, --bcc\n"
"\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n"
-#: quilt/mail.in:285
+#: quilt/mail.in:302
msgid "Could not determine the envelope sender address. Please use --sender."
msgstr ""
"Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender."
-#: quilt/mail.in:425
+#: quilt/mail.in:446
msgid "Unable to extract a subject header from %s\\n"
msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n"
-#: quilt/mail.in:449
+#: quilt/mail.in:470
msgid "Patches %s have duplicate subject headers.\\n"
msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n"
-#: quilt/mail.in:458
+#: quilt/mail.in:479
msgid "File %s does not exist\\n"
msgstr "Datei %s existiert nicht\\n"
-#: quilt/mail.in:518
+#: quilt/mail.in:539
msgid "Introduction has no subject header (saved as %s)\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n"
-#: quilt/mail.in:521
+#: quilt/mail.in:542
msgid "Introduction has no subject header\\n"
msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n"
-#: quilt/mail.in:624
+#: quilt/mail.in:654
msgid "Introduction saved as %s\\n"
msgstr "Einleitung gespeichert als %s\\n"
@@ -857,7 +860,8 @@ msgstr "Verwendung: quilt new [-p n|-p ab] {patchname}\\n"
msgid ""
"\n"
"Create a new patch with the specified file name, and insert it after the\n"
-"topmost patch.\n"
+"topmost patch. The name can be prefixed with a sub-directory name, allowing\n"
+"for grouping related patches together.\n"
"\n"
"-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n"
"\n"
@@ -882,23 +886,27 @@ msgstr ""
"im vorgesehenen Wurzelverzeichnis, falls Quilt ein Verzeichnis zu weit oben\n"
"im Verzeichnisbaum verwendet.\n"
-#: quilt/new.in:75
+#: quilt/new.in:76
#, fuzzy
msgid ""
"Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n"
msgstr ""
-"Kann Patches mit Level -p%s nicht aktualisieren, bitte -p0, -p1 "
-"oder -pab angeben\\n"
+"Kann Patches mit Level -p%s nicht aktualisieren, bitte -p0, -p1 oder -pab "
+"angeben\\n"
-#: quilt/new.in:90 quilt/refresh.in:185
+#: quilt/new.in:89
+msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n"
+msgstr ""
+
+#: quilt/new.in:97 quilt/refresh.in:185
msgid "Patch %s exists already\\n"
msgstr "Patch %s existiert bereits\\n"
-#: quilt/new.in:101 quilt/refresh.in:342
+#: quilt/new.in:108 quilt/refresh.in:342
msgid "Failed to create patch %s\\n"
msgstr "Konnte Patch %s nicht erzeugen\\n"
-#: quilt/new.in:104
+#: quilt/new.in:111
msgid "Patch %s is now on top\\n"
msgstr "Der oberste Patch ist jetzt %s\\n"
@@ -981,11 +989,11 @@ msgstr ""
"\n"
"-v\tViele Meldungen ausgeben.\n"
-#: quilt/pop.in:100 quilt/scripts/patchfns.in:919
+#: quilt/pop.in:100 quilt/scripts/patchfns.in:886
msgid "Failed to copy files to temporary directory\\n"
msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
-#: quilt/pop.in:116 quilt/scripts/patchfns.in:937
+#: quilt/pop.in:116 quilt/scripts/patchfns.in:904
msgid "Failed to patch temporary files\\n"
msgstr "Konnte temporäre Dateien nicht patchen\\n"
@@ -1011,7 +1019,7 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
msgid "No patch removed\\n"
msgstr "Kein Patch entfernt\\n"
-#: quilt/pop.in:261 quilt/scripts/patchfns.in:526
+#: quilt/pop.in:261 quilt/scripts/patchfns.in:492
msgid "No patches applied\\n"
msgstr "Keine Patches angewandt\\n"
@@ -1038,8 +1046,8 @@ msgid ""
"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color"
"[=always|auto|never]] [num|patch]\\n"
msgstr ""
-"Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color"
-"[=always|auto|never]] [num|patch]\\n"
+"Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--"
+"color[=always|auto|never]] [num|patch]\\n"
#: quilt/push.in:27
#, fuzzy
@@ -1385,46 +1393,46 @@ msgstr "Konnte Änderungen an %s in Patch %s nicht zurücknehmen\\n"
msgid "Changes to %s in patch %s reverted\\n"
msgstr "Änderungen an %s in Patch %s zurückgenommen\\n"
-#: quilt/scripts/edmail.in:83
+#: quilt/scripts/edmail.in:96
#, perl-format
msgid "Display name `%s' contains unpaired parentheses\n"
msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n"
-#: quilt/scripts/edmail.in:101
+#: quilt/scripts/edmail.in:114
#, perl-format
msgid "Delivery address `%s' is invalid\n"
msgstr "Zustelladresse `%s' ist ungültig\n"
-#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539
+#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505
#, fuzzy
msgid "%s is not a regular file\\n"
msgstr "Patch %s ist nicht in der series-Datei\\n"
-#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510
+#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476
msgid "No patches in series\\n"
msgstr "Keine Patches in der series-Datei\\n"
-#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512
+#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478
msgid "No series file found\\n"
msgstr ""
-#: quilt/scripts/patchfns.in:568
+#: quilt/scripts/patchfns.in:534
msgid "Patch %s is not in series\\n"
msgstr "Patch %s ist nicht in der series-Datei\\n"
-#: quilt/scripts/patchfns.in:596
+#: quilt/scripts/patchfns.in:562
msgid "Patch %s is not applied\\n"
msgstr "Patch %s ist nicht angewandt\\n"
-#: quilt/scripts/patchfns.in:633
+#: quilt/scripts/patchfns.in:599
msgid "File series fully applied, ends at patch %s\\n"
msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
-#: quilt/scripts/patchfns.in:655
+#: quilt/scripts/patchfns.in:632
msgid "Patch %s does not exist\\n"
msgstr "Patch %s existiert nicht\\n"
-#: quilt/scripts/patchfns.in:978
+#: quilt/scripts/patchfns.in:945
msgid ""
"The quilt meta-data in this tree has version %s, but this version of quilt "
"can only handle meta-data formats up to and including version %s. Please pop "
@@ -1437,7 +1445,7 @@ msgstr ""
"quilt alle Patches mit der Version von quilt, die zur Erstellung des "
"Arbeitsverzeichnisses verwendet wurde.\\n"
-#: quilt/scripts/patchfns.in:1122
+#: quilt/scripts/patchfns.in:1089
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"
@@ -1510,8 +1518,8 @@ msgid ""
"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] "
"{specfile|seriesfile}\\n"
msgstr ""
-"Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] "
-"[--fuzz=N] {spec-datei|series-datei}\\n"
+"Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--"
+"fuzz=N] {spec-datei|series-datei}\\n"
#: quilt/setup.in:78
#, fuzzy
@@ -1550,11 +1558,11 @@ msgstr ""
msgid "The -v option will show rpm's output\\n"
msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
-#: quilt/setup.in:189
+#: quilt/setup.in:195
msgid "File %s not found\\n"
msgstr "Datei %s nicht gefunden\\n"
-#: quilt/setup.in:192
+#: quilt/setup.in:198
msgid "Unpacking archive %s\\n"
msgstr "Entpacke Archiv %s\\n"