am 796c3870: (-s ours) am f1ae3088: (-s ours) Import translations. DO NOT MERGE

* commit '796c38705b05337dc5fe29f60c0b06ac098ce1dd':
  Import translations. DO NOT MERGE