diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:30 -0800 |
| commit | 83ac11fac4a71be40b6397763f685f49a39718be (patch) | |
| tree | cfb0c67a42d0b43b68634048e86045216dfc69c8 /builtin | |
| parent | Merge branch 'mk/diff-shortstat-dirstat-fix' (diff) | |
| parent | Add hint interactive cleaning (diff) | |
| download | tgif-83ac11fac4a71be40b6397763f685f49a39718be.tar.xz | |
Merge branch 'ja/clean-confirm-i18n'
The prompt string "remove?" used when "git clean -i" asks the user
if a path should be removed was localizable, but the code always
expects a substring of "yes" to tell it to go ahead. Always show
[y/N] as part of this prompt to hint that the answer is not (yet)
localized.
* ja/clean-confirm-i18n:
Add hint interactive cleaning
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clean.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 7e7fdcfe54..98c103fa8b 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -754,7 +754,8 @@ static int ask_each_cmd(void) /* Ctrl-D should stop removing files */ if (!eof) { qname = quote_path_relative(item->string, NULL, &buf); - printf(_("remove %s? "), qname); + /* TRANSLATORS: Make sure to keep [y/N] as is */ + printf(_("Remove %s [y/N]? "), qname); if (strbuf_getline(&confirm, stdin, '\n') != EOF) { strbuf_trim(&confirm); } else { |