am d8fd1cd7: (-s ours) am 9a86c085: (-s ours) Import translations. DO NOT MERGE

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