am f96a1767: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit 'f96a17676fccb6e08605b9f43a867db0924bb9e9':
  Import revised translations.  DO NOT MERGE