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

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