Code review and added internationalization in xpi-File