Re: [PATCH 19/25] gettextize: git-reset reset_type_names messages

From: Thomas Rast <trast@student.ethz.ch>
Date: Sep 15, 2010, 15:50 UTC
Message-ID: <201009151750.00882.trast@student.ethz.ch>
In-Reply-To: <alpine.DEB.2.00.1009151216000.11791@ds9.cixit.se>

Peter Krefting wrote:

Show 19 quoted lines

> 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.

This would still break even in English(!) if we ever introduced an arduous or extreme reset...

-- 
Thomas Rast
trast@{inf,student}.ethz.ch