- Fix a few translation bugs; update german translation.

1 files changed, 280 insertions, 251 deletions

diff --git a/po/de.po b/po/de.po
index a3c6834..9914541 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,30 +1,32 @@
+# translation of de.po to
 # German quilt translation
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# Andreas Gruenbacher <agruen@suse.de>, 2003.
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Andreas Gruenbacher <agruen@suse.de>, 2003, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: quilt 0.21\n"
-"PO-Revision-Date: 2003-11-24 17:00 +0200\n"
+"Project-Id-Version: de\n"
+"PO-Revision-Date: 2005-07-19 11:32+0200\n"
 "Last-Translator: Andreas Gruenbacher <agruen@suse.de>\n"
+"Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10\n"
 
-#: bin/quilt:23
+#: bin/quilt.in:23
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..."
 
-#: bin/quilt:24
+#: bin/quilt.in:24
 msgid "       quilt --version"
 msgstr "            quilt --version"
 
-#: bin/quilt:26
+#: bin/quilt.in:26
 msgid "Commands are:"
 msgstr "Vorhandene Befehle:"
 
-#: bin/quilt:31
-#, fuzzy
+#: bin/quilt.in:31
 msgid ""
 "\n"
 "Global options:\n"
@@ -41,7 +43,7 @@ msgid ""
 "\tPrint the version number and exit immediately."
 msgstr ""
 "\n"
-"Gemeinsame Optionen für alle Befehle:\n"
+"Globale Optionen:\n"
 "\n"
 "--trace\n"
 "\tFührt die Kommandos im bash Trace-Modus (-x) aus. Für Debugging.\n"
@@ -49,13 +51,15 @@ msgstr ""
 "--quiltrc datei\n"
 "\tVerwende die angegebene Konfigurationsdatei statt ~/.quiltrc (oder\n"
 "\t/etc/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-Dokumentation\n"
-"\tfür mögliche Einstellungen."
+"\tfür mögliche Einstellungen.\n"
+"--version\n"
+"\tGibt die Versionsummer aus."
 
-#: quilt/add:22
+#: quilt/add.in:22
 msgid "Usage: quilt add [-p patch] {file} ...\\n"
 msgstr "Verwendung: quilt add [-p patch] {datei} ...\\n"
 
-#: quilt/add:25
+#: quilt/add.in:25
 msgid ""
 "\n"
 "Add one or more files to the topmost or named patch.  Files must be\n"
@@ -74,65 +78,69 @@ msgstr ""
 "-p patch\n"
 "\tPatch, zu dem die Dateien hinzugefügt werden sollen.\n"
 
-#: quilt/add:48 quilt/add:54
+#: quilt/add.in:48 quilt/add.in:54
 msgid "File \\`%s' is located below \\`%s'\\n"
 msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n"
 
-#: quilt/add:78 quilt/applied:62 quilt/delete:97 quilt/diff:160 quilt/diff:171
-#: quilt/graph:116 quilt/header:135 quilt/next:62 quilt/pop:246
-#: quilt/previous:62 quilt/push:312 quilt/refresh:148 quilt/remove:53
-#: quilt/rename:63 quilt/unapplied:62
+#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160
+#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62
+#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312
+#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63
+#: quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei enthalten\\n"
 
-#: quilt/add:99 quilt/diff:239 quilt/graph:121 quilt/pop:261 quilt/refresh:154
-#: quilt/remove:74
+#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261
+#: quilt/refresh.in:154 quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/add:106 quilt/delete:76 quilt/diff:247 quilt/files:103 quilt/fold:79
-#: quilt/fork:72 quilt/graph:131 quilt/header:142 quilt/pop:295 quilt/push:350
-#: quilt/refresh:162 quilt/remove:81 quilt/rename:85
+#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103
+#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142
+#: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81
+#: quilt/rename.in:85
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
-#: quilt/add:121
+#: quilt/add.in:121
 msgid "File %s is already in patch %s\\n"
 msgstr "Datei %s ist bereits in Patch $patch enthalten\\n"
 
-#: quilt/add:129 quilt/remove:100
+#: quilt/add.in:129 quilt/remove.in:100
 msgid "File %s modified by patch %s\\n"
 msgstr "Datei %s wird von Patch %s verändert\\n"
 
-#: quilt/add:137
+#: quilt/add.in:137
 msgid "Cannot add symbolic link %s\\n"
 msgstr "Kann symbolische Verknüpfung %s nicht hinzufügen\\n"
 
-#: quilt/add:144
+#: quilt/add.in:144
 msgid "Failed to back up file %s\\n"
 msgstr "Konnte Datei %s nicht sichern\\n"
 
-#: quilt/add:155
+#: quilt/add.in:155
 msgid "File %s added to patch %s\\n"
 msgstr "Datei %s zu Patch %s hinzugefügt\\n"
 
-#: quilt/annotate:22
-#, fuzzy
+#: quilt/annotate.in:22
 msgid "Usage: quilt annotate {file}\\n"
-msgstr "Verwendung: quilt patches {file}\\n"
+msgstr "Verwendung: quilt annotate {datei}\\n"
 
-#: quilt/annotate:25
+#: quilt/annotate.in:25
 msgid ""
 "\n"
 "Print an annotated listing of the specified file showing which\n"
 "patches modify which lines.\n"
 msgstr ""
+"\n"
+"Erzeuge ein Listing der angegebenen Datei das anzeigt, welche\n"
+"Patches welche Zeilen verändern.\n"
 
