Simplify/Enhance Translation (many ToDos left). SR: tweak Label
Merge branch 'master' of git://github.com/flavour/eden