diff options
| -rw-r--r-- | po/de.po | 18 | ||||
| -rw-r--r-- | po/fr.po | 18 | ||||
| -rw-r--r-- | po/ja.po | 18 | ||||
| -rw-r--r-- | po/quilt.pot | 10 | ||||
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/delete.in | 2 | ||||
| -rw-r--r-- | test/delete.test | 1 |
7 files changed, 40 insertions, 32 deletions
@@ -185,19 +185,19 @@ msgstr "Keine Patches in der series-Datei\\n" msgid "Patch %s is currently applied\\n" msgstr "Patch %s ist momentan angewandt\\n" -#: quilt/delete.in:107 quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" -msgstr "Konnte Patch %s nicht entfernen\\n" - -#: quilt/delete.in:115 +#: quilt/delete.in:113 msgid "Removed patch %s\\n" msgstr "Entferne Patch %s\\n" -#: quilt/delete.in:128 +#: quilt/delete.in:115 +msgid "Failed to remove patch %s\\n" +msgstr "Konnte Patch %s nicht entfernen\\n" + +#: quilt/delete.in:126 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "Konnte Datei %s nicht sichern\\n" -#: quilt/delete.in:135 +#: quilt/delete.in:133 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "Konnte Patch %s nicht entfernen\\n" @@ -610,7 +610,9 @@ msgstr "Text an Header von Patch %s angefügt\\n" #: quilt/import.in:22 msgid "" "Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" -msgstr "Verwendung: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] [patchdatei] ...\\n" +msgstr "" +"Verwendung: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] " +"[patchdatei] ...\\n" #: quilt/import.in:25 msgid "" @@ -186,19 +186,19 @@ msgstr "Aucun patch n'est appliqué\\n" msgid "Patch %s is currently applied\\n" msgstr "Le patch %s est actuellement appliqué\\n" -#: quilt/delete.in:107 quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" -msgstr "Impossible de retirer le patch %s\\n" - -#: quilt/delete.in:115 +#: quilt/delete.in:113 msgid "Removed patch %s\\n" msgstr "Patch %s retiré\\n" -#: quilt/delete.in:128 +#: quilt/delete.in:115 +msgid "Failed to remove patch %s\\n" +msgstr "Impossible de retirer le patch %s\\n" + +#: quilt/delete.in:126 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "Impossible de faire une copie de sécurité du fichier \\\"%s\\\"\\n" -#: quilt/delete.in:135 +#: quilt/delete.in:133 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "Impossible de retirer le patch \\\"%s\\\"\\n" @@ -615,7 +615,9 @@ msgstr "Texte ajouté à la fin de l'en-tête du patch %s\\n" #: quilt/import.in:22 msgid "" "Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" -msgstr "Usage : quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] fichier_de_patch ...\\n" +msgstr "" +"Usage : quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] " +"fichier_de_patch ...\\n" #: quilt/import.in:25 #, fuzzy @@ -182,19 +182,19 @@ msgstr "シリーズã«ç™»éŒ²ã•ã‚Œã¦ã„るパッãƒãŒã‚ã‚Šã¾ã›ã‚“\\n" msgid "Patch %s is currently applied\\n" msgstr "パッム%s ã¯ç¾åœ¨é©ç”¨ã•ã‚Œã¦ã„ã¾ã™\\n" -#: quilt/delete.in:107 quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" -msgstr "パッム%s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" - -#: quilt/delete.in:115 +#: quilt/delete.in:113 msgid "Removed patch %s\\n" msgstr "パッム%s を削除ã—ã¾ã—ãŸ\\n" -#: quilt/delete.in:128 +#: quilt/delete.in:115 +msgid "Failed to remove patch %s\\n" +msgstr "パッム%s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" + +#: quilt/delete.in:126 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "ファイル \\\"%s\\\" ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" -#: quilt/delete.in:135 +#: quilt/delete.in:133 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "パッム\\\"%s\\\" ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" @@ -592,7 +592,9 @@ msgstr "パッム%s ã®ãƒ˜ãƒƒãƒ€ã«è¿½åŠ ã—ã¾ã—ãŸ\\n" #: quilt/import.in:22 msgid "" "Usage: quilt import [-p num] [-n patch] [-f] [-d {o|a|n}] patchfile ...\\n" -msgstr "使ã„æ–¹: quilt import [-p num] [-n パッãƒ] [-f] [-d {o|a|n}] パッãƒãƒ•ã‚¡ã‚¤ãƒ« ...\\n" +msgstr "" +"使ã„æ–¹: quilt import [-p num] [-n パッãƒ] [-f] [-d {o|a|n}] パッãƒãƒ•ã‚¡ã‚¤" +"ル ...\\n" #: quilt/import.in:25 msgid "" diff --git a/po/quilt.pot b/po/quilt.pot index f8b83f9..7a82b53 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -125,19 +125,19 @@ msgstr "" msgid "Patch %s is currently applied\\n" msgstr "" -#: quilt/delete.in:107 quilt/delete.in:117 -msgid "Failed to remove patch %s\\n" +#: quilt/delete.in:113 +msgid "Removed patch %s\\n" msgstr "" #: quilt/delete.in:115 -msgid "Removed patch %s\\n" +msgid "Failed to remove patch %s\\n" msgstr "" -#: quilt/delete.in:128 +#: quilt/delete.in:126 msgid "Failed to backup patch file \\\"%s\\\"\\n" msgstr "" -#: quilt/delete.in:135 +#: quilt/delete.in:133 msgid "Failed to remove patch file \\\"%s\\\"\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 09d0c67..1d7560b 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 26 12:49:00 CET 2006 - agruen@suse.de + +- quilt/delete.in: Remove a superfluous message. + +------------------------------------------------------------------- Thu Jan 26 04:20:31 CET 2006 - agruen@suse.de - lib/backup-files.c: Stop using ftw and implement our own dir diff --git a/quilt/delete.in b/quilt/delete.in index 8710923..1cb2523 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -104,8 +104,6 @@ if is_applied "$patch"; then fi if ! quilt_command pop -fq then - printf $"Failed to remove patch %s\n" \ - "$(print_patch "$patch")" >&2 exit 1 fi fi diff --git a/test/delete.test b/test/delete.test index bbeb3e9..0ecf0f4 100644 --- a/test/delete.test +++ b/test/delete.test @@ -80,7 +80,6 @@ Test the delete command. $ quilt delete "test3" > Removing patch %{P}test3 > .pc/test3/dir: Permission denied - > Removing patch %{P}test3 failed $ chmod a+rx .pc/test3/dir |