-#: quilt/applied:22
+#: quilt/applied.in:22
 msgid "Usage: quilt applied [patch]\\n"
 msgstr "Verwendung: quilt applied [patch]\\n"
 
-#: quilt/applied:25
+#: quilt/applied.in:25
 msgid ""
 "\n"
 "Print a list of applied patches, or all patches up to and including the\n"
@@ -142,16 +150,15 @@ msgstr ""
 "Gibt eine Liste der angewandten Patches aus, oder eine Liste aller Patches\n"
 "vom Anfang der series-Datei bis zum angegebenen Patch.\n"
 
-#: quilt/applied:67
+#: quilt/applied.in:67
 msgid "Patch is not applied\\n"
 msgstr "Patch ist nicht angewandt\\n"
 
-#: quilt/delete:22
+#: quilt/delete.in:22
 msgid "Usage: quilt delete [patch | -n]\\n"
 msgstr "Verwendung: quilt delete [patch | -n]\\n"
 
-#: quilt/delete:25
-#, fuzzy
+#: quilt/delete.in:25
 msgid ""
 "\n"
 "Remove the specified or topmost patch from the series file.  If the\n"
@@ -165,36 +172,37 @@ msgstr ""
 "Löscht den obersten oder angegebenen Patch aus der series-Datei. Falls\n"
 "dieser Patch angewandt ist, entfernt quilt ihn zuerst. (Momentan kann \n"
 "nur der oberste Patch entfernt werden.)\n"
+"\n"
+"-n\tLösche den nächsten (dem obersten folgenden) Patch statt des obersten\n"
+"\toder angegebenen.\n"
 
-#: quilt/delete:88
+#: quilt/delete.in:88
 msgid "No next patch\\n"
 msgstr "Kein Patch %s\\n"
 
-#: quilt/delete:106
+#: quilt/delete.in:106
 msgid "Patch %s is currently applied\\n"
 msgstr "Patch %s ist momentan angewandt\\n"
 
-#: quilt/delete:113
-#, fuzzy
+#: quilt/delete.in:113
 msgid "Removed patch %s\\n"
-msgstr "Entferne patch %s\\n"
+msgstr "Entferne Patch %s\\n"
 
-#: quilt/delete:115
+#: quilt/delete.in:115
 msgid "Failed to remove patch %s\\n"
 msgstr "Konnte Patch %s nicht entfernen\\n"
 
-#: quilt/diff:24
-#, fuzzy
+#: quilt/diff.in:24
 msgid ""
 "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
 "patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] "
 "[--color] [file ...]\\n"
 msgstr ""
 "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-"
-"R] [-P patch] [--snapshot] [--diff=programm] [--color] [datei ...]\\n"
+"R] [-P patch] [--snapshot] [--diff=programm] [--no-timestamps] [--no-index] "
+"[--sort] [--color] [datei ...]\\n"
 
-#: quilt/diff:28
-#, fuzzy
+#: quilt/diff.in:28
 msgid ""
 "\n"
 "Produces a diff of the specified file(s) in the topmost or specified\n"
@@ -255,6 +263,9 @@ msgstr ""
 "--no-timestamps\n"
 "\tKeine Zeitstempel in Patches angeben.\n"
 "\n"
+"--no-index\n"
+"\tErzeuge keine \"Index:\"-Zeilen\n"
+"\n"
 "-z\tÄnderungen relativ zum angewandten Patch ausgeben.\n"
 "\n"
 "-P patch\n"
@@ -277,48 +288,51 @@ msgstr ""
 "\n"
 "--color[=always|auto|never]\n"
 "\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie).\n"
+"\n"
+"--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n"
+"\tReihenfolge zu erhalten.\n"
 
-#: quilt/diff:231
+#: quilt/diff.in:231
 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
 msgstr ""
 "Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht "
 "kombiniert werden.\\n"
 
-#: quilt/diff:258
+#: quilt/diff.in:258
 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden."
 "\\n"
 
-#: quilt/diff:293 quilt/files:122
+#: quilt/diff.in:293 quilt/files.in:122
 msgid "Patch %s not applied before patch %s\\n"
 msgstr "Patch %s ist nicht vor Patch %s angewandt\\n"
 
-#: quilt/diff:343 quilt/pop:114
+#: quilt/diff.in:343 quilt/pop.in:114
 msgid "Failed to copy files to temporary directory\\n"
 msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n"
 
-#: quilt/diff:367 quilt/pop:138
+#: quilt/diff.in:367 quilt/pop.in:138
 msgid "Failed to patch temporary files\\n"
 msgstr "Konnte temporäre Dateien nicht patchen\\n"
 
-#: quilt/diff:386
+#: quilt/diff.in:386
 msgid "File %s is not being modified\\n"
 msgstr "Datei %s wird nicht verändert.\\n"
 
-#: quilt/diff:406 quilt/refresh:201
+#: quilt/diff.in:406 quilt/refresh.in:201
 msgid "Diff failed, aborting\\n"
 msgstr "Diff fehlgeschlagen, Abbruch.\\n"
 
-#: quilt/diff:413
+#: quilt/diff.in:413
 msgid "More recent patches modify files in patch %s\\n"
 msgstr "Später angewandte Patches verändern Dateien von %s\\n"
 
-#: quilt/edit:13
+#: quilt/edit.in:13
 msgid "Usage: quilt edit file ...\\n"
 msgstr "Verwendung: quilt edit datei ...\\n"
 
-#: quilt/edit:16
+#: quilt/edit.in:16
 msgid ""
 "\n"
 "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
