Peter Krefting wrote:
This is untranslatable for several languages. For Swedish it would suffice
to move the " reset" part into the array:
quoted
- "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
quoted
- 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