am a0daefb0: (-s ours) am 34f6f70e: (-s ours) Import translations. DO NOT MERGE

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