[#70] Fixed some translation related issues