@@ -328,11 +342,11 @@ msgstr ""
 "Füge die angegebene(n) Datei(en) dem obersten Patch hinzu, und editiere\n"
 "sie dann in \\$EDITOR (%s).\n"
 
-#: quilt/files:22
+#: quilt/files.in:22
 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n"
 msgstr "Verwendung: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n"
 
-#: quilt/files:25
+#: quilt/files.in:25
 msgid ""
 "\n"
 "Print the list of files that the topmost or specified patch changes.\n"
@@ -365,15 +379,15 @@ msgstr ""
 "\tersten angewandten Patch.\n"
 "\n"
 
-#: quilt/files:76 quilt/files:96
+#: quilt/files.in:76 quilt/files.in:96
 msgid "Patch %s is not in series file\\n"
 msgstr "Patch %s ist nicht in der series-Datei enthalten\\n"
 
-#: quilt/fold:22
+#: quilt/fold.in:22
 msgid "Usage: quilt fold [-p strip-level]\\n"
 msgstr "Verwendung: quilt fold [-p strip-ebenen]\\n"
 
-#: quilt/fold:25
+#: quilt/fold.in:25
 msgid ""
 "\n"
 "Integrate the patch read from standard input into the topmost patch:\n"
@@ -395,15 +409,15 @@ msgstr ""
 "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n"
 "\tentfernt werden sollen.\n"
 
-#: quilt/fold:116
+#: quilt/fold.in:116
 msgid "File %s may be corrupted\\n"
 msgstr "Datei %s ist möglicherweise defekt\\n"
 
-#: quilt/fork:22
+#: quilt/fork.in:22
 msgid "Usage: quilt fork [new_name]\\n"
 msgstr "Verwendung: quilt fork [neuer_name]\\n"
 
-#: quilt/fork:25
+#: quilt/fork.in:25
 msgid ""
 "\n"
 "Fork the topmost patch.  Forking a patch means creating a verbatim copy\n"
@@ -418,20 +432,33 @@ msgid ""
 "dash-and-number, the number is further incremented (e.g., patch.diff,\n"
 "patch-2.diff, patch-3.diff).\n"
 msgstr ""
+"\n"
+"Spalte den obersten Patch auf.  Ausfspalten bedeutet, dass eine neue Kopie\n"
+"des Patches unter einem anderen Namen angelegt wird, und der neue Patch\n"
+"anstelle des ursprünglichen in die Series-Datei eingetragen wird.  Das ist\n"
+"praktisch wenn ein Patch verändert werden soll, aber die ursprüngliche "
+"Version\n"
+"erhalten bleiben soll.  Eine typische Abfolge von Befehlen ist: fork, edit, "
+"refresh.\n"
+"\n"
+"Wenn neuer_name fehlt, wird der Name des ursprünglichen Patches verwendet,\n"
+"gefolgt von \\\"-2\\\".  Falls der name bereits in Strick-Nummer endet, wird "
+"die\n"
+"Nummer erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n"
 
-#: quilt/fork:99
+#: quilt/fork.in:99
 msgid "Patch %s exists already, please choose a new name\\n"
 msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
 
-#: quilt/fork:111
+#: quilt/fork.in:111
 msgid "Fork of patch %s to patch %s failed\\n"
 msgstr "Fehler beim Aufspalten von %s auf %s\\n"
 
-#: quilt/fork:117
+#: quilt/fork.in:117
 msgid "Fork of patch %s created as %s\\n"
 msgstr "Neue Version von %s erstellt als %s\\n"
 
-#: quilt/graph:22
+#: quilt/graph.in:22
 msgid ""
 "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] "
 "[patch]\\n"
@@ -439,7 +466,7 @@ msgstr ""
 "Verwendung: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-"
 "labels=files]\\n"
 
-#: quilt/graph:26
+#: quilt/graph.in:26
 msgid ""
 "\n"
 "Generate a dot(1) directed graph showing the dependencies between\n"
@@ -495,11 +522,11 @@ msgstr ""
 "\n"
 "-T ps\tErzeuge direkt eine PostScript-Datei.\n"
 
-#: quilt/grep:22
+#: quilt/grep.in:22
 msgid "Usage: quilt grep [-h|options] {pattern}\\n"
 msgstr "Verwendung: quilt grep [-h|options] {suchausdruck}\\n"
 
-#: quilt/grep:25
+#: quilt/grep.in:25
 msgid ""
 "\n"
 "Grep through the source files, recursively, skipping patches and quilt\n"
@@ -519,16 +546,15 @@ msgstr ""
 "\tDoppelstrick (--) angegeben werden. Suchausdrücke, die mit einem Strich\n"
 "\tbeginnen, können nach einem weiteren Doppelstrich (--) angegeben werden.\n"
 
-#: quilt/header:24
-#, fuzzy
+#: quilt/header.in:24
 msgid ""
 "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-"
 "trailing-whitespace] [patch]\\n"
 msgstr ""
-"Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--"
-"backup] [patch]\\n"
+"Verwendung: quilt header [-e|-r|-e] [--backup] [--strip-diffstat] [--strip-"
+"trailing-whitespace] [patch]\\n"
 
-#: quilt/header:28
+#: quilt/header.in:28
 msgid ""
 "\n"
 "Print or change the header of the topmost or specified patch.\n"
@@ -547,22 +573,39 @@ msgid ""
 "--backup\n"
 "\tCreate a backup copy of the old version of a patch as patch~.\n"
 msgstr ""
