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

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