am b6b0b609: (-s ours) am b2039bcd: (-s ours) Import translations. DO NOT MERGE

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