am 2e3518fe: (-s ours) am 533f8542: (-s ours) Import translations. DO NOT MERGE

* commit '2e3518fe354762f906bfb7e6afe82f81ad4aa0d4':
  Import translations. DO NOT MERGE