Development

Merge internationalization changes.