diff options
| -rw-r--r-- | po/Makefile | 25 | ||||
| -rw-r--r-- | po/de.po | 427 | ||||
| -rw-r--r-- | po/fr.po | 427 | ||||
| -rw-r--r-- | po/ja.po | 430 | ||||
| -rw-r--r-- | po/quilt.pot | 416 | ||||
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/patches.in | 15 | ||||
| -rw-r--r-- | scripts/edmail.in | 23 | ||||
| -rw-r--r-- | scripts/parse-patch.in | 24 | ||||
| -rw-r--r-- | scripts/patchfns.in | 23 | ||||
| -rw-r--r-- | scripts/remove-trailing-ws.in | 38 |
11 files changed, 1245 insertions, 608 deletions
diff --git a/po/Makefile b/po/Makefile index f2e98e3..31dacea 100644 --- a/po/Makefile +++ b/po/Makefile @@ -1,7 +1,3 @@ -QUILT_IN := add applied delete diff edit files fold fork graph grep \ - import mail new next patches pop previous push refresh \ - remove series setup snapshot top unapplied upgrade -SCRIPTS_IN := patchfns inspect patchfns # scripts/parse-patch is perl based # LINGUAS = ... @@ -16,13 +12,24 @@ all: $(LINGUAS:%=%.mo) msgmerge -o $@ $@ $^ msgfmt --statistics -o /dev/null $@ -quilt.pot: $(QUILT_IN:%=../quilt/%.in) $(SCRIPTS_IN:%=../scripts/%.in) ../bin/quilt.in +quilt.pot: $(filter-out ../debian/control ../doc/quilt.1 ../doc/README, \ + $(patsubst %.in,%,$(wildcard ../*/*.in))) rm -f quilt.pot; touch quilt.pot + ( cd .. ; \ for file in $+ ; do \ - bash --dump-po-strings $$file \ - |msguniq \ - |msgcat --force-po -F - quilt.pot -o quilt.pot; \ - done + file=$${file#../} ; \ + if head $$file | grep -q bash; then \ + bash --dump-po-strings $$file ; \ + elif head $$file | grep -q perl; then \ + xgettext --from-code=UTF-8 --omit-header --language=Perl \ + --keyword=_ -o - $$file; \ + else \ + echo "Don't know how to handle $$file" >&2 ; \ + exit 1 ; \ + fi \ + done ) \ + |msguniq \ + |msgcat --force-po -F - quilt.pot -o quilt.pot clean: rm -f *.mo *~ @@ -11,19 +11,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../bin/quilt.in:23 +#: bin/quilt:23 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..." -#: ../bin/quilt.in:24 +#: bin/quilt:24 msgid " quilt --version" msgstr " quilt --version" -#: ../bin/quilt.in:26 +#: bin/quilt:26 msgid "Commands are:" msgstr "Vorhandene Befehle:" -#: ../bin/quilt.in:31 +#: bin/quilt:31 #, fuzzy msgid "" "\n" @@ -51,11 +51,11 @@ msgstr "" "\t/etc/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-Dokumentation\n" "\tfür mögliche Einstellungen." -#: ../quilt/add.in:22 +#: quilt/add:22 msgid "Usage: quilt add [-p patch] {file} ...\\n" msgstr "Verwendung: quilt add [-p patch] {datei} ...\\n" -#: ../quilt/add.in:25 +#: quilt/add:25 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -74,55 +74,65 @@ msgstr "" "-p patch\n" "\tPatch, zu dem die Dateien hinzugefügt werden sollen.\n" -#: ../quilt/add.in:48 ../quilt/add.in:54 +#: quilt/add:48 quilt/add:54 msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" -#: ../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/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 -#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 -#: ../quilt/unapplied.in:62 +#: 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 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" -#: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121 -#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74 +#: quilt/add:99 quilt/diff:239 quilt/graph:121 quilt/pop:261 quilt/refresh:154 +#: quilt/remove:74 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: ../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/pop.in:295 ../quilt/push.in:350 -#: ../quilt/refresh.in:162 ../quilt/remove.in:81 +#: 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 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" -#: ../quilt/add.in:121 +#: quilt/add:121 msgid "File %s is already in patch %s\\n" msgstr "Datei %s ist bereits in Patch $patch enthalten\\n" -#: ../quilt/add.in:129 ../quilt/remove.in:100 +#: quilt/add:129 quilt/remove:100 msgid "File %s modified by patch %s\\n" msgstr "Datei %s wird von Patch %s verändert\\n" -#: ../quilt/add.in:137 +#: quilt/add:137 msgid "Cannot add symbolic link %s\\n" msgstr "Kann symbolische Verknüpfung %s nicht hinzufügen\\n" -#: ../quilt/add.in:144 +#: quilt/add:144 msgid "Failed to back up file %s\\n" msgstr "Konnte Datei %s nicht sichern\\n" -#: ../quilt/add.in:155 +#: quilt/add:155 msgid "File %s added to patch %s\\n" msgstr "Datei %s zu Patch %s hinzugefügt\\n" -#: ../quilt/applied.in:22 +#: quilt/annotate:22 +#, fuzzy +msgid "Usage: quilt annotate {file}\\n" +msgstr "Verwendung: quilt patches {file}\\n" + +#: quilt/annotate:25 +msgid "" +"\n" +"Print an annotated listing of the specified file showing which\n" +"patches modify which lines.\n" +msgstr "" + +#: quilt/applied:22 msgid "Usage: quilt applied [patch]\\n" msgstr "Verwendung: quilt applied [patch]\\n" -#: ../quilt/applied.in:25 +#: quilt/applied:25 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" @@ -132,15 +142,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.in:67 +#: quilt/applied:67 msgid "Patch is not applied\\n" msgstr "Patch ist nicht angewandt\\n" -#: ../quilt/delete.in:22 +#: quilt/delete:22 msgid "Usage: quilt delete [patch | -n]\\n" msgstr "Verwendung: quilt delete [patch | -n]\\n" -#: ../quilt/delete.in:25 +#: quilt/delete:25 #, fuzzy msgid "" "\n" @@ -156,24 +166,24 @@ msgstr "" "dieser Patch angewandt ist, entfernt quilt ihn zuerst. (Momentan kann \n" "nur der oberste Patch entfernt werden.)\n" -#: ../quilt/delete.in:88 +#: quilt/delete:88 msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: ../quilt/delete.in:106 +#: quilt/delete:106 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" -#: ../quilt/delete.in:113 +#: quilt/delete:113 #, fuzzy msgid "Removed patch %s\\n" msgstr "Entferne patch %s\\n" -#: ../quilt/delete.in:115 +#: quilt/delete:115 msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" -#: ../quilt/diff.in:24 +#: quilt/diff:24 #, fuzzy msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " @@ -183,7 +193,7 @@ msgstr "" "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=programm] [--color] [datei ...]\\n" -#: ../quilt/diff.in:28 +#: quilt/diff:28 #, fuzzy msgid "" "\n" @@ -268,47 +278,47 @@ msgstr "" "--color[=always|auto|never]\n" "\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie).\n" -#: ../quilt/diff.in:231 +#: quilt/diff: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.in:258 +#: quilt/diff: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.in:293 ../quilt/files.in:122 +#: quilt/diff:293 quilt/files:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: ../quilt/diff.in:343 ../quilt/pop.in:114 +#: quilt/diff:343 quilt/pop:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: ../quilt/diff.in:367 ../quilt/pop.in:138 +#: quilt/diff:367 quilt/pop:138 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: ../quilt/diff.in:386 +#: quilt/diff:386 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: ../quilt/diff.in:406 ../quilt/refresh.in:201 +#: quilt/diff:406 quilt/refresh:201 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: ../quilt/diff.in:413 +#: quilt/diff:413 msgid "More recent patches modify files in patch %s\\n" msgstr "Später angewandte Patches verändern Dateien von %s\\n" -#: ../quilt/edit.in:13 +#: quilt/edit:13 msgid "Usage: quilt edit file ...\\n" msgstr "Verwendung: quilt edit datei ...\\n" -#: ../quilt/edit.in:16 +#: quilt/edit:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -318,11 +328,11 @@ msgstr "" "Füge die angegebene(n) Datei(en) dem obersten Patch hinzu, und editiere\n" "sie dann in \\$EDITOR (%s).\n" -#: ../quilt/files.in:22 +#: quilt/files: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.in:25 +#: quilt/files:25 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -355,15 +365,15 @@ msgstr "" "\tersten angewandten Patch.\n" "\n" -#: ../quilt/files.in:76 ../quilt/files.in:96 +#: quilt/files:76 quilt/files:96 msgid "Patch %s is not in series file\\n" msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" -#: ../quilt/fold.in:22 +#: quilt/fold:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "Verwendung: quilt fold [-p strip-ebenen]\\n" -#: ../quilt/fold.in:25 +#: quilt/fold:25 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -385,15 +395,15 @@ msgstr "" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" "\tentfernt werden sollen.\n" -#: ../quilt/fold.in:116 +#: quilt/fold:116 msgid "File %s may be corrupted\\n" msgstr "Datei %s ist möglicherweise defekt\\n" -#: ../quilt/fork.in:22 +#: quilt/fork:22 msgid "Usage: quilt fork [new_name]\\n" msgstr "Verwendung: quilt fork [neuer_name]\\n" -#: ../quilt/fork.in:25 +#: quilt/fork:25 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -409,19 +419,19 @@ msgid "" "patch-2.diff, patch-3.diff).\n" msgstr "" -#: ../quilt/fork.in:99 +#: quilt/fork: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.in:111 +#: quilt/fork:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Fehler beim Aufspalten von %s auf %s\\n" -#: ../quilt/fork.in:117 +#: quilt/fork:117 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" -#: ../quilt/graph.in:22 +#: quilt/graph:22 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[patch]\\n" @@ -429,7 +439,7 @@ msgstr "" "Verwendung: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-" "labels=files]\\n" -#: ../quilt/graph.in:26 +#: quilt/graph:26 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -485,11 +495,11 @@ msgstr "" "\n" "-T ps\tErzeuge direkt eine PostScript-Datei.\n" -#: ../quilt/grep.in:22 +#: quilt/grep:22 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "Verwendung: quilt grep [-h|options] {suchausdruck}\\n" -#: ../quilt/grep.in:25 +#: quilt/grep:25 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -509,11 +519,50 @@ msgstr "" "\tDoppelstrick (--) angegeben werden. Suchausdrücke, die mit einem Strich\n" "\tbeginnen, können nach einem weiteren Doppelstrich (--) angegeben werden.\n" -#: ../quilt/import.in:22 +#: quilt/header:24 +#, fuzzy +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" + +#: quilt/header:28 +msgid "" +"\n" +"Print or change the header of the topmost or specified patch.\n" +"\n" +"-a, -r, -e\n" +"\tAppend to (-a) or replace (-r) the exiting patch header, or\n" +"\tedit (-e) the header in \\$EDITOR (%s). If none of these options is\n" +"\tgiven, print the patch header.\n" +"\t\n" +"--strip-diffstat\n" +"\tStrip diffstat output from the header.\n" +"\n" +"--strip-trailing-whitespace\n" +"\tStrip trailing whitespace at the end of lines of the header.\n" +"\n" +"--backup\n" +"\tCreate a backup copy of the old version of a patch as patch~.\n" +msgstr "" + +#: quilt/header:192 +#, fuzzy +msgid "Replaced header of patch %s\\n" +msgstr "Patch %s aufgefrischt\\n" + +#: quilt/header:195 +#, fuzzy +msgid "Appended text to header of patch %s\\n" +msgstr "Konnte Patch %s nicht erzeugen\\n" + +#: quilt/import: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.in:25 +#: quilt/import:25 msgid "" "\n" "Import external patches.\n" @@ -539,37 +588,37 @@ msgstr "" "\n" "-f\tÜberschreibe/aktualisiere existierende Patches.\n" -#: ../quilt/import.in:74 +#: quilt/import: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.in:92 +#: quilt/import:92 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: ../quilt/import.in:100 +#: quilt/import:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: ../quilt/import.in:104 +#: quilt/import:104 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: ../quilt/import.in:107 +#: quilt/import:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: ../quilt/import.in:115 +#: quilt/import:115 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: ../quilt/import.in:122 +#: quilt/import: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.in:25 +#: quilt/mail:25 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" @@ -577,20 +626,21 @@ msgstr "" "Verwendung: quilt mail {--mbox datei|--send} [--from ...] [--to ...] [--" "cc ...] [--bcc ...] [--subject ...]\\n" -#: ../quilt/mail.in:28 +#: quilt/mail:28 +#, fuzzy 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" -"@DOCSUBDIR@/README.MAIL for details.\n" +"/usr/share/doc/quilt-0.41/README.MAIL 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 @MTA@.\n" +"\tSend the messages directly using /usr/sbin/sendmail.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use.\n" @@ -618,11 +668,11 @@ msgstr "" "--to, --cc, --bcc\n" "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n" -#: ../quilt/new.in:22 +#: quilt/new:22 msgid "Usage: quilt new {patchname}\\n" msgstr "Verwendung: new {patchname}\\n" -#: ../quilt/new.in:25 +#: quilt/new:25 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -632,23 +682,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.in:64 +#: quilt/new:64 msgid "Patch %s exists already\\n" msgstr "Patch %s existiert bereits\\n" -#: ../quilt/new.in:75 +#: quilt/new:75 msgid "Failed to create patch %s\\n" msgstr "Konnte Patch %s nicht erzeugen\\n" -#: ../quilt/new.in:78 +#: quilt/new:78 msgid "Patch %s is now on top\\n" msgstr "Der oberste Patch ist jetzt %s\\n" -#: ../quilt/next.in:22 +#: quilt/next:22 msgid "Usage: quilt next [patch]\\n" msgstr "Verwendung: quilt next [patch]\\n" -#: ../quilt/next.in:25 +#: quilt/next:25 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" @@ -658,11 +708,11 @@ msgstr "" "Gibt den Namen des nächsten Patches nach dem obersten oder angegebenen\n" "Patch in der series-Datei aus.\n" -#: ../quilt/patches.in:22 +#: quilt/patches:22 msgid "Usage: quilt patches {file}\\n" msgstr "Verwendung: quilt patches {file}\\n" -#: ../quilt/patches.in:25 +#: quilt/patches:25 msgid "" "\n" "Print the list of patches that modify the specified file. (Uses a\n" @@ -678,11 +728,11 @@ msgstr "" "\n" "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" -#: ../quilt/pop.in:22 +#: quilt/pop:22 msgid "Usage: quilt pop [-afRqv] [num|patch]\\n" msgstr "Verwendung: quilt pop [-afRqv] [num|patch]\\n" -#: ../quilt/pop.in:25 +#: quilt/pop:25 #, fuzzy msgid "" "\n" @@ -724,38 +774,38 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: ../quilt/pop.in:156 +#: quilt/pop: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.in:181 +#: quilt/pop:181 #, fuzzy msgid "Patch %s appears to be empty, removing\\n" msgstr "Patch %s scheint leer zu sein\\n" -#: ../quilt/pop.in:185 +#: quilt/pop:185 msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: ../quilt/pop.in:269 +#: quilt/pop:269 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: ../quilt/pop.in:279 +#: quilt/pop:279 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: ../quilt/pop.in:302 ../quilt/push.in:372 +#: quilt/pop:302 quilt/push:372 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" -#: ../quilt/previous.in:22 +#: quilt/previous:22 msgid "Usage: quilt previous [patch]\\n" msgstr "Verwendung: quilt previous [patch]\\n" -#: ../quilt/previous.in:25 +#: quilt/previous:25 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" @@ -765,11 +815,11 @@ msgstr "" "Gibt den Namen des Patches vor dem obersten oder angegebenen\n" "Patch in der series-Datei aus.\n" -#: ../quilt/push.in:24 +#: quilt/push:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "Verwendung: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" -#: ../quilt/push.in:27 +#: quilt/push:27 #, fuzzy msgid "" "\n" @@ -826,48 +876,48 @@ msgstr "" "--color[=always|auto|never]\n" " Syntax-Einfärbung aktivieren (immer, automatisch, nie).\n" -#: ../quilt/push.in:64 +#: quilt/push:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: ../quilt/push.in:157 +#: quilt/push:157 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: ../quilt/push.in:189 +#: quilt/push:189 #, fuzzy msgid "Patch %s does not exist, applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: ../quilt/push.in:193 +#: quilt/push:193 msgid "Patch %s appears to be empty, applied\\n" msgstr "Patch %s scheint leer zu sein, angewandt\\n" -#: ../quilt/push.in:197 +#: quilt/push:197 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n" -#: ../quilt/push.in:202 +#: quilt/push: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.in:241 +#: quilt/push:241 msgid "Patch %s not found in file series\\n" msgstr "Patch %s nicht in series-Datei gefunden\\n" -#: ../quilt/push.in:329 +#: quilt/push:329 msgid "Patch %s is already applied\\n" msgstr "Patch %s ist bereits angewandt\\n" -#: ../quilt/push.in:338 +#: quilt/push: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.in:352 +#: quilt/push:352 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" -#: ../quilt/refresh.in:22 +#: quilt/refresh:22 #, fuzzy msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " @@ -876,7 +926,7 @@ msgstr "" "Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--" "backup] [patch]\\n" -#: ../quilt/refresh.in:26 +#: quilt/refresh:26 #, fuzzy msgid "" "\n" @@ -954,41 +1004,41 @@ msgstr "" "--backup\n" "\tErzeuge ein Backup der alten Version von patch als patch~.\n" -#: ../quilt/refresh.in:173 +#: quilt/refresh: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.in:207 +#: quilt/refresh: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 " "erzwingen.\\n" -#: ../quilt/refresh.in:213 +#: quilt/refresh:213 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: ../quilt/refresh.in:219 +#: quilt/refresh:219 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: ../quilt/refresh.in:296 +#: quilt/refresh:296 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: ../quilt/refresh.in:301 +#: quilt/refresh:301 msgid "Refreshed patch %s\\n" msgstr "Patch %s aufgefrischt\\n" -#: ../quilt/remove.in:22 +#: quilt/remove:22 msgid "Usage: quilt remove [-p patch] {file} ...\\n" msgstr "Verwendung: quilt remove [-p patch] {datei} ...\\n" -#: ../quilt/remove.in:25 +#: quilt/remove:25 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -1005,23 +1055,52 @@ msgstr "" "-p patch\n" "\tPatch, aus dem Dateien entfernt werden sollen.\n" -#: ../quilt/remove.in:91 +#: quilt/remove:91 msgid "File %s is not in patch %s\\n" msgstr "Datei %s ist nicht in Patch %s enthalten\\n" -#: ../quilt/remove.in:109 +#: quilt/remove:109 msgid "Failed to remove file %s from patch %s\\n" msgstr "Konnte Datei %s nicht aus Patch %s entfernen\\n" -#: ../quilt/remove.in:123 +#: quilt/remove:123 msgid "File %s removed from patch %s\\n" msgstr "Datei %s aus Patch %s entfernt\\n" -#: ../quilt/series.in:22 +#: quilt/rename:22 +#, fuzzy +msgid "Usage: quilt rename [-p patch] new_name\\n" +msgstr "Verwendung: quilt remove [-p patch] {datei} ...\\n" + +#: quilt/rename:25 +msgid "" +"\n" +"Rename the topmost or named patch.\n" +"\n" +"-p patch\n" +"\tPatch to rename.\n" +msgstr "" + +#: quilt/rename:96 +#, fuzzy +msgid "Patch %s exists already, please choose a different name\\n" +msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n" + +#: quilt/rename:110 +#, fuzzy +msgid "Renaming of patch %s to %s failed\\n" +msgstr "Fehler beim Aufspalten von %s auf %s\\n" + +#: quilt/rename:116 +#, fuzzy +msgid "Patch %s renamed to %s\\n" +msgstr "Neue Version von %s erstellt als %s\\n" + +#: quilt/series:22 msgid "Usage: quilt series [-v]\\n" msgstr "Verwendung: quilt series [-v]\\n" -#: ../quilt/series.in:25 +#: quilt/series:25 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1033,12 +1112,12 @@ msgstr "" "\n" "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" -#: ../quilt/setup.in:27 +#: quilt/setup: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.in:30 +#: quilt/setup:30 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1055,33 +1134,33 @@ msgstr "" "\n" "-v\tAusführliche Ausgabe.\n" -#: ../quilt/setup.in:96 +#: quilt/setup:96 msgid "Directory %s exists\\n" msgstr "Verzeichnis %s existiert\\n" -#: ../quilt/setup.in:102 +#: quilt/setup:102 msgid "File %s exists\\n" msgstr "Datei %s existiert\\n" -#: ../quilt/setup.in:118 +#: quilt/setup: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.in:121 +#: quilt/setup:121 msgid "The -v option will show rpm's output\\n" msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" -#: ../quilt/setup.in:155 +#: quilt/setup:155 msgid "Unpacking archive %s\\n" msgstr "Entpacke Archiv %s\\n" -#: ../quilt/snapshot.in:22 +#: quilt/snapshot:22 msgid "Usage: quilt snapshot [-d]\\n" msgstr "Verwendung: quilt snapshot [-d]\\n" -#: ../quilt/snapshot.in:25 +#: quilt/snapshot:25 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1100,11 +1179,11 @@ msgstr "" "\n" "-d\tEntferne lediglich den aktuellen Snapshot.\n" -#: ../quilt/top.in:22 +#: quilt/top:22 msgid "Usage: quilt top\\n" msgstr "Verwendung: quilt top\\n" -#: ../quilt/top.in:25 +#: quilt/top:25 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" @@ -1113,11 +1192,11 @@ msgstr "" "\n" "Gibt den Namen des obersten Patches auf dem Stapel aus.\n" -#: ../quilt/unapplied.in:22 +#: quilt/unapplied:22 msgid "Usage: quilt unapplied [patch]\\n" msgstr "Verwendung: quilt unapplied [patch]\\n" -#: ../quilt/unapplied.in:25 +#: quilt/unapplied:25 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" @@ -1127,11 +1206,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.in:25 +#: quilt/upgrade:25 msgid "Usage: quilt upgrade\\n" msgstr "Verwendung: quilt upgrade\\n" -#: ../quilt/upgrade.in:28 +#: quilt/upgrade:28 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1149,7 +1228,7 @@ msgstr "" "Metadaten enthält. In diesem Fall fordert quilt dazu auf, \\`quilt upgrade'\n" "auszuführen.\n" -#: ../quilt/upgrade.in:67 +#: quilt/upgrade:67 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" @@ -1157,15 +1236,15 @@ msgstr "" "Die Metadaten in $QUILT_PC/ sind bereits in Format Version $DB_VERSION; " "nichts zu tun\\n" -#: ../quilt/upgrade.in:71 +#: quilt/upgrade:71 msgid "Converting meta-data to version %s\\n" msgstr "Konvertiere Metadaten in Version %s\\n" -#: ../quilt/upgrade.in:102 +#: quilt/upgrade:102 msgid "Conversion failed\\n" msgstr "Konvertierung fehlgeschlagen\\n" -#: ../quilt/upgrade.in:103 +#: quilt/upgrade:103 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " @@ -1177,7 +1256,42 @@ msgstr "" "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" -#: ../scripts/patchfns.in:751 +#: scripts/edmail:64 +#, perl-format +msgid "Display name '%s' contains unpaired parentheses\n" +msgstr "" + +#: scripts/edmail:68 +#, perl-format +msgid "Display name '%s' contains invalid characters\n" +msgstr "" + +#: scripts/edmail:72 +#, perl-format +msgid "Display name '%s' contains non-printable or 8-bit characters\n" +msgstr "" + +#: scripts/edmail:78 +#, perl-format +msgid "Delivery address '%s' is invalid\n" +msgstr "" + +#: scripts/parse-patch:33 +#, perl-format +msgid "USAGE: %s {-s|-u} section file [< replacement]\n" +msgstr "" + +#: scripts/parse-patch:80 scripts/parse-patch:87 +#, perl-format +msgid "File %s disappeared!\n" +msgstr "" + +#: scripts/parse-patch:133 scripts/parse-patch:139 +#, fuzzy, perl-format +msgid "Failed to rename %s to %s: %s\n" +msgstr "Konnte Patch %s nicht erzeugen\\n" + +#: scripts/patchfns: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 " @@ -1190,7 +1304,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: ../scripts/patchfns.in:828 +#: scripts/patchfns:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1198,6 +1312,41 @@ msgstr "" "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. " "Bitte führen Sie \\`quilt upgrade' aus.\\n" +#: scripts/remove-trailing-ws:26 +#, perl-format +msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" +msgstr "" + +#: scripts/remove-trailing-ws:48 scripts/remove-trailing-ws:75 +#, perl-format +msgid "%s: I'm confused.\n" +msgstr "" + +#: scripts/remove-trailing-ws:96 +#, perl-format +msgid "Warning: trailing whitespace in line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:99 +#, perl-format +msgid "Warning: trailing whitespace in lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:103 +#, perl-format +msgid "Removing trailing whitespace from line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:106 +#, perl-format +msgid "Removing trailing whitespace from lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:126 +#, fuzzy, 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" @@ -13,19 +13,19 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: ../bin/quilt.in:23 +#: bin/quilt:23 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Usage : quilt [--trace[=verbose]] [--quiltrc=XX] commande [-h] ..." -#: ../bin/quilt.in:24 +#: bin/quilt:24 msgid " quilt --version" msgstr " quilt --version" -#: ../bin/quilt.in:26 +#: bin/quilt:26 msgid "Commands are:" msgstr "Les commandes sont :" -#: ../bin/quilt.in:31 +#: bin/quilt:31 msgid "" "\n" "Global options:\n" @@ -55,11 +55,11 @@ msgstr "" "--version\n" "\tAffiche le numro de version et sort immdiatement." -#: ../quilt/add.in:22 +#: quilt/add:22 msgid "Usage: quilt add [-p patch] {file} ...\\n" msgstr "Usage : quilt add [-p patch] {fichier} ...\\n" -#: ../quilt/add.in:25 +#: quilt/add:25 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -78,55 +78,65 @@ msgstr "" "-p patch\n" "\tPatch auquel les fichiers doivent tre ajouts.\n" -#: ../quilt/add.in:48 ../quilt/add.in:54 +#: quilt/add:48 quilt/add:54 msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Le fichier %s est situ en dessous de %s\\n" -#: ../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/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 -#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 -#: ../quilt/unapplied.in:62 +#: 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 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121 -#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74 +#: quilt/add:99 quilt/diff:239 quilt/graph:121 quilt/pop:261 quilt/refresh:154 +#: quilt/remove:74 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: ../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/pop.in:295 ../quilt/push.in:350 -#: ../quilt/refresh.in:162 ../quilt/remove.in:81 +#: 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 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" -#: ../quilt/add.in:121 +#: quilt/add:121 msgid "File %s is already in patch %s\\n" msgstr "Le fichier %s est dj dans le patch %s\\n" -#: ../quilt/add.in:129 ../quilt/remove.in:100 +#: quilt/add:129 quilt/remove:100 msgid "File %s modified by patch %s\\n" msgstr "Le fichier %s est modifi par le patch %s\\n" -#: ../quilt/add.in:137 +#: quilt/add:137 msgid "Cannot add symbolic link %s\\n" msgstr "Impossible d'ajouter le lien symbolique %s\\n" -#: ../quilt/add.in:144 +#: quilt/add:144 msgid "Failed to back up file %s\\n" msgstr "Impossible de faire une copie de scurit de %s\\n" -#: ../quilt/add.in:155 +#: quilt/add:155 msgid "File %s added to patch %s\\n" msgstr "Le fichier %s a t ajout au patch %s\\n" -#: ../quilt/applied.in:22 +#: quilt/annotate:22 +#, fuzzy +msgid "Usage: quilt annotate {file}\\n" +msgstr "Usage : quilt patches {fichier}\\n" + +#: quilt/annotate:25 +msgid "" +"\n" +"Print an annotated listing of the specified file showing which\n" +"patches modify which lines.\n" +msgstr "" + +#: quilt/applied:22 msgid "Usage: quilt applied [patch]\\n" msgstr "Usage : quilt applied [patch]\\n" -#: ../quilt/applied.in:25 +#: quilt/applied:25 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" @@ -136,15 +146,15 @@ msgstr "" "Affiche la liste des patches appliqus, ou la liste de tous les patches\n" "jusqu' celui pass en paramtre (inclus).\n" -#: ../quilt/applied.in:67 +#: quilt/applied:67 msgid "Patch is not applied\\n" msgstr "Le patch n'est pas appliqu\\n" -#: ../quilt/delete.in:22 +#: quilt/delete:22 msgid "Usage: quilt delete [patch | -n]\\n" msgstr "Usage : quilt delete [patch | -n]\\n" -#: ../quilt/delete.in:25 +#: quilt/delete:25 msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -162,23 +172,23 @@ msgstr "" "-n\tEfface le patch qui suit celui qui est au sommet, au lieu du\n" "\tpatch spcifi ou de celui qui est au sommet.\n" -#: ../quilt/delete.in:88 +#: quilt/delete:88 msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: ../quilt/delete.in:106 +#: quilt/delete:106 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqu\\n" -#: ../quilt/delete.in:113 +#: quilt/delete:113 msgid "Removed patch %s\\n" msgstr "Patch %s retir\\n" -#: ../quilt/delete.in:115 +#: quilt/delete:115 msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" -#: ../quilt/diff.in:24 +#: quilt/diff: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] " @@ -188,7 +198,7 @@ msgstr "" "P patch] [--snapshot] [--diff=utilitaire] [--no-timestamps] [--no-index] [--" "sort] [--color] [fichier ...]\\n" -#: ../quilt/diff.in:28 +#: quilt/diff:28 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -280,46 +290,46 @@ msgstr "" "--sort\tTrie les fichiers par leur nom au lieu de prserver leur ordre\n" "\td'origine.\n" -#: ../quilt/diff.in:231 +#: quilt/diff:231 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Les options -c patch, --snapshot et -z ne peuvent pas tre combines." -#: ../quilt/diff.in:258 +#: quilt/diff:258 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\n" -#: ../quilt/diff.in:293 ../quilt/files.in:122 +#: quilt/diff:293 quilt/files:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: ../quilt/diff.in:343 ../quilt/pop.in:114 +#: quilt/diff:343 quilt/pop:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:367 ../quilt/pop.in:138 +#: quilt/diff:367 quilt/pop:138 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: ../quilt/diff.in:386 +#: quilt/diff:386 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: ../quilt/diff.in:406 ../quilt/refresh.in:201 +#: quilt/diff:406 quilt/refresh:201 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: ../quilt/diff.in:413 +#: quilt/diff:413 msgid "More recent patches modify files in patch %s\\n" msgstr "Un patch plus recent modifie des fichiers communs %s.\\n" -#: ../quilt/edit.in:13 +#: quilt/edit:13 msgid "Usage: quilt edit file ...\\n" msgstr "Usage : quilt edit {fichier} ...\\n" -#: ../quilt/edit.in:16 +#: quilt/edit:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -329,11 +339,11 @@ msgstr "" "dite le(s) fichier(s) spcifis au sein de \\$EDITOR (%s) aprs addition \n" "au patch du sommet.\n" -#: ../quilt/files.in:22 +#: quilt/files:22 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" msgstr "Usage : quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" -#: ../quilt/files.in:25 +#: quilt/files:25 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -365,15 +375,15 @@ msgstr "" "\tcelui appliqu en dernier. Le nom de fichier - correspond au \n" "\tpremier patch appliqu.\n" -#: ../quilt/files.in:76 ../quilt/files.in:96 +#: quilt/files:76 quilt/files:96 msgid "Patch %s is not in series file\\n" msgstr "Le patch %s n'est pas dans le fichier series\\n" -#: ../quilt/fold.in:22 +#: quilt/fold:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "Usage : quilt fold [-p strip-level]\\n" -#: ../quilt/fold.in:25 +#: quilt/fold:25 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -395,15 +405,15 @@ msgstr "" "\tNombre de niveaux de rpertoires retirer lors de l'application du \n" "\tpatch.\n" -#: ../quilt/fold.in:116 +#: quilt/fold:116 msgid "File %s may be corrupted\\n" msgstr "Le fichier %s est peut-tre corrompu\\n" -#: ../quilt/fork.in:22 +#: quilt/fork:22 msgid "Usage: quilt fork [new_name]\\n" msgstr "Usage : quilt fork [nouveau_nom]\\n" -#: ../quilt/fork.in:25 +#: quilt/fork:25 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -434,19 +444,19 @@ msgstr "" "tiret suivi d'un nombre, ce nombre est augment la place (par\n" "exemple : patch.diff, patch-2.diff, patch-3.diff).\n" -#: ../quilt/fork.in:99 +#: quilt/fork:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Le patch %s existe dj, veuillez choisir un nouveau nom.\\n" -#: ../quilt/fork.in:111 +#: quilt/fork:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Le fork de %s en %s a chou.\\n" -#: ../quilt/fork.in:117 +#: quilt/fork:117 msgid "Fork of patch %s created as %s\\n" msgstr "Le fork de %s a t cr en tant que %s\\n" -#: ../quilt/graph.in:22 +#: quilt/graph:22 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[patch]\\n" @@ -454,7 +464,7 @@ msgstr "" "Usage : quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[patch]\\n" -#: ../quilt/graph.in:26 +#: quilt/graph:26 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -511,11 +521,11 @@ msgstr "" "\n" "-T ps\tProduit directement un fichier PostScript.\n" -#: ../quilt/grep.in:22 +#: quilt/grep:22 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "Usage : quilt grep [-h|options] {motif}\\n" -#: ../quilt/grep.in:25 +#: quilt/grep:25 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -537,11 +547,50 @@ msgstr "" "\ttiret peuvent tre passes aprs un second double tiret\n" "\t(-- --).\n" -#: ../quilt/import.in:22 +#: quilt/header:24 +#, fuzzy +msgid "" +"Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" +"trailing-whitespace] [patch]\\n" +msgstr "" +"Usage : quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--" +"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" + +#: quilt/header:28 +msgid "" +"\n" +"Print or change the header of the topmost or specified patch.\n" +"\n" +"-a, -r, -e\n" +"\tAppend to (-a) or replace (-r) the exiting patch header, or\n" +"\tedit (-e) the header in \\$EDITOR (%s). If none of these options is\n" +"\tgiven, print the patch header.\n" +"\t\n" +"--strip-diffstat\n" +"\tStrip diffstat output from the header.\n" +"\n" +"--strip-trailing-whitespace\n" +"\tStrip trailing whitespace at the end of lines of the header.\n" +"\n" +"--backup\n" +"\tCreate a backup copy of the old version of a patch as patch~.\n" +msgstr "" + +#: quilt/header:192 +#, fuzzy +msgid "Replaced header of patch %s\\n" +msgstr "Le patch %s a t rafraichi.\\n" + +#: quilt/header:195 +#, fuzzy +msgid "Appended text to header of patch %s\\n" +msgstr "Impossible de cre le patch %s\\n" + +#: quilt/import:22 msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ...\\n" -#: ../quilt/import.in:25 +#: quilt/import:25 msgid "" "\n" "Import external patches.\n" @@ -568,36 +617,36 @@ msgstr "" "\n" "-f\tcrase/met jour les patchs existants.\n" -#: ../quilt/import.in:74 +#: quilt/import:74 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" "L'option -n ne peut tre utilis que lors de l'import d'un seul patch.\\n" -#: ../quilt/import.in:92 +#: quilt/import:92 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: ../quilt/import.in:100 +#: quilt/import:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: ../quilt/import.in:104 +#: quilt/import:104 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: ../quilt/import.in:107 +#: quilt/import:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistr dans %s)\\n" -#: ../quilt/import.in:115 +#: quilt/import:115 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: ../quilt/import.in:122 +#: quilt/import:122 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de srie.\\n" -#: ../quilt/mail.in:25 +#: quilt/mail:25 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" @@ -605,20 +654,21 @@ msgstr "" "Usage : quilt mail {--mbox fichier|--send} [--from ...] [--to ...] [--" "cc ...] [--bcc ...] [--subject ...]\\n" -#: ../quilt/mail.in:28 +#: quilt/mail:28 +#, fuzzy 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" -"@DOCSUBDIR@/README.MAIL for details.\n" +"/usr/share/doc/quilt-0.41/README.MAIL 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 @MTA@.\n" +"\tSend the messages directly using /usr/sbin/sendmail.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use.\n" @@ -649,11 +699,11 @@ msgstr "" "\tAjoute un destinataire dans le champ d'en-tte A, Copie ou Copie\n" "\tcache, respectivement.\n" -#: ../quilt/new.in:22 +#: quilt/new:22 msgid "Usage: quilt new {patchname}\\n" msgstr "Usage : quilt new {nom_de_patch}\\n" -#: ../quilt/new.in:25 +#: quilt/new:25 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -663,23 +713,23 @@ msgstr "" "Cre un nouveau patch au nom spcifi, et l'insere aprs le patch\n" "au sommet dans le fichier de srie.\n" -#: ../quilt/new.in:64 +#: quilt/new:64 msgid "Patch %s exists already\\n" msgstr "Le patch %s existe dj\\n" -#: ../quilt/new.in:75 +#: quilt/new:75 msgid "Failed to create patch %s\\n" msgstr "Impossible de cre le patch %s\\n" -#: ../quilt/new.in:78 +#: quilt/new:78 msgid "Patch %s is now on top\\n" msgstr "Le patch %s est maintenant au sommet\\n" -#: ../quilt/next.in:22 +#: quilt/next:22 msgid "Usage: quilt next [patch]\\n" msgstr "Usage : quilt next [patch]\\n" -#: ../quilt/next.in:25 +#: quilt/next:25 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" @@ -691,11 +741,11 @@ msgstr "" "\n" "-n\tAffiche le nom de fichier au lieu du nom de patch.\n" -#: ../quilt/patches.in:22 +#: quilt/patches:22 msgid "Usage: quilt patches {file}\\n" msgstr "Usage : quilt patches {fichier}\\n" -#: ../quilt/patches.in:25 +#: quilt/patches:25 msgid "" "\n" "Print the list of patches that modify the specified file. (Uses a\n" @@ -714,11 +764,11 @@ msgstr "" "\n" "-v\tAffichage verbeux, plus simple lire.\n" -#: ../quilt/pop.in:22 +#: quilt/pop:22 msgid "Usage: quilt pop [-afRqv] [num|patch]\\n" msgstr "Usage : quilt pop [-afRqv] [num|patch]\\n" -#: ../quilt/pop.in:25 +#: quilt/pop:25 msgid "" "\n" "Remove patch(es) from the stack of applied patches. Without options,\n" @@ -760,37 +810,37 @@ msgstr "" "\n" "-v\tOpre verbeusement.\n" -#: ../quilt/pop.in:156 +#: quilt/pop:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" "\\n" -#: ../quilt/pop.in:181 +#: quilt/pop:181 msgid "Patch %s appears to be empty, removing\\n" msgstr "Le patch %s semble vide, enlev\\n" -#: ../quilt/pop.in:185 +#: quilt/pop:185 msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: ../quilt/pop.in:269 +#: quilt/pop:269 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit tre rafraichi au pralable.\\n" -#: ../quilt/pop.in:279 +#: quilt/pop:279 msgid "No patch removed\\n" msgstr "Aucun patch retir\\n" -#: ../quilt/pop.in:302 ../quilt/push.in:372 +#: quilt/pop:302 quilt/push:372 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" -#: ../quilt/previous.in:22 +#: quilt/previous:22 msgid "Usage: quilt previous [patch]\\n" msgstr "Usage : quilt previous [-n] [patch]\\n" -#: ../quilt/previous.in:25 +#: quilt/previous:25 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" @@ -802,11 +852,11 @@ msgstr "" "\n" "-n\tAffiche le nom de fichier au lieu du nom de patch.\n" -#: ../quilt/push.in:24 +#: quilt/push:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" -#: ../quilt/push.in:27 +#: quilt/push:27 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -867,48 +917,48 @@ msgstr "" "\tApplique une coloration syntaxique, toujours (always), de manire\n" "\tautomatique (auto) ou jamais (never).\n" -#: ../quilt/push.in:64 +#: quilt/push:64 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:157 +#: quilt/push:157 msgid "Applying patch %s\\n" msgstr "Application de %s\\n" -#: ../quilt/push.in:189 +#: quilt/push:189 msgid "Patch %s does not exist, applied\\n" msgstr "Le patch %s n'existe pas, appliqu\\n" -#: ../quilt/push.in:193 +#: quilt/push:193 msgid "Patch %s appears to be empty, applied\\n" msgstr "Le patch %s semble vide. Il a t appliqu.\\n" -#: ../quilt/push.in:197 +#: quilt/push:197 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "%s a t appliqu (forc ; vous devriez le rafrachir)\\n" -#: ../quilt/push.in:202 +#: quilt/push:202 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:241 +#: quilt/push:241 msgid "Patch %s not found in file series\\n" msgstr "Le patch %s est introuvable dans le fichier de srie\\n" -#: ../quilt/push.in:329 +#: quilt/push:329 msgid "Patch %s is already applied\\n" msgstr "Le patch %s est dj appliqu.\\n" -#: ../quilt/push.in:338 +#: quilt/push:338 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n" -#: ../quilt/push.in:352 +#: quilt/push:352 msgid "File series fully applied, ends at patch %s\\n" msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" -#: ../quilt/refresh.in:22 +#: quilt/refresh:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " "[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" @@ -916,7 +966,7 @@ msgstr "" "Usage : quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--" "diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" -#: ../quilt/refresh.in:26 +#: quilt/refresh:26 msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1001,43 +1051,43 @@ msgstr "" "--strip-trailing-whitespace\n" "\tSupprime les espaces la fin des lignes dans le patch gnr.\n" -#: ../quilt/refresh.in:173 +#: quilt/refresh:173 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de rafrachir des patchs avec -p%s. Veuillez spcifier -p0 ou -p1 " " la place.\\n" -#: ../quilt/refresh.in:207 +#: quilt/refresh:207 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Des fichiers plus rcents modifient les mmes fichiers que %s.\n" "Forcez le rafrachissement avec -f.\\n" -#: ../quilt/refresh.in:213 +#: quilt/refresh:213 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n" "certains fichiers sont masqus.\\n" -#: ../quilt/refresh.in:219 +#: quilt/refresh:219 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: ../quilt/refresh.in:296 +#: quilt/refresh:296 msgid "Patch %s is unchanged\\n" msgstr "Le patch %s n'a pas t modifi\\n" -#: ../quilt/refresh.in:301 +#: quilt/refresh:301 msgid "Refreshed patch %s\\n" msgstr "Le patch %s a t rafraichi.\\n" -#: ../quilt/remove.in:22 +#: quilt/remove:22 msgid "Usage: quilt remove [-p patch] {file} ...\\n" msgstr "Usage : quilt remove [-p patch] {fichier} ...\\n" -#: ../quilt/remove.in:25 +#: quilt/remove:25 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -1054,23 +1104,52 @@ msgstr "" "-p patch\n" "\tPatch duquel les fichiers doivent tre retirs.\n" -#: ../quilt/remove.in:91 +#: quilt/remove:91 msgid "File %s is not in patch %s\\n" msgstr "Le fichier %s n'est pas dans le patch %s.\\n" -#: ../quilt/remove.in:109 +#: quilt/remove:109 msgid "Failed to remove file %s from patch %s\\n" msgstr "Impossible d'enlever le fichier %s du patch %s.\\n" -#: ../quilt/remove.in:123 +#: quilt/remove:123 msgid "File %s removed from patch %s\\n" msgstr "Le fichier %s a t enlev du patch %s.\\n" -#: ../quilt/series.in:22 +#: quilt/rename:22 +#, fuzzy +msgid "Usage: quilt rename [-p patch] new_name\\n" +msgstr "Usage : quilt remove [-p patch] {fichier} ...\\n" + +#: quilt/rename:25 +msgid "" +"\n" +"Rename the topmost or named patch.\n" +"\n" +"-p patch\n" +"\tPatch to rename.\n" +msgstr "" + +#: quilt/rename:96 +#, fuzzy +msgid "Patch %s exists already, please choose a different name\\n" +msgstr "Le patch %s existe dj, veuillez choisir un nouveau nom.\\n" + +#: quilt/rename:110 +#, fuzzy +msgid "Renaming of patch %s to %s failed\\n" +msgstr "Le fork de %s en %s a chou.\\n" + +#: quilt/rename:116 +#, fuzzy +msgid "Patch %s renamed to %s\\n" +msgstr "Le fork de %s a t cr en tant que %s\\n" + +#: quilt/series:22 msgid "Usage: quilt series [-v]\\n" msgstr "Usage : quilt series [-v]\\n" -#: ../quilt/series.in:25 +#: quilt/series:25 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1082,13 +1161,13 @@ msgstr "" "\n" "-v\tAffichage verbeux, plus simple lire.\n" -#: ../quilt/setup.in:27 +#: quilt/setup:27 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n" msgstr "" "Usage : quilt setup [-d rpertoire_source] [-v] {fichier_sries|fichier_spec}" "\\n" -#: ../quilt/setup.in:30 +#: quilt/setup:30 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1105,32 +1184,32 @@ msgstr "" "\n" "-v\taffichage verbeux pour le debug.\n" -#: ../quilt/setup.in:96 +#: quilt/setup:96 msgid "Directory %s exists\\n" msgstr "Le rpertoire %s existe\\n" -#: ../quilt/setup.in:102 +#: quilt/setup:102 msgid "File %s exists\\n" msgstr "Le fichier %s existe\\n" -#: ../quilt/setup.in:118 +#: quilt/setup:118 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "La section %%prep de %s a chou ; les rsultats sont peut-tre incomplets\\n" -#: ../quilt/setup.in:121 +#: quilt/setup:121 msgid "The -v option will show rpm's output\\n" msgstr "L'option -v montre les affichages de rpm\\\\n" -#: ../quilt/setup.in:155 +#: quilt/setup:155 msgid "Unpacking archive %s\\n" msgstr "Dsarchivage de %s\\n" -#: ../quilt/snapshot.in:22 +#: quilt/snapshot:22 msgid "Usage: quilt snapshot [-d]\\n" msgstr "Usage : quilt snapshot [-d]\\n" -#: ../quilt/snapshot.in:25 +#: quilt/snapshot:25 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1150,11 +1229,11 @@ msgstr "" "\n" "-d\tSupprime l'instantan actuel et termine.\n" -#: ../quilt/top.in:22 +#: quilt/top:22 msgid "Usage: quilt top\\n" msgstr "Usage : quilt top\\n" -#: ../quilt/top.in:25 +#: quilt/top:25 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" @@ -1164,11 +1243,11 @@ msgstr "" "Affiche le nom du patch au sommet de la pile des patches actuellement\n" "appliqus.\n" -#: ../quilt/unapplied.in:22 +#: quilt/unapplied:22 msgid "Usage: quilt unapplied [patch]\\n" msgstr "Usage : quilt unapplied [patch]\\n" -#: ../quilt/unapplied.in:25 +#: quilt/unapplied:25 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" @@ -1178,11 +1257,11 @@ msgstr "" "Affiche la liste de tous les patches non appliqus, ou de tous les patches\n" "suivant celui indiqu en paramtre.\n" -#: ../quilt/upgrade.in:25 +#: quilt/upgrade:25 msgid "Usage: quilt upgrade\\n" msgstr "Usage : quilt upgrade\\n" -#: ../quilt/upgrade.in:28 +#: quilt/upgrade:28 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1200,22 +1279,22 @@ msgstr "" " l'ancien format. Dans ce cas, quilt vous demandera d'utiliser\n" " quilt upgrade explicitement.\n" -#: ../quilt/upgrade.in:67 +#: quilt/upgrade:67 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" msgstr "" "Les mta-donnes de quilt dans %s sont dj au format %s ; rien faire\\n" -#: ../quilt/upgrade.in:71 +#: quilt/upgrade:71 msgid "Converting meta-data to version %s\\n" msgstr "Conversion des mta-dones au format v%s\\n" -#: ../quilt/upgrade.in:102 +#: quilt/upgrade:102 msgid "Conversion failed\\n" msgstr "chec de la convertion\\n" -#: ../quilt/upgrade.in:103 +#: quilt/upgrade:103 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " @@ -1227,7 +1306,42 @@ msgstr "" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" -#: ../scripts/patchfns.in:751 +#: scripts/edmail:64 +#, perl-format +msgid "Display name '%s' contains unpaired parentheses\n" +msgstr "" + +#: scripts/edmail:68 +#, perl-format +msgid "Display name '%s' contains invalid characters\n" +msgstr "" + +#: scripts/edmail:72 +#, perl-format +msgid "Display name '%s' contains non-printable or 8-bit characters\n" +msgstr "" + +#: scripts/edmail:78 +#, perl-format +msgid "Delivery address '%s' is invalid\n" +msgstr "" + +#: scripts/parse-patch:33 +#, perl-format +msgid "USAGE: %s {-s|-u} section file [< replacement]\n" +msgstr "" + +#: scripts/parse-patch:80 scripts/parse-patch:87 +#, perl-format +msgid "File %s disappeared!\n" +msgstr "" + +#: scripts/parse-patch:133 scripts/parse-patch:139 +#, fuzzy, perl-format +msgid "Failed to rename %s to %s: %s\n" +msgstr "Impossible de cre le patch %s\\n" + +#: scripts/patchfns: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 " @@ -1239,7 +1353,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: ../scripts/patchfns.in:828 +#: scripts/patchfns:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1247,6 +1361,41 @@ msgstr "" "Votre arbre a t cr par une vieille version de quilt. Veuillez \n" "utiliser quilt upgrade .\\n" +#: scripts/remove-trailing-ws:26 +#, perl-format +msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" +msgstr "" + +#: scripts/remove-trailing-ws:48 scripts/remove-trailing-ws:75 +#, perl-format +msgid "%s: I'm confused.\n" +msgstr "" + +#: scripts/remove-trailing-ws:96 +#, perl-format +msgid "Warning: trailing whitespace in line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:99 +#, perl-format +msgid "Warning: trailing whitespace in lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:103 +#, perl-format +msgid "Removing trailing whitespace from line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:106 +#, perl-format +msgid "Removing trailing whitespace from lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:126 +#, fuzzy, perl-format +msgid "Renaming %s to %s: %s\n" +msgstr "Le fork de %s en %s a chou.\\n" + #~ msgid "Cannot change into directory %s\\n" #~ msgstr "Impossible d'entrer dans le rpertoire %s\\n" @@ -12,19 +12,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../bin/quilt.in:23 +#: bin/quilt:23 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "使い方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." -#: ../bin/quilt.in:24 +#: bin/quilt:24 msgid " quilt --version" msgstr "" -#: ../bin/quilt.in:26 +#: bin/quilt:26 msgid "Commands are:" msgstr "コマンド一覧:" -#: ../bin/quilt.in:31 +#: bin/quilt:31 #, fuzzy msgid "" "\n" @@ -52,11 +52,11 @@ msgstr "" "\tフィギュレーションファイルを指定。内容の詳細については PDFのド\n" "\tキュメントを参照。" -#: ../quilt/add.in:22 +#: quilt/add:22 msgid "Usage: quilt add [-p patch] {file} ...\\n" msgstr "使い方: quilt add [-p パッチ] {file} ...\\n" -#: ../quilt/add.in:25 +#: quilt/add:25 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -74,55 +74,65 @@ msgstr "" "-p patch\n" "\tファイルを追加するパッチ\n" -#: ../quilt/add.in:48 ../quilt/add.in:54 +#: quilt/add:48 quilt/add:54 msgid "File \\`%s' is located below \\`%s'\\n" msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n" -#: ../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/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 -#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 -#: ../quilt/unapplied.in:62 +#: 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 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121 -#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74 +#: quilt/add:99 quilt/diff:239 quilt/graph:121 quilt/pop:261 quilt/refresh:154 +#: quilt/remove:74 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: ../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/pop.in:295 ../quilt/push.in:350 -#: ../quilt/refresh.in:162 ../quilt/remove.in:81 +#: 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 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" -#: ../quilt/add.in:121 +#: quilt/add:121 msgid "File %s is already in patch %s\\n" msgstr "ファイル %s は、すでにパッチ %s に含まれています\\n" -#: ../quilt/add.in:129 ../quilt/remove.in:100 +#: quilt/add:129 quilt/remove:100 msgid "File %s modified by patch %s\\n" msgstr "ファイル %s は、パッチ %s によってすでに変更されています\\n" -#: ../quilt/add.in:137 +#: quilt/add:137 msgid "Cannot add symbolic link %s\\n" msgstr "シンボリックファイル %sは追加できません" -#: ../quilt/add.in:144 +#: quilt/add:144 msgid "Failed to back up file %s\\n" msgstr "ファイル %s のバックアップに失敗しました\\n" -#: ../quilt/add.in:155 +#: quilt/add:155 msgid "File %s added to patch %s\\n" msgstr "ファイル %s をパッチ %s に追加しました\\n" -#: ../quilt/applied.in:22 +#: quilt/annotate:22 +#, fuzzy +msgid "Usage: quilt annotate {file}\\n" +msgstr "使い方: quilt patches {ファイル}\\n" + +#: quilt/annotate:25 +msgid "" +"\n" +"Print an annotated listing of the specified file showing which\n" +"patches modify which lines.\n" +msgstr "" + +#: quilt/applied:22 msgid "Usage: quilt applied [patch]\\n" msgstr "使い方: quilt applied [パッチ]\\n" -#: ../quilt/applied.in:25 +#: quilt/applied:25 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" @@ -132,15 +142,15 @@ msgstr "" "適用されているパッチの一覧を表示します。指定されたパッチがある場合は、\n" "seriesファイル内のパッチ一覧の中から指定されたパッチまでを表示します。\n" -#: ../quilt/applied.in:67 +#: quilt/applied:67 msgid "Patch is not applied\\n" msgstr "パッチは適用されていません\\n" -#: ../quilt/delete.in:22 +#: quilt/delete:22 msgid "Usage: quilt delete [patch | -n]\\n" msgstr "使い方: quilt delete [パッチ | -n]\\n" -#: ../quilt/delete.in:25 +#: quilt/delete:25 #, fuzzy msgid "" "\n" @@ -156,24 +166,25 @@ msgstr "" "パッチがすでに適用されている場合は、最初にパッチを外します。( 現状、最\n" "上位のパッチしか削除することはできません。) \n" -#: ../quilt/delete.in:88 +#: quilt/delete:88 +#, fuzzy msgid "No next patch\\n" -msgstr "" +msgstr "現在位置はパッチ %s です" -#: ../quilt/delete.in:106 +#: quilt/delete:106 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています。\\n" -#: ../quilt/delete.in:113 +#: quilt/delete:113 #, fuzzy msgid "Removed patch %s\\n" msgstr "パッチ %s を削除します\\n" -#: ../quilt/delete.in:115 +#: quilt/delete:115 msgid "Failed to remove patch %s\\n" msgstr "パッチ %sを削除することに失敗しました。\\n" -#: ../quilt/diff.in:24 +#: quilt/diff:24 #, fuzzy msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " @@ -183,7 +194,7 @@ msgstr "" "使い方: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-" "P パッチ] [--snapshot] [--diff=utility] [--color] [ファイル ...]\\n" -#: ../quilt/diff.in:28 +#: quilt/diff:28 #, fuzzy msgid "" "\n" @@ -266,44 +277,44 @@ msgstr "" "--color[=always|auto|never]\n" "\tシンタックスの色付け指定。\n" -#: ../quilt/diff.in:231 +#: quilt/diff:231 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "オプション \\`-c patch'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: ../quilt/diff.in:258 +#: quilt/diff:258 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: ../quilt/diff.in:293 ../quilt/files.in:122 +#: quilt/diff:293 quilt/files:122 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: ../quilt/diff.in:343 ../quilt/pop.in:114 +#: quilt/diff:343 quilt/pop:114 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: ../quilt/diff.in:367 ../quilt/pop.in:138 +#: quilt/diff:367 quilt/pop:138 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: ../quilt/diff.in:386 +#: quilt/diff:386 msgid "File %s is not being modified\\n" msgstr "ファイル %sは変更されていません\\n" -#: ../quilt/diff.in:406 ../quilt/refresh.in:201 +#: quilt/diff:406 quilt/refresh:201 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: ../quilt/diff.in:413 +#: quilt/diff:413 msgid "More recent patches modify files in patch %s\\n" msgstr "最近のパッチが、パッチ %s内のファイルを変更しています\\n" -#: ../quilt/edit.in:13 +#: quilt/edit:13 msgid "Usage: quilt edit file ...\\n" msgstr "使い方: quilt edit ファイル ...\\n" -#: ../quilt/edit.in:16 +#: quilt/edit:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -312,11 +323,11 @@ msgstr "" "\n" "最上位のパッチに指定されたファイルを追加後、\\$EDITOR (%s) を使って編集。\n" -#: ../quilt/files.in:22 +#: quilt/files:22 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" msgstr "使い方: quilt files [-v] [-a] [-l] [--combine パッチ] [パッチ]\\n" -#: ../quilt/files.in:25 +#: quilt/files:25 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -349,15 +360,15 @@ msgstr "" "\tことになる。\n" "\n" -#: ../quilt/files.in:76 ../quilt/files.in:96 +#: quilt/files:76 quilt/files:96 msgid "Patch %s is not in series file\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: ../quilt/fold.in:22 +#: quilt/fold:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "使い方: quilt fold [-p strip-level]\\n" -#: ../quilt/fold.in:25 +#: quilt/fold:25 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -377,15 +388,15 @@ msgstr "" "-p strip-level\n" "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n" -#: ../quilt/fold.in:116 +#: quilt/fold:116 msgid "File %s may be corrupted\\n" msgstr "ファイル %s は壊れている可能性があります\\n" -#: ../quilt/fork.in:22 +#: quilt/fork:22 msgid "Usage: quilt fork [new_name]\\n" msgstr "使い方: quilt fork [new_name]\\n" -#: ../quilt/fork.in:25 +#: quilt/fork:25 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -401,19 +412,19 @@ msgid "" "patch-2.diff, patch-3.diff).\n" msgstr "" -#: ../quilt/fork.in:99 +#: quilt/fork:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "パッチ %sはすでに存在します。新しい名前を選んでください\\n" -#: ../quilt/fork.in:111 +#: quilt/fork:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n" -#: ../quilt/fork.in:117 +#: quilt/fork:117 msgid "Fork of patch %s created as %s\\n" msgstr "パッチ %sの分岐で %sが作成されました\\n" -#: ../quilt/graph.in:22 +#: quilt/graph:22 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[patch]\\n" @@ -421,7 +432,7 @@ msgstr "" "使い方: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[パッチ]\\n\"" -#: ../quilt/graph.in:26 +#: quilt/graph:26 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -477,11 +488,11 @@ msgstr "" "\n" "-T ps\t直接ポストスクリプトファイルを生成する。\n" -#: ../quilt/grep.in:22 +#: quilt/grep:22 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "使い方: quilt grep [-h|options] {パターン}\\n" -#: ../quilt/grep.in:25 +#: quilt/grep:25 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -501,11 +512,50 @@ msgstr "" "-hを渡すことができる。ダッシュ記号で始まる検索パターンは2つ目の二重ダッ\n" "シュ記号の後に渡すことができる。\n" -#: ../quilt/import.in:22 +#: quilt/header:24 +#, fuzzy +msgid "" +"Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" +"trailing-whitespace] [patch]\\n" +msgstr "" +"使い方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " +"[パッチ]\\n" + +#: quilt/header:28 +msgid "" +"\n" +"Print or change the header of the topmost or specified patch.\n" +"\n" +"-a, -r, -e\n" +"\tAppend to (-a) or replace (-r) the exiting patch header, or\n" +"\tedit (-e) the header in \\$EDITOR (%s). If none of these options is\n" +"\tgiven, print the patch header.\n" +"\t\n" +"--strip-diffstat\n" +"\tStrip diffstat output from the header.\n" +"\n" +"--strip-trailing-whitespace\n" +"\tStrip trailing whitespace at the end of lines of the header.\n" +"\n" +"--backup\n" +"\tCreate a backup copy of the old version of a patch as patch~.\n" +msgstr "" + +#: quilt/header:192 +#, fuzzy +msgid "Replaced header of patch %s\\n" +msgstr "パッチ %s をリフレッシュしました\\n" + +#: quilt/header:195 +#, fuzzy +msgid "Appended text to header of patch %s\\n" +msgstr "パッチ %s の作成に失敗しました\\n" + +#: quilt/import:22 msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" msgstr "使い方: quilt import [-f] [-p num] [-n パッチ] パッチファイル ...\\n" -#: ../quilt/import.in:25 +#: quilt/import:25 msgid "" "\n" "Import external patches.\n" @@ -531,35 +581,35 @@ msgstr "" "\n" "-f\t存在するパッチの上書き、またはアップデート。\n" -#: ../quilt/import.in:74 +#: quilt/import:74 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "オプション \\`-n'は、パッチを一つだけ取り込むときのみ有効です。\\n" -#: ../quilt/import.in:92 +#: quilt/import:92 msgid "Patch %s is applied\\n" msgstr "パッチ %s は、すでに適用されています\\n" -#: ../quilt/import.in:100 +#: quilt/import:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます。\\n" -#: ../quilt/import.in:104 +#: quilt/import:104 msgid "Replacing patch %s with new version\\n" msgstr "パッチ % を新しいバージョンに置き換えます\\n" -#: ../quilt/import.in:107 +#: quilt/import:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッチ %s を取り込んでいます (%sとして保存されます)\\n" -#: ../quilt/import.in:115 +#: quilt/import:115 msgid "Failed to import patch %s\\n" msgstr "パッチ %s の取り込みに失敗しました\\n" -#: ../quilt/import.in:122 +#: quilt/import:122 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" -#: ../quilt/mail.in:25 +#: quilt/mail:25 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" @@ -567,20 +617,21 @@ msgstr "" "使い方: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] " "[--bcc ...] [--subject ...]\\n" -#: ../quilt/mail.in:28 +#: quilt/mail:28 +#, fuzzy 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" -"@DOCSUBDIR@/README.MAIL for details.\n" +"/usr/share/doc/quilt-0.41/README.MAIL 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 @MTA@.\n" +"\tSend the messages directly using /usr/sbin/sendmail.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use.\n" @@ -607,11 +658,11 @@ msgstr "" "--to, --cc, --bcc\n" "\tToやCC、BCCへの受信者の追加。\n" -#: ../quilt/new.in:22 +#: quilt/new:22 msgid "Usage: quilt new {patchname}\\n" msgstr "使い方: quilt new {パッチ名}\\n" -#: ../quilt/new.in:25 +#: quilt/new:25 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -622,23 +673,23 @@ msgstr "" "追加される場所は、現在最上位のパッチの次です。\n" "\n" -#: ../quilt/new.in:64 +#: quilt/new:64 msgid "Patch %s exists already\\n" msgstr "パッチ %s は、すでに存在します\\n" -#: ../quilt/new.in:75 +#: quilt/new:75 msgid "Failed to create patch %s\\n" msgstr "パッチ %s の作成に失敗しました\\n" -#: ../quilt/new.in:78 +#: quilt/new:78 msgid "Patch %s is now on top\\n" msgstr "パッチ %s を最上位にしました\\n" -#: ../quilt/next.in:22 +#: quilt/next:22 msgid "Usage: quilt next [patch]\\n" msgstr "使い方: quilt next [パッチ]\\n" -#: ../quilt/next.in:25 +#: quilt/next:25 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" @@ -647,11 +698,11 @@ msgstr "" "\n" "最上位または指定されたパッチの次のパッチ名を表示。\n" -#: ../quilt/patches.in:22 +#: quilt/patches:22 msgid "Usage: quilt patches {file}\\n" msgstr "使い方: quilt patches {ファイル}\\n" -#: ../quilt/patches.in:25 +#: quilt/patches:25 msgid "" "\n" "Print the list of patches that modify the specified file. (Uses a\n" @@ -668,11 +719,11 @@ msgstr "" "\n" "-v\t詳細で見やすい表示。\n" -#: ../quilt/pop.in:22 +#: quilt/pop:22 msgid "Usage: quilt pop [-afRqv] [num|patch]\\n" msgstr "使い方: quilt pop [-afRqv] [数字|パッチ]\\n" -#: ../quilt/pop.in:25 +#: quilt/pop:25 #, fuzzy msgid "" "\n" @@ -715,38 +766,38 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: ../quilt/pop.in:156 +#: quilt/pop:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" "けてはずしてください)\\n" -#: ../quilt/pop.in:181 +#: quilt/pop:181 #, fuzzy msgid "Patch %s appears to be empty, removing\\n" msgstr "パッチ %sは、空のようです\\n" -#: ../quilt/pop.in:185 +#: quilt/pop:185 msgid "Removing patch %s\\n" msgstr "パッチ %s を削除します\\n" -#: ../quilt/pop.in:269 +#: quilt/pop:269 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" -#: ../quilt/pop.in:279 +#: quilt/pop:279 msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: ../quilt/pop.in:302 ../quilt/push.in:372 +#: quilt/pop:302 quilt/push:372 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です" -#: ../quilt/previous.in:22 +#: quilt/previous:22 msgid "Usage: quilt previous [patch]\\n" msgstr "使い方: quilt previous [パッチ]\\n" -#: ../quilt/previous.in:25 +#: quilt/previous:25 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" @@ -756,11 +807,11 @@ msgstr "" "最上位のパッチの前のパッチ名を表示。パッチ名が指定されたときは、指定\n" "されたパッチの前のパッチ名を表示。\n" -#: ../quilt/push.in:24 +#: quilt/push:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "使い方: quilt push [-afqv] [--leave-rejects] [数字|パッチ]\\n" -#: ../quilt/push.in:27 +#: quilt/push:27 #, fuzzy msgid "" "\n" @@ -819,50 +870,50 @@ msgstr "" " シンタックスの色付けを行なう。\n" "\n" -#: ../quilt/push.in:64 +#: quilt/push:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n" -#: ../quilt/push.in:157 +#: quilt/push:157 msgid "Applying patch %s\\n" msgstr "パッチ %s を適用しています\\n" -#: ../quilt/push.in:189 +#: quilt/push:189 #, fuzzy msgid "Patch %s does not exist, applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: ../quilt/push.in:193 +#: quilt/push:193 msgid "Patch %s appears to be empty, applied\\n" msgstr "パッチ %s は空のようですが、適用しました\\n" -#: ../quilt/push.in:197 +#: quilt/push:197 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" "パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: ../quilt/push.in:202 +#: quilt/push:202 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" -#: ../quilt/push.in:241 +#: quilt/push:241 msgid "Patch %s not found in file series\\n" msgstr "パッチ %s が seriesファイル内で見つかりません。\\n" -#: ../quilt/push.in:329 +#: quilt/push:329 msgid "Patch %s is already applied\\n" msgstr "パッチ %s は、すでに適用済です\\n" -#: ../quilt/push.in:338 +#: quilt/push:338 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" -#: ../quilt/push.in:352 +#: quilt/push:352 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: ../quilt/refresh.in:22 +#: quilt/refresh:22 #, fuzzy msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " @@ -871,7 +922,7 @@ msgstr "" "使い方: quilt refresh [-p n] [-f] [--no-timestamps] [--diffstat] [--backup] " "[パッチ]\\n" -#: ../quilt/refresh.in:26 +#: quilt/refresh:26 #, fuzzy msgid "" "\n" @@ -946,40 +997,40 @@ msgstr "" "\tバックアップ用のコピーとして古いバージョンのパッチを patch~の\n" "\t形で作成する。\n" -#: ../quilt/refresh.in:173 +#: quilt/refresh:173 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "-p%sではリフレッシュすることができません。-p0または -p1を指定してください\\n" -#: ../quilt/refresh.in:207 +#: quilt/refresh:207 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %sのファイルに変更を加えています。リフレッシュを実行" "する場合は -f オプションを使用してください。\\n" -#: ../quilt/refresh.in:213 +#: quilt/refresh:213 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: ../quilt/refresh.in:219 +#: quilt/refresh:219 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: ../quilt/refresh.in:296 +#: quilt/refresh:296 msgid "Patch %s is unchanged\\n" msgstr "パッチ % に変更はありません\\n" -#: ../quilt/refresh.in:301 +#: quilt/refresh:301 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" -#: ../quilt/remove.in:22 +#: quilt/remove:22 msgid "Usage: quilt remove [-p patch] {file} ...\\n" msgstr "使い方: quilt remove [-p パッチ] {ファイル} ...\\n" -#: ../quilt/remove.in:25 +#: quilt/remove:25 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -995,23 +1046,52 @@ msgstr "" "-p パッチ\n" "\tファイルを削除するパッチを指定。\n" -#: ../quilt/remove.in:91 +#: quilt/remove:91 msgid "File %s is not in patch %s\\n" msgstr "ファイル %sは、パッチ %sに含まれていません\\n" -#: ../quilt/remove.in:109 +#: quilt/remove:109 msgid "Failed to remove file %s from patch %s\\n" msgstr "ファイル %s を、パッチ %s から削除することに失敗しました\\n" -#: ../quilt/remove.in:123 +#: quilt/remove:123 msgid "File %s removed from patch %s\\n" msgstr "ファイル %s を、パッチ %s から削除しました\\n" -#: ../quilt/series.in:22 +#: quilt/rename:22 +#, fuzzy +msgid "Usage: quilt rename [-p patch] new_name\\n" +msgstr "使い方: quilt remove [-p パッチ] {ファイル} ...\\n" + +#: quilt/rename:25 +msgid "" +"\n" +"Rename the topmost or named patch.\n" +"\n" +"-p patch\n" +"\tPatch to rename.\n" +msgstr "" + +#: quilt/rename:96 +#, fuzzy +msgid "Patch %s exists already, please choose a different name\\n" +msgstr "パッチ %sはすでに存在します。新しい名前を選んでください\\n" + +#: quilt/rename:110 +#, fuzzy +msgid "Renaming of patch %s to %s failed\\n" +msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n" + +#: quilt/rename:116 +#, fuzzy +msgid "Patch %s renamed to %s\\n" +msgstr "パッチ %sの分岐で %sが作成されました\\n" + +#: quilt/series:22 msgid "Usage: quilt series [-v]\\n" msgstr "使い方: quilt series [-v]\\n" -#: ../quilt/series.in:25 +#: quilt/series:25 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1024,12 +1104,12 @@ msgstr "" "-v\t詳細で見やすい表示。\n" "\n" -#: ../quilt/setup.in:27 +#: quilt/setup:27 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n" msgstr "" "使い方: quilt setup [-d path-prefix] [-v] {specファイル|seriesファイル}\\n" -#: ../quilt/setup.in:30 +#: quilt/setup:30 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1046,33 +1126,33 @@ msgstr "" "\n" "-v\t詳細なデバッグ表示\n" -#: ../quilt/setup.in:96 +#: quilt/setup:96 msgid "Directory %s exists\\n" msgstr "ディレクトリ %s は、すでに存在します\\n" -#: ../quilt/setup.in:102 +#: quilt/setup:102 msgid "File %s exists\\n" msgstr "ファイル %s は、すでに存在します\\n" -#: ../quilt/setup.in:118 +#: quilt/setup:118 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま" "す\\n" -#: ../quilt/setup.in:121 +#: quilt/setup:121 msgid "The -v option will show rpm's output\\n" msgstr "-vオプションを使って、rpmの出力を表示できます" -#: ../quilt/setup.in:155 +#: quilt/setup:155 msgid "Unpacking archive %s\\n" msgstr "アーカイブ %sを展開しています\\n" -#: ../quilt/snapshot.in:22 +#: quilt/snapshot:22 msgid "Usage: quilt snapshot [-d]\\n" msgstr "使い方: quilt snapshot [-d]\\n" -#: ../quilt/snapshot.in:25 +#: quilt/snapshot:25 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1091,11 +1171,11 @@ msgstr "" "-d\t現在のスナップショットを削除。\n" "\n" -#: ../quilt/top.in:22 +#: quilt/top:22 msgid "Usage: quilt top\\n" msgstr "使い方: quilt top\\n" -#: ../quilt/top.in:25 +#: quilt/top:25 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" @@ -1104,11 +1184,11 @@ msgstr "" "\n" "現在適用されているパッチスタックの最上位パッチ名を表示\n" -#: ../quilt/unapplied.in:22 +#: quilt/unapplied:22 msgid "Usage: quilt unapplied [patch]\\n" msgstr "使い方: quilt unapplied [パッチ]\\n" -#: ../quilt/unapplied.in:25 +#: quilt/unapplied:25 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" @@ -1118,11 +1198,11 @@ msgstr "" "適用されていないパッチを表示。パッチが指定された場合は、指定されたパッ\n" "チ以降で適用されていないパッチを表示。\n" -#: ../quilt/upgrade.in:25 +#: quilt/upgrade:25 msgid "Usage: quilt upgrade\\n" msgstr "使い方: quilt upgrade\\n" -#: ../quilt/upgrade.in:28 +#: quilt/upgrade:28 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1138,7 +1218,7 @@ msgstr "" "場合のみ必要。変更が確認された場合、quiltから \\`quilt upgrade'の実行が\n" "要求される。\n" -#: ../quilt/upgrade.in:67 +#: quilt/upgrade:67 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" @@ -1146,15 +1226,15 @@ msgstr "" "%s内の quiltメタデータはすでに version %s フォーマットのため、処理する必要が" "ありません。\\n" -#: ../quilt/upgrade.in:71 +#: quilt/upgrade:71 msgid "Converting meta-data to version %s\\n" msgstr "メタデータを version %sに変更中です\\n" -#: ../quilt/upgrade.in:102 +#: quilt/upgrade:102 msgid "Conversion failed\\n" msgstr "変更に失敗しました\\n" -#: ../quilt/upgrade.in:103 +#: quilt/upgrade:103 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " @@ -1166,7 +1246,42 @@ msgstr "" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" -#: ../scripts/patchfns.in:751 +#: scripts/edmail:64 +#, perl-format +msgid "Display name '%s' contains unpaired parentheses\n" +msgstr "" + +#: scripts/edmail:68 +#, perl-format +msgid "Display name '%s' contains invalid characters\n" +msgstr "" + +#: scripts/edmail:72 +#, perl-format +msgid "Display name '%s' contains non-printable or 8-bit characters\n" +msgstr "" + +#: scripts/edmail:78 +#, perl-format +msgid "Delivery address '%s' is invalid\n" +msgstr "" + +#: scripts/parse-patch:33 +#, perl-format +msgid "USAGE: %s {-s|-u} section file [< replacement]\n" +msgstr "" + +#: scripts/parse-patch:80 scripts/parse-patch:87 +#, perl-format +msgid "File %s disappeared!\n" +msgstr "" + +#: scripts/parse-patch:133 scripts/parse-patch:139 +#, fuzzy, perl-format +msgid "Failed to rename %s to %s: %s\n" +msgstr "パッチ %s の作成に失敗しました\\n" + +#: scripts/patchfns: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 " @@ -1178,7 +1293,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: ../scripts/patchfns.in:828 +#: scripts/patchfns:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1186,6 +1301,41 @@ msgstr "" "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので" "す。'quilt upgrade'を実行してください。\\n" +#: scripts/remove-trailing-ws:26 +#, perl-format +msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" +msgstr "" + +#: scripts/remove-trailing-ws:48 scripts/remove-trailing-ws:75 +#, perl-format +msgid "%s: I'm confused.\n" +msgstr "" + +#: scripts/remove-trailing-ws:96 +#, perl-format +msgid "Warning: trailing whitespace in line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:99 +#, perl-format +msgid "Warning: trailing whitespace in lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:103 +#, perl-format +msgid "Removing trailing whitespace from line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:106 +#, perl-format +msgid "Removing trailing whitespace from lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:126 +#, fuzzy, perl-format +msgid "Renaming %s to %s: %s\n" +msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n" + #~ msgid "Cannot change into directory %s\\n" #~ msgstr "ディレクトリ %s に移動できません\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 005ab4d..f05c600 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -1,16 +1,16 @@ -#: ../bin/quilt.in:23 +#: bin/quilt:23 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "" -#: ../bin/quilt.in:24 +#: bin/quilt:24 msgid " quilt --version" msgstr "" -#: ../bin/quilt.in:26 +#: bin/quilt:26 msgid "Commands are:" msgstr "" -#: ../bin/quilt.in:31 +#: bin/quilt:31 msgid "" "\n" "Global options:\n" @@ -27,11 +27,11 @@ msgid "" "\tPrint the version number and exit immediately." msgstr "" -#: ../quilt/add.in:22 +#: quilt/add:22 msgid "Usage: quilt add [-p patch] {file} ...\\n" msgstr "" -#: ../quilt/add.in:25 +#: quilt/add:25 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -42,70 +42,79 @@ msgid "" "\tPatch to add files to.\n" msgstr "" -#: ../quilt/add.in:48 ../quilt/add.in:54 +#: quilt/add:48 quilt/add:54 msgid "File \\`%s' is located below \\`%s'\\n" msgstr "" -#: ../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/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62 -#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53 -#: ../quilt/unapplied.in:62 +#: 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 msgid "Patch %s is not in series\\n" msgstr "" -#: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121 -#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74 +#: quilt/add:99 quilt/diff:239 quilt/graph:121 quilt/pop:261 quilt/refresh:154 +#: quilt/remove:74 msgid "Patch %s is not applied\\n" msgstr "" -#: ../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/pop.in:295 ../quilt/push.in:350 -#: ../quilt/refresh.in:162 ../quilt/remove.in:81 +#: 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 msgid "No patches applied\\n" msgstr "" -#: ../quilt/add.in:121 +#: quilt/add:121 msgid "File %s is already in patch %s\\n" msgstr "" -#: ../quilt/add.in:129 ../quilt/remove.in:100 +#: quilt/add:129 quilt/remove:100 msgid "File %s modified by patch %s\\n" msgstr "" -#: ../quilt/add.in:137 +#: quilt/add:137 msgid "Cannot add symbolic link %s\\n" msgstr "" -#: ../quilt/add.in:144 +#: quilt/add:144 msgid "Failed to back up file %s\\n" msgstr "" -#: ../quilt/add.in:155 +#: quilt/add:155 msgid "File %s added to patch %s\\n" msgstr "" -#: ../quilt/applied.in:22 +#: quilt/annotate:22 +msgid "Usage: quilt annotate {file}\\n" +msgstr "" + +#: quilt/annotate:25 +msgid "" +"\n" +"Print an annotated listing of the specified file showing which\n" +"patches modify which lines.\n" +msgstr "" + +#: quilt/applied:22 msgid "Usage: quilt applied [patch]\\n" msgstr "" -#: ../quilt/applied.in:25 +#: quilt/applied:25 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" "specified patch in the file series.\n" msgstr "" -#: ../quilt/applied.in:67 +#: quilt/applied:67 msgid "Patch is not applied\\n" msgstr "" -#: ../quilt/delete.in:22 +#: quilt/delete:22 msgid "Usage: quilt delete [patch | -n]\\n" msgstr "" -#: ../quilt/delete.in:25 +#: quilt/delete:25 msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -116,30 +125,30 @@ msgid "" "\tor topmost patch.\n" msgstr "" -#: ../quilt/delete.in:88 +#: quilt/delete:88 msgid "No next patch\\n" msgstr "" -#: ../quilt/delete.in:106 +#: quilt/delete:106 msgid "Patch %s is currently applied\\n" msgstr "" -#: ../quilt/delete.in:113 +#: quilt/delete:113 msgid "Removed patch %s\\n" msgstr "" -#: ../quilt/delete.in:115 +#: quilt/delete:115 msgid "Failed to remove patch %s\\n" msgstr "" -#: ../quilt/diff.in:24 +#: quilt/diff: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 "" -#: ../quilt/diff.in:28 +#: quilt/diff:28 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -186,54 +195,54 @@ msgid "" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: ../quilt/diff.in:231 +#: quilt/diff:231 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: ../quilt/diff.in:258 +#: quilt/diff:258 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/diff.in:293 ../quilt/files.in:122 +#: quilt/diff:293 quilt/files:122 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: ../quilt/diff.in:343 ../quilt/pop.in:114 +#: quilt/diff:343 quilt/pop:114 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:367 ../quilt/pop.in:138 +#: quilt/diff:367 quilt/pop:138 msgid "Failed to patch temporary files\\n" msgstr "" -#: ../quilt/diff.in:386 +#: quilt/diff:386 msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:406 ../quilt/refresh.in:201 +#: quilt/diff:406 quilt/refresh:201 msgid "Diff failed, aborting\\n" msgstr "" -#: ../quilt/diff.in:413 +#: quilt/diff:413 msgid "More recent patches modify files in patch %s\\n" msgstr "" -#: ../quilt/edit.in:13 +#: quilt/edit:13 msgid "Usage: quilt edit file ...\\n" msgstr "" -#: ../quilt/edit.in:16 +#: quilt/edit:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" "the topmost patch.\n" msgstr "" -#: ../quilt/files.in:22 +#: quilt/files:22 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" msgstr "" -#: ../quilt/files.in:25 +#: quilt/files:25 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -251,15 +260,15 @@ msgid "" "\n" msgstr "" -#: ../quilt/files.in:76 ../quilt/files.in:96 +#: quilt/files:76 quilt/files:96 msgid "Patch %s is not in series file\\n" msgstr "" -#: ../quilt/fold.in:22 +#: quilt/fold:22 msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "" -#: ../quilt/fold.in:25 +#: quilt/fold:25 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -272,15 +281,15 @@ msgid "" "\twhen applying patchfile.\n" msgstr "" -#: ../quilt/fold.in:116 +#: quilt/fold:116 msgid "File %s may be corrupted\\n" msgstr "" -#: ../quilt/fork.in:22 +#: quilt/fork:22 msgid "Usage: quilt fork [new_name]\\n" msgstr "" -#: ../quilt/fork.in:25 +#: quilt/fork:25 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -296,25 +305,25 @@ msgid "" "patch-2.diff, patch-3.diff).\n" msgstr "" -#: ../quilt/fork.in:99 +#: quilt/fork:99 msgid "Patch %s exists already, please choose a new name\\n" msgstr "" -#: ../quilt/fork.in:111 +#: quilt/fork:111 msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: ../quilt/fork.in:117 +#: quilt/fork:117 msgid "Fork of patch %s created as %s\\n" msgstr "" -#: ../quilt/graph.in:22 +#: quilt/graph:22 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[patch]\\n" msgstr "" -#: ../quilt/graph.in:26 +#: quilt/graph:26 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -345,11 +354,11 @@ msgid "" "-T ps\tDirectly produce a PostScript output file.\n" msgstr "" -#: ../quilt/grep.in:22 +#: quilt/grep:22 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "" -#: ../quilt/grep.in:25 +#: quilt/grep:25 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -361,11 +370,45 @@ msgid "" "\tcan be passed after a second double-dash (-- --).\n" msgstr "" -#: ../quilt/import.in:22 +#: quilt/header:24 +msgid "" +"Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" +"trailing-whitespace] [patch]\\n" +msgstr "" + +#: quilt/header:28 +msgid "" +"\n" +"Print or change the header of the topmost or specified patch.\n" +"\n" +"-a, -r, -e\n" +"\tAppend to (-a) or replace (-r) the exiting patch header, or\n" +"\tedit (-e) the header in \\$EDITOR (%s). If none of these options is\n" +"\tgiven, print the patch header.\n" +"\t\n" +"--strip-diffstat\n" +"\tStrip diffstat output from the header.\n" +"\n" +"--strip-trailing-whitespace\n" +"\tStrip trailing whitespace at the end of lines of the header.\n" +"\n" +"--backup\n" +"\tCreate a backup copy of the old version of a patch as patch~.\n" +msgstr "" + +#: quilt/header:192 +msgid "Replaced header of patch %s\\n" +msgstr "" + +#: quilt/header:195 +msgid "Appended text to header of patch %s\\n" +msgstr "" + +#: quilt/import:22 msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" msgstr "" -#: ../quilt/import.in:25 +#: quilt/import:25 msgid "" "\n" "Import external patches.\n" @@ -380,54 +423,54 @@ msgid "" "-f\tOverwite/update existing patches.\n" msgstr "" -#: ../quilt/import.in:74 +#: quilt/import:74 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" -#: ../quilt/import.in:92 +#: quilt/import:92 msgid "Patch %s is applied\\n" msgstr "" -#: ../quilt/import.in:100 +#: quilt/import:100 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: ../quilt/import.in:104 +#: quilt/import:104 msgid "Replacing patch %s with new version\\n" msgstr "" -#: ../quilt/import.in:107 +#: quilt/import:107 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: ../quilt/import.in:115 +#: quilt/import:115 msgid "Failed to import patch %s\\n" msgstr "" -#: ../quilt/import.in:122 +#: quilt/import:122 msgid "Failed to insert patch %s into file series\\n" msgstr "" -#: ../quilt/mail.in:25 +#: quilt/mail:25 msgid "" "Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" "bcc ...] [--subject ...]\\n" msgstr "" -#: ../quilt/mail.in:28 +#: quilt/mail: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" -"@DOCSUBDIR@/README.MAIL for details.\n" +"/usr/share/doc/quilt-0.41/README.MAIL 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 @MTA@.\n" +"\tSend the messages directly using /usr/sbin/sendmail.\n" "\n" "--from, --subject\n" "\tThe values for the From and Subject headers to use.\n" @@ -436,45 +479,45 @@ msgid "" "\tAppend a recipient to the To, Cc, or Bcc header.\n" msgstr "" -#: ../quilt/new.in:22 +#: quilt/new:22 msgid "Usage: quilt new {patchname}\\n" msgstr "" -#: ../quilt/new.in:25 +#: quilt/new:25 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" "topmost patch in the patch series file.\n" msgstr "" -#: ../quilt/new.in:64 +#: quilt/new:64 msgid "Patch %s exists already\\n" msgstr "" -#: ../quilt/new.in:75 +#: quilt/new:75 msgid "Failed to create patch %s\\n" msgstr "" -#: ../quilt/new.in:78 +#: quilt/new:78 msgid "Patch %s is now on top\\n" msgstr "" -#: ../quilt/next.in:22 +#: quilt/next:22 msgid "Usage: quilt next [patch]\\n" msgstr "" -#: ../quilt/next.in:25 +#: quilt/next:25 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" "the series file.\n" msgstr "" -#: ../quilt/patches.in:22 +#: quilt/patches:22 msgid "Usage: quilt patches {file}\\n" msgstr "" -#: ../quilt/patches.in:25 +#: quilt/patches:25 msgid "" "\n" "Print the list of patches that modify the specified file. (Uses a\n" @@ -484,11 +527,11 @@ msgid "" "-v\tVerbose, more user friendly output.\n" msgstr "" -#: ../quilt/pop.in:22 +#: quilt/pop:22 msgid "Usage: quilt pop [-afRqv] [num|patch]\\n" msgstr "" -#: ../quilt/pop.in:25 +#: quilt/pop:25 msgid "" "\n" "Remove patch(es) from the stack of applied patches. Without options,\n" @@ -511,46 +554,46 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: ../quilt/pop.in:156 +#: quilt/pop:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: ../quilt/pop.in:181 +#: quilt/pop:181 msgid "Patch %s appears to be empty, removing\\n" msgstr "" -#: ../quilt/pop.in:185 +#: quilt/pop:185 msgid "Removing patch %s\\n" msgstr "" -#: ../quilt/pop.in:269 +#: quilt/pop:269 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: ../quilt/pop.in:279 +#: quilt/pop:279 msgid "No patch removed\\n" msgstr "" -#: ../quilt/pop.in:302 ../quilt/push.in:372 +#: quilt/pop:302 quilt/push:372 msgid "Now at patch %s\\n" msgstr "" -#: ../quilt/previous.in:22 +#: quilt/previous:22 msgid "Usage: quilt previous [patch]\\n" msgstr "" -#: ../quilt/previous.in:25 +#: quilt/previous:25 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" "patch in the series file.\n" msgstr "" -#: ../quilt/push.in:24 +#: quilt/push:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "" -#: ../quilt/push.in:27 +#: quilt/push:27 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -581,53 +624,53 @@ msgid "" " Use syntax coloring.\n" msgstr "" -#: ../quilt/push.in:64 +#: quilt/push:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: ../quilt/push.in:157 +#: quilt/push:157 msgid "Applying patch %s\\n" msgstr "" -#: ../quilt/push.in:189 +#: quilt/push:189 msgid "Patch %s does not exist, applied\\n" msgstr "" -#: ../quilt/push.in:193 +#: quilt/push:193 msgid "Patch %s appears to be empty, applied\\n" msgstr "" -#: ../quilt/push.in:197 +#: quilt/push:197 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: ../quilt/push.in:202 +#: quilt/push:202 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: ../quilt/push.in:241 +#: quilt/push:241 msgid "Patch %s not found in file series\\n" msgstr "" -#: ../quilt/push.in:329 +#: quilt/push:329 msgid "Patch %s is already applied\\n" msgstr "" -#: ../quilt/push.in:338 +#: quilt/push:338 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" -#: ../quilt/push.in:352 +#: quilt/push:352 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: ../quilt/refresh.in:22 +#: quilt/refresh:22 msgid "" "Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " "[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" msgstr "" -#: ../quilt/refresh.in:26 +#: quilt/refresh:26 msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -670,37 +713,37 @@ msgid "" "\tStrip trailing whitespace at the end of lines of the generated patch.\n" msgstr "" -#: ../quilt/refresh.in:173 +#: quilt/refresh:173 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/refresh.in:207 +#: quilt/refresh:207 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: ../quilt/refresh.in:213 +#: quilt/refresh:213 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: ../quilt/refresh.in:219 +#: quilt/refresh:219 msgid "Nothing in patch %s\\n" msgstr "" -#: ../quilt/refresh.in:296 +#: quilt/refresh:296 msgid "Patch %s is unchanged\\n" msgstr "" -#: ../quilt/refresh.in:301 +#: quilt/refresh:301 msgid "Refreshed patch %s\\n" msgstr "" -#: ../quilt/remove.in:22 +#: quilt/remove:22 msgid "Usage: quilt remove [-p patch] {file} ...\\n" msgstr "" -#: ../quilt/remove.in:25 +#: quilt/remove:25 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -710,23 +753,48 @@ msgid "" "\tPatch to remove files from.\n" msgstr "" -#: ../quilt/remove.in:91 +#: quilt/remove:91 msgid "File %s is not in patch %s\\n" msgstr "" -#: ../quilt/remove.in:109 +#: quilt/remove:109 msgid "Failed to remove file %s from patch %s\\n" msgstr "" -#: ../quilt/remove.in:123 +#: quilt/remove:123 msgid "File %s removed from patch %s\\n" msgstr "" -#: ../quilt/series.in:22 +#: quilt/rename:22 +msgid "Usage: quilt rename [-p patch] new_name\\n" +msgstr "" + +#: quilt/rename:25 +msgid "" +"\n" +"Rename the topmost or named patch.\n" +"\n" +"-p patch\n" +"\tPatch to rename.\n" +msgstr "" + +#: quilt/rename:96 +msgid "Patch %s exists already, please choose a different name\\n" +msgstr "" + +#: quilt/rename:110 +msgid "Renaming of patch %s to %s failed\\n" +msgstr "" + +#: quilt/rename:116 +msgid "Patch %s renamed to %s\\n" +msgstr "" + +#: quilt/series:22 msgid "Usage: quilt series [-v]\\n" msgstr "" -#: ../quilt/series.in:25 +#: quilt/series:25 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -734,11 +802,11 @@ msgid "" "-v\tVerbose, more user friendly output.\n" msgstr "" -#: ../quilt/setup.in:27 +#: quilt/setup:27 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n" msgstr "" -#: ../quilt/setup.in:30 +#: quilt/setup:30 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -748,31 +816,31 @@ msgid "" "-v\tverbose debug output.\n" msgstr "" -#: ../quilt/setup.in:96 +#: quilt/setup:96 msgid "Directory %s exists\\n" msgstr "" -#: ../quilt/setup.in:102 +#: quilt/setup:102 msgid "File %s exists\\n" msgstr "" -#: ../quilt/setup.in:118 +#: quilt/setup:118 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" -#: ../quilt/setup.in:121 +#: quilt/setup:121 msgid "The -v option will show rpm's output\\n" msgstr "" -#: ../quilt/setup.in:155 +#: quilt/setup:155 msgid "Unpacking archive %s\\n" msgstr "" -#: ../quilt/snapshot.in:22 +#: quilt/snapshot:22 msgid "Usage: quilt snapshot [-d]\\n" msgstr "" -#: ../quilt/snapshot.in:25 +#: quilt/snapshot:25 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -783,33 +851,33 @@ msgid "" "-d\tOnly remove current snapshot.\n" msgstr "" -#: ../quilt/top.in:22 +#: quilt/top:22 msgid "Usage: quilt top\\n" msgstr "" -#: ../quilt/top.in:25 +#: quilt/top:25 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" "patches.\n" msgstr "" -#: ../quilt/unapplied.in:22 +#: quilt/unapplied:22 msgid "Usage: quilt unapplied [patch]\\n" msgstr "" -#: ../quilt/unapplied.in:25 +#: quilt/unapplied:25 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" "the specified patch in the series file.\n" msgstr "" -#: ../quilt/upgrade.in:25 +#: quilt/upgrade:25 msgid "Usage: quilt upgrade\\n" msgstr "" -#: ../quilt/upgrade.in:28 +#: quilt/upgrade:28 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -820,21 +888,21 @@ msgid "" "case, quilt will request to run \\`quilt upgrade'.\n" msgstr "" -#: ../quilt/upgrade.in:67 +#: quilt/upgrade:67 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" msgstr "" -#: ../quilt/upgrade.in:71 +#: quilt/upgrade:71 msgid "Converting meta-data to version %s\\n" msgstr "" -#: ../quilt/upgrade.in:102 +#: quilt/upgrade:102 msgid "Conversion failed\\n" msgstr "" -#: ../quilt/upgrade.in:103 +#: quilt/upgrade:103 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " @@ -842,7 +910,42 @@ msgid "" "patches from scratch.\\n" msgstr "" -#: ../scripts/patchfns.in:751 +#: scripts/edmail:64 +#, perl-format +msgid "Display name '%s' contains unpaired parentheses\n" +msgstr "" + +#: scripts/edmail:68 +#, perl-format +msgid "Display name '%s' contains invalid characters\n" +msgstr "" + +#: scripts/edmail:72 +#, perl-format +msgid "Display name '%s' contains non-printable or 8-bit characters\n" +msgstr "" + +#: scripts/edmail:78 +#, perl-format +msgid "Delivery address '%s' is invalid\n" +msgstr "" + +#: scripts/parse-patch:33 +#, perl-format +msgid "USAGE: %s {-s|-u} section file [< replacement]\n" +msgstr "" + +#: scripts/parse-patch:80 scripts/parse-patch:87 +#, perl-format +msgid "File %s disappeared!\n" +msgstr "" + +#: scripts/parse-patch:133 scripts/parse-patch:139 +#, perl-format +msgid "Failed to rename %s to %s: %s\n" +msgstr "" + +#: scripts/patchfns: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 " @@ -850,8 +953,43 @@ msgid "" "downgrading.\\n" msgstr "" -#: ../scripts/patchfns.in:828 +#: scripts/patchfns:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" msgstr "" + +#: scripts/remove-trailing-ws:26 +#, perl-format +msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" +msgstr "" + +#: scripts/remove-trailing-ws:48 scripts/remove-trailing-ws:75 +#, perl-format +msgid "%s: I'm confused.\n" +msgstr "" + +#: scripts/remove-trailing-ws:96 +#, perl-format +msgid "Warning: trailing whitespace in line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:99 +#, perl-format +msgid "Warning: trailing whitespace in lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:103 +#, perl-format +msgid "Removing trailing whitespace from line %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:106 +#, perl-format +msgid "Removing trailing whitespace from lines %s of %s\n" +msgstr "" + +#: scripts/remove-trailing-ws:126 +#, perl-format +msgid "Renaming %s to %s: %s\n" +msgstr "" diff --git a/quilt.changes b/quilt.changes index 2392b52..502eab8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jul 19 00:15:16 CEST 2005 - agruen@suse.de + +- Add internationalization support to Perl scripts as well. + +------------------------------------------------------------------- Mon Jul 18 19:28:18 CEST 2005 - khali@linux-fr.org - French translation unfuzzying. diff --git a/quilt/patches.in b/quilt/patches.in index 1ecc77a..1c1b18c 100644 --- a/quilt/patches.in +++ b/quilt/patches.in @@ -50,6 +50,21 @@ scan_applied() done } +touched_by_patch() +{ + local strip=$1 patch=$2 + cat_file $(patch_file_name $patch) \ + | @AWK@ ' + /^\+\+\+[ \t]/ { + sub(/^\+\+\+[ \t]/, "") + sub(/[ \t].*/, "") + sub(/^\/dev\/null/, "") + for (i=0; i<'$strip'; i++) + sub(/^[^\/]*\//, "") + print + }' +} + scan_unapplied() { local prefix=$1 file=$2 diff --git a/scripts/edmail.in b/scripts/edmail.in index 9f1e8f3..24834c9 100644 --- a/scripts/edmail.in +++ b/scripts/edmail.in @@ -1,8 +1,18 @@ #! @PERL@ -w use Getopt::Long; +use POSIX qw(setlocale); +use Locale::gettext; use strict; +setlocale(LC_MESSAGES, ""); +bindtextdomain("quilt", "@LOCALEDIR@"); +textdomain("quilt"); + +sub _($) { + return gettext(shift); +} + my (%append_name, %append_value, $remove_empty_headers, %remove_header, %extract_recipients, %replace_name, %replace_value, $charset); GetOptions('add-recipient:s%' => @@ -50,19 +60,22 @@ sub check_recipient($) { } else { # The value is not (properly) quoted. Check for invalid characters. while (/\(/ or /\)/) { - die "Display name '$display' contains unpaired parentheses\n" + die sprintf( +_("Display name '%s' contains unpaired parentheses\n"), $display) unless s/\(([^()]*)\)/$1/; } - die "Display name '$display' contains invalid characters\n" + die sprintf( +_("Display name '%s' contains invalid characters\n"), $display) if /[$spldot]/; } - die "Display name '$display' contains non-printable or " . - "8-bit characters\n" if (/[^ \t\40-\176]/); + die sprintf( +_("Display name '%s' contains non-printable or 8-bit characters\n"), $display) + if (/[^ \t\40-\176]/); } else { $deliver = $_; } # Check for a valid delivery address - die "Delivery address '$deliver' is invalid\n" + die sprintf(_("Delivery address '%s' is invalid\n"), $display) if $deliver =~ /[ \t]/ or $deliver =~ /[^ \t\40-\176]/ or $deliver !~ /^[^$spl]+@(\[?)[^$spldot]+(?:\.[^$spldot]+)*(\]?)$/ or (!$1) != (!$2); diff --git a/scripts/parse-patch.in b/scripts/parse-patch.in index 56c3c55..6441b82 100644 --- a/scripts/parse-patch.in +++ b/scripts/parse-patch.in @@ -12,15 +12,25 @@ use FileHandle; use Getopt::Long; use File::Temp qw(tempfile); +use POSIX qw(setlocale); +use Locale::gettext; use strict; +setlocale(LC_MESSAGES, ""); +bindtextdomain("quilt", "@LOCALEDIR@"); +textdomain("quilt"); + +sub _($) { + return gettext(shift); +} + my $select; my $update; if (!GetOptions("s|select=s" => \$select, "u|update=s" => \$update) || (!defined $select && !defined $update)) { - print STDERR "USAGE: $0 {-s|-u} section file [< replacement]\n"; + print STDERR sprintf(_("USAGE: %s {-s|-u} section file [< replacement]\n"), $0); exit 1; } @@ -66,13 +76,15 @@ foreach my $arg (@ARGV) { if ($arg =~ /\.gz$/) { $fh2->close(); if (! -e $tempname) { - die "File $tempname disappeared!\n"; + die sprintf( +_("File %s disappeared!\n"), $tempname); } $fh2 = new FileHandle("| gzip -c > $tempname"); } elsif ($arg =~ /\.bz2$/) { $fh2->close(); if (! -e $tempname) { - die "File $tempname disappeared!\n"; + die sprintf( +_("File %s disappeared!\n"), $tempname); } $fh2 = new FileHandle("| bzip2 -c > $tempname"); } @@ -117,12 +129,14 @@ foreach my $arg (@ARGV) { if (-e $arg) { unlink "$arg~"; unless (rename $arg, "$arg~") { - die "Failed to rename $arg to $arg~: $!\n"; + die sprintf( +_("Failed to rename %s to %s: %s\n"), $arg, "$arg~", $!); } } unless (rename $tempname, $arg) { rename("$arg~", $arg); - die "Failed to rename $arg.parse to $arg: $!\n"; + die sprintf( +_("Failed to rename %s to %s: %s\n"), $tempname, $arg, $!); } } close $fh; diff --git a/scripts/patchfns.in b/scripts/patchfns.in index a70cfed..0738a1b 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -1,3 +1,5 @@ +#! @BASH@ + # This file contains the common functions used in all quilt script # It is meant to be sourced by bash scripts. @@ -313,12 +315,6 @@ is_numeric() echo $1 | grep -q '^[0-9]*$' } -is_applied_last() -{ - local patch=$1 - [ "$(top_patch)" == $patch ] -} - is_applied() { local patch=$1 @@ -521,21 +517,6 @@ files_in_patch_ordered() ' } -touched_by_patch() -{ - local strip=$1 patch=$2 - cat_file $(patch_file_name $patch) \ - | @AWK@ ' - /^\+\+\+[ \t]/ { - sub(/^\+\+\+[ \t]/, "") - sub(/[ \t].*/, "") - sub(/^\/dev\/null/, "") - for (i=0; i<'$strip'; i++) - sub(/^[^\/]*\//, "") - print - }' -} - diff_file() { local file=$1 old_file=$2 new_file=$3 diff --git a/scripts/remove-trailing-ws.in b/scripts/remove-trailing-ws.in index f14de5d..dfda46b 100644 --- a/scripts/remove-trailing-ws.in +++ b/scripts/remove-trailing-ws.in @@ -8,12 +8,22 @@ use strict; use FileHandle; use File::Temp qw( :mktemp ); +use POSIX qw(setlocale); +use Locale::gettext; use Getopt::Std; use vars qw($opt_p $opt_n); +setlocale(LC_MESSAGES, ""); +bindtextdomain("quilt", "@LOCALEDIR@"); +textdomain("quilt"); + +sub _($) { + return gettext(shift); +} + $opt_p = 0; getopts('np:') - or die "SYNOPSIS: $0 [-p num] [-n] [patch]\n"; + or die sprintf(_("SYNOPSIS: %s [-p num] [-n] [patch]\n"), $0); my %files; my $file; @@ -35,7 +45,7 @@ while (<>) { while ($removed || $added) { $_ = <>; defined $_ - or die "$0: I'm confused.\n"; + or die sprintf(_("%s: I'm confused.\n"), $0); if (/^\+/) { push @{$files{$file}}, $line_number if s/(^\+.*?)[ \t]+$/$1/; @@ -62,7 +72,7 @@ while (<>) { while ($line_number <= $last_line) { $_ = <>; defined $_ - or die "$0: I'm confused.\n"; + or die sprintf(_("%s: I'm confused.\n"), $0); if (s/(^[+!] .*?)[ \t]+$/$1/) { push @{$files{$file}}, $line_number; } @@ -82,18 +92,26 @@ while (<>) { foreach my $file (keys %files) { my @lines = @{$files{$file}}; if ($opt_n) { - print STDERR "Warning: trailing whitespace in line"; + print STDERR sprintf( +_("Warning: trailing whitespace in line %s of %s\n"), $lines[0], $file) + if @lines == 1; + print STDERR sprintf( +_("Warning: trailing whitespace in lines %s of %s\n"), join(',', @lines), $file) + if @lines > 1; } else { - print STDERR "Removing trailing whitespace from line"; + print STDERR sprintf( +_("Removing trailing whitespace from line %s of %s\n"), $lines[0], $file) + if @lines == 1; + print STDERR sprintf( +_("Removing trailing whitespace from lines %s of %s\n"), join(',', @lines), $file) + if @lines > 1; } - print STDERR "s" if @lines > 1; - print STDERR " " . join(',', @lines) . " of $file\n"; unless ($opt_n) { my $fh = new FileHandle("< $file") or die "$file: $!\n"; my ($tmp, $tmpname) = mkstemp("$file.XXXXXX") - or die "$file.XXXXXX: $!\n"; + or die "$file.*: $!\n"; while (<$fh>) { if (@lines && $lines[0] == $.) { s/[ \t]+$//; @@ -105,8 +123,6 @@ foreach my $file (keys %files) { $tmp->close or die "$tmpname: $!\n"; rename $tmpname, $file - or die "Renaming $tmpname to $file: $!\n"; + or die sprintf(_("Renaming %s to %s: %s\n"), $tmpname, $file, $!); } } - -#exit (%files ? 1 : 0); |