am 2ea40009: (-s ours) am 23b816b1: (-s ours) Import translations. DO NOT MERGE

* commit '2ea40009f88c84301dc1b0e82daf8698bfb52fd6':
  Import translations. DO NOT MERGE