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

* commit '44add5fb863b71a19270fba19570e89a99c22ae8':