am 21741f87: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '21741f8734f35b9089fbb53b329971837d331274':
  Import translations. DO NOT MERGE