am b5f89802: (-s ours) am 4740067a: (-s ours) am 06cc7f7f: (-s ours) Import translations. DO NOT MERGE

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