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

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