am 83f4d736: (-s ours) am 564269bf: (-s ours) Import translations. DO NOT MERGE

* commit '83f4d7363c7e56844387675fe106f34ff836f8cc':