Localization continued.
Merge branch 'dateTestBranch'