am 25e9aded: (-s ours) am a525a0d7: am f9c54fb1: (-s ours) Import translations. DO NOT MERGE

* commit '25e9adedcbacbba342f385670d8b83ff88b3a9b6':