Converted to use message bundles
57 files changed