am 380a3665: (-s ours) am 249a5b28: (-s ours) am 8313b3a5: Import translations. DO NOT MERGE

* commit '380a36651dda981421ca2cce1af6c7b9befeb2f8':
  Import translations. DO NOT MERGE