am b2df3e40: (-s ours) am 97ffe946: (-s ours) Import translations. DO NOT MERGE

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