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

* commit '80c46b560f9e1b36d39c3da9025ccda1a847573e':
  Import translations. DO NOT MERGE