am 1425f228: (-s ours) am e8231187: (-s ours) Import translations. DO NOT MERGE

* commit '1425f22853e00d8f0cdb33ce97a84c6cf677e8da':
  Import translations. DO NOT MERGE