From: Peter Krefting <peter@softwolves.pp.se>
Date: Wed, 15 Sep 2010 11:17:56 GMT
Subject: Re: [PATCH 19/25] gettextize: git-reset reset_type_names messages
Message-ID: <alpine.DEB.2.00.1009151216000.11791@ds9.cixit.se>
In-Reply-To: <1283456446-22577-20-git-send-email-avarab@gmail.com>

Ævar Arnfjörð Bjarmason:

> Make the messages in git-reset that use the reset_type_names static
> array to be translatable by marking the array items with N_() and
> using _() later.

This is untranslatable for several languages. For Swedish it would suffice 
to move the " reset" part into the array:

> -	"mixed", "soft", "hard", "merge", "keep", NULL
> +	N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
> };

changing it to

N_("mixed reset"), N_("soft reset"), ...

and changing this

> -		die("Cannot do a %s reset in the middle of a merge.",
> -		    reset_type_names[reset_type]);
> +		die(_("Cannot do a %s reset in the middle of a merge."),
> +		    _(reset_type_names[reset_type]));

into "... do a %s in ..", with similar changes for the others.

-- 
\\// Peter - http://www.softwolves.pp.se/