am 9eff1426: (-s ours) am 5fe0d63f: (-s ours) Import translations. DO NOT MERGE

* commit '9eff142638f0dbfd92a304785d3be59886b93309':