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

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