Re: [PATCH 10/25] gettextize: git-merge basic messages

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sep 2, 2010, 20:09 UTC
Message-ID: <20100902200940.GB2531@burratino>
In-Reply-To: <1283456446-22577-11-git-send-email-avarab@gmail.com>

Ævar Arnfjörð Bjarmason wrote:

Show 10 quoted lines

> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -116,13 +116,13 @@ static struct strategy *get_strategy(const char *name)
>  		exclude_cmds(&main_cmds, &not_strategies);
>  	}
>  	if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
> -		fprintf(stderr, "Could not find merge strategy '%s'.\n", name);
> -		fprintf(stderr, "Available strategies are:");
> +		fprintf(stderr, _("Could not find merge strategy '%s'.\n"), name);
> +		fprintf(stderr, _("Available strategies are:"));

Another basic question (sorry for my ignorance): do translators prefer whole paragraphs or line-by-line messages like this? (Of course that is not a topic for this patch; I am just curious.)

Show 6 quoted lines

> @@ -513,7 +513,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)
>  		int is_bool;
>  		shortlog_len = git_config_bool_or_int(k, v, &is_bool);
>  		if (!is_bool && shortlog_len < 0)
> -			return error("%s: negative length %s???", k, v);
> +			return error(_("%s: negative length %s???"), k, v);

What branch are you translating? I am hoping the omgwtfbbq??! message gets a chance to be tweaked before release.