+"\n"
+"Zeige den Header des obersten oder angegebenen Patches an, oder verändere "
+"ihn.\n"
+"\n"
+"-a, -r, -e\n"
+"\tFüge Text von der Standardeingabe an den Header an (-a), ersetze den "
+"Header\n"
+"\tmit der Standardeingabe, oder editiere den Header in \\$EDITOR (%s). Wenn "
+"keine\n"
+"\tdieser Optionen angegeben ist, gib den Header aus.\n"
+"\n"
+"--strip-diffstat\n"
+"\tEntferne diffstat-Ergebnisse vom Header.\n"
+"\n"
+"--strip-trailing-whitespace\n"
+"\tEntferne Whitespace an Zeilenenden im Header.\n"
+"\n"
+"--backup\n"
+"\tErzeuge eine Sicherungskopie von patch als patch~.\n"
 
-#: quilt/header:192
-#, fuzzy
+#: quilt/header.in:192
 msgid "Replaced header of patch %s\\n"
-msgstr "Patch %s aufgefrischt\\n"
+msgstr "Header von Patch %s ersetzt\\n"
 
-#: quilt/header:195
-#, fuzzy
+#: quilt/header.in:195
 msgid "Appended text to header of patch %s\\n"
-msgstr "Konnte Patch %s nicht erzeugen\\n"
+msgstr "Text an Header von Patch %s angefügt\\n"
 
-#: quilt/import:22
+#: quilt/import.in:22
 msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n"
 msgstr "Verwendung: quilt import [-f] [-p num] [-n patch] [patchdatei] ...\\n"
 
-#: quilt/import:25
+#: quilt/import.in:25
 msgid ""
 "\n"
 "Import external patches.\n"
@@ -588,37 +631,37 @@ msgstr ""
 "\n"
 "-f\tÜberschreibe/aktualisiere existierende Patches.\n"
 
-#: quilt/import:74
+#: quilt/import.in:74
 msgid "Option \\`-n' can only be used when importing a single patch\\n"
 msgstr ""
 "Die Option \\`-n' kann nur beim Importieren eines einzelnen Patches "
 "verwendet werden\\n"
 
-#: quilt/import:92
+#: quilt/import.in:92
 msgid "Patch %s is applied\\n"
 msgstr "Patch %s ist angewandt\\n"
 
-#: quilt/import:100
+#: quilt/import.in:100
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n"
 
-#: quilt/import:104
+#: quilt/import.in:104
 msgid "Replacing patch %s with new version\\n"
 msgstr "Ersetze Patch %s durch neuere Version\\n"
 
-#: quilt/import:107
+#: quilt/import.in:107
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Importiere Patch %s (abgelegt als %s)\\n"
 
-#: quilt/import:115
+#: quilt/import.in:115
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import:122
+#: quilt/import.in:122
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
-#: quilt/mail:25
+#: quilt/mail.in:25
 msgid ""
 "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--"
 "bcc ...] [--subject ...]\\n"
@@ -626,21 +669,20 @@ msgstr ""
 "Verwendung: quilt mail {--mbox datei|--send} [--from ...] [--to ...] [--"
 "cc ...] [--bcc ...] [--subject ...]\\n"
 
-#: quilt/mail:28
-#, fuzzy
+#: quilt/mail.in:28
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
 "them in a mailbox file, or send them immediately. The editor is opened\n"
 "with a template for the introductory message. Please see the file\n"
-"/usr/share/doc/quilt-0.41/README.MAIL for details.\n"
+"%s for details.\n"
 "\n"
 "--mbox file\n"
 "\tStore all messages in the specified file in mbox format. The mbox\n"
 "\tcan later be sent using formail, for example.\n"
 "\n"
 "--send\n"
-"\tSend the messages directly using /usr/sbin/sendmail.\n"
+"\tSend the messages directly using @MTA@.\n"
 "\n"
 "--from, --subject\n"
 "\tThe values for the From and Subject headers to use.\n"
@@ -653,7 +695,7 @@ msgstr ""
 "speichere sie in einer Mailbox-Datei, oder versende sie sofort. Der Editor\n"
 "wird mit der Vorlage einer Einleitungs-Nachricht geöffnet. Für Details "
 "siehe\n"
-"@DOCSUBDIR@/README.MAIL.\n"
+"%s.\n"
 "\n"
 "--mbox datei\n"
 "\tAlle Nachrichten in der angegebenen Datei im mbox-Format speichern. Die\n"
@@ -668,11 +710,11 @@ msgstr ""
 "--to, --cc, --bcc\n"
 "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n"
 
-#: quilt/new:22
+#: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
 msgstr "Verwendung: new {patchname}\\n"
 
-#: quilt/new:25
+#: quilt/new.in:25
 msgid ""
 "\n"
 "Create a new patch with the specified file name, and insert it after the\n"
@@ -682,23 +724,23 @@ msgstr ""
 "Erzeuge einen neuen Patch mit dem angegebenen Dateinamen, und fügt\n"
 "ihn nach dem obersten Patch in die series-Datei ein.\n"
 
-#: quilt/new:64
+#: quilt/new.in:64
 msgid "Patch %s exists already\\n"
 msgstr "Patch %s existiert bereits\\n"
 
-#: quilt/new:75
+#: quilt/new.in:75
 msgid "Failed to create patch %s\\n"
 msgstr "Konnte Patch %s nicht erzeugen\\n"
 
-#: quilt/new:78
+#: quilt/new.in:78
 msgid "Patch %s is now on top\\n"
 msgstr "Der oberste Patch ist jetzt %s\\n"
 
-#: quilt/next:22
+#: quilt/next.in:22
 msgid "Usage: quilt next [patch]\\n"
 msgstr "Verwendung: quilt next [patch]\\n"
 
