Added internationalization support -- not finished