am 1df7940c: (-s ours) am 6f0e78f1: (-s ours) Import translations. DO NOT MERGE

* commit '1df7940ca3a1f2897fb716bd0efa077cf465e8f1':
  Import translations. DO NOT MERGE