Merge "Move date format strings to donottranslate.xml and add locale overrides."