am f6e6e160: (-s ours) am 82af5d89: (-s ours) am 6d25c934: (-s ours) Import translations. DO NOT MERGE

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