Merge changes Ie26719cb,I6d1b943b into ics-mr1

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