summaryrefslogtreecommitdiff
path: root/builtin/clean.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-06 23:02:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-06 23:02:30 (GMT)
commit83ac11fac4a71be40b6397763f685f49a39718be (patch)
treecfb0c67a42d0b43b68634048e86045216dfc69c8 /builtin/clean.c
parentb6488fe191c3bff0dee39cfd2a7082dd52159c47 (diff)
parentd913022763b633e2694a556dbb07f74684b0ee92 (diff)
downloadgit-83ac11fac4a71be40b6397763f685f49a39718be.zip
git-83ac11fac4a71be40b6397763f685f49a39718be.tar.gz
git-83ac11fac4a71be40b6397763f685f49a39718be.tar.bz2
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/clean.c')
-rw-r--r--builtin/clean.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/clean.c b/builtin/clean.c
index 7e7fdcf..98c103f 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 {