am 38d169b3: (-s ours) am 1bbd4933: (-s ours) Import translations. DO NOT MERGE

* commit '38d169b330bf76efe29f8a5fc3c6404f6c932d33':
  Import translations. DO NOT MERGE