am 42630b77: (-s ours) Import translations. DO NOT MERGE

* commit '42630b77c4963abf88ff8429741cf6d6c55ad11e':
  Import translations. DO NOT MERGE