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

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