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

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