diff options
| author | Jean Delvare <jdelvare@suse.de> | 2011-12-05 21:24:19 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2011-12-05 21:24:19 +0100 |
| commit | 76881987d1ff4e430008cb8eab652ac5181c224c (patch) | |
| tree | 6fe01fc3475908f0124f9b2efe0c983f40fa5a4e | |
| parent | 2c236e637a2d25a633aea6dfc54d6afcbafd81e4 (diff) | |
| download | quilt-76881987d1ff4e430008cb8eab652ac5181c224c.tar.gz | |
Translation updates.
| -rw-r--r-- | po/de.po | 223 | ||||
| -rw-r--r-- | po/fr.po | 76 | ||||
| -rw-r--r-- | po/ja.po | 78 | ||||
| -rw-r--r-- | po/quilt.pot | 76 | ||||
| -rw-r--r-- | po/ru.po | 908 | ||||
| -rw-r--r-- | quilt.changes | 7 |
6 files changed, 872 insertions, 496 deletions
@@ -36,7 +36,7 @@ msgid "" "\n" "--quiltrc file\n" "\tUse the specified configuration file instead of ~/.quiltrc (or\n" -"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n" +"\t@ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n" "\tdocumentation for details about its possible contents. The\n" "\tspecial value \\\"-\\\" causes quilt not to read any configuration\n" "\tfile.\n" @@ -52,7 +52,7 @@ msgstr "" "\n" "--quiltrc datei\n" "\tVerwende die angegebene Konfigurationsdatei statt ~/.quiltrc (oder\n" -"\t/etc/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-Dokumentation\n" +"\t@ETCDIR@/quilt.quiltrc, wenn ~/.quiltrc fehlt). Siehe die pdf-Dokumentation\n" "\tfür mögliche Einstellungen. Der Dateiname \\`-' bedeutet, dass keine\n" "\tResource-Datei eingelesen werden soll.\n" "\n" @@ -90,7 +90,7 @@ msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" msgid "File %s is already in patch %s\\n" msgstr "Datei %s ist bereits in Patch $patch\\n" -#: quilt/add.in:111 quilt/revert.in:83 +#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84 msgid "File %s modified by patch %s\\n" msgstr "Datei %s wird von Patch %s verändert\\n" @@ -181,7 +181,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:593 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:617 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -317,24 +317,29 @@ msgstr "" "kombiniert werden.\\n" #: quilt/diff.in:232 -msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" +msgid "" +"Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -"Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." +"Kann kein Diff mit -p%s erzeugen, bitte -p0, -p1 oder -pab verwenden." "\\n" -#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:380 +#: quilt/diff.in:241 +msgid "No snapshot to diff against\\n" +msgstr "" + +#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:326 +#: quilt/diff.in:341 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:345 quilt/refresh.in:228 +#: quilt/diff.in:360 quilt/refresh.in:234 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:352 +#: quilt/diff.in:367 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Warnung: später angewandte Patches verändern Dateien von %s\\n" @@ -475,7 +480,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:340 +#: quilt/fork.in:102 quilt/refresh.in:346 msgid "Fork of patch %s created as %s\\n" msgstr "Neue Version von %s erstellt als %s\\n" @@ -614,11 +619,11 @@ msgstr "" "--backup\n" "\tErzeuge eine Sicherungskopie von patch als patch~.\n" -#: quilt/header.in:167 +#: quilt/header.in:169 msgid "Replaced header of patch %s\\n" msgstr "Header von Patch %s ersetzt\\n" -#: quilt/header.in:170 +#: quilt/header.in:172 msgid "Appended text to header of patch %s\\n" msgstr "Text an Header von Patch %s angefügt\\n" @@ -646,7 +651,7 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-f\tOverwite/update existing patches.\n" +"-f\tOverwrite/update existing patches.\n" "\n" "-d {o|a|n}\n" "\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" @@ -720,7 +725,7 @@ msgstr "Importiere Patch %s (abgelegt als %s)\\n" msgid "Failed to import patch %s\\n" msgstr "Konnte Patch %s nicht importieren\\n" -#: quilt/import.in:223 quilt/refresh.in:327 +#: quilt/import.in:223 quilt/refresh.in:333 msgid "Failed to insert patch %s into file series\\n" msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n" @@ -814,46 +819,52 @@ msgstr "" "--to, --cc, --bcc\n" "\tFüre einen Empfänger an die To, Cc, or Bcc-Kopfzeilen an.\n" -#: quilt/mail.in:275 +#: quilt/mail.in:285 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:408 +#: quilt/mail.in:425 msgid "Unable to extract a subject header from %s\\n" msgstr "Konnte keine Subject-Kopfzeile aus %s extrahieren\\n" -#: quilt/mail.in:432 +#: quilt/mail.in:449 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Die Patches %s haben die selben Subject-Kopfzeilen.\\n" -#: quilt/mail.in:441 -#, fuzzy +#: quilt/mail.in:458 msgid "File %s does not exist\\n" -msgstr "Patch %s existiert nicht\\n" +msgstr "Datei %s existiert nicht\\n" -#: quilt/mail.in:501 +#: quilt/mail.in:518 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile (gespeichert als %s)\\n" -#: quilt/mail.in:504 +#: quilt/mail.in:521 msgid "Introduction has no subject header\\n" msgstr "Die Einleitung hat keine Subject-Kopfzeile\\n" -#: quilt/mail.in:601 +#: quilt/mail.in:624 msgid "Introduction saved as %s\\n" msgstr "Einleitung gespeichert als %s\\n" #: quilt/new.in:22 -msgid "Usage: quilt new {patchname}\\n" -msgstr "Verwendung: new {patchname}\\n" +msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n" +msgstr "Verwendung: quilt new [-p n|-p ab] {patchname}\\n" #: quilt/new.in:25 +#, fuzzy msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" "topmost patch.\n" "\n" +"-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" +"\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "Quilt can be used in sub-directories of a source tree. It determines the\n" "root of a source tree by searching for a %s directory above the\n" "current working directory. Create a %s directory in the intended root\n" @@ -871,15 +882,23 @@ msgstr "" "im vorgesehenen Wurzelverzeichnis, falls Quilt ein Verzeichnis zu weit oben\n" "im Verzeichnisbaum verwendet.\n" -#: quilt/new.in:70 quilt/refresh.in:179 +#: quilt/new.in:75 +#, fuzzy +msgid "" +"Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" +msgstr "" +"Kann Patches mit Level -p%s nicht aktualisieren, bitte -p0, -p1 " +"oder -pab angeben\\n" + +#: quilt/new.in:90 quilt/refresh.in:185 msgid "Patch %s exists already\\n" msgstr "Patch %s existiert bereits\\n" -#: quilt/new.in:81 quilt/refresh.in:336 +#: quilt/new.in:101 quilt/refresh.in:342 msgid "Failed to create patch %s\\n" msgstr "Konnte Patch %s nicht erzeugen\\n" -#: quilt/new.in:84 +#: quilt/new.in:104 msgid "Patch %s is now on top\\n" msgstr "Der oberste Patch ist jetzt %s\\n" @@ -962,11 +981,11 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:889 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:919 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:907 +#: quilt/pop.in:116 quilt/scripts/patchfns.in:937 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" @@ -992,11 +1011,11 @@ msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n" msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:508 +#: quilt/pop.in:261 quilt/scripts/patchfns.in:526 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" -#: quilt/pop.in:268 quilt/push.in:381 +#: quilt/pop.in:268 quilt/push.in:396 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -1015,13 +1034,12 @@ msgstr "" "Patch in der series-Datei aus.\n" #: quilt/push.in:24 -#, fuzzy msgid "" -"Usage: quilt push [-afqv] [--merge] [--leave-rejects] [--color[=always|auto|" -"never]] [num|patch]\\n" +"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color" +"[=always|auto|never]] [num|patch]\\n" msgstr "" -"Verwendung: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|" -"never]] [num|patch]\\n" +"Verwendung: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color" +"[=always|auto|never]] [num|patch]\\n" #: quilt/push.in:27 #, fuzzy @@ -1046,7 +1064,7 @@ msgid "" "--fuzz=N\n" "\tSet the maximum fuzz factor (default: 2).\n" "\n" -"-m, --merge\n" +"-m, --merge[=merge|diff3]\n" "\tMerge the patch file into the original files (see patch(1)).\n" "\n" "--leave-rejects\n" @@ -1084,31 +1102,31 @@ msgstr "" msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: quilt/push.in:172 +#: quilt/push.in:178 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: quilt/push.in:207 +#: quilt/push.in:213 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Patch %s existiert nicht; wende leeren patch an\\n" -#: quilt/push.in:211 +#: quilt/push.in:217 msgid "Patch %s appears to be empty; applied\\n" msgstr "Patch %s scheint leer zu sein; angewandt\\n" -#: quilt/push.in:215 +#: quilt/push.in:221 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n" -#: quilt/push.in:225 +#: quilt/push.in:231 msgid "Patch %s can be reverse-applied\\n" msgstr "Patch %s kann verkehrt angewandt werden\\n" -#: quilt/push.in:228 +#: quilt/push.in:234 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:361 +#: quilt/push.in:376 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n" @@ -1229,42 +1247,76 @@ msgstr "" "--strip-trailing-whitespace\n" "\tEntferne Whitespace an Zeilenenden.\n" -#: quilt/refresh.in:165 +#: quilt/refresh.in:171 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "Kann nur den obersten Patch mit -z aktualisieren\\n" -#: quilt/refresh.in:196 +#: quilt/refresh.in:202 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" -#: quilt/refresh.in:234 +#: quilt/refresh.in:240 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:240 +#: quilt/refresh.in:246 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:246 +#: quilt/refresh.in:252 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" -#: quilt/refresh.in:318 +#: quilt/refresh.in:324 msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:344 +#: quilt/refresh.in:350 msgid "Refreshed patch %s\\n" msgstr "Patch %s aktualisiert\\n" +#: quilt/remove.in:22 +msgid "Usage: quilt remove [-P patch] {file} ...\\n" +msgstr "Verwendung: quilt remove [-P patch] {datei} ...\\n" + +#: quilt/remove.in:25 +#, fuzzy +msgid "" +"\n" +"Remove one or more files from the topmost or named patch. Files that\n" +"are modified by patches on top of the specified patch cannot be removed.\n" +"\n" +"-P patch\n" +"\tRemove named files from the named patch.\n" +msgstr "" +"\n" +"Änderungen an den angegebenen Dateien am obersten oder angegebenen Patch\n" +"zurücknehmen. Änderungen in Dateien, die durch Patches über dem angegebenen\n" +"Patch verändert werden, können nicht zurückgenommen werden.\n" +"\n" +"-P patch\n" +"\tPatch, aus dem Dateien entfernt werden sollen.\n" + +#: quilt/remove.in:73 quilt/revert.in:75 +msgid "File %s is not in patch %s\\n" +msgstr "Datei %s ist nicht in Patch %s\\n" + +#: quilt/remove.in:91 +msgid "Failed to remove file %s from patch %s\\n" +msgstr "Konnte Datei %s aus Patch %s nicht entfernen\\n" + +#: quilt/remove.in:105 +msgid "File %s removed from patch %s\\n" +msgstr "Datei %s aus Patch %s entfernt\\n" + #: quilt/rename.in:22 msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "Verwendung: quilt rename [-P patch] neuer_name\\n" @@ -1300,11 +1352,15 @@ msgid "Usage: quilt revert [-P patch] {file} ...\\n" msgstr "Verwendung: quilt revert [-P patch] {datei} ...\\n" #: quilt/revert.in:25 +#, fuzzy msgid "" "\n" -"Revert the changes to the topmost or named patch for the specified file(s).\n" -"Changes to files that are modified by patches on top of the specified patch\n" -"cannot be reverted.\n" +"Revert uncommitted changes to the topmost or named patch for the specified\n" +"file(s): after the revert, 'quilt diff -z' will show no differences for " +"those\n" +"files. Changes to files that are modified by patches on top of the " +"specified\n" +"patch cannot be reverted.\n" "\n" "-P patch\n" "\tRevert changes in the named patch.\n" @@ -1317,11 +1373,7 @@ msgstr "" "-P patch\n" "\tPatch, aus dem Dateien entfernt werden sollen.\n" -#: quilt/revert.in:74 -msgid "File %s is not in patch %s\\n" -msgstr "Datei %s ist nicht in Patch %s\\n" - -#: quilt/revert.in:102 quilt/revert.in:112 +#: quilt/revert.in:103 quilt/revert.in:112 msgid "File %s is unchanged\\n" msgstr "Datei %s ist unverändert\\n" @@ -1348,37 +1400,47 @@ msgstr "Zustelladresse `%s' ist ungültig\n" msgid "USAGE: %s {-s|-u} section file [< replacement]\n" msgstr "" -#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104 +#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 +#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 #, fuzzy, perl-format msgid "File %s disappeared!\n" msgstr "Datei %s ist unverändert\\n" -#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156 +#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 #, fuzzy, perl-format msgid "Failed to rename %s to %s: %s\n" msgstr "Umbenennen von %s auf %s: %s\n" -#: quilt/scripts/patchfns.in:483 quilt/scripts/patchfns.in:495 +#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 +#, fuzzy +msgid "%s is not a regular file\\n" +msgstr "Patch %s ist nicht in der series-Datei\\n" + +#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510 msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/scripts/patchfns.in:544 +#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 +msgid "No series file found\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:572 +#: quilt/scripts/patchfns.in:596 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:609 +#: quilt/scripts/patchfns.in:633 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:631 +#: quilt/scripts/patchfns.in:655 msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:940 +#: quilt/scripts/patchfns.in:978 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 " @@ -1391,7 +1453,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:1027 +#: quilt/scripts/patchfns.in:1122 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1461,13 +1523,14 @@ msgstr "Datei %s existiert\\n" #: quilt/setup.in:75 msgid "" -"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] {specfile|" -"seriesfile}\\n" +"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " +"{specfile|seriesfile}\\n" msgstr "" "Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] " -"{spec-datei|series-datei}\\n" +"[--fuzz=N] {spec-datei|series-datei}\\n" #: quilt/setup.in:78 +#, fuzzy msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1478,6 +1541,9 @@ msgid "" "\tDirectory that contains the package sources. Defaults to \\`.'.\n" "\n" "-v\tVerbose debug output.\n" +"\n" +"--fuzz=N\n" +"\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" msgstr "" "\n" "Initialisiere einen Quellbaum aus einer rpm spec-Datei oder einer quilt " @@ -1490,21 +1556,21 @@ msgstr "" "\n" "-v\tAusführliche Ausgabe.\n" -#: quilt/setup.in:143 +#: quilt/setup.in:149 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:146 +#: quilt/setup.in:152 msgid "The -v option will show rpm's output\\n" msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" -#: quilt/setup.in:183 +#: quilt/setup.in:189 msgid "File %s not found\\n" msgstr "Datei %s nicht gefunden\\n" -#: quilt/setup.in:186 +#: quilt/setup.in:192 msgid "Unpacking archive %s\\n" msgstr "Entpacke Archiv %s\\n" @@ -1607,6 +1673,3 @@ 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 "File %s removed from patch %s\\n" -#~ msgstr "Datei %s aus Patch %s entfernt\\n" @@ -181,7 +181,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:619 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:617 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqué\\n" @@ -324,19 +324,23 @@ msgstr "" "Impossible de créer des patches avec -p%s. Veuillez spécifier -p0, -p1 ou -" "pab à la place\\n" -#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:384 +#: quilt/diff.in:241 +msgid "No snapshot to diff against\\n" +msgstr "Pas d'instantané avec lequel comparer\\n" + +#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqué avant %s\\n." -#: quilt/diff.in:328 +#: quilt/diff.in:341 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifié.\\n" -#: quilt/diff.in:347 quilt/refresh.in:228 +#: quilt/diff.in:360 quilt/refresh.in:234 msgid "Diff failed, aborting\\n" msgstr "Le diff a échoué. Abandon.\\n" -#: quilt/diff.in:354 +#: quilt/diff.in:367 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Attention: un patch plus recent modifie des fichiers communs à %s\\n" @@ -478,7 +482,7 @@ msgstr "Le patch %s existe déjà, veuillez choisir un nouveau nom\\n" 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:340 +#: quilt/fork.in:102 quilt/refresh.in:346 msgid "Fork of patch %s created as %s\\n" msgstr "Le fork de %s a été créé en tant que %s\\n" @@ -650,7 +654,7 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-f\tOverwite/update existing patches.\n" +"-f\tOverwrite/update existing patches.\n" "\n" "-d {o|a|n}\n" "\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" @@ -723,7 +727,7 @@ msgstr "Import du patch %s (enregistré dans %s)\\n" msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:223 quilt/refresh.in:327 +#: quilt/import.in:223 quilt/refresh.in:333 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" @@ -824,32 +828,32 @@ msgstr "" "--reply-to message\n" "\tAjoute les en-têtes appropriés pour répondre au message spécifié.\n" -#: quilt/mail.in:279 +#: quilt/mail.in:285 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:412 +#: quilt/mail.in:425 msgid "Unable to extract a subject header from %s\\n" msgstr "Impossible d'extraire une ligne de sujet de %s\\n" -#: quilt/mail.in:436 +#: quilt/mail.in:449 msgid "Patches %s have duplicate subject headers.\\n" msgstr "Les patches %s ont des sujets dupliqués.\\n" -#: quilt/mail.in:445 +#: quilt/mail.in:458 msgid "File %s does not exist\\n" msgstr "Le fichier %s n'existe pas\\n" -#: quilt/mail.in:505 +#: quilt/mail.in:518 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:508 +#: quilt/mail.in:521 msgid "Introduction has no subject header\\n" msgstr "L'introduction ne contient pas de ligne de sujet\\n" -#: quilt/mail.in:605 +#: quilt/mail.in:624 msgid "Introduction saved as %s\\n" msgstr "Introduction sauvegardée en tant que %s\\n" @@ -898,11 +902,11 @@ msgstr "" "Impossible de créer des patchs avec -p%s. Veuillez spécifier -p0, -p1 ou -" "pab à la place.\\n" -#: quilt/new.in:90 quilt/refresh.in:179 +#: quilt/new.in:90 quilt/refresh.in:185 msgid "Patch %s exists already\\n" msgstr "Le patch %s existe déjà\\n" -#: quilt/new.in:101 quilt/refresh.in:336 +#: quilt/new.in:101 quilt/refresh.in:342 msgid "Failed to create patch %s\\n" msgstr "Impossible de créer le patch %s\\n" @@ -995,11 +999,11 @@ msgstr "" "\n" "-v\tOpère verbeusement.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:921 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:919 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:939 +#: quilt/pop.in:116 quilt/scripts/patchfns.in:937 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" @@ -1025,7 +1029,7 @@ msgstr "Le patch %s doit être rafraichi au préalable.\\n" msgid "No patch removed\\n" msgstr "Aucun patch retiré\\n" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:528 +#: quilt/pop.in:261 quilt/scripts/patchfns.in:526 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqué\\n" @@ -1268,39 +1272,39 @@ msgstr "" "--strip-trailing-whitespace\n" "\tSupprime les espaces à la fin des lignes.\n" -#: quilt/refresh.in:165 +#: quilt/refresh.in:171 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:196 +#: quilt/refresh.in:202 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de rafraîchir des patchs avec -p%s. Veuillez spécifier -p0 ou -p1 " "à la place.\\n" -#: quilt/refresh.in:234 +#: quilt/refresh.in:240 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:240 +#: quilt/refresh.in:246 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:246 +#: quilt/refresh.in:252 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" -#: quilt/refresh.in:318 +#: quilt/refresh.in:324 msgid "Patch %s is unchanged\\n" msgstr "Patch %s inchangé\\n" -#: quilt/refresh.in:344 +#: quilt/refresh.in:350 msgid "Refreshed patch %s\\n" msgstr "Patch %s rafraîchi\\n" @@ -1431,35 +1435,35 @@ msgstr "Le fichier %s a disparu !\n" msgid "Failed to rename %s to %s: %s\n" msgstr "Impossible de renommer %s en %s : %s\n" -#: quilt/scripts/patchfns.in:247 quilt/scripts/patchfns.in:541 +#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "%s n'est pas un fichier régulier\\n" -#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 +#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510 msgid "No patches in series\\n" msgstr "Aucun patch dans la série\\n" -#: quilt/scripts/patchfns.in:497 quilt/scripts/patchfns.in:514 +#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 msgid "No series file found\\n" msgstr "Fichier de série non trouvé" -#: quilt/scripts/patchfns.in:570 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/scripts/patchfns.in:598 +#: quilt/scripts/patchfns.in:596 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/scripts/patchfns.in:635 +#: quilt/scripts/patchfns.in:633 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:657 +#: quilt/scripts/patchfns.in:655 msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'existe pas\\n" -#: quilt/scripts/patchfns.in:980 +#: quilt/scripts/patchfns.in:978 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 " @@ -1471,7 +1475,7 @@ 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:1124 +#: quilt/scripts/patchfns.in:1122 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -178,7 +178,7 @@ msgstr "" msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:619 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:617 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" @@ -315,19 +315,23 @@ msgid "" msgstr "" "-p%s でパッチの差分はとれません。-p0、-p1、または -pab を指定してください\\n" -#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:384 +#: quilt/diff.in:241 +msgid "No snapshot to diff against\\n" +msgstr "" + +#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: quilt/diff.in:328 +#: quilt/diff.in:341 msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:347 quilt/refresh.in:228 +#: quilt/diff.in:360 quilt/refresh.in:234 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: quilt/diff.in:354 +#: quilt/diff.in:367 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "警告: 最近のパッチが、パッチ %s 内のファイルを変更しています\\n" @@ -462,7 +466,7 @@ msgstr "パッチ %s はすでに存在します。新しい名前を選んで msgid "Fork of patch %s to patch %s failed\\n" msgstr "パッチ %s からパッチ %s への分岐に失敗しました\\n" -#: quilt/fork.in:102 quilt/refresh.in:340 +#: quilt/fork.in:102 quilt/refresh.in:346 msgid "Fork of patch %s created as %s\\n" msgstr "パッチ %s の分岐で %s が作成されました\\n" @@ -615,6 +619,7 @@ msgstr "" "ル ...\\n" #: quilt/import.in:25 +#, fuzzy msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -630,7 +635,7 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-f\tOverwite/update existing patches.\n" +"-f\tOverwrite/update existing patches.\n" "\n" "-d {o|a|n}\n" "\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" @@ -700,7 +705,7 @@ msgstr "パッチ %s を取り込んでいます (%s として保存されます msgid "Failed to import patch %s\\n" msgstr "パッチ %s の取り込みに失敗しました\\n" -#: quilt/import.in:223 quilt/refresh.in:327 +#: quilt/import.in:223 quilt/refresh.in:333 msgid "Failed to insert patch %s into file series\\n" msgstr "seriesファイルへのパッチ %s の書き込みに失敗しました\\n" @@ -797,33 +802,33 @@ msgstr "" "--reply-to メッセージ\n" "\t指定されたメッセージへのリプライとなるように、適切なヘッダを追加。\n" -#: quilt/mail.in:279 +#: quilt/mail.in:285 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" "エンベロープの送信者アドレスを確定できませんでした。--senderオプション\n" "を使用してください。" -#: quilt/mail.in:412 +#: quilt/mail.in:425 msgid "Unable to extract a subject header from %s\\n" msgstr "%s から件名を取り出せません。\\n" -#: quilt/mail.in:436 +#: quilt/mail.in:449 msgid "Patches %s have duplicate subject headers.\\n" msgstr "パッチ %s の件名が重複しています。\\n" -#: quilt/mail.in:445 +#: quilt/mail.in:458 msgid "File %s does not exist\\n" msgstr "ファイル %s が存在しません\\n" -#: quilt/mail.in:505 +#: quilt/mail.in:518 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "序文に件名がありません(%s として保存されました)\\n" -#: quilt/mail.in:508 +#: quilt/mail.in:521 msgid "Introduction has no subject header\\n" msgstr "序文に件名がありません\\n" -#: quilt/mail.in:605 +#: quilt/mail.in:624 msgid "Introduction saved as %s\\n" msgstr "序文は %s という名前で保存されました\\n" @@ -866,18 +871,17 @@ msgstr "" "合は、正しい場所に %s ディレクトリを作成すること。\n" #: quilt/new.in:75 -#, fuzzy msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "" "-p%s でパッチを作成することができません。-p0、-p1 または -pab を指定してくだ" "さい\\n" -#: quilt/new.in:90 quilt/refresh.in:179 +#: quilt/new.in:90 quilt/refresh.in:185 msgid "Patch %s exists already\\n" msgstr "パッチ %s は、すでに存在します\\n" -#: quilt/new.in:101 quilt/refresh.in:336 +#: quilt/new.in:101 quilt/refresh.in:342 msgid "Failed to create patch %s\\n" msgstr "パッチ %s の作成に失敗しました\\n" @@ -965,11 +969,11 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:921 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:919 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:939 +#: quilt/pop.in:116 quilt/scripts/patchfns.in:937 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" @@ -995,7 +999,7 @@ msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:528 +#: quilt/pop.in:261 quilt/scripts/patchfns.in:526 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -1231,37 +1235,37 @@ msgstr "" "--strip-trailing-whitespace\n" "\t末尾の空白文字を削除する。\n" -#: quilt/refresh.in:165 +#: quilt/refresh.in:171 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "-zオプションがある場合、最上位パッチ以外のリフレッシュはできません\\n" -#: quilt/refresh.in:196 +#: quilt/refresh.in:202 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "-p%s ではリフレッシュすることができません。-p0または -p1を指定してください\\n" -#: quilt/refresh.in:234 +#: quilt/refresh.in:240 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "より最近のパッチがパッチ %s のファイルに変更を加えています。リフレッシュを実" "行する場合は -f オプションを使用してください。\\n" -#: quilt/refresh.in:240 +#: quilt/refresh.in:246 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "--strip-trailing-whitespace は影になっているファイルがある場合は使えません" -#: quilt/refresh.in:246 +#: quilt/refresh.in:252 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" -#: quilt/refresh.in:318 +#: quilt/refresh.in:324 msgid "Patch %s is unchanged\\n" msgstr "パッチ %s に変更はありません\\n" -#: quilt/refresh.in:344 +#: quilt/refresh.in:350 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1391,36 +1395,36 @@ msgstr "ファイル %s に変更はありません\\n" msgid "Failed to rename %s to %s: %s\n" msgstr "%s から %s へ名前を変更しました: %s\n" -#: quilt/scripts/patchfns.in:247 quilt/scripts/patchfns.in:541 +#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "%s は普通のファイルではありません\\n" -#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 +#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510 msgid "No patches in series\\n" msgstr "シリーズに登録されているパッチがありません\\n" -#: quilt/scripts/patchfns.in:497 quilt/scripts/patchfns.in:514 +#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 msgid "No series file found\\n" msgstr "シリーズファイルが見つかりません\\n" -#: quilt/scripts/patchfns.in:570 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:598 +#: quilt/scripts/patchfns.in:596 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/scripts/patchfns.in:635 +#: quilt/scripts/patchfns.in:633 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: quilt/scripts/patchfns.in:657 +#: quilt/scripts/patchfns.in:655 msgid "Patch %s does not exist\\n" msgstr "パッチ %s が存在しません\\n" -#: quilt/scripts/patchfns.in:980 +#: quilt/scripts/patchfns.in:978 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 " @@ -1432,7 +1436,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:1124 +#: quilt/scripts/patchfns.in:1122 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 122296a..8c78e33 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -119,7 +119,7 @@ msgstr "" msgid "No next patch\\n" msgstr "" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:619 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:617 msgid "Patch %s is currently applied\\n" msgstr "" @@ -207,19 +207,23 @@ msgid "" "Cannot diff patches with -p%s, please specify -p0, -p1, or -pab instead\\n" msgstr "" -#: quilt/diff.in:266 quilt/files.in:105 quilt/mail.in:384 +#: quilt/diff.in:241 +msgid "No snapshot to diff against\\n" +msgstr "" + +#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:328 +#: quilt/diff.in:341 msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:347 quilt/refresh.in:228 +#: quilt/diff.in:360 quilt/refresh.in:234 msgid "Diff failed, aborting\\n" msgstr "" -#: quilt/diff.in:354 +#: quilt/diff.in:367 msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "" @@ -312,7 +316,7 @@ msgstr "" msgid "Fork of patch %s to patch %s failed\\n" msgstr "" -#: quilt/fork.in:102 quilt/refresh.in:340 +#: quilt/fork.in:102 quilt/refresh.in:346 msgid "Fork of patch %s created as %s\\n" msgstr "" @@ -425,7 +429,7 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-f\tOverwite/update existing patches.\n" +"-f\tOverwrite/update existing patches.\n" "\n" "-d {o|a|n}\n" "\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" @@ -473,7 +477,7 @@ msgstr "" msgid "Failed to import patch %s\\n" msgstr "" -#: quilt/import.in:223 quilt/refresh.in:327 +#: quilt/import.in:223 quilt/refresh.in:333 msgid "Failed to insert patch %s into file series\\n" msgstr "" @@ -529,31 +533,31 @@ msgid "" "\tAdd the appropriate headers to reply to the specified message.\n" msgstr "" -#: quilt/mail.in:279 +#: quilt/mail.in:285 msgid "Could not determine the envelope sender address. Please use --sender." msgstr "" -#: quilt/mail.in:412 +#: quilt/mail.in:425 msgid "Unable to extract a subject header from %s\\n" msgstr "" -#: quilt/mail.in:436 +#: quilt/mail.in:449 msgid "Patches %s have duplicate subject headers.\\n" msgstr "" -#: quilt/mail.in:445 +#: quilt/mail.in:458 msgid "File %s does not exist\\n" msgstr "" -#: quilt/mail.in:505 +#: quilt/mail.in:518 msgid "Introduction has no subject header (saved as %s)\\n" msgstr "" -#: quilt/mail.in:508 +#: quilt/mail.in:521 msgid "Introduction has no subject header\\n" msgstr "" -#: quilt/mail.in:605 +#: quilt/mail.in:624 msgid "Introduction saved as %s\\n" msgstr "" @@ -585,11 +589,11 @@ msgid "" "Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" msgstr "" -#: quilt/new.in:90 quilt/refresh.in:179 +#: quilt/new.in:90 quilt/refresh.in:185 msgid "Patch %s exists already\\n" msgstr "" -#: quilt/new.in:101 quilt/refresh.in:336 +#: quilt/new.in:101 quilt/refresh.in:342 msgid "Failed to create patch %s\\n" msgstr "" @@ -649,11 +653,11 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:921 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:919 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:939 +#: quilt/pop.in:116 quilt/scripts/patchfns.in:937 msgid "Failed to patch temporary files\\n" msgstr "" @@ -677,7 +681,7 @@ msgstr "" msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:528 +#: quilt/pop.in:261 quilt/scripts/patchfns.in:526 msgid "No patches applied\\n" msgstr "" @@ -826,33 +830,33 @@ msgid "" "\tStrip trailing whitespace at the end of lines.\n" msgstr "" -#: quilt/refresh.in:165 +#: quilt/refresh.in:171 msgid "Can only refresh the topmost patch with -z currently\\n" msgstr "" -#: quilt/refresh.in:196 +#: quilt/refresh.in:202 msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/refresh.in:234 +#: quilt/refresh.in:240 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" -#: quilt/refresh.in:240 +#: quilt/refresh.in:246 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:246 +#: quilt/refresh.in:252 msgid "Nothing in patch %s\\n" msgstr "" -#: quilt/refresh.in:318 +#: quilt/refresh.in:324 msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:344 +#: quilt/refresh.in:350 msgid "Refreshed patch %s\\n" msgstr "" @@ -963,35 +967,35 @@ msgstr "" msgid "Failed to rename %s to %s: %s\n" msgstr "" -#: quilt/scripts/patchfns.in:247 quilt/scripts/patchfns.in:541 +#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 msgid "%s is not a regular file\\n" msgstr "" -#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 +#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:497 quilt/scripts/patchfns.in:514 +#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:570 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:598 +#: quilt/scripts/patchfns.in:596 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:635 +#: quilt/scripts/patchfns.in:633 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:657 +#: quilt/scripts/patchfns.in:655 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:980 +#: quilt/scripts/patchfns.in:978 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 " @@ -999,7 +1003,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1124 +#: quilt/scripts/patchfns.in:1122 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -17,19 +17,20 @@ msgstr "" "X-Launchpad-Export-Date: 2011-09-20 08:04+0000\n" "X-Generator: Launchpad (build 13980)\n" -#: bin/quilt.in:23 +#: bin/quilt.in:32 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Синтаксис: quilt [--trace[=verbose]] [--quiltrc=XX] команда [-h] ..." -#: bin/quilt.in:24 +#: bin/quilt.in:33 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:26 +#: bin/quilt.in:35 msgid "Commands are:" msgstr "Команды:" -#: bin/quilt.in:31 +#: bin/quilt.in:40 +#, fuzzy msgid "" "\n" "Global options:\n" @@ -39,8 +40,10 @@ msgid "" "\n" "--quiltrc file\n" "\tUse the specified configuration file instead of ~/.quiltrc (or\n" -"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n" -"\tdocumentation for details about its possible contents.\n" +"\t@ETCDIR@/quilt.quiltrc if ~/.quiltrc does not exist). See the pdf\n" +"\tdocumentation for details about its possible contents. The\n" +"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n" +"\tfile.\n" "\n" "--version\n" "\tPrint the version number and exit immediately." @@ -60,17 +63,19 @@ msgstr "" "\tНапечатать номер версии и выйти из программы." #: quilt/add.in:22 -msgid "Usage: quilt add [-p patch] {file} ...\\n" +#, fuzzy +msgid "Usage: quilt add [-P patch] {file} ...\\n" msgstr "Синтаксис: quilt add [-p патч] {файл} ...\\n" #: quilt/add.in:25 +#, fuzzy msgid "" "\n" "Add one or more files to the topmost or named patch. Files must be\n" "added to the patch before being modified. Files that are modified by\n" "patches already applied on top of the specified patch cannot be added.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to add files to.\n" msgstr "" "\n" @@ -83,58 +88,45 @@ msgstr "" "\tПатч, к которому добавлять файлы.\n" #: quilt/add.in:48 quilt/add.in:54 -msgid "File \\`%s' is located below \\`%s'\\n" +#, fuzzy +msgid "File %s is located below %s\\n" msgstr "Файл \\`%s' расположен ниже \\`%s'\\n" -#: quilt/add.in:78 quilt/applied.in:62 quilt/delete.in:97 quilt/diff.in:160 -#: quilt/diff.in:171 quilt/graph.in:116 quilt/header.in:135 quilt/next.in:62 -#: quilt/pop.in:246 quilt/previous.in:62 quilt/push.in:312 -#: quilt/refresh.in:148 quilt/remove.in:53 quilt/rename.in:63 -#: quilt/unapplied.in:62 -msgid "Patch %s is not in series\\n" -msgstr "Патч %s не в серии\\n" - -#: quilt/add.in:99 quilt/diff.in:239 quilt/graph.in:121 quilt/pop.in:261 -#: quilt/refresh.in:154 quilt/remove.in:74 -msgid "Patch %s is not applied\\n" -msgstr "Патч %s не применён\\n" - -#: quilt/add.in:106 quilt/delete.in:76 quilt/diff.in:247 quilt/files.in:103 -#: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 -#: quilt/pop.in:295 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 -#: quilt/rename.in:85 -msgid "No patches applied\\n" -msgstr "Нет применённых патчей\\n" - -#: quilt/add.in:121 +#: quilt/add.in:103 msgid "File %s is already in patch %s\\n" msgstr "Файл %s уже в патче %s\\n" -#: quilt/add.in:129 quilt/remove.in:100 +#: quilt/add.in:111 quilt/remove.in:82 quilt/revert.in:84 msgid "File %s modified by patch %s\\n" msgstr "Файл %s изменён патчем %s\\n" -#: quilt/add.in:137 +#: quilt/add.in:119 msgid "Cannot add symbolic link %s\\n" msgstr "Не удалось добавить символьную ссылку %s\\n" -#: quilt/add.in:144 +#: quilt/add.in:126 msgid "Failed to back up file %s\\n" msgstr "Не удалось создать резервную копию файла %s\\n" -#: quilt/add.in:155 +#: quilt/add.in:137 msgid "File %s added to patch %s\\n" msgstr "Файл %s добавлен к патчу %s\\n" #: quilt/annotate.in:22 -msgid "Usage: quilt annotate {file}\\n" +#, fuzzy +msgid "Usage: quilt annotate [-P patch] {file}\\n" msgstr "Синтаксис: quilt annotate {файл}\\n" #: quilt/annotate.in:25 +#, fuzzy msgid "" "\n" "Print an annotated listing of the specified file showing which\n" -"patches modify which lines.\n" +"patches modify which lines. Only applied patches are included.\n" +"\n" +"-P patch\n" +"\tStop checking for changes at the specified rather than the\n" +"\ttopmost patch.\n" msgstr "" "\n" "Вывести список, показывающий, какие строки указанного файла\n" @@ -154,15 +146,13 @@ msgstr "" "Вывести список применённых патчей или всех патчей, до и включая\n" "указанный патч в файле series.\n" -#: quilt/applied.in:67 -msgid "Patch is not applied\\n" -msgstr "Патч не применён\\n" - #: quilt/delete.in:22 -msgid "Usage: quilt delete [patch | -n]\\n" +#, fuzzy +msgid "Usage: quilt delete [-r] [--backup] [patch|-n]\\n" msgstr "Синтаксис: quilt delete [патч | -n]\\n" #: quilt/delete.in:25 +#, fuzzy msgid "" "\n" "Remove the specified or topmost patch from the series file. If the\n" @@ -171,6 +161,12 @@ msgid "" "\n" "-n\tDelete the next patch after topmost, rather than the specified\n" "\tor topmost patch.\n" +"\n" +"-r\tRemove the deleted patch file from the patches directory as well.\n" +"\n" +"--backup\n" +"\tRename the patch file to patch~ rather than deleting it.\n" +"\tIgnored if not used with \\`-r'.\n" msgstr "" "\n" "Удалить указанный или верхний патч из файла series. Если патч применён,\n" @@ -180,33 +176,45 @@ msgstr "" "-n\tУдалить патч, предшествующий верхнему, вместо указанного\n" "\tили верхнего.\n" -#: quilt/delete.in:88 +#: quilt/delete.in:89 msgid "No next patch\\n" msgstr "Отсутствует следующий патч\\n" -#: quilt/delete.in:106 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:617 msgid "Patch %s is currently applied\\n" msgstr "Патч %s применён\\n" -#: quilt/delete.in:113 +#: quilt/delete.in:114 msgid "Removed patch %s\\n" msgstr "Удалён патч %s\\n" -#: quilt/delete.in:115 +#: quilt/delete.in:116 msgid "Failed to remove patch %s\\n" msgstr "Не удалось отменить патч %s\\n" +#: quilt/delete.in:127 +#, fuzzy +msgid "Failed to backup patch file %s\\n" +msgstr "Не удалось создать резервную копию файла %s\\n" + +#: quilt/delete.in:134 +#, fuzzy +msgid "Failed to remove patch file %s\\n" +msgstr "Не удалось отменить патч %s\\n" + #: quilt/diff.in:24 +#, fuzzy msgid "" -"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " -"[--color] [file ...]\\n" +"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" msgstr "" "Синтаксис: quilt diff [-p n] [-u|-U число|-c|-C число] [--combine патч|-z] [-" "R] [-P патч] [--snapshot] [--diff=утилита] [--no-timestamps] [--no-index] [--" "sort] [--color] [файл ...]\\n" #: quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -215,6 +223,10 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" @@ -237,7 +249,7 @@ msgid "" "\n" "--combine patch\n" "\tCreate a combined diff for all patches between this patch and\n" -"\tthe patch specified with -P. A patch name of \\\"-\\\" is equivalent\n" +"\tthe patch specified with -P. A patch name of \\`-' is equivalent\n" "\tto specifying the first applied patch.\n" "\n" "--snapshot\n" @@ -294,46 +306,46 @@ msgstr "" "\n" "--sort\tСортировать файлы по имени, не сохраняя их исходного порядка.\n" -#: quilt/diff.in:231 +#: quilt/diff.in:218 +#, fuzzy msgid "" -"Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" +"Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Опции \\`-c patch', \\`--snapshot' и \\`-z' не могут использоваться " "совместно.\\n" -#: quilt/diff.in:258 -msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" +#: quilt/diff.in:232 +#, 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:293 quilt/files.in:122 +#: quilt/diff.in:241 +msgid "No snapshot to diff against\\n" +msgstr "" + +#: quilt/diff.in:273 quilt/files.in:105 quilt/mail.in:397 msgid "Patch %s not applied before patch %s\\n" msgstr "Патч %s не был применён перед патчем %s\\n" -#: quilt/diff.in:343 quilt/pop.in:114 -msgid "Failed to copy files to temporary directory\\n" -msgstr "Не удалось скопировать файлы во временный каталог\\n" - -#: quilt/diff.in:367 quilt/pop.in:138 -msgid "Failed to patch temporary files\\n" -msgstr "Не удалось применить патч к временным файлам\\n" - -#: quilt/diff.in:386 +#: quilt/diff.in:341 msgid "File %s is not being modified\\n" msgstr "Файл %s не изменяется\\n" -#: quilt/diff.in:406 quilt/refresh.in:201 +#: quilt/diff.in:360 quilt/refresh.in:234 msgid "Diff failed, aborting\\n" msgstr "Не удалось выполнить diff, завершение\\n" -#: quilt/diff.in:413 -msgid "More recent patches modify files in patch %s\\n" +#: quilt/diff.in:367 +#, fuzzy +msgid "Warning: more recent patches modify files in patch %s\\n" msgstr "Более новые патчи изменяют файлы в патче %s\\n" -#: quilt/edit.in:13 +#: quilt/edit.in:24 msgid "Usage: quilt edit file ...\\n" msgstr "Синтаксис: quilt edit файл ...\\n" -#: quilt/edit.in:16 +#: quilt/edit.in:27 msgid "" "\n" "Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n" @@ -348,6 +360,7 @@ msgid "Usage: quilt files [-v] [-a] [-l] [--combine patch] [patch]\\n" msgstr "Синтаксис: quilt files [-v] [-a] [-l] [--combine патч] [патч]\\n" #: quilt/files.in:25 +#, fuzzy msgid "" "\n" "Print the list of files that the topmost or specified patch changes.\n" @@ -360,8 +373,8 @@ msgid "" "\n" "--combine patch\n" "\tCreate a listing for all patches between this patch and\n" -"\tthe topmost applied patch. A patch name of \\\"-\\\" is equivalent\n" -"\tto specifying the first applied patch.\n" +"\tthe topmost or specified patch. A patch name of \\`-' is\n" +"\tequivalent to specifying the first applied patch.\n" "\n" msgstr "" "\n" @@ -379,15 +392,13 @@ msgstr "" "\tуказанию первого применённого патча.\n" "\n" -#: quilt/files.in:76 quilt/files.in:96 -msgid "Patch %s is not in series file\\n" -msgstr "Патч %s не входит в файл series\\n" - #: quilt/fold.in:22 -msgid "Usage: quilt fold [-p strip-level]\\n" +#, fuzzy +msgid "Usage: quilt fold [-R] [-q] [-f] [-p strip-level]\\n" msgstr "Usage: quilt fold [-p strip-level]\\n" #: quilt/fold.in:25 +#, fuzzy msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -395,6 +406,13 @@ msgid "" "patch, the patch is applied with the specified strip level (which\n" "defaults to 1).\n" "\n" +"-R\tApply patch in reverse.\n" +"\n" +"-q\tQuiet operation.\n" +"\n" +"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n" +"\tapply the patch interactively: the patch utility may ask questions.\n" +"\n" "-p strip-level\n" "\tThe number of pathname components to strip from file names\n" "\twhen applying patchfile.\n" @@ -408,7 +426,7 @@ msgstr "" "\tЧисло компонент пути, которые необходимо удалить из имён файлов\n" "\tпри наложении патча.\n" -#: quilt/fold.in:116 +#: quilt/fold.in:129 msgid "File %s may be corrupted\\n" msgstr "Файл %s может быть повреждён\\n" @@ -417,6 +435,7 @@ msgid "Usage: quilt fork [new_name]\\n" msgstr "Синтаксис: quilt fork [новое_имя]\\n" #: quilt/fork.in:25 +#, fuzzy msgid "" "\n" "Fork the topmost patch. Forking a patch means creating a verbatim copy\n" @@ -427,7 +446,7 @@ msgid "" "sequence of commands would be: fork, edit, refresh.\n" "\n" "If new_name is missing, the name of the forked patch will be the current\n" -"patch name, followed by \\\"-2\\\". If the patch name already ends in a\n" +"patch name, followed by \\`-2'. If the patch name already ends in a\n" "dash-and-number, the number is further incremented (e.g., patch.diff,\n" "patch-2.diff, patch-3.diff).\n" msgstr "" @@ -443,22 +462,23 @@ msgstr "" "добавляется «-2». Если патч уже заканчивается дефисом и числом, то это\n" "число увеличивается (т.е. patch.diff, patch-2.diff, patch-3.diff).\n" -#: quilt/fork.in:99 +#: quilt/fork.in:84 msgid "Patch %s exists already, please choose a new name\\n" msgstr "Патч %s уже существует, выберите новое имя\\n" -#: quilt/fork.in:111 +#: quilt/fork.in:96 msgid "Fork of patch %s to patch %s failed\\n" msgstr "Не удалось создать ответвление патча %s в патч %s\\n" -#: quilt/fork.in:117 +#: quilt/fork.in:102 quilt/refresh.in:346 msgid "Fork of patch %s created as %s\\n" msgstr "Ответвление патча %s создано как %s\\n" #: quilt/graph.in:22 +#, fuzzy msgid "" "Usage: quilt graph [--all] [--reduce] [--lines[=num]] [--edge-labels=files] " -"[patch]\\n" +"[-T ps] [patch]\\n" msgstr "" "Синтаксис: quilt graph [--all] [--reduce] [--lines[=число]] [--edge-" "labels=файлы] [патч]\\n" @@ -552,6 +572,7 @@ msgstr "" "trailing-whitespace] [патч]\\n" #: quilt/header.in:28 +#, fuzzy msgid "" "\n" "Print or change the header of the topmost or specified patch.\n" @@ -560,7 +581,7 @@ msgid "" "\tAppend to (-a) or replace (-r) the exiting patch header, or\n" "\tedit (-e) the header in \\$EDITOR (%s). If none of these options is\n" "\tgiven, print the patch header.\n" -"\t\n" +"\n" "--strip-diffstat\n" "\tStrip diffstat output from the header.\n" "\n" @@ -587,144 +608,215 @@ msgstr "" "--backup\n" "\tСоздать резервную копию старой версии патча в файле патч~.\n" -#: quilt/header.in:192 +#: quilt/header.in:169 msgid "Replaced header of patch %s\\n" msgstr "Заменён заголовок патча %s\\n" -#: quilt/header.in:195 +#: quilt/header.in:172 msgid "Appended text to header of patch %s\\n" msgstr "Добавлен текст к заголовку патча %s\\n" #: quilt/import.in:22 -msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" +#, fuzzy +msgid "" +"Usage: quilt import [-p num] [-R] [-P patch] [-f] [-d {o|a|n}] patchfile ..." +"\\n" msgstr "Usage: quilt import [-f] [-p число] [-n патч] файл-патча ...\\n" #: quilt/import.in:25 msgid "" "\n" -"Import external patches.\n" +"Import external patches. The patches will be inserted following the\n" +"current top patch, and must be pushed after import to apply them.\n" "\n" "-p num\n" "\tNumber of directory levels to strip when applying (default=1)\n" "\n" -"-n patch\n" +"-R\n" +"\tApply patch in reverse.\n" +"\n" +"-P patch\n" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" -"-f\tOverwite/update existing patches.\n" -msgstr "" -"\n" -"Импортировать внешние патчи.\n" -"\n" -"-p число\n" -"\tЧисло уровней директорий, которые нужно убрать перед наложением\n" -"\t(по умочанию=1)\n" +"-f\tOverwrite/update existing patches.\n" "\n" -"-n патч\n" -"\tИмя патча для использования в quilt. Эту опцию можно использовать\n" -"\tтолько прии импорте одного патча.\n" -"\n" -"-f\tПерезаписать или обновить существующие патчи.\n" +"-d {o|a|n}\n" +"\tWhen overwriting in existing patch, keep the old (o), all (a), or\n" +"\tnew (n) patch header. If both patches include headers, this option\n" +"\tmust be specified. This option is only effective when -f is used.\n" +msgstr "" + +#: quilt/import.in:71 +msgid "Patch headers differ:\\n" +msgstr "" #: quilt/import.in:74 -msgid "Option \\`-n' can only be used when importing a single patch\\n" +msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" +msgstr "" + +#: quilt/import.in:139 +#, fuzzy +msgid "Option \\`-P' can only be used when importing a single patch\\n" msgstr "Опцию \\`-n' можно использовать только при импорте одного патча\\n" -#: quilt/import.in:92 +#: quilt/import.in:169 msgid "Patch %s is applied\\n" msgstr "Патч %s применён\\n" -#: quilt/import.in:100 +#: quilt/import.in:178 +#, fuzzy +msgid "Patch %s already exists in series.\\n" +msgstr "Патч %s не в серии\\n" + +#: quilt/import.in:184 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Патч %s существует. Принудительно заменить можно опцией -f.\\n" -#: quilt/import.in:104 +#: quilt/import.in:195 msgid "Replacing patch %s with new version\\n" msgstr "Замена патча %s новой версией\\n" -#: quilt/import.in:107 +#: quilt/import.in:199 +#, fuzzy +msgid "Importing patch %s\\n" +msgstr "Удаление патча %s\\n" + +#: quilt/import.in:201 msgid "Importing patch %s (stored as %s)\\n" msgstr "Импорт патча %s (сохранён как %s)\\n" -#: quilt/import.in:115 +#: quilt/import.in:214 msgid "Failed to import patch %s\\n" msgstr "Не удалось импортировать патч %s\\n" -#: quilt/import.in:122 +#: quilt/import.in:223 quilt/refresh.in:333 msgid "Failed to insert patch %s into file series\\n" msgstr "Не удалось вставить патч %s в файл series\\n" -#: quilt/mail.in:25 +#: quilt/mail.in:24 +#, fuzzy msgid "" -"Usage: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc ...] [--" -"bcc ...] [--subject ...]\\n" +"Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--" +"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] " +"[--reply-to message] [first_patch [last_patch]]\\n" msgstr "" -"Синтаксис: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--cc " -"...] [--bcc ...] [--subject ...]\\n" +"Синтаксис: quilt mail {--mbox file|--send} [--from ...] [--to ...] [--" +"cc ...] [--bcc ...] [--subject ...]\\n" -#: quilt/mail.in:28 +#: quilt/mail.in:27 msgid "" "\n" -"Create mail messages from all patches in the series file, and either store\n" -"them in a mailbox file, or send them immediately. The editor is opened\n" -"with a template for the introductory message. Please see the file\n" -"%s for details.\n" +"Create mail messages from a specified range of patches, or all patches in\n" +"the series file, and either store them in a mailbox file, or send them\n" +"immediately. The editor is opened with a template for the introduction.\n" +"Please see %s for details.\n" +"When specifying a range of patches, a first patch name of \\`-' denotes the\n" +"first, and a last patch name of \\`-' denotes the last patch in the series.\n" +"\n" +"-m text\n" +"\tText to use as the text in the introduction. When this option is\n" +"\tused, the editor will not be invoked, and the patches will be\n" +"\tprocessed immediately.\n" +"\n" +"--prefix prefix\n" +"\tUse an alternate prefix in the bracketed part of the subjects\n" +"\tgenerated. Defaults to \\`patch'.\n" "\n" "--mbox file\n" "\tStore all messages in the specified file in mbox format. The mbox\n" "\tcan later be sent using formail, for example.\n" "\n" "--send\n" -"\tSend the messages directly using %s.\n" +"\tSend the messages directly.\n" +"\n" +"--sender\n" +"\tThe envelope sender address to use. The address must be of the form\n" +"\t\\`user@domain.name'. No display name is allowed.\n" "\n" "--from, --subject\n" -"\tThe values for the From and Subject headers to use.\n" +"\tThe values for the From and Subject headers to use. If no --from\n" +"\toption is given, the value of the --sender option is used.\n" "\n" "--to, --cc, --bcc\n" "\tAppend a recipient to the To, Cc, or Bcc header.\n" -msgstr "" -"\n" -"Создать почтовые сообщения из всех патчей в файле series, и либо\n" -"сохранить их в файле mailbox, либо немедленно отослать. Открывается\n" -"редактор с шаблоном для вводного сообщения. Подробности смотрите в\n" -"файле %s.\n" -"\n" -"--mbox файл\n" -"\tСохранить все сообщения в указанном файле в формате mbox.\n" -"\tmbox затем можно отправить, используя, например, formail.\n" -"\n" -"--send\n" -"\tОтослать сообщения немедленно, используя %s.\n" "\n" -"--from, --subject\n" -"\tЗначения для заголовочных полей From и Subject.\n" +"--signature file\n" +"\tAppend the specified signature to messages (defaults to ~/.signature\n" +"\tif found; use \\`-' for no signature).\n" "\n" -"--to, --cc, --bcc\n" -"\tДобавить получателя к заголовку To, Cc, или Bcc.\n" +"--reply-to message\n" +"\tAdd the appropriate headers to reply to the specified message.\n" +msgstr "" + +#: quilt/mail.in:285 +msgid "Could not determine the envelope sender address. Please use --sender." +msgstr "" + +#: quilt/mail.in:425 +msgid "Unable to extract a subject header from %s\\n" +msgstr "" + +#: quilt/mail.in:449 +msgid "Patches %s have duplicate subject headers.\\n" +msgstr "" + +#: quilt/mail.in:458 +#, fuzzy +msgid "File %s does not exist\\n" +msgstr "Файл %s существует\\n" + +#: quilt/mail.in:518 +msgid "Introduction has no subject header (saved as %s)\\n" +msgstr "" + +#: quilt/mail.in:521 +msgid "Introduction has no subject header\\n" +msgstr "" + +#: quilt/mail.in:624 +msgid "Introduction saved as %s\\n" +msgstr "" #: quilt/new.in:22 -msgid "Usage: quilt new {patchname}\\n" +#, fuzzy +msgid "Usage: quilt new [-p n|-p ab] {patchname}\\n" msgstr "Синтаксис: quilt new {имя-патча}\\n" #: quilt/new.in:25 msgid "" "\n" "Create a new patch with the specified file name, and insert it after the\n" -"topmost patch in the patch series file.\n" -msgstr "" +"topmost patch.\n" "\n" -"Создать новый патч с указанным именем файла, и вставить его после\n" -"верхнего патча в файле series.\n" +"-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n" +"\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" +"Quilt can be used in sub-directories of a source tree. It determines the\n" +"root of a source tree by searching for a %s directory above the\n" +"current working directory. Create a %s directory in the intended root\n" +"directory if quilt chooses a top-level directory that is too high up\n" +"in the directory tree.\n" +msgstr "" + +#: quilt/new.in:75 +#, fuzzy +msgid "" +"Cannot create patches with -p%s, please specify -p0, p1, or -pab instead\\n" +msgstr "Не удалось обновить патчи с -p%s, используйте -p0 или -p1\\n" -#: quilt/new.in:64 +#: quilt/new.in:90 quilt/refresh.in:185 msgid "Patch %s exists already\\n" msgstr "Патч %s уже существует\\n" -#: quilt/new.in:75 +#: quilt/new.in:101 quilt/refresh.in:342 msgid "Failed to create patch %s\\n" msgstr "Не удалось создать патч %s\\n" -#: quilt/new.in:78 +#: quilt/new.in:104 msgid "Patch %s is now on top\\n" msgstr "Патч %s теперь наверху\\n" @@ -743,7 +835,8 @@ msgstr "" "файле series.\n" #: quilt/patches.in:22 -msgid "Usage: quilt patches {file}\\n" +#, fuzzy +msgid "Usage: quilt patches [-v] {file}\\n" msgstr "Синтаксис: quilt patches {файл}\\n" #: quilt/patches.in:25 @@ -807,29 +900,41 @@ msgstr "" "\n" "-v\tПодробный вывод.\n" -#: quilt/pop.in:156 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:919 +msgid "Failed to copy files to temporary directory\\n" +msgstr "Не удалось скопировать файлы во временный каталог\\n" + +#: quilt/pop.in:116 quilt/scripts/patchfns.in:937 +msgid "Failed to patch temporary files\\n" +msgstr "Не удалось применить патч к временным файлам\\n" + +#: quilt/pop.in:134 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Не удалось чисто удалить патч %s (обновите его или удалите принудительно с -" "f)\\n" -#: quilt/pop.in:181 +#: quilt/pop.in:159 msgid "Patch %s appears to be empty, removing\\n" msgstr "Похоже, патч %s пуст, удаление\\n" -#: quilt/pop.in:185 +#: quilt/pop.in:164 msgid "Removing patch %s\\n" msgstr "Удаление патча %s\\n" -#: quilt/pop.in:269 +#: quilt/pop.in:235 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Сначала нужно обновить патч %s.\\n" -#: quilt/pop.in:279 +#: quilt/pop.in:245 msgid "No patch removed\\n" msgstr "Не удалено ни одного патча\\n" -#: quilt/pop.in:302 quilt/push.in:372 +#: quilt/pop.in:261 quilt/scripts/patchfns.in:526 +msgid "No patches applied\\n" +msgstr "Нет применённых патчей\\n" + +#: quilt/pop.in:268 quilt/push.in:396 msgid "Now at patch %s\\n" msgstr "Текущий патч: %s\\n" @@ -848,10 +953,14 @@ msgstr "" "в файле series.\n" #: quilt/push.in:24 -msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" +#, fuzzy +msgid "" +"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color" +"[=always|auto|never]] [num|patch]\\n" msgstr "Синтаксис: quilt push [-afqv] [--leave-rejects] [число|патч]\\n" #: quilt/push.in:27 +#, fuzzy msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -863,21 +972,23 @@ msgid "" "\n" "-a\tApply all patches in the series file.\n" "\n" -"-f\tForce apply, even if the patch has rejects.\n" -"\n" "-q\tQuiet operation.\n" "\n" +"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n" +"\tapply the patch interactively: the patch utility may ask questions.\n" +"\n" "-v\tVerbose operation.\n" "\n" +"--fuzz=N\n" +"\tSet the maximum fuzz factor (default: 2).\n" +"\n" +"-m, --merge[=merge|diff3]\n" +"\tMerge the patch file into the original files (see patch(1)).\n" +"\n" "--leave-rejects\n" "\tLeave around the reject files patch produced, even if the patch\n" "\tis not actually applied.\n" "\n" -"--interactive\n" -"\tAllow the patch utility to ask how to deal with conflicts. If\n" -"\tthis option is not given, the -f option will be passed to the \n" -"\tpatch program.\n" -"\n" "--color[=always|auto|never]\n" "\tUse syntax coloring.\n" msgstr "" @@ -907,55 +1018,51 @@ msgstr "" "--color[=always|auto|never]\n" "\tИспользовать подсветку синтаксиса.\n" -#: quilt/push.in:64 +#: quilt/push.in:66 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Прервано пользователем; патч %s не был наложен.\\n" -#: quilt/push.in:157 +#: quilt/push.in:178 msgid "Applying patch %s\\n" msgstr "Наложение патча %s\\n" -#: quilt/push.in:189 +#: quilt/push.in:213 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Патч %s не существует; наложен пустой патч\\n" -#: quilt/push.in:193 +#: quilt/push.in:217 msgid "Patch %s appears to be empty; applied\\n" msgstr "Похоже, патч %s пуст; наложен\\n" -#: quilt/push.in:197 +#: quilt/push.in:221 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Применён патч %s (принудительно; следует сделать refresh)\\n" -#: quilt/push.in:202 +#: quilt/push.in:231 +#, fuzzy +msgid "Patch %s can be reverse-applied\\n" +msgstr "Патч %s применён\\n" + +#: quilt/push.in:234 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Патч %s не применяется (принудить с -f)\\n" -#: quilt/push.in:241 -msgid "Patch %s not found in file series\\n" -msgstr "Патч %s не найден в файле series\\n" - -#: quilt/push.in:329 -msgid "Patch %s is already applied\\n" -msgstr "Патч %s уже применён\\n" - -#: quilt/push.in:338 +#: quilt/push.in:376 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Сначала необходимо обновить самый верхний патч %s.\\n" -#: quilt/push.in:352 -msgid "File series fully applied, ends at patch %s\\n" -msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n" - #: quilt/refresh.in:22 +#, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] " -"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n" +"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 [-p n] [-f] [--no-timestamps] [--no-index] [--" "diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [патч]\\n" #: quilt/refresh.in:26 +#, fuzzy msgid "" "\n" "Refreshes the specified patch, or the topmost patch by default.\n" @@ -972,14 +1079,23 @@ msgid "" "\n" "-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n" "\n" +"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n" +"\toriginal and new filenames instead of the default\n" +"\tdir.orig/file and dir/file names.\n" +"\n" "-u, -U num, -c, -C num\n" "\tCreate a unified diff (-u, -U) with num lines of context. Create\n" "\ta context diff (-c, -C) with num lines of context. The number of\n" "\tcontext lines defaults to 3.\n" "\n" +"-z[new_name]\n" +"\tCreate a new patch containing the changes instead of refreshing the\n" +"\ttopmost patch. If no new name is specified, \\`-2' is added to the\n" +"\toriginal patch name, etc. (See the fork command.)\n" +"\n" "--no-timestamps\n" "\tDo not include file timestamps in patch headers.\n" -"\t\n" +"\n" "--no-index\n" "\tDo not output Index: lines.\n" "\n" @@ -1036,49 +1152,54 @@ msgstr "" "--strip-trailing-whitespace\n" "\tУдалять пробелы на концах строк.\n" -#: quilt/refresh.in:173 -msgid "" -"Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n" +#: quilt/refresh.in:171 +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" msgstr "Не удалось обновить патчи с -p%s, используйте -p0 или -p1\\n" -#: quilt/refresh.in:207 +#: quilt/refresh.in:240 msgid "" "More recent patches modify files in patch %s. Enforce refresh with -f.\\n" msgstr "" "Более новые патчи изменяют файлы в патче %s. Принудительное обновление можно " "сделать с помощью опции -f.\\n" -#: quilt/refresh.in:213 +#: quilt/refresh.in:246 msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" "Нельзя использовать --strip-trailing-whitespace на патче с затенёнными " "файлами.\\n" -#: quilt/refresh.in:219 +#: quilt/refresh.in:252 msgid "Nothing in patch %s\\n" msgstr "Ничего нет в патче %s\\n" -#: quilt/refresh.in:296 +#: quilt/refresh.in:324 msgid "Patch %s is unchanged\\n" msgstr "Патч %s не изменён\\n" -#: quilt/refresh.in:301 +#: quilt/refresh.in:350 msgid "Refreshed patch %s\\n" msgstr "Патч %s обновлён\\n" #: quilt/remove.in:22 -msgid "Usage: quilt remove [-p patch] {file} ...\\n" +#, fuzzy +msgid "Usage: quilt remove [-P patch] {file} ...\\n" msgstr "Синтаксис: quilt remove [-p патч] {файл} ...\\n" #: quilt/remove.in:25 +#, fuzzy msgid "" "\n" "Remove one or more files from the topmost or named patch. Files that\n" "are modified by patches on top of the specified patch cannot be removed.\n" "\n" -"-p patch\n" -"\tPatch to remove files from.\n" +"-P patch\n" +"\tRemove named files from the named patch.\n" msgstr "" "\n" "Удалить один или более файлов из самого верхнего или названного\n" @@ -1088,28 +1209,30 @@ msgstr "" "-p патч\n" "\tПатч, из которого нужно удалить файлы.\n" -#: quilt/remove.in:91 +#: quilt/remove.in:73 quilt/revert.in:75 msgid "File %s is not in patch %s\\n" msgstr "Файл %s отсутствует в патче %s\\n" -#: quilt/remove.in:109 +#: quilt/remove.in:91 msgid "Failed to remove file %s from patch %s\\n" msgstr "Не удалось удалить файл %s из патча %s\\n" -#: quilt/remove.in:123 +#: quilt/remove.in:105 msgid "File %s removed from patch %s\\n" msgstr "Файл %s удалён из патча %s\\n" #: quilt/rename.in:22 -msgid "Usage: quilt rename [-p patch] new_name\\n" +#, fuzzy +msgid "Usage: quilt rename [-P patch] new_name\\n" msgstr "Синтаксис: quilt rename [-p патч] новое_имя\\n" #: quilt/rename.in:25 +#, fuzzy msgid "" "\n" "Rename the topmost or named patch.\n" "\n" -"-p patch\n" +"-P patch\n" "\tPatch to rename.\n" msgstr "" "\n" @@ -1118,18 +1241,174 @@ msgstr "" "-p патч\n" "\tПатч, который нужно переименовать.\n" -#: quilt/rename.in:96 +#: quilt/rename.in:84 msgid "Patch %s exists already, please choose a different name\\n" msgstr "Патч %s уже существует, выберите другое имя\\n" -#: quilt/rename.in:110 +#: quilt/rename.in:98 msgid "Renaming of patch %s to %s failed\\n" msgstr "Не удалось переименовать патч %s в %s\\n" -#: quilt/rename.in:116 +#: quilt/rename.in:104 msgid "Patch %s renamed to %s\\n" msgstr "Патч %s переименован в %s\\n" +#: quilt/revert.in:22 +#, fuzzy +msgid "Usage: quilt revert [-P patch] {file} ...\\n" +msgstr "Синтаксис: quilt remove [-p патч] {файл} ...\\n" + +#: quilt/revert.in:25 +#, fuzzy +msgid "" +"\n" +"Revert uncommitted changes to the topmost or named patch for the specified\n" +"file(s): after the revert, 'quilt diff -z' will show no differences for " +"those\n" +"files. Changes to files that are modified by patches on top of the " +"specified\n" +"patch cannot be reverted.\n" +"\n" +"-P patch\n" +"\tRevert changes in the named patch.\n" +msgstr "" +"\n" +"Добавить один или более файлов к верхнему или к названному патчу.\n" +"Файлы необходимо добавлять к патчу перед тем, как изменять их.\n" +"Файлы, которые изменены патчами, уже наложенными поверх выбранного,\n" +"не могут быть добавлены.\n" +"\n" +"-p патч\n" +"\tПатч, к которому добавлять файлы.\n" + +#: quilt/revert.in:103 quilt/revert.in:112 +#, fuzzy +msgid "File %s is unchanged\\n" +msgstr "Патч %s не изменён\\n" + +#: quilt/revert.in:120 +#, fuzzy +msgid "Failed to revert changes to %s in patch %s\\n" +msgstr "Не удалось удалить файл %s из патча %s\\n" + +#: quilt/revert.in:124 +#, fuzzy +msgid "Changes to %s in patch %s reverted\\n" +msgstr "Не удалось вставить патч %s в файл series\\n" + +#: quilt/scripts/edmail.in:83 +#, fuzzy, perl-format +msgid "Display name `%s' contains unpaired parentheses\n" +msgstr "Отображаемое имя '%s' содержит непарные скобки\n" + +#: quilt/scripts/edmail.in:101 +#, fuzzy, perl-format +msgid "Delivery address `%s' is invalid\n" +msgstr "Некорректный адрес назначения '%s'\n" + +#: quilt/scripts/parse-patch.in:50 +#, perl-format +msgid "USAGE: %s {-s|-u} section file [< replacement]\n" +msgstr "СИНТАКСИС: %s {-s|-u} секция файл [< замена]\n" + +#: quilt/scripts/parse-patch.in:101 quilt/scripts/parse-patch.in:108 +#: quilt/scripts/parse-patch.in:115 quilt/scripts/parse-patch.in:122 +#, perl-format +msgid "File %s disappeared!\n" +msgstr "Файл %s исчез!\n" + +#: quilt/scripts/parse-patch.in:168 quilt/scripts/parse-patch.in:174 +#, perl-format +msgid "Failed to rename %s to %s: %s\n" +msgstr "Не удалось переименовать %s в %s: %s\n" + +#: quilt/scripts/patchfns.in:245 quilt/scripts/patchfns.in:539 +#, fuzzy +msgid "%s is not a regular file\\n" +msgstr "Патч %s не входит в файл series\\n" + +#: quilt/scripts/patchfns.in:493 quilt/scripts/patchfns.in:510 +#, fuzzy +msgid "No patches in series\\n" +msgstr "Нет применённых патчей\\n" + +#: quilt/scripts/patchfns.in:495 quilt/scripts/patchfns.in:512 +msgid "No series file found\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:568 +msgid "Patch %s is not in series\\n" +msgstr "Патч %s не в серии\\n" + +#: quilt/scripts/patchfns.in:596 +msgid "Patch %s is not applied\\n" +msgstr "Патч %s не применён\\n" + +#: quilt/scripts/patchfns.in:633 +msgid "File series fully applied, ends at patch %s\\n" +msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n" + +#: quilt/scripts/patchfns.in:655 +#, fuzzy +msgid "Patch %s does not exist\\n" +msgstr "Патч %s не в серии\\n" + +#: quilt/scripts/patchfns.in:978 +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 " +"all the patches using the version of quilt used to push them before " +"downgrading.\\n" +msgstr "" +"Метаданные quilt в этом дереве имеют версию %s, но эта версия quilt может " +"обрабатывать форматы метаданных толь до версии %s включительно. Пожалуйста, " +"отмените все патчи, используя версию quilt, которая использовалась для их " +"наложения, прежде чем использовать эту версию.\\n" + +#: quilt/scripts/patchfns.in:1122 +msgid "" +"The working tree was created by an older version of quilt. Please run 'quilt " +"upgrade'.\\n" +msgstr "" +"Рабочее дерево было создано более старой версией quilt. Пожалуйста, " +"выполните 'quilt upgrade'.\\n" + +#: quilt/scripts/remove-trailing-ws.in:43 +#, perl-format +msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" +msgstr "СИНТАКСИС: %s [-p число] [-n] [патч]\n" + +#: quilt/scripts/remove-trailing-ws.in:65 +#: quilt/scripts/remove-trailing-ws.in:92 +#, perl-format +msgid "%s: I'm confused.\n" +msgstr "%s: я в растерянности.\n" + +#: quilt/scripts/remove-trailing-ws.in:113 +#, perl-format +msgid "Warning: trailing whitespace in line %s of %s\n" +msgstr "Предупреждение: пробел в конце строки %s файла %s\n" + +#: quilt/scripts/remove-trailing-ws.in:116 +#, perl-format +msgid "Warning: trailing whitespace in lines %s of %s\n" +msgstr "Предупреждение: пробел в конце строк %s файла %s\n" + +#: quilt/scripts/remove-trailing-ws.in:120 +#, perl-format +msgid "Removing trailing whitespace from line %s of %s\n" +msgstr "Удаление пробела из конца строки %s файла %s\n" + +#: quilt/scripts/remove-trailing-ws.in:123 +#, perl-format +msgid "Removing trailing whitespace from lines %s of %s\n" +msgstr "Удаление пробела из конца строк %s файла %s\n" + +#: quilt/scripts/remove-trailing-ws.in:143 +#, perl-format +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" @@ -1146,19 +1425,37 @@ msgstr "" "\n" "-v\tПодробный, более дружественный вывод.\n" -#: quilt/setup.in:27 -msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n" +#: quilt/setup.in:31 +msgid "Directory %s exists\\n" +msgstr "Директория %s существует\\n" + +#: quilt/setup.in:37 +msgid "File %s exists\\n" +msgstr "Файл %s существует\\n" + +#: quilt/setup.in:75 +#, fuzzy +msgid "" +"Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " +"{specfile|seriesfile}\\n" msgstr "" "Синтаксис: quilt setup [-d префикс-пути] [-v] {файл-spec|файл-series}\\n" -#: quilt/setup.in:30 +#: quilt/setup.in:78 +#, fuzzy msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" "\n" -"-d\toptional path prefix (sub-directory).\n" +"-d\tOptional path prefix for the resulting source tree.\n" +"\n" +"--sourcedir\n" +"\tDirectory that contains the package sources. Defaults to \\`.'.\n" +"\n" +"-v\tVerbose debug output.\n" "\n" -"-v\tverbose debug output.\n" +"--fuzz=N\n" +"\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" msgstr "" "\n" "Инициализирует исходное дерево из файла rpm spec или файла quilt series.\n" @@ -1167,24 +1464,21 @@ msgstr "" "\n" "-v\tвывод отладочной информации.\n" -#: quilt/setup.in:96 -msgid "Directory %s exists\\n" -msgstr "Директория %s существует\\n" - -#: quilt/setup.in:102 -msgid "File %s exists\\n" -msgstr "Файл %s существует\\n" - -#: quilt/setup.in:118 +#: quilt/setup.in:149 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n" -#: quilt/setup.in:121 +#: quilt/setup.in:152 msgid "The -v option will show rpm's output\\n" msgstr "Опция -v покажет вывод rpm\\n" -#: quilt/setup.in:155 +#: quilt/setup.in:189 +#, fuzzy +msgid "File %s not found\\n" +msgstr "Файл %s не изменяется\\n" + +#: quilt/setup.in:192 msgid "Unpacking archive %s\\n" msgstr "Распаковка архива %s\\n" @@ -1259,8 +1553,8 @@ msgstr "" #: quilt/upgrade.in:67 msgid "" -"The quilt meta-data in %s are already in the version %s format; nothing to " -"do\\n" +"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 @@ -1283,92 +1577,92 @@ msgstr "" "использованной при создании этого рабочего дерева, или удалите директорию %s " "и примените все патчи с нуля.\\n" -#: scripts/edmail.in:81 -#, perl-format -msgid "Display name '%s' contains unpaired parentheses\n" -msgstr "Отображаемое имя '%s' содержит непарные скобки\n" - -#: scripts/edmail.in:85 -#, perl-format -msgid "Display name '%s' contains invalid characters\n" -msgstr "Отображаемое имя '%s' содержит некорректные символы\n" - -#: scripts/edmail.in:89 -#, perl-format -msgid "Display name '%s' contains non-printable or 8-bit characters\n" -msgstr "Отображаемое имя '%s' содержит непечатные или 8-битные символы\n" - -#: scripts/edmail.in:95 -#, perl-format -msgid "Delivery address '%s' is invalid\n" -msgstr "Некорректный адрес назначения '%s'\n" - -#: scripts/parse-patch.in:50 -#, perl-format -msgid "USAGE: %s {-s|-u} section file [< replacement]\n" -msgstr "СИНТАКСИС: %s {-s|-u} секция файл [< замена]\n" - -#: scripts/parse-patch.in:97 scripts/parse-patch.in:104 -#, perl-format -msgid "File %s disappeared!\n" -msgstr "Файл %s исчез!\n" - -#: scripts/parse-patch.in:150 scripts/parse-patch.in:156 -#, perl-format -msgid "Failed to rename %s to %s: %s\n" -msgstr "Не удалось переименовать %s в %s: %s\n" - -#: scripts/patchfns.in:732 -msgid "" -"The quilt meta-data in this tree has version %s, but this version of quilt " -"can only handle meta-data formats up to and including version %s. Please pop " -"all the patches using the version of quilt used to push them before " -"downgrading.\\n" -msgstr "" -"Метаданные quilt в этом дереве имеют версию %s, но эта версия quilt может " -"обрабатывать форматы метаданных толь до версии %s включительно. Пожалуйста, " -"отмените все патчи, используя версию quilt, которая использовалась для их " -"наложения, прежде чем использовать эту версию.\\n" - -#: scripts/patchfns.in:809 -msgid "" -"The working tree was created by an older version of quilt. Please run 'quilt " -"upgrade'.\\n" -msgstr "" -"Рабочее дерево было создано более старой версией quilt. Пожалуйста, " -"выполните 'quilt upgrade'.\\n" - -#: scripts/remove-trailing-ws.in:43 -#, perl-format -msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" -msgstr "СИНТАКСИС: %s [-p число] [-n] [патч]\n" - -#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92 -#, perl-format -msgid "%s: I'm confused.\n" -msgstr "%s: я в растерянности.\n" - -#: scripts/remove-trailing-ws.in:113 -#, perl-format -msgid "Warning: trailing whitespace in line %s of %s\n" -msgstr "Предупреждение: пробел в конце строки %s файла %s\n" - -#: scripts/remove-trailing-ws.in:116 -#, perl-format -msgid "Warning: trailing whitespace in lines %s of %s\n" -msgstr "Предупреждение: пробел в конце строк %s файла %s\n" - -#: scripts/remove-trailing-ws.in:120 -#, perl-format -msgid "Removing trailing whitespace from line %s of %s\n" -msgstr "Удаление пробела из конца строки %s файла %s\n" - -#: scripts/remove-trailing-ws.in:123 -#, perl-format -msgid "Removing trailing whitespace from lines %s of %s\n" -msgstr "Удаление пробела из конца строк %s файла %s\n" - -#: scripts/remove-trailing-ws.in:143 -#, perl-format -msgid "Renaming %s to %s: %s\n" -msgstr "Переименование %s в %s: %s\n" +#~ msgid "Patch is not applied\\n" +#~ msgstr "Патч не применён\\n" + +#~ msgid "" +#~ "\n" +#~ "Import external patches.\n" +#~ "\n" +#~ "-p num\n" +#~ "\tNumber of directory levels to strip when applying (default=1)\n" +#~ "\n" +#~ "-n patch\n" +#~ "\tPatch filename to use inside quilt. This option can only be\n" +#~ "\tused when importing a single patch.\n" +#~ "\n" +#~ "-f\tOverwite/update existing patches.\n" +#~ msgstr "" +#~ "\n" +#~ "Импортировать внешние патчи.\n" +#~ "\n" +#~ "-p число\n" +#~ "\tЧисло уровней директорий, которые нужно убрать перед наложением\n" +#~ "\t(по умочанию=1)\n" +#~ "\n" +#~ "-n патч\n" +#~ "\tИмя патча для использования в quilt. Эту опцию можно использовать\n" +#~ "\tтолько прии импорте одного патча.\n" +#~ "\n" +#~ "-f\tПерезаписать или обновить существующие патчи.\n" + +#~ msgid "" +#~ "\n" +#~ "Create mail messages from all patches in the series file, and either " +#~ "store\n" +#~ "them in a mailbox file, or send them immediately. The editor is opened\n" +#~ "with a template for the introductory message. Please see the file\n" +#~ "%s for details.\n" +#~ "\n" +#~ "--mbox file\n" +#~ "\tStore all messages in the specified file in mbox format. The mbox\n" +#~ "\tcan later be sent using formail, for example.\n" +#~ "\n" +#~ "--send\n" +#~ "\tSend the messages directly using %s.\n" +#~ "\n" +#~ "--from, --subject\n" +#~ "\tThe values for the From and Subject headers to use.\n" +#~ "\n" +#~ "--to, --cc, --bcc\n" +#~ "\tAppend a recipient to the To, Cc, or Bcc header.\n" +#~ msgstr "" +#~ "\n" +#~ "Создать почтовые сообщения из всех патчей в файле series, и либо\n" +#~ "сохранить их в файле mailbox, либо немедленно отослать. Открывается\n" +#~ "редактор с шаблоном для вводного сообщения. Подробности смотрите в\n" +#~ "файле %s.\n" +#~ "\n" +#~ "--mbox файл\n" +#~ "\tСохранить все сообщения в указанном файле в формате mbox.\n" +#~ "\tmbox затем можно отправить, используя, например, formail.\n" +#~ "\n" +#~ "--send\n" +#~ "\tОтослать сообщения немедленно, используя %s.\n" +#~ "\n" +#~ "--from, --subject\n" +#~ "\tЗначения для заголовочных полей From и Subject.\n" +#~ "\n" +#~ "--to, --cc, --bcc\n" +#~ "\tДобавить получателя к заголовку To, Cc, или Bcc.\n" + +#~ msgid "" +#~ "\n" +#~ "Create a new patch with the specified file name, and insert it after the\n" +#~ "topmost patch in the patch series file.\n" +#~ msgstr "" +#~ "\n" +#~ "Создать новый патч с указанным именем файла, и вставить его после\n" +#~ "верхнего патча в файле series.\n" + +#~ 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" + +#~ msgid "Display name '%s' contains non-printable or 8-bit characters\n" +#~ msgstr "Отображаемое имя '%s' содержит непечатные или 8-битные символы\n" diff --git a/quilt.changes b/quilt.changes index 3ab9d62..254561d 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 5 21:23:12 CET 2011 - jdelvare@suse.de + +- po/*: Synchronize language files. +- po/fr.po: French translation update. +- po/de.po: Partial German translation update. + +------------------------------------------------------------------- Mon Nov 14 22:09:32 CET 2011 - jdelvare@suse.de - scripts/inspect.in: Fix decompression of tar archives. |