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

* commit '2496a32ca67270e5570f97b780ae47aade080e0d':
  Import translations. DO NOT MERGE