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

* commit '6d85c058a8513f4f60f3a66fc80bc0010bcc5b23':
  Import translations. DO NOT MERGE