am 2f0660b4: (-s ours) Import translations. DO NOT MERGE

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