am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE

* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
  Import translations. DO NOT MERGE