am 96a0370a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE

* commit '96a0370a2b893fb8acb1c1bd6873cecf05da7942':
  Import translations. DO NOT MERGE