am 18875315: (-s ours) am c3af713c: (-s ours) Import translations. DO NOT MERGE

* commit '1887531593e791c7be3acde694348e2a768930b9':
  Import translations. DO NOT MERGE