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

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