Not using included localizable strings.
Merge branch 'refs/heads/localization-fixes'