Re: [PATCH 3/6] merge-recursive: remove i18n legos in conflict messages

From: Jonathan Nieder <jrnieder@gmail.com>
Date: May 31, 2012, 13:52 UTC
Message-ID: <20120531135222.GB10523@burratino>
In-Reply-To: <1338469482-30936-4-git-send-email-pclouds@gmail.com>

Nguyễn Thái Ngọc Duy wrote:

Show 8 quoted lines

> +	const char *msg[] = {
> +		"CONFLICT (rename/delete): %s deleted in %s and renamed in %s. Version %s of %s left in tree.",
> +		"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree.",
> +	};
> +	const char *renamed_msg[] = {
> +		"CONFLICT (rename/delete): %s deleted in %s and renamed in %s. Version %s of %s left in tree at %s.",
> +		"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree at %s.",
> +	};

Is lego by sentence ok?  i.e., having 4 translated messages:

	CONFLICT (rename/delete): %s deleted in %s and renamed in %s.
	CONFLICT (modify/delete): %s deleted in %s and modified in %s.
	Version %s of %s left in tree.
	Version %s of %s left in tree at %s.