am 8309f1d7: (-s ours) am 6d85c058: (-s ours) am 6edd7628: (-s ours) Import translations. DO NOT MERGE

* commit '8309f1d7a758488a89368640e61ce53c5d85872a':
  Import translations. DO NOT MERGE