-#: quilt/next:25
+#: quilt/next.in:25
 msgid ""
 "\n"
 "Print the name of the next patch after the specified or topmost patch in\n"
@@ -708,11 +750,11 @@ msgstr ""
 "Gibt den Namen des nächsten Patches nach dem obersten oder angegebenen\n"
 "Patch in der series-Datei aus.\n"
 
-#: quilt/patches:22
+#: quilt/patches.in:22
 msgid "Usage: quilt patches {file}\\n"
 msgstr "Verwendung: quilt patches {file}\\n"
 
-#: quilt/patches:25
+#: quilt/patches.in:25
 msgid ""
 "\n"
 "Print the list of patches that modify the specified file. (Uses a\n"
@@ -728,12 +770,11 @@ msgstr ""
 "\n"
 "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n"
 
-#: quilt/pop:22
+#: quilt/pop.in:22
 msgid "Usage: quilt pop [-afRqv] [num|patch]\\n"
 msgstr "Verwendung: quilt pop [-afRqv] [num|patch]\\n"
 
-#: quilt/pop:25
-#, fuzzy
+#: quilt/pop.in:25
 msgid ""
 "\n"
 "Remove patch(es) from the stack of applied patches.  Without options,\n"
@@ -756,7 +797,7 @@ msgid ""
 "-v\tVerbose operation.\n"
 msgstr ""
 "\n"
-"Entfernt Patches vom Stapel der angewandten Patches. Es kann eine Anzahl\n"
+"Entferne Patches vom Stapel der angewandten Patches. Es kann eine Anzahl\n"
 "von Patches, die entfernt werden soll, oder der Name eines Patches\n"
 "angegeben werden. Wenn ein Name angegeben wird, werden alle Patches über\n"
 "dem angegebenen Patch entfernt. Wenn weder ein Patchname noch eine Nummer\n"
@@ -767,45 +808,44 @@ msgstr ""
 "-f\tErzwungenes Entfernen. Der Zustand vor dem Anwenden das Patches wird\n"
 "\tüber die Sicherungsdateien wiederhergestellt.\n"
 "\n"
-"-R\tEntfernen über \\`patch -R'. Überprüft auch, ob der\n"
-"\tAusgangszustand vor dem Anwenden des Patches wieder erreicht wird.\n"
+"-R\t Überprüfe immer, ob sich Patches vollständig entfernen lassen;\n"
+"\tnicht auf Datei-Zeitspempel verlassen.\n"
 "\n"
 "-q\tWenige Meldungen ausgeben.\n"
 "\n"
 "-v\tViele Meldungen ausgeben.\n"
 
-#: quilt/pop:156
+#: quilt/pop.in:156
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 "Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen "
 "erzwingen mit -f)\\n"
 
-#: quilt/pop:181
-#, fuzzy
+#: quilt/pop.in:181
 msgid "Patch %s appears to be empty, removing\\n"
-msgstr "Patch %s scheint leer zu sein\\n"
+msgstr "Patch %s scheint leer zu sein; wird entfernt\\n"
 
-#: quilt/pop:185
+#: quilt/pop.in:185
 msgid "Removing patch %s\\n"
 msgstr "Entferne patch %s\\n"
 
-#: quilt/pop:269
+#: quilt/pop.in:269
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
-#: quilt/pop:279
+#: quilt/pop.in:279
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: quilt/pop:302 quilt/push:372
+#: quilt/pop.in:302 quilt/push.in:372
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
-#: quilt/previous:22
+#: quilt/previous.in:22
 msgid "Usage: quilt previous [patch]\\n"
 msgstr "Verwendung: quilt previous [patch]\\n"
 
-#: quilt/previous:25
+#: quilt/previous.in:25
 msgid ""
 "\n"
 "Print the name of the previous patch before the specified or topmost\n"
@@ -815,12 +855,11 @@ msgstr ""
 "Gibt den Namen des Patches vor dem obersten oder angegebenen\n"
 "Patch in der series-Datei aus.\n"
 
-#: quilt/push:24
+#: quilt/push.in:24
 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n"
 msgstr "Verwendung: quilt push [-afqv] [--leave-rejects] [num|patch]\\n"
 
-#: quilt/push:27
-#, fuzzy
+#: quilt/push.in:27
 msgid ""
 "\n"
 "Apply patch(es) from the series file.  Without options, the next patch\n"
@@ -848,7 +887,7 @@ msgid ""
 "\tpatch program.\n"
 "\n"
 "--color[=always|auto|never]\n"
-"        Use syntax coloring.\n"
+"\tUse syntax coloring.\n"
 msgstr ""
 "\n"
 "Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n"
@@ -874,60 +913,57 @@ msgstr ""
 "\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n"
 "\n"
 "--color[=always|auto|never]\n"
-"        Syntax-Einfärbung aktivieren (immer, automatisch, nie).\n"
+"\tSyntax-Einfärbung aktivieren (immer, automatisch, nie).\n"
 
-#: quilt/push:64
+#: quilt/push.in:64
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
 
-#: quilt/push:157
+#: quilt/push.in:157
 msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
-#: quilt/push:189
-#, fuzzy
+#: quilt/push.in:189
 msgid "Patch %s does not exist, applied\\n"
-msgstr "Patch %s ist nicht angewandt\\n"
+msgstr "Patch %s existiert nicht; wird angewandt\\n"
 
-#: quilt/push:193
+#: quilt/push.in:193
 msgid "Patch %s appears to be empty, applied\\n"
 msgstr "Patch %s scheint leer zu sein, angewandt\\n"
 
