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

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