am cb178ef6: (-s ours) Import translations. DO NOT MERGE

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