am a4f23f87: (-s ours) am 6aded27a: (-s ours) Import translations. DO NOT MERGE

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