From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Jul 2012 19:37:54 GMT
Subject: Re: [PATCH v2 7/7] i18n: merge-recursive: mark strings for translation
Message-ID: <7vboj7r31p.fsf@alter.siamese.dyndns.org>
In-Reply-To: <11b679b77fb9e30b8ea29c3e8a76e711d969377a.1342920089.git.worldhello.net@gmail.com>

Jiang Xin <worldhello.net@gmail.com> writes:

> @@ -249,14 +249,14 @@ struct tree *write_tree_from_memory(struct merge_options *o)
>  
>  	if (unmerged_cache()) {
>  		int i;
> -		fprintf(stderr, "BUG: There are unmerged index entries:\n");
> +		fprintf(stderr, _("BUG: There are unmerged index entries:\n"));

Micronit. "BUG:" entries are only to help Git developers to locate
the exact codepath that is buggy, and I think it is better left
untranslated.

> +		if (NULL == renamed) {

Better written as "if (!renamed)".