{"thread":{"id":"49205","subject":"[PATCH] i18n: fix mistakes in translated strings","startedAt":"2018-08-23T21:01:31Z","lastAt":"2018-09-04T19:47:19Z","messageCount":11,"participants":["Jean-Noël Avila","Junio C Hamano","Jean-Noël AVILA","Jiang Xin","Jean-Noel Avila","Ævar Arnfjörð Bjarmason","Duy Nguyen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"356409","messageId":"20180823210056.27489-1-jn.avila@free.fr","threadId":"49205","inReplyTo":null,"subject":"[PATCH] i18n: fix mistakes in translated strings","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2018-08-23T21:00:56Z","receivedAt":"2018-08-23T21:01:31Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Fix typos and convert a question which does not expect to be replied\nto a simple advice.\n\nSigned-off-by: Jean-Noël Avila \n---\n builtin/submodule--helper.c | 2 +-\n config.c | 2 +-\n sequencer.c | 2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\nindex 2bcc70fdfe..b56028ba9d 100644\n--- a/builtin/submodule--helper.c\n+++ b/builtin/submodule--helper.c\n@@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n \t\targv_array_pushv(&cpr.args, info->argv);\n \n \t\tif (run_command(&cpr))\n-\t\t\tdie(_(\"run_command returned non-zero status while\"\n+\t\t\tdie(_(\"run_command returned non-zero status while \"\n \t\t\t\t\"recursing in the nested submodules of %s\\n.\"),\n \t\t\t\tdisplaypath);\n \t}\ndiff --git a/config.c b/config.c\nindex 9a0b10d4bc..3461993f0a 100644\n--- a/config.c\n+++ b/config.c\n@@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_(\n \"\t%s\\n\"\n \"from\\n\"\n \"\t%s\\n\"\n-\"Do you have circular includes?\");\n+\"This might be due to circular includes.\");\n static int handle_path_include(const char *path, struct config_include_data *inc)\n {\n \tint ret = 0;\ndiff --git a/sequencer.c b/sequencer.c\nindex 65d371c746..84bf598c3e 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -720,7 +720,7 @@ static const char *read_author_ident(struct strbuf *buf)\n \t/* dequote values and construct ident line in-place */\n \tfor (in = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {\n \t\tif (!skip_prefix(in, keys[i], (const char **)&in)) {\n-\t\t\twarning(_(\"could not parse '%s' (looking for '%s'\"),\n+\t\t\twarning(_(\"could not parse '%s' (looking for '%s')\"),\n \t\t\t\trebase_path_author_script(), keys[i]);\n \t\t\treturn NULL;\n \t\t}\n-- \n2.18.0\n\n"},{"id":"356416","messageId":"xmqqwosghiw8.fsf@gitster-ct.c.googlers.com","threadId":"49205","inReplyTo":"20180823210056.27489-1-jn.avila@free.fr","subject":"Re: [PATCH] i18n: fix mistakes in translated strings","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-08-23T21:28:55Z","receivedAt":"2018-08-23T21:28:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jean-Noël Avila writes:\n\n> -\t\t\tdie(_(\"run_command returned non-zero status while\"\n> +\t\t\tdie(_(\"run_command returned non-zero status while \"\n> \t\t\t\t\"recursing in the nested submodules of %s\\n.\"),\n\nObviously good.\n\n> diff --git a/config.c b/config.c\n> index 9a0b10d4bc..3461993f0a 100644\n> --- a/config.c\n> +++ b/config.c\n> @@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_(\n> \"\t%s\\n\"\n> \"from\\n\"\n> \"\t%s\\n\"\n> -\"Do you have circular includes?\");\n> +\"This might be due to circular includes.\");\n\nOK.\n\n> diff --git a/sequencer.c b/sequencer.c\n> index 65d371c746..84bf598c3e 100644\n> --- a/sequencer.c\n> +++ b/sequencer.c\n> @@ -720,7 +720,7 @@ static const char *read_author_ident(struct strbuf *buf)\n> \t/* dequote values and construct ident line in-place */\n> \tfor (in = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {\n> \t\tif (!skip_prefix(in, keys[i], (const char **)&in)) {\n> -\t\t\twarning(_(\"could not parse '%s' (looking for '%s'\"),\n> +\t\t\twarning(_(\"could not parse '%s' (looking for '%s')\"),\n\nGood. Thanks.\n"},{"id":"357218","messageId":"4909221.b3sI1bcdIh@cayenne","threadId":"49205","inReplyTo":"xmqqwosghiw8.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] i18n: fix mistakes in translated strings","fromName":"Jean-Noël AVILA","fromEmail":"jn.avila@free.fr","sentAt":"2018-09-03T17:52:19Z","receivedAt":"2018-09-03T17:52:23Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"Le jeudi 23 août 2018, 23:28:55 CEST Junio C Hamano a écrit :\n> Jean-Noël Avila writes:\n> \n> > -\t\t\tdie(_(\"run_command returned non-zero status while\"\n> > +\t\t\tdie(_(\"run_command returned non-zero status while \"\n> > \t\t\t\t\"recursing in the nested submodules of %s\\n.\"),\n> \n> Obviously good.\n> \n> > diff --git a/config.c b/config.c\n> > index 9a0b10d4bc..3461993f0a 100644\n> > --- a/config.c\n> > +++ b/config.c\n> > @@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_(\n> > \"\t%s\\n\"\n> > \"from\\n\"\n> > \"\t%s\\n\"\n> > -\"Do you have circular includes?\");\n> > +\"This might be due to circular includes.\");\n> \n> OK.\nHello,\n\nHas this patch been integrated in a -rc? In which case, would a new round of translation need to be triggered?\n\nThanks\n\nJN\n\n\n\n"},{"id":"357284","messageId":"CANYiYbGt=jK6=wAat8UmQBBUNrKe35ALFtBJQJAtmF6CoNnEsw@mail.gmail.com","threadId":"49205","inReplyTo":"4909221.b3sI1bcdIh@cayenne","subject":"[L10N] Kickoff for Git 2.19.0 round 2","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2018-09-04T01:01:49Z","receivedAt":"2018-09-04T01:21:27Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Hi,\n\nLet's start new round of l10n for Git 2.19.0. It includes fixes from @jnavila.\n\nYou can get it from the usual place:\n\n https://github.com/git-l10n/git-po/\n\nAs how to update your XX.po and help to translate Git, please see\n\"Updating a XX.po file\" and other sections in “po/README\" file.\n\n--\nJiang Xin\n\nJean-Noël AVILA 于2018年9月4日周二 上午1:52写道：\n>\n> Le jeudi 23 août 2018, 23:28:55 CEST Junio C Hamano a écrit :\n> > Jean-Noël Avila writes:\n> >\n> > > - die(_(\"run_command returned non-zero status while\"\n> > > + die(_(\"run_command returned non-zero status while \"\n> > > \"recursing in the nested submodules of %s\\n.\"),\n> >\n> > Obviously good.\n> >\n> > > diff --git a/config.c b/config.c\n> > > index 9a0b10d4bc..3461993f0a 100644\n> > > --- a/config.c\n> > > +++ b/config.c\n> > > @@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_(\n> > > \" %s\\n\"\n> > > \"from\\n\"\n> > > \" %s\\n\"\n> > > -\"Do you have circular includes?\");\n> > > +\"This might be due to circular includes.\");\n> >\n> > OK.\n> Hello,\n>\n> Has this patch been integrated in a -rc? In which case, would a new round of translation need to be triggered?\n>\n> Thanks\n>\n> JN\n>\n>\n>\n\n\n-- \n蒋鑫\n\n华为技术有限公司\n邮件: xin.jiang@huawei.com, worldhello.net@gmail.com\n博客: http://www.worldhello.net/\n微博: http://weibo.com/gotgit/\n电话: 18601196889\n"},{"id":"357285","messageId":"CANYiYbHmU=j+MwLTumJ+BK_0msyPBeux92wF8VqL9J04VOc-FQ@mail.gmail.com","threadId":"49205","inReplyTo":"20180823210056.27489-1-jn.avila@free.fr","subject":"Re: [PATCH] i18n: fix mistakes in translated strings","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2018-09-04T01:52:07Z","receivedAt":"2018-09-04T01:52:20Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Jean-Noël Avila 于2018年8月24日周五 上午5:02写道：\n> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\n> index 2bcc70fdfe..b56028ba9d 100644\n> --- a/builtin/submodule--helper.c\n> +++ b/builtin/submodule--helper.c\n> @@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n> argv_array_pushv(&cpr.args, info->argv);\n>\n> if (run_command(&cpr))\n> - die(_(\"run_command returned non-zero status while\"\n> + die(_(\"run_command returned non-zero status while \"\n> \"recursing in the nested submodules of %s\\n.\"),\n\nAny specific reason to put a period after newline?\nAnd there is another mistake just above this one:\n\n \"run_command returned non-zero status for %s\\n.\"\n\n-- \nJiang Xin\n"},{"id":"357294","messageId":"20180904141816.26398-1-jn.avila@free.fr","threadId":"49205","inReplyTo":"CANYiYbHmU=j+MwLTumJ+BK_0msyPBeux92wF8VqL9J04VOc-FQ@mail.gmail.com","subject":"[PATCH] i18n: fix dangling dot in die() messages","fromName":"Jean-Noel Avila","fromEmail":"jn.avila@free.fr","sentAt":"2018-09-04T14:18:16Z","receivedAt":"2018-09-04T14:56:19Z","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\nIt is not clear what the style guide for messages is.\n\n builtin/submodule--helper.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\nindex b56028ba9d..a011abfd7c 100644\n--- a/builtin/submodule--helper.c\n+++ b/builtin/submodule--helper.c\n@@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n \t\tprintf(_(\"Entering '%s'\\n\"), displaypath);\n \n \tif (info->argv[0] && run_command(&cp))\n-\t\tdie(_(\"run_command returned non-zero status for %s\\n.\"),\n+\t\tdie(_(\"run_command returned non-zero status for %s\"),\n \t\t\tdisplaypath);\n \n \tif (info->recursive) {\n@@ -543,7 +543,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n \n \t\tif (run_command(&cpr))\n \t\t\tdie(_(\"run_command returned non-zero status while \"\n-\t\t\t\t\"recursing in the nested submodules of %s\\n.\"),\n+\t\t\t\t\"recursing in the nested submodules of %s\"),\n \t\t\t\tdisplaypath);\n \t}\n \n-- \n2.18.0\n\n"},{"id":"357295","messageId":"CACBZZX6Bm-xOO-mvDzmRAA9Xu6HrBr5z+39dp4t6fTTCmNHKbQ@mail.gmail.com","threadId":"49205","inReplyTo":"20180904141816.26398-1-jn.avila@free.fr","subject":"Re: [PATCH] i18n: fix dangling dot in die() messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2018-09-04T15:05:29Z","receivedAt":"2018-09-04T15:05:43Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Tue, Sep 4, 2018 at 4:59 PM Jean-Noel Avila wrote:\n\nYour commit message says \"dangling dot\"...\n\n> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\n> index b56028ba9d..a011abfd7c 100644\n> --- a/builtin/submodule--helper.c\n> +++ b/builtin/submodule--helper.c\n> @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n> printf(_(\"Entering '%s'\\n\"), displaypath);\n>\n> if (info->argv[0] && run_command(&cp))\n> - die(_(\"run_command returned non-zero status for %s\\n.\"),\n> + die(_(\"run_command returned non-zero status for %s\"),\n\n...but here and below you're also removing the newline. Is this\nintended, and does it work as desired afterwards? I.e. were we just\nignoring the \\n?\n\n> displaypath);\n>\n> if (info->recursive) {\n> @@ -543,7 +543,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n>\n> if (run_command(&cpr))\n> die(_(\"run_command returned non-zero status while \"\n> - \"recursing in the nested submodules of %s\\n.\"),\n> + \"recursing in the nested submodules of %s\"),\n> displaypath);\n> }\n>\n> --\n> 2.18.0\n>\n"},{"id":"357296","messageId":"2f6f52c8-4b8a-a954-5ffb-5d66dfb97fe1@free.fr","threadId":"49205","inReplyTo":"CACBZZX6Bm-xOO-mvDzmRAA9Xu6HrBr5z+39dp4t6fTTCmNHKbQ@mail.gmail.com","subject":"Re: [PATCH] i18n: fix dangling dot in die() messages","fromName":"Jean-Noël Avila","fromEmail":"jn.avila@free.fr","sentAt":"2018-09-04T15:13:53Z","receivedAt":"2018-09-04T15:14:04Z","isPatch":true,"sender":{"key":"jn.avila@free.fr","avatar":"https://avatars.githubusercontent.com/u/156172?v=4"},"body":"On 04/09/2018, Ævar Arnfjörð Bjarmason wrote:On Tue, Sep 4, 2018 at 4:59\nPM Jean-Noel Avila wrote:\n> Your commit message says \"dangling dot\"...\n\nThe dot is dangling on its own line. I don't really catch why this would\nbe needed.\n\n>\n>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\n>> index b56028ba9d..a011abfd7c 100644\n>> --- a/builtin/submodule--helper.c\n>> +++ b/builtin/submodule--helper.c\n>> @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n>> printf(_(\"Entering '%s'\\n\"), displaypath);\n>>\n>> if (info->argv[0] && run_command(&cp))\n>> - die(_(\"run_command returned non-zero status for %s\\n.\"),\n>> + die(_(\"run_command returned non-zero status for %s\"),\n> ...but here and below you're also removing the newline. Is this\n> intended, and does it work as desired afterwards? I.e. were we just\n> ignoring the \\n?\n>\n\nI checked that usually, the die command does not have the final dot nor\na new line. But I'm not sure of what's intended here.\n\n"},{"id":"357297","messageId":"CACsJy8CgS1JzbKhV4T+xpCHnc8OrVEd5i-o-O-XamPxuPOZjMw@mail.gmail.com","threadId":"49205","inReplyTo":"CACBZZX6Bm-xOO-mvDzmRAA9Xu6HrBr5z+39dp4t6fTTCmNHKbQ@mail.gmail.com","subject":"Re: [PATCH] i18n: fix dangling dot in die() messages","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2018-09-04T15:16:05Z","receivedAt":"2018-09-04T15:16:35Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Tue, Sep 4, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason wrote:\n>\n> On Tue, Sep 4, 2018 at 4:59 PM Jean-Noel Avila wrote:\n>\n> Your commit message says \"dangling dot\"...\n>\n> > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\n> > index b56028ba9d..a011abfd7c 100644\n> > --- a/builtin/submodule--helper.c\n> > +++ b/builtin/submodule--helper.c\n> > @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n> > printf(_(\"Entering '%s'\\n\"), displaypath);\n> >\n> > if (info->argv[0] && run_command(&cp))\n> > - die(_(\"run_command returned non-zero status for %s\\n.\"),\n> > + die(_(\"run_command returned non-zero status for %s\"),\n>\n> ...but here and below you're also removing the newline. Is this\n> intended, and does it work as desired afterwards? I.e. were we just\n> ignoring the \\n?\n\ndie() already adds \\n, so this \\n adds a blank line. Since this is an\nerror, not part of any fancy text layout construction, I think the \\n\nhere could (and should) be removed\n-- \nDuy\n"},{"id":"357331","messageId":"xmqqr2i983ev.fsf@gitster-ct.c.googlers.com","threadId":"49205","inReplyTo":"CANYiYbHmU=j+MwLTumJ+BK_0msyPBeux92wF8VqL9J04VOc-FQ@mail.gmail.com","subject":"Re: [PATCH] i18n: fix mistakes in translated strings","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-09-04T19:32:08Z","receivedAt":"2018-09-04T19:32:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin writes:\n\n> Jean-Noël Avila 于2018年8月24日周五 上午5:02写道：\n>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\n>> index 2bcc70fdfe..b56028ba9d 100644\n>> --- a/builtin/submodule--helper.c\n>> +++ b/builtin/submodule--helper.c\n>> @@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n>> argv_array_pushv(&cpr.args, info->argv);\n>>\n>> if (run_command(&cpr))\n>> - die(_(\"run_command returned non-zero status while\"\n>> + die(_(\"run_command returned non-zero status while \"\n>> \"recursing in the nested submodules of %s\\n.\"),\n>\n> Any specific reason to put a period after newline?\n> And there is another mistake just above this one:\n>\n> \"run_command returned non-zero status for %s\\n.\"\n\nEmbarrassing X-<\n\nThese are not something the \"fix\" introduces (rather it is what it\nstill misses), though.\n\n\n"},{"id":"357334","messageId":"xmqqefe982pp.fsf@gitster-ct.c.googlers.com","threadId":"49205","inReplyTo":"2f6f52c8-4b8a-a954-5ffb-5d66dfb97fe1@free.fr","subject":"Re: [PATCH] i18n: fix dangling dot in die() messages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-09-04T19:47:14Z","receivedAt":"2018-09-04T19:47:19Z","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 04/09/2018, Ævar Arnfjörð Bjarmason wrote:On Tue, Sep 4, 2018 at 4:59\n> PM Jean-Noel Avila wrote:\n>> Your commit message says \"dangling dot\"...\n>\n> The dot is dangling on its own line. I don't really catch why this would\n> be needed.\n>\n>>\n>>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c\n>>> index b56028ba9d..a011abfd7c 100644\n>>> --- a/builtin/submodule--helper.c\n>>> +++ b/builtin/submodule--helper.c\n>>> @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,\n>>> printf(_(\"Entering '%s'\\n\"), displaypath);\n>>>\n>>> if (info->argv[0] && run_command(&cp))\n>>> - die(_(\"run_command returned non-zero status for %s\\n.\"),\n>>> + die(_(\"run_command returned non-zero status for %s\"),\n>> ...but here and below you're also removing the newline. Is this\n>> intended, and does it work as desired afterwards? I.e. were we just\n>> ignoring the \\n?\n>>\n>\n> I checked that usually, the die command does not have the final dot nor\n> a new line. But I'm not sure of what's intended here.\n\nYour changes look correct. Die() and friends terminate the message\non their own, so a trailing newline in the message is usually a\nmistake.\n"}]}