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

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