am b1e61ff5: (-s ours) am 63c4a166: (-s ours) Import translations. DO NOT MERGE

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