am 90ba3887: (-s ours) am 7c674854: (-s ours) Import translations. DO NOT MERGE

* commit '90ba3887c920374ce75338096d498532161e102b':
  Import translations. DO NOT MERGE