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

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