am fbd1e65c: am a61ee4d9: (-s ours) am 8c2c1837: am 0308361b: Import translations. DO NOT MERGE

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