am e69c0e42: (-s ours) am a4a75803: (-s ours) am a6bf0ebd: (-s ours) Import translations. DO NOT MERGE

* commit 'e69c0e4236557a1a2f6af2afcf0884878cfc390a':
  Import translations. DO NOT MERGE