Re: [PATCH v5] submodule merge: update conflict error message

From: Calvin Wan <calvinwan@google.com>
Date: Jul 25, 2022, 21:27 UTC
Message-ID: <CAFySSZD+kofhqYmxOnoNi49XSps6z44Ym8=qMBYjwOKJR3Mymw@mail.gmail.com>
In-Reply-To: <220725.86v8rlpdix.gmgdl@evledraar.gmail.com>

Hi Ævar,

Show 9 quoted lines

> Whereas we want this, surely?;
>
>  - one
>    one continued
>  - two
>    two continued
>
> I.e. we're using " - " to mark list items, but then not indenting the
> items.

Yes we surely do!

Show 5 quoted lines

> I think you can borrow a bit from ba5e8a0eb80 (object-name: make
> ambiguous object output translatable, 2022-01-27) here, i.e.:
>
>  1. Just translate a message like "go to submodule ...\nor update to
>     an", have another variant for the "resolution exists".

I am removing the "resolution exists" variant because the text that came with it was unclear to begin with.

> per ba5e8a0eb80 you should explain
> any addition of magical formatting like " %s" with a TRANSLATORS
> comment.

ack

>  - A trailing  " " before a \n?

ack

Show 11 quoted lines

>    It's quite odd to tell a user to run a command with the `` syntax,
>    which is used for interpolation. Let's instead suggest:
>
>         blah blah blah run:
>
>                 git add foo \
>                         bar \ [...]
>                         baz
>
>    I.e. use \ at the end of lines to note a multi-line command, not wrap
>    the whole thing in ``-quotes.

That looks much better than what I currently have.

>  - If a message must always end in a \n just add it between _()'s,
>    instead of making it part of the _() string.

ack