am cb4a3c04: (-s ours) am 090e6396: (-s ours) Import translations. DO NOT MERGE

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