help: add space after autocorrect prompt
PATCH 1/1 help: add space after autocorrect prompt
From: Kashav Madan <[email protected]>
---
help: add space after autocorrect prompt
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1166%2Fkashav%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1166/kashav/master-v1
Pull-Request: https://github.com/git/git/pull/1166
help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
help.c +1 -1
@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)else if (autocorrect ==AUTOCORRECT_PROMPT ) {char *answer;struct strbuf msg =STRBUF_INIT ; -strbuf_addf (&msg,_ ("Run '%s' instead? (y/N)" ), assumed); +strbuf_addf (&msg,_ ("Run '%s' instead? (y/N) " ), assumed); answer =git_prompt (msg.buf,PROMPT_ECHO );strbuf_release (&msg); if (!(starts_with(answer, "y") ||
base-commit: e773545c7fe7eca21b134847f4fc2cbc9547fa14
Signature · 1 line
gitgitgadget
Quoted 5 lines · kashav madan via GitGitGadget
From: Kashav Madan <[email protected]>
Signed-off-by Kashav Madan <[email protected]>---
help: add space after autocorrect prompt
The patch looks OK-ish, but let's make sure. We will find what we should write in the log message while doing so.
If you look at the output from
$ git grep -C2 git_prompt \*.c
you'll notice that existing message given to git_prompt look like these:
yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO);
yesno = git_prompt(_("Do you want me to do it for you "
"[Y/n]? "), PROMPT_ECHO);
strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed);
answer = git_prompt(msg.buf, PROMPT_ECHO);The last one is what you are touching in this patch.
There is another one in credential.c that asks not just a single yes/no answer, so it is justifiably different from all the others, but the one you noticed is different from what we see above in three points:
- It does not leave a SP before where the end-user input goes;
- It append (y/N) _after_ question mark;
- It encloses the choices in (), not [].
You are only addressing the first inconsistency, leaving the other two still there.
So, perhaps you would want to explain the change this way
Subject: [PATCH] help: update auto-correction prompt to look more like others
There are three callsite of git_prompt() helper function to ask a "yes/no" question to the end user, but one of them in help.c that asks if the suggested auto-correction is OK, which is given when the user makes a possible typo in a Git subcommand name, is formatted differently from others. Update the format string to make the prompt string look more consistent.
And you'd want to update the string more like so:
Review
Quoted 2 lines
(quoted diff) +1
-1- strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed); + strbuf_addf(&msg, _("Run '%s' instead [y/N]? "), assumed);
to fix all three points, not just one.
Thanks.
PATCH v2 1/1 help: make auto-correction prompt more consistent
In reply to kashav madan via GitGitGadgetFrom: Kashav Madan <[email protected]>
There are three callsites of git_prompt() that ask the user for "yes/no" confirmation, but the one in help.c, used for auto-correction, is formatted differently from the others. This updates that format string to make the prompt look more consistent.
---
help: make auto-correction prompt more consistent
Changes since v1:
* Appended (y/N) after the question mark
* Enclosed the choices in (), not []
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1166%2Fkashav%2Fmaster-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1166/kashav/master-v2
Pull-Request: https://github.com/git/git/pull/1166
Range-diff vs v1:
1: 5df696252dd ! 1: e6dc616c964 help: add space after autocorrect prompt
@@ Metadata
Author: Kashav Madan <[email protected]>
## Commit message ##
- help: add space after autocorrect prompt
+ help: make auto-correction prompt more consistent
+
+ There are three callsites of git_prompt() that ask the user for "yes/no"
+ confirmation, but the one in help.c, used for auto-correction, is
+ formatted differently from the others. This updates that format string
+ to make the prompt look more consistent.
@@ help.c: const char *help_unknown_cmd(const char *cmd)
char *answer;
struct strbuf msg = STRBUF_INIT;
- strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed);
-+ strbuf_addf(&msg, _("Run '%s' instead? (y/N) "), assumed);
++ strbuf_addf(&msg, _("Run '%s' instead [y/N]? "), assumed);
answer = git_prompt(msg.buf, PROMPT_ECHO); strbuf_release(&msg);
if (!(starts_with(answer, "y") ||
help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
help.c +1 -1
@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)else if (autocorrect ==AUTOCORRECT_PROMPT ) {char *answer;struct strbuf msg =STRBUF_INIT ; -strbuf_addf (&msg,_ ("Run '%s' instead? (y/N)" ), assumed); +strbuf_addf (&msg,_ ("Run '%s' instead [y/N]? " ), assumed); answer =git_prompt (msg.buf,PROMPT_ECHO );strbuf_release (&msg); if (!(starts_with(answer, "y") ||
base-commit: e773545c7fe7eca21b134847f4fc2cbc9547fa14
Signature · 1 line
gitgitgadget
Re: [PATCH v2] help: make auto-correction prompt more consistent
Quoted 6 lines · kashav madan via GitGitGadget
From: Kashav Madan <[email protected]>
There are three callsites of
git_prompt()that ask the user for "yes/no" confirmation, but the one inhelp.c, used for auto-correction, is formatted differently from the others. This updates that format string to make the prompt look more consistent.
Looks much better.
The last sentence should be phrased as if we were giving an order to the codebase to "become like so", to match the style, in which our log messages are typically written (look for "imperative-mood" in Documentation/SubmittingPatches).
Thanks.
Quoted 15 lines
help.c +1
-1@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)else if (autocorrect ==AUTOCORRECT_PROMPT ) {char *answer;struct strbuf msg =STRBUF_INIT ; -strbuf_addf (&msg,_ ("Run '%s' instead? (y/N)" ), assumed); +strbuf_addf (&msg,_ ("Run '%s' instead [y/N]? " ), assumed); answer =git_prompt (msg.buf,PROMPT_ECHO );strbuf_release (&msg); if (!(starts_with(answer, "y") ||base-commit:
e773545c7fe7eca21b134847f4fc2cbc9547fa14
Quoted 28 lines · Junio C Hamano
Quoted 5 lines · kashav madan via GitGitGadget
From: Kashav Madan <[email protected]>
Signed-off-by Kashav Madan <[email protected]>---
help: add space after autocorrect promptThe patch looks OK-ish, but let's make sure. We will find what we should write in the log message while doing so.
If you look at the output from
$ git grep -C2 git_prompt \*.cyou'll notice that existing message given to
git_promptlook like these:yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO); yesno = git_prompt(_("Do you want me to do it for you " "[Y/n]? "), PROMPT_ECHO); strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed); answer = git_prompt(msg.buf, PROMPT_ECHO);The last one is what you are touching in this patch.
Quoted 7 lines
There is another one in
credential.cthat asks not just a single yes/no answer, so it is justifiably different from all the others, but the one you noticed is different from what we see above in three points:- It does not leave a SP before where the end-user input goes;
- It append (y/N) _after_ question mark;
I actually prefer this one;
Run 'status' instead? [y/N]
sounds better than
Run 'status' instead [y/N]?
but that's not a strong opinion.
Quoted 17 lines · Johannes Altmanninger
Quoted 11 lines · Junio C Hamano
you'll notice that existing message given to
git_promptlook like these:yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO); yesno = git_prompt(_("Do you want me to do it for you " "[Y/n]? "), PROMPT_ECHO); strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed); answer = git_prompt(msg.buf, PROMPT_ECHO);Quoted 2 lines
- It does not leave a SP before where the end-user input goes;
- It append (y/N) _after_ question mark;I actually prefer this one;
Quoted 7 lines
Run 'status' instead? [y/N]
sounds better than
Run 'status' instead [y/N]?
but that's not a strong opinion.
For what it's worth, I also find "Run 'status' instead? [y/N]" more sensible, and (at least based upon memory) it also seems to be the typical way it's done in other software (including software I've written). That said, it's a very minor point which needn't hold up the patch if kashav isn't interested in redoing this as a single patch which normalizes all callers to use a common format.
v3 cover normalize format of yes/no prompts
In reply to kashav madan via GitGitGadgetChanges since v2:
* Moves question mark before the yes/no choices, to be more consistent with other tools.
* Normalizes format string for bisect--helper, clean, add-patch.
* Updates localized versions of all changed strings, which was missed in v2.
Kashav Madan (4):
bisect--helper: normalize format string of yes/no prompts
clean: normalize format string of yes/no prompt
add-patch: normalize format string of yes/no prompt
help: make auto-correction prompt more consistent
add-patch.c | 4 ++-- builtin/bisect--helper.c | 6 +++--- builtin/clean.c | 2 +- help.c | 2 +- po/bg.po | 14 +++++++------- po/ca.po | 20 ++++++++++---------- po/de.po | 20 ++++++++++---------- po/el.po | 14 +++++++------- po/es.po | 22 +++++++++++----------- po/fr.po | 20 ++++++++++---------- po/git.pot | 10 +++++----- po/id.po | 18 +++++++++--------- po/it.po | 14 +++++++------- po/ko.po | 16 ++++++++-------- po/pl.po | 20 ++++++++++---------- po/pt_PT.po | 16 ++++++++-------- po/ru.po | 16 ++++++++-------- po/sv.po | 22 +++++++++++----------- po/tr.po | 20 ++++++++++---------- po/vi.po | 20 ++++++++++---------- po/zh_CN.po | 20 ++++++++++---------- po/zh_TW.po | 20 ++++++++++---------- 22 files changed, 168 insertions(+), 168 deletions(-)
base-commit: e773545c7fe7eca21b134847f4fc2cbc9547fa14
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1166%2Fkashav%2Fmaster-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1166/kashav/master-v3
Pull-Request: https://github.com/git/git/pull/1166
Range-diff vs v2:
1: e6dc616c964 < -: ----------- help: make auto-correction prompt more consistent -: ----------- > 1: e7672e70cc9 bisect--helper: normalize format string of yes/no prompts -: ----------- > 2: 0c81a14247f clean: normalize format string of yes/no prompt -: ----------- > 3: 4a70e569f8a add-patch: normalize format string of yes/no prompt -: ----------- > 4: fc913ef31fb help: make auto-correction prompt more consistent
Signature · 1 line
gitgitgadget
PATCH v3 2/4 clean: normalize format string of yes/no prompt
From: Kashav Madan <[email protected]>
Move the question mark in the prompt before the choices to be more consistent with other similar prompts.
--- builtin/clean.c | 2 +- po/bg.po | 2 +- po/ca.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 2 +- po/es.po | 4 ++-- po/fr.po | 4 ++-- po/git.pot | 2 +- po/id.po | 4 ++-- po/it.po | 4 ++-- po/ko.po | 4 ++-- po/pl.po | 4 ++-- po/pt_PT.po | 4 ++-- po/ru.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 4 ++-- po/vi.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 19 files changed, 34 insertions(+), 34 deletions(-)
builtin/clean.c +1 -1
@@ -752,7 +752,7 @@ static int ask_each_cmd(void)if (!eof) { qname =quote_path (item->string,NULL , &buf,0 );/* TRANSLATORS: Make sure to keep [y/N] as is */ -printf (_ ("Remove %s [y/N]? " ), qname); +printf (_ ("Remove %s? [y/N] " ), qname);if (git_read_line_interactively (&confirm) ==EOF ) {putchar ('\n' ); eof =1 ;
po/bg.po +1 -1
@@ -13487,7 +13487,7 @@ msgstr "Избиране на обекти за изтриване" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " +msgid "Remove %s? [y/N] " msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ" #: builtin/clean.c:786
po/ca.po +2 -2
@@ -13211,8 +13211,8 @@ msgstr "Selecciona els ítems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Voleu eliminar %s [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "Voleu eliminar %s? [y/N] " #: builtin/clean.c:786 msgid ""
po/de.po +2 -2
@@ -13274,8 +13274,8 @@ msgstr "Wählen Sie Einträge zum Löschen" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "'%s' löschen [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "'%s' löschen? [y/N] " #: builtin/clean.c:786 msgid ""
po/el.po +1 -1
@@ -9560,7 +9560,7 @@ msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:760 #, c-format -msgid "Remove %s [y/N]? " +msgid "Remove %s? [y/N] " msgstr "" #: builtin/clean.c:785 git-add--interactive.perl:1717
po/es.po +2 -2
@@ -13081,8 +13081,8 @@ msgstr "Seleccionar objetos para borrar" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "¿Borrar %s [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "¿Borrar %s? [y/N] " #: builtin/clean.c:786 msgid ""
po/fr.po +2 -2
@@ -13282,8 +13282,8 @@ msgstr "Sélectionner les éléments à supprimer" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Supprimer %s [y/N] ? " +msgid "Remove %s? [y/N] " +msgstr "Supprimer %s ? [y/N] " #: builtin/clean.c:786 msgid ""
po/git.pot +1 -1
@@ -12087,7 +12087,7 @@ msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " +msgid "Remove %s? [y/N] " msgstr "" #: builtin/clean.c:786
po/id.po +2 -2
@@ -12525,8 +12525,8 @@ msgstr "Pilih item untuk dihapus" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Hapus %s [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "Hapus %s? [y/N] " #: builtin/clean.c:786 msgid ""
po/it.po +2 -2
@@ -12508,8 +12508,8 @@ msgstr "Seleziona gli elementi da eliminare" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:758 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Eliminare %s [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "Eliminare %s? [y/N] " #: builtin/clean.c:789 msgid ""
po/ko.po +2 -2
@@ -7179,8 +7179,8 @@ msgstr "삭제할 항목을 선택하십시오" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:763 #, c-format -msgid "Remove %s [y/N]? " -msgstr "%s 제거합니까 [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "%s 제거합니까? [y/N] " #: builtin/clean.c:788 git-add--interactive.perl:1717 #, c-format
po/pl.po +2 -2
@@ -13061,8 +13061,8 @@ msgstr "Wybierz elementy do skasowania" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Usunąć %s [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "Usunąć %s? [y/N] " #: builtin/clean.c:786 msgid ""
po/pt_PT.po +2 -2
@@ -12623,8 +12623,8 @@ msgstr "Selecione itens para eliminar" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Remover %s [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "Remover %s? [y/N] " #: builtin/clean.c:786 msgid ""
po/ru.po +2 -2
@@ -11466,8 +11466,8 @@ msgstr "Укажите элементы для удаления" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:758 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Удалить %s [y - да/N - нет]? " +msgid "Remove %s? [y/N] " +msgstr "Удалить %s? [y - да/N - нет] " #: builtin/clean.c:789 msgid ""
po/sv.po +2 -2
@@ -12981,8 +12981,8 @@ msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Ta bort %s [Y=ja / N=nej]? " +msgid "Remove %s? [y/N] " +msgstr "Ta bort %s? [Y=ja / N=nej] " #: builtin/clean.c:786 msgid ""
po/tr.po +2 -2
@@ -13040,8 +13040,8 @@ msgstr "Silinecek ögeleri seçin" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "%s kaldırılsın mı [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "%s kaldırılsın mı? [y/N] " #: builtin/clean.c:786 msgid ""
po/vi.po +2 -2
@@ -13037,8 +13037,8 @@ msgstr "Chọn mục muốn xóa" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "Xóa bỏ “%s” [y/N]? " +msgid "Remove %s? [y/N] " +msgstr "Xóa bỏ “%s”? [y/N] " #: builtin/clean.c:786 msgid ""
po/zh_CN.po +2 -2
@@ -12881,8 +12881,8 @@ msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "删除 %s [y/N]？" +msgid "Remove %s? [y/N] " +msgstr "删除 %s? [y/N] " #: builtin/clean.c:786 msgid ""
po/zh_TW.po +2 -2
@@ -12735,8 +12735,8 @@ msgstr "選擇要刪除的條目" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:755 #, c-format -msgid "Remove %s [y/N]? " -msgstr "移除 %s [y/N]？ " +msgid "Remove %s? [y/N] " +msgstr "移除 %s? [y/N] " #: builtin/clean.c:786 msgid ""
Signature · 1 line
gitgitgadget
PATCH v3 1/4 bisect--helper: normalize format string of yes/no prompts
In reply to kashav madan via GitGitGadgetFrom: Kashav Madan <[email protected]>
Both callers of git_prompt in bisect--helper.c ask the user for yes/no confirmation. They both place the question mark after the choices, however this is inconsistent with how most UNIX-y tools do it. Update the format string to exclude the choices from the question.
--- builtin/bisect--helper.c | 6 +++--- po/bg.po | 6 +++--- po/ca.po | 8 ++++---- po/de.po | 8 ++++---- po/el.po | 8 ++++---- po/es.po | 8 ++++---- po/fr.po | 8 ++++---- po/git.pot | 4 ++-- po/id.po | 8 ++++---- po/it.po | 6 +++--- po/ko.po | 8 ++++---- po/pl.po | 8 ++++---- po/pt_PT.po | 8 ++++---- po/ru.po | 8 ++++---- po/sv.po | 8 ++++---- po/tr.po | 8 ++++---- po/vi.po | 8 ++++---- po/zh_CN.po | 8 ++++---- po/zh_TW.po | 8 ++++---- 19 files changed, 71 insertions(+), 71 deletions(-)
builtin/bisect--helper.c +3 -3
@@ -370,7 +370,7 @@ static int decide_next(const struct bisect_terms *terms,* translation. The program will only accept English input * at this point. */ - yesno =git_prompt (_ ("Are you sure [Y/n]? " ),PROMPT_ECHO ); + yesno =git_prompt (_ ("Are you sure? [Y/n] " ),PROMPT_ECHO );if (starts_with (yesno,"N" ) ||starts_with (yesno,"n" ))return -1 ;return 0 ;
@@ -838,8 +838,8 @@ static int bisect_autostart(struct bisect_terms *terms)* translation. The program will only accept English input * at this point. */ - yesno =git_prompt (_ ("Do you want me to do it for you " -"[Y/n]? " ),PROMPT_ECHO ); + yesno =git_prompt (_ ("Do you want me to do it for you? " +"[Y/n] " ),PROMPT_ECHO ); res =tolower (*yesno) =='n' ?-1 :bisect_start (terms, empty_strvec,0 );
po/bg.po +3 -3
@@ -11633,7 +11633,7 @@ msgstr "двоично търсене само по „%s“ подаване." #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " +msgid "Are you sure? [Y/n] " msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не" #: builtin/bisect--helper.c:434
@@ -11716,8 +11716,8 @@ msgstr "Започнете като изпълните командата „git #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не" +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/ca.po +4 -4
@@ -11355,8 +11355,8 @@ msgstr "bisecant amb només una comissió %s" #. translation. The program will only accept English input #. at this point. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "N'esteu segur [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "N'esteu segur? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11435,8 +11435,8 @@ msgstr "Cal començar per «git bisect start»\n" #. translation. The program will only accept English input #. at this point. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Voleu que ho faci per vostè [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Voleu que ho faci per vostè? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/de.po +4 -4
@@ -11429,8 +11429,8 @@ msgstr "binäre Suche nur mit einem %s Commit" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "Sind Sie sicher [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "Sind Sie sicher? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11511,8 +11511,8 @@ msgstr "Sie müssen mit \"git bisect start\" beginnen\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Wollen Sie, dass ich es für Sie mache? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/el.po +4 -4
@@ -8202,7 +8202,7 @@ msgstr "" #. at this point. #. #: builtin/bisect--helper.c:329 -msgid "Are you sure [Y/n]? " +msgid "Are you sure? [Y/n] " msgstr "Επιβεβαιώνετε [Y/n]; " #: builtin/bisect--helper.c:376
@@ -19779,7 +19779,7 @@ msgstr "Χρειάζεται να αρχίσετε με \"git bisect start\"" #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " msgstr "" #: git-bisect.sh:101
@@ -21272,8 +21272,8 @@ msgstr "" #. TRANSLATORS: please keep [y/N] as is. #: git-send-email.perl:825 #, perl-format -msgid "Are you sure you want to use <%s> [y/N]? " -msgstr "Επιβεβαιώνετε πως θέλετε να χρησιμοποιήσετε <%s> [y/N]? " +msgid "Are you sure you want to use <%s>? [y/N] " +msgstr "Επιβεβαιώνετε πως θέλετε να χρησιμοποιήσετε <%s>? [y/N] " #: git-send-email.perl:880 msgid ""
po/es.po +4 -4
@@ -11267,8 +11267,8 @@ msgstr "haciendo bisect solo con un commit %s" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "¿Estás seguro [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "¿Estás seguro? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11347,8 +11347,8 @@ msgstr "Debes iniciar con \"git bisect start\"\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "¿Quieres que lo haga por ti [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "¿Quieres que lo haga por ti? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/fr.po +4 -4
@@ -11445,8 +11445,8 @@ msgstr "bissection avec seulement un commit %s" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "Confirmez-vous [Y/n] ? " +msgid "Are you sure? [Y/n] " +msgstr "Confirmez-vous ? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11526,8 +11526,8 @@ msgstr "Vous devez démarrer avec \"git bisect start\"\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Souhaitez-vous que je le fasse pour vous ? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/git.pot +2 -2
@@ -10385,7 +10385,7 @@ msgstr "" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " +msgid "Are you sure? [Y/n] " msgstr "" #: builtin/bisect--helper.c:434
@@ -10460,7 +10460,7 @@ msgstr "" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " msgstr "" #: builtin/bisect--helper.c:859
po/id.po +4 -4
@@ -10734,8 +10734,8 @@ msgstr "membagi dua hanya dengan sebuah komit %s" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "Anda yakin [Y/n]?" +msgid "Are you sure? [Y/n] " +msgstr "Anda yakin? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -10813,8 +10813,8 @@ msgstr "Anda perlu memulai dengan \"git bisect start\"\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Anda ingin saya melakukannya untuk Anda [Y/n]" +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Anda ingin saya melakukannya untuk Anda [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/it.po +3 -3
@@ -10682,7 +10682,7 @@ msgstr "eseguo la bisezione solo con un commit %s" #. at this point. #. #: builtin/bisect--helper.c:370 -msgid "Are you sure [Y/n]? " +msgid "Are you sure? [Y/n] " msgstr "Sei sicuro? [Y/n] " #: builtin/bisect--helper.c:431
@@ -10762,8 +10762,8 @@ msgstr "Devi iniziare con \"git bisect start\"\n" #. at this point. #. #: builtin/bisect--helper.c:838 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Vuoi che me ne occupi io [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Vuoi che me ne occupi io? [Y/n] " #: builtin/bisect--helper.c:866 msgid "perform 'git bisect next'"
po/ko.po +4 -4
@@ -15994,8 +15994,8 @@ msgstr "\"git bisect start\" 명령으로 시작해야 합니다" #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "지금 하시겠습니까 [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "지금 하시겠습니까? [Y/n] " #: git-bisect.sh:121 #, sh-format
@@ -16061,8 +16061,8 @@ msgstr "경고: 하나의 $TERM_BAD 커밋에 대해서만 이등분." #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:312 -msgid "Are you sure [Y/n]? " -msgstr "확실합니까 [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "확실합니까? [Y/n] " #: git-bisect.sh:324 #, sh-format
po/pl.po +4 -4
@@ -11238,8 +11238,8 @@ msgstr "przeszukiwanie tylko z zapisem %s" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "Czy na pewno [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "Czy na pewno? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11319,8 +11319,8 @@ msgstr "Musisz rozpocząć przez „git bisect start”\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Chcesz, żeby to teraz zrobić [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Chcesz, żeby to teraz zrobić? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/pt_PT.po +4 -4
@@ -10900,8 +10900,8 @@ msgstr "bissetando apenas com uma memória %s" #. at this point. #. #: builtin/bisect--helper.c:358 -msgid "Are you sure [Y/n]? " -msgstr "Tem a certeza [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "Tem a certeza? [Y/n] " #: builtin/bisect--helper.c:419 msgid "no terms defined"
@@ -10977,8 +10977,8 @@ msgstr "Deves começar com \"git bisect start\"\n" #. at this point. #. #: builtin/bisect--helper.c:826 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Quer que seja eu a fazer isso [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Quer que seja eu a fazer isso? [Y/n] " #: builtin/bisect--helper.c:844 msgid "Please call `--bisect-state` with at least one argument"
po/ru.po +4 -4
@@ -9796,8 +9796,8 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #: builtin/bisect--helper.c:357 -msgid "Are you sure [Y/n]? " -msgstr "Вы уверены [Y - да/n - нет]? " +msgid "Are you sure? [Y/n] " +msgstr "Вы уверены? [Y - да/n - нет] " #: builtin/bisect--helper.c:418 msgid "no terms defined"
@@ -9870,8 +9870,8 @@ msgstr "" #. translation. The program will only accept English input #. at this point. #: builtin/bisect--helper.c:825 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Вы уверены, что хотите, чтобы я сделал это [Y] - да/[n] - нет? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Вы уверены, что хотите, чтобы я сделал это? [Y] - да/[n] - нет " #: builtin/bisect--helper.c:843 msgid "Please call `--bisect-state` with at least one argument"
po/sv.po +4 -4
@@ -11173,8 +11173,8 @@ msgstr "utför bisect med endast en %s incheckning" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "Är du säker [Y=ja/N=nej]? " +msgid "Are you sure? [Y/n] " +msgstr "Är du säker? [Y=ja/N=nej] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11254,8 +11254,8 @@ msgstr "Du måste starta med \"git bisect start\"\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Vill du att jag ska göra det åt dig? [Y=ja/N=nej] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/tr.po +4 -4
@@ -11238,8 +11238,8 @@ msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "Emin misiniz [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "Emin misiniz? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11317,8 +11317,8 @@ msgstr "\"git bisect start\" ile başlamalısınız\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Bunu sizin yerinize benim yapmamı ister misiniz? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/vi.po +4 -4
@@ -11235,8 +11235,8 @@ msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "Bạn có chắc chắn chưa [Y/n]? " +msgid "Are you sure? [Y/n] " +msgstr "Bạn có chắc chắn chưa? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11314,8 +11314,8 @@ msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "Bạn có muốn tôi thực hiện điều này cho bạn không? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/zh_CN.po +4 -4
@@ -11092,8 +11092,8 @@ msgstr "在只有一个 %s 提交的情况下二分查找" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "您确认么[Y/n]？ " +msgid "Are you sure? [Y/n] " +msgstr "您确认么? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11169,8 +11169,8 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "您想让我为您这样做么[Y/n]？ " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "您想让我为您这样做么? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
po/zh_TW.po +4 -4
@@ -10958,8 +10958,8 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋" #. at this point. #. #: builtin/bisect--helper.c:373 -msgid "Are you sure [Y/n]? " -msgstr "您確認嗎[Y/n]？ " +msgid "Are you sure? [Y/n] " +msgstr "您確認嗎? [Y/n] " #: builtin/bisect--helper.c:434 msgid "no terms defined"
@@ -11036,8 +11036,8 @@ msgstr "您需要執行 \"git bisect start\" 來開始\n" #. at this point. #. #: builtin/bisect--helper.c:841 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "您想讓我為您這樣做嗎[Y/n]？ " +msgid "Do you want me to do it for you? [Y/n] " +msgstr "您想讓我為您這樣做嗎? [Y/n] " #: builtin/bisect--helper.c:859 msgid "Please call `--bisect-state` with at least one argument"
Signature · 1 line
gitgitgadget
PATCH v3 3/4 add-patch: normalize format string of yes/no prompt
In reply to kashav madan via GitGitGadgetFrom: Kashav Madan <[email protected]>
Move the question mark in the prompt before the choices to be more consistent with other similar prompts.
--- add-patch.c | 4 ++-- po/bg.po | 2 +- po/ca.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/es.po | 6 +++--- po/fr.po | 4 ++-- po/git.pot | 2 +- po/id.po | 4 ++-- po/it.po | 4 ++-- po/ko.po | 4 ++-- po/pl.po | 4 ++-- po/pt_PT.po | 4 ++-- po/ru.po | 4 ++-- po/sv.po | 6 +++--- po/tr.po | 4 ++-- po/vi.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-)
add-patch.c +2 -2
@@ -1245,8 +1245,8 @@ static int edit_hunk_loop(struct add_p_state *s,* of the word "no" does not start with n. */ res =prompt_yesno (s,_ ("Your edited hunk does not apply. " -"Edit again (saying \"no\" discards!) " -"[y/n]? " )); +"Edit again (saying \"no\" discards!)? " +"[y/n] " ));if (res <1 )return -1 ; }
po/bg.po +1 -1
@@ -826,7 +826,7 @@ msgstr "неуспешно изпълнение на „git apply --cached“" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Редактираното парче не може да се приложи. Да се продължи ли с " "редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ "
po/ca.po +2 -2
@@ -689,11 +689,11 @@ msgstr "«git apply --cached» ha fallat" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n]" " " msgstr "" "El tros editat no s'aplica. Editeu-lo de nou (si responeu «no» es " -"descartarà) [y/n]? " +"descartarà)? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/de.po +2 -2
@@ -654,10 +654,10 @@ msgstr "'git apply --cached' schlug fehl." #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n" -"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?" +"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!)? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/el.po +2 -2
@@ -20795,10 +20795,10 @@ msgstr "" #. of the word "no" does not start with n. #: git-add--interactive.perl:1213 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Η επεξεργασμένη αλλαγή σας δεν εφαρμόζεται. Να γίνει επεξεργασία πάλι (με \"n" -"\" απορρίπτεται!) [y/n];" +"\" απορρίπτεται!); [y/n] " #: git-add--interactive.perl:1222 msgid ""
po/es.po +3 -3
@@ -644,10 +644,10 @@ msgstr "falló 'git apply --cached'" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" -"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/" -"n]? " +"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!)? [y/" +"n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/fr.po +2 -2
@@ -714,10 +714,10 @@ msgstr "'git apply --cached' a échoué" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " -"l'élimine !) [y|n] ? " +"l'élimine !) ? [y|n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/git.pot +1 -1
@@ -567,7 +567,7 @@ msgstr "" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" #: add-patch.c:1290
po/id.po +2 -2
@@ -631,10 +631,10 @@ msgstr "'git apply --cached' gagal" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Bingkah Anda tak diterapkan. Sunting lagi (bilang \"n\" untuk \"tidak\" " -"buang!) [y/n]?" +"buang!)? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/it.po +2 -2
@@ -660,10 +660,10 @@ msgstr "'git apply --cached' non riuscito" #. of the word "no" does not start with n. #: add-patch.c:1241 git-add--interactive.perl:1244 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "L'hunk modificato non può essere applicato senza problemi. Modificarlo di " -"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? " +"nuovo (se rispondi \"no\", sarà eliminato!)? [y/n] " #: add-patch.c:1284 msgid "The selected hunks do not apply to the index!"
po/ko.po +2 -2
@@ -17274,10 +17274,10 @@ msgstr "부분 편집 파일을 읽기용으로 여는데 실패: '%s'" #. of the word "no" does not start with n. #: git-add--interactive.perl:1213 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "편집한 부분이 적용되지 않습니다. 다시 편집하시겠습니까 (\"no\"라고 하면 버립" -"니다!) [y/n]? " +"니다!)? [y/n] " #: git-add--interactive.perl:1222 msgid ""
po/pl.po +2 -2
@@ -689,10 +689,10 @@ msgstr "„git apply --cached” nie powiodło się" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Zmieniony skrawek się nie stosuje. Edytować ponownie (odpowiedź „nie” go " -"porzuci!) [y/n]? " +"porzuci!)? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/pt_PT.po +2 -2
@@ -844,10 +844,10 @@ msgstr "'git apply --cached' falhou" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Problema na submissão de pedaço editado. Editar de novo (responder \"n\" " -"para \"não\" descarta!) [y/n]? " +"para \"não\" descarta!)? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/ru.po +2 -2
@@ -577,9 +577,9 @@ msgstr "" #. of the word "no" does not start with n. #: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n]" " " -msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? " +msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!)? [y/n] " #: add-patch.c:1289 msgid "The selected hunks do not apply to the index!"
po/sv.po +3 -3
@@ -632,10 +632,10 @@ msgstr "\"git apply --cached\" misslyckades" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" -"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " -"[y/n]? " +"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!)? " +"[y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/tr.po +2 -2
@@ -716,10 +716,10 @@ msgstr "'git apply --cached' başarısız oldu" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\"n (hayır)\" " -"ıskartaya çıkarır!) [y/n]? " +"ıskartaya çıkarır!)? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/vi.po +2 -2
@@ -641,10 +641,10 @@ msgstr "“git apply --cached” gặp lỗi" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " msgstr "" "Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại " -"bỏ!) [y/n]? " +"bỏ!)? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/zh_CN.po +2 -2
@@ -754,8 +754,8 @@ msgstr "'git apply --cached' 失败" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " +msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！）? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
po/zh_TW.po +2 -2
@@ -637,8 +637,8 @@ msgstr "「git apply --cached」失敗" #. of the word "no" does not start with n. #: add-patch.c:1247 git-add--interactive.perl:1242 msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " +"Your edited hunk does not apply. Edit again (saying \"no\" discards!)? [y/n] " +msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！）? [y/n] " #: add-patch.c:1290 msgid "The selected hunks do not apply to the index!"
Signature · 1 line
gitgitgadget
PATCH v3 4/4 help: make auto-correction prompt more consistent
In reply to kashav madan via GitGitGadgetFrom: Kashav Madan <[email protected]>
There are three callsites of git_prompt() that ask the user for "yes/no" confirmation, but the one in help.c, used for auto-correction, is formatted differently from the others. Update that format string to make the prompt look more consistent, by adding a space after the prompt and enclosing the choices in [] instead of ().
--- help.c | 2 +- po/bg.po | 4 ++-- po/ca.po | 4 ++-- po/de.po | 4 ++-- po/es.po | 4 ++-- po/fr.po | 4 ++-- po/git.pot | 2 +- po/id.po | 2 +- po/pl.po | 4 ++-- po/sv.po | 4 ++-- po/tr.po | 4 ++-- po/vi.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-)
help.c +1 -1
@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)else if (autocorrect ==AUTOCORRECT_PROMPT ) {char *answer;struct strbuf msg =STRBUF_INIT ; -strbuf_addf (&msg,_ ("Run '%s' instead? (y/N)" ), assumed); +strbuf_addf (&msg,_ ("Run '%s' instead? [y/N] " ), assumed); answer =git_prompt (msg.buf,PROMPT_ECHO );strbuf_release (&msg); if (!(starts_with(answer, "y") ||
po/bg.po +2 -2
@@ -4800,8 +4800,8 @@ msgstr "" #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Да се изпълни „%s“ вместо това? (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Да се изпълни „%s“ вместо това? [y/N] " #: help.c:654 #, c-format
po/ca.po +2 -2
@@ -4665,8 +4665,8 @@ msgstr "El procés continuarà, pressuposant que volíeu dir «%s»." #: help.c:646 #, c-format, fuzzy -msgid "Run '%s' instead? (y/N)" -msgstr "Voleu executar «%s»? (s/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Voleu executar «%s»? [s/N] " #: help.c:654 #, c-format
po/de.po +2 -2
@@ -4620,8 +4620,8 @@ msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Stattdessen '%s' ausführen? (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Stattdessen '%s' ausführen? [y/N] " #: help.c:654 #, c-format
po/es.po +2 -2
@@ -4565,8 +4565,8 @@ msgstr "Continuando asumiendo que quisiste decir '%s'." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Ejecutar '%s' en su lugar? (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Ejecutar '%s' en su lugar? [y/N] " #: help.c:654 #, c-format
po/fr.po +2 -2
@@ -4698,8 +4698,8 @@ msgstr "Continuons en supposant que vous avez voulu dire '%s'." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Lancer '%s' à la place ? (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Lancer '%s' à la place ? [y/N] " #: help.c:654 #, c-format
po/git.pot +1 -1
@@ -4246,7 +4246,7 @@ msgstr "" #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" +msgid "Run '%s' instead? [y/N] " msgstr "" #: help.c:654
po/id.po +1 -1
@@ -4415,7 +4415,7 @@ msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" +msgid "Run '%s' instead? [y/N] " msgstr "" #: help.c:654
po/pl.po +2 -2
@@ -4591,8 +4591,8 @@ msgstr "Zakładam dalej, że chodziło o „%s”." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Wykonać zamiast tego „%s”? (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Wykonać zamiast tego „%s”? [y/N] " #: help.c:654 #, c-format
po/sv.po +2 -2
@@ -4528,8 +4528,8 @@ msgstr "Fortsätter under förutsättningen att du menade \"%s\"." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Köra \"%s\" istället? (j/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Köra \"%s\" istället? [j/N] " #: help.c:654 #, c-format
po/tr.po +2 -2
@@ -4597,8 +4597,8 @@ msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Bunun yerine '%s' çalıştır? (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Bunun yerine '%s' çalıştır? [y/N] " #: help.c:654 #, c-format
po/vi.po +2 -2
@@ -4535,8 +4535,8 @@ msgstr "Tiếp tục và coi rằng ý bạn là “%s”." #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "Chạy “%s” để thay thế? (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "Chạy “%s” để thay thế? [y/N] " #: help.c:654 #, c-format
po/zh_CN.po +2 -2
@@ -4546,8 +4546,8 @@ msgstr "假定您想要的是 '%s' 并继续。" #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "取而代之运行 '%s' ？ (y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "取而代之运行 '%s' ？ [y/N] " #: help.c:654 #, c-format
po/zh_TW.po +2 -2
@@ -4411,8 +4411,8 @@ msgstr "假定你想要的是 '%s' 並繼續。" #: help.c:646 #, c-format -msgid "Run '%s' instead? (y/N)" -msgstr "改執行「%s」？(y/N)" +msgid "Run '%s' instead? [y/N] " +msgstr "改執行「%s」？[y/N] " #: help.c:654 #, c-format
Signature · 1 line
gitgitgadget
Quoted 5 lines · Johannes Altmanninger
Quoted 2 lines
- It does not leave a SP before where the end-user input goes;
- It append (y/N) _after_ question mark;I actually prefer this one;
Quoted 7 lines
Run 'status' instead? [y/N]
sounds better than
Run 'status' instead [y/N]?
but that's not a strong opinion.
It is fine to have your own preference, but we are discussing to make the three, two of which use "[choices]? " while only one uses "? (choices)", consistent.
So I'd prefer to see us turn the odd man out to do "[choices]? " first. Adjusting to your personal preference can be proposed after the dust settles for the consistency fix.
Thanks.
Re: [PATCH v3 1/4] bisect--helper: normalize format string of yes/no prompts
In reply to Kashav Madan via GitGitGadgetQuoted 6 lines · Kashav Madan via GitGitGadget
From: Kashav Madan <[email protected]>
Both callers of
git_promptinbisect--helper.cask the user for yes/no confirmation. They both place the question mark after the choices, however this is inconsistent with how most UNIX-y tools do it. Update the format string to exclude the choices from the question.
Is there somewhere that the claim can be confirmed? I am not having much luck with queries like
https://www.google.com/search?q=prompt+question+mark+and+choices
that gave https://home.csulb.edu/~murdock/choice.html the most relevant page X-<.
I personally do not think this step is worth doing, but in any case, NEVER touch po/* directory when you are updating code and strings in the code. It is something our i18n coordinator will do at certain point in the release cycle.
Re: [PATCH v3 1/4] bisect--helper: normalize format string of yes/no prompts
Quoted 14 lines · Junio C Hamano
Quoted 6 lines · Kashav Madan via GitGitGadget
From: Kashav Madan <[email protected]>
Both callers of
git_promptinbisect--helper.cask the user for yes/no confirmation. They both place the question mark after the choices, however this is inconsistent with how most UNIX-y tools do it. Update the format string to exclude the choices from the question.Is there somewhere that the claim can be confirmed? I am not having much luck with queries like
https://www.google.com/search?q=prompt+question+mark+and+choices
Quoted 7 lines
that gave https://home.csulb.edu/~murdock/choice.html the most relevant page X-<.
I personally do not think this step is worth doing, but in any case, NEVER touch po/* directory when you are updating code and strings in the code. It is something our i18n coordinator will do at certain point in the release cycle.
After reading the series through, it seems all four patches share the same problem (i.e. swapping ? and choices, and touching po/*).
I'll discard this round, and instead queue the v2 from you, using the proposed log message to what I wrote for you during my review.
Thanks for your first contribution, and welcome to the Git development community ;-)
----- >8 --------- >8 --------- >8 --------- >8 --------- >8 -----
From: Kashav Madan <[email protected]>
Date: Wed, 15 Dec 2021 22:58:58 +0000
Subject: [PATCH] help: make auto-correction prompt more consistent
There are three callsites of git_prompt() helper function that ask a "yes/no" question to the end user, but one of them in help.c that asks if the suggested auto-correction is OK, which is given when the user makes a possible typo in a Git subcommand name, is formatted differently from the others.
Update the format string to make the prompt string look more consistent.
--- help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
help.c +1 -1
@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)else if (autocorrect ==AUTOCORRECT_PROMPT ) {char *answer;struct strbuf msg =STRBUF_INIT ; -strbuf_addf (&msg,_ ("Run '%s' instead? (y/N)" ), assumed); +strbuf_addf (&msg,_ ("Run '%s' instead [y/N]? " ), assumed); answer =git_prompt (msg.buf,PROMPT_ECHO );strbuf_release (&msg); if (!(starts_with(answer, "y") ||
Signature · 1 line
2.34.1-469-g0a17e94afe