diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2005-02-06 00:35:23 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2005-02-06 00:35:23 +0000 |
commit | c6e5788b1e0ee1de26779c37a489f24cbd4273e4 (patch) | |
tree | 7fe13b8a00e72c389ff674a34d56a4e99f9ea0c0 /po | |
parent | 0728a96e16b7cf12786309402a3dbbb512555b1a (diff) | |
download | quilt-c6e5788b1e0ee1de26779c37a489f24cbd4273e4.tar.gz |
- Don't leak so many temporary files in the push command.
- Include command names in tempfile names to find leaks more easily.
Diffstat (limited to 'po')
-rw-r--r-- | po/de.po | 78 | ||||
-rw-r--r-- | po/fr.po | 78 | ||||
-rw-r--r-- | po/ja.po | 90 | ||||
-rw-r--r-- | po/quilt.pot | 77 |
4 files changed, 171 insertions, 152 deletions
@@ -67,20 +67,20 @@ msgstr "" "\tPatch, zu dem die Dateien hinzugefügt werden sollen.\n" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272 +#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/next.in:62 +#: ../quilt/pop.in:239 ../quilt/previous.in:62 ../quilt/push.in:311 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 +#: ../quilt/add.in:75 ../quilt/diff.in:226 ../quilt/pop.in:254 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 +#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:234 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143 +#: ../quilt/pop.in:288 ../quilt/push.in:349 ../quilt/refresh.in:143 #: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Keine Patches angewandt\\n" @@ -143,7 +143,7 @@ msgstr "Patch %s ist momentan angewandt\\n" msgid "Failed to remove patch %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" -#: ../quilt/diff.in:22 +#: ../quilt/diff.in:24 msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " "patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" @@ -151,7 +151,7 @@ msgstr "" "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=programm] [--color] [datei ...]\\n" -#: ../quilt/diff.in:26 +#: ../quilt/diff.in:28 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -230,51 +230,51 @@ msgstr "" "--color[=always|auto|never]\n" "\tSyntaxeinfärbung verwenden (immer, nur für Terminals, nie).\n" -#: ../quilt/diff.in:213 +#: ../quilt/diff.in:218 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`-c patch', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" -#: ../quilt/diff.in:240 +#: ../quilt/diff.in:245 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\n" -#: ../quilt/diff.in:275 ../quilt/files.in:122 +#: ../quilt/diff.in:280 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: ../quilt/diff.in:311 +#: ../quilt/diff.in:316 msgid "Cannot change into directory %s\\n" msgstr "Kann nicht in Verzeichnis %s wechseln\\n" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 +#: ../quilt/diff.in:323 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: ../quilt/diff.in:329 +#: ../quilt/diff.in:334 msgid "Cannot change to temporary directory\\n" msgstr "Kann nicht in temporäres Verzeichnis wechseln\\n" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 +#: ../quilt/diff.in:353 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: ../quilt/diff.in:354 +#: ../quilt/diff.in:359 msgid "Cannot change to source directory\\n" msgstr "Kann nicht in Quellverzeichnis wechseln\\n" -#: ../quilt/diff.in:372 +#: ../quilt/diff.in:377 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: ../quilt/diff.in:392 ../quilt/refresh.in:175 +#: ../quilt/diff.in:397 ../quilt/refresh.in:175 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: ../quilt/diff.in:399 +#: ../quilt/diff.in:404 msgid "More recent patches modify files in patch %s\\n" msgstr "Später angewandte Patches verändern Dateien von %s\\n" @@ -559,25 +559,25 @@ msgstr "" "\n" "-v\tViele Meldungen ausgeben.\n" -#: ../quilt/pop.in:153 +#: ../quilt/pop.in:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen " "erzwingen mit -f)\\n" -#: ../quilt/pop.in:176 +#: ../quilt/pop.in:178 msgid "Removing patch %s\\n" msgstr "Entferne patch %s\\n" -#: ../quilt/pop.in:260 +#: ../quilt/pop.in:262 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: ../quilt/pop.in:270 +#: ../quilt/pop.in:272 msgid "No patch removed\\n" msgstr "Kein Patch entfernt\\n" -#: ../quilt/pop.in:293 ../quilt/push.in:328 +#: ../quilt/pop.in:295 ../quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "Jetzt in Patch %s\\n" @@ -595,11 +595,12 @@ msgstr "" "Gibt den Namen des Patches vor dem obersten oder angegebenen\n" "Patch in der series-Datei aus.\n" -#: ../quilt/push.in:22 +#: ../quilt/push.in:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "Verwendung: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" -#: ../quilt/push.in:25 +#: ../quilt/push.in:27 +#, fuzzy msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -625,6 +626,9 @@ msgid "" "\tAllow the patch utility to ask how to deal with conflicts. If\n" "\tthis option is not given, the option -f will be passed to the \n" "\tpatch program.\n" +"\n" +"--color[=always|auto|never]\n" +" Use syntax coloring.\n" msgstr "" "\n" "Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n" @@ -649,43 +653,43 @@ msgstr "" "\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n" "\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n" -#: ../quilt/push.in:59 +#: ../quilt/push.in:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n" -#: ../quilt/push.in:71 +#: ../quilt/push.in:96 msgid "Patch %s appears to be empty\\n" msgstr "Patch %s scheint leer zu sein\\n" -#: ../quilt/push.in:135 +#: ../quilt/push.in:160 msgid "Applying patch %s\\n" msgstr "Wende Patch %s an\\n" -#: ../quilt/push.in:166 +#: ../quilt/push.in:192 msgid "Patch %s appears to be empty, applied\\n" msgstr "Patch %s scheint leer zu sein, angewandt\\n" -#: ../quilt/push.in:170 +#: ../quilt/push.in:196 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n" -#: ../quilt/push.in:175 +#: ../quilt/push.in:201 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n" -#: ../quilt/push.in:214 +#: ../quilt/push.in:240 msgid "Patch %s not found in file series\\n" msgstr "Patch %s nicht in series-Datei gefunden\\n" -#: ../quilt/push.in:289 +#: ../quilt/push.in:328 msgid "Patch %s is already applied\\n" msgstr "Patch %s ist bereits angewandt\\n" -#: ../quilt/push.in:298 +#: ../quilt/push.in:337 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" -#: ../quilt/push.in:312 +#: ../quilt/push.in:351 msgid "File series fully applied, ends at patch %s\\n" msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n" @@ -984,7 +988,7 @@ msgstr "" "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie " "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n" -#: ../scripts/patchfns.in:750 +#: ../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 " @@ -997,7 +1001,7 @@ msgstr "" "quilt alle Patches mit der Version von quilt, die zur Erstellung des " "Arbeitsverzeichnisses verwendet wurde.\\n" -#: ../scripts/patchfns.in:817 +#: ../scripts/patchfns.in:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -69,20 +69,20 @@ msgstr "" "\tPatch auquel les fichiers doivent tre ajouts.\n" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272 +#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/next.in:62 +#: ../quilt/pop.in:239 ../quilt/previous.in:62 ../quilt/push.in:311 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 +#: ../quilt/add.in:75 ../quilt/diff.in:226 ../quilt/pop.in:254 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 +#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:234 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143 +#: ../quilt/pop.in:288 ../quilt/push.in:349 ../quilt/refresh.in:143 #: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqu\\n" @@ -145,7 +145,7 @@ msgstr "Le patch %s est actuellement appliqu\\n" msgid "Failed to remove patch %s\\n" msgstr "Impossible de retirer le patch %s\\n" -#: ../quilt/diff.in:22 +#: ../quilt/diff.in:24 msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " "patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" @@ -153,7 +153,7 @@ msgstr "" "Usage : quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-" "P patch] [--snapshot] [--diff=utilitaire] [--color] [fichier ...]\\n" -#: ../quilt/diff.in:26 +#: ../quilt/diff.in:28 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -240,50 +240,50 @@ msgstr "" "\tColorise la syntaxe toujours (always), de manire automatique (auto)\n" "\tou jamais (never).\n" -#: ../quilt/diff.in:213 +#: ../quilt/diff.in:218 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Les options -c patch, --snapshot et -z ne peuvent pas tre combines." -#: ../quilt/diff.in:240 +#: ../quilt/diff.in:245 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\n" -#: ../quilt/diff.in:275 ../quilt/files.in:122 +#: ../quilt/diff.in:280 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: ../quilt/diff.in:311 +#: ../quilt/diff.in:316 msgid "Cannot change into directory %s\\n" msgstr "Impossible d'entrer dans le rpertoire %s\\n" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 +#: ../quilt/diff.in:323 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:329 +#: ../quilt/diff.in:334 msgid "Cannot change to temporary directory\\n" msgstr "Impossible d'entrer dans le rpertoire temporaire\\n" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 +#: ../quilt/diff.in:353 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: ../quilt/diff.in:354 +#: ../quilt/diff.in:359 msgid "Cannot change to source directory\\n" msgstr "Impossible d'entrer dans le rpertoire source\\n" -#: ../quilt/diff.in:372 +#: ../quilt/diff.in:377 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: ../quilt/diff.in:392 ../quilt/refresh.in:175 +#: ../quilt/diff.in:397 ../quilt/refresh.in:175 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: ../quilt/diff.in:399 +#: ../quilt/diff.in:404 msgid "More recent patches modify files in patch %s\\n" msgstr "Un patch plus recent modifie des fichiers communs %s.\\n" @@ -573,25 +573,25 @@ msgstr "" "\n" "-v\tOpre verbeusement.\n" -#: ../quilt/pop.in:153 +#: ../quilt/pop.in:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)" "\\n" -#: ../quilt/pop.in:176 +#: ../quilt/pop.in:178 msgid "Removing patch %s\\n" msgstr "Retrait de %s\\n" -#: ../quilt/pop.in:260 +#: ../quilt/pop.in:262 msgid "Patch %s needs to be refreshed first.\\n" msgstr "Le patch %s doit tre rafraichi au pralable.\\n" -#: ../quilt/pop.in:270 +#: ../quilt/pop.in:272 msgid "No patch removed\\n" msgstr "Aucun patch retir\\n" -#: ../quilt/pop.in:293 ../quilt/push.in:328 +#: ../quilt/pop.in:295 ../quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -611,11 +611,12 @@ msgstr "" "\n" "-n\tAffiche le nom de fichier au lieu du nom de patch.\n" -#: ../quilt/push.in:22 +#: ../quilt/push.in:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" -#: ../quilt/push.in:25 +#: ../quilt/push.in:27 +#, fuzzy msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -641,6 +642,9 @@ msgid "" "\tAllow the patch utility to ask how to deal with conflicts. If\n" "\tthis option is not given, the option -f will be passed to the \n" "\tpatch program.\n" +"\n" +"--color[=always|auto|never]\n" +" Use syntax coloring.\n" msgstr "" "\n" "Applique un ou plusieurs patches de la srie. Si aucun argument n'est\n" @@ -669,44 +673,44 @@ msgstr "" "\tSi cette option n'est pas donne, l'option -f sera passe au \n" "\tprogramme patch.\n" -#: ../quilt/push.in:59 +#: ../quilt/push.in:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas t appliqu.\\n" -#: ../quilt/push.in:71 +#: ../quilt/push.in:96 msgid "Patch %s appears to be empty\\n" msgstr "Le patch %s semble vide.\\n" -#: ../quilt/push.in:135 +#: ../quilt/push.in:160 msgid "Applying patch %s\\n" msgstr "Application de %s\\n" -#: ../quilt/push.in:166 +#: ../quilt/push.in:192 msgid "Patch %s appears to be empty, applied\\n" msgstr "Le patch %s semble vide. Il a t appliqu.\\n" -#: ../quilt/push.in:170 +#: ../quilt/push.in:196 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "%s a t appliqu (forc ; vous devriez le rafrachir)\\n" -#: ../quilt/push.in:175 +#: ../quilt/push.in:201 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:214 +#: ../quilt/push.in:240 msgid "Patch %s not found in file series\\n" msgstr "Le patch %s est introuvable dans le fichier de srie\\n" -#: ../quilt/push.in:289 +#: ../quilt/push.in:328 msgid "Patch %s is already applied\\n" msgstr "Le patch %s est dj appliqu.\\n" -#: ../quilt/push.in:298 +#: ../quilt/push.in:337 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit tre rafraichi au pralable.\\n" -#: ../quilt/push.in:312 +#: ../quilt/push.in:351 msgid "File series fully applied, ends at patch %s\\n" msgstr "La srie est compltement applique. Le dernier patch est %s.\\n" @@ -1005,7 +1009,7 @@ msgstr "" "version utilise pour crer cet arbre de travail, ou effacez le rpertoire\n" "%s et rappliquez compltement vos patchs.\\n" -#: ../scripts/patchfns.in:750 +#: ../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 " @@ -1017,7 +1021,7 @@ msgstr "" "format %s (inclus). Veuillez retirer vos patches avec la version \n" "utilise pour les appliquer avant d'installer une version plus ancienne.\\n" -#: ../scripts/patchfns.in:817 +#: ../scripts/patchfns.in:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" @@ -67,20 +67,20 @@ msgstr "" "\tファイルを追加するパッチ\n" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272 +#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/next.in:62 +#: ../quilt/pop.in:239 ../quilt/previous.in:62 ../quilt/push.in:311 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 +#: ../quilt/add.in:75 ../quilt/diff.in:226 ../quilt/pop.in:254 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 +#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:234 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143 +#: ../quilt/pop.in:288 ../quilt/push.in:349 ../quilt/refresh.in:143 #: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "適用されているパッチはありません\\n" @@ -143,7 +143,7 @@ msgstr "パッチ %s は現在適用されています。\\n" msgid "Failed to remove patch %s\\n" msgstr "パッチ %sを削除することに失敗しました。\\n" -#: ../quilt/diff.in:22 +#: ../quilt/diff.in:24 msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " "patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" @@ -151,7 +151,7 @@ msgstr "" "使い方: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-" "P パッチ] [--snapshot] [--diff=utility] [--color] [ファイル ...]\\n" -#: ../quilt/diff.in:26 +#: ../quilt/diff.in:28 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -228,47 +228,48 @@ msgstr "" "--color[=always|auto|never]\n" "\tシンタックスの色付け指定。\n" -#: ../quilt/diff.in:213 +#: ../quilt/diff.in:218 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" -msgstr "オプション \\`-c patch'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" +msgstr "" +"オプション \\`-c patch'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: ../quilt/diff.in:240 +#: ../quilt/diff.in:245 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: ../quilt/diff.in:275 ../quilt/files.in:122 +#: ../quilt/diff.in:280 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: ../quilt/diff.in:311 +#: ../quilt/diff.in:316 msgid "Cannot change into directory %s\\n" msgstr "ディレクトリ %s に移動できません\\n" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 +#: ../quilt/diff.in:323 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: ../quilt/diff.in:329 +#: ../quilt/diff.in:334 msgid "Cannot change to temporary directory\\n" msgstr "テンポラリディレクトリに移動できません\\n" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 +#: ../quilt/diff.in:353 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: ../quilt/diff.in:354 +#: ../quilt/diff.in:359 msgid "Cannot change to source directory\\n" msgstr "ソースディレクトリに移動できません\\n" -#: ../quilt/diff.in:372 +#: ../quilt/diff.in:377 msgid "File %s is not being modified\\n" msgstr "ファイル %sは変更されていません\\n" -#: ../quilt/diff.in:392 ../quilt/refresh.in:175 +#: ../quilt/diff.in:397 ../quilt/refresh.in:175 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: ../quilt/diff.in:399 +#: ../quilt/diff.in:404 msgid "More recent patches modify files in patch %s\\n" msgstr "最近のパッチが、パッチ %s内のファイルを変更しています\\n" @@ -549,25 +550,25 @@ msgstr "" "\n" "-v\t詳細に表示。\n" -#: ../quilt/pop.in:153 +#: ../quilt/pop.in:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" "パッチ %s を、正常にはずすことができません (リフレッシュするか -fを付\n" "けてはずしてください)\\n" -#: ../quilt/pop.in:176 +#: ../quilt/pop.in:178 msgid "Removing patch %s\\n" msgstr "パッチ %s を削除します\\n" -#: ../quilt/pop.in:260 +#: ../quilt/pop.in:262 msgid "Patch %s needs to be refreshed first.\\n" msgstr "最初に、パッチ %s のリフレッシュが必要です。\\n" -#: ../quilt/pop.in:270 +#: ../quilt/pop.in:272 msgid "No patch removed\\n" msgstr "適用されているパッチはありません\\n" -#: ../quilt/pop.in:293 ../quilt/push.in:328 +#: ../quilt/pop.in:295 ../quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "現在位置はパッチ %s です" @@ -585,11 +586,12 @@ msgstr "" "最上位のパッチの前のパッチ名を表示。パッチ名が指定されたときは、指定\n" "されたパッチの前のパッチ名を表示。\n" -#: ../quilt/push.in:22 +#: ../quilt/push.in:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "使い方: quilt push [-afqv] [--leave-rejects] [数字|パッチ]\\n" -#: ../quilt/push.in:25 +#: ../quilt/push.in:27 +#, fuzzy msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -615,6 +617,9 @@ msgid "" "\tAllow the patch utility to ask how to deal with conflicts. If\n" "\tthis option is not given, the option -f will be passed to the \n" "\tpatch program.\n" +"\n" +"--color[=always|auto|never]\n" +" Use syntax coloring.\n" msgstr "" "\n" "seriesに登録されているパッチを適用する。オプションが無い場合は series \n" @@ -636,45 +641,47 @@ msgstr "" "\tまま残す。\n" "\n" -#: ../quilt/push.in:59 +#: ../quilt/push.in:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "ユーザによって中断されました。パッチ % は適用されていません。\\n" -#: ../quilt/push.in:71 +#: ../quilt/push.in:96 msgid "Patch %s appears to be empty\\n" msgstr "パッチ %sは、空のようです\\n" -#: ../quilt/push.in:135 +#: ../quilt/push.in:160 msgid "Applying patch %s\\n" msgstr "パッチ %s を適用しています\\n" -#: ../quilt/push.in:166 +#: ../quilt/push.in:192 msgid "Patch %s appears to be empty, applied\\n" msgstr "パッチ %s は空のようですが、適用しました\\n" -#: ../quilt/push.in:170 +#: ../quilt/push.in:196 msgid "Applied patch %s (forced; needs refresh)\\n" -msgstr "パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" +msgstr "" +"パッチ % を適用しました (強制適用したために、リフレッシュが必要です)\\n" -#: ../quilt/push.in:175 +#: ../quilt/push.in:201 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "パッチ %sが適用できません (強制適用する場合は -fを付けてください)\\n" -#: ../quilt/push.in:214 +#: ../quilt/push.in:240 msgid "Patch %s not found in file series\\n" msgstr "パッチ %s が seriesファイル内で見つかりません。\\n" -#: ../quilt/push.in:289 +#: ../quilt/push.in:328 msgid "Patch %s is already applied\\n" msgstr "パッチ %s は、すでに適用済です\\n" -#: ../quilt/push.in:298 +#: ../quilt/push.in:337 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上位パッチのリフレッシュが最初に必要です。\\n" -#: ../quilt/push.in:312 +#: ../quilt/push.in:351 msgid "File series fully applied, ends at patch %s\\n" -msgstr "seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" +msgstr "" +"seriesファイルのパッチはすべて適用されています。最終パッチは %s です。\\n" #: ../quilt/refresh.in:22 msgid "" @@ -825,7 +832,8 @@ msgstr "" #: ../quilt/setup.in:27 msgid "Usage: quilt setup [-d path-prefix] [-v] {specfile|seriesfile}\\n" -msgstr "使い方: quilt setup [-d path-prefix] [-v] {specファイル|seriesファイル}\\n" +msgstr "" +"使い方: quilt setup [-d path-prefix] [-v] {specファイル|seriesファイル}\\n" #: ../quilt/setup.in:30 msgid "" @@ -964,7 +972,7 @@ msgstr "" "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n" "トリを削除し、最初からパッチをあて直してください。\\n" -#: ../scripts/patchfns.in:750 +#: ../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 " @@ -976,7 +984,7 @@ msgstr "" "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n" "すべてのパッチを pop してください。\\n" -#: ../scripts/patchfns.in:817 +#: ../scripts/patchfns.in:809 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 3e586df..68f8737 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -36,20 +36,20 @@ msgid "" msgstr "" #: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76 -#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62 -#: ../quilt/pop.in:237 ../quilt/previous.in:62 ../quilt/push.in:272 +#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/next.in:62 +#: ../quilt/pop.in:239 ../quilt/previous.in:62 ../quilt/push.in:311 #: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "" -#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:252 +#: ../quilt/add.in:75 ../quilt/diff.in:226 ../quilt/pop.in:254 #: ../quilt/refresh.in:135 ../quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "" -#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 +#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:234 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:286 ../quilt/push.in:310 ../quilt/refresh.in:143 +#: ../quilt/pop.in:288 ../quilt/push.in:349 ../quilt/refresh.in:143 #: ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "" @@ -105,13 +105,13 @@ msgstr "" msgid "Failed to remove patch %s\\n" msgstr "" -#: ../quilt/diff.in:22 +#: ../quilt/diff.in:24 msgid "" "Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " "patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n" msgstr "" -#: ../quilt/diff.in:26 +#: ../quilt/diff.in:28 msgid "" "\n" "Produces a diff of the specified file(s) in the topmost or specified\n" @@ -153,47 +153,47 @@ msgid "" "\tUse syntax coloring.\n" msgstr "" -#: ../quilt/diff.in:213 +#: ../quilt/diff.in:218 msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: ../quilt/diff.in:240 +#: ../quilt/diff.in:245 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: ../quilt/diff.in:275 ../quilt/files.in:122 +#: ../quilt/diff.in:280 ../quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: ../quilt/diff.in:311 +#: ../quilt/diff.in:316 msgid "Cannot change into directory %s\\n" msgstr "" -#: ../quilt/diff.in:318 ../quilt/pop.in:115 +#: ../quilt/diff.in:323 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:329 +#: ../quilt/diff.in:334 msgid "Cannot change to temporary directory\\n" msgstr "" -#: ../quilt/diff.in:348 ../quilt/pop.in:138 +#: ../quilt/diff.in:353 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "" -#: ../quilt/diff.in:354 +#: ../quilt/diff.in:359 msgid "Cannot change to source directory\\n" msgstr "" -#: ../quilt/diff.in:372 +#: ../quilt/diff.in:377 msgid "File %s is not being modified\\n" msgstr "" -#: ../quilt/diff.in:392 ../quilt/refresh.in:175 +#: ../quilt/diff.in:397 ../quilt/refresh.in:175 msgid "Diff failed, aborting\\n" msgstr "" -#: ../quilt/diff.in:399 +#: ../quilt/diff.in:404 msgid "More recent patches modify files in patch %s\\n" msgstr "" @@ -402,23 +402,23 @@ msgid "" "-v\tVerbose operation.\n" msgstr "" -#: ../quilt/pop.in:153 +#: ../quilt/pop.in:156 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" msgstr "" -#: ../quilt/pop.in:176 +#: ../quilt/pop.in:178 msgid "Removing patch %s\\n" msgstr "" -#: ../quilt/pop.in:260 +#: ../quilt/pop.in:262 msgid "Patch %s needs to be refreshed first.\\n" msgstr "" -#: ../quilt/pop.in:270 +#: ../quilt/pop.in:272 msgid "No patch removed\\n" msgstr "" -#: ../quilt/pop.in:293 ../quilt/push.in:328 +#: ../quilt/pop.in:295 ../quilt/push.in:371 msgid "Now at patch %s\\n" msgstr "" @@ -433,11 +433,11 @@ msgid "" "patch in the series file.\n" msgstr "" -#: ../quilt/push.in:22 +#: ../quilt/push.in:24 msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n" msgstr "" -#: ../quilt/push.in:25 +#: ../quilt/push.in:27 msgid "" "\n" "Apply patch(es) from the series file. Without options, the next patch\n" @@ -463,45 +463,48 @@ msgid "" "\tAllow the patch utility to ask how to deal with conflicts. If\n" "\tthis option is not given, the option -f will be passed to the \n" "\tpatch program.\n" +"\n" +"--color[=always|auto|never]\n" +" Use syntax coloring.\n" msgstr "" -#: ../quilt/push.in:59 +#: ../quilt/push.in:64 msgid "Interrupted by user; patch %s was not applied.\\n" msgstr "" -#: ../quilt/push.in:71 +#: ../quilt/push.in:96 msgid "Patch %s appears to be empty\\n" msgstr "" -#: ../quilt/push.in:135 +#: ../quilt/push.in:160 msgid "Applying patch %s\\n" msgstr "" -#: ../quilt/push.in:166 +#: ../quilt/push.in:192 msgid "Patch %s appears to be empty, applied\\n" msgstr "" -#: ../quilt/push.in:170 +#: ../quilt/push.in:196 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "" -#: ../quilt/push.in:175 +#: ../quilt/push.in:201 msgid "Patch %s does not apply (enforce with -f)\\n" msgstr "" -#: ../quilt/push.in:214 +#: ../quilt/push.in:240 msgid "Patch %s not found in file series\\n" msgstr "" -#: ../quilt/push.in:289 +#: ../quilt/push.in:328 msgid "Patch %s is already applied\\n" msgstr "" -#: ../quilt/push.in:298 +#: ../quilt/push.in:337 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "" -#: ../quilt/push.in:312 +#: ../quilt/push.in:351 msgid "File series fully applied, ends at patch %s\\n" msgstr "" @@ -713,7 +716,7 @@ msgid "" "patches from scratch.\\n" msgstr "" -#: ../scripts/patchfns.in:750 +#: ../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 " @@ -721,7 +724,7 @@ msgid "" "downgrading.\\n" msgstr "" -#: ../scripts/patchfns.in:817 +#: ../scripts/patchfns.in:809 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |