am f40c0896: (-s ours) am 2790a98c: (-s ours) Import translations. DO NOT MERGE

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