On Sunday, 4 August 2019 01:45:22 CEST Jeff King wrote:
> On Sat, Aug 03, 2019 at 09:59:07PM +0200, Jean-Noël Avila wrote:
>
> > - N_("where the checkout from")),
> > + N_("where the checkout is from")),
>
> I think your original "where to checkout from" is better.
>
> As a native speaker, "where the checkout is from" implies that checkout
> is a noun that is being described. But I think we want checkout to be a
> verb (because we are talking about the operation), and the option tells
> Git how to do that operation.
>
> (I agree the original "where the checkout from" is nonsense).
>
Oh. OK.
> > diff --git a/builtin/fetch.c b/builtin/fetch.c
> > index 53ce99d2bb..0e8760e5d4 100644
> > --- a/builtin/fetch.c
> > +++ b/builtin/fetch.c
> > @@ -850,6 +850,15 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
> > return 0;
> > }
> >
> > +static char warn_show_forced_updates[] =
> > +N_("Fetch normally indicates which branches had a forced update, but that\n"
> > + "check has been disabled. To re-enable, use '--show-forced-updates' flag\n"
> > + "or run 'git config fetch.showForcedUpdates true'.");
>
> This one isn't a typo fix, right? It's just putting the two warning()
> calls into a single message. I can see how this would be useful for
> translators, but note that the output will be different. The original
> would be something like:
>
> warning: Fetch normally indicates...
> warning: To re-enable...
>
> where now we'd get:
>
> warning: Fetch normally indicates...
> check has been disabled...
> or run 'git config...
>
> which might be a bit harder to read because the wrapped lines lose the
> prefix. For advise() we nicely pick out the newlines and prefix each
> line individually, but warning(), error(), etc, don't do that. Maybe
> they should.
>
> That's too big for this late in the -rc cycle, I think. In the meantime,
> I'm not sure which (the original or your patch) is the least-bad
> solution. :)
>
> This change (if I am right that there's no actual typo fix) should
> perhaps be in a separate patch from the earlier hunk, though.
>
> -Peff
>
This one is not about typos.
My original fix was more concerning the second sequence, where the sentence is broken in the middle, simply for better rendering but this does not make sense either, because the lines are too long anyway.
I guess that in most languages, a sentence can be broken into two propositions by a coordinating conjunction, but it may not match the English structure.
Is it so important that the lines of warning all start with a "warning:" prefix?
JN
