am ed4f212d: am c787f82d: (-s ours) Import translations. DO NOT MERGE

* commit 'ed4f212d458ecc1f14a893bd0b559d8a791cef5d':