{"thread":{"id":"50452","subject":"[PATCH] Fix typos in translatable strings for v2.21.0","startedAt":"2019-02-09T21:32:05Z","lastAt":"2019-02-11T20:57:33Z","messageCount":6,"participants":["Jean-Noël Avila","Jean-Noël AVILA","Jiang Xin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"368944","messageId":"20190209213044.29539-1-jn.avila@free.fr","threadId":"50452","inReplyTo":null,"subject":"[PATCH] Fix typos in translatable strings for v2.21.0","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2019-02-09T21:30:44Z","receivedAt":"2019-02-09T21:32:05Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Signed-off-by: Jean-Noël Avila \n---\n builtin/bisect--helper.c | 4 ++--\n builtin/fetch.c | 2 +-\n builtin/rebase.c | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c\nindex c1cff32661..e7325fe37f 100644\n--- a/builtin/bisect--helper.c\n+++ b/builtin/bisect--helper.c\n@@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)\n \t\t\targv_array_clear(&argv);\n \t\t\treturn error(_(\"could not check out original\"\n \t\t\t\t \" HEAD '%s'. Try 'git bisect\"\n-\t\t\t\t \"reset '.\"), branch.buf);\n+\t\t\t\t \" reset '.\"), branch.buf);\n \t\t}\n \t\targv_array_clear(&argv);\n \t}\n@@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)\n \t\tOPT_BOOL(0, \"no-checkout\", &no_checkout,\n \t\t\t N_(\"update BISECT_HEAD instead of checking out the current commit\")),\n \t\tOPT_BOOL(0, \"no-log\", &nolog,\n-\t\t\t N_(\"no log for BISECT_WRITE \")),\n+\t\t\t N_(\"no log for BISECT_WRITE\")),\n \t\tOPT_END()\n \t};\n \tstruct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 5a09fe24cd..b620fd54b4 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)\n \tif (strcmp(remote->name, repository_format_partial_clone)) {\n \t\tif (filter_options.choice)\n \t\t\tdie(_(\"--filter can only be used with the remote \"\n-\t\t\t \"configured in extensions.partialclone\"));\n+\t\t\t \"configured in extensions.partialClone\"));\n \t\treturn;\n \t}\n \ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 96efd40901..1c39abc02e 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (options.reschedule_failed_exec && !is_interactive(&options))\n-\t\tdie(_(\"--reschedule-failed-exec requires an interactive rebase\"));\n+\t\tdie(_(\"%s requires an interactive rebase\", \"--reschedule-failed-exec\"));\n \n \tif (options.git_am_opts.argc) {\n \t\t/* all am options except -q are compatible only with --am */\n-- \n2.21.0.rc0\n\n"},{"id":"368945","messageId":"2525576.bgtBK8p9MF@cayenne","threadId":"50452","inReplyTo":"20190209213044.29539-1-jn.avila@free.fr","subject":"Re: [PATCH] Fix typos in translatable strings for v2.21.0","fromName":"Jean-Noël AVILA","fromEmail":"jn.avila@free.fr","sentAt":"2019-02-09T21:33:49Z","receivedAt":"2019-02-09T21:33:52Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Please forget this one. Will re-submit.\n\n\n"},{"id":"368999","messageId":"20190211064453.5205-1-jn.avila@free.fr","threadId":"50452","inReplyTo":"20190209213044.29539-1-jn.avila@free.fr","subject":"[PATCH] Fix typos in translatable strings for v2.21.0","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2019-02-11T06:44:53Z","receivedAt":"2019-02-11T06:45:02Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Signed-off-by: Jean-Noël Avila \n---\n builtin/bisect--helper.c | 4 ++--\n builtin/fetch.c | 2 +-\n builtin/rebase.c | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c\nindex c1cff32661..e7325fe37f 100644\n--- a/builtin/bisect--helper.c\n+++ b/builtin/bisect--helper.c\n@@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)\n \t\t\targv_array_clear(&argv);\n \t\t\treturn error(_(\"could not check out original\"\n \t\t\t\t \" HEAD '%s'. Try 'git bisect\"\n-\t\t\t\t \"reset '.\"), branch.buf);\n+\t\t\t\t \" reset '.\"), branch.buf);\n \t\t}\n \t\targv_array_clear(&argv);\n \t}\n@@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)\n \t\tOPT_BOOL(0, \"no-checkout\", &no_checkout,\n \t\t\t N_(\"update BISECT_HEAD instead of checking out the current commit\")),\n \t\tOPT_BOOL(0, \"no-log\", &nolog,\n-\t\t\t N_(\"no log for BISECT_WRITE \")),\n+\t\t\t N_(\"no log for BISECT_WRITE\")),\n \t\tOPT_END()\n \t};\n \tstruct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 5a09fe24cd..b620fd54b4 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)\n \tif (strcmp(remote->name, repository_format_partial_clone)) {\n \t\tif (filter_options.choice)\n \t\t\tdie(_(\"--filter can only be used with the remote \"\n-\t\t\t \"configured in extensions.partialclone\"));\n+\t\t\t \"configured in extensions.partialClone\"));\n \t\treturn;\n \t}\n \ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 96efd40901..7c7bc13e91 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t}\n \n \tif (options.reschedule_failed_exec && !is_interactive(&options))\n-\t\tdie(_(\"--reschedule-failed-exec requires an interactive rebase\"));\n+\t\tdie(_(\"%s requires an interactive rebase\"), \"--reschedule-failed-exec\");\n \n \tif (options.git_am_opts.argc) {\n \t\t/* all am options except -q are compatible only with --am */\n-- \n2.21.0.rc0\n\n"},{"id":"369002","messageId":"CANYiYbHoNV+6yi6a75oh2nPpihsqEu0Fq+8R_G6O+XOD5JogoQ@mail.gmail.com","threadId":"50452","inReplyTo":"20190211064453.5205-1-jn.avila@free.fr","subject":"Re: [PATCH] Fix typos in translatable strings for v2.21.0","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2019-02-11T08:09:12Z","receivedAt":"2019-02-11T08:09:26Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Jean-Noël Avila 于2019年2月11日周一 下午2:48写道：\n>\n> Signed-off-by: Jean-Noël Avila \n> ---\n> builtin/bisect--helper.c | 4 ++--\n> builtin/fetch.c | 2 +-\n> builtin/rebase.c | 2 +-\n> 3 files changed, 4 insertions(+), 4 deletions(-)\n\nThis re-roll is v2 (forgot suffix v2 in subject), and LGTM.\nDifference between v1 and v2:\n\n - die(_(\"--reschedule-failed-exec requires an\ninteractive rebase\"));\n -+ die(_(\"%s requires an interactive rebase\",\n\"--reschedule-failed-exec\"));\n ++ die(_(\"%s requires an interactive rebase\"),\n\"--reschedule-failed-exec\");\n\n>\n> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c\n> index c1cff32661..e7325fe37f 100644\n> --- a/builtin/bisect--helper.c\n> +++ b/builtin/bisect--helper.c\n> @@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)\n> argv_array_clear(&argv);\n> return error(_(\"could not check out original\"\n> \" HEAD '%s'. Try 'git bisect\"\n> - \"reset '.\"), branch.buf);\n> + \" reset '.\"), branch.buf);\n\nfixed typo: git bisectreset -> git bisect reset\n\n> }\n> argv_array_clear(&argv);\n> }\n> @@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)\n> OPT_BOOL(0, \"no-checkout\", &no_checkout,\n> N_(\"update BISECT_HEAD instead of checking out the current commit\")),\n> OPT_BOOL(0, \"no-log\", &nolog,\n> - N_(\"no log for BISECT_WRITE \")),\n> + N_(\"no log for BISECT_WRITE\")),\n\nstrip trailing writespace.\n\n> OPT_END()\n> };\n> struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };\n> diff --git a/builtin/fetch.c b/builtin/fetch.c\n> index 5a09fe24cd..b620fd54b4 100644\n> --- a/builtin/fetch.c\n> +++ b/builtin/fetch.c\n> @@ -1480,7 +1480,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)\n> if (strcmp(remote->name, repository_format_partial_clone)) {\n> if (filter_options.choice)\n> die(_(\"--filter can only be used with the remote \"\n> - \"configured in extensions.partialclone\"));\n> + \"configured in extensions.partialClone\"));\n\nUse camelcase for config variable name.\n\n> return;\n> }\n>\n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index 96efd40901..7c7bc13e91 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1434,7 +1434,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n> }\n>\n> if (options.reschedule_failed_exec && !is_interactive(&options))\n> - die(_(\"--reschedule-failed-exec requires an interactive rebase\"));\n> + die(_(\"%s requires an interactive rebase\"), \"--reschedule-failed-exec\");\n\nReuse l10n string (\"%s requires an interactive rebase\") defined in\nbuiltin/rebase.c:121:\n\n case REBASE_AM:\n die(_(\"%s requires an interactive rebase\"), option);\n\n>\n> if (options.git_am_opts.argc) {\n> /* all am options except -q are compatible only with --am */\n> --\n> 2.21.0.rc0\n>\n"},{"id":"369005","messageId":"1517c545-0028-56e4-fc58-fb3c6d3551fe@free.fr","threadId":"50452","inReplyTo":"CANYiYbHoNV+6yi6a75oh2nPpihsqEu0Fq+8R_G6O+XOD5JogoQ@mail.gmail.com","subject":"Re: [PATCH] Fix typos in translatable strings for v2.21.0","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2019-02-11T08:50:02Z","receivedAt":"2019-02-11T08:50:10Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"On 11 février 2019, Jiang Xin wrote:\n\n> Jean-Noël Avila 于2019年2月11日周一 下午2:48写道：\n>> Signed-off-by: Jean-Noël Avila \n>> ---\n>> builtin/bisect--helper.c | 4 ++--\n>> builtin/fetch.c | 2 +-\n>> builtin/rebase.c | 2 +-\n>> 3 files changed, 4 insertions(+), 4 deletions(-)\n> This re-roll is v2 (forgot suffix v2 in subject), and LGTM.\n> Difference between v1 and v2:\n>\n> - die(_(\"--reschedule-failed-exec requires an\n> interactive rebase\"));\n> -+ die(_(\"%s requires an interactive rebase\",\n> \"--reschedule-failed-exec\"));\n> ++ die(_(\"%s requires an interactive rebase\"),\n> \"--reschedule-failed-exec\");\nThanks for reviewing. The first submission was too hasty and did not\neven compile.\n"},{"id":"369035","messageId":"xmqqo97igi12.fsf@gitster-ct.c.googlers.com","threadId":"50452","inReplyTo":"1517c545-0028-56e4-fc58-fb3c6d3551fe@free.fr","subject":"Re: [PATCH] Fix typos in translatable strings for v2.21.0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-02-11T20:57:29Z","receivedAt":"2019-02-11T20:57:33Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Noël Avila writes:\n\n> On 11 février 2019, Jiang Xin wrote:\n>\n>> Jean-Noël Avila 于2019年2月11日周一 下午2:48写道：\n>>> Signed-off-by: Jean-Noël Avila \n>>> ---\n>>> builtin/bisect--helper.c | 4 ++--\n>>> builtin/fetch.c | 2 +-\n>>> builtin/rebase.c | 2 +-\n>>> 3 files changed, 4 insertions(+), 4 deletions(-)\n>> This re-roll is v2 (forgot suffix v2 in subject), and LGTM.\n>> Difference between v1 and v2:\n>>\n>> - die(_(\"--reschedule-failed-exec requires an\n>> interactive rebase\"));\n>> -+ die(_(\"%s requires an interactive rebase\",\n>> \"--reschedule-failed-exec\"));\n>> ++ die(_(\"%s requires an interactive rebase\"),\n>> \"--reschedule-failed-exec\");\n> Thanks for reviewing. The first submission was too hasty and did not\n> even compile.\n\nThanks, both. Will queue.\n"}]}