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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
