[PATCH] i18n: fix mistakes in translated strings

[PATCH] i18n: fix mistakes in translated strings

[Jean-Noël Avila]

Fix typos and convert a question which does not expect to be replied
to a simple advice.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
 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

Re: [PATCH] i18n: fix mistakes in translated strings

[Junio C Hamano]

Jean-Noël Avila <jn.avila@free.fr> 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.

Re: [PATCH] i18n: fix mistakes in translated strings

[Jean-Noël AVILA]

Le jeudi 23 août 2018, 23:28:55 CEST Junio C Hamano a écrit :
> Jean-Noël Avila <jn.avila@free.fr> 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

[L10N] Kickoff for Git 2.19.0 round 2

[Jiang Xin]

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 <jn.avila@free.fr> 于2018年9月4日周二 上午1:52写道：
>
> Le jeudi 23 août 2018, 23:28:55 CEST Junio C Hamano a écrit :
> > Jean-Noël Avila <jn.avila@free.fr> 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

Re: [PATCH] i18n: fix mistakes in translated strings

[Jiang Xin]

Jean-Noël Avila <jn.avila@free.fr> 于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

[PATCH] i18n: fix dangling dot in die() messages

[Jean-Noel Avila]

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---

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

Re: [PATCH] i18n: fix dangling dot in die() messages

[Ævar Arnfjörð Bjarmason]

On Tue, Sep 4, 2018 at 4:59 PM Jean-Noel Avila <jn.avila@free.fr> 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
>

Re: [PATCH] i18n: fix dangling dot in die() messages

[Jean-Noël Avila]

On 04/09/2018, Ævar Arnfjörð Bjarmason wrote:On Tue, Sep 4, 2018 at 4:59
PM Jean-Noel Avila <jn.avila@free.fr> 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.

Re: [PATCH] i18n: fix dangling dot in die() messages

[Duy Nguyen]

On Tue, Sep 4, 2018 at 5:08 PM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
>
> On Tue, Sep 4, 2018 at 4:59 PM Jean-Noel Avila <jn.avila@free.fr> 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

Re: [PATCH] i18n: fix mistakes in translated strings

[Junio C Hamano]

Jiang Xin <worldhello.net@gmail.com> writes:

> Jean-Noël Avila <jn.avila@free.fr> 于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.

Re: [PATCH] i18n: fix dangling dot in die() messages

[Junio C Hamano]

Jean-Noël Avila <jn.avila@free.fr> writes:

> On 04/09/2018, Ævar Arnfjörð Bjarmason wrote:On Tue, Sep 4, 2018 at 4:59
> PM Jean-Noel Avila <jn.avila@free.fr> 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.