am a118b48b: (-s ours) am 8a4d0c51: (-s ours) Import translations. DO NOT MERGE

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