diff options
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 31 |
1 files changed, 16 insertions, 15 deletions
@@ -635,11 +635,12 @@ 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) patch header. If both patches\n" -"\tinclude headers, this option must be specified.\n" -"\n" "-f\tOverwite/update existing patches.\n" +"\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 "" "\n" "Importe des patchs externes. Ces patches sont insérés juste après\n" @@ -656,50 +657,50 @@ msgstr "" "\n" "-f\tÉcrase/met à jour les patchs existants.\n" -#: quilt/import.in:67 +#: quilt/import.in:68 msgid "Patch headers differ:\\n" msgstr "" -#: quilt/import.in:70 +#: quilt/import.in:71 msgid "Please use -d {o|a|n} to specify which patch header(s) to keep.\\n" msgstr "" -#: quilt/import.in:123 +#: quilt/import.in:124 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:143 +#: quilt/import.in:144 msgid "Patch %s is applied\\n" msgstr "Le patch %s n'est pas appliqué\\n" -#: quilt/import.in:152 +#: quilt/import.in:153 #, fuzzy msgid "Patch %s already exists in series.\\n" msgstr "Le patch %s n'est pas dans la série\\n" -#: quilt/import.in:158 +#: quilt/import.in:159 msgid "Patch %s exists. Replace with -f.\\n" msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n" -#: quilt/import.in:169 +#: quilt/import.in:170 msgid "Replacing patch %s with new version\\n" msgstr "Remplacement du patch %s avec la nouvelle version\\n" -#: quilt/import.in:173 +#: quilt/import.in:174 #, fuzzy msgid "Importing patch %s\\n" msgstr "Retrait de %s\\n" -#: quilt/import.in:175 +#: quilt/import.in:176 msgid "Importing patch %s (stored as %s)\\n" msgstr "Import du patch %s (enregistré dans %s)\\n" -#: quilt/import.in:185 +#: quilt/import.in:186 msgid "Failed to import patch %s\\n" msgstr "Impossible d'importer le patch %s\\n" -#: quilt/import.in:192 +#: quilt/import.in:193 msgid "Failed to insert patch %s into file series\\n" msgstr "Impossible d'inserer %s dans le fichier de série.\\n" |