am 7d7fef1b: (-s ours) Import translations. DO NOT MERGE

* commit '7d7fef1bf670fc802bdeaa60faf9cecb8165ff57':
  Import translations. DO NOT MERGE