Translation Enablement

... 2 more small enhancements
Merge pull request #998 from Joern-R/pull1

Translation Enablement