-#: quilt/push:197
+#: quilt/push.in:197
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n"
 
-#: quilt/push:202
+#: quilt/push.in:202
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
 
-#: quilt/push:241
+#: quilt/push.in:241
 msgid "Patch %s not found in file series\\n"
 msgstr "Patch %s nicht in series-Datei gefunden\\n"
 
-#: quilt/push:329
+#: quilt/push.in:329
 msgid "Patch %s is already applied\\n"
 msgstr "Patch %s ist bereits angewandt\\n"
 
-#: quilt/push:338
+#: quilt/push.in:338
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
-#: quilt/push:352
+#: quilt/push.in:352
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 
-#: quilt/refresh:22
-#, fuzzy
+#: quilt/refresh.in:22
 msgid ""
 "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
 "[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
 msgstr ""
-"Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--"
-"backup] [patch]\\n"
+"Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--"
+"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
 
-#: quilt/refresh:26
-#, fuzzy
+#: quilt/refresh.in:26
 msgid ""
 "\n"
 "Refreshes the specified patch, or the topmost patch by default.\n"
@@ -967,7 +1003,7 @@ msgid ""
 "--sort\tSort files by their name instead of preserving the original order.\n"
 "\n"
 "--strip-trailing-whitespace\n"
-"\tStrip trailing whitespace at the end of lines of the generated patch.\n"
+"\tStrip trailing whitespace at the end of lines.\n"
 msgstr ""
 "\n"
 "Frischt den obersten oder angegebenen Patch auf. Dokumentation in der\n"
@@ -990,6 +1026,12 @@ msgstr ""
 "\tein Context Diff (-c, -C) mit anzahl Kontextzeilen. Die Anzahl der\n"
 "\tKontextzeilen ist 3, wenn nicht anders angegeben.\n"
 "\n"
+"--no-timestamps\n"
+"\tKeine Zeitstempel in Patches angeben.\n"
+"\n"
+"--no-index\n"
+"\tErzeuge keine \"Index:\"-Zeilen\n"
+"\n"
 "--diffstat\n"
 "\tFüge dem Patch-Kopf einen diffstat-Abschnitt hinzu, oder ersetzte den\n"
 "\tbestehenden Abschnitt.\n"
@@ -1002,43 +1044,51 @@ msgstr ""
 "quiltrc).\n"
 "\n"
 "--backup\n"
-"\tErzeuge ein Backup der alten Version von patch als patch~.\n"
+"\tErzeuge ein Backup der alten Version von patch als patch~\n"
+"\n"
+"--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n"
+"\tReihenfolge zu erhalten.\n"
+"\n"
+"--strip-trailing-whitespace\n"
+"\tEntferne Whitespace an Zeilenenden.\n"
 
-#: quilt/refresh:173
+#: quilt/refresh.in:173
 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
 msgstr ""
 "Kann Patches mit Level -p$opt_strip_level nicht auffrischen, bitte -p0 oder -"
 "p1 angeben\\n"
 
-#: quilt/refresh:207
+#: quilt/refresh.in:207
 msgid ""
 "More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
 msgstr ""
-"Später angewandte Patches verändern Dateien von $patch. Auffrischen mit -f "
+"Später angewandte Patches verändern Dateien von %s. Auffrischen mit -f "
 "erzwingen.\\n"
 
-#: quilt/refresh:213
+#: quilt/refresh.in:213
 msgid ""
 "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
 msgstr ""
+"Kann --strip-trailing-whitespace nicht für Patches verwenden, die Dateien "
+"enthalten, die danach von anderen Patches weiter verändert werden.\\n"
 
-#: quilt/refresh:219
+#: quilt/refresh.in:219
 msgid "Nothing in patch %s\\n"
 msgstr "Patch %s ist leer\\n"
 
-#: quilt/refresh:296
+#: quilt/refresh.in:296
 msgid "Patch %s is unchanged\\n"
 msgstr "Patch %s ist unverändert\\n"
 
-#: quilt/refresh:301
+#: quilt/refresh.in:301
 msgid "Refreshed patch %s\\n"
 msgstr "Patch %s aufgefrischt\\n"
 
-#: quilt/remove:22
+#: quilt/remove.in:22
 msgid "Usage: quilt remove [-p patch] {file} ...\\n"
 msgstr "Verwendung: quilt remove [-p patch] {datei} ...\\n"
 
-#: quilt/remove:25
+#: quilt/remove.in:25
 msgid ""
 "\n"
 "Remove one or more files from the topmost or named patch.  Files that\n"
@@ -1055,24 +1105,23 @@ msgstr ""
 "-p patch\n"
 "\tPatch, aus dem Dateien entfernt werden sollen.\n"
 
-#: quilt/remove:91
+#: quilt/remove.in:91
 msgid "File %s is not in patch %s\\n"
 msgstr "Datei %s ist nicht in Patch %s enthalten\\n"
 
-#: quilt/remove:109
+#: quilt/remove.in:109
 msgid "Failed to remove file %s from patch %s\\n"
 msgstr "Konnte Datei %s nicht aus Patch %s entfernen\\n"
 
-#: quilt/remove:123
+#: quilt/remove.in:123
 msgid "File %s removed from patch %s\\n"
 msgstr "Datei %s aus Patch %s entfernt\\n"
 
-#: quilt/rename:22
-#, fuzzy
+#: quilt/rename.in:22
 msgid "Usage: quilt rename [-p patch] new_name\\n"
-msgstr "Verwendung: quilt remove [-p patch] {datei} ...\\n"
+msgstr "Verwendung: quilt rename [-p patch] neuer_name\\n"
 
