am a0dd8117: (-s ours) am 5b2bbb74: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

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