am b4e056cd: (-s ours) am 671f8dd5: (-s ours) Import translations. DO NOT MERGE

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