-#: quilt/rename:25
+#: quilt/rename.in:25
 msgid ""
 "\n"
 "Rename the topmost or named patch.\n"
@@ -1080,27 +1129,30 @@ msgid ""
 "-p patch\n"
 "\tPatch to rename.\n"
 msgstr ""
+"\n"
+"Benennt den obersten oder angegebenen Patch um.\n"
+"\n"
+"-p patch\n"
+"\tPatch, der umbenannt werden soll.\n"
+"\n"
 
-#: quilt/rename:96
-#, fuzzy
+#: quilt/rename.in:96
 msgid "Patch %s exists already, please choose a different name\\n"
-msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n"
+msgstr "Patch %s existiert bereits, bitte einen anderen Namen wählen\\n"
 
-#: quilt/rename:110
-#, fuzzy
+#: quilt/rename.in:110
 msgid "Renaming of patch %s to %s failed\\n"
-msgstr "Fehler beim Aufspalten von %s auf %s\\n"
+msgstr "Fehler beim Umbenennen von Patch %s auf %s\\n"
 
-#: quilt/rename:116
-#, fuzzy
+#: quilt/rename.in:116
 msgid "Patch %s renamed to %s\\n"
-msgstr "Neue Version von %s erstellt als %s\\n"
+msgstr "Patch %s auf %s umbenannt\\n"
 
-#: quilt/series:22
+#: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr "Verwendung: quilt series [-v]\\n"
 
-#: quilt/series:25
+#: quilt/series.in:25
 msgid ""
 "\n"
 "Print the names of all patches in the series file.\n"
@@ -1112,12 +1164,12 @@ msgstr ""
 "\n"
 "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n"
 
-#: quilt/setup:27
+#: quilt/setup.in:27
 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n"
 msgstr ""
 "Verwendung: quilt setup [-d pfad-präfix] [-v] {spec-datei|series-datei}\\n"
 
-#: quilt/setup:30
+#: quilt/setup.in:30
 msgid ""
 "\n"
 "Initializes a source tree from an rpm spec file or a quilt series file.\n"
@@ -1134,33 +1186,33 @@ msgstr ""
 "\n"
 "-v\tAusführliche Ausgabe.\n"
 
-#: quilt/setup:96
+#: quilt/setup.in:96
 msgid "Directory %s exists\\n"
 msgstr "Verzeichnis %s existiert\\n"
 
-#: quilt/setup:102
+#: quilt/setup.in:102
 msgid "File %s exists\\n"
 msgstr "Datei %s existiert\\n"
 
-#: quilt/setup:118
+#: quilt/setup.in:118
 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:121
+#: quilt/setup.in:121
 msgid "The -v option will show rpm's output\\n"
 msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n"
 
-#: quilt/setup:155
+#: quilt/setup.in:155
 msgid "Unpacking archive %s\\n"
 msgstr "Entpacke Archiv %s\\n"
 
-#: quilt/snapshot:22
+#: quilt/snapshot.in:22
 msgid "Usage: quilt snapshot [-d]\\n"
 msgstr "Verwendung: quilt snapshot [-d]\\n"
 
-#: quilt/snapshot:25
+#: quilt/snapshot.in:25
 msgid ""
 "\n"
 "Take a snapshot of the current working state.  After taking the snapshot,\n"
@@ -1179,11 +1231,11 @@ msgstr ""
 "\n"
 "-d\tEntferne lediglich den aktuellen Snapshot.\n"
 
-#: quilt/top:22
+#: quilt/top.in:22
 msgid "Usage: quilt top\\n"
 msgstr "Verwendung: quilt top\\n"
 
-#: quilt/top:25
+#: quilt/top.in:25
 msgid ""
 "\n"
 "Print the name of the topmost patch on the current stack of applied\n"
@@ -1192,11 +1244,11 @@ msgstr ""
 "\n"
 "Gibt den Namen des obersten Patches auf dem Stapel aus.\n"
 
-#: quilt/unapplied:22
+#: quilt/unapplied.in:22
 msgid "Usage: quilt unapplied [patch]\\n"
 msgstr "Verwendung: quilt unapplied [patch]\\n"
 
-#: quilt/unapplied:25
+#: quilt/unapplied.in:25
 msgid ""
 "\n"
 "Print a list of patches that are not applied, or all patches that follow\n"
@@ -1206,11 +1258,11 @@ msgstr ""
 "Gint eine Liste der Patches aus, die momentan nicht angewandt sind, bzw.\n"
 "eine Liste der Patches, die dem angegebenen Patch folgen.\n"
 
-#: quilt/upgrade:25
+#: quilt/upgrade.in:25
 msgid "Usage: quilt upgrade\\n"
 msgstr "Verwendung: quilt upgrade\\n"
 
-#: quilt/upgrade:28
+#: quilt/upgrade.in:28
 msgid ""
 "\n"
 "Upgrade the meta-data in a working tree from an old version of quilt to the\n"
@@ -1228,7 +1280,7 @@ msgstr ""
 "Metadaten enthält. In diesem Fall fordert quilt dazu auf, \\`quilt upgrade'\n"
 "auszuführen.\n"
 
-#: quilt/upgrade:67
+#: quilt/upgrade.in:67
 msgid ""
 "The quilt meta-data in %s are already in the version %s format; nothing to do"
 "\\n"
@@ -1236,15 +1288,15 @@ msgstr ""
 "Die Metadaten in $QUILT_PC/ sind bereits in Format Version $DB_VERSION; "
 "nichts zu tun\\n"
 
