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

* commit '04250824ff4d5231ee17a060a7ce77fcc02a6657':
  Import translations. DO NOT MERGE