am 233d666a: (-s ours) Import translations. DO NOT MERGE

* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
  Import translations. DO NOT MERGE