diff options
| -rw-r--r-- | po/de.po | 122 | ||||
| -rw-r--r-- | po/fr.po | 138 | ||||
| -rw-r--r-- | po/ja.po | 128 | ||||
| -rw-r--r-- | po/quilt.pot | 117 | ||||
| -rw-r--r-- | po/ru.po | 120 |
5 files changed, 335 insertions, 290 deletions
@@ -9,6 +9,7 @@ msgstr "" "PO-Revision-Date: 2005-07-19 11:32+0200\n" "Last-Translator: Andreas Gruenbacher <agruen@suse.de>\n" "Language-Team: <en@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -182,7 +183,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Kein Patch %s\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:583 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" @@ -213,6 +214,7 @@ msgstr "" "index] [--sort] [--color] [datei ...]\\n" #: quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -258,7 +260,7 @@ msgid "" "\tis invoked with the original and new file name as arguments.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" "\n" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" @@ -435,7 +437,7 @@ msgstr "" "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n" "\tentfernt werden sollen.\n" -#: quilt/fold.in:129 +#: quilt/fold.in:131 msgid "File %s may be corrupted\\n" msgstr "Datei %s ist möglicherweise defekt\\n" @@ -924,18 +926,23 @@ msgstr "" "Gibt den Namen des nächsten Patches nach dem obersten oder angegebenen\n" "Patch in der series-Datei aus.\n" -#: quilt/patches.in:22 -msgid "Usage: quilt patches [-v] {file}\\n" +#: quilt/patches.in:24 +#, fuzzy +msgid "Usage: quilt patches [-v] {file} [files...]\\n" msgstr "Verwendung: quilt patches [-v] {file}\\n" -#: quilt/patches.in:25 +#: quilt/patches.in:27 +#, fuzzy msgid "" "\n" -"Print the list of patches that modify the specified file. (Uses a\n" +"Print the list of patches that modify any of the specified files. (Uses a\n" "heuristic to determine which files are modified by unapplied patches.\n" "Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-v\tVerbose, more user friendly output.\n" +"\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "Gibt die Liste der Patches aus, die die angegebene Datei verändern.\n" @@ -989,41 +996,37 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:886 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 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:904 -msgid "Failed to patch temporary files\\n" -msgstr "Konnte temporäre Dateien nicht patchen\\n" - -#: quilt/pop.in:134 +#: quilt/pop.in:125 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Patch %s kann nicht entfernt werden (Patch aktualisieren oder entfernen " "erzwingen mit -f)\\n" -#: quilt/pop.in:159 +#: quilt/pop.in:150 msgid "Patch %s appears to be empty, removing\\n" msgstr "Patch %s scheint leer zu sein; wird entfernt\\n" -#: quilt/pop.in:164 +#: quilt/pop.in:155 msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: quilt/pop.in:235 +#: quilt/pop.in:226 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aktualisiert werden (Refresh).\\n" -#: quilt/pop.in:245 +#: quilt/pop.in:236 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:492 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" -#: quilt/pop.in:268 quilt/push.in:396 +#: quilt/pop.in:259 quilt/push.in:397 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -1043,8 +1046,8 @@ msgstr "" #: quilt/push.in:24 msgid "" -"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--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] [--merge[=merge|diff3]] [--leave-rejects] [--" "color[=always|auto|never]] [num|patch]\\n" @@ -1080,7 +1083,7 @@ msgid "" "\tis not actually applied.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n" @@ -1106,35 +1109,35 @@ msgstr "" "--color[=always|auto|never]\n" "\tSyntax-Einfärbung aktivieren (immer, automatisch, nie).\n" -#: quilt/push.in:66 +#: quilt/push.in:68 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: quilt/push.in:178 +#: quilt/push.in:180 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: quilt/push.in:213 +#: quilt/push.in:214 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Patch %s existiert nicht; wende leeren patch an\\n" -#: quilt/push.in:217 +#: quilt/push.in:218 msgid "Patch %s appears to be empty; applied\\n" msgstr "Patch %s scheint leer zu sein; angewandt\\n" -#: quilt/push.in:221 +#: quilt/push.in:222 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n" -#: quilt/push.in:231 +#: quilt/push.in:232 msgid "Patch %s can be reverse-applied\\n" msgstr "Patch %s kann verkehrt angewandt werden\\n" -#: quilt/push.in:234 +#: quilt/push.in:235 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:376 +#: quilt/push.in:377 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n" @@ -1279,7 +1282,7 @@ 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:252 quilt/refresh.in:354 msgid "Nothing in patch %s\\n" msgstr "Patch %s ist leer\\n" @@ -1287,7 +1290,7 @@ msgstr "Patch %s ist leer\\n" msgid "Patch %s is unchanged\\n" msgstr "Patch %s ist unverändert\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:352 msgid "Refreshed patch %s\\n" msgstr "Patch %s aktualisiert\\n" @@ -1403,36 +1406,40 @@ 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:211 quilt/scripts/patchfns.in:505 +#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 #, fuzzy msgid "%s is not a regular file\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476 +#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 msgid "No patches in series\\n" msgstr "Keine Patches in der series-Datei\\n" -#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478 +#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:534 +#: quilt/scripts/patchfns.in:540 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei\\n" -#: quilt/scripts/patchfns.in:562 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/scripts/patchfns.in:599 +#: quilt/scripts/patchfns.in:605 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:632 +#: quilt/scripts/patchfns.in:638 msgid "Patch %s does not exist\\n" msgstr "Patch %s existiert nicht\\n" -#: quilt/scripts/patchfns.in:945 +#: quilt/scripts/patchfns.in:910 +msgid "Failed to patch temporary files\\n" +msgstr "Konnte temporäre Dateien nicht patchen\\n" + +#: quilt/scripts/patchfns.in:951 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 " @@ -1445,7 +1452,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: quilt/scripts/patchfns.in:1089 +#: quilt/scripts/patchfns.in:1095 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1458,33 +1465,32 @@ msgstr "" msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "Aufruf: %s [-p num] [-n] [patch]\n" -#: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:66 #, perl-format msgid "%s: I'm confused.\n" msgstr "%s: Ich bin verwirrt.\n" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:114 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:117 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:121 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "Entferne abschliessende Leerzeichen in Zeile %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:124 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "Entferne abschliessende Leerzeichen in den Zeilen %s von %s\n" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:144 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "Umbenennen von %s auf %s: %s\n" @@ -1494,10 +1500,14 @@ msgid "Usage: quilt series [-v]\\n" msgstr "Verwendung: quilt series [-v]\\n" #: quilt/series.in:25 +#, fuzzy msgid "" "\n" "Print the names of all patches in the series file.\n" "\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" +"\t\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1505,15 +1515,15 @@ msgstr "" "\n" "-v\tAusführlichere, benutzerfreundliche Ausgabe.\n" -#: quilt/setup.in:31 +#: quilt/setup.in:34 quilt/setup.in:53 msgid "Directory %s exists\\n" msgstr "Verzeichnis %s existiert\\n" -#: quilt/setup.in:37 +#: quilt/setup.in:59 msgid "File %s exists\\n" msgstr "Datei %s existiert\\n" -#: quilt/setup.in:75 +#: quilt/setup.in:99 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" @@ -1521,7 +1531,7 @@ msgstr "" "Verwendung: quilt setup [-d pfad-präfix] [-v] [--sourcedir verzeichnis] [--" "fuzz=N] {spec-datei|series-datei}\\n" -#: quilt/setup.in:78 +#: quilt/setup.in:102 #, fuzzy msgid "" "\n" @@ -1548,21 +1558,21 @@ msgstr "" "\n" "-v\tAusführliche Ausgabe.\n" -#: quilt/setup.in:149 +#: quilt/setup.in:173 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:152 +#: quilt/setup.in:176 msgid "The -v option will show rpm's output\\n" msgstr "Die Option -v zeigt die Ausgaben von rpm an\\n" -#: quilt/setup.in:195 +#: quilt/setup.in:228 quilt/setup.in:240 msgid "File %s not found\\n" msgstr "Datei %s nicht gefunden\\n" -#: quilt/setup.in:198 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "Unpacking archive %s\\n" msgstr "Entpacke Archiv %s\\n" @@ -9,6 +9,7 @@ msgstr "" "PO-Revision-Date: 2006-01-04 17:30+0100\n" "Last-Translator: Jean Delvare <khali@linux-fr.org>\n" "Language-Team: French <traduc@traduc.org>\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -181,7 +182,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Pas de patch suivant\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:583 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqué\\n" @@ -212,6 +213,7 @@ msgstr "" "index] [--sort] [--color] [fichier ...]\\n" #: quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -257,7 +259,7 @@ msgid "" "\tis invoked with the original and new file name as arguments.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" "\n" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" @@ -315,7 +317,8 @@ msgstr "" msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -"Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées.\\n" +"Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées." +"\\n" #: quilt/diff.in:232 msgid "" @@ -435,7 +438,7 @@ msgstr "" "\tNombre de niveaux de répertoires à retirer lors de l'application du \n" "\tpatch.\n" -#: quilt/fold.in:129 +#: quilt/fold.in:131 msgid "File %s may be corrupted\\n" msgstr "Le fichier %s est peut-être corrompu\\n" @@ -738,8 +741,8 @@ msgid "" "subject ...] [--reply-to message] [first_patch [last_patch]]\\n" msgstr "" "Usage : quilt mail {--mbox fichier|--send} [-m texte] [-M fichier] [--prefix " -"préfixe] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] " -"[--subject ...] [--reply-to message] [premier_patch [dernier_patch]]\\n" +"préfixe] [--sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--" +"subject ...] [--reply-to message] [premier_patch [dernier_patch]]\\n" #: quilt/mail.in:27 msgid "" @@ -942,18 +945,23 @@ msgstr "" "\n" "-n\tAffiche le nom de fichier au lieu du nom de patch.\n" -#: quilt/patches.in:22 -msgid "Usage: quilt patches [-v] {file}\\n" +#: quilt/patches.in:24 +#, fuzzy +msgid "Usage: quilt patches [-v] {file} [files...]\\n" msgstr "Usage : quilt patches [-v] {fichier}\\n" -#: quilt/patches.in:25 +#: quilt/patches.in:27 +#, fuzzy msgid "" "\n" -"Print the list of patches that modify the specified file. (Uses a\n" +"Print the list of patches that modify any of the specified files. (Uses a\n" "heuristic to determine which files are modified by unapplied patches.\n" "Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-v\tVerbose, more user friendly output.\n" +"\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "Affiche la liste des patches modifiant le fichier spécifié. \n" @@ -1011,41 +1019,37 @@ msgstr "" "\n" "-v\tOpère verbeusement.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:886 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 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:904 -msgid "Failed to patch temporary files\\n" -msgstr "Impossible de patcher les fichiers temporaires\\n" - -#: quilt/pop.in:134 +#: quilt/pop.in:125 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -"Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" -"\\n" +"Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -" +"f)\\n" -#: quilt/pop.in:159 +#: quilt/pop.in:150 msgid "Patch %s appears to be empty, removing\\n" msgstr "Le patch %s semble vide, enlevé\\n" -#: quilt/pop.in:164 +#: quilt/pop.in:155 msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/pop.in:235 +#: quilt/pop.in:226 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit être rafraichi au préalable.\\n" -#: quilt/pop.in:245 +#: quilt/pop.in:236 msgid "No patch removed\\n" msgstr "Aucun patch retiré\\n" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:492 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqué\\n" -#: quilt/pop.in:268 quilt/push.in:396 +#: quilt/pop.in:259 quilt/push.in:397 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -1067,13 +1071,14 @@ msgstr "" #: quilt/push.in:24 msgid "" -"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--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 "" -"Usage : quilt push [-afqv] [--merge[=merge|diff3]] [--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" #: quilt/push.in:27 +#, fuzzy msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -1103,7 +1108,7 @@ msgid "" "\tis not actually applied.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "Applique un ou plusieurs patches de la série. Si aucun argument n'est\n" @@ -1137,36 +1142,36 @@ msgstr "" "\tApplique une coloration syntaxique, toujours («always»), de manière\n" "\tautomatique («auto») ou jamais («never»).\n" -#: quilt/push.in:66 +#: quilt/push.in:68 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n" -#: quilt/push.in:178 +#: quilt/push.in:180 msgid "Applying patch %s\\n" msgstr "Application de %s\\n" -#: quilt/push.in:213 +#: quilt/push.in:214 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n" -#: quilt/push.in:217 +#: quilt/push.in:218 msgid "Patch %s appears to be empty; applied\\n" msgstr "Le patch %s semble vide. Il a été appliqué.\\n" -#: quilt/push.in:221 +#: quilt/push.in:222 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n" -#: quilt/push.in:231 +#: quilt/push.in:232 msgid "Patch %s can be reverse-applied\\n" msgstr "Le patch %s peut être appliqué à l'envers\\n" -#: quilt/push.in:234 +#: quilt/push.in:235 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n" -#: quilt/push.in:376 +#: quilt/push.in:377 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n" @@ -1308,7 +1313,7 @@ msgstr "" "Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n" "certains fichiers sont masqués.\\n" -#: quilt/refresh.in:252 +#: quilt/refresh.in:252 quilt/refresh.in:354 msgid "Nothing in patch %s\\n" msgstr "Le patch %s ne contient rien\\n" @@ -1316,7 +1321,7 @@ msgstr "Le patch %s ne contient rien\\n" msgid "Patch %s is unchanged\\n" msgstr "Patch %s inchangé\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:352 msgid "Refreshed patch %s\\n" msgstr "Patch %s rafraîchi\\n" @@ -1431,35 +1436,39 @@ msgstr "Le nom `%s' est mal parenthésé\n" msgid "Delivery address `%s' is invalid\n" msgstr "L'adresse de destination `%s' est invalide\n" -#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505 +#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 msgid "%s is not a regular file\\n" msgstr "%s n'est pas un fichier régulier\\n" -#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476 +#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 msgid "No patches in series\\n" msgstr "Aucun patch dans la série\\n" -#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478 +#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 msgid "No series file found\\n" msgstr "Fichier de série non trouvé\\n" -#: quilt/scripts/patchfns.in:534 +#: quilt/scripts/patchfns.in:540 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/scripts/patchfns.in:562 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/scripts/patchfns.in:599 +#: quilt/scripts/patchfns.in:605 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:632 +#: quilt/scripts/patchfns.in:638 msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'existe pas\\n" -#: quilt/scripts/patchfns.in:945 +#: quilt/scripts/patchfns.in:910 +msgid "Failed to patch temporary files\\n" +msgstr "Impossible de patcher les fichiers temporaires\\n" + +#: quilt/scripts/patchfns.in:951 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 +1480,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:1089 +#: quilt/scripts/patchfns.in:1095 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1484,33 +1493,32 @@ msgstr "" msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n" -#: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:66 #, perl-format msgid "%s: I'm confused.\n" msgstr "%s : Je suis confus.\n" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:114 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "Attention : espaces à la fin de la ligne %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:117 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "Attention : espaces à la fin des lignes %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:121 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "Suppression des espaces à la fin de la ligne %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:124 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "Suppression des espaces à la fin des lignes %s de %s\n" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:144 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "En renommant %s en %s : %s\n" @@ -1520,10 +1528,14 @@ msgid "Usage: quilt series [-v]\\n" msgstr "Usage : quilt series [-v]\\n" #: quilt/series.in:25 +#, fuzzy msgid "" "\n" "Print the names of all patches in the series file.\n" "\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" +"\t\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1531,15 +1543,15 @@ msgstr "" "\n" "-v\tAffichage verbeux, plus simple à lire.\n" -#: quilt/setup.in:31 +#: quilt/setup.in:34 quilt/setup.in:53 msgid "Directory %s exists\\n" msgstr "Le répertoire %s existe\\n" -#: quilt/setup.in:37 +#: quilt/setup.in:59 msgid "File %s exists\\n" msgstr "Le fichier %s existe\\n" -#: quilt/setup.in:75 +#: quilt/setup.in:99 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" @@ -1547,7 +1559,7 @@ msgstr "" "Usage : quilt setup [-d répertoire_source] [-v] [--sourcedir répertoire] [--" "fuzz=N] {fichier_spec|fichier_séries}\\n" -#: quilt/setup.in:78 +#: quilt/setup.in:102 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1576,20 +1588,20 @@ msgstr "" "--fuzz=N\n" "\tDéfinit le niveau maximum de flou (nécessite rpm 4.6 ou supérieur).\n" -#: quilt/setup.in:149 +#: quilt/setup.in:173 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "La section %%prep de %s a échoué ; les résultats sont peut-être incomplets\\n" -#: quilt/setup.in:152 +#: quilt/setup.in:176 msgid "The -v option will show rpm's output\\n" msgstr "L'option -v montre les affichages de rpm\\\\n" -#: quilt/setup.in:195 +#: quilt/setup.in:228 quilt/setup.in:240 msgid "File %s not found\\n" msgstr "Le fichier %s est introuvable\\n" -#: quilt/setup.in:198 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "Unpacking archive %s\\n" msgstr "Désarchivage de %s\\n" @@ -8,10 +8,10 @@ msgstr "" "PO-Revision-Date: 2011-02-01 19:37+0900\n" "Last-Translator: Yasushi SHOJI <yashi@atmark-techno.com>\n" "Language-Team: Quilt\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: \n" #: bin/quilt.in:36 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." @@ -178,7 +178,7 @@ msgstr "" msgid "No next patch\\n" msgstr "次のパッチはありません\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:583 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 msgid "Patch %s is currently applied\\n" msgstr "パッチ %s は現在適用されています\\n" @@ -209,6 +209,7 @@ msgstr "" "[--sort] [--color] [ファイル ...]\\n" #: quilt/diff.in:28 +#, fuzzy msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -254,7 +255,7 @@ msgid "" "\tis invoked with the original and new file name as arguments.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" "\n" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" @@ -424,7 +425,7 @@ msgstr "" "-p strip-level\n" "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n" -#: quilt/fold.in:129 +#: quilt/fold.in:131 msgid "File %s may be corrupted\\n" msgstr "ファイル %s は壊れている可能性があります\\n" @@ -913,18 +914,23 @@ msgstr "" "\n" "最上位または指定されたパッチの次のパッチ名を表示。\n" -#: quilt/patches.in:22 -msgid "Usage: quilt patches [-v] {file}\\n" +#: quilt/patches.in:24 +#, fuzzy +msgid "Usage: quilt patches [-v] {file} [files...]\\n" msgstr "使い方: quilt patches [-v] {ファイル}\\n" -#: quilt/patches.in:25 +#: quilt/patches.in:27 +#, fuzzy msgid "" "\n" -"Print the list of patches that modify the specified file. (Uses a\n" +"Print the list of patches that modify any of the specified files. (Uses a\n" "heuristic to determine which files are modified by unapplied patches.\n" "Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-v\tVerbose, more user friendly output.\n" +"\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "指定されたファイルに対し、変更を行なうパッチのリストを表示。 (適用されて\n" @@ -980,41 +986,37 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:886 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:904 -msgid "Failed to patch temporary files\\n" -msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" - -#: quilt/pop.in:134 +#: quilt/pop.in:125 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" "けてはずしてください)\\n" -#: quilt/pop.in:159 +#: quilt/pop.in:150 msgid "Patch %s appears to be empty, removing\\n" msgstr "パッチ %s は、空のようです。はずします\\n" -#: quilt/pop.in:164 +#: quilt/pop.in:155 msgid "Removing patch %s\\n" msgstr "パッチ %s をはずします\\n" -#: quilt/pop.in:235 +#: quilt/pop.in:226 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" -#: quilt/pop.in:245 +#: quilt/pop.in:236 msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:492 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" -#: quilt/pop.in:268 quilt/push.in:396 +#: quilt/pop.in:259 quilt/push.in:397 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です\\n" @@ -1034,13 +1036,14 @@ msgstr "" #: quilt/push.in:24 msgid "" -"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--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 "" -"使い方: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--color" -"[=always|auto|never]] [num|patch]\\n" +"使い方: quilt push [-afqv] [--merge[=merge|diff3]] [--leave-rejects] [--" +"color[=always|auto|never]] [num|patch]\\n" #: quilt/push.in:27 +#, fuzzy msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -1070,7 +1073,7 @@ msgid "" "\tis not actually applied.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "seriesに登録されているパッチを適用する。オプションが無い場合は series\n" @@ -1103,36 +1106,36 @@ msgstr "" " シンタックスの色付けを行なう。\n" "\n" -#: quilt/push.in:66 +#: quilt/push.in:68 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "ユーザによって中断されました。パッチ %s は適用されていません。\\n" -#: quilt/push.in:178 +#: quilt/push.in:180 msgid "Applying patch %s\\n" msgstr "パッチ %s を適用しています\\n" -#: quilt/push.in:213 +#: quilt/push.in:214 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n" -#: quilt/push.in:217 +#: quilt/push.in:218 msgid "Patch %s appears to be empty; applied\\n" msgstr "パッチ %s は空のようですが、適用しました\\n" -#: quilt/push.in:221 +#: quilt/push.in:222 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" "パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: quilt/push.in:231 +#: quilt/push.in:232 msgid "Patch %s can be reverse-applied\\n" msgstr "パッチ %s は、反転して適用することができます\\n" -#: quilt/push.in:234 +#: quilt/push.in:235 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n" -#: quilt/push.in:376 +#: quilt/push.in:377 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" @@ -1268,7 +1271,7 @@ msgid "" msgstr "" "--strip-trailing-whitespace は影になっているファイルがある場合は使えません" -#: quilt/refresh.in:252 +#: quilt/refresh.in:252 quilt/refresh.in:354 msgid "Nothing in patch %s\\n" msgstr "パッチ %s にはなにも含まれていません\\n" @@ -1276,7 +1279,7 @@ msgstr "パッチ %s にはなにも含まれていません\\n" msgid "Patch %s is unchanged\\n" msgstr "パッチ %s に変更はありません\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:352 msgid "Refreshed patch %s\\n" msgstr "パッチ %s をリフレッシュしました\\n" @@ -1390,36 +1393,40 @@ msgstr "表示用の名前 `%s' が対にならない括弧を含んでいます msgid "Delivery address `%s' is invalid\n" msgstr "配送先のアドレス `%s' が不正です\n" -#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505 +#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 msgid "%s is not a regular file\\n" msgstr "%s は普通のファイルではありません\\n" -#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476 +#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 msgid "No patches in series\\n" msgstr "シリーズに登録されているパッチがありません\\n" -#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478 +#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 msgid "No series file found\\n" msgstr "シリーズファイルが見つかりません\\n" -#: quilt/scripts/patchfns.in:534 +#: quilt/scripts/patchfns.in:540 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/scripts/patchfns.in:562 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/scripts/patchfns.in:599 +#: quilt/scripts/patchfns.in:605 msgid "File series fully applied, ends at patch %s\\n" msgstr "" "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" -#: quilt/scripts/patchfns.in:632 +#: quilt/scripts/patchfns.in:638 msgid "Patch %s does not exist\\n" msgstr "パッチ %s が存在しません\\n" -#: quilt/scripts/patchfns.in:945 +#: quilt/scripts/patchfns.in:910 +msgid "Failed to patch temporary files\\n" +msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" + +#: quilt/scripts/patchfns.in:951 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 " @@ -1431,7 +1438,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: quilt/scripts/patchfns.in:1089 +#: quilt/scripts/patchfns.in:1095 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1444,33 +1451,32 @@ msgstr "" msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "書式: %s [p num] [-n] [パッチ]\n" -#: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:66 #, perl-format msgid "%s: I'm confused.\n" msgstr "%s: 混乱しました\n" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:114 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:117 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:121 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:124 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:144 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "%s から %s へ名前を変更しました: %s\n" @@ -1480,10 +1486,14 @@ msgid "Usage: quilt series [-v]\\n" msgstr "使い方: quilt series [-v]\\n" #: quilt/series.in:25 +#, fuzzy msgid "" "\n" "Print the names of all patches in the series file.\n" "\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" +"\t\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1492,15 +1502,15 @@ msgstr "" "-v\t詳細で見やすい表示。\n" "\n" -#: quilt/setup.in:31 +#: quilt/setup.in:34 quilt/setup.in:53 msgid "Directory %s exists\\n" msgstr "ディレクトリ %s は、すでに存在します\\n" -#: quilt/setup.in:37 +#: quilt/setup.in:59 msgid "File %s exists\\n" msgstr "ファイル %s は、すでに存在します\\n" -#: quilt/setup.in:75 +#: quilt/setup.in:99 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" @@ -1508,7 +1518,7 @@ msgstr "" "使い方: quilt setup [-d path-prefix] [-v] [--sourcedir ディレクトリ] [--" "fuzz=N] {specファイル|シリーズファイル}\\n" -#: quilt/setup.in:78 +#: quilt/setup.in:102 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1537,21 +1547,21 @@ msgstr "" "--fuzz=N\n" "\t最大何行のずれを許すか指定する\n" -#: quilt/setup.in:149 +#: quilt/setup.in:173 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "%%prepセクションの解析に失敗しました。完全に作業が完了していない場合がありま" "す\\n" -#: quilt/setup.in:152 +#: quilt/setup.in:176 msgid "The -v option will show rpm's output\\n" msgstr "-vオプションを使って、rpmの出力を表示できます" -#: quilt/setup.in:195 +#: quilt/setup.in:228 quilt/setup.in:240 msgid "File %s not found\\n" msgstr "ファイル %s が見つかりません" -#: quilt/setup.in:198 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "Unpacking archive %s\\n" msgstr "アーカイブ %s を展開しています\\n" diff --git a/po/quilt.pot b/po/quilt.pot index 940843b..ea1604c 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:583 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 msgid "Patch %s is currently applied\\n" msgstr "" @@ -192,7 +192,7 @@ msgid "" "\tis invoked with the original and new file name as arguments.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" "\n" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" @@ -284,7 +284,7 @@ msgid "" "\twhen applying patchfile.\n" msgstr "" -#: quilt/fold.in:129 +#: quilt/fold.in:131 msgid "File %s may be corrupted\\n" msgstr "" @@ -620,18 +620,21 @@ msgid "" "the series file.\n" msgstr "" -#: quilt/patches.in:22 -msgid "Usage: quilt patches [-v] {file}\\n" +#: quilt/patches.in:24 +msgid "Usage: quilt patches [-v] {file} [files...]\\n" msgstr "" -#: quilt/patches.in:25 +#: quilt/patches.in:27 msgid "" "\n" -"Print the list of patches that modify the specified file. (Uses a\n" +"Print the list of patches that modify any of the specified files. (Uses a\n" "heuristic to determine which files are modified by unapplied patches.\n" "Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-v\tVerbose, more user friendly output.\n" +"\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" #: quilt/pop.in:22 @@ -661,39 +664,35 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:886 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:904 -msgid "Failed to patch temporary files\\n" -msgstr "" - -#: quilt/pop.in:134 +#: quilt/pop.in:125 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: quilt/pop.in:159 +#: quilt/pop.in:150 msgid "Patch %s appears to be empty, removing\\n" msgstr "" -#: quilt/pop.in:164 +#: quilt/pop.in:155 msgid "Removing patch %s\\n" msgstr "" -#: quilt/pop.in:235 +#: quilt/pop.in:226 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: quilt/pop.in:245 +#: quilt/pop.in:236 msgid "No patch removed\\n" msgstr "" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:492 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 msgid "No patches applied\\n" msgstr "" -#: quilt/pop.in:268 quilt/push.in:396 +#: quilt/pop.in:259 quilt/push.in:397 msgid "Now at patch %s\\n" msgstr "" @@ -710,8 +709,8 @@ msgstr "" #: quilt/push.in:24 msgid "" -"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--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 "" #: quilt/push.in:27 @@ -744,38 +743,38 @@ msgid "" "\tis not actually applied.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" -#: quilt/push.in:66 +#: quilt/push.in:68 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: quilt/push.in:178 +#: quilt/push.in:180 msgid "Applying patch %s\\n" msgstr "" -#: quilt/push.in:213 +#: quilt/push.in:214 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "" -#: quilt/push.in:217 +#: quilt/push.in:218 msgid "Patch %s appears to be empty; applied\\n" msgstr "" -#: quilt/push.in:221 +#: quilt/push.in:222 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: quilt/push.in:231 +#: quilt/push.in:232 msgid "Patch %s can be reverse-applied\\n" msgstr "" -#: quilt/push.in:234 +#: quilt/push.in:235 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: quilt/push.in:376 +#: quilt/push.in:377 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" @@ -856,7 +855,7 @@ msgid "" "Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n" msgstr "" -#: quilt/refresh.in:252 +#: quilt/refresh.in:252 quilt/refresh.in:354 msgid "Nothing in patch %s\\n" msgstr "" @@ -864,7 +863,7 @@ msgstr "" msgid "Patch %s is unchanged\\n" msgstr "" -#: quilt/refresh.in:350 +#: quilt/refresh.in:352 msgid "Refreshed patch %s\\n" msgstr "" @@ -959,35 +958,39 @@ msgstr "" msgid "Delivery address `%s' is invalid\n" msgstr "" -#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505 +#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 msgid "%s is not a regular file\\n" msgstr "" -#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476 +#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 msgid "No patches in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478 +#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:534 +#: quilt/scripts/patchfns.in:540 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/scripts/patchfns.in:562 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/scripts/patchfns.in:599 +#: quilt/scripts/patchfns.in:605 msgid "File series fully applied, ends at patch %s\\n" msgstr "" -#: quilt/scripts/patchfns.in:632 +#: quilt/scripts/patchfns.in:638 msgid "Patch %s does not exist\\n" msgstr "" -#: quilt/scripts/patchfns.in:945 +#: quilt/scripts/patchfns.in:910 +msgid "Failed to patch temporary files\\n" +msgstr "" + +#: quilt/scripts/patchfns.in:951 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 " @@ -995,7 +998,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: quilt/scripts/patchfns.in:1089 +#: quilt/scripts/patchfns.in:1095 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1006,33 +1009,32 @@ msgstr "" msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:65 -#: quilt/scripts/remove-trailing-ws.in:92 +#: quilt/scripts/remove-trailing-ws.in:66 #, perl-format msgid "%s: I'm confused.\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:114 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:117 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:121 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:124 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:144 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "" @@ -1046,24 +1048,27 @@ msgid "" "\n" "Print the names of all patches in the series file.\n" "\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" +"\t\n" "-v\tVerbose, more user friendly output.\n" msgstr "" -#: quilt/setup.in:31 +#: quilt/setup.in:34 quilt/setup.in:53 msgid "Directory %s exists\\n" msgstr "" -#: quilt/setup.in:37 +#: quilt/setup.in:59 msgid "File %s exists\\n" msgstr "" -#: quilt/setup.in:75 +#: quilt/setup.in:99 msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " "{specfile|seriesfile}\\n" msgstr "" -#: quilt/setup.in:78 +#: quilt/setup.in:102 msgid "" "\n" "Initializes a source tree from an rpm spec file or a quilt series file.\n" @@ -1079,19 +1084,19 @@ msgid "" "\tSet the maximum fuzz factor (needs rpm 4.6 or later).\n" msgstr "" -#: quilt/setup.in:149 +#: quilt/setup.in:173 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" -#: quilt/setup.in:152 +#: quilt/setup.in:176 msgid "The -v option will show rpm's output\\n" msgstr "" -#: quilt/setup.in:195 +#: quilt/setup.in:228 quilt/setup.in:240 msgid "File %s not found\\n" msgstr "" -#: quilt/setup.in:198 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "Unpacking archive %s\\n" msgstr "" @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2011-09-20 07:55+0000\n" "Last-Translator: Sergey Basalaev <SBasalaev@gmail.com>\n" "Language-Team: Russian <ru@li.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -180,7 +181,7 @@ msgstr "" msgid "No next patch\\n" msgstr "Отсутствует следующий патч\\n" -#: quilt/delete.in:102 quilt/scripts/patchfns.in:583 +#: quilt/delete.in:102 quilt/scripts/patchfns.in:589 msgid "Patch %s is currently applied\\n" msgstr "Патч %s применён\\n" @@ -260,7 +261,7 @@ msgid "" "\tis invoked with the original and new file name as arguments.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" "\n" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" @@ -426,7 +427,7 @@ msgstr "" "\tЧисло компонент пути, которые необходимо удалить из имён файлов\n" "\tпри наложении патча.\n" -#: quilt/fold.in:129 +#: quilt/fold.in:131 msgid "File %s may be corrupted\\n" msgstr "Файл %s может быть повреждён\\n" @@ -842,19 +843,23 @@ msgstr "" "Вывести имя патча, следующего за указанным или верхним патчем в\n" "файле series.\n" -#: quilt/patches.in:22 +#: quilt/patches.in:24 #, fuzzy -msgid "Usage: quilt patches [-v] {file}\\n" +msgid "Usage: quilt patches [-v] {file} [files...]\\n" msgstr "Синтаксис: quilt patches {файл}\\n" -#: quilt/patches.in:25 +#: quilt/patches.in:27 +#, fuzzy msgid "" "\n" -"Print the list of patches that modify the specified file. (Uses a\n" +"Print the list of patches that modify any of the specified files. (Uses a\n" "heuristic to determine which files are modified by unapplied patches.\n" "Note that this heuristic is much slower than scanning applied patches.)\n" "\n" "-v\tVerbose, more user friendly output.\n" +"\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "Вывести список всех патчей, изменяющих указанный файл. (Использует\n" @@ -908,41 +913,37 @@ msgstr "" "\n" "-v\tПодробный вывод.\n" -#: quilt/pop.in:100 quilt/scripts/patchfns.in:886 +#: quilt/pop.in:100 quilt/scripts/patchfns.in:892 msgid "Failed to copy files to temporary directory\\n" msgstr "Не удалось скопировать файлы во временный каталог\\n" -#: quilt/pop.in:116 quilt/scripts/patchfns.in:904 -msgid "Failed to patch temporary files\\n" -msgstr "Не удалось применить патч к временным файлам\\n" - -#: quilt/pop.in:134 +#: quilt/pop.in:125 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Не удалось чисто удалить патч %s (обновите его или удалите принудительно с -" "f)\\n" -#: quilt/pop.in:159 +#: quilt/pop.in:150 msgid "Patch %s appears to be empty, removing\\n" msgstr "Похоже, патч %s пуст, удаление\\n" -#: quilt/pop.in:164 +#: quilt/pop.in:155 msgid "Removing patch %s\\n" msgstr "Удаление патча %s\\n" -#: quilt/pop.in:235 +#: quilt/pop.in:226 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Сначала нужно обновить патч %s.\\n" -#: quilt/pop.in:245 +#: quilt/pop.in:236 msgid "No patch removed\\n" msgstr "Не удалено ни одного патча\\n" -#: quilt/pop.in:261 quilt/scripts/patchfns.in:492 +#: quilt/pop.in:252 quilt/scripts/patchfns.in:498 msgid "No patches applied\\n" msgstr "Нет применённых патчей\\n" -#: quilt/pop.in:268 quilt/push.in:396 +#: quilt/pop.in:259 quilt/push.in:397 msgid "Now at patch %s\\n" msgstr "Текущий патч: %s\\n" @@ -963,8 +964,8 @@ msgstr "" #: quilt/push.in:24 #, fuzzy msgid "" -"Usage: quilt push [-afqv] [--merge[=merge|diff3]] [--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 "Синтаксис: quilt push [-afqv] [--leave-rejects] [число|патч]\\n" #: quilt/push.in:27 @@ -998,7 +999,7 @@ msgid "" "\tis not actually applied.\n" "\n" "--color[=always|auto|never]\n" -"\tUse syntax coloring.\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" msgstr "" "\n" "Применить патчи из файла series. Без опций накладывается следующий\n" @@ -1026,36 +1027,36 @@ msgstr "" "--color[=always|auto|never]\n" "\tИспользовать подсветку синтаксиса.\n" -#: quilt/push.in:66 +#: quilt/push.in:68 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Прервано пользователем; патч %s не был наложен.\\n" -#: quilt/push.in:178 +#: quilt/push.in:180 msgid "Applying patch %s\\n" msgstr "Наложение патча %s\\n" -#: quilt/push.in:213 +#: quilt/push.in:214 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Патч %s не существует; наложен пустой патч\\n" -#: quilt/push.in:217 +#: quilt/push.in:218 msgid "Patch %s appears to be empty; applied\\n" msgstr "Похоже, патч %s пуст; наложен\\n" -#: quilt/push.in:221 +#: quilt/push.in:222 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Применён патч %s (принудительно; следует сделать refresh)\\n" -#: quilt/push.in:231 +#: quilt/push.in:232 #, fuzzy msgid "Patch %s can be reverse-applied\\n" msgstr "Патч %s применён\\n" -#: quilt/push.in:234 +#: quilt/push.in:235 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Патч %s не применяется (принудить с -f)\\n" -#: quilt/push.in:376 +#: quilt/push.in:377 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Сначала необходимо обновить самый верхний патч %s.\\n" @@ -1182,7 +1183,7 @@ msgstr "" "Нельзя использовать --strip-trailing-whitespace на патче с затенёнными " "файлами.\\n" -#: quilt/refresh.in:252 +#: quilt/refresh.in:252 quilt/refresh.in:354 msgid "Nothing in patch %s\\n" msgstr "Ничего нет в патче %s\\n" @@ -1190,7 +1191,7 @@ msgstr "Ничего нет в патче %s\\n" msgid "Patch %s is unchanged\\n" msgstr "Патч %s не изменён\\n" -#: quilt/refresh.in:350 +#: quilt/refresh.in:352 msgid "Refreshed patch %s\\n" msgstr "Патч %s обновлён\\n" @@ -1314,38 +1315,42 @@ msgstr "Отображаемое имя '%s' содержит непарные msgid "Delivery address `%s' is invalid\n" msgstr "Некорректный адрес назначения '%s'\n" -#: quilt/scripts/patchfns.in:211 quilt/scripts/patchfns.in:505 +#: quilt/scripts/patchfns.in:217 quilt/scripts/patchfns.in:511 #, fuzzy msgid "%s is not a regular file\\n" msgstr "Патч %s не входит в файл series\\n" -#: quilt/scripts/patchfns.in:459 quilt/scripts/patchfns.in:476 +#: quilt/scripts/patchfns.in:465 quilt/scripts/patchfns.in:482 #, fuzzy msgid "No patches in series\\n" msgstr "Нет применённых патчей\\n" -#: quilt/scripts/patchfns.in:461 quilt/scripts/patchfns.in:478 +#: quilt/scripts/patchfns.in:467 quilt/scripts/patchfns.in:484 msgid "No series file found\\n" msgstr "" -#: quilt/scripts/patchfns.in:534 +#: quilt/scripts/patchfns.in:540 msgid "Patch %s is not in series\\n" msgstr "Патч %s не в серии\\n" -#: quilt/scripts/patchfns.in:562 +#: quilt/scripts/patchfns.in:568 msgid "Patch %s is not applied\\n" msgstr "Патч %s не применён\\n" -#: quilt/scripts/patchfns.in:599 +#: quilt/scripts/patchfns.in:605 msgid "File series fully applied, ends at patch %s\\n" msgstr "Серия файлов полностью применена, заканчивается на патче %s\\n" -#: quilt/scripts/patchfns.in:632 +#: quilt/scripts/patchfns.in:638 #, fuzzy msgid "Patch %s does not exist\\n" msgstr "Патч %s не в серии\\n" -#: quilt/scripts/patchfns.in:945 +#: quilt/scripts/patchfns.in:910 +msgid "Failed to patch temporary files\\n" +msgstr "Не удалось применить патч к временным файлам\\n" + +#: quilt/scripts/patchfns.in:951 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 " @@ -1357,7 +1362,7 @@ msgstr "" "отмените все патчи, используя версию quilt, которая использовалась для их " "наложения, прежде чем использовать эту версию.\\n" -#: quilt/scripts/patchfns.in:1089 +#: quilt/scripts/patchfns.in:1095 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -1370,33 +1375,32 @@ msgstr "" 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 +#: quilt/scripts/remove-trailing-ws.in:66 #, perl-format msgid "%s: I'm confused.\n" msgstr "%s: я в растерянности.\n" -#: quilt/scripts/remove-trailing-ws.in:113 +#: quilt/scripts/remove-trailing-ws.in:114 #, perl-format msgid "Warning: trailing whitespace in line %s of %s\n" msgstr "Предупреждение: пробел в конце строки %s файла %s\n" -#: quilt/scripts/remove-trailing-ws.in:116 +#: quilt/scripts/remove-trailing-ws.in:117 #, perl-format msgid "Warning: trailing whitespace in lines %s of %s\n" msgstr "Предупреждение: пробел в конце строк %s файла %s\n" -#: quilt/scripts/remove-trailing-ws.in:120 +#: quilt/scripts/remove-trailing-ws.in:121 #, perl-format msgid "Removing trailing whitespace from line %s of %s\n" msgstr "Удаление пробела из конца строки %s файла %s\n" -#: quilt/scripts/remove-trailing-ws.in:123 +#: quilt/scripts/remove-trailing-ws.in:124 #, perl-format msgid "Removing trailing whitespace from lines %s of %s\n" msgstr "Удаление пробела из конца строк %s файла %s\n" -#: quilt/scripts/remove-trailing-ws.in:143 +#: quilt/scripts/remove-trailing-ws.in:144 #, perl-format msgid "Renaming %s to %s: %s\n" msgstr "Переименование %s в %s: %s\n" @@ -1406,10 +1410,14 @@ msgid "Usage: quilt series [-v]\\n" msgstr "Синтаксис: quilt series [-v]\\n" #: quilt/series.in:25 +#, fuzzy msgid "" "\n" "Print the names of all patches in the series file.\n" "\n" +"--color[=always|auto|never]\n" +"\tUse syntax coloring (auto activates it only if the output is a tty).\n" +"\t\n" "-v\tVerbose, more user friendly output.\n" msgstr "" "\n" @@ -1417,15 +1425,15 @@ msgstr "" "\n" "-v\tПодробный, более дружественный вывод.\n" -#: quilt/setup.in:31 +#: quilt/setup.in:34 quilt/setup.in:53 msgid "Directory %s exists\\n" msgstr "Директория %s существует\\n" -#: quilt/setup.in:37 +#: quilt/setup.in:59 msgid "File %s exists\\n" msgstr "Файл %s существует\\n" -#: quilt/setup.in:75 +#: quilt/setup.in:99 #, fuzzy msgid "" "Usage: quilt setup [-d path-prefix] [-v] [--sourcedir dir] [--fuzz=N] " @@ -1433,7 +1441,7 @@ msgid "" msgstr "" "Синтаксис: quilt setup [-d префикс-пути] [-v] {файл-spec|файл-series}\\n" -#: quilt/setup.in:78 +#: quilt/setup.in:102 #, fuzzy msgid "" "\n" @@ -1456,21 +1464,21 @@ msgstr "" "\n" "-v\tвывод отладочной информации.\n" -#: quilt/setup.in:149 +#: quilt/setup.in:173 msgid "The %%prep section of %s failed; results may be incomplete\\n" msgstr "" "Секция %%prep файла %s содержит ошибки; результаты могут быть незавершены\\n" -#: quilt/setup.in:152 +#: quilt/setup.in:176 msgid "The -v option will show rpm's output\\n" msgstr "Опция -v покажет вывод rpm\\n" -#: quilt/setup.in:195 +#: quilt/setup.in:228 quilt/setup.in:240 #, fuzzy msgid "File %s not found\\n" msgstr "Файл %s не изменяется\\n" -#: quilt/setup.in:198 +#: quilt/setup.in:231 quilt/setup.in:243 msgid "Unpacking archive %s\\n" msgstr "Распаковка архива %s\\n" |