diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/de.po | 359 | ||||
| -rw-r--r-- | po/fr.po | 359 | ||||
| -rw-r--r-- | po/ja.po | 359 | ||||
| -rw-r--r-- | po/quilt.pot | 358 | ||||
| -rw-r--r-- | po/ru.po | 359 |
5 files changed, 929 insertions, 865 deletions
@@ -64,11 +64,11 @@ msgstr "" "--version\n" "\tGibt die Versionsummer aus.\\n" -#: quilt/add.in:22 +#: quilt/add.in:11 msgid "Usage: quilt add [-P patch] {file} ...\\n" msgstr "Aufruf: quilt add [-P patch] {datei} ...\\n" -#: quilt/add.in:25 +#: quilt/add.in:14 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -87,35 +87,35 @@ msgstr "" "-P patch\n" "\tPatch, zu dem die Dateien hinzugefügt werden sollen.\n" -#: quilt/add.in:48 quilt/add.in:54 +#: quilt/add.in:37 quilt/add.in:43 msgid "File %s is located below %s\\n" msgstr "Die Datei %s befindet sich unterhalb des Verzeichnisses %s\\n" -#: quilt/add.in:103 +#: quilt/add.in:100 msgid "File %s is already in patch %s\\n" msgstr "Datei %s ist bereits in Patch %s\\n" -#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84 +#: quilt/add.in:108 quilt/remove.in:79 quilt/revert.in:81 msgid "File %s modified by patch %s\\n" msgstr "Datei %s wird von Patch %s verändert\\n" -#: quilt/add.in:119 +#: quilt/add.in:116 msgid "Cannot add symbolic link %s\\n" msgstr "Symbolische Verknüpfung %s kann nicht hinzufügt werden\\n" -#: quilt/add.in:126 +#: quilt/add.in:123 msgid "Failed to back up file %s\\n" msgstr "Datei %s konnte nicht gesichert werden\\n" -#: quilt/add.in:137 +#: quilt/add.in:134 msgid "File %s added to patch %s\\n" msgstr "Datei %s zu Patch %s hinzugefügt\\n" -#: quilt/annotate.in:22 +#: quilt/annotate.in:11 msgid "Usage: quilt annotate [-P patch] {file}\\n" msgstr "Aufruf: quilt annotate [-P patch] {datei}\\n" -#: quilt/annotate.in:25 +#: quilt/annotate.in:14 msgid "" "\n" "Print an annotated listing of the specified file showing which\n" @@ -134,11 +134,11 @@ msgstr "" "\tNur bis zum angegebenen Patch statt bis zum obersten Patch\n" "\tnach Änderungen suchen.\n" -#: quilt/applied.in:22 +#: quilt/applied.in:11 msgid "Usage: quilt applied [patch]\\n" msgstr "Aufruf: quilt applied [patch]\\n" -#: quilt/applied.in:25 +#: quilt/applied.in:14 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" @@ -148,11 +148,11 @@ msgstr "" "Gibt eine Liste der angewandten Patches aus, oder eine Liste aller\n" "Patches vom Anfang der series-Datei bis zum angegebenen Patch.\n" -#: quilt/delete.in:22 +#: quilt/delete.in:11 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "Aufruf: quilt delete [-r] [--backup] [patch|-n]\\n" -#: quilt/delete.in:25 +#: quilt/delete.in:14 msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -182,31 +182,31 @@ msgstr "" "\tDen Patch in patch~ umbenennen, statt ihn zu löschen.\n" "\tHat nur in Kompination mit -r eine Wirkung.\n" -#: quilt/delete.in:89 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "Kein folgender Patch\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:618 +#: quilt/delete.in:99 quilt/scripts/patchfns.in:602 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" -#: quilt/delete.in:114 +#: quilt/delete.in:111 msgid "Removed patch %s\\n" msgstr "Entfernen von Patch %s\\n" -#: quilt/delete.in:116 +#: quilt/delete.in:113 msgid "Failed to remove patch %s\\n" msgstr "Patch %s konnte nicht entfernt werden\\n" -#: quilt/delete.in:127 +#: quilt/delete.in:124 msgid "Failed to backup patch file %s\\n" msgstr "Datei %s konnte nicht gesichert werden\\n" -#: quilt/delete.in:134 +#: quilt/delete.in:131 msgid "Failed to remove patch file %s\\n" msgstr "Patchdatei %s konnte nicht entfernt werden\\n" -#: quilt/diff.in:24 +#: quilt/diff.in:11 msgid "" "Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " @@ -216,7 +216,7 @@ msgstr "" "R] [-P patch] [--snapshot] [--diff=programm] [--no-timestamps] [--no-index] " "[--sort] [--color[=always|auto|never]] [datei ...]\\n" -#: quilt/diff.in:28 +#: quilt/diff.in:15 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -319,45 +319,45 @@ msgstr "" "--sort\tDateien im Patch nach ihren Namen sortieren, statt die\n" "\tursprüngliche Reihenfolge beizubehalten.\n" -#: quilt/diff.in:226 +#: quilt/diff.in:221 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`--combine', \\`--snapshot' und \\`-z' können nicht " "kombiniert werden.\\n" -#: quilt/diff.in:240 +#: quilt/diff.in:235 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "Es kann kein Diff mit -p%s erzeugt werden, bitte -p0, -p1 oder -pab " "verwenden.\\n" -#: quilt/diff.in:249 +#: quilt/diff.in:244 msgid "No snapshot to diff against\\n" msgstr "Kein Snapshot, um ein Diff zu erzeugen\\n" -#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:432 +#: quilt/diff.in:278 quilt/files.in:107 quilt/mail.in:429 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:351 +#: quilt/diff.in:346 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert\\n" -#: quilt/diff.in:370 +#: quilt/diff.in:365 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:377 +#: quilt/diff.in:372 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" -#: quilt/edit.in:24 +#: quilt/edit.in:13 msgid "Usage: quilt edit file ...\\n" msgstr "Aufruf: quilt edit datei ...\\n" -#: quilt/edit.in:27 +#: quilt/edit.in:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -367,11 +367,11 @@ msgstr "" "Die angegebene(n) Datei(en) dem obersten Patch hinzufügen und dann im\n" "\\$EDITOR (%s) editieren.\n" -#: quilt/files.in:22 +#: quilt/files.in:11 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" msgstr "Aufruf: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" -#: quilt/files.in:25 +#: quilt/files.in:14 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -404,11 +404,11 @@ msgstr "" "\tentspricht dem ersten angewandten Patch.\n" "\n" -#: quilt/fold.in:22 +#: quilt/fold.in:11 msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" msgstr "Aufruf: quilt fold [-R] [-q] [-f] [-p strip-ebenen]\\n" -#: quilt/fold.in:25 +#: quilt/fold.in:14 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -445,15 +445,15 @@ msgstr "" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" "\tentfernt werden sollen.\n" -#: quilt/fold.in:131 +#: quilt/fold.in:128 msgid "File %s may be corrupted\\n" msgstr "Datei %s ist möglicherweise defekt\\n" -#: quilt/fork.in:22 +#: quilt/fork.in:11 msgid "Usage: quilt fork [new_name]\\n" msgstr "Aufruf: quilt fork [neuer_name]\\n" -#: quilt/fork.in:25 +#: quilt/fork.in:14 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -480,19 +480,19 @@ msgstr "" "gefolgt von \\`-2'. Falls der Name bereits auf Bindestrich+Zahl endet,\n" "wird die Zahl erhöht (z.B. patch.diff, patch-2.diff, patch-3.diff).\n" -#: quilt/fork.in:84 +#: quilt/fork.in:81 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:96 +#: quilt/fork.in:93 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Fehler beim Aufspalten von %s nach %s\\n" -#: quilt/fork.in:102 quilt/refresh.in:344 +#: quilt/fork.in:99 quilt/refresh.in:341 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" -#: quilt/graph.in:22 +#: quilt/graph.in:11 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [patch]\\n" @@ -500,7 +500,7 @@ msgstr "" "Aufruf: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [patch]\\n" -#: quilt/graph.in:26 +#: quilt/graph.in:15 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -556,11 +556,11 @@ msgstr "" "\n" "-T ps\tDirekt eine PostScript-Datei erzeugen.\n" -#: quilt/grep.in:22 +#: quilt/grep.in:11 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "Aufruf: quilt grep [-h|options] {suchausdruck}\\n" -#: quilt/grep.in:25 +#: quilt/grep.in:14 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -582,7 +582,7 @@ msgstr "" "\teinem Strich beginnen, können nach einem weiteren Doppel-Bindestrich\n" "\tangegeben werden.\n" -#: quilt/header.in:24 +#: quilt/header.in:13 msgid "" "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" @@ -590,7 +590,7 @@ msgstr "" "Aufruf: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" -#: quilt/header.in:28 +#: quilt/header.in:17 msgid "" "\n" "Print or change the header of the topmost or specified patch.\n" @@ -627,15 +627,15 @@ msgstr "" "--backup\n" "\tErzeugen einer Sicherungskopie von patch als patch~.\n" -#: quilt/header.in:170 +#: quilt/header.in:167 msgid "Replaced header of patch %s\\n" msgstr "Header von Patch %s ersetzt\\n" -#: quilt/header.in:173 +#: quilt/header.in:170 msgid "Appended text to header of patch %s\\n" msgstr "Text an Header von Patch %s angefügt\\n" -#: quilt/import.in:22 +#: quilt/import.in:14 msgid "" "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..." "\\n" @@ -643,7 +643,7 @@ msgstr "" "Aufruf: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] " "[patchdatei] ...\\n" -#: quilt/import.in:25 +#: quilt/import.in:17 msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -689,59 +689,59 @@ msgstr "" "\tdiese Option angegeben werden. Diese Option ist nur in Kombination mit\n" "\t-f wirksam.\n" -#: quilt/import.in:73 quilt/mail.in:463 +#: quilt/import.in:65 quilt/mail.in:460 msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/import.in:96 +#: quilt/import.in:88 msgid "Patch headers differ:\\n" msgstr "Die Patchheader unterscheiden sich:\\n" -#: quilt/import.in:99 +#: quilt/import.in:91 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "Bitte verwenden Sie die Option -d {o|a|n}, um anzugeben, welche Patchheader " "erhalten bleiben sollen.\\n" -#: quilt/import.in:164 +#: quilt/import.in:156 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" "Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches " "verwendet werden\\n" -#: quilt/import.in:194 +#: quilt/import.in:195 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:203 +#: quilt/import.in:204 msgid "Patch %s already exists in series.\\n" msgstr "Patch %s existiert bereits in der series-Datei.\\n" -#: quilt/import.in:209 +#: quilt/import.in:210 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:220 +#: quilt/import.in:221 msgid "Replacing patch %s with new version\\n" msgstr "Ersetzen von Patch %s durch neuere Version\\n" -#: quilt/import.in:224 +#: quilt/import.in:225 msgid "Importing patch %s\\n" msgstr "Importieren von Patch %s\\n" -#: quilt/import.in:226 +#: quilt/import.in:227 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importieren von Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:239 +#: quilt/import.in:240 msgid "Failed to import patch %s\\n" msgstr "Patch %s konnte nicht importiert werden\\n" -#: quilt/import.in:248 quilt/refresh.in:331 +#: quilt/import.in:249 quilt/refresh.in:328 msgid "Failed to insert patch %s into file series\\n" msgstr "Patch %s konnte nicht in die series-Datei eingefügt werden\\n" -#: quilt/mail.in:24 +#: quilt/mail.in:13 msgid "" "Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] " "[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--" @@ -753,7 +753,7 @@ msgstr "" "subject ...] [--reply-to message] [--charset ...] [--signature datei] " "[first_patch [last_patch]]\\n" -#: quilt/mail.in:27 +#: quilt/mail.in:16 msgid "" "\n" "Create mail messages from a specified range of patches, or all patches in\n" @@ -857,45 +857,45 @@ msgstr "" "\tDie entsprechenden Header hinzufügen, um auf die angegebene\n" "\tNachricht zu antworten.\n" -#: quilt/mail.in:209 quilt/mail.in:217 +#: quilt/mail.in:198 quilt/mail.in:206 msgid "Introduction message already specified" msgstr "Einleitungstext bereits angegeben" -#: quilt/mail.in:315 +#: quilt/mail.in:312 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "Die Envelope-Adresse konnte nicht festgestellt werden. Bitte verwenden Sie --" "sender." -#: quilt/mail.in:466 +#: quilt/mail.in:463 msgid "Unable to extract a subject header from %s\\n" msgstr "Es konnte keine Subject-Kopfzeile aus %s extrahiert werden\\n" -#: quilt/mail.in:492 +#: quilt/mail.in:489 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben dieselben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:501 +#: quilt/mail.in:498 msgid "File %s does not exist\\n" msgstr "Datei %s existiert nicht\\n" -#: quilt/mail.in:561 +#: quilt/mail.in:558 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:564 +#: quilt/mail.in:561 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:677 +#: quilt/mail.in:674 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" -#: quilt/new.in:22 +#: quilt/new.in:14 msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n" msgstr "Aufruf: quilt new [-p n|-p ab] {patchname}\\n" -#: quilt/new.in:25 +#: quilt/new.in:17 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -934,7 +934,7 @@ msgstr "" "%s-Verzeichnis im vorgesehenen Wurzelverzeichnis, falls Quilt ein\n" "Verzeichnis zu weit oben im Verzeichnisbaum verwendet.\n" -#: quilt/new.in:76 +#: quilt/new.in:68 msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "" @@ -945,7 +945,7 @@ msgstr "" msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n" msgstr "QUILT_PATCHES(%s) muss sich von QUILT_PC(%s) unterscheiden\\n" -#: quilt/new.in:97 quilt/refresh.in:185 +#: quilt/new.in:97 quilt/refresh.in:182 msgid "Patch %s exists already\\n" msgstr "Patch %s existiert bereits\\n" @@ -953,15 +953,15 @@ msgstr "Patch %s existiert bereits\\n" msgid "Patch %s is now on top\\n" msgstr "Der oberste Patch ist jetzt %s\\n" -#: quilt/new.in:110 quilt/refresh.in:340 +#: quilt/new.in:110 quilt/refresh.in:337 msgid "Failed to create patch %s\\n" msgstr "Patch %s konnte nicht erzeugt werden\\n" -#: quilt/next.in:22 +#: quilt/next.in:11 msgid "Usage: quilt next [patch]\\n" msgstr "Aufruf: quilt next [patch]\\n" -#: quilt/next.in:25 +#: quilt/next.in:14 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" @@ -971,14 +971,14 @@ msgstr "" "Gibt den Namen des nächsten Patches nach dem obersten oder angegebenen\n" "Patch in der series-Datei aus.\n" -#: quilt/patches.in:24 +#: quilt/patches.in:13 msgid "" "Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "" "Aufruf: quilt patches [-v] [--color[=always|auto|never]] {datei} " "[dateien...]\\n" -#: quilt/patches.in:27 +#: quilt/patches.in:16 msgid "" "\n" "Print the list of patches that modify any of the specified files. (Uses a\n" @@ -1002,11 +1002,11 @@ msgstr "" "\tSyntaxeinfärbung verwenden (wird bei auto nur aktiviert, wenn Ausgabe\n" "\tauf tty).\n" -#: quilt/pop.in:22 +#: quilt/pop.in:11 msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n" msgstr "Aufruf: quilt pop [-afRqv] [--refresh] [num|patch]\\nn" -#: quilt/pop.in:25 +#: quilt/pop.in:14 msgid "" "\n" "Remove patch(es) from the stack of applied patches. Without options,\n" @@ -1055,49 +1055,53 @@ msgstr "" "\tJeden Patch automatisch neu erzeugen, bevor seine Anwendung rückgängig\n" "gemacht wird.\n" -#: quilt/pop.in:103 quilt/scripts/patchfns.in:930 +#: quilt/pop.in:92 quilt/scripts/patchfns.in:977 msgid "Failed to copy files to temporary directory\\n" msgstr "Dateien konnten nicht in temporäres Verzeichnis kopiert werden\\n" -#: quilt/pop.in:128 +#: quilt/pop.in:117 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Patch %s kann nicht entfernt werden (Patch aktualisieren oder das Entfernen " "mit -f erzwingen)\\n" -#: quilt/pop.in:153 +#: quilt/pop.in:119 +msgid "Hint: \\`quilt diff -z' will show the pending changes.\\n" +msgstr "" + +#: quilt/pop.in:143 msgid "Patch %s appears to be empty, removing\\n" msgstr "Patch %s scheint leer zu sein; wird entfernt\\n" -#: quilt/pop.in:158 +#: quilt/pop.in:148 msgid "Removing patch %s\\n" msgstr "Entfernen von Patch %s\\n" -#: quilt/pop.in:216 quilt/push.in:376 +#: quilt/pop.in:214 quilt/push.in:376 msgid "Options %s and %s are mutually exclusive\\n" msgstr "Optionen %s und %s können nicht kombiniert werden\\n" -#: quilt/pop.in:238 +#: quilt/pop.in:236 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aktualisiert werden (refresh).\\n" -#: quilt/pop.in:248 +#: quilt/pop.in:246 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:272 quilt/scripts/patchfns.in:527 +#: quilt/pop.in:270 quilt/scripts/patchfns.in:511 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" -#: quilt/pop.in:279 quilt/push.in:440 +#: quilt/pop.in:277 quilt/push.in:440 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" -#: quilt/previous.in:22 +#: quilt/previous.in:11 msgid "Usage: quilt previous [patch]\\n" msgstr "Aufruf: quilt previous [patch]\\n" -#: quilt/previous.in:25 +#: quilt/previous.in:14 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" @@ -1107,7 +1111,7 @@ msgstr "" "Den Namen des Patches vor dem obersten oder angegebenen Patch in\n" "der series-Datei ausgeben.\n" -#: quilt/push.in:24 +#: quilt/push.in:11 msgid "" "Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" @@ -1115,7 +1119,7 @@ msgstr "" "Aufruf: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" -#: quilt/push.in:27 +#: quilt/push.in:14 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -1184,35 +1188,35 @@ msgstr "" "--refresh\n" "\tJeden Patch automatisch neu erzeugen, nachdem er angewandt wurde.\n" -#: quilt/push.in:70 +#: quilt/push.in:57 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: quilt/push.in:186 +#: quilt/push.in:176 msgid "Applying patch %s\\n" msgstr "Anwenden von Patch %s\\n" -#: quilt/push.in:220 +#: quilt/push.in:210 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Patch %s existiert nicht; leerer Patch wird angewandt\\n" -#: quilt/push.in:224 +#: quilt/push.in:214 msgid "Patch %s appears to be empty; applied\\n" msgstr "Patch %s scheint leer zu sein; angewandt\\n" -#: quilt/push.in:228 +#: quilt/push.in:218 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (refresh))\\n" -#: quilt/push.in:238 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "Patch %s kann umgekehrt angewandt werden\\n" -#: quilt/push.in:241 +#: quilt/push.in:231 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:296 +#: quilt/push.in:286 msgid "Patch %s is already applied; check your series file\\n" msgstr "Patch %s wurde bereits angewandt; überprüfen Sie Ihre series-Datei\\n" @@ -1224,7 +1228,7 @@ msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (refresh).\\n" msgid "No patch applied\\n" msgstr "Kein Patch angewandt\\n" -#: quilt/refresh.in:22 +#: quilt/refresh.in:11 msgid "" "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] " "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" @@ -1234,7 +1238,7 @@ msgstr "" "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" "trailing-whitespace] [patch]\\n" -#: quilt/refresh.in:26 +#: quilt/refresh.in:15 msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1339,25 +1343,25 @@ msgstr "" "--strip-trailing-whitespace\n" "\tWhitespace-Zeichen an Zeilenenden entfernen.\n" -#: quilt/refresh.in:171 +#: quilt/refresh.in:168 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "Nur der oberste Patch kann mit -z aktualisiert werden\\n" -#: quilt/refresh.in:202 +#: quilt/refresh.in:199 msgid "" "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "Patches mit Level -p%s können nicht aktualisiert werden, bitte -p0, -p1 oder " "-pab angeben\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:237 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von %s. Aktualisieren mit -f " "erzwingen.\\n" -#: quilt/refresh.in:246 +#: quilt/refresh.in:243 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" @@ -1365,23 +1369,23 @@ msgstr "" "Dateien enthalten, welche danach von anderen Patches weiter verändert werden." "\\n" -#: quilt/refresh.in:252 quilt/refresh.in:352 +#: quilt/refresh.in:249 quilt/refresh.in:349 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:321 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:347 msgid "Refreshed patch %s\\n" msgstr "Patch %s aktualisiert\\n" -#: quilt/remove.in:22 +#: quilt/remove.in:11 msgid "Usage: quilt remove [-P patch] {file} ...\\n" msgstr "Aufruf: quilt remove [-P patch] {datei} ...\\n" -#: quilt/remove.in:25 +#: quilt/remove.in:14 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -1398,23 +1402,23 @@ msgstr "" "-P patch\n" "\tAngegebene Dateien aus dem genannten Patch entfernen.\n" -#: quilt/remove.in:73 quilt/revert.in:75 +#: quilt/remove.in:70 quilt/revert.in:72 msgid "File %s is not in patch %s\\n" msgstr "Datei %s ist nicht in Patch %s\\n" -#: quilt/remove.in:91 +#: quilt/remove.in:88 msgid "Failed to remove file %s from patch %s\\n" msgstr "Datei %s konnte nicht aus Patch %s entfernt werden\\n" -#: quilt/remove.in:105 +#: quilt/remove.in:102 msgid "File %s removed from patch %s\\n" msgstr "Datei %s aus Patch %s entfernt\\n" -#: quilt/rename.in:22 +#: quilt/rename.in:11 msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "Aufruf: quilt rename [-P patch] neuer_name\\n" -#: quilt/rename.in:25 +#: quilt/rename.in:14 msgid "" "\n" "Rename the topmost or named patch.\n" @@ -1428,23 +1432,23 @@ msgstr "" "-P patch\n" "\tPatch, der umbenannt werden soll.\n" -#: quilt/rename.in:84 +#: quilt/rename.in:81 msgid "Patch %s exists already, please choose a different name\\n" msgstr "Patch %s existiert bereits, bitte einen anderen Namen wählen\\n" -#: quilt/rename.in:98 +#: quilt/rename.in:95 msgid "Renaming of patch %s to %s failed\\n" msgstr "Fehler beim Umbenennen von Patch %s in %s\\n" -#: quilt/rename.in:104 +#: quilt/rename.in:101 msgid "Patch %s renamed to %s\\n" msgstr "Patch %s umbenannt in %s\\n" -#: quilt/revert.in:22 +#: quilt/revert.in:11 msgid "Usage: quilt revert [-P patch] {file} ...\\n" msgstr "Aufruf: quilt revert [-P patch] {datei} ...\\n" -#: quilt/revert.in:25 +#: quilt/revert.in:14 msgid "" "\n" "Revert uncommitted changes to the topmost or named patch for the specified\n" @@ -1467,15 +1471,15 @@ msgstr "" "-P patch\n" "\tÄnderungen in dem angegebenen Patch zurücknehmen.\n" -#: quilt/revert.in:103 quilt/revert.in:112 +#: quilt/revert.in:100 quilt/revert.in:109 msgid "File %s is unchanged\\n" msgstr "Datei %s ist unverändert\\n" -#: quilt/revert.in:120 +#: quilt/revert.in:117 msgid "Failed to revert changes to %s in patch %s\\n" msgstr "Änderungen an %s in Patch %s konnten nicht zurückgenommen werden\\n" -#: quilt/revert.in:124 +#: quilt/revert.in:121 msgid "Changes to %s in patch %s reverted\\n" msgstr "Änderungen an %s in Patch %s zurückgenommen\\n" @@ -1489,39 +1493,35 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n" msgid "Delivery address `%s' is invalid\n" msgstr "Zustelladresse `%s' ist ungültig\n" -#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:237 quilt/scripts/patchfns.in:524 msgid "%s is not a regular file\\n" msgstr "%s ist keine reguläre Datei\\n" -#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:486 quilt/scripts/patchfns.in:498 msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513 -msgid "No series file found\\n" -msgstr "Keine series-Datei gefunden\\n" - -#: quilt/scripts/patchfns.in:569 +#: quilt/scripts/patchfns.in:553 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:597 +#: quilt/scripts/patchfns.in:581 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:634 +#: quilt/scripts/patchfns.in:618 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" -#: quilt/scripts/patchfns.in:779 +#: quilt/scripts/patchfns.in:774 msgid "Diff failed on file '%s', aborting\\n" msgstr "Diff gegen Datei '%s' fehlgeschlagen, Abbruch.\\n" -#: quilt/scripts/patchfns.in:948 +#: quilt/scripts/patchfns.in:995 msgid "Failed to patch temporary files\\n" msgstr "Patch konnte nicht auf temporäre Dateien angewandt werden\\n" -#: quilt/scripts/patchfns.in:991 +#: quilt/scripts/patchfns.in:1038 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1534,17 +1534,17 @@ msgstr "" "der Version von quilt, die zur Erstellung des Arbeitsverzeichnisses " "verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:1064 +#: quilt/scripts/patchfns.in:1113 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n" msgstr "" "Sie müssen '%s' (aus dem Paket %s) installieren, um 'quilt %s' nutzen zu " "können\\n" -#: quilt/scripts/patchfns.in:1143 +#: quilt/scripts/patchfns.in:1192 msgid "Cannot change into parent directory %s/\\n" msgstr "Wechsel in übergeordnetes Verzeichnis %s/ nicht möglich\\n" -#: quilt/scripts/patchfns.in:1184 +#: quilt/scripts/patchfns.in:1237 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1552,7 +1552,7 @@ msgstr "" "Das Arbeitsverzeichnis wurde von einer älteren quilt-Version erstellt. Bitte " "führen Sie \\`quilt upgrade' aus.\\n" -#: quilt/scripts/patchfns.in:1192 +#: quilt/scripts/patchfns.in:1245 msgid "" "The series file no longer matches the applied patches. Please run 'quilt pop " "-a'.\\n" @@ -1560,6 +1560,10 @@ msgstr "" "Die series-Datei passt nicht mehr zu den angewandten Patches. Bitte führen " "Sie 'quilt pop -a' aus.\\n" +#: quilt/scripts/patchfns.in:1254 +msgid "No series file found\\n" +msgstr "Keine series-Datei gefunden\\n" + #: quilt/scripts/remove-trailing-ws.in:43 #, perl-format msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" @@ -1595,11 +1599,11 @@ msgstr "Abschliessende Leerzeichen in den Zeilen %s von %s werden entfernt\n" msgid "Renaming %s to %s: %s\n" msgstr "Umbenennen von %s in %s: %s\n" -#: quilt/series.in:22 +#: quilt/series.in:11 msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" msgstr "Aufruf: quilt series [--color[=always|auto|never]] [-v]\\n" -#: quilt/series.in:25 +#: quilt/series.in:14 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1618,15 +1622,15 @@ msgstr "" "\n" "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" -#: quilt/setup.in:38 quilt/setup.in:58 +#: quilt/setup.in:23 quilt/setup.in:43 msgid "Directory %s exists\\n" msgstr "Verzeichnis %s existiert\\n" -#: quilt/setup.in:64 +#: quilt/setup.in:49 msgid "File %s exists\\n" msgstr "Datei %s existiert\\n" -#: quilt/setup.in:274 +#: quilt/setup.in:265 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--" "slow|--fast] {specfile|seriesfile}\\n" @@ -1634,7 +1638,8 @@ msgstr "" "Aufruf: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--" "fuzz=N] [--slow|--fast] {spec-datei|series-datei}\\n" -#: quilt/setup.in:277 +#: quilt/setup.in:268 +#, fuzzy msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1649,15 +1654,23 @@ msgid "" "--fuzz=N\n" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" "\n" -"--slow\tUse the original, slow method to process the spec file. This is the\n" -"\tdefault for now, but that might change in the future. In this mode,\n" +"--slow\tUse the original, slow method to process the spec file. In this " +"mode,\n" "\trpmbuild generates a working tree in a temporary directory while all\n" "\tits actions are recorded, and then everything is replayed from scratch\n" "\tin the target directory.\n" "\n" -"--fast\tUse an alternative, faster method to process the spec file. In this\n" -"\tmode, rpmbuild is told to generate a working tree directly in the\n" -"\ttarget directory.\n" +"--fast\tUse the new, faster method to process the spec file. In this mode,\n" +"\trpmbuild is told to generate a working tree directly in the target\n" +"\tdirectory. This is the default (since quilt version 0.67).\n" +"\n" +"The setup command is only guaranteed to work properly on spec files where\n" +"applying all the patches is the last thing done in the %%prep section. This " +"is\n" +"a design limitation due to the fact that quilt can only operate on patches. " +"If\n" +"other commands in the %%prep section modify the patched files, this must\n" +"happen first, otherwise you won't be able to push the patch series.\n" msgstr "" "\n" "Initialisiert einen Quellbaum aus einer rpm-spec-Datei oder einer quilt-\n" @@ -1685,33 +1698,33 @@ msgstr "" "\tDatei verwenden. Dabei erzeugt rpmbuild ein Arbeitsverzeichnis\n" "\tdirekt im Zielverzeichnis.\n" -#: quilt/setup.in:380 +#: quilt/setup.in:396 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:383 +#: quilt/setup.in:399 msgid "The -v option will show rpm's output\\n" msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" -#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467 +#: quilt/setup.in:460 quilt/setup.in:472 quilt/setup.in:483 msgid "File %s not found\\n" msgstr "Datei %s nicht gefunden\\n" -#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470 +#: quilt/setup.in:463 quilt/setup.in:475 quilt/setup.in:486 msgid "Unpacking archive %s\\n" msgstr "Entpacken des Archivs %s\\n" -#: quilt/setup.in:480 +#: quilt/setup.in:496 msgid "Trying alternative patches and series names..." msgstr "Versuch alternativer patches- und series-Namen ..." -#: quilt/snapshot.in:22 +#: quilt/snapshot.in:11 msgid "Usage: quilt snapshot [-d]\\n" msgstr "Aufruf: quilt snapshot [-d]\\n" -#: quilt/snapshot.in:25 +#: quilt/snapshot.in:14 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1730,11 +1743,11 @@ msgstr "" "\n" "-d\tLediglich den aktuellen Snapshot entfernen.\n" -#: quilt/top.in:22 +#: quilt/top.in:11 msgid "Usage: quilt top\\n" msgstr "Aufruf: quilt top\\n" -#: quilt/top.in:25 +#: quilt/top.in:14 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" @@ -1743,11 +1756,11 @@ msgstr "" "\n" "Den Namen des obersten Patches auf dem Stapel ausgeben.\n" -#: quilt/unapplied.in:22 +#: quilt/unapplied.in:11 msgid "Usage: quilt unapplied [patch]\\n" msgstr "Aufruf: quilt unapplied [patch]\\n" -#: quilt/unapplied.in:25 +#: quilt/unapplied.in:14 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" @@ -1757,11 +1770,11 @@ msgstr "" "Eine Liste der Patches ausgeben, die momentan nicht angewandt sind, bzw.\n" "eine Liste der Patches, die dem angegebenen Patch folgen.\n" -#: quilt/upgrade.in:25 +#: quilt/upgrade.in:15 msgid "Usage: quilt upgrade\\n" msgstr "Aufruf: quilt upgrade\\n" -#: quilt/upgrade.in:28 +#: quilt/upgrade.in:18 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1778,7 +1791,7 @@ msgstr "" "Metadaten enthält. In diesem Fall fordert quilt dazu auf, \\`quilt upgrade'\n" "auszuführen.\n" -#: quilt/upgrade.in:67 +#: quilt/upgrade.in:65 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" @@ -1786,15 +1799,15 @@ msgstr "" "Die Metadaten in %s haben bereits das Format Version %s; keine " "Aktualisierung nötig\\n" -#: quilt/upgrade.in:71 +#: quilt/upgrade.in:69 msgid "Converting meta-data to version %s\\n" msgstr "Konvertieren der Metadaten auf Version %s\\n" -#: quilt/upgrade.in:102 +#: quilt/upgrade.in:100 msgid "Conversion failed\\n" msgstr "Konvertierung fehlgeschlagen\\n" -#: quilt/upgrade.in:103 +#: quilt/upgrade.in:101 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " @@ -60,11 +60,11 @@ msgstr "" "--version\n" "\tAffiche le numéro de version et sort immédiatement.\\n" -#: quilt/add.in:22 +#: quilt/add.in:11 msgid "Usage: quilt add [-P patch] {file} ...\\n" msgstr "Usage : quilt add [-P patch] {fichier} ...\\n" -#: quilt/add.in:25 +#: quilt/add.in:14 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -83,35 +83,35 @@ msgstr "" "-P patch\n" "\tPatch auquel les fichiers doivent être ajoutés.\n" -#: quilt/add.in:48 quilt/add.in:54 +#: quilt/add.in:37 quilt/add.in:43 msgid "File %s is located below %s\\n" msgstr "Le fichier %s est situé en dessous de %s\\n" -#: quilt/add.in:103 +#: quilt/add.in:100 msgid "File %s is already in patch %s\\n" msgstr "Le fichier %s est déjà dans le patch %s\\n" -#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84 +#: quilt/add.in:108 quilt/remove.in:79 quilt/revert.in:81 msgid "File %s modified by patch %s\\n" msgstr "Le fichier %s est modifié par le patch %s\\n" -#: quilt/add.in:119 +#: quilt/add.in:116 msgid "Cannot add symbolic link %s\\n" msgstr "Impossible d'ajouter le lien symbolique %s\\n" -#: quilt/add.in:126 +#: quilt/add.in:123 msgid "Failed to back up file %s\\n" msgstr "Impossible de faire une copie de sécurité de %s\\n" -#: quilt/add.in:137 +#: quilt/add.in:134 msgid "File %s added to patch %s\\n" msgstr "Le fichier %s a été ajouté au patch %s\\n" -#: quilt/annotate.in:22 +#: quilt/annotate.in:11 msgid "Usage: quilt annotate [-P patch] {file}\\n" msgstr "Usage : quilt annotate [-P patch] {fichier}\\n" -#: quilt/annotate.in:25 +#: quilt/annotate.in:14 msgid "" "\n" "Print an annotated listing of the specified file showing which\n" @@ -130,11 +130,11 @@ msgstr "" "\tAnnote le fichier tel qu'il se trouve après application du patch\n" "\tspécifié plutôt que d'aller jusqu'au patch au sommet.\n" -#: quilt/applied.in:22 +#: quilt/applied.in:11 msgid "Usage: quilt applied [patch]\\n" msgstr "Usage : quilt applied [patch]\\n" -#: quilt/applied.in:25 +#: quilt/applied.in:14 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" @@ -144,11 +144,11 @@ msgstr "" "Affiche la liste des patches appliqués, ou la liste de tous les patches\n" "jusqu'à celui passé en paramètre (inclus).\n" -#: quilt/delete.in:22 +#: quilt/delete.in:11 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "Usage : quilt delete [-r] [--backup] [patch|-n]\\n" -#: quilt/delete.in:25 +#: quilt/delete.in:14 msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -178,31 +178,31 @@ msgstr "" "\tRenomme le fichier en patch~ au lieu de le supprimer.\n" "\tIgnoré si \\`-r' n'est pas également utilisé.\n" -#: quilt/delete.in:89 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:618 +#: quilt/delete.in:99 quilt/scripts/patchfns.in:602 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqué\\n" -#: quilt/delete.in:114 +#: quilt/delete.in:111 msgid "Removed patch %s\\n" msgstr "Patch %s retiré\\n" -#: quilt/delete.in:116 +#: quilt/delete.in:113 msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" -#: quilt/delete.in:127 +#: quilt/delete.in:124 msgid "Failed to backup patch file %s\\n" msgstr "Impossible de faire une copie de sécurité du fichier %s\\n" -#: quilt/delete.in:134 +#: quilt/delete.in:131 msgid "Failed to remove patch file %s\\n" msgstr "Impossible de retirer le patch %s\\n" -#: quilt/diff.in:24 +#: quilt/diff.in:11 msgid "" "Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " @@ -212,7 +212,7 @@ msgstr "" "R] [-P patch] [--snapshot] [--diff=utilitaire] [--no-timestamps] [--no-" "index] [--sort] [--color[=always|auto|never]] [fichier ...]\\n" -#: quilt/diff.in:28 +#: quilt/diff.in:15 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -313,45 +313,45 @@ msgstr "" "--sort\tTrie les fichiers par leur nom au lieu de préserver leur ordre\n" "\td'origine.\n" -#: quilt/diff.in:226 +#: quilt/diff.in:221 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées." "\\n" -#: quilt/diff.in:240 +#: quilt/diff.in:235 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "Impossible de créer des patches avec -p%s. Veuillez spécifier -p0, -p1 ou -" "pab à la place\\n" -#: quilt/diff.in:249 +#: quilt/diff.in:244 msgid "No snapshot to diff against\\n" msgstr "Pas d'instantané avec lequel comparer\\n" -#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:432 +#: quilt/diff.in:278 quilt/files.in:107 quilt/mail.in:429 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqué avant %s\\n." -#: quilt/diff.in:351 +#: quilt/diff.in:346 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifié.\\n" -#: quilt/diff.in:370 +#: quilt/diff.in:365 msgid "Diff failed, aborting\\n" msgstr "Le diff a échoué. Abandon.\\n" -#: quilt/diff.in:377 +#: quilt/diff.in:372 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Attention: un patch plus recent modifie des fichiers communs à %s\\n" -#: quilt/edit.in:24 +#: quilt/edit.in:13 msgid "Usage: quilt edit file ...\\n" msgstr "Usage : quilt edit {fichier} ...\\n" -#: quilt/edit.in:27 +#: quilt/edit.in:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -361,11 +361,11 @@ msgstr "" "Édite le(s) fichier(s) spécifiés au sein de \\$EDITOR (%s) après addition \n" "au patch du sommet.\n" -#: quilt/files.in:22 +#: quilt/files.in:11 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.in:14 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -397,11 +397,11 @@ msgstr "" "\tsommet (ou le patch spécifié). Le nom de fichier « - » correspond au\n" "\tpremier patch appliqué.\n" -#: quilt/fold.in:22 +#: quilt/fold.in:11 msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" msgstr "Usage : quilt fold [-R] [-q] [-f] [-p strip-level]\\n" -#: quilt/fold.in:25 +#: quilt/fold.in:14 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -438,15 +438,15 @@ msgstr "" "\tNombre de niveaux de répertoires à retirer lors de l'application du \n" "\tpatch.\n" -#: quilt/fold.in:131 +#: quilt/fold.in:128 msgid "File %s may be corrupted\\n" msgstr "Le fichier %s est peut-être corrompu\\n" -#: quilt/fork.in:22 +#: quilt/fork.in:11 msgid "Usage: quilt fork [new_name]\\n" msgstr "Usage : quilt fork [nouveau_nom]\\n" -#: quilt/fork.in:25 +#: quilt/fork.in:14 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -477,19 +477,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:84 +#: quilt/fork.in:81 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Le patch %s existe déjà, veuillez choisir un nouveau nom\\n" -#: quilt/fork.in:96 +#: quilt/fork.in:93 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Le fork de %s en %s a échoué\\n" -#: quilt/fork.in:102 quilt/refresh.in:344 +#: quilt/fork.in:99 quilt/refresh.in:341 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.in:11 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [patch]\\n" @@ -497,7 +497,7 @@ msgstr "" "Usage : quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [patch]\\n" -#: quilt/graph.in:26 +#: quilt/graph.in:15 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -554,11 +554,11 @@ msgstr "" "\n" "-T ps\tProduit directement un fichier PostScript.\n" -#: quilt/grep.in:22 +#: quilt/grep.in:11 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "Usage : quilt grep [-h|options] {motif}\\n" -#: quilt/grep.in:25 +#: quilt/grep.in:14 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -580,7 +580,7 @@ msgstr "" "\ttiret peuvent être passées après un second double tiret\n" "\t(-- --).\n" -#: quilt/header.in:24 +#: quilt/header.in:13 msgid "" "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" @@ -588,7 +588,7 @@ msgstr "" "Usage : quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" -#: quilt/header.in:28 +#: quilt/header.in:17 msgid "" "\n" "Print or change the header of the topmost or specified patch.\n" @@ -625,15 +625,15 @@ msgstr "" "\tCrée une sauvegarde de la version originale du patch en tant\n" "\tque patch~.\n" -#: quilt/header.in:170 +#: quilt/header.in:167 msgid "Replaced header of patch %s\\n" msgstr "En-tête du patch %s remplacé\\n" -#: quilt/header.in:173 +#: quilt/header.in:170 msgid "Appended text to header of patch %s\\n" msgstr "Texte ajouté à la fin de l'en-tête du patch %s\\n" -#: quilt/import.in:22 +#: quilt/import.in:14 msgid "" "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..." "\\n" @@ -641,7 +641,7 @@ msgstr "" "Usage : quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] " "fichier_de_patch ...\\n" -#: quilt/import.in:25 +#: quilt/import.in:17 msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -688,57 +688,57 @@ msgstr "" "\ten-têtes, cette option doit être spécifiée. Cette option n'est\n" "\teffective que lorsque -f est utilisé.\n" -#: quilt/import.in:73 quilt/mail.in:463 +#: quilt/import.in:65 quilt/mail.in:460 msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'existe pas\\n" -#: quilt/import.in:96 +#: quilt/import.in:88 msgid "Patch headers differ:\\n" msgstr "Les en-têtes des patches diffèrent :\\n" -#: quilt/import.in:99 +#: quilt/import.in:91 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "Veuillez utiliser -d {o|a|n} pour spécifier quel(s) en-tête(s) conserver.\\n" -#: quilt/import.in:164 +#: quilt/import.in:156 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" "L'option « -P » ne peut être utilisé que lors de l'import d'un seul patch.\\n" -#: quilt/import.in:194 +#: quilt/import.in:195 msgid "Patch %s is applied\\n" msgstr "Le patch %s est appliqué\\n" -#: quilt/import.in:203 +#: quilt/import.in:204 msgid "Patch %s already exists in series.\\n" msgstr "Le patch %s existe déjà dans la série.\\n" -#: quilt/import.in:209 +#: quilt/import.in:210 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:220 +#: quilt/import.in:221 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:224 +#: quilt/import.in:225 msgid "Importing patch %s\\n" msgstr "Import du patch %s\\n" -#: quilt/import.in:226 +#: quilt/import.in:227 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistré dans %s)\\n" -#: quilt/import.in:239 +#: quilt/import.in:240 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:248 quilt/refresh.in:331 +#: quilt/import.in:249 quilt/refresh.in:328 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" -#: quilt/mail.in:24 +#: quilt/mail.in:13 msgid "" "Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] " "[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--" @@ -750,7 +750,7 @@ msgstr "" "subject ...] [--reply-to message] [--charset ...] [--signature fichier] " "[premier_patch [dernier_patch]]\\n" -#: quilt/mail.in:27 +#: quilt/mail.in:16 msgid "" "\n" "Create mail messages from a specified range of patches, or all patches in\n" @@ -857,44 +857,44 @@ msgstr "" "--reply-to message\n" "\tAjoute les en-têtes appropriés pour répondre au message spécifié.\n" -#: quilt/mail.in:209 quilt/mail.in:217 +#: quilt/mail.in:198 quilt/mail.in:206 msgid "Introduction message already specified" msgstr "Message d'introduction déjà spécifié" -#: quilt/mail.in:315 +#: quilt/mail.in:312 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "Impossible de déterminer l'adresse d'expéditeur. Utilisez --sender." -#: quilt/mail.in:466 +#: quilt/mail.in:463 msgid "Unable to extract a subject header from %s\\n" msgstr "Impossible d'extraire une ligne de sujet de %s\\n" -#: quilt/mail.in:492 +#: quilt/mail.in:489 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Les patches %s ont des sujets dupliqués.\\n" -#: quilt/mail.in:501 +#: quilt/mail.in:498 msgid "File %s does not exist\\n" msgstr "Le fichier %s n'existe pas\\n" -#: quilt/mail.in:561 +#: quilt/mail.in:558 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" "L'introduction n'a pas de ligne de sujet (sauvegardé en tant que %s)\\n" -#: quilt/mail.in:564 +#: quilt/mail.in:561 msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:677 +#: quilt/mail.in:674 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegardée en tant que %s\\n" -#: quilt/new.in:22 +#: quilt/new.in:14 msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n" msgstr "Usage : quilt new [-p n|-p ab] {nom_de_patch}\\n" -#: quilt/new.in:25 +#: quilt/new.in:17 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -930,7 +930,7 @@ msgstr "" "répertoire devant être la racine si quilt choisi un répertoire trop haut\n" "dans l'arborescence.\n" -#: quilt/new.in:76 +#: quilt/new.in:68 msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "" @@ -941,7 +941,7 @@ msgstr "" msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n" msgstr "QUILT_PATCHES(%s) et QUILT_PC(%s) doivent être différents\\n" -#: quilt/new.in:97 quilt/refresh.in:185 +#: quilt/new.in:97 quilt/refresh.in:182 msgid "Patch %s exists already\\n" msgstr "Le patch %s existe déjà\\n" @@ -949,15 +949,15 @@ msgstr "Le patch %s existe déjà\\n" msgid "Patch %s is now on top\\n" msgstr "Le patch %s est maintenant au sommet\\n" -#: quilt/new.in:110 quilt/refresh.in:340 +#: quilt/new.in:110 quilt/refresh.in:337 msgid "Failed to create patch %s\\n" msgstr "Impossible de créer le patch %s\\n" -#: quilt/next.in:22 +#: quilt/next.in:11 msgid "Usage: quilt next [patch]\\n" msgstr "Usage : quilt next [patch]\\n" -#: quilt/next.in:25 +#: quilt/next.in:14 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" @@ -969,14 +969,14 @@ msgstr "" "\n" "-n\tAffiche le nom de fichier au lieu du nom de patch.\n" -#: quilt/patches.in:24 +#: quilt/patches.in:13 msgid "" "Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "" "Usage : quilt patches [-v] [--color[=always|auto|never]] {fichier} " "[fichiers...]\\n" -#: quilt/patches.in:27 +#: quilt/patches.in:16 msgid "" "\n" "Print the list of patches that modify any of the specified files. (Uses a\n" @@ -1003,11 +1003,11 @@ msgstr "" "\t(«auto») ou jamais («never»).\n" "\t«auto» n'est activé par défaut que si la sortie est un tty.\n" -#: quilt/pop.in:22 +#: quilt/pop.in:11 msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n" msgstr "Usage : quilt pop [-afRqv] [--refresh] [num|patch]\\n" -#: quilt/pop.in:25 +#: quilt/pop.in:14 msgid "" "\n" "Remove patch(es) from the stack of applied patches. Without options,\n" @@ -1055,49 +1055,53 @@ msgstr "" "--refresh\n" "\tRafraichit automatiquement chaque patch avant de l'enlever.\n" -#: quilt/pop.in:103 quilt/scripts/patchfns.in:930 +#: quilt/pop.in:92 quilt/scripts/patchfns.in:977 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n" -#: quilt/pop.in:128 +#: quilt/pop.in:117 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:153 +#: quilt/pop.in:119 +msgid "Hint: \\`quilt diff -z' will show the pending changes.\\n" +msgstr "" + +#: quilt/pop.in:143 msgid "Patch %s appears to be empty, removing\\n" msgstr "Le patch %s semble vide, enlevé\\n" -#: quilt/pop.in:158 +#: quilt/pop.in:148 msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/pop.in:216 quilt/push.in:376 +#: quilt/pop.in:214 quilt/push.in:376 msgid "Options %s and %s are mutually exclusive\\n" msgstr "Les options %s et %s sont mutuellement exclusives\\n" -#: quilt/pop.in:238 +#: quilt/pop.in:236 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit être rafraichi au préalable.\\n" -#: quilt/pop.in:248 +#: quilt/pop.in:246 msgid "No patch removed\\n" msgstr "Aucun patch retiré\\n" -#: quilt/pop.in:272 quilt/scripts/patchfns.in:527 +#: quilt/pop.in:270 quilt/scripts/patchfns.in:511 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqué\\n" -#: quilt/pop.in:279 quilt/push.in:440 +#: quilt/pop.in:277 quilt/push.in:440 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" -#: quilt/previous.in:22 +#: quilt/previous.in:11 msgid "Usage: quilt previous [patch]\\n" msgstr "Usage : quilt previous [-n] [patch]\\n" -#: quilt/previous.in:25 +#: quilt/previous.in:14 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" @@ -1109,7 +1113,7 @@ msgstr "" "\n" "-n\tAffiche le nom de fichier au lieu du nom de patch.\n" -#: quilt/push.in:24 +#: quilt/push.in:11 msgid "" "Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" @@ -1117,7 +1121,7 @@ msgstr "" "Usage : quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" -#: quilt/push.in:27 +#: quilt/push.in:14 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -1188,36 +1192,36 @@ msgstr "" "\tRafraichit automatiquement chaque patch ayant été appliqué avec\n" "\tsuccès.\n" -#: quilt/push.in:70 +#: quilt/push.in:57 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:186 +#: quilt/push.in:176 msgid "Applying patch %s\\n" msgstr "Application de %s\\n" -#: quilt/push.in:220 +#: quilt/push.in:210 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n" -#: quilt/push.in:224 +#: quilt/push.in:214 msgid "Patch %s appears to be empty; applied\\n" msgstr "Le patch %s semble vide. Il a été appliqué.\\n" -#: quilt/push.in:228 +#: quilt/push.in:218 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n" -#: quilt/push.in:238 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "Le patch %s peut être appliqué à l'envers\\n" -#: quilt/push.in:241 +#: quilt/push.in:231 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:296 +#: quilt/push.in:286 msgid "Patch %s is already applied; check your series file\\n" msgstr "Le patch %s est déjà appliqué. Vérifiez votre fichier series.\\n" @@ -1229,7 +1233,7 @@ msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n" msgid "No patch applied\\n" msgstr "Aucun patch appliqué\\n" -#: quilt/refresh.in:22 +#: quilt/refresh.in:11 msgid "" "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] " "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" @@ -1239,7 +1243,7 @@ msgstr "" "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" "trailing-whitespace] [patch]\\n" -#: quilt/refresh.in:26 +#: quilt/refresh.in:15 msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1343,48 +1347,48 @@ msgstr "" "--strip-trailing-whitespace\n" "\tSupprime les espaces à la fin des lignes.\n" -#: quilt/refresh.in:171 +#: quilt/refresh.in:168 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "Seul le patch au sommet peut actuellement être rafraîchi avec -z\\n" -#: quilt/refresh.in:202 +#: quilt/refresh.in:199 msgid "" "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "Impossible de rafraîchir des patchs avec -p%s. Veuillez spécifier -p0, -p1 " "ou -pab à la place.\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:237 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Des fichiers plus récents modifient les mêmes fichiers que %s.\n" "Forcez le rafraîchissement avec -f.\\n" -#: quilt/refresh.in:246 +#: quilt/refresh.in:243 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 masqués.\\n" -#: quilt/refresh.in:252 quilt/refresh.in:352 +#: quilt/refresh.in:249 quilt/refresh.in:349 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:321 msgid "Patch %s is unchanged\\n" msgstr "Patch %s inchangé\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:347 msgid "Refreshed patch %s\\n" msgstr "Patch %s rafraîchi\\n" -#: quilt/remove.in:22 +#: quilt/remove.in:11 msgid "Usage: quilt remove [-P patch] {file} ...\\n" msgstr "Usage : quilt remove [-P patch] {fichier} ...\\n" -#: quilt/remove.in:25 +#: quilt/remove.in:14 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -1401,23 +1405,23 @@ msgstr "" "-P patch\n" "\tPatch dont les fichiers doivent être retirés.\n" -#: quilt/remove.in:73 quilt/revert.in:75 +#: quilt/remove.in:70 quilt/revert.in:72 msgid "File %s is not in patch %s\\n" msgstr "Le fichier %s n'est pas dans le patch %s.\\n" -#: quilt/remove.in:91 +#: quilt/remove.in:88 msgid "Failed to remove file %s from patch %s\\n" msgstr "Impossible d'enlever le fichier %s du patch %s\\n" -#: quilt/remove.in:105 +#: quilt/remove.in:102 msgid "File %s removed from patch %s\\n" msgstr "Le fichier %s a été enlevé du patch %s.\\n" -#: quilt/rename.in:22 +#: quilt/rename.in:11 msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "Usage : quilt rename [-P patch] nouveau_nom\\n" -#: quilt/rename.in:25 +#: quilt/rename.in:14 msgid "" "\n" "Rename the topmost or named patch.\n" @@ -1431,23 +1435,23 @@ msgstr "" "-P patch\n" "\tPatch à renommer.\n" -#: quilt/rename.in:84 +#: quilt/rename.in:81 msgid "Patch %s exists already, please choose a different name\\n" msgstr "Le patch %s existe déjà, veuillez choisir un nom différent\\n" -#: quilt/rename.in:98 +#: quilt/rename.in:95 msgid "Renaming of patch %s to %s failed\\n" msgstr "Le renommage de %s en %s a échoué\\n" -#: quilt/rename.in:104 +#: quilt/rename.in:101 msgid "Patch %s renamed to %s\\n" msgstr "Patch %s renommé en %s\\n" -#: quilt/revert.in:22 +#: quilt/revert.in:11 msgid "Usage: quilt revert [-P patch] {file} ...\\n" msgstr "Usage : quilt revert [-P patch] {fichier} ...\\n" -#: quilt/revert.in:25 +#: quilt/revert.in:14 msgid "" "\n" "Revert uncommitted changes to the topmost or named patch for the specified\n" @@ -1469,15 +1473,15 @@ msgstr "" "-P patch\n" "\tPatch dont les fichiers doivent être restaurés.\n" -#: quilt/revert.in:103 quilt/revert.in:112 +#: quilt/revert.in:100 quilt/revert.in:109 msgid "File %s is unchanged\\n" msgstr "Le fichier %s est inchangé\\n" -#: quilt/revert.in:120 +#: quilt/revert.in:117 msgid "Failed to revert changes to %s in patch %s\\n" msgstr "Impossible de restaurer le fichier %s du patch %s.\\n" -#: quilt/revert.in:124 +#: quilt/revert.in:121 msgid "Changes to %s in patch %s reverted\\n" msgstr "Modifications de %s dans le patch %s annulées\\n" @@ -1491,39 +1495,35 @@ msgstr "Le nom `%s' est mal parenthésé\n" msgid "Delivery address `%s' is invalid\n" msgstr "L'adresse de destination `%s' est invalide\n" -#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:237 quilt/scripts/patchfns.in:524 msgid "%s is not a regular file\\n" msgstr "%s n'est pas un fichier régulier\\n" -#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:486 quilt/scripts/patchfns.in:498 msgid "No patches in series\\n" msgstr "Aucun patch dans la série\\n" -#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513 -msgid "No series file found\\n" -msgstr "Fichier de série non trouvé\\n" - -#: quilt/scripts/patchfns.in:569 +#: quilt/scripts/patchfns.in:553 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/scripts/patchfns.in:597 +#: quilt/scripts/patchfns.in:581 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/scripts/patchfns.in:634 +#: quilt/scripts/patchfns.in:618 msgid "File series fully applied, ends at patch %s\\n" msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n" -#: quilt/scripts/patchfns.in:779 +#: quilt/scripts/patchfns.in:774 msgid "Diff failed on file '%s', aborting\\n" msgstr "Le diff a échoué sur le fichier «%s». Abandon.\\n" -#: quilt/scripts/patchfns.in:948 +#: quilt/scripts/patchfns.in:995 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: quilt/scripts/patchfns.in:991 +#: quilt/scripts/patchfns.in:1038 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1535,15 +1535,15 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n" -#: quilt/scripts/patchfns.in:1064 +#: quilt/scripts/patchfns.in:1113 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n" msgstr "Vous devez installer '%s' (paquet %s) pour utiliser « quilt %s »\\n" -#: quilt/scripts/patchfns.in:1143 +#: quilt/scripts/patchfns.in:1192 msgid "Cannot change into parent directory %s/\\n" msgstr "Impossible de remplacer le répertoire de travail en cours par %s/\\n" -#: quilt/scripts/patchfns.in:1184 +#: quilt/scripts/patchfns.in:1237 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1551,7 +1551,7 @@ msgstr "" "Votre arbre a été créé par une vieille version de quilt. Veuillez \n" "utiliser « quilt upgrade ».\\n" -#: quilt/scripts/patchfns.in:1192 +#: quilt/scripts/patchfns.in:1245 msgid "" "The series file no longer matches the applied patches. Please run 'quilt pop " "-a'.\\n" @@ -1559,6 +1559,10 @@ msgstr "" "Le fichier series ne correspond plus aux patchs appliqués. Veuillez utiliser " "« quilt pop -a ».\\n" +#: quilt/scripts/patchfns.in:1254 +msgid "No series file found\\n" +msgstr "Fichier de série non trouvé\\n" + #: quilt/scripts/remove-trailing-ws.in:43 #, perl-format msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" @@ -1594,11 +1598,11 @@ msgstr "Suppression des espaces à la fin des lignes %s de %s\n" msgid "Renaming %s to %s: %s\n" msgstr "En renommant %s en %s : %s\n" -#: quilt/series.in:22 +#: quilt/series.in:11 msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" msgstr "Usage : quilt series [--color[=always|auto|never]] [-v]\\n" -#: quilt/series.in:25 +#: quilt/series.in:14 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1617,15 +1621,15 @@ msgstr "" "\n" "-v\tAffichage verbeux, plus simple à lire.\n" -#: quilt/setup.in:38 quilt/setup.in:58 +#: quilt/setup.in:23 quilt/setup.in:43 msgid "Directory %s exists\\n" msgstr "Le répertoire %s existe\\n" -#: quilt/setup.in:64 +#: quilt/setup.in:49 msgid "File %s exists\\n" msgstr "Le fichier %s existe\\n" -#: quilt/setup.in:274 +#: quilt/setup.in:265 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--" "slow|--fast] {specfile|seriesfile}\\n" @@ -1633,7 +1637,8 @@ msgstr "" "Usage : quilt setup [-d répertoire_source] [-v] [--sourcedir répertoire] [--" "fuzz=N] [--slow|--fast] {fichier_spec|fichier_séries}\\n" -#: quilt/setup.in:277 +#: quilt/setup.in:268 +#, fuzzy msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1648,15 +1653,23 @@ msgid "" "--fuzz=N\n" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" "\n" -"--slow\tUse the original, slow method to process the spec file. This is the\n" -"\tdefault for now, but that might change in the future. In this mode,\n" +"--slow\tUse the original, slow method to process the spec file. In this " +"mode,\n" "\trpmbuild generates a working tree in a temporary directory while all\n" "\tits actions are recorded, and then everything is replayed from scratch\n" "\tin the target directory.\n" "\n" -"--fast\tUse an alternative, faster method to process the spec file. In this\n" -"\tmode, rpmbuild is told to generate a working tree directly in the\n" -"\ttarget directory.\n" +"--fast\tUse the new, faster method to process the spec file. In this mode,\n" +"\trpmbuild is told to generate a working tree directly in the target\n" +"\tdirectory. This is the default (since quilt version 0.67).\n" +"\n" +"The setup command is only guaranteed to work properly on spec files where\n" +"applying all the patches is the last thing done in the %%prep section. This " +"is\n" +"a design limitation due to the fact that quilt can only operate on patches. " +"If\n" +"other commands in the %%prep section modify the patched files, this must\n" +"happen first, otherwise you won't be able to push the patch series.\n" msgstr "" "\n" "Initialise un arbre de sources à partir d'un fichier de\n" @@ -1683,32 +1696,32 @@ msgstr "" "\tfichier de spécification rpm. Dans ce mode, rpmbuild travaille\n" "\tdirectement dans le répertoire de destination.\n" -#: quilt/setup.in:380 +#: quilt/setup.in:396 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "La section %%prep de %s a échoué ; les résultats sont peut-être incomplets\\n" -#: quilt/setup.in:383 +#: quilt/setup.in:399 msgid "The -v option will show rpm's output\\n" msgstr "L'option -v montre les affichages de rpm\\\\n" -#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467 +#: quilt/setup.in:460 quilt/setup.in:472 quilt/setup.in:483 msgid "File %s not found\\n" msgstr "Le fichier %s est introuvable\\n" -#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470 +#: quilt/setup.in:463 quilt/setup.in:475 quilt/setup.in:486 msgid "Unpacking archive %s\\n" msgstr "Désarchivage de %s\\n" -#: quilt/setup.in:480 +#: quilt/setup.in:496 msgid "Trying alternative patches and series names..." msgstr "Tentative d'utilisation des noms de patches et séries alternatifs..." -#: quilt/snapshot.in:22 +#: quilt/snapshot.in:11 msgid "Usage: quilt snapshot [-d]\\n" msgstr "Usage : quilt snapshot [-d]\\n" -#: quilt/snapshot.in:25 +#: quilt/snapshot.in:14 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1728,11 +1741,11 @@ msgstr "" "\n" "-d\tSupprime l'instantané actuel et termine.\n" -#: quilt/top.in:22 +#: quilt/top.in:11 msgid "Usage: quilt top\\n" msgstr "Usage : quilt top\\n" -#: quilt/top.in:25 +#: quilt/top.in:14 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" @@ -1742,11 +1755,11 @@ msgstr "" "Affiche le nom du patch au sommet de la pile des patches actuellement\n" "appliqués.\n" -#: quilt/unapplied.in:22 +#: quilt/unapplied.in:11 msgid "Usage: quilt unapplied [patch]\\n" msgstr "Usage : quilt unapplied [patch]\\n" -#: quilt/unapplied.in:25 +#: quilt/unapplied.in:14 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" @@ -1756,11 +1769,11 @@ msgstr "" "Affiche la liste de tous les patches non appliqués, ou de tous les patches\n" "suivant celui indiqué en paramètre.\n" -#: quilt/upgrade.in:25 +#: quilt/upgrade.in:15 msgid "Usage: quilt upgrade\\n" msgstr "Usage : quilt upgrade\\n" -#: quilt/upgrade.in:28 +#: quilt/upgrade.in:18 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1778,22 +1791,22 @@ msgstr "" "à l'ancien format. Dans ce cas, quilt vous demandera d'utiliser\n" "« quilt upgrade » explicitement.\n" -#: quilt/upgrade.in:67 +#: quilt/upgrade.in:65 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" msgstr "" "Les méta-données de quilt dans %s sont déjà au format %s ; rien à faire\\n" -#: quilt/upgrade.in:71 +#: quilt/upgrade.in:69 msgid "Converting meta-data to version %s\\n" msgstr "Conversion des méta-données au format v%s\\n" -#: quilt/upgrade.in:102 +#: quilt/upgrade.in:100 msgid "Conversion failed\\n" msgstr "Échec de la conversion\\n" -#: quilt/upgrade.in:103 +#: quilt/upgrade.in:101 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " @@ -58,11 +58,11 @@ msgstr "" "--version\n" "\tバージョン情報を出力して終了。\\n" -#: quilt/add.in:22 +#: quilt/add.in:11 msgid "Usage: quilt add [-P patch] {file} ...\\n" msgstr "使い方: quilt add [-P パッチ] {file} ...\\n" -#: quilt/add.in:25 +#: quilt/add.in:14 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -80,35 +80,35 @@ msgstr "" "-P パッチ\n" "\tファイルを追加するパッチ\n" -#: quilt/add.in:48 quilt/add.in:54 +#: quilt/add.in:37 quilt/add.in:43 msgid "File %s is located below %s\\n" msgstr "ファイル %s は、%s 以下にあります\\n" -#: quilt/add.in:103 +#: quilt/add.in:100 msgid "File %s is already in patch %s\\n" msgstr "ファイル %s は、すでにパッチ %s に含まれています\\n" -#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84 +#: quilt/add.in:108 quilt/remove.in:79 quilt/revert.in:81 msgid "File %s modified by patch %s\\n" msgstr "ファイル %s は、パッチ %s によってすでに変更されています\\n" -#: quilt/add.in:119 +#: quilt/add.in:116 msgid "Cannot add symbolic link %s\\n" msgstr "シンボリックファイル %s は追加できません" -#: quilt/add.in:126 +#: quilt/add.in:123 msgid "Failed to back up file %s\\n" msgstr "ファイル %s のバックアップに失敗しました\\n" -#: quilt/add.in:137 +#: quilt/add.in:134 msgid "File %s added to patch %s\\n" msgstr "ファイル %s をパッチ %s に追加しました\\n" -#: quilt/annotate.in:22 +#: quilt/annotate.in:11 msgid "Usage: quilt annotate [-P patch] {file}\\n" msgstr "使い方: quilt annotate [-P パッチ] {file}\\n" -#: quilt/annotate.in:25 +#: quilt/annotate.in:14 msgid "" "\n" "Print an annotated listing of the specified file showing which\n" @@ -125,11 +125,11 @@ msgstr "" "-P パッチ\n" "\t最上位のパッチまで処理を行なわず、指定されたパッチで処理を終了\n" -#: quilt/applied.in:22 +#: quilt/applied.in:11 msgid "Usage: quilt applied [patch]\\n" msgstr "使い方: quilt applied [パッチ]\\n" -#: quilt/applied.in:25 +#: quilt/applied.in:14 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" @@ -139,11 +139,11 @@ msgstr "" "適用されているパッチの一覧を表示します。指定されたパッチがある場合は、\n" "seriesファイル内のパッチ一覧の中から指定されたパッチまでを表示します。\n" -#: quilt/delete.in:22 +#: quilt/delete.in:11 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "使い方: quilt delete [-r] [--backup] [パッチ|-n]\\n" -#: quilt/delete.in:25 +#: quilt/delete.in:14 msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -174,31 +174,31 @@ msgstr "" "\tパッチを削除せず、パッチ~に名前を変更します。オプション\\`-r'が\n" "\t有効ではないときは無視される。\n" -#: quilt/delete.in:89 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:618 +#: quilt/delete.in:99 quilt/scripts/patchfns.in:602 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" -#: quilt/delete.in:114 +#: quilt/delete.in:111 msgid "Removed patch %s\\n" msgstr "パッチ %s を削除しました\\n" -#: quilt/delete.in:116 +#: quilt/delete.in:113 msgid "Failed to remove patch %s\\n" msgstr "パッチ %s の削除に失敗しました\\n" -#: quilt/delete.in:127 +#: quilt/delete.in:124 msgid "Failed to backup patch file %s\\n" msgstr "ファイル %s のバックアップに失敗しました\\n" -#: quilt/delete.in:134 +#: quilt/delete.in:131 msgid "Failed to remove patch file %s\\n" msgstr "パッチ %s の削除に失敗しました\\n" -#: quilt/diff.in:24 +#: quilt/diff.in:11 msgid "" "Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " @@ -208,7 +208,7 @@ msgstr "" "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " "[--sort] [--color[=always|auto|never]] [file ...]\\n" -#: quilt/diff.in:28 +#: quilt/diff.in:15 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -303,43 +303,43 @@ msgstr "" "\n" "--sort\t順番を保持せず、名前順にファイルを並び換える。\n" -#: quilt/diff.in:226 +#: quilt/diff.in:221 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: quilt/diff.in:240 +#: quilt/diff.in:235 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "-p%s でパッチの差分はとれません。-p0、-p1、または -pab を指定してください\\n" -#: quilt/diff.in:249 +#: quilt/diff.in:244 msgid "No snapshot to diff against\\n" msgstr "diff対象のスナップショトがありません\\n" -#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:432 +#: quilt/diff.in:278 quilt/files.in:107 quilt/mail.in:429 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: quilt/diff.in:351 +#: quilt/diff.in:346 msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:370 +#: quilt/diff.in:365 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: quilt/diff.in:377 +#: quilt/diff.in:372 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n" -#: quilt/edit.in:24 +#: quilt/edit.in:13 msgid "Usage: quilt edit file ...\\n" msgstr "使い方: quilt edit ファイル ...\\n" -#: quilt/edit.in:27 +#: quilt/edit.in:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -348,11 +348,11 @@ msgstr "" "\n" "最上位のパッチに指定されたファイルを追加後、\\$EDITOR (%s) を使って編集。\n" -#: quilt/files.in:22 +#: quilt/files.in:11 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.in:14 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -385,11 +385,11 @@ msgstr "" "\tことになる。\n" "\n" -#: quilt/fold.in:22 +#: quilt/fold.in:11 msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" msgstr "使い方: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" -#: quilt/fold.in:25 +#: quilt/fold.in:14 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -424,15 +424,15 @@ msgstr "" "-p strip-level\n" "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n" -#: quilt/fold.in:131 +#: quilt/fold.in:128 msgid "File %s may be corrupted\\n" msgstr "ファイル %s は壊れている可能性があります\\n" -#: quilt/fork.in:22 +#: quilt/fork.in:11 msgid "Usage: quilt fork [new_name]\\n" msgstr "使い方: quilt fork [new_name]\\n" -#: quilt/fork.in:25 +#: quilt/fork.in:14 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -458,19 +458,19 @@ msgstr "" "\\`-2' が付く。すでにパッチ名が -番号で終っている場合、番号の値が1増える " "(例: patch.diff、patch-2.diff、patch-3.diff)。\n" -#: quilt/fork.in:84 +#: quilt/fork.in:81 msgid "Patch %s exists already, please choose a new name\\n" msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n" -#: quilt/fork.in:96 +#: quilt/fork.in:93 msgid "Fork of patch %s to patch %s failed\\n" msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n" -#: quilt/fork.in:102 quilt/refresh.in:344 +#: quilt/fork.in:99 quilt/refresh.in:341 msgid "Fork of patch %s created as %s\\n" msgstr "パッチ %s の分岐で %s が作成されました\\n" -#: quilt/graph.in:22 +#: quilt/graph.in:11 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [patch]\\n" @@ -478,7 +478,7 @@ msgstr "" "使い方: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [パッチ]\\n" -#: quilt/graph.in:26 +#: quilt/graph.in:15 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -534,11 +534,11 @@ msgstr "" "\n" "-T ps\t直接ポストスクリプトファイルを生成する。\n" -#: quilt/grep.in:22 +#: quilt/grep.in:11 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "使い方: quilt grep [-h|options] {パターン}\\n" -#: quilt/grep.in:25 +#: quilt/grep.in:14 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -558,7 +558,7 @@ msgstr "" "-hを渡すことができる。ダッシュ記号で始まる検索パターンは2つ目の二重ダッ\n" "シュ記号の後に渡すことができる。\n" -#: quilt/header.in:24 +#: quilt/header.in:13 msgid "" "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" @@ -566,7 +566,7 @@ msgstr "" "使い方: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [パッチ]\\n" -#: quilt/header.in:28 +#: quilt/header.in:17 msgid "" "\n" "Print or change the header of the topmost or specified patch.\n" @@ -602,15 +602,15 @@ msgstr "" "--backup\n" "\t古いバージョンのパッチのバックアップコピーをパッチ~として作成する。\n" -#: quilt/header.in:170 +#: quilt/header.in:167 msgid "Replaced header of patch %s\\n" msgstr "パッチ %s のヘッダを変更しました\\n" -#: quilt/header.in:173 +#: quilt/header.in:170 msgid "Appended text to header of patch %s\\n" msgstr "パッチ %s のヘッダに追加しました\\n" -#: quilt/import.in:22 +#: quilt/import.in:14 msgid "" "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..." "\\n" @@ -618,7 +618,7 @@ msgstr "" "使い方: quilt import [-p num] [-R] [-P パッチ] [-f] [-d {o|a|n}] パッチファイ" "ル ...\\n" -#: quilt/import.in:25 +#: quilt/import.in:17 msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -663,56 +663,56 @@ msgstr "" "\tがある場合は必ずこのオプションを指定する必要がある。このオプショ\n" "\tンは -fが指定された時のみ有効。\n" -#: quilt/import.in:73 quilt/mail.in:463 +#: quilt/import.in:65 quilt/mail.in:460 msgid "Patch %s does not exist\\n" msgstr "パッチ %s が存在しません\\n" -#: quilt/import.in:96 +#: quilt/import.in:88 msgid "Patch headers differ:\\n" msgstr "パッチヘッダの差異:\\n" -#: quilt/import.in:99 +#: quilt/import.in:91 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "どのパッチヘッダを残すか、オプション -d {o|a|n}を使って指定してください" -#: quilt/import.in:164 +#: quilt/import.in:156 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "オプション \\`-P'は、パッチを一つだけ取り込むときのみ有効です\\n" -#: quilt/import.in:194 +#: quilt/import.in:195 msgid "Patch %s is applied\\n" msgstr "パッチ %s は、すでに適用されています\\n" -#: quilt/import.in:203 +#: quilt/import.in:204 msgid "Patch %s already exists in series.\\n" msgstr "パッチ %s は、すでに seriesの中にあります\\n" -#: quilt/import.in:209 +#: quilt/import.in:210 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます\\n" -#: quilt/import.in:220 +#: quilt/import.in:221 msgid "Replacing patch %s with new version\\n" msgstr "パッチ %s を新しいバージョンに置き換えます\\n" -#: quilt/import.in:224 +#: quilt/import.in:225 msgid "Importing patch %s\\n" msgstr "パッチ %s を取り込みます\\n" -#: quilt/import.in:226 +#: quilt/import.in:227 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n" -#: quilt/import.in:239 +#: quilt/import.in:240 msgid "Failed to import patch %s\\n" msgstr "パッチ %s の取り込みに失敗しました\\n" -#: quilt/import.in:248 quilt/refresh.in:331 +#: quilt/import.in:249 quilt/refresh.in:328 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" -#: quilt/mail.in:24 +#: quilt/mail.in:13 msgid "" "Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] " "[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--" @@ -724,7 +724,7 @@ msgstr "" "subject ...] [--reply-to message] [--charset ...] [--signature file] " "[first_patch [last_patch]]\\n" -#: quilt/mail.in:27 +#: quilt/mail.in:16 msgid "" "\n" "Create mail messages from a specified range of patches, or all patches in\n" @@ -825,45 +825,45 @@ msgstr "" "--reply-to メッセージ\n" "\t指定されたメッセージへのリプライとなるように、適切なヘッダを追加。\n" -#: quilt/mail.in:209 quilt/mail.in:217 +#: quilt/mail.in:198 quilt/mail.in:206 msgid "Introduction message already specified" msgstr "概要文はすでに指定されています" -#: quilt/mail.in:315 +#: quilt/mail.in:312 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n" "を使用してください。" -#: quilt/mail.in:466 +#: quilt/mail.in:463 msgid "Unable to extract a subject header from %s\\n" msgstr "%s から件名を取り出せません。\\n" -#: quilt/mail.in:492 +#: quilt/mail.in:489 msgid "Patches %s have duplicate subject headers.\\n" msgstr "パッチ %s の件名が重複しています。\\n" -#: quilt/mail.in:501 +#: quilt/mail.in:498 msgid "File %s does not exist\\n" msgstr "ファイル %s が存在しません\\n" -#: quilt/mail.in:561 +#: quilt/mail.in:558 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "概要文に件名部分がありません(%s として保存されました)\\n" -#: quilt/mail.in:564 +#: quilt/mail.in:561 msgid "Introduction has no subject header\\n" msgstr "概要文に件名部分がありません\\n" -#: quilt/mail.in:677 +#: quilt/mail.in:674 msgid "Introduction saved as %s\\n" msgstr "概要文は %s という名前で保存されました\\n" -#: quilt/new.in:22 +#: quilt/new.in:14 msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n" msgstr "使い方: quilt new [-p n | -p ab] {パッチ名}\\n" -#: quilt/new.in:25 +#: quilt/new.in:17 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -899,7 +899,7 @@ msgstr "" "たディレクトリより上のディレクトリを Quilt が間違って選んでしまった場\n" "合は、正しい場所に %s ディレクトリを作成すること。\n" -#: quilt/new.in:76 +#: quilt/new.in:68 msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "" @@ -910,7 +910,7 @@ msgstr "" msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n" msgstr "QUILT_PATCHES(%s) は、QUILT_PC(%s) と異なる設定にする必要があります\\n" -#: quilt/new.in:97 quilt/refresh.in:185 +#: quilt/new.in:97 quilt/refresh.in:182 msgid "Patch %s exists already\\n" msgstr "パッチ %s は、すでに存在します\\n" @@ -918,15 +918,15 @@ msgstr "パッチ %s は、すでに存在します\\n" msgid "Patch %s is now on top\\n" msgstr "パッチ %s を最上位にしました\\n" -#: quilt/new.in:110 quilt/refresh.in:340 +#: quilt/new.in:110 quilt/refresh.in:337 msgid "Failed to create patch %s\\n" msgstr "パッチ %s の作成に失敗しました\\n" -#: quilt/next.in:22 +#: quilt/next.in:11 msgid "Usage: quilt next [patch]\\n" msgstr "使い方: quilt next [パッチ]\\n" -#: quilt/next.in:25 +#: quilt/next.in:14 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" @@ -935,13 +935,13 @@ msgstr "" "\n" "最上位または指定されたパッチの次のパッチ名を表示。\n" -#: quilt/patches.in:24 +#: quilt/patches.in:13 msgid "" "Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "" "使い方: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" -#: quilt/patches.in:27 +#: quilt/patches.in:16 msgid "" "\n" "Print the list of patches that modify any of the specified files. (Uses a\n" @@ -964,11 +964,11 @@ msgstr "" "--color[=always|auto|never]\n" "\tシンタックスの色付け指定(ttyへの出力に限り自動的に有効化される)。\n" -#: quilt/pop.in:22 +#: quilt/pop.in:11 msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n" msgstr "使い方: quilt pop [-afRqv] [--refresh] [num|patch]\\n" -#: quilt/pop.in:25 +#: quilt/pop.in:14 msgid "" "\n" "Remove patch(es) from the stack of applied patches. Without options,\n" @@ -1016,49 +1016,53 @@ msgstr "" "--refresh\n" "\tパッチを外す前に自動的にパッチを更新する。\n" -#: quilt/pop.in:103 quilt/scripts/patchfns.in:930 +#: quilt/pop.in:92 quilt/scripts/patchfns.in:977 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/pop.in:128 +#: quilt/pop.in:117 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" "けてはずしてください)\\n" -#: quilt/pop.in:153 +#: quilt/pop.in:119 +msgid "Hint: \\`quilt diff -z' will show the pending changes.\\n" +msgstr "" + +#: quilt/pop.in:143 msgid "Patch %s appears to be empty, removing\\n" msgstr "パッチ %s は、空のようです。はずします\\n" -#: quilt/pop.in:158 +#: quilt/pop.in:148 msgid "Removing patch %s\\n" msgstr "パッチ %s をはずします\\n" -#: quilt/pop.in:216 quilt/push.in:376 +#: quilt/pop.in:214 quilt/push.in:376 msgid "Options %s and %s are mutually exclusive\\n" msgstr "オプション %s と %s は、同時に使用できません\\n" -#: quilt/pop.in:238 +#: quilt/pop.in:236 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" -#: quilt/pop.in:248 +#: quilt/pop.in:246 msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:272 quilt/scripts/patchfns.in:527 +#: quilt/pop.in:270 quilt/scripts/patchfns.in:511 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:279 quilt/push.in:440 +#: quilt/pop.in:277 quilt/push.in:440 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です\\n" -#: quilt/previous.in:22 +#: quilt/previous.in:11 msgid "Usage: quilt previous [patch]\\n" msgstr "使い方: quilt previous [パッチ]\\n" -#: quilt/previous.in:25 +#: quilt/previous.in:14 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" @@ -1068,7 +1072,7 @@ msgstr "" "最上位のパッチの前のパッチ名を表示。パッチ名が指定されたときは、指定\n" "されたパッチの前のパッチ名を表示。\n" -#: quilt/push.in:24 +#: quilt/push.in:11 msgid "" "Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" @@ -1076,7 +1080,7 @@ msgstr "" "使い方: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" -#: quilt/push.in:27 +#: quilt/push.in:14 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -1142,36 +1146,36 @@ msgstr "" "\tパッチを外す前に自動的にパッチを更新する。\n" "\n" -#: quilt/push.in:70 +#: quilt/push.in:57 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "ユーザによって中断されました。パッチ %s は適用されていません。\\n" -#: quilt/push.in:186 +#: quilt/push.in:176 msgid "Applying patch %s\\n" msgstr "パッチ %s を適用しています\\n" -#: quilt/push.in:220 +#: quilt/push.in:210 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n" -#: quilt/push.in:224 +#: quilt/push.in:214 msgid "Patch %s appears to be empty; applied\\n" msgstr "パッチ %s は空のようですが、適用しました\\n" -#: quilt/push.in:228 +#: quilt/push.in:218 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" "パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: quilt/push.in:238 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "パッチ %s は、反転して適用することができます\\n" -#: quilt/push.in:241 +#: quilt/push.in:231 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n" -#: quilt/push.in:296 +#: quilt/push.in:286 msgid "Patch %s is already applied; check your series file\\n" msgstr "" "パッチ %s はすでに適用されています。シリーズファイルを確認してください\\n" @@ -1184,7 +1188,7 @@ msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" msgid "No patch applied\\n" msgstr "パッチはひとつも適用されませんでした\\n" -#: quilt/refresh.in:22 +#: quilt/refresh.in:11 msgid "" "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] " "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" @@ -1194,7 +1198,7 @@ msgstr "" "f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" "trailing-whitespace] [パッチ]\\n" -#: quilt/refresh.in:26 +#: quilt/refresh.in:15 msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1294,47 +1298,47 @@ msgstr "" "--strip-trailing-whitespace\n" "\t末尾の空白文字を削除する。\n" -#: quilt/refresh.in:171 +#: quilt/refresh.in:168 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "-zオプションがある場合、最上位パッチ以外のリフレッシュはできません\\n" -#: quilt/refresh.in:202 +#: quilt/refresh.in:199 msgid "" "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "-p%s でパッチを作成することができません。-p0、-p1 または -pab を指定してくだ" "さい\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:237 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実" "行する場合は -f オプションを使用してください。\\n" -#: quilt/refresh.in:246 +#: quilt/refresh.in:243 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "--strip-trailing-whitespace は影になっているファイルがある場合は使えません" -#: quilt/refresh.in:252 quilt/refresh.in:352 +#: quilt/refresh.in:249 quilt/refresh.in:349 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:321 msgid "Patch %s is unchanged\\n" msgstr "パッチ %s に変更はありません\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:347 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" -#: quilt/remove.in:22 +#: quilt/remove.in:11 msgid "Usage: quilt remove [-P patch] {file} ...\\n" msgstr "使い方: quilt remove [-P パッチ] {ファイル} ...\\n" -#: quilt/remove.in:25 +#: quilt/remove.in:14 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -1350,23 +1354,23 @@ msgstr "" "-P パッチ\n" "\tファイルを削除するパッチを指定。\n" -#: quilt/remove.in:73 quilt/revert.in:75 +#: quilt/remove.in:70 quilt/revert.in:72 msgid "File %s is not in patch %s\\n" msgstr "ファイル %s は、パッチ %s に含まれていません\\n" -#: quilt/remove.in:91 +#: quilt/remove.in:88 msgid "Failed to remove file %s from patch %s\\n" msgstr "ファイル %s をパッチ %s から削除するのに失敗しました\\n" -#: quilt/remove.in:105 +#: quilt/remove.in:102 msgid "File %s removed from patch %s\\n" msgstr "ファイル %s を、パッチ %s から削除しました\\n" -#: quilt/rename.in:22 +#: quilt/rename.in:11 msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "使い方: quilt rename [-P patch] new_name\\n" -#: quilt/rename.in:25 +#: quilt/rename.in:14 msgid "" "\n" "Rename the topmost or named patch.\n" @@ -1380,23 +1384,23 @@ msgstr "" "-P patch\n" "\t名前を変更する patch\n" -#: quilt/rename.in:84 +#: quilt/rename.in:81 msgid "Patch %s exists already, please choose a different name\\n" msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n" -#: quilt/rename.in:98 +#: quilt/rename.in:95 msgid "Renaming of patch %s to %s failed\\n" msgstr "パッチ %s から %s への名前の変更に失敗しました\\n" -#: quilt/rename.in:104 +#: quilt/rename.in:101 msgid "Patch %s renamed to %s\\n" msgstr "パッチ %s から %s へ名前を変更しました\\n" -#: quilt/revert.in:22 +#: quilt/revert.in:11 msgid "Usage: quilt revert [-P patch] {file} ...\\n" msgstr "使い方: quilt revert [-P パッチ] {ファイル} ...\\n" -#: quilt/revert.in:25 +#: quilt/revert.in:14 msgid "" "\n" "Revert uncommitted changes to the topmost or named patch for the specified\n" @@ -1418,15 +1422,15 @@ msgstr "" "-P パッチ\n" "\tファイルを削除するパッチを指定。\n" -#: quilt/revert.in:103 quilt/revert.in:112 +#: quilt/revert.in:100 quilt/revert.in:109 msgid "File %s is unchanged\\n" msgstr "ファイル %s に変更はありません\\n" -#: quilt/revert.in:120 +#: quilt/revert.in:117 msgid "Failed to revert changes to %s in patch %s\\n" msgstr "%s への変更(パッチ %s 内)を元に戻すことに失敗しました" -#: quilt/revert.in:124 +#: quilt/revert.in:121 msgid "Changes to %s in patch %s reverted\\n" msgstr "%s への変更 (パッチ %s 内) を元に戻しました" @@ -1440,40 +1444,36 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます msgid "Delivery address `%s' is invalid\n" msgstr "配送先のアドレス `%s' が不正です\n" -#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:237 quilt/scripts/patchfns.in:524 msgid "%s is not a regular file\\n" msgstr "%s は普通のファイルではありません\\n" -#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:486 quilt/scripts/patchfns.in:498 msgid "No patches in series\\n" msgstr "シリーズに登録されているパッチがありません\\n" -#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513 -msgid "No series file found\\n" -msgstr "シリーズファイルが見つかりません\\n" - -#: quilt/scripts/patchfns.in:569 +#: quilt/scripts/patchfns.in:553 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:597 +#: quilt/scripts/patchfns.in:581 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/scripts/patchfns.in:634 +#: quilt/scripts/patchfns.in:618 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: quilt/scripts/patchfns.in:779 +#: quilt/scripts/patchfns.in:774 msgid "Diff failed on file '%s', aborting\\n" msgstr "ファイル'%s'の差分に失敗しました。異常終了します\\n" -#: quilt/scripts/patchfns.in:948 +#: quilt/scripts/patchfns.in:995 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: quilt/scripts/patchfns.in:991 +#: quilt/scripts/patchfns.in:1038 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1485,17 +1485,17 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:1064 +#: quilt/scripts/patchfns.in:1113 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n" msgstr "" "'%s' (%s パッケージ) がインストールされていないと、'quilt %s' は利用できませ" "ん\\n" -#: quilt/scripts/patchfns.in:1143 +#: quilt/scripts/patchfns.in:1192 msgid "Cannot change into parent directory %s/\\n" msgstr "上のディレクトリー %s に変更できません/\\n" -#: quilt/scripts/patchfns.in:1184 +#: quilt/scripts/patchfns.in:1237 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1503,7 +1503,7 @@ msgstr "" "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので" "す。'quilt upgrade'を実行してください。\\n" -#: quilt/scripts/patchfns.in:1192 +#: quilt/scripts/patchfns.in:1245 msgid "" "The series file no longer matches the applied patches. Please run 'quilt pop " "-a'.\\n" @@ -1511,6 +1511,10 @@ msgstr "" "シリーズファイルと適用されているパッチとの整合性が取れません。'quilt\n" "pop'を実行してください。\\n" +#: quilt/scripts/patchfns.in:1254 +msgid "No series file found\\n" +msgstr "シリーズファイルが見つかりません\\n" + #: quilt/scripts/remove-trailing-ws.in:43 #, perl-format msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" @@ -1546,11 +1550,11 @@ msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n" msgid "Renaming %s to %s: %s\n" msgstr "%s から %s へ名前を変更しました: %s\n" -#: quilt/series.in:22 +#: quilt/series.in:11 msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" msgstr "使い方: quilt series [--color[=always|auto|never]] [-v]\\n" -#: quilt/series.in:25 +#: quilt/series.in:14 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1569,15 +1573,15 @@ msgstr "" "-v\t詳細で見やすい表示。\n" "\n" -#: quilt/setup.in:38 quilt/setup.in:58 +#: quilt/setup.in:23 quilt/setup.in:43 msgid "Directory %s exists\\n" msgstr "ディレクトリ %s は、すでに存在します\\n" -#: quilt/setup.in:64 +#: quilt/setup.in:49 msgid "File %s exists\\n" msgstr "ファイル %s は、すでに存在します\\n" -#: quilt/setup.in:274 +#: quilt/setup.in:265 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--" "slow|--fast] {specfile|seriesfile}\\n" @@ -1585,7 +1589,8 @@ msgstr "" "使い方: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--" "slow|--fast] {specfile|seriesfile}\\n" -#: quilt/setup.in:277 +#: quilt/setup.in:268 +#, fuzzy msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1600,15 +1605,23 @@ msgid "" "--fuzz=N\n" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" "\n" -"--slow\tUse the original, slow method to process the spec file. This is the\n" -"\tdefault for now, but that might change in the future. In this mode,\n" +"--slow\tUse the original, slow method to process the spec file. In this " +"mode,\n" "\trpmbuild generates a working tree in a temporary directory while all\n" "\tits actions are recorded, and then everything is replayed from scratch\n" "\tin the target directory.\n" "\n" -"--fast\tUse an alternative, faster method to process the spec file. In this\n" -"\tmode, rpmbuild is told to generate a working tree directly in the\n" -"\ttarget directory.\n" +"--fast\tUse the new, faster method to process the spec file. In this mode,\n" +"\trpmbuild is told to generate a working tree directly in the target\n" +"\tdirectory. This is the default (since quilt version 0.67).\n" +"\n" +"The setup command is only guaranteed to work properly on spec files where\n" +"applying all the patches is the last thing done in the %%prep section. This " +"is\n" +"a design limitation due to the fact that quilt can only operate on patches. " +"If\n" +"other commands in the %%prep section modify the patched files, this must\n" +"happen first, otherwise you won't be able to push the patch series.\n" msgstr "" "\n" "rpmの specファイルまたは quiltの seriesファイルを使って、ソースツリー\n" @@ -1633,33 +1646,33 @@ msgstr "" "\trpmbuild はターゲットディレクトリで作業ツリーの生成を指示され\n" "\tる。\n" -#: quilt/setup.in:380 +#: quilt/setup.in:396 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま" "す\\n" -#: quilt/setup.in:383 +#: quilt/setup.in:399 msgid "The -v option will show rpm's output\\n" msgstr "-vオプションを使って、rpmの出力を表示できます" -#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467 +#: quilt/setup.in:460 quilt/setup.in:472 quilt/setup.in:483 msgid "File %s not found\\n" msgstr "ファイル %s が見つかりません" -#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470 +#: quilt/setup.in:463 quilt/setup.in:475 quilt/setup.in:486 msgid "Unpacking archive %s\\n" msgstr "アーカイブ %s を展開しています\\n" -#: quilt/setup.in:480 +#: quilt/setup.in:496 msgid "Trying alternative patches and series names..." msgstr "別名の patches と series を試します..." -#: quilt/snapshot.in:22 +#: quilt/snapshot.in:11 msgid "Usage: quilt snapshot [-d]\\n" msgstr "使い方: quilt snapshot [-d]\\n" -#: quilt/snapshot.in:25 +#: quilt/snapshot.in:14 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1678,11 +1691,11 @@ msgstr "" "-d\t現在のスナップショットを削除。\n" "\n" -#: quilt/top.in:22 +#: quilt/top.in:11 msgid "Usage: quilt top\\n" msgstr "使い方: quilt top\\n" -#: quilt/top.in:25 +#: quilt/top.in:14 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" @@ -1691,11 +1704,11 @@ msgstr "" "\n" "現在適用されているパッチスタックの最上位パッチ名を表示\n" -#: quilt/unapplied.in:22 +#: quilt/unapplied.in:11 msgid "Usage: quilt unapplied [patch]\\n" msgstr "使い方: quilt unapplied [パッチ]\\n" -#: quilt/unapplied.in:25 +#: quilt/unapplied.in:14 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" @@ -1705,11 +1718,11 @@ msgstr "" "適用されていないパッチを表示。パッチが指定された場合は、指定されたパッ\n" "チ以降で適用されていないパッチを表示。\n" -#: quilt/upgrade.in:25 +#: quilt/upgrade.in:15 msgid "Usage: quilt upgrade\\n" msgstr "使い方: quilt upgrade\\n" -#: quilt/upgrade.in:28 +#: quilt/upgrade.in:18 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1725,7 +1738,7 @@ msgstr "" "場合のみ必要。変更が確認された場合、quiltから \\`quilt upgrade'の実行が\n" "要求される。\n" -#: quilt/upgrade.in:67 +#: quilt/upgrade.in:65 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" @@ -1733,15 +1746,15 @@ msgstr "" "%s 内の quilt メタデータはすでに version %s フォーマットのため、処理する必要" "がありません。\\n" -#: quilt/upgrade.in:71 +#: quilt/upgrade.in:69 msgid "Converting meta-data to version %s\\n" msgstr "メタデータを version %s に変更中です\\n" -#: quilt/upgrade.in:102 +#: quilt/upgrade.in:100 msgid "Conversion failed\\n" msgstr "変更に失敗しました\\n" -#: quilt/upgrade.in:103 +#: quilt/upgrade.in:101 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " diff --git a/po/quilt.pot b/po/quilt.pot index 4465ff3..7612d28 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -29,11 +29,11 @@ msgid "" "\tPrint the version number and exit immediately.\\n" msgstr "" -#: quilt/add.in:22 +#: quilt/add.in:11 msgid "Usage: quilt add [-P patch] {file} ...\\n" msgstr "" -#: quilt/add.in:25 +#: quilt/add.in:14 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -44,35 +44,35 @@ msgid "" "\tPatch to add files to.\n" msgstr "" -#: quilt/add.in:48 quilt/add.in:54 +#: quilt/add.in:37 quilt/add.in:43 msgid "File %s is located below %s\\n" msgstr "" -#: quilt/add.in:103 +#: quilt/add.in:100 msgid "File %s is already in patch %s\\n" msgstr "" -#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84 +#: quilt/add.in:108 quilt/remove.in:79 quilt/revert.in:81 msgid "File %s modified by patch %s\\n" msgstr "" -#: quilt/add.in:119 +#: quilt/add.in:116 msgid "Cannot add symbolic link %s\\n" msgstr "" -#: quilt/add.in:126 +#: quilt/add.in:123 msgid "Failed to back up file %s\\n" msgstr "" -#: quilt/add.in:137 +#: quilt/add.in:134 msgid "File %s added to patch %s\\n" msgstr "" -#: quilt/annotate.in:22 +#: quilt/annotate.in:11 msgid "Usage: quilt annotate [-P patch] {file}\\n" msgstr "" -#: quilt/annotate.in:25 +#: quilt/annotate.in:14 msgid "" "\n" "Print an annotated listing of the specified file showing which\n" @@ -83,22 +83,22 @@ msgid "" "\ttopmost patch.\n" msgstr "" -#: quilt/applied.in:22 +#: quilt/applied.in:11 msgid "Usage: quilt applied [patch]\\n" msgstr "" -#: quilt/applied.in:25 +#: quilt/applied.in:14 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/delete.in:22 +#: quilt/delete.in:11 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "" -#: quilt/delete.in:25 +#: quilt/delete.in:14 msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -115,38 +115,38 @@ msgid "" "\tIgnored if not used with \\`-r'.\n" msgstr "" -#: quilt/delete.in:89 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:618 +#: quilt/delete.in:99 quilt/scripts/patchfns.in:602 msgid "Patch %s is currently applied\\n" msgstr "" -#: quilt/delete.in:114 +#: quilt/delete.in:111 msgid "Removed patch %s\\n" msgstr "" -#: quilt/delete.in:116 +#: quilt/delete.in:113 msgid "Failed to remove patch %s\\n" msgstr "" -#: quilt/delete.in:127 +#: quilt/delete.in:124 msgid "Failed to backup patch file %s\\n" msgstr "" -#: quilt/delete.in:134 +#: quilt/delete.in:131 msgid "Failed to remove patch file %s\\n" msgstr "" -#: quilt/diff.in:24 +#: quilt/diff.in:11 msgid "" "Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " "[--sort] [--color[=always|auto|never]] [file ...]\\n" msgstr "" -#: quilt/diff.in:28 +#: quilt/diff.in:15 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -197,52 +197,52 @@ msgid "" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: quilt/diff.in:226 +#: quilt/diff.in:221 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: quilt/diff.in:240 +#: quilt/diff.in:235 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -#: quilt/diff.in:249 +#: quilt/diff.in:244 msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:432 +#: quilt/diff.in:278 quilt/files.in:107 quilt/mail.in:429 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:351 +#: quilt/diff.in:346 msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:370 +#: quilt/diff.in:365 msgid "Diff failed, aborting\\n" msgstr "" -#: quilt/diff.in:377 +#: quilt/diff.in:372 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "" -#: quilt/edit.in:24 +#: quilt/edit.in:13 msgid "Usage: quilt edit file ...\\n" msgstr "" -#: quilt/edit.in:27 +#: quilt/edit.in: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.in:11 msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" msgstr "" -#: quilt/files.in:25 +#: quilt/files.in:14 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -260,11 +260,11 @@ msgid "" "\n" msgstr "" -#: quilt/fold.in:22 +#: quilt/fold.in:11 msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" msgstr "" -#: quilt/fold.in:25 +#: quilt/fold.in:14 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -284,15 +284,15 @@ msgid "" "\twhen applying patchfile.\n" msgstr "" -#: quilt/fold.in:131 +#: quilt/fold.in:128 msgid "File %s may be corrupted\\n" msgstr "" -#: quilt/fork.in:22 +#: quilt/fork.in:11 msgid "Usage: quilt fork [new_name]\\n" msgstr "" -#: quilt/fork.in:25 +#: quilt/fork.in:14 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -308,25 +308,25 @@ msgid "" "patch-2.diff, patch-3.diff).\n" msgstr "" -#: quilt/fork.in:84 +#: quilt/fork.in:81 msgid "Patch %s exists already, please choose a new name\\n" msgstr "" -#: quilt/fork.in:96 +#: quilt/fork.in:93 msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: quilt/fork.in:102 quilt/refresh.in:344 +#: quilt/fork.in:99 quilt/refresh.in:341 msgid "Fork of patch %s created as %s\\n" msgstr "" -#: quilt/graph.in:22 +#: quilt/graph.in:11 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [patch]\\n" msgstr "" -#: quilt/graph.in:26 +#: quilt/graph.in:15 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -357,11 +357,11 @@ msgid "" "-T ps\tDirectly produce a PostScript output file.\n" msgstr "" -#: quilt/grep.in:22 +#: quilt/grep.in:11 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "" -#: quilt/grep.in:25 +#: quilt/grep.in:14 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -373,13 +373,13 @@ msgid "" "\tcan be passed after a second double-dash (-- --).\n" msgstr "" -#: quilt/header.in:24 +#: quilt/header.in:13 msgid "" "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" msgstr "" -#: quilt/header.in:28 +#: quilt/header.in:17 msgid "" "\n" "Print or change the header of the topmost or specified patch.\n" @@ -399,21 +399,21 @@ msgid "" "\tCreate a backup copy of the old version of a patch as patch~.\n" msgstr "" -#: quilt/header.in:170 +#: quilt/header.in:167 msgid "Replaced header of patch %s\\n" msgstr "" -#: quilt/header.in:173 +#: quilt/header.in:170 msgid "Appended text to header of patch %s\\n" msgstr "" -#: quilt/import.in:22 +#: quilt/import.in:14 msgid "" "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..." "\\n" msgstr "" -#: quilt/import.in:25 +#: quilt/import.in:17 msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -437,55 +437,55 @@ msgid "" "\tmust be specified. This option is only effective when -f is used.\n" msgstr "" -#: quilt/import.in:73 quilt/mail.in:463 +#: quilt/import.in:65 quilt/mail.in:460 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/import.in:96 +#: quilt/import.in:88 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:99 +#: quilt/import.in:91 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:164 +#: quilt/import.in:156 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" -#: quilt/import.in:194 +#: quilt/import.in:195 msgid "Patch %s is applied\\n" msgstr "" -#: quilt/import.in:203 +#: quilt/import.in:204 msgid "Patch %s already exists in series.\\n" msgstr "" -#: quilt/import.in:209 +#: quilt/import.in:210 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: quilt/import.in:220 +#: quilt/import.in:221 msgid "Replacing patch %s with new version\\n" msgstr "" -#: quilt/import.in:224 +#: quilt/import.in:225 msgid "Importing patch %s\\n" msgstr "" -#: quilt/import.in:226 +#: quilt/import.in:227 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: quilt/import.in:239 +#: quilt/import.in:240 msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:248 quilt/refresh.in:331 +#: quilt/import.in:249 quilt/refresh.in:328 msgid "Failed to insert patch %s into file series\\n" msgstr "" -#: quilt/mail.in:24 +#: quilt/mail.in:13 msgid "" "Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] " "[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--" @@ -493,7 +493,7 @@ msgid "" "[first_patch [last_patch]]\\n" msgstr "" -#: quilt/mail.in:27 +#: quilt/mail.in:16 msgid "" "\n" "Create mail messages from a specified range of patches, or all patches in\n" @@ -546,43 +546,43 @@ msgid "" "\tAdd the appropriate headers to reply to the specified message.\n" msgstr "" -#: quilt/mail.in:209 quilt/mail.in:217 +#: quilt/mail.in:198 quilt/mail.in:206 msgid "Introduction message already specified" msgstr "" -#: quilt/mail.in:315 +#: quilt/mail.in:312 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:466 +#: quilt/mail.in:463 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:492 +#: quilt/mail.in:489 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:501 +#: quilt/mail.in:498 msgid "File %s does not exist\\n" msgstr "" -#: quilt/mail.in:561 +#: quilt/mail.in:558 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:564 +#: quilt/mail.in:561 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:677 +#: quilt/mail.in:674 msgid "Introduction saved as %s\\n" msgstr "" -#: quilt/new.in:22 +#: quilt/new.in:14 msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n" msgstr "" -#: quilt/new.in:25 +#: quilt/new.in:17 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -602,7 +602,7 @@ msgid "" "in the directory tree.\n" msgstr "" -#: quilt/new.in:76 +#: quilt/new.in:68 msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "" @@ -611,7 +611,7 @@ msgstr "" msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n" msgstr "" -#: quilt/new.in:97 quilt/refresh.in:185 +#: quilt/new.in:97 quilt/refresh.in:182 msgid "Patch %s exists already\\n" msgstr "" @@ -619,27 +619,27 @@ msgstr "" msgid "Patch %s is now on top\\n" msgstr "" -#: quilt/new.in:110 quilt/refresh.in:340 +#: quilt/new.in:110 quilt/refresh.in:337 msgid "Failed to create patch %s\\n" msgstr "" -#: quilt/next.in:22 +#: quilt/next.in:11 msgid "Usage: quilt next [patch]\\n" msgstr "" -#: quilt/next.in:25 +#: quilt/next.in:14 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:24 +#: quilt/patches.in:13 msgid "" "Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "" -#: quilt/patches.in:27 +#: quilt/patches.in:16 msgid "" "\n" "Print the list of patches that modify any of the specified files. (Uses a\n" @@ -652,11 +652,11 @@ msgid "" "\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" -#: quilt/pop.in:22 +#: quilt/pop.in:11 msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n" msgstr "" -#: quilt/pop.in:25 +#: quilt/pop.in:14 msgid "" "\n" "Remove patch(es) from the stack of applied patches. Without options,\n" @@ -682,60 +682,64 @@ msgid "" "\tAutomatically refresh every patch before it gets unapplied.\n" msgstr "" -#: quilt/pop.in:103 quilt/scripts/patchfns.in:930 +#: quilt/pop.in:92 quilt/scripts/patchfns.in:977 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/pop.in:128 +#: quilt/pop.in:117 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: quilt/pop.in:153 +#: quilt/pop.in:119 +msgid "Hint: \\`quilt diff -z' will show the pending changes.\\n" +msgstr "" + +#: quilt/pop.in:143 msgid "Patch %s appears to be empty, removing\\n" msgstr "" -#: quilt/pop.in:158 +#: quilt/pop.in:148 msgid "Removing patch %s\\n" msgstr "" -#: quilt/pop.in:216 quilt/push.in:376 +#: quilt/pop.in:214 quilt/push.in:376 msgid "Options %s and %s are mutually exclusive\\n" msgstr "" -#: quilt/pop.in:238 +#: quilt/pop.in:236 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/pop.in:248 +#: quilt/pop.in:246 msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:272 quilt/scripts/patchfns.in:527 +#: quilt/pop.in:270 quilt/scripts/patchfns.in:511 msgid "No patches applied\\n" msgstr "" -#: quilt/pop.in:279 quilt/push.in:440 +#: quilt/pop.in:277 quilt/push.in:440 msgid "Now at patch %s\\n" msgstr "" -#: quilt/previous.in:22 +#: quilt/previous.in:11 msgid "Usage: quilt previous [patch]\\n" msgstr "" -#: quilt/previous.in:25 +#: quilt/previous.in:14 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.in:11 msgid "" "Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" msgstr "" -#: quilt/push.in:27 +#: quilt/push.in:14 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -770,35 +774,35 @@ msgid "" "\tAutomatically refresh every patch after it was successfully applied.\n" msgstr "" -#: quilt/push.in:70 +#: quilt/push.in:57 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: quilt/push.in:186 +#: quilt/push.in:176 msgid "Applying patch %s\\n" msgstr "" -#: quilt/push.in:220 +#: quilt/push.in:210 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "" -#: quilt/push.in:224 +#: quilt/push.in:214 msgid "Patch %s appears to be empty; applied\\n" msgstr "" -#: quilt/push.in:228 +#: quilt/push.in:218 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: quilt/push.in:238 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "" -#: quilt/push.in:241 +#: quilt/push.in:231 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: quilt/push.in:296 +#: quilt/push.in:286 msgid "Patch %s is already applied; check your series file\\n" msgstr "" @@ -810,14 +814,14 @@ msgstr "" msgid "No patch applied\\n" msgstr "" -#: quilt/refresh.in:22 +#: quilt/refresh.in:11 msgid "" "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] " "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" "trailing-whitespace] [patch]\\n" msgstr "" -#: quilt/refresh.in:26 +#: quilt/refresh.in:15 msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -869,42 +873,42 @@ msgid "" "\tStrip trailing whitespace at the end of lines.\n" msgstr "" -#: quilt/refresh.in:171 +#: quilt/refresh.in:168 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "" -#: quilt/refresh.in:202 +#: quilt/refresh.in:199 msgid "" "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -#: quilt/refresh.in:240 +#: quilt/refresh.in:237 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: quilt/refresh.in:246 +#: quilt/refresh.in:243 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:252 quilt/refresh.in:352 +#: quilt/refresh.in:249 quilt/refresh.in:349 msgid "Nothing in patch %s\\n" msgstr "" -#: quilt/refresh.in:324 +#: quilt/refresh.in:321 msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:350 +#: quilt/refresh.in:347 msgid "Refreshed patch %s\\n" msgstr "" -#: quilt/remove.in:22 +#: quilt/remove.in:11 msgid "Usage: quilt remove [-P patch] {file} ...\\n" msgstr "" -#: quilt/remove.in:25 +#: quilt/remove.in:14 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -914,23 +918,23 @@ msgid "" "\tRemove named files from the named patch.\n" msgstr "" -#: quilt/remove.in:73 quilt/revert.in:75 +#: quilt/remove.in:70 quilt/revert.in:72 msgid "File %s is not in patch %s\\n" msgstr "" -#: quilt/remove.in:91 +#: quilt/remove.in:88 msgid "Failed to remove file %s from patch %s\\n" msgstr "" -#: quilt/remove.in:105 +#: quilt/remove.in:102 msgid "File %s removed from patch %s\\n" msgstr "" -#: quilt/rename.in:22 +#: quilt/rename.in:11 msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "" -#: quilt/rename.in:25 +#: quilt/rename.in:14 msgid "" "\n" "Rename the topmost or named patch.\n" @@ -939,23 +943,23 @@ msgid "" "\tPatch to rename.\n" msgstr "" -#: quilt/rename.in:84 +#: quilt/rename.in:81 msgid "Patch %s exists already, please choose a different name\\n" msgstr "" -#: quilt/rename.in:98 +#: quilt/rename.in:95 msgid "Renaming of patch %s to %s failed\\n" msgstr "" -#: quilt/rename.in:104 +#: quilt/rename.in:101 msgid "Patch %s renamed to %s\\n" msgstr "" -#: quilt/revert.in:22 +#: quilt/revert.in:11 msgid "Usage: quilt revert [-P patch] {file} ...\\n" msgstr "" -#: quilt/revert.in:25 +#: quilt/revert.in:14 msgid "" "\n" "Revert uncommitted changes to the topmost or named patch for the specified\n" @@ -969,15 +973,15 @@ msgid "" "\tRevert changes in the named patch.\n" msgstr "" -#: quilt/revert.in:103 quilt/revert.in:112 +#: quilt/revert.in:100 quilt/revert.in:109 msgid "File %s is unchanged\\n" msgstr "" -#: quilt/revert.in:120 +#: quilt/revert.in:117 msgid "Failed to revert changes to %s in patch %s\\n" msgstr "" -#: quilt/revert.in:124 +#: quilt/revert.in:121 msgid "Changes to %s in patch %s reverted\\n" msgstr "" @@ -991,39 +995,35 @@ msgstr "" msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:237 quilt/scripts/patchfns.in:524 msgid "%s is not a regular file\\n" msgstr "" -#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:486 quilt/scripts/patchfns.in:498 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513 -msgid "No series file found\\n" -msgstr "" - -#: quilt/scripts/patchfns.in:569 +#: quilt/scripts/patchfns.in:553 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:597 +#: quilt/scripts/patchfns.in:581 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:634 +#: quilt/scripts/patchfns.in:618 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:779 +#: quilt/scripts/patchfns.in:774 msgid "Diff failed on file '%s', aborting\\n" msgstr "" -#: quilt/scripts/patchfns.in:948 +#: quilt/scripts/patchfns.in:995 msgid "Failed to patch temporary files\\n" msgstr "" -#: quilt/scripts/patchfns.in:991 +#: quilt/scripts/patchfns.in:1038 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1031,26 +1031,30 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1064 +#: quilt/scripts/patchfns.in:1113 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n" msgstr "" -#: quilt/scripts/patchfns.in:1143 +#: quilt/scripts/patchfns.in:1192 msgid "Cannot change into parent directory %s/\\n" msgstr "" -#: quilt/scripts/patchfns.in:1184 +#: quilt/scripts/patchfns.in:1237 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1192 +#: quilt/scripts/patchfns.in:1245 msgid "" "The series file no longer matches the applied patches. Please run 'quilt pop " "-a'.\\n" msgstr "" +#: quilt/scripts/patchfns.in:1254 +msgid "No series file found\\n" +msgstr "" + #: quilt/scripts/remove-trailing-ws.in:43 #, perl-format msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" @@ -1086,11 +1090,11 @@ msgstr "" msgid "Renaming %s to %s: %s\n" msgstr "" -#: quilt/series.in:22 +#: quilt/series.in:11 msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" msgstr "" -#: quilt/series.in:25 +#: quilt/series.in:14 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1101,21 +1105,21 @@ msgid "" "-v\tVerbose, more user friendly output.\n" msgstr "" -#: quilt/setup.in:38 quilt/setup.in:58 +#: quilt/setup.in:23 quilt/setup.in:43 msgid "Directory %s exists\\n" msgstr "" -#: quilt/setup.in:64 +#: quilt/setup.in:49 msgid "File %s exists\\n" msgstr "" -#: quilt/setup.in:274 +#: quilt/setup.in:265 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--" "slow|--fast] {specfile|seriesfile}\\n" msgstr "" -#: quilt/setup.in:277 +#: quilt/setup.in:268 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1130,42 +1134,50 @@ msgid "" "--fuzz=N\n" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" "\n" -"--slow\tUse the original, slow method to process the spec file. This is the\n" -"\tdefault for now, but that might change in the future. In this mode,\n" +"--slow\tUse the original, slow method to process the spec file. In this " +"mode,\n" "\trpmbuild generates a working tree in a temporary directory while all\n" "\tits actions are recorded, and then everything is replayed from scratch\n" "\tin the target directory.\n" "\n" -"--fast\tUse an alternative, faster method to process the spec file. In this\n" -"\tmode, rpmbuild is told to generate a working tree directly in the\n" -"\ttarget directory.\n" +"--fast\tUse the new, faster method to process the spec file. In this mode,\n" +"\trpmbuild is told to generate a working tree directly in the target\n" +"\tdirectory. This is the default (since quilt version 0.67).\n" +"\n" +"The setup command is only guaranteed to work properly on spec files where\n" +"applying all the patches is the last thing done in the %%prep section. This " +"is\n" +"a design limitation due to the fact that quilt can only operate on patches. " +"If\n" +"other commands in the %%prep section modify the patched files, this must\n" +"happen first, otherwise you won't be able to push the patch series.\n" msgstr "" -#: quilt/setup.in:380 +#: quilt/setup.in:396 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" -#: quilt/setup.in:383 +#: quilt/setup.in:399 msgid "The -v option will show rpm's output\\n" msgstr "" -#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467 +#: quilt/setup.in:460 quilt/setup.in:472 quilt/setup.in:483 msgid "File %s not found\\n" msgstr "" -#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470 +#: quilt/setup.in:463 quilt/setup.in:475 quilt/setup.in:486 msgid "Unpacking archive %s\\n" msgstr "" -#: quilt/setup.in:480 +#: quilt/setup.in:496 msgid "Trying alternative patches and series names..." msgstr "" -#: quilt/snapshot.in:22 +#: quilt/snapshot.in:11 msgid "Usage: quilt snapshot [-d]\\n" msgstr "" -#: quilt/snapshot.in:25 +#: quilt/snapshot.in:14 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1176,33 +1188,33 @@ msgid "" "-d\tOnly remove current snapshot.\n" msgstr "" -#: quilt/top.in:22 +#: quilt/top.in:11 msgid "Usage: quilt top\\n" msgstr "" -#: quilt/top.in:25 +#: quilt/top.in:14 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.in:11 msgid "Usage: quilt unapplied [patch]\\n" msgstr "" -#: quilt/unapplied.in:25 +#: quilt/unapplied.in:14 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.in:15 msgid "Usage: quilt upgrade\\n" msgstr "" -#: quilt/upgrade.in:28 +#: quilt/upgrade.in:18 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1213,21 +1225,21 @@ msgid "" "case, quilt will request to run \\`quilt upgrade'.\n" msgstr "" -#: quilt/upgrade.in:67 +#: quilt/upgrade.in:65 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.in:69 msgid "Converting meta-data to version %s\\n" msgstr "" -#: quilt/upgrade.in:102 +#: quilt/upgrade.in:100 msgid "Conversion failed\\n" msgstr "" -#: quilt/upgrade.in:103 +#: quilt/upgrade.in:101 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " @@ -64,11 +64,11 @@ msgstr "" "--version\n" "\tНапечатать номер версии и выйти из программы.\\n" -#: quilt/add.in:22 +#: quilt/add.in:11 msgid "Usage: quilt add [-P patch] {file} ...\\n" msgstr "Синтаксис: quilt add [-P патч] {файл} …\\n" -#: quilt/add.in:25 +#: quilt/add.in:14 msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" @@ -87,35 +87,35 @@ msgstr "" "-P патч\n" "\tПатч, к которому добавлять файлы.\n" -#: quilt/add.in:48 quilt/add.in:54 +#: quilt/add.in:37 quilt/add.in:43 msgid "File %s is located below %s\\n" msgstr "Файл %s расположен ниже %s\\n" -#: quilt/add.in:103 +#: quilt/add.in:100 msgid "File %s is already in patch %s\\n" msgstr "Файл %s уже в патче %s\\n" -#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84 +#: quilt/add.in:108 quilt/remove.in:79 quilt/revert.in:81 msgid "File %s modified by patch %s\\n" msgstr "Файл %s изменён патчем %s\\n" -#: quilt/add.in:119 +#: quilt/add.in:116 msgid "Cannot add symbolic link %s\\n" msgstr "Не удалось добавить символьную ссылку %s\\n" -#: quilt/add.in:126 +#: quilt/add.in:123 msgid "Failed to back up file %s\\n" msgstr "Не удалось создать резервную копию файла %s\\n" -#: quilt/add.in:137 +#: quilt/add.in:134 msgid "File %s added to patch %s\\n" msgstr "Файл %s добавлен к патчу %s\\n" -#: quilt/annotate.in:22 +#: quilt/annotate.in:11 msgid "Usage: quilt annotate [-P patch] {file}\\n" msgstr "Синтаксис: quilt annotate [-P патч] {файл}\\n" -#: quilt/annotate.in:25 +#: quilt/annotate.in:14 msgid "" "\n" "Print an annotated listing of the specified file showing which\n" @@ -134,11 +134,11 @@ msgstr "" "\tОстановить проверку изменений после указанного патча, а не\n" "\tсамого верхнего.\n" -#: quilt/applied.in:22 +#: quilt/applied.in:11 msgid "Usage: quilt applied [patch]\\n" msgstr "Синтаксис: quilt applied [патч]\\n" -#: quilt/applied.in:25 +#: quilt/applied.in:14 msgid "" "\n" "Print a list of applied patches, or all patches up to and including the\n" @@ -148,11 +148,11 @@ msgstr "" "Вывести список применённых патчей или всех патчей, до и включая\n" "указанный патч в файле series.\n" -#: quilt/delete.in:22 +#: quilt/delete.in:11 msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "Синтаксис: quilt delete [-r] [--backup] [патч | -n]\\n" -#: quilt/delete.in:25 +#: quilt/delete.in:14 msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -182,31 +182,31 @@ msgstr "" "\tНе удалять файл патча, а переименовать в имя_патча~.\n" "\tИгнорируется, если не используется вместе с «-r».\n" -#: quilt/delete.in:89 +#: quilt/delete.in:86 msgid "No next patch\\n" msgstr "Отсутствует следующий патч\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:618 +#: quilt/delete.in:99 quilt/scripts/patchfns.in:602 msgid "Patch %s is currently applied\\n" msgstr "Патч %s применён\\n" -#: quilt/delete.in:114 +#: quilt/delete.in:111 msgid "Removed patch %s\\n" msgstr "Удалён патч %s\\n" -#: quilt/delete.in:116 +#: quilt/delete.in:113 msgid "Failed to remove patch %s\\n" msgstr "Не удалось удалить патч %s\\n" -#: quilt/delete.in:127 +#: quilt/delete.in:124 msgid "Failed to backup patch file %s\\n" msgstr "Не удалось создать резервную копию файла патча %s\\n" -#: quilt/delete.in:134 +#: quilt/delete.in:131 msgid "Failed to remove patch file %s\\n" msgstr "Не удалось удалить файл патча %s\\n" -#: quilt/diff.in:24 +#: quilt/diff.in:11 msgid "" "Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " @@ -216,7 +216,7 @@ msgstr "" "патч|-z] [-R] [-P патч] [--snapshot] [--diff=утилита] [--no-timestamps] [--" "no-index] [--sort] [--color[=always|auto|never]] [файл …]\\n" -#: quilt/diff.in:28 +#: quilt/diff.in:15 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -313,44 +313,44 @@ msgstr "" "\n" "--sort\tСортировать файлы по имени, не сохраняя их исходного порядка.\n" -#: quilt/diff.in:226 +#: quilt/diff.in:221 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Опции «--combine», «--snapshot» и «-z» не могут использоваться совместно.\\n" -#: quilt/diff.in:240 +#: quilt/diff.in:235 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "Невозможно сравнить патчи с -p%s, пожалуйста, используйте -p0, -p1 либо -pab" "\\n" -#: quilt/diff.in:249 +#: quilt/diff.in:244 msgid "No snapshot to diff against\\n" msgstr "Нет снимка для вывода различий\\n" -#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:432 +#: quilt/diff.in:278 quilt/files.in:107 quilt/mail.in:429 msgid "Patch %s not applied before patch %s\\n" msgstr "Патч %s не был применён перед патчем %s\\n" -#: quilt/diff.in:351 +#: quilt/diff.in:346 msgid "File %s is not being modified\\n" msgstr "Файл %s не изменяется\\n" -#: quilt/diff.in:370 +#: quilt/diff.in:365 msgid "Diff failed, aborting\\n" msgstr "Не удалось выполнить diff, завершение\\n" -#: quilt/diff.in:377 +#: quilt/diff.in:372 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Предупреждение: более новые патчи изменяют файлы в патче %s\\n" -#: quilt/edit.in:24 +#: quilt/edit.in:13 msgid "Usage: quilt edit file ...\\n" msgstr "Синтаксис: quilt edit файл ...\\n" -#: quilt/edit.in:27 +#: quilt/edit.in:16 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -360,11 +360,11 @@ msgstr "" "Редактировать указанные файлы в редакторе \\$EDITOR (%s) после\n" "добавления их к верхнему патчу.\n" -#: quilt/files.in:22 +#: quilt/files.in:11 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.in:14 msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -396,11 +396,11 @@ msgstr "" "\tуказанию первого применённого патча.\n" "\n" -#: quilt/fold.in:22 +#: quilt/fold.in:11 msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" msgstr "Синтаксис: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" -#: quilt/fold.in:25 +#: quilt/fold.in:14 msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -436,15 +436,15 @@ msgstr "" "\tЧисло компонент пути, которые необходимо удалить из имён файлов\n" "\tпри наложении патча.\n" -#: quilt/fold.in:131 +#: quilt/fold.in:128 msgid "File %s may be corrupted\\n" msgstr "Файл %s может быть повреждён\\n" -#: quilt/fork.in:22 +#: quilt/fork.in:11 msgid "Usage: quilt fork [new_name]\\n" msgstr "Синтаксис: quilt fork [новое_имя]\\n" -#: quilt/fork.in:25 +#: quilt/fork.in:14 msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -471,19 +471,19 @@ msgstr "" "добавляется «-2». Если патч уже заканчивается дефисом и числом, то это\n" "число увеличивается (т.е. patch.diff, patch-2.diff, patch-3.diff).\n" -#: quilt/fork.in:84 +#: quilt/fork.in:81 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Патч %s уже существует, выберите новое имя\\n" -#: quilt/fork.in:96 +#: quilt/fork.in:93 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Не удалось создать ответвление патча %s в патч %s\\n" -#: quilt/fork.in:102 quilt/refresh.in:344 +#: quilt/fork.in:99 quilt/refresh.in:341 msgid "Fork of patch %s created as %s\\n" msgstr "Ответвление патча %s создано как %s\\n" -#: quilt/graph.in:22 +#: quilt/graph.in:11 msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " "[-T ps] [patch]\\n" @@ -491,7 +491,7 @@ msgstr "" "Синтаксис: quilt graph [--all] [--reduce] [--lines[=число]] [--edge-" "labels=файлы] [-T ps] [патч]\\n" -#: quilt/graph.in:26 +#: quilt/graph.in:15 msgid "" "\n" "Generate a dot(1) directed graph showing the dependencies between\n" @@ -546,11 +546,11 @@ msgstr "" "\n" "-T ps\tСразу создать файл PostScript.\n" -#: quilt/grep.in:22 +#: quilt/grep.in:11 msgid "Usage: quilt grep [-h|options] {pattern}\\n" msgstr "Синтаксис: quilt grep [-h|параметры] {шаблон}\\n" -#: quilt/grep.in:25 +#: quilt/grep.in:14 msgid "" "\n" "Grep through the source files, recursively, skipping patches and quilt\n" @@ -571,7 +571,7 @@ msgstr "" "\tдвойного дефиса (--). Выражения для поиска, начинающиеся с дефиса,\n" "\tмогут быть переданы после второго двойного дефиса (-- --).\n" -#: quilt/header.in:24 +#: quilt/header.in:13 msgid "" "Usage: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [patch]\\n" @@ -579,7 +579,7 @@ msgstr "" "Синтаксис: quilt header [-a|-r|-e] [--backup] [--strip-diffstat] [--strip-" "trailing-whitespace] [патч]\\n" -#: quilt/header.in:28 +#: quilt/header.in:17 msgid "" "\n" "Print or change the header of the topmost or specified patch.\n" @@ -615,15 +615,15 @@ msgstr "" "--backup\n" "\tСоздать резервную копию старой версии патча в файле имя_патча~.\n" -#: quilt/header.in:170 +#: quilt/header.in:167 msgid "Replaced header of patch %s\\n" msgstr "Заменён заголовок патча %s\\n" -#: quilt/header.in:173 +#: quilt/header.in:170 msgid "Appended text to header of patch %s\\n" msgstr "Добавлен текст к заголовку патча %s\\n" -#: quilt/import.in:22 +#: quilt/import.in:14 msgid "" "Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..." "\\n" @@ -631,7 +631,7 @@ msgstr "" "Синтаксис: quilt import [-p число] [-R] [-P патч] [-f] [-d {o|a|n}] файл-" "патча …\\n" -#: quilt/import.in:25 +#: quilt/import.in:17 msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -677,57 +677,57 @@ msgstr "" "\tдолжна быть указана. Эта опция имеет эффект только, когда используется -" "f.\n" -#: quilt/import.in:73 quilt/mail.in:463 +#: quilt/import.in:65 quilt/mail.in:460 msgid "Patch %s does not exist\\n" msgstr "Патч %s не существует\\n" -#: quilt/import.in:96 +#: quilt/import.in:88 msgid "Patch headers differ:\\n" msgstr "Заголовки патчей различаются:\\n" -#: quilt/import.in:99 +#: quilt/import.in:91 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "Пожалуйста, используйте -d {o|a|n}, чтобы определить, какой из заголовков " "оставить.\\n" -#: quilt/import.in:164 +#: quilt/import.in:156 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "Опцию «-P» можно использовать только при импорте одиночного патча\\n" -#: quilt/import.in:194 +#: quilt/import.in:195 msgid "Patch %s is applied\\n" msgstr "Патч %s применён\\n" -#: quilt/import.in:203 +#: quilt/import.in:204 msgid "Patch %s already exists in series.\\n" msgstr "Патч %s уже существует в series.\\n" -#: quilt/import.in:209 +#: quilt/import.in:210 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Патч %s существует. Принудительно заменить можно опцией -f.\\n" -#: quilt/import.in:220 +#: quilt/import.in:221 msgid "Replacing patch %s with new version\\n" msgstr "Замена патча %s новой версией\\n" -#: quilt/import.in:224 +#: quilt/import.in:225 msgid "Importing patch %s\\n" msgstr "Импорт патча %s\\n" -#: quilt/import.in:226 +#: quilt/import.in:227 msgid "Importing patch %s (stored as %s)\\n" msgstr "Импорт патча %s (сохранён как %s)\\n" -#: quilt/import.in:239 +#: quilt/import.in:240 msgid "Failed to import patch %s\\n" msgstr "Не удалось импортировать патч %s\\n" -#: quilt/import.in:248 quilt/refresh.in:331 +#: quilt/import.in:249 quilt/refresh.in:328 msgid "Failed to insert patch %s into file series\\n" msgstr "Не удалось вставить патч %s в файл series\\n" -#: quilt/mail.in:24 +#: quilt/mail.in:13 msgid "" "Usage: quilt mail {--mbox file|--send} [-m text] [-M file] [--prefix prefix] " "[--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--" @@ -739,7 +739,7 @@ msgstr "" "[--reply-to message] [--charset …] [--signature файл] [первый_патч " "[последний_патч]]\\n" -#: quilt/mail.in:27 +#: quilt/mail.in:16 msgid "" "\n" "Create mail messages from a specified range of patches, or all patches in\n" @@ -841,43 +841,43 @@ msgstr "" "--reply-to сообщение\n" "\tДобавить подходящие заголовки для ответа на указанное сообщение.\n" -#: quilt/mail.in:209 quilt/mail.in:217 +#: quilt/mail.in:198 quilt/mail.in:206 msgid "Introduction message already specified" msgstr "Вводное сообщение уже указано" -#: quilt/mail.in:315 +#: quilt/mail.in:312 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "Не удалось определить адрес отправителя. Используйте опцию --sender." -#: quilt/mail.in:466 +#: quilt/mail.in:463 msgid "Unable to extract a subject header from %s\\n" msgstr "Не удалось извлечь тему письма из %s\\n" -#: quilt/mail.in:492 +#: quilt/mail.in:489 msgid "Patches %s have duplicate subject headers.\\n" msgstr "У патчей %s дублируются заголовки темы.\\n" -#: quilt/mail.in:501 +#: quilt/mail.in:498 msgid "File %s does not exist\\n" msgstr "Файл %s не существует\\n" -#: quilt/mail.in:561 +#: quilt/mail.in:558 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Во введении нет заголовка Subject (сохранено как %s)\\n" -#: quilt/mail.in:564 +#: quilt/mail.in:561 msgid "Introduction has no subject header\\n" msgstr "Во введении нет заголовка Subject\\n" -#: quilt/mail.in:677 +#: quilt/mail.in:674 msgid "Introduction saved as %s\\n" msgstr "Введение сохранено как %s\\n" -#: quilt/new.in:22 +#: quilt/new.in:14 msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n" msgstr "Синтаксис: quilt new [-p n|-p ab] {имя-патча}\\n" -#: quilt/new.in:25 +#: quilt/new.in:17 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" @@ -914,7 +914,7 @@ msgstr "" "если quilt выбирает в её качестве директорию слишком высоко в дереве\n" "исходных кодов.\n" -#: quilt/new.in:76 +#: quilt/new.in:68 msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "Не удалось создать патчи с -p%s, используйте -p0, -p1 или -pab\\n" @@ -923,7 +923,7 @@ msgstr "Не удалось создать патчи с -p%s, использу msgid "QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\\n" msgstr "QUILT_PATCHES(%s) должна отличаться от QUILT_PC(%s)\\n" -#: quilt/new.in:97 quilt/refresh.in:185 +#: quilt/new.in:97 quilt/refresh.in:182 msgid "Patch %s exists already\\n" msgstr "Патч %s уже существует\\n" @@ -931,15 +931,15 @@ msgstr "Патч %s уже существует\\n" msgid "Patch %s is now on top\\n" msgstr "Патч %s теперь наверху\\n" -#: quilt/new.in:110 quilt/refresh.in:340 +#: quilt/new.in:110 quilt/refresh.in:337 msgid "Failed to create patch %s\\n" msgstr "Не удалось создать патч %s\\n" -#: quilt/next.in:22 +#: quilt/next.in:11 msgid "Usage: quilt next [patch]\\n" msgstr "Синтаксис: quilt next [патч]\\n" -#: quilt/next.in:25 +#: quilt/next.in:14 msgid "" "\n" "Print the name of the next patch after the specified or topmost patch in\n" @@ -949,14 +949,14 @@ msgstr "" "Вывести имя патча, следующего за указанным или верхним патчем в\n" "файле series.\n" -#: quilt/patches.in:24 +#: quilt/patches.in:13 msgid "" "Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "" "Синтаксис: quilt patches [-v] [--color[=always|auto|never]] {файл} " "[файлы…]\\n" -#: quilt/patches.in:27 +#: quilt/patches.in:16 msgid "" "\n" "Print the list of patches that modify any of the specified files. (Uses a\n" @@ -979,11 +979,11 @@ msgstr "" "\tИспользовать подсветку синтаксиса (опция auto активирует подсветку только " "при выводе в терминал).\n" -#: quilt/pop.in:22 +#: quilt/pop.in:11 msgid "Usage: quilt pop [-afRqv] [--refresh] [num|patch]\\n" msgstr "Синтаксис: quilt pop [-afRqv] [--refresh] [число|патч]\\n" -#: quilt/pop.in:25 +#: quilt/pop.in:14 msgid "" "\n" "Remove patch(es) from the stack of applied patches. Without options,\n" @@ -1030,49 +1030,53 @@ msgstr "" "--refresh\n" "\tАвтоматически обновить каждый патч перед его откатом.\n" -#: quilt/pop.in:103 quilt/scripts/patchfns.in:930 +#: quilt/pop.in:92 quilt/scripts/patchfns.in:977 msgid "Failed to copy files to temporary directory\\n" msgstr "Не удалось скопировать файлы во временную директорию\\n" -#: quilt/pop.in:128 +#: quilt/pop.in:117 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Не удалось чисто удалить патч %s (обновите его или удалите принудительно с -" "f)\\n" -#: quilt/pop.in:153 +#: quilt/pop.in:119 +msgid "Hint: \\`quilt diff -z' will show the pending changes.\\n" +msgstr "" + +#: quilt/pop.in:143 msgid "Patch %s appears to be empty, removing\\n" msgstr "Похоже, патч %s пуст, удаление\\n" -#: quilt/pop.in:158 +#: quilt/pop.in:148 msgid "Removing patch %s\\n" msgstr "Удаление патча %s\\n" -#: quilt/pop.in:216 quilt/push.in:376 +#: quilt/pop.in:214 quilt/push.in:376 msgid "Options %s and %s are mutually exclusive\\n" msgstr "Опции %s и %s — взаимоисключающие\\n" -#: quilt/pop.in:238 +#: quilt/pop.in:236 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Сначала нужно обновить патч %s.\\n" -#: quilt/pop.in:248 +#: quilt/pop.in:246 msgid "No patch removed\\n" msgstr "Не удалено ни одного патча\\n" -#: quilt/pop.in:272 quilt/scripts/patchfns.in:527 +#: quilt/pop.in:270 quilt/scripts/patchfns.in:511 msgid "No patches applied\\n" msgstr "Нет применённых патчей\\n" -#: quilt/pop.in:279 quilt/push.in:440 +#: quilt/pop.in:277 quilt/push.in:440 msgid "Now at patch %s\\n" msgstr "Текущий патч: %s\\n" -#: quilt/previous.in:22 +#: quilt/previous.in:11 msgid "Usage: quilt previous [patch]\\n" msgstr "Синтаксис: quilt previous [патч]\\n" -#: quilt/previous.in:25 +#: quilt/previous.in:14 msgid "" "\n" "Print the name of the previous patch before the specified or topmost\n" @@ -1082,7 +1086,7 @@ msgstr "" "Вывести имя патча, предшествующего указанному или верхнему\n" "в файле series.\n" -#: quilt/push.in:24 +#: quilt/push.in:11 msgid "" "Usage: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [num|patch]\\n" @@ -1090,7 +1094,7 @@ msgstr "" "Синтаксис: quilt push [-afqvm] [--fuzz=N] [--merge[=merge|diff3]] [--leave-" "rejects] [--color[=always|auto|never]] [--refresh] [число|патч]\\n" -#: quilt/push.in:27 +#: quilt/push.in:14 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -1156,35 +1160,35 @@ msgstr "" "--refresh\n" "\tАвтоматически обновлять каждый патч после того, как он был применен.\n" -#: quilt/push.in:70 +#: quilt/push.in:57 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Прервано пользователем; патч %s не был наложен.\\n" -#: quilt/push.in:186 +#: quilt/push.in:176 msgid "Applying patch %s\\n" msgstr "Наложение патча %s\\n" -#: quilt/push.in:220 +#: quilt/push.in:210 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Патч %s не существует; наложен пустой патч\\n" -#: quilt/push.in:224 +#: quilt/push.in:214 msgid "Patch %s appears to be empty; applied\\n" msgstr "Похоже, патч %s пуст; наложен\\n" -#: quilt/push.in:228 +#: quilt/push.in:218 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Наложен патч %s (принудительно; следует сделать refresh)\\n" -#: quilt/push.in:238 +#: quilt/push.in:228 msgid "Patch %s can be reverse-applied\\n" msgstr "Патч %s может быть наложен в обратную сторону\\n" -#: quilt/push.in:241 +#: quilt/push.in:231 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Патч %s не удаётся наложить (принудить с -f)\\n" -#: quilt/push.in:296 +#: quilt/push.in:286 msgid "Patch %s is already applied; check your series file\\n" msgstr "Патч %s уже наложен; проверьте свой файл series\\n" @@ -1196,7 +1200,7 @@ msgstr "Сначала необходимо обновить самый верх msgid "No patch applied\\n" msgstr "Нет наложенных патчей\\n" -#: quilt/refresh.in:22 +#: quilt/refresh.in:11 msgid "" "Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-z[new_name]] [-f] " "[--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-" @@ -1206,7 +1210,7 @@ msgstr "" "z[новое_имя]] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--" "backup] [--strip-trailing-whitespace] [патч]\\n" -#: quilt/refresh.in:26 +#: quilt/refresh.in:15 msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -1305,46 +1309,46 @@ msgstr "" "--strip-trailing-whitespace\n" "\tУдалять пробелы на концах строк.\n" -#: quilt/refresh.in:171 +#: quilt/refresh.in:168 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "Опцией -z в настоящее время можно обновить только верхний патч\\n" -#: quilt/refresh.in:202 +#: quilt/refresh.in:199 msgid "" "Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "Не удалось обновить патчи с -p%s, используйте -p0, -p1 или -pab\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:237 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Более новые патчи изменяют файлы в патче %s. Принудительное обновление можно " "сделать с помощью опции -f.\\n" -#: quilt/refresh.in:246 +#: quilt/refresh.in:243 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Нельзя использовать --strip-trailing-whitespace на патче с затенёнными " "файлами.\\n" -#: quilt/refresh.in:252 quilt/refresh.in:352 +#: quilt/refresh.in:249 quilt/refresh.in:349 msgid "Nothing in patch %s\\n" msgstr "Ничего нет в патче %s\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:321 msgid "Patch %s is unchanged\\n" msgstr "Патч %s не изменён\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:347 msgid "Refreshed patch %s\\n" msgstr "Патч %s обновлён\\n" -#: quilt/remove.in:22 +#: quilt/remove.in:11 msgid "Usage: quilt remove [-P patch] {file} ...\\n" msgstr "Синтаксис: quilt remove [-P патч] {файл} …\\n" -#: quilt/remove.in:25 +#: quilt/remove.in:14 msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" @@ -1361,23 +1365,23 @@ msgstr "" "-P патч\n" "\tПатч, из которого нужно удалить файлы.\n" -#: quilt/remove.in:73 quilt/revert.in:75 +#: quilt/remove.in:70 quilt/revert.in:72 msgid "File %s is not in patch %s\\n" msgstr "Файл %s отсутствует в патче %s\\n" -#: quilt/remove.in:91 +#: quilt/remove.in:88 msgid "Failed to remove file %s from patch %s\\n" msgstr "Не удалось удалить файл %s из патча %s\\n" -#: quilt/remove.in:105 +#: quilt/remove.in:102 msgid "File %s removed from patch %s\\n" msgstr "Файл %s удалён из патча %s\\n" -#: quilt/rename.in:22 +#: quilt/rename.in:11 msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "Синтаксис: quilt rename [-P патч] новое_имя\\n" -#: quilt/rename.in:25 +#: quilt/rename.in:14 msgid "" "\n" "Rename the topmost or named patch.\n" @@ -1391,23 +1395,23 @@ msgstr "" "-P патч\n" "\tПатч, который нужно переименовать.\n" -#: quilt/rename.in:84 +#: quilt/rename.in:81 msgid "Patch %s exists already, please choose a different name\\n" msgstr "Патч %s уже существует, выберите другое имя\\n" -#: quilt/rename.in:98 +#: quilt/rename.in:95 msgid "Renaming of patch %s to %s failed\\n" msgstr "Не удалось переименовать патч %s в %s\\n" -#: quilt/rename.in:104 +#: quilt/rename.in:101 msgid "Patch %s renamed to %s\\n" msgstr "Патч %s переименован в %s\\n" -#: quilt/revert.in:22 +#: quilt/revert.in:11 msgid "Usage: quilt revert [-P patch] {file} ...\\n" msgstr "Синтаксис: quilt remove [-P патч] {файл} …\\n" -#: quilt/revert.in:25 +#: quilt/revert.in:14 msgid "" "\n" "Revert uncommitted changes to the topmost or named patch for the specified\n" @@ -1429,15 +1433,15 @@ msgstr "" "-P патч\n" "\tПатч, изменения в котором нужно отменить.\n" -#: quilt/revert.in:103 quilt/revert.in:112 +#: quilt/revert.in:100 quilt/revert.in:109 msgid "File %s is unchanged\\n" msgstr "Файл %s не изменён\\n" -#: quilt/revert.in:120 +#: quilt/revert.in:117 msgid "Failed to revert changes to %s in patch %s\\n" msgstr "Не удалось отменить изменения в %s в патче %s\\n" -#: quilt/revert.in:124 +#: quilt/revert.in:121 msgid "Changes to %s in patch %s reverted\\n" msgstr "Изменения в %s в патче %s отменены\\n" @@ -1451,39 +1455,35 @@ msgstr "Отображаемое имя «%s» содержит непарные msgid "Delivery address `%s' is invalid\n" msgstr "Некорректный адрес назначения «%s»\n" -#: quilt/scripts/patchfns.in:243 quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:237 quilt/scripts/patchfns.in:524 msgid "%s is not a regular file\\n" msgstr "%s не является обычным файлом\\n" -#: quilt/scripts/patchfns.in:494 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:486 quilt/scripts/patchfns.in:498 msgid "No patches in series\\n" msgstr "Нет патчей в файле series\\n" -#: quilt/scripts/patchfns.in:496 quilt/scripts/patchfns.in:513 -msgid "No series file found\\n" -msgstr "Файл series не найден\\n" - -#: quilt/scripts/patchfns.in:569 +#: quilt/scripts/patchfns.in:553 msgid "Patch %s is not in series\\n" msgstr "Патча %s нет в файле series\\n" -#: quilt/scripts/patchfns.in:597 +#: quilt/scripts/patchfns.in:581 msgid "Patch %s is not applied\\n" msgstr "Патч %s не наложен\\n" -#: quilt/scripts/patchfns.in:634 +#: quilt/scripts/patchfns.in:618 msgid "File series fully applied, ends at patch %s\\n" msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n" -#: quilt/scripts/patchfns.in:779 +#: quilt/scripts/patchfns.in:774 msgid "Diff failed on file '%s', aborting\\n" msgstr "Не удалось выполнить diff на файле «%s», завершение\\n" -#: quilt/scripts/patchfns.in:948 +#: quilt/scripts/patchfns.in:995 msgid "Failed to patch temporary files\\n" msgstr "Не удалось применить патч к временным файлам\\n" -#: quilt/scripts/patchfns.in:991 +#: quilt/scripts/patchfns.in:1038 msgid "" "The quilt meta-data in this tree has version %s, but this version of quilt " "can only handle meta-data formats up to and including version %s. Please pop " @@ -1495,15 +1495,15 @@ msgstr "" "отмените все патчи, используя версию quilt, которая использовалась для их " "наложения, прежде чем использовать эту версию.\\n" -#: quilt/scripts/patchfns.in:1064 +#: quilt/scripts/patchfns.in:1113 msgid "You have to install '%s' (from package %s) to use 'quilt %s'\\n" msgstr "Нужно установить «%s» (из пакета %s), чтобы использовать «quilt %s»\\n" -#: quilt/scripts/patchfns.in:1143 +#: quilt/scripts/patchfns.in:1192 msgid "Cannot change into parent directory %s/\\n" msgstr "Невозможно перейти в родительскую директорию %s/\\n" -#: quilt/scripts/patchfns.in:1184 +#: quilt/scripts/patchfns.in:1237 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1511,7 +1511,7 @@ msgstr "" "Рабочее дерево было создано более старой версией quilt. Пожалуйста, " "выполните «quilt upgrade».\\n" -#: quilt/scripts/patchfns.in:1192 +#: quilt/scripts/patchfns.in:1245 msgid "" "The series file no longer matches the applied patches. Please run 'quilt pop " "-a'.\\n" @@ -1519,6 +1519,10 @@ msgstr "" "Файл series больше не соответствует наложенным патчам. Пожалуйста, выполните " "«quilt pop -a».\\n" +#: quilt/scripts/patchfns.in:1254 +msgid "No series file found\\n" +msgstr "Файл series не найден\\n" + #: quilt/scripts/remove-trailing-ws.in:43 #, perl-format msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" @@ -1554,11 +1558,11 @@ msgstr "Удаление пробела из конца строк %s файла msgid "Renaming %s to %s: %s\n" msgstr "Переименование %s в %s: %s\n" -#: quilt/series.in:22 +#: quilt/series.in:11 msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" msgstr "Синтаксис: quilt series [--color[=always|auto|never]] [-v]\\n" -#: quilt/series.in:25 +#: quilt/series.in:14 msgid "" "\n" "Print the names of all patches in the series file.\n" @@ -1577,15 +1581,15 @@ msgstr "" "\n" "-v\tПодробный, более дружественный вывод.\n" -#: quilt/setup.in:38 quilt/setup.in:58 +#: quilt/setup.in:23 quilt/setup.in:43 msgid "Directory %s exists\\n" msgstr "Директория %s существует\\n" -#: quilt/setup.in:64 +#: quilt/setup.in:49 msgid "File %s exists\\n" msgstr "Файл %s существует\\n" -#: quilt/setup.in:274 +#: quilt/setup.in:265 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] [--" "slow|--fast] {specfile|seriesfile}\\n" @@ -1593,7 +1597,8 @@ msgstr "" "Синтаксис: quilt setup [-d префикс-пути] [-v] [--sourcedir путь] [--fuzz=N] " "[--slow|--fast] {файл-spec|файл-series}\\n" -#: quilt/setup.in:277 +#: quilt/setup.in:268 +#, fuzzy msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1608,15 +1613,23 @@ msgid "" "--fuzz=N\n" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" "\n" -"--slow\tUse the original, slow method to process the spec file. This is the\n" -"\tdefault for now, but that might change in the future. In this mode,\n" +"--slow\tUse the original, slow method to process the spec file. In this " +"mode,\n" "\trpmbuild generates a working tree in a temporary directory while all\n" "\tits actions are recorded, and then everything is replayed from scratch\n" "\tin the target directory.\n" "\n" -"--fast\tUse an alternative, faster method to process the spec file. In this\n" -"\tmode, rpmbuild is told to generate a working tree directly in the\n" -"\ttarget directory.\n" +"--fast\tUse the new, faster method to process the spec file. In this mode,\n" +"\trpmbuild is told to generate a working tree directly in the target\n" +"\tdirectory. This is the default (since quilt version 0.67).\n" +"\n" +"The setup command is only guaranteed to work properly on spec files where\n" +"applying all the patches is the last thing done in the %%prep section. This " +"is\n" +"a design limitation due to the fact that quilt can only operate on patches. " +"If\n" +"other commands in the %%prep section modify the patched files, this must\n" +"happen first, otherwise you won't be able to push the patch series.\n" msgstr "" "\n" "Инициализирует дерево исходных кодов из спецификации rpm или файла series.\n" @@ -1643,32 +1656,32 @@ msgstr "" "spec. В этом\n" "\tрежиме rpmbuild генерирует рабочее дерево прямо в целевой директории.\n" -#: quilt/setup.in:380 +#: quilt/setup.in:396 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n" -#: quilt/setup.in:383 +#: quilt/setup.in:399 msgid "The -v option will show rpm's output\\n" msgstr "Опция -v покажет вывод rpm\\n" -#: quilt/setup.in:444 quilt/setup.in:456 quilt/setup.in:467 +#: quilt/setup.in:460 quilt/setup.in:472 quilt/setup.in:483 msgid "File %s not found\\n" msgstr "Файл %s не найден\\n" -#: quilt/setup.in:447 quilt/setup.in:459 quilt/setup.in:470 +#: quilt/setup.in:463 quilt/setup.in:475 quilt/setup.in:486 msgid "Unpacking archive %s\\n" msgstr "Распаковка архива %s\\n" -#: quilt/setup.in:480 +#: quilt/setup.in:496 msgid "Trying alternative patches and series names..." msgstr "Попытка использовать альтернативные имена для series и patches…" -#: quilt/snapshot.in:22 +#: quilt/snapshot.in:11 msgid "Usage: quilt snapshot [-d]\\n" msgstr "Синтаксис: quilt snapshot [-d]\\n" -#: quilt/snapshot.in:25 +#: quilt/snapshot.in:14 msgid "" "\n" "Take a snapshot of the current working state. After taking the snapshot,\n" @@ -1686,11 +1699,11 @@ msgstr "" "\n" "-d\tПросто удалить текущий снимок.\n" -#: quilt/top.in:22 +#: quilt/top.in:11 msgid "Usage: quilt top\\n" msgstr "Синтаксис: quilt top\\n" -#: quilt/top.in:25 +#: quilt/top.in:14 msgid "" "\n" "Print the name of the topmost patch on the current stack of applied\n" @@ -1699,11 +1712,11 @@ msgstr "" "\n" "Вывести имя верхнего патча в текущем стеке применённых патчей.\n" -#: quilt/unapplied.in:22 +#: quilt/unapplied.in:11 msgid "Usage: quilt unapplied [patch]\\n" msgstr "Синтаксис: quilt unapplied [патч]\\n" -#: quilt/unapplied.in:25 +#: quilt/unapplied.in:14 msgid "" "\n" "Print a list of patches that are not applied, or all patches that follow\n" @@ -1713,11 +1726,11 @@ msgstr "" "Вывести список неналоженных патчей или всех патчей, следующих\n" "за указанным патчем в файле series.\n" -#: quilt/upgrade.in:25 +#: quilt/upgrade.in:15 msgid "Usage: quilt upgrade\\n" msgstr "Синтаксис: quilt upgrade\\n" -#: quilt/upgrade.in:28 +#: quilt/upgrade.in:18 msgid "" "\n" "Upgrade the meta-data in a working tree from an old version of quilt to the\n" @@ -1733,21 +1746,21 @@ msgstr "" "изменился, а рабочее дерево по-прежнему содержит метаданные старого\n" "формата. В этом случае quilt попросит запустить «quilt upgrade».\n" -#: quilt/upgrade.in:67 +#: quilt/upgrade.in:65 msgid "" "The quilt meta-data in %s are already in the version %s format; nothing to do" "\\n" msgstr "Метаданные quilt в %s уже в формате версии %s; нечего делать\\n" -#: quilt/upgrade.in:71 +#: quilt/upgrade.in:69 msgid "Converting meta-data to version %s\\n" msgstr "Преобразование метаданных к версии %s\\n" -#: quilt/upgrade.in:102 +#: quilt/upgrade.in:100 msgid "Conversion failed\\n" msgstr "Преобразование не удалось\\n" -#: quilt/upgrade.in:103 +#: quilt/upgrade.in:101 msgid "" "\n" "Please remove all patches using \\`quilt pop -a' from the quilt version used " |