am c029b460: (-s ours) am 8462ebf7: (-s ours) Import translations. DO NOT MERGE

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