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

2018-09-04 Thread Junio C Hamano 
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.

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

2018-09-03 Thread Jiang Xin 
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

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

2018-09-03 Thread Jean-Noël AVILA 
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

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

2018-08-23 Thread Junio C Hamano 
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.