Fixed resource bundle, added language info