am 522fbf65: (-s ours) am 1c258bc5: (-s ours) Import translations. DO NOT MERGE

* commit '522fbf659bfcb490b83dc3b4bacdd6c1f1c21606':
  Import translations. DO NOT MERGE