am aa62905b: (-s ours) am be25b245: (-s ours) Import translations. DO NOT MERGE

* commit 'aa62905bbc7a33f1e743b2b2ba860cd1b130698e':