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

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