am 7d10fb4a: (-s ours) am 328b133b: (-s ours) Import translations. DO NOT MERGE

* commit '7d10fb4af180be90783632cc6ada13c533e85515':