# [PATCH] i18n: fix mistakes in translated strings 11 messages from 2018-08-23 to 2018-09-04. Participants: Jean-Noël Avila, Junio C Hamano, Jean-Noël AVILA, Jiang Xin, Jean-Noel Avila, Ævar Arnfjörð Bjarmason, Duy Nguyen. Thread: https://gitlist.dev/t/49205 ## Jean-Noël Avila, 2018-08-23 21:00 Subject: [PATCH] i18n: fix mistakes in translated strings Message-ID: <20180823210056.27489-1-jn.avila@free.fr> URL: https://gitlist.dev/e/20180823210056.27489-1-jn.avila%40free.fr ``` Fix typos and convert a question which does not expect to be replied to a simple advice. Signed-off-by: Jean-Noël Avila --- builtin/submodule--helper.c | 2 +- config.c | 2 +- sequencer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 2bcc70fdfe..b56028ba9d 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, argv_array_pushv(&cpr.args, info->argv); if (run_command(&cpr)) - die(_("run_command returned non-zero status while" + die(_("run_command returned non-zero status while " "recursing in the nested submodules of %s\n."), displaypath); } diff --git a/config.c b/config.c index 9a0b10d4bc..3461993f0a 100644 --- a/config.c +++ b/config.c @@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_( " %s\n" "from\n" " %s\n" -"Do you have circular includes?"); +"This might be due to circular includes."); static int handle_path_include(const char *path, struct config_include_data *inc) { int ret = 0; diff --git a/sequencer.c b/sequencer.c index 65d371c746..84bf598c3e 100644 --- a/sequencer.c +++ b/sequencer.c @@ -720,7 +720,7 @@ static const char *read_author_ident(struct strbuf *buf) /* dequote values and construct ident line in-place */ for (in = buf->buf; i < 3 && in - buf->buf < buf->len; i++) { if (!skip_prefix(in, keys[i], (const char **)&in)) { - warning(_("could not parse '%s' (looking for '%s'"), + warning(_("could not parse '%s' (looking for '%s')"), rebase_path_author_script(), keys[i]); return NULL; } -- 2.18.0 ``` ## Junio C Hamano, 2018-08-23 21:28 Subject: Re: [PATCH] i18n: fix mistakes in translated strings Message-ID: URL: https://gitlist.dev/e/xmqqwosghiw8.fsf%40gitster-ct.c.googlers.com In-Reply-To: <20180823210056.27489-1-jn.avila@free.fr> ``` Jean-Noël Avila writes: > - die(_("run_command returned non-zero status while" > + die(_("run_command returned non-zero status while " > "recursing in the nested submodules of %s\n."), Obviously good. > diff --git a/config.c b/config.c > index 9a0b10d4bc..3461993f0a 100644 > --- a/config.c > +++ b/config.c > @@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_( > " %s\n" > "from\n" > " %s\n" > -"Do you have circular includes?"); > +"This might be due to circular includes."); OK. > diff --git a/sequencer.c b/sequencer.c > index 65d371c746..84bf598c3e 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -720,7 +720,7 @@ static const char *read_author_ident(struct strbuf *buf) > /* dequote values and construct ident line in-place */ > for (in = buf->buf; i < 3 && in - buf->buf < buf->len; i++) { > if (!skip_prefix(in, keys[i], (const char **)&in)) { > - warning(_("could not parse '%s' (looking for '%s'"), > + warning(_("could not parse '%s' (looking for '%s')"), Good. Thanks. ``` ## Jean-Noël AVILA, 2018-09-03 17:52 Subject: Re: [PATCH] i18n: fix mistakes in translated strings Message-ID: <4909221.b3sI1bcdIh@cayenne> URL: https://gitlist.dev/e/4909221.b3sI1bcdIh%40cayenne In-Reply-To: ``` Le jeudi 23 août 2018, 23:28:55 CEST Junio C Hamano a écrit : > Jean-Noël Avila writes: > > > - die(_("run_command returned non-zero status while" > > + die(_("run_command returned non-zero status while " > > "recursing in the nested submodules of %s\n."), > > Obviously good. > > > diff --git a/config.c b/config.c > > index 9a0b10d4bc..3461993f0a 100644 > > --- a/config.c > > +++ b/config.c > > @@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_( > > " %s\n" > > "from\n" > > " %s\n" > > -"Do you have circular includes?"); > > +"This might be due to circular includes."); > > OK. Hello, Has this patch been integrated in a -rc? In which case, would a new round of translation need to be triggered? Thanks JN ``` ## Jiang Xin, 2018-09-04 01:01 Subject: [L10N] Kickoff for Git 2.19.0 round 2 Message-ID: URL: https://gitlist.dev/e/CANYiYbGt%3DjK6%3DwAat8UmQBBUNrKe35ALFtBJQJAtmF6CoNnEsw%40mail.gmail.com In-Reply-To: <4909221.b3sI1bcdIh@cayenne> ``` Hi, Let's start new round of l10n for Git 2.19.0. It includes fixes from @jnavila. You can get it from the usual place: https://github.com/git-l10n/git-po/ As how to update your XX.po and help to translate Git, please see "Updating a XX.po file" and other sections in “po/README" file. -- Jiang Xin Jean-Noël AVILA 于2018年9月4日周二 上午1:52写道： > > Le jeudi 23 août 2018, 23:28:55 CEST Junio C Hamano a écrit : > > Jean-Noël Avila writes: > > > > > - die(_("run_command returned non-zero status while" > > > + die(_("run_command returned non-zero status while " > > > "recursing in the nested submodules of %s\n."), > > > > Obviously good. > > > > > diff --git a/config.c b/config.c > > > index 9a0b10d4bc..3461993f0a 100644 > > > --- a/config.c > > > +++ b/config.c > > > @@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_( > > > " %s\n" > > > "from\n" > > > " %s\n" > > > -"Do you have circular includes?"); > > > +"This might be due to circular includes."); > > > > OK. > Hello, > > Has this patch been integrated in a -rc? In which case, would a new round of translation need to be triggered? > > Thanks > > JN > > > -- 蒋鑫 华为技术有限公司 邮件: xin.jiang@huawei.com, worldhello.net@gmail.com 博客: http://www.worldhello.net/ 微博: http://weibo.com/gotgit/ 电话: 18601196889 ``` ## Jiang Xin, 2018-09-04 01:52 Subject: Re: [PATCH] i18n: fix mistakes in translated strings Message-ID: URL: https://gitlist.dev/e/CANYiYbHmU%3Dj%2BMwLTumJ%2BBK_0msyPBeux92wF8VqL9J04VOc-FQ%40mail.gmail.com In-Reply-To: <20180823210056.27489-1-jn.avila@free.fr> ``` Jean-Noël Avila 于2018年8月24日周五 上午5:02写道： > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > index 2bcc70fdfe..b56028ba9d 100644 > --- a/builtin/submodule--helper.c > +++ b/builtin/submodule--helper.c > @@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, > argv_array_pushv(&cpr.args, info->argv); > > if (run_command(&cpr)) > - die(_("run_command returned non-zero status while" > + die(_("run_command returned non-zero status while " > "recursing in the nested submodules of %s\n."), Any specific reason to put a period after newline? And there is another mistake just above this one: "run_command returned non-zero status for %s\n." -- Jiang Xin ``` ## Jean-Noel Avila, 2018-09-04 14:18 Subject: [PATCH] i18n: fix dangling dot in die() messages Message-ID: <20180904141816.26398-1-jn.avila@free.fr> URL: https://gitlist.dev/e/20180904141816.26398-1-jn.avila%40free.fr In-Reply-To: ``` Signed-off-by: Jean-Noël Avila --- It is not clear what the style guide for messages is. builtin/submodule--helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index b56028ba9d..a011abfd7c 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, printf(_("Entering '%s'\n"), displaypath); if (info->argv[0] && run_command(&cp)) - die(_("run_command returned non-zero status for %s\n."), + die(_("run_command returned non-zero status for %s"), displaypath); if (info->recursive) { @@ -543,7 +543,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, if (run_command(&cpr)) die(_("run_command returned non-zero status while " - "recursing in the nested submodules of %s\n."), + "recursing in the nested submodules of %s"), displaypath); } -- 2.18.0 ``` ## Ævar Arnfjörð Bjarmason, 2018-09-04 15:05 Subject: Re: [PATCH] i18n: fix dangling dot in die() messages Message-ID: URL: https://gitlist.dev/e/CACBZZX6Bm-xOO-mvDzmRAA9Xu6HrBr5z%2B39dp4t6fTTCmNHKbQ%40mail.gmail.com In-Reply-To: <20180904141816.26398-1-jn.avila@free.fr> ``` On Tue, Sep 4, 2018 at 4:59 PM Jean-Noel Avila wrote: Your commit message says "dangling dot"... > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > index b56028ba9d..a011abfd7c 100644 > --- a/builtin/submodule--helper.c > +++ b/builtin/submodule--helper.c > @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, > printf(_("Entering '%s'\n"), displaypath); > > if (info->argv[0] && run_command(&cp)) > - die(_("run_command returned non-zero status for %s\n."), > + die(_("run_command returned non-zero status for %s"), ...but here and below you're also removing the newline. Is this intended, and does it work as desired afterwards? I.e. were we just ignoring the \n? > displaypath); > > if (info->recursive) { > @@ -543,7 +543,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, > > if (run_command(&cpr)) > die(_("run_command returned non-zero status while " > - "recursing in the nested submodules of %s\n."), > + "recursing in the nested submodules of %s"), > displaypath); > } > > -- > 2.18.0 > ``` ## Jean-Noël Avila, 2018-09-04 15:13 Subject: Re: [PATCH] i18n: fix dangling dot in die() messages Message-ID: <2f6f52c8-4b8a-a954-5ffb-5d66dfb97fe1@free.fr> URL: https://gitlist.dev/e/2f6f52c8-4b8a-a954-5ffb-5d66dfb97fe1%40free.fr In-Reply-To: ``` On 04/09/2018, Ævar Arnfjörð Bjarmason wrote:On Tue, Sep 4, 2018 at 4:59 PM Jean-Noel Avila wrote: > Your commit message says "dangling dot"... The dot is dangling on its own line. I don't really catch why this would be needed. > >> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c >> index b56028ba9d..a011abfd7c 100644 >> --- a/builtin/submodule--helper.c >> +++ b/builtin/submodule--helper.c >> @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, >> printf(_("Entering '%s'\n"), displaypath); >> >> if (info->argv[0] && run_command(&cp)) >> - die(_("run_command returned non-zero status for %s\n."), >> + die(_("run_command returned non-zero status for %s"), > ...but here and below you're also removing the newline. Is this > intended, and does it work as desired afterwards? I.e. were we just > ignoring the \n? > I checked that usually, the die command does not have the final dot nor a new line. But I'm not sure of what's intended here. ``` ## Duy Nguyen, 2018-09-04 15:16 Subject: Re: [PATCH] i18n: fix dangling dot in die() messages Message-ID: URL: https://gitlist.dev/e/CACsJy8CgS1JzbKhV4T%2BxpCHnc8OrVEd5i-o-O-XamPxuPOZjMw%40mail.gmail.com In-Reply-To: ``` On Tue, Sep 4, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason wrote: > > On Tue, Sep 4, 2018 at 4:59 PM Jean-Noel Avila wrote: > > Your commit message says "dangling dot"... > > > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > > index b56028ba9d..a011abfd7c 100644 > > --- a/builtin/submodule--helper.c > > +++ b/builtin/submodule--helper.c > > @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, > > printf(_("Entering '%s'\n"), displaypath); > > > > if (info->argv[0] && run_command(&cp)) > > - die(_("run_command returned non-zero status for %s\n."), > > + die(_("run_command returned non-zero status for %s"), > > ...but here and below you're also removing the newline. Is this > intended, and does it work as desired afterwards? I.e. were we just > ignoring the \n? die() already adds \n, so this \n adds a blank line. Since this is an error, not part of any fancy text layout construction, I think the \n here could (and should) be removed -- Duy ``` ## Junio C Hamano, 2018-09-04 19:32 Subject: Re: [PATCH] i18n: fix mistakes in translated strings Message-ID: URL: https://gitlist.dev/e/xmqqr2i983ev.fsf%40gitster-ct.c.googlers.com In-Reply-To: ``` Jiang Xin writes: > Jean-Noël Avila 于2018年8月24日周五 上午5:02写道： >> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c >> index 2bcc70fdfe..b56028ba9d 100644 >> --- a/builtin/submodule--helper.c >> +++ b/builtin/submodule--helper.c >> @@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, >> argv_array_pushv(&cpr.args, info->argv); >> >> if (run_command(&cpr)) >> - die(_("run_command returned non-zero status while" >> + die(_("run_command returned non-zero status while " >> "recursing in the nested submodules of %s\n."), > > Any specific reason to put a period after newline? > And there is another mistake just above this one: > > "run_command returned non-zero status for %s\n." Embarrassing X-< These are not something the "fix" introduces (rather it is what it still misses), though. ``` ## Junio C Hamano, 2018-09-04 19:47 Subject: Re: [PATCH] i18n: fix dangling dot in die() messages Message-ID: URL: https://gitlist.dev/e/xmqqefe982pp.fsf%40gitster-ct.c.googlers.com In-Reply-To: <2f6f52c8-4b8a-a954-5ffb-5d66dfb97fe1@free.fr> ``` Jean-Noël Avila writes: > On 04/09/2018, Ævar Arnfjörð Bjarmason wrote:On Tue, Sep 4, 2018 at 4:59 > PM Jean-Noel Avila wrote: >> Your commit message says "dangling dot"... > > The dot is dangling on its own line. I don't really catch why this would > be needed. > >> >>> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c >>> index b56028ba9d..a011abfd7c 100644 >>> --- a/builtin/submodule--helper.c >>> +++ b/builtin/submodule--helper.c >>> @@ -521,7 +521,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, >>> printf(_("Entering '%s'\n"), displaypath); >>> >>> if (info->argv[0] && run_command(&cp)) >>> - die(_("run_command returned non-zero status for %s\n."), >>> + die(_("run_command returned non-zero status for %s"), >> ...but here and below you're also removing the newline. Is this >> intended, and does it work as desired afterwards? I.e. were we just >> ignoring the \n? >> > > I checked that usually, the die command does not have the final dot nor > a new line. But I'm not sure of what's intended here. Your changes look correct. Die() and friends terminate the message on their own, so a trailing newline in the message is usually a mistake. ```