am 63069cc9: (-s ours) Import translations. DO NOT MERGE

* commit '63069cc985869fe06254e352ea63b361cb0d0917':
  Import translations. DO NOT MERGE