am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '68f0d47e8ee045dffb5f59c67cc77f38598472c5':
  Import revised translations. DO NOT MERGE