From 24d62b8d779e287ed3a418e83aef1475d6720c37 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 22 Jul 2004 02:37:33 +0000 Subject: Tell the user to refresh patch which does not remove properly, not only to force with -f --- po/fr.po | 12 ++++++------ scripts/rpatch.in | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8786cee..e84f371 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: quilt 0.33\n" -"PO-Revision-Date: 2004-07-13 15:31-0700\n" +"PO-Revision-Date: 2004-07-21 19:40-0700\n" "Last-Translator: Martin Quinson \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -81,7 +81,7 @@ msgstr "Le patch %s n'est pas appliqu #: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229 #: ../quilt/files.in:76 ../quilt/fold.in:79 ../quilt/fork.in:65 -#: ../quilt/pop.in:184 ../quilt/push.in:182 ../quilt/push.in:220 +#: ../quilt/pop.in:184 ../quilt/push.in:182 ../quilt/push.in:221 #: ../quilt/refresh.in:143 ../quilt/remove.in:81 msgid "No patches applied\\n" msgstr "Aucun patch n'est appliqué\\n" @@ -560,11 +560,11 @@ msgstr "" msgid "No patch removed\\n" msgstr "Aucun patch retiré\\n" -#: ../quilt/pop.in:175 ../quilt/push.in:211 +#: ../quilt/pop.in:175 ../quilt/push.in:212 msgid "Interrupted by user\\n" msgstr "Interrompu par l'utilisateur\\n" -#: ../quilt/pop.in:191 ../quilt/push.in:222 +#: ../quilt/pop.in:191 ../quilt/push.in:223 msgid "Now at patch %s\\n" msgstr "Le patch %s est maintenant au sommet\\n" @@ -1009,8 +1009,8 @@ msgid "Usage: %s [-fRq] patchname\\n" msgstr "Usage: %s [-fRq] nom_de_patch\\n" #: ../scripts/rpatch.in:100 -msgid "Patch %s does not remove cleanly (enforce with -f)\\n" -msgstr "Le patch %s ne se retire pas proprement (forcez avec -f)\\n" +msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n" +msgstr "Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)\\n" #: ../scripts/rpatch.in:123 msgid "Removing patch %s\\n" diff --git a/scripts/rpatch.in b/scripts/rpatch.in index 6f859f7..7d179d3 100755 --- a/scripts/rpatch.in +++ b/scripts/rpatch.in @@ -97,7 +97,7 @@ check_for_pending_changes() if [ -s $remains ] then - printf $"Patch %s does not remove cleanly (enforce with -f)\n" \ + printf $"Patch %s does not remove cleanly (refresh it or enforce with -f)\n" \ "$(print_patch $patch)" >&2 status=1 fi -- cgit