am 47358b6a: (-s ours) am 2637bc51: (-s ours) Import translations. DO NOT MERGE

* commit '47358b6ae8be24ce614c68170cdcd2cc62e48ac9':
  Import translations. DO NOT MERGE