am 89da20f9: (-s ours) am 43db8085: am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE

* commit '89da20f91684cd29065935675dde199e110a0509':