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

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