diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-07-14 20:11:30 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-07-14 20:11:30 +0000 |
| commit | a51c8b3e8814d1be7219de5a188a30cc960cd53b (patch) | |
| tree | 27763639fe63ebb01090305a78f4f61160e2992d | |
| parent | 3bbfed1736aedb94a74bd94378a3993d988f8cce (diff) | |
| download | quilt-a51c8b3e8814d1be7219de5a188a30cc960cd53b.tar.gz | |
Update the French translation.
| -rw-r--r-- | po/fr.po | 14 | ||||
| -rw-r--r-- | po/quilt.pot | 6 | ||||
| -rw-r--r-- | quilt.changes | 5 |
3 files changed, 15 insertions, 10 deletions
@@ -737,8 +737,8 @@ msgid "" "-f\tForce remove. The state before the patch(es) were applied will\n" "\tbe restored from backup files.\n" "\n" -"-R\tRemove the patch with \\`patch -R' and check if the patch reverts\n" -"\tall changes properly.\n" +"-R\tAlways verify if the patch removes cleanly; don't rely on\n" +"\ttimestamp checks.\n" "\n" "-q\tQuiet operation.\n" "\n" @@ -754,11 +754,11 @@ msgstr "" "\n" "-a\tRetire tous les patches de la série.\n" "\n" -"-f\tForce l'action. L'état des patches avant qu'ils ne soient retirés \n" +"-f\tForce l'action. L'état avant que les patches ne soient retirés\n" "\tsera restoré depuis les fichiers de sauvegarde.\n" "\n" -"-R\tRetire le patche avec « patch -R » et vérifie que cela retire \n" -"\tproprement tous les changements.\n" +"-R\tVérifie que le patch s'enlève proprement ; ne se base pas sur\n" +"\tles horaires de dernière modification des fichiers.\n" "\n" "-q\tOpère silencieusement.\n" "\n" @@ -834,7 +834,7 @@ msgid "" "\n" "--interactive\n" "\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" +"\tthis option is not given, the -f option will be passed to the \n" "\tpatch program.\n" "\n" "--color[=always|auto|never]\n" @@ -864,7 +864,7 @@ msgstr "" "\n" "--interactive\n" "\tLaisse l'utilitaire patch demander comment résoudre les conflits.\n" -"\tSi cette option n'est pas donnée, l'option -f sera passée au \n" +"\tSi cette option n'est pas utilisée, l'option -f sera passée au\n" "\tprogramme patch.\n" "\n" "--color[=always|auto|never]\n" diff --git a/po/quilt.pot b/po/quilt.pot index 92bb7d3..868ee32 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -505,8 +505,8 @@ msgid "" "-f\tForce remove. The state before the patch(es) were applied will\n" "\tbe restored from backup files.\n" "\n" -"-R\tRemove the patch with \\`patch -R' and check if the patch reverts\n" -"\tall changes properly.\n" +"-R\tAlways verify if the patch removes cleanly; don't rely on\n" +"\ttimestamp checks.\n" "\n" "-q\tQuiet operation.\n" "\n" @@ -576,7 +576,7 @@ msgid "" "\n" "--interactive\n" "\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" +"\tthis option is not given, the -f option will be passed to the \n" "\tpatch program.\n" "\n" "--color[=always|auto|never]\n" diff --git a/quilt.changes b/quilt.changes index 5bd4da3..dc17574 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jul 14 22:10:21 CEST 2005 - khali@linux-fr.org + +- Update the French translation. + +------------------------------------------------------------------- Thu Jul 14 13:05:39 CEST 2005 - agruen@suse.de - Use wildcard to generate the list of all commands in Makefile |