diff options
Diffstat (limited to 'po/fr.po')
| -rw-r--r-- | po/fr.po | 42 |
1 files changed, 23 insertions, 19 deletions
@@ -395,6 +395,7 @@ msgid "Usage: quilt fold [-p strip-level]\\n" msgstr "Usage : quilt fold [-p strip-level]\\n" #: quilt/fold.in:25 +#, fuzzy msgid "" "\n" "Integrate the patch read from standard input into the topmost patch:\n" @@ -402,6 +403,11 @@ msgid "" "patch, the patch is applied with the specified strip level (which\n" "defaults to 1).\n" "\n" +"-q\tQuiet operation.\n" +"\n" +"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n" +"\tapply the patch interactively: the patch utility may ask questions.\n" +"\n" "-p strip-level\n" "\tThe number of pathname components to strip from file names\n" "\twhen applying patchfile.\n" @@ -416,7 +422,7 @@ msgstr "" "\tNombre de niveaux de répertoires à retirer lors de l'application du \n" "\tpatch.\n" -#: quilt/fold.in:112 +#: quilt/fold.in:123 msgid "File %s may be corrupted\\n" msgstr "Le fichier %s est peut-être corrompu\\n" @@ -971,7 +977,7 @@ msgstr "Aucun patch retiré\\n" msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqué\\n" -#: quilt/pop.in:274 quilt/push.in:373 +#: quilt/pop.in:274 quilt/push.in:369 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -992,14 +998,16 @@ msgstr "" "-n\tAffiche le nom de fichier au lieu du nom de patch.\n" #: quilt/push.in:24 +#, fuzzy msgid "" -"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|" -"auto|never]] [num|patch]\\n" +"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] " +"[num|patch]\\n" msgstr "" "Usage : quilt push [-afqv] [--leave-rejects] [--interactive] [--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" @@ -1011,21 +1019,17 @@ msgid "" "\n" "-a\tApply all patches in the series file.\n" "\n" -"-f\tForce apply, even if the patch has rejects.\n" -"\n" "-q\tQuiet operation.\n" "\n" +"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n" +"\tapply the patch interactively: the patch utility may ask questions.\n" +"\n" "-v\tVerbose operation.\n" "\n" "--leave-rejects\n" "\tLeave around the reject files patch produced, even if the patch\n" "\tis not actually applied.\n" "\n" -"--interactive\n" -"\tAllow the patch utility to ask how to deal with conflicts. If\n" -"\tthis option is not given, the -f option will be passed to the\n" -"\tpatch program.\n" -"\n" "--color[=always|auto|never]\n" "\tUse syntax coloring.\n" msgstr "" @@ -1060,36 +1064,36 @@ msgstr "" "\tApplique une coloration syntaxique, toujours («always»), de manière\n" "\tautomatique («auto») ou jamais («never»).\n" -#: quilt/push.in:64 +#: quilt/push.in:60 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:177 +#: quilt/push.in:173 msgid "Applying patch %s\\n" msgstr "Application de %s\\n" -#: quilt/push.in:211 +#: quilt/push.in:207 msgid "Patch %s does not exist; applied empty patch\\n" msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n" -#: quilt/push.in:215 +#: quilt/push.in:211 msgid "Patch %s appears to be empty; applied\\n" msgstr "Le patch %s semble vide. Il a été appliqué.\\n" -#: quilt/push.in:219 +#: quilt/push.in:215 msgid "Applied patch %s (forced; needs refresh)\\n" msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n" -#: quilt/push.in:229 +#: quilt/push.in:225 msgid "Patch %s can be reverse-applied\\n" msgstr "Le patch %s peut être appliqué à l'envers\\n" -#: quilt/push.in:232 +#: quilt/push.in:228 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:353 +#: quilt/push.in:349 msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n" |