Merge "Clarify string translation." into nyc-mr1-dev