am 640a0c95: (-s ours) Import translations. DO NOT MERGE

* commit '640a0c95e6acca84b12c40a5f8444e31a9261360':
  Import translations. DO NOT MERGE