am 54b5982f: (-s ours) Import translations. DO NOT MERGE

* commit '54b5982f148290a00fa2ff38e7e30d487cf69998':
  Import translations. DO NOT MERGE