am a0b80f05: (-s ours) am 7dd8b649: (-s ours) Import translations. DO NOT MERGE

* commit 'a0b80f05ded1b3d729854a7dc1cca96eefdaa53c':
  Import translations. DO NOT MERGE