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

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