summaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-07-14 20:11:30 +0000
committerJean Delvare <khali@linux-fr.org>2005-07-14 20:11:30 +0000
commita51c8b3e8814d1be7219de5a188a30cc960cd53b (patch)
tree27763639fe63ebb01090305a78f4f61160e2992d /po
parent3bbfed1736aedb94a74bd94378a3993d988f8cce (diff)
downloadquilt-a51c8b3e8814d1be7219de5a188a30cc960cd53b.tar.gz
Update the French translation.
Diffstat (limited to 'po')
-rw-r--r--po/fr.po14
-rw-r--r--po/quilt.pot6
2 files changed, 10 insertions, 10 deletions
diff --git a/po/fr.po b/po/fr.po
index b799a7e..1332d42 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -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"