am e109d65b: (-s ours) am 87aa4b25: am a1467911: Import translations. DO NOT MERGE

* commit 'e109d65b35a6c2ec1d946291827d1ae7927eebb1':