am 636345b0: (-s ours) am 3689cdd7: (-s ours) Import translations. DO NOT MERGE

* commit '636345b03612dce306d4ac6729d34ea29c8549e4':