am 7857404b: (-s ours) Import translations. DO NOT MERGE

* commit '7857404b0f4518d687bea446579976bc4382aa29':
  Import translations. DO NOT MERGE