From 1f821207c913836f2290978ebb047b491707f26c Mon Sep 17 00:00:00 2001 From: FG Date: Wed, 18 May 2022 10:37:31 +0200 Subject: [PATCH] Remove German from xkcd related commands (#2224) Signed-off-by: dotcs --- docs/commands/pwgen.md | 2 +- gopass.1 | 4 ++-- internal/action/commands.go | 2 +- internal/action/pwgen/commands.go | 2 +- zsh.completion | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/commands/pwgen.md b/docs/commands/pwgen.md index 2012c33d14..cc6790bae3 100644 --- a/docs/commands/pwgen.md +++ b/docs/commands/pwgen.md @@ -17,4 +17,4 @@ Flag | Aliases | Description `--one-per-line` | `-1` | Print one password per line. `--xkcd` | `-x` | Use multiple random english words combined to a password. `--sep` | `--xs` | Word separator for multi-word passwords. -`--lang` | `--xl` | Language to generate password from. Currently only supports english (en, default) and german (de). +`--lang` | `--xl` | Language to generate password from. Currently only supports english (en, default). diff --git a/gopass.1 b/gopass.1 index 48b6fe74e5..63f53f18fe 100644 --- a/gopass.1 +++ b/gopass.1 @@ -224,7 +224,7 @@ Choose a password generator, use one of: cryptic, memorable, xkcd or external. D \fB\-\-lang\fR, \fB\-\-xkcdlang\fR, \fB\-\-xl\fR, -Language to generate password from, currently de (german) and en (english, default) are supported +Language to generate password from, currently only en (english, default) is supported .TP \fB\-\-print\fR, \fB\-p\fR, @@ -402,7 +402,7 @@ Do not include characters that could be easily confused with each other, like '1 \fB\-\-lang\fR, \fB\-\-xkcdlang\fR, \fB\-\-xl\fR, -Language to generate password from, currently de (german) and en (english, default) are supported +Language to generate password from, currently only en (english, default) is supported .TP \fB\-\-no-capitalize\fR, \fB\-A\fR, diff --git a/internal/action/commands.go b/internal/action/commands.go index f421b947c0..77b83bb3b0 100644 --- a/internal/action/commands.go +++ b/internal/action/commands.go @@ -429,7 +429,7 @@ func (s *Action) GetCommands() []*cli.Command { &cli.StringFlag{ Name: "lang", Aliases: []string{"xkcdlang", "xl"}, - Usage: "Language to generate password from, currently de (german) and en (english, default) are supported", + Usage: "Language to generate password from, currently only en (english, default) is supported", Value: "en", }, }, diff --git a/internal/action/pwgen/commands.go b/internal/action/pwgen/commands.go index 4a30cec8bd..af976985a5 100644 --- a/internal/action/pwgen/commands.go +++ b/internal/action/pwgen/commands.go @@ -52,7 +52,7 @@ func GetCommands() []*cli.Command { &cli.StringFlag{ Name: "lang", Aliases: []string{"xkcdlang", "xl"}, - Usage: "Language to generate password from, currently de (german) and en (english, default) are supported", + Usage: "Language to generate password from, currently only en (english, default) is supported", Value: "en", }, }, diff --git a/zsh.completion b/zsh.completion index 52d2a1dc05..86f6966368 100644 --- a/zsh.completion +++ b/zsh.completion @@ -115,7 +115,7 @@ WARNING: This will update the secret content to the latest format. This might be ;; generate) - _arguments : "--clip[Copy the generated password to the clipboard]" "--print[Print the generated password to the terminal]" "--force[Force to overwrite existing password]" "--edit[Open secret for editing after generating a password]" "--symbols[Use symbols in the password]" "--generator[Choose a password generator, use one of: cryptic, memorable, xkcd or external. Default: cryptic]" "--strict[Require strict character class rules]" "--sep[Word separator for generated passwords. If no separator is specified, the words are combined without spaces/separator and the first character of words is capitalised.]" "--lang[Language to generate password from, currently de (german) and en (english, default) are supported]" + _arguments : "--clip[Copy the generated password to the clipboard]" "--print[Print the generated password to the terminal]" "--force[Force to overwrite existing password]" "--edit[Open secret for editing after generating a password]" "--symbols[Use symbols in the password]" "--generator[Choose a password generator, use one of: cryptic, memorable, xkcd or external. Default: cryptic]" "--strict[Require strict character class rules]" "--sep[Word separator for generated passwords. If no separator is specified, the words are combined without spaces/separator and the first character of words is capitalised.]" "--lang[Language to generate password from, currently only en (english, default) is supported]" _gopass_complete_folders _gopass_complete_passwords ;; @@ -186,7 +186,7 @@ WARNING: This will update the secret content to the latest format. This might be ;; pwgen) - _arguments : "--no-numerals[Do not include numerals in the generated passwords.]" "--no-capitalize[Do not include capital letter in the generated passwords.]" "--ambiguous[Do not include characters that could be easily confused with each other, like '1' and 'l' or '0' and 'O']" "--symbols[Include at least one symbol in the password.]" "--one-per-line[Print one password per line]" "--xkcd[Use multiple random english words combined to a password. By default, space is used as separator and all words are lowercase]" "--sep[Word separator for generated xkcd style password. If no separator is specified, the words are combined without spaces/separator and the first character of words is capitalised. This flag implies -xkcd]" "--lang[Language to generate password from, currently de (german) and en (english, default) are supported]" + _arguments : "--no-numerals[Do not include numerals in the generated passwords.]" "--no-capitalize[Do not include capital letter in the generated passwords.]" "--ambiguous[Do not include characters that could be easily confused with each other, like '1' and 'l' or '0' and 'O']" "--symbols[Include at least one symbol in the password.]" "--one-per-line[Print one password per line]" "--xkcd[Use multiple random english words combined to a password. By default, space is used as separator and all words are lowercase]" "--sep[Word separator for generated xkcd style password. If no separator is specified, the words are combined without spaces/separator and the first character of words is capitalised. This flag implies -xkcd]" "--lang[Language to generate password from, currently only en (english, default) is supported]" ;;