am 6494d0b3: (-s ours) am 04631ba7: (-s ours) Import translations. DO NOT MERGE

* commit '6494d0b34eeb79bc569fbca273a19a242a1aec99':
  Import translations. DO NOT MERGE