am 41e16eaa: (-s ours) am 8b24b374: am 78ef5443: Import translations. DO NOT MERGE

* commit '41e16eaa038fe4adeb8a3566b440aa23c1928c98':