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

* commit '08d0f6420ac439265e9b4086c931173b44409c51':
  Import revised translations.  DO NOT MERGE