Merge changes Ied79f3cb,Iaba87f49 into ics-mr1

* changes:
  Import revised translations.  DO NOT MERGE
  Restore deleted string still referenced from a layout.