Fix for I18n as well as adding German translation