am 6f30c2a6: (-s ours) Import translations. DO NOT MERGE

* commit '6f30c2a64dc0a1d22fe3e9d65b963a2f6cf85f46':
  Import translations. DO NOT MERGE