From 5059e9de98f1a7f2a4eef12c086a5068f8cdff34 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Mon, 27 Jun 2005 07:55:49 +0000 Subject: - quilt diff: Fix -z option if QUILT_PATCHES is an absolute path. --- po/fr.po | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'po/fr.po') diff --git a/po/fr.po b/po/fr.po index 8a509b3..5d0452c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -282,35 +282,23 @@ msgstr "" msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqué avant %s\\n." -#: ../quilt/diff.in:342 -msgid "Cannot change into directory %s\\n" -msgstr "Impossible d'entrer dans le répertoire %s\\n" - -#: ../quilt/diff.in:349 ../quilt/pop.in:114 +#: ../quilt/diff.in:343 ../quilt/pop.in:114 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le répertoire temporaire\\n" -#: ../quilt/diff.in:360 -msgid "Cannot change to temporary directory\\n" -msgstr "Impossible d'entrer dans le répertoire temporaire\\n" - -#: ../quilt/diff.in:379 ../quilt/pop.in:138 +#: ../quilt/diff.in:367 ../quilt/pop.in:138 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: ../quilt/diff.in:385 -msgid "Cannot change to source directory\\n" -msgstr "Impossible d'entrer dans le répertoire source\\n" - -#: ../quilt/diff.in:403 +#: ../quilt/diff.in:386 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifié.\\n" -#: ../quilt/diff.in:423 ../quilt/refresh.in:201 +#: ../quilt/diff.in:406 ../quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "Le diff a échoué. Abandon.\\n" -#: ../quilt/diff.in:430 +#: ../quilt/diff.in:413 msgid "More recent patches modify files in patch %s\\n" msgstr "Un patch plus recent modifie des fichiers communs à %s.\\n" @@ -1161,6 +1149,15 @@ msgstr "" "Votre arbre a été créé par une vieille version de quilt. Veuillez \n" "utiliser « quilt upgrade ».\\n" +#~ msgid "Cannot change into directory %s\\n" +#~ msgstr "Impossible d'entrer dans le répertoire %s\\n" + +#~ msgid "Cannot change to temporary directory\\n" +#~ msgstr "Impossible d'entrer dans le répertoire temporaire\\n" + +#~ msgid "Cannot change to source directory\\n" +#~ msgstr "Impossible d'entrer dans le répertoire source\\n" + #~ msgid "" #~ "\n" #~ "Fork the topmost patch. If new_name is missing, the name of the\n" -- cgit