am 217a1e91: (-s ours) am 048a468b: am 61ace95b: Import translations. DO NOT MERGE

* commit '217a1e91d381b47b4630ace34651c014993e8b47':
  Import translations. DO NOT MERGE