-#: quilt/upgrade:71
+#: quilt/upgrade.in:71
 msgid "Converting meta-data to version %s\\n"
 msgstr "Konvertiere Metadaten in Version %s\\n"
 
-#: quilt/upgrade:102
+#: quilt/upgrade.in:102
 msgid "Conversion failed\\n"
 msgstr "Konvertierung fehlgeschlagen\\n"
 
-#: quilt/upgrade:103
+#: quilt/upgrade.in:103
 msgid ""
 "\n"
 "Please remove all patches using \\`quilt pop -a' from the quilt version used "
@@ -1256,42 +1308,42 @@ msgstr ""
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
 
-#: scripts/edmail:64
+#: scripts/edmail.in:64
 #, perl-format
 msgid "Display name '%s' contains unpaired parentheses\n"
-msgstr ""
+msgstr "Anzeigename '%s' enthält eine unvollständige Klammerung\n"
 
-#: scripts/edmail:68
+#: scripts/edmail.in:68
 #, perl-format
 msgid "Display name '%s' contains invalid characters\n"
-msgstr ""
+msgstr "Anzeigename '%s' enthält ungültige Zeichen\n"
 
-#: scripts/edmail:72
+#: scripts/edmail.in:72
 #, perl-format
 msgid "Display name '%s' contains non-printable or 8-bit characters\n"
-msgstr ""
+msgstr "Anzeigename '%s' enthält nichtdruckbare or 8-Bit-Zeichen\n"
 
-#: scripts/edmail:78
+#: scripts/edmail.in:78
 #, perl-format
 msgid "Delivery address '%s' is invalid\n"
-msgstr ""
+msgstr "Zustelladresse '%s' ist ungültig\n"
 
-#: scripts/parse-patch:33
+#: scripts/parse-patch.in:33
 #, perl-format
 msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
+msgstr "Verwendung: %s {-s|-u} abschnitt datei [< ersetzung]\n"
 
-#: scripts/parse-patch:80 scripts/parse-patch:87
+#: scripts/parse-patch.in:80 scripts/parse-patch.in:87
 #, perl-format
 msgid "File %s disappeared!\n"
-msgstr ""
+msgstr "Datei %s ist verschwunden\n"
 
-#: scripts/parse-patch:133 scripts/parse-patch:139
-#, fuzzy, perl-format
+#: scripts/parse-patch.in:133 scripts/parse-patch.in:139
+#, perl-format
 msgid "Failed to rename %s to %s: %s\n"
-msgstr "Konnte Patch %s nicht erzeugen\\n"
+msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
 
-#: scripts/patchfns:732
+#: scripts/patchfns.in:732
 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 "
@@ -1304,7 +1356,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: scripts/patchfns:809
+#: scripts/patchfns.in:809
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1312,60 +1364,37 @@ msgstr ""
 "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. "
 "Bitte führen Sie \\`quilt upgrade' aus.\\n"
 
-#: scripts/remove-trailing-ws:26
+#: scripts/remove-trailing-ws.in:26
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
-msgstr ""
+msgstr "Aufruf: %s [-p num] [-n] [patch]\n"
 
-#: scripts/remove-trailing-ws:48 scripts/remove-trailing-ws:75
+#: scripts/remove-trailing-ws.in:48 scripts/remove-trailing-ws.in:75
 #, perl-format
 msgid "%s: I'm confused.\n"
-msgstr ""
+msgstr "%s: Ich bin verwirrt.\n"
 
-#: scripts/remove-trailing-ws:96
+#: scripts/remove-trailing-ws.in:96
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
-msgstr ""
+msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n"
 
-#: scripts/remove-trailing-ws:99
+#: scripts/remove-trailing-ws.in:99
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
-msgstr ""
+msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n"
 
-#: scripts/remove-trailing-ws:103
+#: scripts/remove-trailing-ws.in:103
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
-msgstr ""
+msgstr "Entferne abschliessende Leerzeichen in Zeile %s von %s\n"
 
-#: scripts/remove-trailing-ws:106
+#: scripts/remove-trailing-ws.in:106
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
-msgstr ""
+msgstr "Entferne abschliessende Leerzeichen in den Zeilen %s von %s\n"
 
-#: scripts/remove-trailing-ws:126
-#, fuzzy, perl-format
+#: scripts/remove-trailing-ws.in:126
+#, perl-format
 msgid "Renaming %s to %s: %s\n"
-msgstr "Fehler beim Aufspalten von %s auf %s\\n"
-
-#~ msgid "Cannot change into directory %s\\n"
-#~ msgstr "Kann nicht in Verzeichnis %s wechseln\\n"
-
-#~ msgid "Cannot change to temporary directory\\n"
-#~ msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n"
-
-#~ msgid "Cannot change to source directory\\n"
-#~ msgstr "Kann nicht in Quellverzeichnis wechseln\\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Fork the topmost patch. If new_name is missing, the name of the\n"
-#~ "forked patch will be the current patch name, followed by \\\"-2\\\".\n"
-#~ "If the patch name already ends in a dash-and-number, the number is\n"
-#~ "further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff).\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Spalte vom nächsten Patch eine neue Version ab. Falls neuer_name nicht\n"
-#~ "angegeben ist, bekommt der neue Patch den selben Namen, gefolgt von \\\"-2"
-#~ "\\\".\n"
-#~ "Falls der Name bereits mit Bindestrich-Nummer endet, wird die Nummer\n"
-#~ "erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n"
+msgstr "Umbenennen von %s auf %s: %s\n"