Translations fixes

Thanks to @tacoverdo for commenting! Please review this code.