diff options
-rw-r--r-- | po/de.po | 14 | ||||
-rw-r--r-- | po/fr.po | 14 | ||||
-rw-r--r-- | po/ja.po | 14 | ||||
-rw-r--r-- | po/quilt.pot | 12 | ||||
-rw-r--r-- | quilt.changes | 6 | ||||
-rw-r--r-- | quilt/diff.in | 2 | ||||
-rw-r--r-- | quilt/refresh.in | 2 |
7 files changed, 38 insertions, 26 deletions
@@ -205,10 +205,11 @@ msgid "Failed to remove patch file %s\\n" msgstr "Konnte Patch %s nicht entfernen\\n" #: quilt/diff.in:24 +#, fuzzy msgid "" -"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " -"[--color] [file ...]\\n" +"Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" +"R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " +"[--sort] [--color] [file ...]\\n" msgstr "" "Verwendung: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-" "R] [-P patch] [--snapshot] [--diff=programm] [--no-timestamps] [--no-index] " @@ -1068,10 +1069,11 @@ msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n" #: quilt/refresh.in:22 +#, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--" -"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] " -"[patch]\\n" +"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-" +"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-" +"whitespace] [patch]\\n" msgstr "" "Verwendung: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-" "timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-" @@ -205,10 +205,11 @@ msgid "Failed to remove patch file %s\\n" msgstr "Impossible de retirer le patch %s\\n" #: quilt/diff.in:24 +#, fuzzy msgid "" -"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " -"[--color] [file ...]\\n" +"Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" +"R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " +"[--sort] [--color] [file ...]\\n" msgstr "" "Usage : quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-" "P patch] [--snapshot] [--diff=utilitaire] [--no-timestamps] [--no-index] [--" @@ -1088,10 +1089,11 @@ msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n" #: quilt/refresh.in:22 +#, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--" -"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] " -"[patch]\\n" +"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-" +"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-" +"whitespace] [patch]\\n" msgstr "" "Usage : quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--" "no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] " @@ -202,10 +202,11 @@ msgid "Failed to remove patch file %s\\n" msgstr "パッム%s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ\\n" #: quilt/diff.in:24 +#, fuzzy msgid "" -"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " -"[--color] [file ...]\\n" +"Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" +"R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " +"[--sort] [--color] [file ...]\\n" msgstr "" "使ã„æ–¹: quilt diff [-p n] [-u|-U æ•°|-c|-C æ•°] [--combine パッãƒ|-z] [-R] [-P " "パッãƒ] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--" @@ -1049,10 +1050,11 @@ msgid "The topmost patch %s needs to be refreshed first.\\n" msgstr "最上ä½ãƒ‘ッãƒã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒæœ€åˆã«å¿…è¦ã§ã™ã€‚\\n" #: quilt/refresh.in:22 +#, fuzzy msgid "" -"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--" -"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] " -"[patch]\\n" +"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-" +"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-" +"whitespace] [patch]\\n" msgstr "" "使ã„æ–¹: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--" "no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] " diff --git a/po/quilt.pot b/po/quilt.pot index 342dde4..01a371d 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -145,9 +145,9 @@ msgstr "" #: quilt/diff.in:24 msgid "" -"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P " -"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] " -"[--color] [file ...]\\n" +"Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-" +"R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] " +"[--sort] [--color] [file ...]\\n" msgstr "" #: quilt/diff.in:28 @@ -733,9 +733,9 @@ msgstr "" #: quilt/refresh.in:22 msgid "" -"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--" -"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] " -"[patch]\\n" +"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-" +"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-" +"whitespace] [patch]\\n" msgstr "" #: quilt/refresh.in:26 diff --git a/quilt.changes b/quilt.changes index 2b67606..17b6533 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 19 17:42:45 CEST 2006 - khali@linux-fr.org + +- quilt/diff.in, quilt/refresh.in: Update usage line to mention + "-p ab". + +------------------------------------------------------------------- Tue Sep 19 17:06:36 CEST 2006 - khali@linux-fr.org - quilt/scripts/patchfns.in: Drop support for "-pab" in series diff --git a/quilt/diff.in b/quilt/diff.in index dad2da0..2829802 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -21,7 +21,7 @@ setup_colors usage() { - printf $"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color] [file ...]\n" + printf $"Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] [--color] [file ...]\n" if [ x$1 = x-h ] then diff --git a/quilt/refresh.in b/quilt/refresh.in index 70af70d..8788161 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -19,7 +19,7 @@ fi usage() { - printf $"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\n" + printf $"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\n" if [ x$1 = x-h ] then |