diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 20:06:52 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-21 20:06:52 +0000 |
commit | 3ea7e41383a9e9ce1fe41a28822944bff469aa02 (patch) | |
tree | bc4e3a03fa6ba2f1d6974a84e09feaa37bd91934 /po/fr.po | |
parent | 3a6c8c1edcac481e7a13cf9c976edd17a4c92219 (diff) | |
download | quilt-3ea7e41383a9e9ce1fe41a28822944bff469aa02.tar.gz |
- Split off strip_diffstat from header command.
- import command: compare patch headers to prevent destruction;
add -d option to choose which header(s) to keep.
Diffstat (limited to 'po/fr.po')
-rw-r--r-- | po/fr.po | 39 |
1 files changed, 26 insertions, 13 deletions
@@ -609,11 +609,11 @@ msgstr "" "\tCrée une sauvegarde de la version originale du patch en tant\n" "\tque patch~.\n" -#: quilt/header.in:176 +#: quilt/header.in:167 msgid "Replaced header of patch %s\\n" msgstr "En-tête du patch %s remplacé\\n" -#: quilt/header.in:179 +#: quilt/header.in:170 msgid "Appended text to header of patch %s\\n" msgstr "Texte ajouté à la fin de l'en-tête du patch %s\\n" @@ -622,6 +622,7 @@ msgid "Usage: quilt import [-f] [-p num] [-n patch] patchfile ...\\n" msgstr "Usage : quilt import [-f] [-p num] [-n patch] fichier_de_patch ...\\n" #: quilt/import.in:25 +#, fuzzy msgid "" "\n" "Import external patches. The patches will be inserted following the\n" @@ -634,6 +635,10 @@ msgid "" "\tPatch filename to use inside quilt. This option can only be\n" "\tused when importing a single patch.\n" "\n" +"-d {o|a|n}\n" +"\tKeep the old (o), all (a), or new (n) description. This option\n" +"\tmust be specified if both patches include a description.\n" +"\n" "-f\tOverwite/update existing patches.\n" msgstr "" "\n" @@ -651,42 +656,50 @@ msgstr "" "\n" "-f\tÉcrase/met à jour les patchs existants.\n" -#: quilt/import.in:75 +#: quilt/import.in:67 +msgid "Patch headers differ:\\n" +msgstr "" + +#: quilt/import.in:70 +msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" +msgstr "" + +#: quilt/import.in:123 msgid "Option \\`-n' can only be used when importing a single patch\\n" msgstr "" "L'option « -n » ne peut être utilisé que lors de l'import d'un seul patch.\\n" -#: quilt/import.in:94 +#: quilt/import.in:143 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/import.in:103 +#: quilt/import.in:152 #, fuzzy msgid "Patch %s already exists in series.\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/import.in:109 +#: quilt/import.in:158 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:113 +#: quilt/import.in:169 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:117 +#: quilt/import.in:173 #, fuzzy msgid "Importing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/import.in:119 +#: quilt/import.in:175 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistré dans %s)\\n" -#: quilt/import.in:128 +#: quilt/import.in:185 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:136 +#: quilt/import.in:192 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" @@ -1246,7 +1259,7 @@ msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n" msgid "Patch %s does not exist\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/scripts/patchfns.in:817 +#: quilt/scripts/patchfns.in:831 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 " @@ -1258,7 +1271,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:902 +#: quilt/scripts/patchfns.in:916 msgid "" "The working tree was created by an older version of quilt. Please run 'quilt " "upgrade'.\\n" |