am 18c1d4df: (-s ours) am 588cf90a: (-s ours) Import translations. DO NOT MERGE

* commit '18c1d4dfa2a721a8cfc0e971ae69c1db26f35b1f':
  Import translations. DO NOT MERGE