Merge changes Ib9b67b9f,Ia8024a23

* changes:
  Import revised translations.
  Fix references to renamed strings.