summaryrefslogtreecommitdiffstats
path: root/po/fr.po
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-09-19 15:13:46 +0000
committerJean Delvare <khali@linux-fr.org>2006-09-19 15:13:46 +0000
commit67b0df979f03d64ecdfa0d0224466c1541e9321c (patch)
treee6ef2d9d062075824f2956c777446c4d5484f400 /po/fr.po
parentca925d2e7fcad12c5b00143dbe8101eff6c907b3 (diff)
downloadquilt-67b0df979f03d64ecdfa0d0224466c1541e9321c.tar.gz
- quilt/scripts/patchfns.in: Drop support for "-pab" in series
file, for it breaks compatibility with previous versions of quilt, and is inconsistent. - test/dir-a-b.test: Drop test case for "-pab" in series file.
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po32
1 files changed, 16 insertions, 16 deletions
diff --git a/po/fr.po b/po/fr.po
index d465b3b..a076721 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -180,11 +180,11 @@ msgstr ""
msgid "No next patch\\n"
msgstr "Pas de patch suivant\\n"
-#: quilt/delete.in:95 quilt/scripts/patchfns.in:475
+#: quilt/delete.in:95 quilt/scripts/patchfns.in:461
msgid "No patches in series\\n"
msgstr "Aucun patch dans la série\\n"
-#: quilt/delete.in:101 quilt/scripts/patchfns.in:573
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:559
msgid "Patch %s is currently applied\\n"
msgstr "Le patch %s est actuellement appliqué\\n"
@@ -340,7 +340,7 @@ msgstr "Impossible de patcher les fichiers temporaires\\n"
msgid "File %s is not being modified\\n"
msgstr "Le fichier %s n'est pas modifié.\\n"
-#: quilt/diff.in:378 quilt/refresh.in:184
+#: quilt/diff.in:378 quilt/refresh.in:188
msgid "Diff failed, aborting\\n"
msgstr "Le diff a échoué. Abandon.\\n"
@@ -961,7 +961,7 @@ msgstr "Le patch %s doit être rafraichi au préalable.\\n"
msgid "No patch removed\\n"
msgstr "Aucun patch retiré\\n"
-#: quilt/pop.in:267 quilt/scripts/patchfns.in:488
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:474
msgid "No patches applied\\n"
msgstr "Aucun patch n'est appliqué\\n"
@@ -1187,35 +1187,35 @@ msgstr ""
"--strip-trailing-whitespace\n"
"\tSupprime les espaces à la fin des lignes.\n"
-#: quilt/refresh.in:155
+#: quilt/refresh.in:159
msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
msgstr ""
"Impossible de rafraîchir des patchs avec -p%s. Veuillez spécifier -p0 ou -p1 "
"à la place.\\n"
-#: quilt/refresh.in:190
+#: quilt/refresh.in:194
msgid ""
"More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
msgstr ""
"Des fichiers plus récents modifient les mêmes fichiers que %s.\n"
"Forcez le rafraîchissement avec -f.\\n"
-#: quilt/refresh.in:196
+#: quilt/refresh.in:200
msgid ""
"Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
msgstr ""
"Impossible d'utiliser --strip-trailing-whitespace sur un patch dont\n"
"certains fichiers sont masqués.\\n"
-#: quilt/refresh.in:202
+#: quilt/refresh.in:206
msgid "Nothing in patch %s\\n"
msgstr "Le patch %s ne contient rien\\n"
-#: quilt/refresh.in:279
+#: quilt/refresh.in:284
msgid "Patch %s is unchanged\\n"
msgstr "Patch %s inchangé\\n"
-#: quilt/refresh.in:285
+#: quilt/refresh.in:290
msgid "Refreshed patch %s\\n"
msgstr "Patch %s rafraîchi\\n"
@@ -1307,23 +1307,23 @@ msgstr "Le fichier %s a disparu !\n"
msgid "Failed to rename %s to %s: %s\n"
msgstr "Impossible de renommer %s en %s : %s\n"
-#: quilt/scripts/patchfns.in:524
+#: quilt/scripts/patchfns.in:510
msgid "Patch %s is not in series\\n"
msgstr "Le patch %s n'est pas dans la série\\n"
-#: quilt/scripts/patchfns.in:552
+#: quilt/scripts/patchfns.in:538
msgid "Patch %s is not applied\\n"
msgstr "Le patch %s n'est pas appliqué\\n"
-#: quilt/scripts/patchfns.in:589
+#: quilt/scripts/patchfns.in:575
msgid "File series fully applied, ends at patch %s\\n"
msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n"
-#: quilt/scripts/patchfns.in:611
+#: quilt/scripts/patchfns.in:597
msgid "Patch %s does not exist\\n"
msgstr "Le patch %s n'existe pas\\n"
-#: quilt/scripts/patchfns.in:871
+#: quilt/scripts/patchfns.in:857
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 "
@@ -1335,7 +1335,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:956
+#: quilt/scripts/patchfns.in:942
msgid ""
"The working tree was created by an older version of quilt. Please run 'quilt "
"upgrade'.\\n"