am 12d1d989: (-s ours) am 213e0c1d: (-s ours) Import translations. DO NOT MERGE

* commit '12d1d98905dae2731c8c598f3ae2f79d879648eb':
  Import translations. DO NOT MERGE