{"thread":{"id":"57087","subject":"[PATCH] help: add space after autocorrect prompt","startedAt":"2021-12-15T21:41:12Z","lastAt":"2021-12-16T21:49:30Z","messageCount":14,"participants":["kashav madan via GitGitGadget","Junio C Hamano","Johannes Altmanninger","Eric Sunshine","Kashav Madan via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"444175","messageId":"pull.1166.git.git.1639604468498.gitgitgadget@gmail.com","threadId":"57087","inReplyTo":null,"subject":"[PATCH] help: add space after autocorrect prompt","fromName":"kashav madan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-15T21:41:08Z","receivedAt":"2021-12-15T21:41:12Z","isPatch":true,"sender":{"key":"name:kashav madan","avatar":null},"body":"From: Kashav Madan <kshvmdn@gmail.com>\n\nSigned-off-by: Kashav Madan <kshvmdn@gmail.com>\n---\n    help: add space after autocorrect prompt\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1166%2Fkashav%2Fmaster-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1166/kashav/master-v1\nPull-Request: https://github.com/git/git/pull/1166\n\n help.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/help.c b/help.c\nindex 973e47cdc30..8435858ce86 100644\n--- a/help.c\n+++ b/help.c\n@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)\n \t\telse if (autocorrect == AUTOCORRECT_PROMPT) {\n \t\t\tchar *answer;\n \t\t\tstruct strbuf msg = STRBUF_INIT;\n-\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n+\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N) \"), assumed);\n \t\t\tanswer = git_prompt(msg.buf, PROMPT_ECHO);\n \t\t\tstrbuf_release(&msg);\n \t\t\tif (!(starts_with(answer, \"y\") ||\n\nbase-commit: e773545c7fe7eca21b134847f4fc2cbc9547fa14\n-- \ngitgitgadget\n"},{"id":"444178","messageId":"xmqqh7b933ej.fsf@gitster.g","threadId":"57087","inReplyTo":"pull.1166.git.git.1639604468498.gitgitgadget@gmail.com","subject":"Re: [PATCH] help: add space after autocorrect prompt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-15T22:32:36Z","receivedAt":"2021-12-15T22:32:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"kashav madan via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Kashav Madan <kshvmdn@gmail.com>\n>\n> Signed-off-by: Kashav Madan <kshvmdn@gmail.com>\n> ---\n>     help: add space after autocorrect prompt\n\nThe patch looks OK-ish, but let's make sure.  We will find what we\nshould write in the log message while doing so.\n\nIf you look at the output from\n\n    $ git grep -C2 git_prompt \\*.c\n\nyou'll notice that existing message given to git_prompt look like\nthese:\n\n    yesno = git_prompt(_(\"Are you sure [Y/n]? \"), PROMPT_ECHO);\n\n    yesno = git_prompt(_(\"Do you want me to do it for you \"\n                         \"[Y/n]? \"), PROMPT_ECHO);\n\n    strbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n    answer = git_prompt(msg.buf, PROMPT_ECHO);\n\nThe last one is what you are touching in this patch.\n\nThere is another one in credential.c that asks not just a single\nyes/no answer, so it is justifiably different from all the others,\nbut the one you noticed is different from what we see above in three\npoints:\n\n - It does not leave a SP before where the end-user input goes;\n - It append (y/N) _after_ question mark;\n - It encloses the choices in (), not [].\n\nYou are only addressing the first inconsistency, leaving the other\ntwo still there.\n\nSo, perhaps you would want to explain the change this way\n\n    Subject: [PATCH] help: update auto-correction prompt to look more like others\n\n    There are three callsite of git_prompt() helper function to ask\n    a \"yes/no\" question to the end user, but one of them in help.c\n    that asks if the suggested auto-correction is OK, which is given\n    when the user makes a possible typo in a Git subcommand name, is\n    formatted differently from others.  Update the format string to\n    make the prompt string look more consistent.\n\n\nAnd you'd want to update the string more like so:\n\n> -\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n> +\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead [y/N]? \"), assumed);\n\nto fix all three points, not just one.\n\nThanks.\n"},{"id":"444181","messageId":"pull.1166.v2.git.git.1639609138813.gitgitgadget@gmail.com","threadId":"57087","inReplyTo":"pull.1166.git.git.1639604468498.gitgitgadget@gmail.com","subject":"[PATCH v2] help: make auto-correction prompt more consistent","fromName":"kashav madan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-15T22:58:58Z","receivedAt":"2021-12-15T22:59:03Z","isPatch":true,"sender":{"key":"name:kashav madan","avatar":null},"body":"From: Kashav Madan <kshvmdn@gmail.com>\n\nThere are three callsites of git_prompt() that ask the user for \"yes/no\"\nconfirmation, but the one in help.c, used for auto-correction, is\nformatted differently from the others. This updates that format string\nto make the prompt look more consistent.\n\nSigned-off-by: Kashav Madan <kshvmdn@gmail.com>\n---\n    help: make auto-correction prompt more consistent\n    \n    Changes since v1:\n    \n     * Appended (y/N) after the question mark\n     * Enclosed the choices in (), not []\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1166%2Fkashav%2Fmaster-v2\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1166/kashav/master-v2\nPull-Request: https://github.com/git/git/pull/1166\n\nRange-diff vs v1:\n\n 1:  5df696252dd ! 1:  e6dc616c964 help: add space after autocorrect prompt\n     @@ Metadata\n      Author: Kashav Madan <kshvmdn@gmail.com>\n      \n       ## Commit message ##\n     -    help: add space after autocorrect prompt\n     +    help: make auto-correction prompt more consistent\n     +\n     +    There are three callsites of git_prompt() that ask the user for \"yes/no\"\n     +    confirmation, but the one in help.c, used for auto-correction, is\n     +    formatted differently from the others. This updates that format string\n     +    to make the prompt look more consistent.\n      \n          Signed-off-by: Kashav Madan <kshvmdn@gmail.com>\n      \n     @@ help.c: const char *help_unknown_cmd(const char *cmd)\n       \t\t\tchar *answer;\n       \t\t\tstruct strbuf msg = STRBUF_INIT;\n      -\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n     -+\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N) \"), assumed);\n     ++\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead [y/N]? \"), assumed);\n       \t\t\tanswer = git_prompt(msg.buf, PROMPT_ECHO);\n       \t\t\tstrbuf_release(&msg);\n       \t\t\tif (!(starts_with(answer, \"y\") ||\n\n\n help.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/help.c b/help.c\nindex 973e47cdc30..71444906ddf 100644\n--- a/help.c\n+++ b/help.c\n@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)\n \t\telse if (autocorrect == AUTOCORRECT_PROMPT) {\n \t\t\tchar *answer;\n \t\t\tstruct strbuf msg = STRBUF_INIT;\n-\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n+\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead [y/N]? \"), assumed);\n \t\t\tanswer = git_prompt(msg.buf, PROMPT_ECHO);\n \t\t\tstrbuf_release(&msg);\n \t\t\tif (!(starts_with(answer, \"y\") ||\n\nbase-commit: e773545c7fe7eca21b134847f4fc2cbc9547fa14\n-- \ngitgitgadget\n"},{"id":"444197","messageId":"xmqq35mtz1i2.fsf@gitster.g","threadId":"57087","inReplyTo":"pull.1166.v2.git.git.1639609138813.gitgitgadget@gmail.com","subject":"Re: [PATCH v2] help: make auto-correction prompt more consistent","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-16T03:12:37Z","receivedAt":"2021-12-16T03:12:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"kashav madan via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Kashav Madan <kshvmdn@gmail.com>\n>\n> There are three callsites of git_prompt() that ask the user for \"yes/no\"\n> confirmation, but the one in help.c, used for auto-correction, is\n> formatted differently from the others. This updates that format string\n> to make the prompt look more consistent.\n\nLooks much better.  \n\nThe last sentence should be phrased as if we were giving an order to\nthe codebase to \"become like so\", to match the style, in which our\nlog messages are typically written (look for \"imperative-mood\" in\nDocumentation/SubmittingPatches).\n\nThanks.\n\n> diff --git a/help.c b/help.c\n> index 973e47cdc30..71444906ddf 100644\n> --- a/help.c\n> +++ b/help.c\n> @@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)\n>  \t\telse if (autocorrect == AUTOCORRECT_PROMPT) {\n>  \t\t\tchar *answer;\n>  \t\t\tstruct strbuf msg = STRBUF_INIT;\n> -\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n> +\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead [y/N]? \"), assumed);\n>  \t\t\tanswer = git_prompt(msg.buf, PROMPT_ECHO);\n>  \t\t\tstrbuf_release(&msg);\n>  \t\t\tif (!(starts_with(answer, \"y\") ||\n>\n> base-commit: e773545c7fe7eca21b134847f4fc2cbc9547fa14\n"},{"id":"444198","messageId":"20211216062709.b4tcagi6qcqhasrh@gmail.com","threadId":"57087","inReplyTo":"xmqqh7b933ej.fsf@gitster.g","subject":"Re: [PATCH] help: add space after autocorrect prompt","fromName":"Johannes Altmanninger","fromEmail":"aclopte@gmail.com","sentAt":"2021-12-16T06:27:09Z","receivedAt":"2021-12-16T06:27:14Z","isPatch":true,"sender":{"key":"aclopte@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6853872?v=4"},"body":"On Wed, Dec 15, 2021 at 02:32:36PM -0800, Junio C Hamano wrote:\n> \"kashav madan via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n> \n> > From: Kashav Madan <kshvmdn@gmail.com>\n> >\n> > Signed-off-by: Kashav Madan <kshvmdn@gmail.com>\n> > ---\n> >     help: add space after autocorrect prompt\n> \n> The patch looks OK-ish, but let's make sure.  We will find what we\n> should write in the log message while doing so.\n> \n> If you look at the output from\n> \n>     $ git grep -C2 git_prompt \\*.c\n> \n> you'll notice that existing message given to git_prompt look like\n> these:\n> \n>     yesno = git_prompt(_(\"Are you sure [Y/n]? \"), PROMPT_ECHO);\n> \n>     yesno = git_prompt(_(\"Do you want me to do it for you \"\n>                          \"[Y/n]? \"), PROMPT_ECHO);\n> \n>     strbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n>     answer = git_prompt(msg.buf, PROMPT_ECHO);\n> \n> The last one is what you are touching in this patch.\n> \n> There is another one in credential.c that asks not just a single\n> yes/no answer, so it is justifiably different from all the others,\n> but the one you noticed is different from what we see above in three\n> points:\n> \n>  - It does not leave a SP before where the end-user input goes;\n>  - It append (y/N) _after_ question mark;\n\nI actually prefer this one;\n\n\tRun 'status' instead? [y/N] \n\nsounds better than\n\n\tRun 'status' instead [y/N]? \n\nbut that's not a strong opinion.\n"},{"id":"444234","messageId":"CAPig+cQ9zFE+83e4fwxLfL18Pf5=SOoDKD7RqhmJ3DmYUDKfow@mail.gmail.com","threadId":"57087","inReplyTo":"20211216062709.b4tcagi6qcqhasrh@gmail.com","subject":"Re: [PATCH] help: add space after autocorrect prompt","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2021-12-16T15:55:09Z","receivedAt":"2021-12-16T15:55:22Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Thu, Dec 16, 2021 at 6:18 AM Johannes Altmanninger <aclopte@gmail.com> wrote:\n> On Wed, Dec 15, 2021 at 02:32:36PM -0800, Junio C Hamano wrote:\n> > you'll notice that existing message given to git_prompt look like\n> > these:\n> >\n> >     yesno = git_prompt(_(\"Are you sure [Y/n]? \"), PROMPT_ECHO);\n> >\n> >     yesno = git_prompt(_(\"Do you want me to do it for you \"\n> >                          \"[Y/n]? \"), PROMPT_ECHO);\n> >\n> >     strbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n> >     answer = git_prompt(msg.buf, PROMPT_ECHO);\n> >\n> >  - It does not leave a SP before where the end-user input goes;\n> >  - It append (y/N) _after_ question mark;\n>\n> I actually prefer this one;\n>\n>         Run 'status' instead? [y/N]\n>\n> sounds better than\n>\n>         Run 'status' instead [y/N]?\n>\n> but that's not a strong opinion.\n\nFor what it's worth, I also find \"Run 'status' instead? [y/N]\" more\nsensible, and (at least based upon memory) it also seems to be the\ntypical way it's done in other software (including software I've\nwritten). That said, it's a very minor point which needn't hold up the\npatch if kashav isn't interested in redoing this as a single patch\nwhich normalizes all callers to use a common format.\n"},{"id":"444245","messageId":"pull.1166.v3.git.git.1639678734.gitgitgadget@gmail.com","threadId":"57087","inReplyTo":"pull.1166.v2.git.git.1639609138813.gitgitgadget@gmail.com","subject":"[PATCH v3 0/4] normalize format of yes/no prompts","fromName":"kashav madan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-16T18:18:50Z","receivedAt":"2021-12-16T18:19:07Z","isPatch":true,"sender":{"key":"name:kashav madan","avatar":null},"body":"Changes since v2:\n\n * Moves question mark before the yes/no choices, to be more consistent with\n   other tools.\n * Normalizes format string for bisect--helper, clean, add-patch.\n * Updates localized versions of all changed strings, which was missed in\n   v2.\n\nKashav Madan (4):\n  bisect--helper: normalize format string of yes/no prompts\n  clean: normalize format string of yes/no prompt\n  add-patch: normalize format string of yes/no prompt\n  help: make auto-correction prompt more consistent\n\n add-patch.c              |  4 ++--\n builtin/bisect--helper.c |  6 +++---\n builtin/clean.c          |  2 +-\n help.c                   |  2 +-\n po/bg.po                 | 14 +++++++-------\n po/ca.po                 | 20 ++++++++++----------\n po/de.po                 | 20 ++++++++++----------\n po/el.po                 | 14 +++++++-------\n po/es.po                 | 22 +++++++++++-----------\n po/fr.po                 | 20 ++++++++++----------\n po/git.pot               | 10 +++++-----\n po/id.po                 | 18 +++++++++---------\n po/it.po                 | 14 +++++++-------\n po/ko.po                 | 16 ++++++++--------\n po/pl.po                 | 20 ++++++++++----------\n po/pt_PT.po              | 16 ++++++++--------\n po/ru.po                 | 16 ++++++++--------\n po/sv.po                 | 22 +++++++++++-----------\n po/tr.po                 | 20 ++++++++++----------\n po/vi.po                 | 20 ++++++++++----------\n po/zh_CN.po              | 20 ++++++++++----------\n po/zh_TW.po              | 20 ++++++++++----------\n 22 files changed, 168 insertions(+), 168 deletions(-)\n\n\nbase-commit: e773545c7fe7eca21b134847f4fc2cbc9547fa14\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1166%2Fkashav%2Fmaster-v3\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1166/kashav/master-v3\nPull-Request: https://github.com/git/git/pull/1166\n\nRange-diff vs v2:\n\n 1:  e6dc616c964 < -:  ----------- help: make auto-correction prompt more consistent\n -:  ----------- > 1:  e7672e70cc9 bisect--helper: normalize format string of yes/no prompts\n -:  ----------- > 2:  0c81a14247f clean: normalize format string of yes/no prompt\n -:  ----------- > 3:  4a70e569f8a add-patch: normalize format string of yes/no prompt\n -:  ----------- > 4:  fc913ef31fb help: make auto-correction prompt more consistent\n\n-- \ngitgitgadget\n"},{"id":"444246","messageId":"0c81a14247f9f832b5dc23de94116d8c67d81325.1639678737.git.gitgitgadget@gmail.com","threadId":"57087","inReplyTo":"pull.1166.v3.git.git.1639678734.gitgitgadget@gmail.com","subject":"[PATCH v3 2/4] clean: normalize format string of yes/no prompt","fromName":"Kashav Madan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-16T18:18:52Z","receivedAt":"2021-12-16T18:19:09Z","isPatch":true,"sender":{"key":"name:Kashav Madan","avatar":null},"body":"From: Kashav Madan <kshvmdn@gmail.com>\n\nMove the question mark in the prompt before the choices to be more\nconsistent with other similar prompts.\n\nSigned-off-by: Kashav Madan <kshvmdn@gmail.com>\n---\n builtin/clean.c | 2 +-\n po/bg.po        | 2 +-\n po/ca.po        | 4 ++--\n po/de.po        | 4 ++--\n po/el.po        | 2 +-\n po/es.po        | 4 ++--\n po/fr.po        | 4 ++--\n po/git.pot      | 2 +-\n po/id.po        | 4 ++--\n po/it.po        | 4 ++--\n po/ko.po        | 4 ++--\n po/pl.po        | 4 ++--\n po/pt_PT.po     | 4 ++--\n po/ru.po        | 4 ++--\n po/sv.po        | 4 ++--\n po/tr.po        | 4 ++--\n po/vi.po        | 4 ++--\n po/zh_CN.po     | 4 ++--\n po/zh_TW.po     | 4 ++--\n 19 files changed, 34 insertions(+), 34 deletions(-)\n\ndiff --git a/builtin/clean.c b/builtin/clean.c\nindex 98a2860409b..2b52e522a82 100644\n--- a/builtin/clean.c\n+++ b/builtin/clean.c\n@@ -752,7 +752,7 @@ static int ask_each_cmd(void)\n \t\tif (!eof) {\n \t\t\tqname = quote_path(item->string, NULL, &buf, 0);\n \t\t\t/* TRANSLATORS: Make sure to keep [y/N] as is */\n-\t\t\tprintf(_(\"Remove %s [y/N]? \"), qname);\n+\t\t\tprintf(_(\"Remove %s? [y/N] \"), qname);\n \t\t\tif (git_read_line_interactively(&confirm) == EOF) {\n \t\t\t\tputchar('\\n');\n \t\t\t\teof = 1;\ndiff --git a/po/bg.po b/po/bg.po\nindex e0786caa274..10ba01d2817 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -13487,7 +13487,7 @@ msgstr \"Избиране на обекти за изтриване\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n msgstr \"Да се изтрие ли „%s“? „y“ —  да, „N“ — НЕ\"\n \n #: builtin/clean.c:786\ndiff --git a/po/ca.po b/po/ca.po\nindex 71673d48d01..d9798fd530e 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -13211,8 +13211,8 @@ msgstr \"Selecciona els ítems a suprimir\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Voleu eliminar %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Voleu eliminar %s? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/de.po b/po/de.po\nindex 3e8ef2ed122..442627f3448 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -13274,8 +13274,8 @@ msgstr \"Wählen Sie Einträge zum Löschen\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"'%s' löschen [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"'%s' löschen? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/el.po b/po/el.po\nindex 27c8c488ea1..b826b73d460 100644\n--- a/po/el.po\n+++ b/po/el.po\n@@ -9560,7 +9560,7 @@ msgstr \"\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:760\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n msgstr \"\"\n \n #: builtin/clean.c:785 git-add--interactive.perl:1717\ndiff --git a/po/es.po b/po/es.po\nindex ef8ae6d471e..8e9143131d0 100644\n--- a/po/es.po\n+++ b/po/es.po\n@@ -13081,8 +13081,8 @@ msgstr \"Seleccionar objetos para borrar\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"¿Borrar %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"¿Borrar %s? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/fr.po b/po/fr.po\nindex 9812213b2fe..ebb5b73ce3b 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -13282,8 +13282,8 @@ msgstr \"Sélectionner les éléments à supprimer\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Supprimer %s [y/N] ? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Supprimer %s ? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/git.pot b/po/git.pot\nindex c3102deb5d2..4ef2f39b950 100644\n--- a/po/git.pot\n+++ b/po/git.pot\n@@ -12087,7 +12087,7 @@ msgstr \"\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n msgstr \"\"\n \n #: builtin/clean.c:786\ndiff --git a/po/id.po b/po/id.po\nindex 3b8b0c39e51..b41e290c94a 100644\n--- a/po/id.po\n+++ b/po/id.po\n@@ -12525,8 +12525,8 @@ msgstr \"Pilih item untuk dihapus\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Hapus %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Hapus %s? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/it.po b/po/it.po\nindex 01c6d1f095e..b4322699060 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -12508,8 +12508,8 @@ msgstr \"Seleziona gli elementi da eliminare\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:758\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Eliminare %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Eliminare %s? [y/N] \"\n \n #: builtin/clean.c:789\n msgid \"\"\ndiff --git a/po/ko.po b/po/ko.po\nindex 96d3a2a3be4..29c7a6896fd 100644\n--- a/po/ko.po\n+++ b/po/ko.po\n@@ -7179,8 +7179,8 @@ msgstr \"삭제할 항목을 선택하십시오\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:763\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"%s 제거합니까 [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"%s 제거합니까? [y/N] \"\n \n #: builtin/clean.c:788 git-add--interactive.perl:1717\n #, c-format\ndiff --git a/po/pl.po b/po/pl.po\nindex 637a328a869..4d79160a15b 100644\n--- a/po/pl.po\n+++ b/po/pl.po\n@@ -13061,8 +13061,8 @@ msgstr \"Wybierz elementy do skasowania\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Usunąć %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Usunąć %s? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/pt_PT.po b/po/pt_PT.po\nindex a9a67f15484..06da638e981 100644\n--- a/po/pt_PT.po\n+++ b/po/pt_PT.po\n@@ -12623,8 +12623,8 @@ msgstr \"Selecione itens para eliminar\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Remover %s [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Remover %s? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/ru.po b/po/ru.po\nindex d091ea22e5a..cc886655cfd 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -11466,8 +11466,8 @@ msgstr \"Укажите элементы для удаления\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:758\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Удалить %s [y - да/N - нет]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Удалить %s? [y - да/N - нет] \"\n \n #: builtin/clean.c:789\n msgid \"\"\ndiff --git a/po/sv.po b/po/sv.po\nindex 6ccb7e7421c..ea9fe33cf9e 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -12981,8 +12981,8 @@ msgstr \"Välj poster att ta bort\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Ta bort %s [Y=ja / N=nej]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Ta bort %s? [Y=ja / N=nej] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/tr.po b/po/tr.po\nindex 686b21459a3..46a1ae5a8d2 100644\n--- a/po/tr.po\n+++ b/po/tr.po\n@@ -13040,8 +13040,8 @@ msgstr \"Silinecek ögeleri seçin\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"%s kaldırılsın mı [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"%s kaldırılsın mı? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/vi.po b/po/vi.po\nindex bfb84bd0049..d9c0130af2b 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -13037,8 +13037,8 @@ msgstr \"Chọn mục muốn xóa\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"Xóa bỏ “%s” [y/N]? \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"Xóa bỏ “%s”? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex 9131b440e6f..a51c81bfc4a 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -12881,8 +12881,8 @@ msgstr \"选择要删除的条目\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"删除 %s [y/N]？\"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"删除 %s? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\ndiff --git a/po/zh_TW.po b/po/zh_TW.po\nindex 80e156c94fc..c5b5f756f33 100644\n--- a/po/zh_TW.po\n+++ b/po/zh_TW.po\n@@ -12735,8 +12735,8 @@ msgstr \"選擇要刪除的條目\"\n #. TRANSLATORS: Make sure to keep [y/N] as is\n #: builtin/clean.c:755\n #, c-format\n-msgid \"Remove %s [y/N]? \"\n-msgstr \"移除 %s [y/N]？ \"\n+msgid \"Remove %s? [y/N] \"\n+msgstr \"移除 %s? [y/N] \"\n \n #: builtin/clean.c:786\n msgid \"\"\n-- \ngitgitgadget\n\n"},{"id":"444247","messageId":"e7672e70cc937ef3aaab9a36199470e01f6676a8.1639678735.git.gitgitgadget@gmail.com","threadId":"57087","inReplyTo":"pull.1166.v3.git.git.1639678734.gitgitgadget@gmail.com","subject":"[PATCH v3 1/4] bisect--helper: normalize format string of yes/no prompts","fromName":"Kashav Madan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-16T18:18:51Z","receivedAt":"2021-12-16T18:19:10Z","isPatch":true,"sender":{"key":"name:Kashav Madan","avatar":null},"body":"From: Kashav Madan <kshvmdn@gmail.com>\n\nBoth callers of git_prompt in bisect--helper.c ask the user for yes/no\nconfirmation. They both place the question mark after the choices,\nhowever this is inconsistent with how most UNIX-y tools do it. Update\nthe format string to exclude the choices from the question.\n\nSigned-off-by: Kashav Madan <kshvmdn@gmail.com>\n---\n builtin/bisect--helper.c | 6 +++---\n po/bg.po                 | 6 +++---\n po/ca.po                 | 8 ++++----\n po/de.po                 | 8 ++++----\n po/el.po                 | 8 ++++----\n po/es.po                 | 8 ++++----\n po/fr.po                 | 8 ++++----\n po/git.pot               | 4 ++--\n po/id.po                 | 8 ++++----\n po/it.po                 | 6 +++---\n po/ko.po                 | 8 ++++----\n po/pl.po                 | 8 ++++----\n po/pt_PT.po              | 8 ++++----\n po/ru.po                 | 8 ++++----\n po/sv.po                 | 8 ++++----\n po/tr.po                 | 8 ++++----\n po/vi.po                 | 8 ++++----\n po/zh_CN.po              | 8 ++++----\n po/zh_TW.po              | 8 ++++----\n 19 files changed, 71 insertions(+), 71 deletions(-)\n\ndiff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c\nindex 28a2e6a5750..2bfbb75f08b 100644\n--- a/builtin/bisect--helper.c\n+++ b/builtin/bisect--helper.c\n@@ -370,7 +370,7 @@ static int decide_next(const struct bisect_terms *terms,\n \t\t * translation. The program will only accept English input\n \t\t * at this point.\n \t\t */\n-\t\tyesno = git_prompt(_(\"Are you sure [Y/n]? \"), PROMPT_ECHO);\n+\t\tyesno = git_prompt(_(\"Are you sure? [Y/n] \"), PROMPT_ECHO);\n \t\tif (starts_with(yesno, \"N\") || starts_with(yesno, \"n\"))\n \t\t\treturn -1;\n \t\treturn 0;\n@@ -838,8 +838,8 @@ static int bisect_autostart(struct bisect_terms *terms)\n \t * translation. The program will only accept English input\n \t * at this point.\n \t */\n-\tyesno = git_prompt(_(\"Do you want me to do it for you \"\n-\t\t\t     \"[Y/n]? \"), PROMPT_ECHO);\n+\tyesno = git_prompt(_(\"Do you want me to do it for you? \"\n+\t\t\t     \"[Y/n] \"), PROMPT_ECHO);\n \tres = tolower(*yesno) == 'n' ?\n \t\t-1 : bisect_start(terms, empty_strvec, 0);\n \ndiff --git a/po/bg.po b/po/bg.po\nindex 51d7c7242f2..e0786caa274 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -11633,7 +11633,7 @@ msgstr \"двоично търсене само по „%s“ подаване.\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n msgstr \"Да се продължи ли? „Y“ —  ДА, „n“ — не\"\n \n #: builtin/bisect--helper.c:434\n@@ -11716,8 +11716,8 @@ msgstr \"Започнете като изпълните командата „git\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Да се извърши ли автоматично? „Y“ —  ДА, „n“ — не\"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Да се извърши ли автоматично? „Y“ —  ДА, „n“ — не \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/ca.po b/po/ca.po\nindex 556b028cd8b..71673d48d01 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -11355,8 +11355,8 @@ msgstr \"bisecant amb només una comissió %s\"\n #. translation. The program will only accept English input\n #. at this point.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"N'esteu segur [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"N'esteu segur? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11435,8 +11435,8 @@ msgstr \"Cal començar per «git bisect start»\\n\"\n #. translation. The program will only accept English input\n #. at this point.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Voleu que ho faci per vostè [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Voleu que ho faci per vostè? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/de.po b/po/de.po\nindex f00c21d896f..3e8ef2ed122 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -11429,8 +11429,8 @@ msgstr \"binäre Suche nur mit einem %s Commit\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Sind Sie sicher [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Sind Sie sicher? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11511,8 +11511,8 @@ msgstr \"Sie müssen mit \\\"git bisect start\\\" beginnen\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Wollen Sie, dass ich es für Sie mache [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Wollen Sie, dass ich es für Sie mache? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/el.po b/po/el.po\nindex 703f46d0c7c..27c8c488ea1 100644\n--- a/po/el.po\n+++ b/po/el.po\n@@ -8202,7 +8202,7 @@ msgstr \"\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:329\n-msgid \"Are you sure [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n msgstr \"Επιβεβαιώνετε [Y/n]; \"\n \n #: builtin/bisect--helper.c:376\n@@ -19779,7 +19779,7 @@ msgstr \"Χρειάζεται να αρχίσετε με \\\"git bisect start\\\"\"\n #. translation. The program will only accept English input\n #. at this point.\n #: git-bisect.sh:60\n-msgid \"Do you want me to do it for you [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n msgstr \"\"\n \n #: git-bisect.sh:101\n@@ -21272,8 +21272,8 @@ msgstr \"\"\n #. TRANSLATORS: please keep [y/N] as is.\n #: git-send-email.perl:825\n #, perl-format\n-msgid \"Are you sure you want to use <%s> [y/N]? \"\n-msgstr \"Επιβεβαιώνετε πως θέλετε να χρησιμοποιήσετε <%s> [y/N]? \"\n+msgid \"Are you sure you want to use <%s>? [y/N] \"\n+msgstr \"Επιβεβαιώνετε πως θέλετε να χρησιμοποιήσετε <%s>? [y/N] \"\n \n #: git-send-email.perl:880\n msgid \"\"\ndiff --git a/po/es.po b/po/es.po\nindex ced2eb6d3d5..ef8ae6d471e 100644\n--- a/po/es.po\n+++ b/po/es.po\n@@ -11267,8 +11267,8 @@ msgstr \"haciendo bisect solo con un commit %s\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"¿Estás seguro [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"¿Estás seguro? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11347,8 +11347,8 @@ msgstr \"Debes iniciar con \\\"git bisect start\\\"\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"¿Quieres que lo haga por ti [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"¿Quieres que lo haga por ti? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/fr.po b/po/fr.po\nindex e950f87add0..9812213b2fe 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -11445,8 +11445,8 @@ msgstr \"bissection avec seulement un commit %s\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Confirmez-vous [Y/n] ? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Confirmez-vous ? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11526,8 +11526,8 @@ msgstr \"Vous devez démarrer avec \\\"git bisect start\\\"\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Souhaitez-vous que je le fasse pour vous [Y/n] ? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Souhaitez-vous que je le fasse pour vous ? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/git.pot b/po/git.pot\nindex 78fea37065b..c3102deb5d2 100644\n--- a/po/git.pot\n+++ b/po/git.pot\n@@ -10385,7 +10385,7 @@ msgstr \"\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n msgstr \"\"\n \n #: builtin/bisect--helper.c:434\n@@ -10460,7 +10460,7 @@ msgstr \"\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n msgstr \"\"\n \n #: builtin/bisect--helper.c:859\ndiff --git a/po/id.po b/po/id.po\nindex c1afc2a32f3..3b8b0c39e51 100644\n--- a/po/id.po\n+++ b/po/id.po\n@@ -10734,8 +10734,8 @@ msgstr \"membagi dua hanya dengan sebuah komit %s\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Anda yakin [Y/n]?\"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Anda yakin? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -10813,8 +10813,8 @@ msgstr \"Anda perlu memulai dengan \\\"git bisect start\\\"\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Anda ingin saya melakukannya untuk Anda [Y/n]\"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Anda ingin saya melakukannya untuk Anda [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/it.po b/po/it.po\nindex c31560834d8..01c6d1f095e 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -10682,7 +10682,7 @@ msgstr \"eseguo la bisezione solo con un commit %s\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:370\n-msgid \"Are you sure [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n msgstr \"Sei sicuro? [Y/n] \"\n \n #: builtin/bisect--helper.c:431\n@@ -10762,8 +10762,8 @@ msgstr \"Devi iniziare con \\\"git bisect start\\\"\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:838\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Vuoi che me ne occupi io [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Vuoi che me ne occupi io? [Y/n] \"\n \n #: builtin/bisect--helper.c:866\n msgid \"perform 'git bisect next'\"\ndiff --git a/po/ko.po b/po/ko.po\nindex 5d190e52380..96d3a2a3be4 100644\n--- a/po/ko.po\n+++ b/po/ko.po\n@@ -15994,8 +15994,8 @@ msgstr \"\\\"git bisect start\\\" 명령으로 시작해야 합니다\"\n #. translation. The program will only accept English input\n #. at this point.\n #: git-bisect.sh:60\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"지금 하시겠습니까 [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"지금 하시겠습니까? [Y/n] \"\n \n #: git-bisect.sh:121\n #, sh-format\n@@ -16061,8 +16061,8 @@ msgstr \"경고: 하나의 $TERM_BAD 커밋에 대해서만 이등분.\"\n #. translation. The program will only accept English input\n #. at this point.\n #: git-bisect.sh:312\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"확실합니까 [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"확실합니까? [Y/n] \"\n \n #: git-bisect.sh:324\n #, sh-format\ndiff --git a/po/pl.po b/po/pl.po\nindex 0ec127e14cc..637a328a869 100644\n--- a/po/pl.po\n+++ b/po/pl.po\n@@ -11238,8 +11238,8 @@ msgstr \"przeszukiwanie tylko z zapisem %s\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Czy na pewno [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Czy na pewno? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11319,8 +11319,8 @@ msgstr \"Musisz rozpocząć przez „git bisect start”\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Chcesz, żeby to teraz zrobić [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Chcesz, żeby to teraz zrobić? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/pt_PT.po b/po/pt_PT.po\nindex 70e5c6d9c16..a9a67f15484 100644\n--- a/po/pt_PT.po\n+++ b/po/pt_PT.po\n@@ -10900,8 +10900,8 @@ msgstr \"bissetando apenas com uma memória %s\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:358\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Tem a certeza [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Tem a certeza? [Y/n] \"\n \n #: builtin/bisect--helper.c:419\n msgid \"no terms defined\"\n@@ -10977,8 +10977,8 @@ msgstr \"Deves começar com \\\"git bisect start\\\"\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:826\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Quer que seja eu a fazer isso [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Quer que seja eu a fazer isso? [Y/n] \"\n \n #: builtin/bisect--helper.c:844\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/ru.po b/po/ru.po\nindex 993d106f1f9..d091ea22e5a 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -9796,8 +9796,8 @@ msgstr \"\"\n #. translation. The program will only accept English input\n #. at this point.\n #: builtin/bisect--helper.c:357\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Вы уверены [Y - да/n - нет]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Вы уверены? [Y - да/n - нет] \"\n \n #: builtin/bisect--helper.c:418\n msgid \"no terms defined\"\n@@ -9870,8 +9870,8 @@ msgstr \"\"\n #. translation. The program will only accept English input\n #. at this point.\n #: builtin/bisect--helper.c:825\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Вы уверены, что хотите, чтобы я сделал это [Y] - да/[n] - нет? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Вы уверены, что хотите, чтобы я сделал это? [Y] - да/[n] - нет \"\n \n #: builtin/bisect--helper.c:843\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/sv.po b/po/sv.po\nindex e3b17b6a0ef..6ccb7e7421c 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -11173,8 +11173,8 @@ msgstr \"utför bisect med endast en %s incheckning\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Är du säker [Y=ja/N=nej]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Är du säker? [Y=ja/N=nej] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11254,8 +11254,8 @@ msgstr \"Du måste starta med \\\"git bisect start\\\"\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Vill du att jag ska göra det åt dig [Y=ja/N=nej]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Vill du att jag ska göra det åt dig? [Y=ja/N=nej] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/tr.po b/po/tr.po\nindex 06870900c4e..686b21459a3 100644\n--- a/po/tr.po\n+++ b/po/tr.po\n@@ -11238,8 +11238,8 @@ msgstr \"yalnızca bir %s işlemesi ile ikili arama yapılıyor\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Emin misiniz [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Emin misiniz? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11317,8 +11317,8 @@ msgstr \"\\\"git bisect start\\\" ile başlamalısınız\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Bunu sizin yerinize benim yapmamı ister misiniz? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/vi.po b/po/vi.po\nindex be197ab594f..bfb84bd0049 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -11235,8 +11235,8 @@ msgstr \"chỉ thực hiện việc bisect với một lần chuyển giao %s\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"Bạn có chắc chắn chưa [Y/n]? \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"Bạn có chắc chắn chưa? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11314,8 +11314,8 @@ msgstr \"Bạn cần khởi đầu bằng \\\"git bisect start\\\"\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"Bạn có muốn tôi thực hiện điều này cho bạn không? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex 60ffa45f7a0..9131b440e6f 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -11092,8 +11092,8 @@ msgstr \"在只有一个 %s 提交的情况下二分查找\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"您确认么[Y/n]？ \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"您确认么? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11169,8 +11169,8 @@ msgstr \"您需要执行 \\\"git bisect start\\\" 来开始\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"您想让我为您这样做么[Y/n]？ \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"您想让我为您这样做么? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\ndiff --git a/po/zh_TW.po b/po/zh_TW.po\nindex f1df8b60a91..80e156c94fc 100644\n--- a/po/zh_TW.po\n+++ b/po/zh_TW.po\n@@ -10958,8 +10958,8 @@ msgstr \"在只有一個 %s 提交的情況下二分搜尋\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:373\n-msgid \"Are you sure [Y/n]? \"\n-msgstr \"您確認嗎[Y/n]？ \"\n+msgid \"Are you sure? [Y/n] \"\n+msgstr \"您確認嗎? [Y/n] \"\n \n #: builtin/bisect--helper.c:434\n msgid \"no terms defined\"\n@@ -11036,8 +11036,8 @@ msgstr \"您需要執行 \\\"git bisect start\\\" 來開始\\n\"\n #. at this point.\n #.\n #: builtin/bisect--helper.c:841\n-msgid \"Do you want me to do it for you [Y/n]? \"\n-msgstr \"您想讓我為您這樣做嗎[Y/n]？ \"\n+msgid \"Do you want me to do it for you? [Y/n] \"\n+msgstr \"您想讓我為您這樣做嗎? [Y/n] \"\n \n #: builtin/bisect--helper.c:859\n msgid \"Please call `--bisect-state` with at least one argument\"\n-- \ngitgitgadget\n\n"},{"id":"444248","messageId":"4a70e569f8a292ef37d8e928f279d0b999b3982d.1639678739.git.gitgitgadget@gmail.com","threadId":"57087","inReplyTo":"pull.1166.v3.git.git.1639678734.gitgitgadget@gmail.com","subject":"[PATCH v3 3/4] add-patch: normalize format string of yes/no prompt","fromName":"Kashav Madan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-16T18:18:53Z","receivedAt":"2021-12-16T18:19:11Z","isPatch":true,"sender":{"key":"name:Kashav Madan","avatar":null},"body":"From: Kashav Madan <kshvmdn@gmail.com>\n\nMove the question mark in the prompt before the choices to be more\nconsistent with other similar prompts.\n\nSigned-off-by: Kashav Madan <kshvmdn@gmail.com>\n---\n add-patch.c | 4 ++--\n po/bg.po    | 2 +-\n po/ca.po    | 4 ++--\n po/de.po    | 4 ++--\n po/el.po    | 4 ++--\n po/es.po    | 6 +++---\n po/fr.po    | 4 ++--\n po/git.pot  | 2 +-\n po/id.po    | 4 ++--\n po/it.po    | 4 ++--\n po/ko.po    | 4 ++--\n po/pl.po    | 4 ++--\n po/pt_PT.po | 4 ++--\n po/ru.po    | 4 ++--\n po/sv.po    | 6 +++---\n po/tr.po    | 4 ++--\n po/vi.po    | 4 ++--\n po/zh_CN.po | 4 ++--\n po/zh_TW.po | 4 ++--\n 19 files changed, 38 insertions(+), 38 deletions(-)\n\ndiff --git a/add-patch.c b/add-patch.c\nindex 8c41cdfe39b..9ff2d4f1749 100644\n--- a/add-patch.c\n+++ b/add-patch.c\n@@ -1245,8 +1245,8 @@ static int edit_hunk_loop(struct add_p_state *s,\n \t\t * of the word \"no\" does not start with n.\n \t\t */\n \t\tres = prompt_yesno(s, _(\"Your edited hunk does not apply. \"\n-\t\t\t\t\t\"Edit again (saying \\\"no\\\" discards!) \"\n-\t\t\t\t\t\"[y/n]? \"));\n+\t\t\t\t\t\"Edit again (saying \\\"no\\\" discards!)? \"\n+\t\t\t\t\t\"[y/n] \"));\n \t\tif (res < 1)\n \t\t\treturn -1;\n \t}\ndiff --git a/po/bg.po b/po/bg.po\nindex 10ba01d2817..5f768a72102 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -826,7 +826,7 @@ msgstr \"неуспешно изпълнение на „git apply --cached“\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Редактираното парче не може да се приложи.  Да се продължи ли с \"\n \"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ \"\ndiff --git a/po/ca.po b/po/ca.po\nindex d9798fd530e..8419c7fe04f 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -689,11 +689,11 @@ msgstr \"«git apply --cached» ha fallat\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]?\"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n]\"\n \" \"\n msgstr \"\"\n \"El tros editat no s'aplica. Editeu-lo de nou (si responeu «no» es \"\n-\"descartarà) [y/n]? \"\n+\"descartarà)? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/de.po b/po/de.po\nindex 442627f3448..367cd73c5a4 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -654,10 +654,10 @@ msgstr \"'git apply --cached' schlug fehl.\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\\n\"\n-\"Erneut bearbeiten? (\\\"n\\\" verwirft Bearbeitung!) [y/n]?\"\n+\"Erneut bearbeiten? (\\\"n\\\" verwirft Bearbeitung!)? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/el.po b/po/el.po\nindex b826b73d460..f5a7936b4a6 100644\n--- a/po/el.po\n+++ b/po/el.po\n@@ -20795,10 +20795,10 @@ msgstr \"\"\n #. of the word \"no\" does not start with n.\n #: git-add--interactive.perl:1213\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Η επεξεργασμένη αλλαγή σας δεν εφαρμόζεται. Να γίνει επεξεργασία πάλι (με \\\"n\"\n-\"\\\" απορρίπτεται!) [y/n];\"\n+\"\\\" απορρίπτεται!); [y/n] \"\n \n #: git-add--interactive.perl:1222\n msgid \"\"\ndiff --git a/po/es.po b/po/es.po\nindex 8e9143131d0..3877b1351e6 100644\n--- a/po/es.po\n+++ b/po/es.po\n@@ -644,10 +644,10 @@ msgstr \"falló 'git apply --cached'\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n-\"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \\\"no\\\" descarta!) [y/\"\n-\"n]? \"\n+\"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \\\"no\\\" descarta!)? [y/\"\n+\"n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/fr.po b/po/fr.po\nindex ebb5b73ce3b..11b83570f71 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -714,10 +714,10 @@ msgstr \"'git apply --cached' a échoué\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Votre section éditée ne s'applique pas. L'éditer à nouveau (\\\"no\\\" \"\n-\"l'élimine !) [y|n] ? \"\n+\"l'élimine !) ? [y|n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/git.pot b/po/git.pot\nindex 4ef2f39b950..0fe5805d8ec 100644\n--- a/po/git.pot\n+++ b/po/git.pot\n@@ -567,7 +567,7 @@ msgstr \"\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \n #: add-patch.c:1290\ndiff --git a/po/id.po b/po/id.po\nindex b41e290c94a..3a9f703a106 100644\n--- a/po/id.po\n+++ b/po/id.po\n@@ -631,10 +631,10 @@ msgstr \"'git apply --cached' gagal\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Bingkah Anda tak diterapkan. Sunting lagi (bilang \\\"n\\\" untuk \\\"tidak\\\" \"\n-\"buang!) [y/n]?\"\n+\"buang!)? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/it.po b/po/it.po\nindex b4322699060..c077320c697 100644\n--- a/po/it.po\n+++ b/po/it.po\n@@ -660,10 +660,10 @@ msgstr \"'git apply --cached' non riuscito\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1241 git-add--interactive.perl:1244\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"L'hunk modificato non può essere applicato senza problemi. Modificarlo di \"\n-\"nuovo (se rispondi \\\"no\\\", sarà eliminato!) [y/n]? \"\n+\"nuovo (se rispondi \\\"no\\\", sarà eliminato!)? [y/n] \"\n \n #: add-patch.c:1284\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/ko.po b/po/ko.po\nindex 29c7a6896fd..1ae95afe670 100644\n--- a/po/ko.po\n+++ b/po/ko.po\n@@ -17274,10 +17274,10 @@ msgstr \"부분 편집 파일을 읽기용으로 여는데 실패: '%s'\"\n #. of the word \"no\" does not start with n.\n #: git-add--interactive.perl:1213\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"편집한 부분이 적용되지 않습니다. 다시 편집하시겠습니까 (\\\"no\\\"라고 하면 버립\"\n-\"니다!) [y/n]? \"\n+\"니다!)? [y/n] \"\n \n #: git-add--interactive.perl:1222\n msgid \"\"\ndiff --git a/po/pl.po b/po/pl.po\nindex 4d79160a15b..f9b6bc59dde 100644\n--- a/po/pl.po\n+++ b/po/pl.po\n@@ -689,10 +689,10 @@ msgstr \"„git apply --cached” nie powiodło się\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Zmieniony skrawek się nie stosuje.  Edytować ponownie (odpowiedź „nie” go \"\n-\"porzuci!) [y/n]? \"\n+\"porzuci!)? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/pt_PT.po b/po/pt_PT.po\nindex 06da638e981..8cabcf9729c 100644\n--- a/po/pt_PT.po\n+++ b/po/pt_PT.po\n@@ -844,10 +844,10 @@ msgstr \"'git apply --cached' falhou\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Problema na submissão de pedaço editado. Editar de novo (responder \\\"n\\\" \"\n-\"para \\\"não\\\" descarta!) [y/n]? \"\n+\"para \\\"não\\\" descarta!)? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/ru.po b/po/ru.po\nindex cc886655cfd..d8bc1acd810 100644\n--- a/po/ru.po\n+++ b/po/ru.po\n@@ -577,9 +577,9 @@ msgstr \"\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1246 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]?\"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n]\"\n \" \"\n-msgstr \"Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? \"\n+msgstr \"Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!)? [y/n] \"\n \n #: add-patch.c:1289\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/sv.po b/po/sv.po\nindex ea9fe33cf9e..685294c8bac 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -632,10 +632,10 @@ msgstr \"\\\"git apply --cached\\\" misslyckades\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n-\"Ditt redigerade stycke kan inte appliceras. Redigera igen (\\\"nej\\\" kastar!) \"\n-\"[y/n]? \"\n+\"Ditt redigerade stycke kan inte appliceras. Redigera igen (\\\"nej\\\" kastar!)? \"\n+\"[y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/tr.po b/po/tr.po\nindex 46a1ae5a8d2..4c7cea44183 100644\n--- a/po/tr.po\n+++ b/po/tr.po\n@@ -716,10 +716,10 @@ msgstr \"'git apply --cached' başarısız oldu\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\\\"n (hayır)\\\" \"\n-\"ıskartaya çıkarır!) [y/n]? \"\n+\"ıskartaya çıkarır!)? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/vi.po b/po/vi.po\nindex d9c0130af2b..0aed6d2d0a4 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -641,10 +641,10 @@ msgstr \"“git apply --cached” gặp lỗi\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n msgstr \"\"\n \"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 \"\n-\"bỏ!) [y/n]? \"\n+\"bỏ!)? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex a51c81bfc4a..e785a8156ae 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -754,8 +754,8 @@ msgstr \"'git apply --cached' 失败\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n-msgstr \"您的编辑块不能被应用。重新编辑（选择 \\\"no\\\" 丢弃！） [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n+msgstr \"您的编辑块不能被应用。重新编辑（选择 \\\"no\\\" 丢弃！）? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\ndiff --git a/po/zh_TW.po b/po/zh_TW.po\nindex c5b5f756f33..a1fb6b5267a 100644\n--- a/po/zh_TW.po\n+++ b/po/zh_TW.po\n@@ -637,8 +637,8 @@ msgstr \"「git apply --cached」失敗\"\n #. of the word \"no\" does not start with n.\n #: add-patch.c:1247 git-add--interactive.perl:1242\n msgid \"\"\n-\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!) [y/n]? \"\n-msgstr \"未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? \"\n+\"Your edited hunk does not apply. Edit again (saying \\\"no\\\" discards!)? [y/n] \"\n+msgstr \"未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！）? [y/n] \"\n \n #: add-patch.c:1290\n msgid \"The selected hunks do not apply to the index!\"\n-- \ngitgitgadget\n\n"},{"id":"444249","messageId":"fc913ef31fbd2cc57c915926d04c9ce8cbcec4ef.1639678742.git.gitgitgadget@gmail.com","threadId":"57087","inReplyTo":"pull.1166.v3.git.git.1639678734.gitgitgadget@gmail.com","subject":"[PATCH v3 4/4] help: make auto-correction prompt more consistent","fromName":"Kashav Madan via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-12-16T18:18:54Z","receivedAt":"2021-12-16T18:19:13Z","isPatch":true,"sender":{"key":"name:Kashav Madan","avatar":null},"body":"From: Kashav Madan <kshvmdn@gmail.com>\n\nThere are three callsites of git_prompt() that ask the user for \"yes/no\"\nconfirmation, but the one in help.c, used for auto-correction, is\nformatted differently from the others. Update that format string to make\nthe prompt look more consistent, by adding a space after the prompt and\nenclosing the choices in [] instead of ().\n\nSigned-off-by: Kashav Madan <kshvmdn@gmail.com>\n---\n help.c      | 2 +-\n po/bg.po    | 4 ++--\n po/ca.po    | 4 ++--\n po/de.po    | 4 ++--\n po/es.po    | 4 ++--\n po/fr.po    | 4 ++--\n po/git.pot  | 2 +-\n po/id.po    | 2 +-\n po/pl.po    | 4 ++--\n po/sv.po    | 4 ++--\n po/tr.po    | 4 ++--\n po/vi.po    | 4 ++--\n po/zh_CN.po | 4 ++--\n po/zh_TW.po | 4 ++--\n 14 files changed, 25 insertions(+), 25 deletions(-)\n\ndiff --git a/help.c b/help.c\nindex 973e47cdc30..2cd08b199c2 100644\n--- a/help.c\n+++ b/help.c\n@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)\n \t\telse if (autocorrect == AUTOCORRECT_PROMPT) {\n \t\t\tchar *answer;\n \t\t\tstruct strbuf msg = STRBUF_INIT;\n-\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n+\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? [y/N] \"), assumed);\n \t\t\tanswer = git_prompt(msg.buf, PROMPT_ECHO);\n \t\t\tstrbuf_release(&msg);\n \t\t\tif (!(starts_with(answer, \"y\") ||\ndiff --git a/po/bg.po b/po/bg.po\nindex 5f768a72102..5933ea51b06 100644\n--- a/po/bg.po\n+++ b/po/bg.po\n@@ -4800,8 +4800,8 @@ msgstr \"\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Да се изпълни „%s“ вместо това? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Да се изпълни „%s“ вместо това? [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/ca.po b/po/ca.po\nindex 8419c7fe04f..0c1084d8733 100644\n--- a/po/ca.po\n+++ b/po/ca.po\n@@ -4665,8 +4665,8 @@ msgstr \"El procés continuarà, pressuposant que volíeu dir «%s».\"\n \n #: help.c:646\n #, c-format, fuzzy\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Voleu executar «%s»? (s/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Voleu executar «%s»? [s/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/de.po b/po/de.po\nindex 367cd73c5a4..4afe6f94325 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -4620,8 +4620,8 @@ msgstr \"Setze fort unter der Annahme, dass Sie '%s' meinten.\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Stattdessen '%s' ausführen? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Stattdessen '%s' ausführen? [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/es.po b/po/es.po\nindex 3877b1351e6..472a633a8f2 100644\n--- a/po/es.po\n+++ b/po/es.po\n@@ -4565,8 +4565,8 @@ msgstr \"Continuando asumiendo que quisiste decir '%s'.\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Ejecutar '%s' en su lugar? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Ejecutar '%s' en su lugar? [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/fr.po b/po/fr.po\nindex 11b83570f71..b9c111c096b 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -4698,8 +4698,8 @@ msgstr \"Continuons en supposant que vous avez voulu dire '%s'.\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Lancer '%s' à la place ? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Lancer '%s' à la place ? [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/git.pot b/po/git.pot\nindex 0fe5805d8ec..c4ff320187a 100644\n--- a/po/git.pot\n+++ b/po/git.pot\n@@ -4246,7 +4246,7 @@ msgstr \"\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n msgstr \"\"\n \n #: help.c:654\ndiff --git a/po/id.po b/po/id.po\nindex 3a9f703a106..4ffe1005120 100644\n--- a/po/id.po\n+++ b/po/id.po\n@@ -4415,7 +4415,7 @@ msgstr \"Melanjutkan di bawah asumsi bahwa maksud Anda '%s'.\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n msgstr \"\"\n \n #: help.c:654\ndiff --git a/po/pl.po b/po/pl.po\nindex f9b6bc59dde..bfbb2be5ca2 100644\n--- a/po/pl.po\n+++ b/po/pl.po\n@@ -4591,8 +4591,8 @@ msgstr \"Zakładam dalej, że chodziło o „%s”.\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Wykonać zamiast tego „%s”? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Wykonać zamiast tego „%s”? [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/sv.po b/po/sv.po\nindex 685294c8bac..a43e1072b53 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -4528,8 +4528,8 @@ msgstr \"Fortsätter under förutsättningen att du menade \\\"%s\\\".\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Köra \\\"%s\\\" istället? (j/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Köra \\\"%s\\\" istället? [j/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/tr.po b/po/tr.po\nindex 4c7cea44183..40d5ec8d703 100644\n--- a/po/tr.po\n+++ b/po/tr.po\n@@ -4597,8 +4597,8 @@ msgstr \"'%s' demek istediğiniz varsayılarak sürdürülüyor.\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Bunun yerine '%s' çalıştır? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Bunun yerine '%s' çalıştır? [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/vi.po b/po/vi.po\nindex 0aed6d2d0a4..b8500e04f99 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -4535,8 +4535,8 @@ msgstr \"Tiếp tục và coi rằng ý bạn là “%s”.\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"Chạy “%s” để thay thế? (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"Chạy “%s” để thay thế? [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex e785a8156ae..475c43f0ea2 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -4546,8 +4546,8 @@ msgstr \"假定您想要的是 '%s' 并继续。\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"取而代之运行 '%s' ？ (y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"取而代之运行 '%s' ？ [y/N] \"\n \n #: help.c:654\n #, c-format\ndiff --git a/po/zh_TW.po b/po/zh_TW.po\nindex a1fb6b5267a..8727a72e182 100644\n--- a/po/zh_TW.po\n+++ b/po/zh_TW.po\n@@ -4411,8 +4411,8 @@ msgstr \"假定你想要的是 '%s' 並繼續。\"\n \n #: help.c:646\n #, c-format\n-msgid \"Run '%s' instead? (y/N)\"\n-msgstr \"改執行「%s」？(y/N)\"\n+msgid \"Run '%s' instead? [y/N] \"\n+msgstr \"改執行「%s」？[y/N] \"\n \n #: help.c:654\n #, c-format\n-- \ngitgitgadget\n"},{"id":"444260","messageId":"xmqq35ms9qxg.fsf@gitster.g","threadId":"57087","inReplyTo":"20211216062709.b4tcagi6qcqhasrh@gmail.com","subject":"Re: [PATCH] help: add space after autocorrect prompt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-16T21:32:27Z","receivedAt":"2021-12-16T21:32:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Altmanninger <aclopte@gmail.com> writes:\n\n>>  - It does not leave a SP before where the end-user input goes;\n>>  - It append (y/N) _after_ question mark;\n>\n> I actually prefer this one;\n>\n> \tRun 'status' instead? [y/N] \n>\n> sounds better than\n>\n> \tRun 'status' instead [y/N]? \n>\n> but that's not a strong opinion.\n\nIt is fine to have your own preference, but we are discussing to\nmake the three, two of which use \"[choices]? \" while only one uses\n\"? (choices)\", consistent.  \n\nSo I'd prefer to see us turn the odd man out to do \"[choices]? \"\nfirst.  Adjusting to your personal preference can be proposed after\nthe dust settles for the consistency fix.\n\nThanks.\n"},{"id":"444263","messageId":"xmqqy24k8c0j.fsf@gitster.g","threadId":"57087","inReplyTo":"e7672e70cc937ef3aaab9a36199470e01f6676a8.1639678735.git.gitgitgadget@gmail.com","subject":"Re: [PATCH v3 1/4] bisect--helper: normalize format string of yes/no prompts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-16T21:39:56Z","receivedAt":"2021-12-16T21:40:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Kashav Madan via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Kashav Madan <kshvmdn@gmail.com>\n>\n> Both callers of git_prompt in bisect--helper.c ask the user for yes/no\n> confirmation. They both place the question mark after the choices,\n> however this is inconsistent with how most UNIX-y tools do it. Update\n> the format string to exclude the choices from the question.\n\nIs there somewhere that the claim can be confirmed?  I am not having\nmuch luck with queries like\n\nhttps://www.google.com/search?q=prompt+question+mark+and+choices\n\nthat gave https://home.csulb.edu/~murdock/choice.html the most\nrelevant page X-<.\n\nI personally do not think this step is worth doing, but in any case,\nNEVER touch po/* directory when you are updating code and strings in\nthe code.  It is something our i18n coordinator will do at certain\npoint in the release cycle.\n"},{"id":"444265","messageId":"xmqqlf0k8bko.fsf@gitster.g","threadId":"57087","inReplyTo":"xmqqy24k8c0j.fsf@gitster.g","subject":"Re: [PATCH v3 1/4] bisect--helper: normalize format string of yes/no prompts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-16T21:49:27Z","receivedAt":"2021-12-16T21:49:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> \"Kashav Madan via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n>\n>> From: Kashav Madan <kshvmdn@gmail.com>\n>>\n>> Both callers of git_prompt in bisect--helper.c ask the user for yes/no\n>> confirmation. They both place the question mark after the choices,\n>> however this is inconsistent with how most UNIX-y tools do it. Update\n>> the format string to exclude the choices from the question.\n>\n> Is there somewhere that the claim can be confirmed?  I am not having\n> much luck with queries like\n>\n> https://www.google.com/search?q=prompt+question+mark+and+choices\n>\n> that gave https://home.csulb.edu/~murdock/choice.html the most\n> relevant page X-<.\n>\n> I personally do not think this step is worth doing, but in any case,\n> NEVER touch po/* directory when you are updating code and strings in\n> the code.  It is something our i18n coordinator will do at certain\n> point in the release cycle.\n\nAfter reading the series through, it seems all four patches share\nthe same problem (i.e. swapping ? and choices, and touching po/*).\n\nI'll discard this round, and instead queue the v2 from you, using\nthe proposed log message to what I wrote for you during my review.\n\nThanks for your first contribution, and welcome to the Git\ndevelopment community ;-)\n\n----- >8 --------- >8 --------- >8 --------- >8 --------- >8 -----\nFrom: Kashav Madan <kshvmdn@gmail.com>\nDate: Wed, 15 Dec 2021 22:58:58 +0000\nSubject: [PATCH] help: make auto-correction prompt more consistent\n\nThere are three callsites of git_prompt() helper function that ask a\n\"yes/no\" question to the end user, but one of them in help.c that\nasks if the suggested auto-correction is OK, which is given when the\nuser makes a possible typo in a Git subcommand name, is formatted\ndifferently from the others.\n\nUpdate the format string to make the prompt string look more\nconsistent.\n\nSigned-off-by: Kashav Madan <kshvmdn@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n help.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/help.c b/help.c\nindex 973e47cdc3..71444906dd 100644\n--- a/help.c\n+++ b/help.c\n@@ -643,7 +643,7 @@ const char *help_unknown_cmd(const char *cmd)\n \t\telse if (autocorrect == AUTOCORRECT_PROMPT) {\n \t\t\tchar *answer;\n \t\t\tstruct strbuf msg = STRBUF_INIT;\n-\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead? (y/N)\"), assumed);\n+\t\t\tstrbuf_addf(&msg, _(\"Run '%s' instead [y/N]? \"), assumed);\n \t\t\tanswer = git_prompt(msg.buf, PROMPT_ECHO);\n \t\t\tstrbuf_release(&msg);\n \t\t\tif (!(starts_with(answer, \"y\") ||\n-- \n2.34.1-469-g0a17e94afe\n\n"}]}