am d0d8f5aa: (-s ours) am 8169b50b: (-s ours) Import translations. DO NOT MERGE

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