From: Jeff King <peff@peff.net>
To: Thomas Rast <trast@inf.ethz.ch>
Cc: Ralf Thielow <ralf.thielow@gmail.com>,
jk@jk.gs, stimming@tuhh.de, git@vger.kernel.org
Subject: Re: [PATCH] l10n: de.po: translate 5 messages
Date: Wed, 7 Aug 2013 05:22:20 -0400 [thread overview]
Message-ID: <20130807092220.GA4563@sigill.intra.peff.net> (raw)
In-Reply-To: <87r4e5vp0r.fsf@linux-k42r.v.cablecom.net>
On Wed, Aug 07, 2013 at 11:17:08AM +0200, Thomas Rast wrote:
> This results from Peff's c17592a (commit: tweak empty cherry pick advice
> for sequencer, 2013-07-26):
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index a17a5df..39717d5 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -62,8 +62,18 @@
> "If you wish to commit it anyway, use:\n"
> "\n"
> " git commit --allow-empty\n"
> +"\n");
> +
> +static const char empty_cherry_pick_advice_single[] =
> +N_("Otherwise, please use 'git reset'\n");
> +
> +static const char empty_cherry_pick_advice_multi[] =
> +N_("If you wish to skip this commit, use:\n"
> "\n"
> -"Otherwise, please use 'git reset'\n");
> +" git reset\n"
> +"\n"
> +"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
> +"the remaining commits.\n");
>
> static const char *use_message_buffer;
> static const char commit_editmsg[] = "COMMIT_EDITMSG";
>
> [...]
>
> So it seems that concatenating sentences indeed falls into a gray area
> between "avoid sentence lego" and "split at paragraphs". And Peff's
> style of splitting it saves the translators work because the first part
> of the message is shared among two code paths.
Yeah, I was mainly trying to avoid repeating myself, since the first
part of the message would be the same (and I did not want them to fall
out of sync).
However, I do not mind changing it if translators would prefer to see
the whole message as a single string. I agree it's a gray area.
-Peff
prev parent reply other threads:[~2013-08-07 9:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-06 18:29 [PATCH] l10n: de.po: translate 5 messages Ralf Thielow
2013-08-07 9:17 ` Thomas Rast
2013-08-07 9:22 ` Jeff King [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130807092220.GA4563@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jk@jk.gs \
--cc=ralf.thielow@gmail.com \
--cc=stimming@tuhh.de \
--cc=trast@inf.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).