am fd82c828: (-s ours) am 2ace394c: (-s ours) Import translations. DO NOT MERGE

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