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

* commit '25149b389501afc817f1248d704def0b4c5b5c04':
  Import translations. DO NOT MERGE