am 33a5fd70: (-s ours) am 415c34b9: (-s ours) Import translations. DO NOT MERGE

* commit '33a5fd70c665189915cb87d9e45c922c7303ab97':
  Import translations. DO NOT MERGE