am 589c0c26: (-s ours) am 4356e281: (-s ours) Import translations. DO NOT MERGE

* commit '589c0c2622d4279ba1926e4ff702ad8ea35ad324':
  Import translations. DO NOT MERGE