am 2b851859: (-s ours) am b09878b8: (-s ours) Import translations. DO NOT MERGE

* commit '2b85185988eec44b6fdd3ee072d44b0a7a72d432':
  Import translations. DO NOT MERGE