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

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