improved translations

Heya Stefan,

I changed the code to better support translations.
I don't claim that the work is now done but I do think it is an improvement.