am 86b4ad17: (-s ours) am 0c1440a9: (-s ours) Import translations. DO NOT MERGE

* commit '86b4ad172735f7132c4a3b8ad7039e34fe3c36c0':
  Import translations. DO NOT MERGE