diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/de.po | 192 | ||||
| -rw-r--r-- | po/ja.po | 191 | ||||
| -rw-r--r-- | po/quilt.pot | 168 | ||||
| -rw-r--r-- | po/ru.po | 188 |
4 files changed, 410 insertions, 329 deletions
@@ -15,19 +15,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: bin/quilt.in:36 +#: bin/quilt.in:40 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..." -#: bin/quilt.in:37 +#: bin/quilt.in:41 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:39 +#: bin/quilt.in:43 msgid "Commands are:" msgstr "Vorhandene Befehle:" -#: bin/quilt.in:44 +#: bin/quilt.in:48 msgid "" "\n" "Global options:\n" @@ -183,7 +183,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:604 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -204,10 +204,11 @@ msgid "Failed to remove patch file %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" #: quilt/diff.in:24 +#, fuzzy 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] [file ...]\\n" +"[--sort] [--color[=always|auto|never]] [file ...]\\n" msgstr "" "Verwendung: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-" "z] [-R] [-P patch] [--snapshot] [--diff=programm] [--no-timestamps] [--no-" @@ -312,36 +313,36 @@ msgstr "" "--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n" "\tReihenfolge zu erhalten.\n" -#: quilt/diff.in:218 +#: quilt/diff.in:226 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:232 +#: quilt/diff.in:240 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" "Kann kein Diff mit -p%s erzeugen, bitte -p0, -p1 oder -pab verwenden.\\n" -#: quilt/diff.in:241 +#: quilt/diff.in:249 msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418 +#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:341 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:360 quilt/refresh.in:234 +#: quilt/diff.in:370 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:367 +#: quilt/diff.in:377 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" @@ -482,7 +483,7 @@ msgstr "Patch %s existiert bereits, bitte neuen Namen wählen\\n" msgid "Fork of patch %s to patch %s failed\\n" msgstr "Fehler beim Aufspalten von %s auf %s\\n" -#: quilt/fork.in:102 quilt/refresh.in:346 +#: quilt/fork.in:102 quilt/refresh.in:347 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" @@ -683,51 +684,55 @@ msgstr "" "\tOption angegeben werden. Diese Option ist nur in Kombination mit -f " "wirksam.\n" -#: quilt/import.in:71 +#: quilt/import.in:73 +msgid "Patch %s does not exist\\n" +msgstr "Patch %s existiert nicht\\n" + +#: quilt/import.in:96 msgid "Patch headers differ:\\n" msgstr "Die Patch-Header unterscheiden sich:\\n" -#: quilt/import.in:74 +#: quilt/import.in:99 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 Patch-Header " "erhalten bleiben sollen.\\n" -#: quilt/import.in:139 +#: quilt/import.in:164 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:169 +#: quilt/import.in:194 msgid "Patch %s is applied\\n" msgstr "Patch %s ist angewandt\\n" -#: quilt/import.in:178 +#: quilt/import.in:203 msgid "Patch %s already exists in series.\\n" msgstr "Patch %s existiert bereits in der series-Datei\\n" -#: quilt/import.in:184 +#: quilt/import.in:209 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n" -#: quilt/import.in:195 +#: quilt/import.in:220 msgid "Replacing patch %s with new version\\n" msgstr "Ersetze Patch %s durch neuere Version\\n" -#: quilt/import.in:199 +#: quilt/import.in:224 msgid "Importing patch %s\\n" msgstr "Importiere patch %s\\n" -#: quilt/import.in:201 +#: quilt/import.in:226 msgid "Importing patch %s (stored as %s)\\n" msgstr "Importiere Patch %s (abgelegt als %s)\\n" -#: quilt/import.in:214 +#: quilt/import.in:239 msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:223 quilt/refresh.in:333 +#: quilt/import.in:248 quilt/refresh.in:334 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -824,41 +829,41 @@ msgstr "" "--to, --cc, --bcc\n" "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n" -#: quilt/mail.in:189 quilt/mail.in:197 +#: quilt/mail.in:192 quilt/mail.in:200 #, fuzzy msgid "Introduction message already specified" msgstr "Einleitung gespeichert als %s\\n" -#: quilt/mail.in:259 +#: quilt/mail.in:262 msgid "You have to install 'formail' to use 'quilt mail'" msgstr "" -#: quilt/mail.in:302 +#: quilt/mail.in:305 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender." -#: quilt/mail.in:446 +#: quilt/mail.in:450 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:470 +#: quilt/mail.in:474 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:479 +#: quilt/mail.in:483 msgid "File %s does not exist\\n" msgstr "Datei %s existiert nicht\\n" -#: quilt/mail.in:539 +#: quilt/mail.in:543 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:542 +#: quilt/mail.in:546 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:656 +#: quilt/mail.in:660 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" @@ -913,14 +918,14 @@ msgstr "" msgid "Patch %s exists already\\n" msgstr "Patch %s existiert bereits\\n" -#: quilt/new.in:108 quilt/refresh.in:342 -msgid "Failed to create patch %s\\n" -msgstr "Konnte Patch %s nicht erzeugen\\n" - -#: quilt/new.in:111 +#: quilt/new.in:108 msgid "Patch %s is now on top\\n" msgstr "Der oberste Patch ist jetzt %s\\n" +#: quilt/new.in:110 quilt/refresh.in:343 +msgid "Failed to create patch %s\\n" +msgstr "Konnte Patch %s nicht erzeugen\\n" + #: quilt/next.in:22 msgid "Usage: quilt next [patch]\\n" msgstr "Verwendung: quilt next [patch]\\n" @@ -937,7 +942,8 @@ msgstr "" #: quilt/patches.in:24 #, fuzzy -msgid "Usage: quilt patches [-v] {file} [files...]\\n" +msgid "" +"Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "Verwendung: quilt patches [-v] {file}\\n" #: quilt/patches.in:27 @@ -1005,7 +1011,7 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:880 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" @@ -1031,11 +1037,11 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n" msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:513 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" -#: quilt/pop.in:259 quilt/push.in:397 +#: quilt/pop.in:259 quilt/push.in:422 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -1122,31 +1128,36 @@ msgstr "" msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: quilt/push.in:180 +#: quilt/push.in:181 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: quilt/push.in:214 +#: quilt/push.in:215 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Patch %s existiert nicht; wende leeren patch an\\n" -#: quilt/push.in:218 +#: quilt/push.in:219 msgid "Patch %s appears to be empty; applied\\n" msgstr "Patch %s scheint leer zu sein; angewandt\\n" -#: quilt/push.in:222 +#: quilt/push.in:223 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n" -#: quilt/push.in:232 +#: quilt/push.in:233 msgid "Patch %s can be reverse-applied\\n" msgstr "Patch %s kann verkehrt angewandt werden\\n" -#: quilt/push.in:235 +#: quilt/push.in:236 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:377 +#: quilt/push.in:291 +#, fuzzy +msgid "Patch %s is already applied; check your series file\\n" +msgstr "Patch %s existiert bereits, bitte einen anderen Namen wählen\\n" + +#: quilt/push.in:396 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n" @@ -1272,34 +1283,41 @@ msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "Kann nur den obersten Patch mit -z aktualisieren\\n" #: quilt/refresh.in:202 -msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#, fuzzy +msgid "" +"Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -"Kann Patches mit Level -p$opt_strip_level nicht aktualisieren, bitte -p0 " -"oder -p1 angeben\\n" +"Kann Patches mit Level -p%s nicht aktualisieren, bitte -p0, -p1 oder -pab " +"angeben\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:235 +#, fuzzy +msgid "Diff failed on file '%s', aborting\\n" +msgstr "Diff fehlgeschlagen, Abbruch.\\n" + +#: quilt/refresh.in:241 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Später angewandte Patches verändern Dateien von %s. Aktalisieren mit -f " "erzwingen.\\n" -#: quilt/refresh.in:246 +#: quilt/refresh.in:247 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Kann --strip-trailing-whitespace nicht für Patches verwenden, die Dateien " "enthalten, die danach von anderen Patches weiter verändert werden.\\n" -#: quilt/refresh.in:252 quilt/refresh.in:354 +#: quilt/refresh.in:253 quilt/refresh.in:355 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:325 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:352 +#: quilt/refresh.in:353 msgid "Refreshed patch %s\\n" msgstr "Patch %s aktualisiert\\n" @@ -1415,40 +1433,36 @@ msgstr "Anzeigename `%s' enthält eine unvollständige Klammerung\n" msgid "Delivery address `%s' is invalid\n" msgstr "Zustelladresse `%s' ist ungültig\n" -#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526 #, fuzzy msgid "%s is not a regular file\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 +#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497 msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 +#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:555 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:568 +#: quilt/scripts/patchfns.in:583 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:605 +#: quilt/scripts/patchfns.in:620 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:638 -msgid "Patch %s does not exist\\n" -msgstr "Patch %s existiert nicht\\n" - -#: quilt/scripts/patchfns.in:910 +#: quilt/scripts/patchfns.in:898 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: quilt/scripts/patchfns.in:951 +#: quilt/scripts/patchfns.in:941 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 " @@ -1461,7 +1475,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:1095 +#: quilt/scripts/patchfns.in:1094 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1505,8 +1519,11 @@ msgid "Renaming %s to %s: %s\n" msgstr "Umbenennen von %s auf %s: %s\n" #: quilt/series.in:22 -msgid "Usage: quilt series [-v]\\n" -msgstr "Verwendung: quilt series [-v]\\n" +#, fuzzy +msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" +msgstr "" +"Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--" +"color[=always|auto|never]] [num|patch]\\n" #: quilt/series.in:25 #, fuzzy @@ -1516,7 +1533,7 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring (auto activates it only if the output is a tty).\n" -"\t\n" +"\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1524,15 +1541,15 @@ msgstr "" "\n" "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" -#: quilt/setup.in:34 quilt/setup.in:53 +#: quilt/setup.in:35 quilt/setup.in:55 msgid "Directory %s exists\\n" msgstr "Verzeichnis %s existiert\\n" -#: quilt/setup.in:59 +#: quilt/setup.in:61 msgid "File %s exists\\n" msgstr "Datei %s existiert\\n" -#: quilt/setup.in:99 +#: quilt/setup.in:102 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" @@ -1540,7 +1557,7 @@ msgstr "" "Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--" "fuzz=N] {spec-datei|series-datei}\\n" -#: quilt/setup.in:102 +#: quilt/setup.in:105 #, fuzzy msgid "" "\n" @@ -1567,25 +1584,25 @@ msgstr "" "\n" "-v\tAusführliche Ausgabe.\n" -#: quilt/setup.in:173 +#: quilt/setup.in:176 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:176 +#: quilt/setup.in:179 msgid "The -v option will show rpm's output\\n" msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" -#: quilt/setup.in:228 quilt/setup.in:240 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "File %s not found\\n" msgstr "Datei %s nicht gefunden\\n" -#: quilt/setup.in:231 quilt/setup.in:243 +#: quilt/setup.in:234 quilt/setup.in:246 msgid "Unpacking archive %s\\n" msgstr "Entpacke Archiv %s\\n" -#: quilt/setup.in:252 +#: quilt/setup.in:255 msgid "Trying alternative patches and series names..." msgstr "" @@ -1688,3 +1705,12 @@ msgstr "" "Bitte entfernen Sie alle Patches mit \\`quilt pop -a' der quilt-Version, die " "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" + +#~ msgid "" +#~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#~ msgstr "" +#~ "Kann Patches mit Level -p$opt_strip_level nicht aktualisieren, bitte -p0 " +#~ "oder -p1 angeben\\n" + +#~ msgid "Usage: quilt series [-v]\\n" +#~ msgstr "Verwendung: quilt series [-v]\\n" @@ -13,19 +13,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: bin/quilt.in:36 +#: bin/quilt.in:40 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "使い方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." -#: bin/quilt.in:37 +#: bin/quilt.in:41 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:39 +#: bin/quilt.in:43 msgid "Commands are:" msgstr "コマンド一覧:" -#: bin/quilt.in:44 +#: bin/quilt.in:48 msgid "" "\n" "Global options:\n" @@ -178,7 +178,7 @@ msgstr "" msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:604 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" @@ -199,10 +199,11 @@ msgid "Failed to remove patch file %s\\n" msgstr "パッチ %s の削除に失敗しました\\n" #: quilt/diff.in:24 +#, fuzzy 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] [file ...]\\n" +"[--sort] [--color[=always|auto|never]] [file ...]\\n" msgstr "" "使い方: quilt diff [-p n|-p ab] [-u|-U 数|-c|-C 数] [--combine パッチ|-z] [-" "R] [-P パッチ] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " @@ -304,35 +305,35 @@ msgstr "" "\n" "--sort\t順番を保持せず、名前順にファイルを並び換える。\n" -#: quilt/diff.in:218 +#: quilt/diff.in:226 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: quilt/diff.in:232 +#: quilt/diff.in:240 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:241 +#: quilt/diff.in:249 msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418 +#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: quilt/diff.in:341 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:360 quilt/refresh.in:234 +#: quilt/diff.in:370 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: quilt/diff.in:367 +#: quilt/diff.in:377 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n" @@ -467,7 +468,7 @@ msgstr "パッチ %s はすでに存在します。新しい名前を選んで msgid "Fork of patch %s to patch %s failed\\n" msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n" -#: quilt/fork.in:102 quilt/refresh.in:346 +#: quilt/fork.in:102 quilt/refresh.in:347 msgid "Fork of patch %s created as %s\\n" msgstr "パッチ %s の分岐で %s が作成されました\\n" @@ -665,48 +666,52 @@ msgstr "" "\tがある場合は必ずこのオプションを指定する必要がある。このオプショ\n" "\tンは -fが指定された時のみ有効。\n" -#: quilt/import.in:71 +#: quilt/import.in:73 +msgid "Patch %s does not exist\\n" +msgstr "パッチ %s が存在しません\\n" + +#: quilt/import.in:96 msgid "Patch headers differ:\\n" msgstr "パッチヘッダの差異:\\n" -#: quilt/import.in:74 +#: quilt/import.in:99 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" "どのパッチヘッダを残すか、オプション -d {o|a|n}を使って指定してください" -#: quilt/import.in:139 +#: quilt/import.in:164 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "オプション \\`-P'は、パッチを一つだけ取り込むときのみ有効です\\n" -#: quilt/import.in:169 +#: quilt/import.in:194 msgid "Patch %s is applied\\n" msgstr "パッチ %s は、すでに適用されています\\n" -#: quilt/import.in:178 +#: quilt/import.in:203 msgid "Patch %s already exists in series.\\n" msgstr "パッチ %s は、すでに seriesの中にあります\\n" -#: quilt/import.in:184 +#: quilt/import.in:209 msgid "Patch %s exists. Replace with -f.\\n" msgstr "パッチ %s は、すでに存在します。-fで置き換えることができます\\n" -#: quilt/import.in:195 +#: quilt/import.in:220 msgid "Replacing patch %s with new version\\n" msgstr "パッチ %s を新しいバージョンに置き換えます\\n" -#: quilt/import.in:199 +#: quilt/import.in:224 msgid "Importing patch %s\\n" msgstr "パッチ %s を取り込みます\\n" -#: quilt/import.in:201 +#: quilt/import.in:226 msgid "Importing patch %s (stored as %s)\\n" msgstr "パッチ %s を取り込んでいます (%s として保存されます)\\n" -#: quilt/import.in:214 +#: quilt/import.in:239 msgid "Failed to import patch %s\\n" msgstr "パッチ %s の取り込みに失敗しました\\n" -#: quilt/import.in:223 quilt/refresh.in:333 +#: quilt/import.in:248 quilt/refresh.in:334 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" @@ -808,42 +813,42 @@ msgstr "" "--reply-to メッセージ\n" "\t指定されたメッセージへのリプライとなるように、適切なヘッダを追加。\n" -#: quilt/mail.in:189 quilt/mail.in:197 +#: quilt/mail.in:192 quilt/mail.in:200 #, fuzzy msgid "Introduction message already specified" msgstr "序文は %s という名前で保存されました\\n" -#: quilt/mail.in:259 +#: quilt/mail.in:262 msgid "You have to install 'formail' to use 'quilt mail'" msgstr "" -#: quilt/mail.in:302 +#: quilt/mail.in:305 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n" "を使用してください。" -#: quilt/mail.in:446 +#: quilt/mail.in:450 msgid "Unable to extract a subject header from %s\\n" msgstr "%s から件名を取り出せません。\\n" -#: quilt/mail.in:470 +#: quilt/mail.in:474 msgid "Patches %s have duplicate subject headers.\\n" msgstr "パッチ %s の件名が重複しています。\\n" -#: quilt/mail.in:479 +#: quilt/mail.in:483 msgid "File %s does not exist\\n" msgstr "ファイル %s が存在しません\\n" -#: quilt/mail.in:539 +#: quilt/mail.in:543 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "序文に件名がありません(%s として保存されました)\\n" -#: quilt/mail.in:542 +#: quilt/mail.in:546 msgid "Introduction has no subject header\\n" msgstr "序文に件名がありません\\n" -#: quilt/mail.in:656 +#: quilt/mail.in:660 msgid "Introduction saved as %s\\n" msgstr "序文は %s という名前で保存されました\\n" @@ -902,14 +907,14 @@ msgstr "" msgid "Patch %s exists already\\n" msgstr "パッチ %s は、すでに存在します\\n" -#: quilt/new.in:108 quilt/refresh.in:342 -msgid "Failed to create patch %s\\n" -msgstr "パッチ %s の作成に失敗しました\\n" - -#: quilt/new.in:111 +#: quilt/new.in:108 msgid "Patch %s is now on top\\n" msgstr "パッチ %s を最上位にしました\\n" +#: quilt/new.in:110 quilt/refresh.in:343 +msgid "Failed to create patch %s\\n" +msgstr "パッチ %s の作成に失敗しました\\n" + #: quilt/next.in:22 msgid "Usage: quilt next [patch]\\n" msgstr "使い方: quilt next [パッチ]\\n" @@ -925,7 +930,8 @@ msgstr "" #: quilt/patches.in:24 #, fuzzy -msgid "Usage: quilt patches [-v] {file} [files...]\\n" +msgid "" +"Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "使い方: quilt patches [-v] {ファイル}\\n" #: quilt/patches.in:27 @@ -995,7 +1001,7 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:880 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" @@ -1021,11 +1027,11 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:513 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:259 quilt/push.in:397 +#: quilt/pop.in:259 quilt/push.in:422 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です\\n" @@ -1119,32 +1125,37 @@ msgstr "" msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "ユーザによって中断されました。パッチ %s は適用されていません。\\n" -#: quilt/push.in:180 +#: quilt/push.in:181 msgid "Applying patch %s\\n" msgstr "パッチ %s を適用しています\\n" -#: quilt/push.in:214 +#: quilt/push.in:215 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n" -#: quilt/push.in:218 +#: quilt/push.in:219 msgid "Patch %s appears to be empty; applied\\n" msgstr "パッチ %s は空のようですが、適用しました\\n" -#: quilt/push.in:222 +#: quilt/push.in:223 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" "パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: quilt/push.in:232 +#: quilt/push.in:233 msgid "Patch %s can be reverse-applied\\n" msgstr "パッチ %s は、反転して適用することができます\\n" -#: quilt/push.in:235 +#: quilt/push.in:236 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n" -#: quilt/push.in:377 +#: quilt/push.in:291 +#, fuzzy +msgid "Patch %s is already applied; check your series file\\n" +msgstr "パッチ %s はすでに存在します。新しい名前を選んでください\\n" + +#: quilt/push.in:396 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" @@ -1263,32 +1274,40 @@ msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "-zオプションがある場合、最上位パッチ以外のリフレッシュはできません\\n" #: quilt/refresh.in:202 -msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#, fuzzy +msgid "" +"Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -"-p%s ではリフレッシュすることができません。-p0または -p1を指定してください\\n" +"-p%s でパッチを作成することができません。-p0、-p1 または -pab を指定してくだ" +"さい\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:235 +#, fuzzy +msgid "Diff failed on file '%s', aborting\\n" +msgstr "差分に失敗しました。異常終了します\\n" + +#: quilt/refresh.in:241 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:247 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:354 +#: quilt/refresh.in:253 quilt/refresh.in:355 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:325 msgid "Patch %s is unchanged\\n" msgstr "パッチ %s に変更はありません\\n" -#: quilt/refresh.in:352 +#: quilt/refresh.in:353 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1402,40 +1421,36 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます msgid "Delivery address `%s' is invalid\n" msgstr "配送先のアドレス `%s' が不正です\n" -#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526 msgid "%s is not a regular file\\n" msgstr "%s は普通のファイルではありません\\n" -#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 +#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497 msgid "No patches in series\\n" msgstr "シリーズに登録されているパッチがありません\\n" -#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 +#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499 msgid "No series file found\\n" msgstr "シリーズファイルが見つかりません\\n" -#: quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:555 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:568 +#: quilt/scripts/patchfns.in:583 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/scripts/patchfns.in:605 +#: quilt/scripts/patchfns.in:620 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: quilt/scripts/patchfns.in:638 -msgid "Patch %s does not exist\\n" -msgstr "パッチ %s が存在しません\\n" - -#: quilt/scripts/patchfns.in:910 +#: quilt/scripts/patchfns.in:898 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: quilt/scripts/patchfns.in:951 +#: quilt/scripts/patchfns.in:941 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 " @@ -1447,7 +1462,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:1095 +#: quilt/scripts/patchfns.in:1094 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1491,8 +1506,11 @@ msgid "Renaming %s to %s: %s\n" msgstr "%s から %s へ名前を変更しました: %s\n" #: quilt/series.in:22 -msgid "Usage: quilt series [-v]\\n" -msgstr "使い方: quilt series [-v]\\n" +#, fuzzy +msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" +msgstr "" +"使い方: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--" +"color[=always|auto|never]] [num|patch]\\n" #: quilt/series.in:25 #, fuzzy @@ -1502,7 +1520,7 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring (auto activates it only if the output is a tty).\n" -"\t\n" +"\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1511,15 +1529,15 @@ msgstr "" "-v\t詳細で見やすい表示。\n" "\n" -#: quilt/setup.in:34 quilt/setup.in:53 +#: quilt/setup.in:35 quilt/setup.in:55 msgid "Directory %s exists\\n" msgstr "ディレクトリ %s は、すでに存在します\\n" -#: quilt/setup.in:59 +#: quilt/setup.in:61 msgid "File %s exists\\n" msgstr "ファイル %s は、すでに存在します\\n" -#: quilt/setup.in:99 +#: quilt/setup.in:102 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" @@ -1527,7 +1545,7 @@ msgstr "" "使い方: quilt setup [-d path-prefix] [-v] [--sourcedir ディレクトリ] [--" "fuzz=N] {specファイル|シリーズファイル}\\n" -#: quilt/setup.in:102 +#: quilt/setup.in:105 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1556,25 +1574,25 @@ msgstr "" "--fuzz=N\n" "\t最大何行のずれを許すか指定する\n" -#: quilt/setup.in:173 +#: quilt/setup.in:176 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま" "す\\n" -#: quilt/setup.in:176 +#: quilt/setup.in:179 msgid "The -v option will show rpm's output\\n" msgstr "-vオプションを使って、rpmの出力を表示できます" -#: quilt/setup.in:228 quilt/setup.in:240 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "File %s not found\\n" msgstr "ファイル %s が見つかりません" -#: quilt/setup.in:231 quilt/setup.in:243 +#: quilt/setup.in:234 quilt/setup.in:246 msgid "Unpacking archive %s\\n" msgstr "アーカイブ %s を展開しています\\n" -#: quilt/setup.in:252 +#: quilt/setup.in:255 msgid "Trying alternative patches and series names..." msgstr "" @@ -1675,3 +1693,12 @@ msgstr "" "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" + +#~ msgid "" +#~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#~ msgstr "" +#~ "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください" +#~ "\\n" + +#~ msgid "Usage: quilt series [-v]\\n" +#~ msgstr "使い方: quilt series [-v]\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 26633e0..b1d2889 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -1,16 +1,16 @@ -#: bin/quilt.in:36 +#: bin/quilt.in:40 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "" -#: bin/quilt.in:37 +#: bin/quilt.in:41 msgid " quilt --version" msgstr "" -#: bin/quilt.in:39 +#: bin/quilt.in:43 msgid "Commands are:" msgstr "" -#: bin/quilt.in:44 +#: bin/quilt.in:48 msgid "" "\n" "Global options:\n" @@ -119,7 +119,7 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:604 msgid "Patch %s is currently applied\\n" msgstr "" @@ -143,7 +143,7 @@ msgstr "" 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] [file ...]\\n" +"[--sort] [--color[=always|auto|never]] [file ...]\\n" msgstr "" #: quilt/diff.in:28 @@ -197,33 +197,33 @@ msgid "" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: quilt/diff.in:218 +#: quilt/diff.in:226 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: quilt/diff.in:232 +#: quilt/diff.in:240 msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -#: quilt/diff.in:241 +#: quilt/diff.in:249 msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418 +#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:341 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:360 quilt/refresh.in:234 +#: quilt/diff.in:370 msgid "Diff failed, aborting\\n" msgstr "" -#: quilt/diff.in:367 +#: quilt/diff.in:377 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "" @@ -316,7 +316,7 @@ msgstr "" msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: quilt/fork.in:102 quilt/refresh.in:346 +#: quilt/fork.in:102 quilt/refresh.in:347 msgid "Fork of patch %s created as %s\\n" msgstr "" @@ -437,47 +437,51 @@ msgid "" "\tmust be specified. This option is only effective when -f is used.\n" msgstr "" -#: quilt/import.in:71 +#: quilt/import.in:73 +msgid "Patch %s does not exist\\n" +msgstr "" + +#: quilt/import.in:96 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:74 +#: quilt/import.in:99 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:139 +#: quilt/import.in:164 msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "" -#: quilt/import.in:169 +#: quilt/import.in:194 msgid "Patch %s is applied\\n" msgstr "" -#: quilt/import.in:178 +#: quilt/import.in:203 msgid "Patch %s already exists in series.\\n" msgstr "" -#: quilt/import.in:184 +#: quilt/import.in:209 msgid "Patch %s exists. Replace with -f.\\n" msgstr "" -#: quilt/import.in:195 +#: quilt/import.in:220 msgid "Replacing patch %s with new version\\n" msgstr "" -#: quilt/import.in:199 +#: quilt/import.in:224 msgid "Importing patch %s\\n" msgstr "" -#: quilt/import.in:201 +#: quilt/import.in:226 msgid "Importing patch %s (stored as %s)\\n" msgstr "" -#: quilt/import.in:214 +#: quilt/import.in:239 msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:223 quilt/refresh.in:333 +#: quilt/import.in:248 quilt/refresh.in:334 msgid "Failed to insert patch %s into file series\\n" msgstr "" @@ -536,39 +540,39 @@ msgid "" "\tAdd the appropriate headers to reply to the specified message.\n" msgstr "" -#: quilt/mail.in:189 quilt/mail.in:197 +#: quilt/mail.in:192 quilt/mail.in:200 msgid "Introduction message already specified" msgstr "" -#: quilt/mail.in:259 +#: quilt/mail.in:262 msgid "You have to install 'formail' to use 'quilt mail'" msgstr "" -#: quilt/mail.in:302 +#: quilt/mail.in:305 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:446 +#: quilt/mail.in:450 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:470 +#: quilt/mail.in:474 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:479 +#: quilt/mail.in:483 msgid "File %s does not exist\\n" msgstr "" -#: quilt/mail.in:539 +#: quilt/mail.in:543 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:542 +#: quilt/mail.in:546 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:656 +#: quilt/mail.in:660 msgid "Introduction saved as %s\\n" msgstr "" @@ -609,12 +613,12 @@ msgstr "" msgid "Patch %s exists already\\n" msgstr "" -#: quilt/new.in:108 quilt/refresh.in:342 -msgid "Failed to create patch %s\\n" +#: quilt/new.in:108 +msgid "Patch %s is now on top\\n" msgstr "" -#: quilt/new.in:111 -msgid "Patch %s is now on top\\n" +#: quilt/new.in:110 quilt/refresh.in:343 +msgid "Failed to create patch %s\\n" msgstr "" #: quilt/next.in:22 @@ -629,7 +633,8 @@ msgid "" msgstr "" #: quilt/patches.in:24 -msgid "Usage: quilt patches [-v] {file} [files...]\\n" +msgid "" +"Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "" #: quilt/patches.in:27 @@ -672,7 +677,7 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:880 msgid "Failed to copy files to temporary directory\\n" msgstr "" @@ -696,11 +701,11 @@ msgstr "" msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:513 msgid "No patches applied\\n" msgstr "" -#: quilt/pop.in:259 quilt/push.in:397 +#: quilt/pop.in:259 quilt/push.in:422 msgid "Now at patch %s\\n" msgstr "" @@ -758,31 +763,35 @@ msgstr "" msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: quilt/push.in:180 +#: quilt/push.in:181 msgid "Applying patch %s\\n" msgstr "" -#: quilt/push.in:214 +#: quilt/push.in:215 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "" -#: quilt/push.in:218 +#: quilt/push.in:219 msgid "Patch %s appears to be empty; applied\\n" msgstr "" -#: quilt/push.in:222 +#: quilt/push.in:223 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: quilt/push.in:232 +#: quilt/push.in:233 msgid "Patch %s can be reverse-applied\\n" msgstr "" -#: quilt/push.in:235 +#: quilt/push.in:236 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: quilt/push.in:377 +#: quilt/push.in:291 +msgid "Patch %s is already applied; check your series file\\n" +msgstr "" + +#: quilt/push.in:396 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" @@ -850,28 +859,33 @@ msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "" #: quilt/refresh.in:202 -msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +msgid "" +"Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -#: quilt/refresh.in:240 +#: quilt/refresh.in:235 +msgid "Diff failed on file '%s', aborting\\n" +msgstr "" + +#: quilt/refresh.in:241 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: quilt/refresh.in:246 +#: quilt/refresh.in:247 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:252 quilt/refresh.in:354 +#: quilt/refresh.in:253 quilt/refresh.in:355 msgid "Nothing in patch %s\\n" msgstr "" -#: quilt/refresh.in:324 +#: quilt/refresh.in:325 msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:352 +#: quilt/refresh.in:353 msgid "Refreshed patch %s\\n" msgstr "" @@ -966,39 +980,35 @@ msgstr "" msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526 msgid "%s is not a regular file\\n" msgstr "" -#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 +#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 +#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:555 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:568 +#: quilt/scripts/patchfns.in:583 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:605 +#: quilt/scripts/patchfns.in:620 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:638 -msgid "Patch %s does not exist\\n" -msgstr "" - -#: quilt/scripts/patchfns.in:910 +#: quilt/scripts/patchfns.in:898 msgid "Failed to patch temporary files\\n" msgstr "" -#: quilt/scripts/patchfns.in:951 +#: quilt/scripts/patchfns.in:941 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 " @@ -1006,7 +1016,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1095 +#: quilt/scripts/patchfns.in:1094 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1048,7 +1058,7 @@ msgid "Renaming %s to %s: %s\n" msgstr "" #: quilt/series.in:22 -msgid "Usage: quilt series [-v]\\n" +msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" msgstr "" #: quilt/series.in:25 @@ -1058,25 +1068,25 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring (auto activates it only if the output is a tty).\n" -"\t\n" +"\n" "-v\tVerbose, more user friendly output.\n" msgstr "" -#: quilt/setup.in:34 quilt/setup.in:53 +#: quilt/setup.in:35 quilt/setup.in:55 msgid "Directory %s exists\\n" msgstr "" -#: quilt/setup.in:59 +#: quilt/setup.in:61 msgid "File %s exists\\n" msgstr "" -#: quilt/setup.in:99 +#: quilt/setup.in:102 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" msgstr "" -#: quilt/setup.in:102 +#: quilt/setup.in:105 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1092,23 +1102,23 @@ msgid "" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" msgstr "" -#: quilt/setup.in:173 +#: quilt/setup.in:176 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" -#: quilt/setup.in:176 +#: quilt/setup.in:179 msgid "The -v option will show rpm's output\\n" msgstr "" -#: quilt/setup.in:228 quilt/setup.in:240 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "File %s not found\\n" msgstr "" -#: quilt/setup.in:231 quilt/setup.in:243 +#: quilt/setup.in:234 quilt/setup.in:246 msgid "Unpacking archive %s\\n" msgstr "" -#: quilt/setup.in:252 +#: quilt/setup.in:255 msgid "Trying alternative patches and series names..." msgstr "" @@ -18,19 +18,19 @@ msgstr "" "X-Launchpad-Export-Date: 2011-09-20 08:04+0000\n" "X-Generator: Launchpad (build 13980)\n" -#: bin/quilt.in:36 +#: bin/quilt.in:40 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Синтаксис: quilt [--trace[=verbose]] [--quiltrc=XX] команда [-h] ..." -#: bin/quilt.in:37 +#: bin/quilt.in:41 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:39 +#: bin/quilt.in:43 msgid "Commands are:" msgstr "Команды:" -#: bin/quilt.in:44 +#: bin/quilt.in:48 #, fuzzy msgid "" "\n" @@ -181,7 +181,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Отсутствует следующий патч\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:604 msgid "Patch %s is currently applied\\n" msgstr "Патч %s применён\\n" @@ -208,7 +208,7 @@ msgstr "Не удалось отменить патч %s\\n" 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] [file ...]\\n" +"[--sort] [--color[=always|auto|never]] [file ...]\\n" msgstr "" "Синтаксис: quilt diff [-p n] [-u|-U число|-c|-C число] [--combine патч|-z] [-" "R] [-P патч] [--snapshot] [--diff=утилита] [--no-timestamps] [--no-index] [--" @@ -307,7 +307,7 @@ msgstr "" "\n" "--sort\tСортировать файлы по имени, не сохраняя их исходного порядка.\n" -#: quilt/diff.in:218 +#: quilt/diff.in:226 #, fuzzy msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" @@ -315,29 +315,29 @@ msgstr "" "Опции \\`-c patch', \\`--snapshot' и \\`-z' не могут использоваться " "совместно.\\n" -#: quilt/diff.in:232 +#: quilt/diff.in:240 #, fuzzy msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "Невозможно сравнить патчи с -p%s, используйте -p0 либо -p1\\n" -#: quilt/diff.in:241 +#: quilt/diff.in:249 msgid "No snapshot to diff against\\n" msgstr "" -#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:418 +#: quilt/diff.in:283 quilt/files.in:105 quilt/mail.in:422 msgid "Patch %s not applied before patch %s\\n" msgstr "Патч %s не был применён перед патчем %s\\n" -#: quilt/diff.in:341 +#: quilt/diff.in:351 msgid "File %s is not being modified\\n" msgstr "Файл %s не изменяется\\n" -#: quilt/diff.in:360 quilt/refresh.in:234 +#: quilt/diff.in:370 msgid "Diff failed, aborting\\n" msgstr "Не удалось выполнить diff, завершение\\n" -#: quilt/diff.in:367 +#: quilt/diff.in:377 #, fuzzy msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Более новые патчи изменяют файлы в патче %s\\n" @@ -471,7 +471,7 @@ msgstr "Патч %s уже существует, выберите новое и msgid "Fork of patch %s to patch %s failed\\n" msgstr "Не удалось создать ответвление патча %s в патч %s\\n" -#: quilt/fork.in:102 quilt/refresh.in:346 +#: quilt/fork.in:102 quilt/refresh.in:347 msgid "Fork of patch %s created as %s\\n" msgstr "Ответвление патча %s создано как %s\\n" @@ -648,50 +648,55 @@ msgid "" "\tmust be specified. This option is only effective when -f is used.\n" msgstr "" -#: quilt/import.in:71 +#: quilt/import.in:73 +#, fuzzy +msgid "Patch %s does not exist\\n" +msgstr "Патч %s не в серии\\n" + +#: quilt/import.in:96 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:74 +#: quilt/import.in:99 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:139 +#: quilt/import.in:164 #, fuzzy msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "Опцию \\`-n' можно использовать только при импорте одного патча\\n" -#: quilt/import.in:169 +#: quilt/import.in:194 msgid "Patch %s is applied\\n" msgstr "Патч %s применён\\n" -#: quilt/import.in:178 +#: quilt/import.in:203 #, fuzzy msgid "Patch %s already exists in series.\\n" msgstr "Патч %s не в серии\\n" -#: quilt/import.in:184 +#: quilt/import.in:209 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Патч %s существует. Принудительно заменить можно опцией -f.\\n" -#: quilt/import.in:195 +#: quilt/import.in:220 msgid "Replacing patch %s with new version\\n" msgstr "Замена патча %s новой версией\\n" -#: quilt/import.in:199 +#: quilt/import.in:224 #, fuzzy msgid "Importing patch %s\\n" msgstr "Удаление патча %s\\n" -#: quilt/import.in:201 +#: quilt/import.in:226 msgid "Importing patch %s (stored as %s)\\n" msgstr "Импорт патча %s (сохранён как %s)\\n" -#: quilt/import.in:214 +#: quilt/import.in:239 msgid "Failed to import patch %s\\n" msgstr "Не удалось импортировать патч %s\\n" -#: quilt/import.in:223 quilt/refresh.in:333 +#: quilt/import.in:248 quilt/refresh.in:334 msgid "Failed to insert patch %s into file series\\n" msgstr "Не удалось вставить патч %s в файл series\\n" @@ -753,40 +758,40 @@ msgid "" "\tAdd the appropriate headers to reply to the specified message.\n" msgstr "" -#: quilt/mail.in:189 quilt/mail.in:197 +#: quilt/mail.in:192 quilt/mail.in:200 msgid "Introduction message already specified" msgstr "" -#: quilt/mail.in:259 +#: quilt/mail.in:262 msgid "You have to install 'formail' to use 'quilt mail'" msgstr "" -#: quilt/mail.in:302 +#: quilt/mail.in:305 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:446 +#: quilt/mail.in:450 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:470 +#: quilt/mail.in:474 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:479 +#: quilt/mail.in:483 #, fuzzy msgid "File %s does not exist\\n" msgstr "Файл %s существует\\n" -#: quilt/mail.in:539 +#: quilt/mail.in:543 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:542 +#: quilt/mail.in:546 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:656 +#: quilt/mail.in:660 msgid "Introduction saved as %s\\n" msgstr "" @@ -829,14 +834,14 @@ msgstr "" msgid "Patch %s exists already\\n" msgstr "Патч %s уже существует\\n" -#: quilt/new.in:108 quilt/refresh.in:342 -msgid "Failed to create patch %s\\n" -msgstr "Не удалось создать патч %s\\n" - -#: quilt/new.in:111 +#: quilt/new.in:108 msgid "Patch %s is now on top\\n" msgstr "Патч %s теперь наверху\\n" +#: quilt/new.in:110 quilt/refresh.in:343 +msgid "Failed to create patch %s\\n" +msgstr "Не удалось создать патч %s\\n" + #: quilt/next.in:22 msgid "Usage: quilt next [patch]\\n" msgstr "Синтаксис: quilt next [патч]\\n" @@ -853,7 +858,8 @@ msgstr "" #: quilt/patches.in:24 #, fuzzy -msgid "Usage: quilt patches [-v] {file} [files...]\\n" +msgid "" +"Usage: quilt patches [-v] [--color[=always|auto|never]] {file} [files...]\\n" msgstr "Синтаксис: quilt patches {файл}\\n" #: quilt/patches.in:27 @@ -921,7 +927,7 @@ msgstr "" "\n" "-v\tПодробный вывод.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:880 msgid "Failed to copy files to temporary directory\\n" msgstr "Не удалось скопировать файлы во временный каталог\\n" @@ -947,11 +953,11 @@ msgstr "Сначала нужно обновить патч %s.\\n" msgid "No patch removed\\n" msgstr "Не удалено ни одного патча\\n" -#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:513 msgid "No patches applied\\n" msgstr "Нет применённых патчей\\n" -#: quilt/pop.in:259 quilt/push.in:397 +#: quilt/pop.in:259 quilt/push.in:422 msgid "Now at patch %s\\n" msgstr "Текущий патч: %s\\n" @@ -1039,32 +1045,37 @@ msgstr "" msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Прервано пользователем; патч %s не был наложен.\\n" -#: quilt/push.in:180 +#: quilt/push.in:181 msgid "Applying patch %s\\n" msgstr "Наложение патча %s\\n" -#: quilt/push.in:214 +#: quilt/push.in:215 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Патч %s не существует; наложен пустой патч\\n" -#: quilt/push.in:218 +#: quilt/push.in:219 msgid "Patch %s appears to be empty; applied\\n" msgstr "Похоже, патч %s пуст; наложен\\n" -#: quilt/push.in:222 +#: quilt/push.in:223 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Применён патч %s (принудительно; следует сделать refresh)\\n" -#: quilt/push.in:232 +#: quilt/push.in:233 #, fuzzy msgid "Patch %s can be reverse-applied\\n" msgstr "Патч %s применён\\n" -#: quilt/push.in:235 +#: quilt/push.in:236 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Патч %s не применяется (принудить с -f)\\n" -#: quilt/push.in:377 +#: quilt/push.in:291 +#, fuzzy +msgid "Patch %s is already applied; check your series file\\n" +msgstr "Патч %s уже применён\\n" + +#: quilt/push.in:396 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Сначала необходимо обновить самый верхний патч %s.\\n" @@ -1174,32 +1185,39 @@ msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "" #: quilt/refresh.in:202 -msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#, fuzzy +msgid "" +"Cannot refresh patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "Не удалось обновить патчи с -p%s, используйте -p0 или -p1\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:235 +#, fuzzy +msgid "Diff failed on file '%s', aborting\\n" +msgstr "Не удалось выполнить diff, завершение\\n" + +#: quilt/refresh.in:241 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:247 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:354 +#: quilt/refresh.in:253 quilt/refresh.in:355 msgid "Nothing in patch %s\\n" msgstr "Ничего нет в патче %s\\n" -#: quilt/refresh.in:324 +#: quilt/refresh.in:325 msgid "Patch %s is unchanged\\n" msgstr "Патч %s не изменён\\n" -#: quilt/refresh.in:352 +#: quilt/refresh.in:353 msgid "Refreshed patch %s\\n" msgstr "Патч %s обновлён\\n" @@ -1323,42 +1341,37 @@ msgstr "Отображаемое имя '%s' содержит непарные msgid "Delivery address `%s' is invalid\n" msgstr "Некорректный адрес назначения '%s'\n" -#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 +#: quilt/scripts/patchfns.in:232 quilt/scripts/patchfns.in:526 #, fuzzy msgid "%s is not a regular file\\n" msgstr "Патч %s не входит в файл series\\n" -#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 +#: quilt/scripts/patchfns.in:480 quilt/scripts/patchfns.in:497 #, fuzzy msgid "No patches in series\\n" msgstr "Нет применённых патчей\\n" -#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 +#: quilt/scripts/patchfns.in:482 quilt/scripts/patchfns.in:499 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:540 +#: quilt/scripts/patchfns.in:555 msgid "Patch %s is not in series\\n" msgstr "Патч %s не в серии\\n" -#: quilt/scripts/patchfns.in:568 +#: quilt/scripts/patchfns.in:583 msgid "Patch %s is not applied\\n" msgstr "Патч %s не применён\\n" -#: quilt/scripts/patchfns.in:605 +#: quilt/scripts/patchfns.in:620 msgid "File series fully applied, ends at patch %s\\n" msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n" -#: quilt/scripts/patchfns.in:638 -#, fuzzy -msgid "Patch %s does not exist\\n" -msgstr "Патч %s не в серии\\n" - -#: quilt/scripts/patchfns.in:910 +#: quilt/scripts/patchfns.in:898 msgid "Failed to patch temporary files\\n" msgstr "Не удалось применить патч к временным файлам\\n" -#: quilt/scripts/patchfns.in:951 +#: quilt/scripts/patchfns.in:941 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 " @@ -1370,7 +1383,7 @@ msgstr "" "отмените все патчи, используя версию quilt, которая использовалась для их " "наложения, прежде чем использовать эту версию.\\n" -#: quilt/scripts/patchfns.in:1095 +#: quilt/scripts/patchfns.in:1094 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1414,8 +1427,9 @@ msgid "Renaming %s to %s: %s\n" msgstr "Переименование %s в %s: %s\n" #: quilt/series.in:22 -msgid "Usage: quilt series [-v]\\n" -msgstr "Синтаксис: quilt series [-v]\\n" +#, fuzzy +msgid "Usage: quilt series [--color[=always|auto|never]] [-v]\\n" +msgstr "Синтаксис: quilt push [-afqv] [--leave-rejects] [число|патч]\\n" #: quilt/series.in:25 #, fuzzy @@ -1425,7 +1439,7 @@ msgid "" "\n" "--color[=always|auto|never]\n" "\tUse syntax coloring (auto activates it only if the output is a tty).\n" -"\t\n" +"\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1433,15 +1447,15 @@ msgstr "" "\n" "-v\tПодробный, более дружественный вывод.\n" -#: quilt/setup.in:34 quilt/setup.in:53 +#: quilt/setup.in:35 quilt/setup.in:55 msgid "Directory %s exists\\n" msgstr "Директория %s существует\\n" -#: quilt/setup.in:59 +#: quilt/setup.in:61 msgid "File %s exists\\n" msgstr "Файл %s существует\\n" -#: quilt/setup.in:99 +#: quilt/setup.in:102 #, fuzzy msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " @@ -1449,7 +1463,7 @@ msgid "" msgstr "" "Синтаксис: quilt setup [-d префикс-пути] [-v] {файл-spec|файл-series}\\n" -#: quilt/setup.in:102 +#: quilt/setup.in:105 #, fuzzy msgid "" "\n" @@ -1472,25 +1486,25 @@ msgstr "" "\n" "-v\tвывод отладочной информации.\n" -#: quilt/setup.in:173 +#: quilt/setup.in:176 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n" -#: quilt/setup.in:176 +#: quilt/setup.in:179 msgid "The -v option will show rpm's output\\n" msgstr "Опция -v покажет вывод rpm\\n" -#: quilt/setup.in:228 quilt/setup.in:240 +#: quilt/setup.in:231 quilt/setup.in:243 #, fuzzy msgid "File %s not found\\n" msgstr "Файл %s не изменяется\\n" -#: quilt/setup.in:231 quilt/setup.in:243 +#: quilt/setup.in:234 quilt/setup.in:246 msgid "Unpacking archive %s\\n" msgstr "Распаковка архива %s\\n" -#: quilt/setup.in:252 +#: quilt/setup.in:255 msgid "Trying alternative patches and series names..." msgstr "" @@ -1589,6 +1603,13 @@ msgstr "" "использованной при создании этого рабочего дерева, или удалите директорию %s " "и примените все патчи с нуля.\\n" +#~ msgid "" +#~ "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#~ msgstr "Не удалось обновить патчи с -p%s, используйте -p0 или -p1\\n" + +#~ msgid "Usage: quilt series [-v]\\n" +#~ msgstr "Синтаксис: quilt series [-v]\\n" + #~ msgid "Patch is not applied\\n" #~ msgstr "Патч не применён\\n" @@ -1670,9 +1691,6 @@ msgstr "" #~ msgid "Patch %s not found in file series\\n" #~ msgstr "Патч %s не найден в файле series\\n" -#~ msgid "Patch %s is already applied\\n" -#~ msgstr "Патч %s уже применён\\n" - #~ msgid "Display name '%s' contains invalid characters\n" #~ msgstr "Отображаемое имя '%s' содержит некорректные символы\n" |