am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

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