From: Phillip Wood Date: Fri, 19 May 2017 14:35:34 GMT Subject: Re: [PATCH] rebase -i: Add missing newline to end of message Message-ID: In-Reply-To: On 19/05/17 12:24, Ævar Arnfjörð Bjarmason wrote: > On Fri, May 19, 2017 at 12:13 PM, Phillip Wood > wrote: >> On 18/05/17 22:21, Johannes Schindelin wrote: >>> Hi Phillip, >>> >>> On Thu, 18 May 2017, Phillip Wood wrote: >>> >>>> From: Phillip Wood >>>> >>>> The message that's printed when auto-stashed changes are successfully >>>> restored was missing '\n' at the end. >>>> --- >>> >>> Please add your Signed-off-by:, and my Acked-by: >> >> Will do (I forgot to add --signoff to git commit). Do I need to resend >> the other patches with your Acked-by: or will that happen when Junio >> applies them? >> >> I was thinking about this last night and wonder if it would be better to do >> >> - printf(_("Applied autostash.")); >> + printf("%s\n", _("Applied autostash.")); >> >> rather than >> >> - printf(_("Applied autostash.")); >> + printf(_("Applied autostash.\n")); >> >> as it would avoid changing the translated string and also mean that the >> newline couldn't be accidentally removed any typos in the translation. >> >> Best Wishes >> >> Phillip > > Just having the \n in the message is fine. Stuff like this is already > checked for as part of the build process by msgfmt, e.g.: > > $ git diff -U0 > diff --git a/po/de.po b/po/de.po > index 679f8f4720..b9a7d417ac 100644 > --- a/po/de.po > +++ b/po/de.po > @@ -23 +23 @@ msgid "hint: %.*s\n" > -msgstr "Hinweis: %.*s\n" > +msgstr "Hinweis: %.*s" > > Errors with: > > po/de.po:23: 'msgid' and 'msgstr' entries do not both end with '\n' > > And if you change the format specifier: > > po/de.po:23: number of format specifications in 'msgid' and > 'msgstr' does not match > Hi Ævar Thanks for clarifying that, I've left the patch unchanged Thanks again Phillip