am 6ad29209: (-s ours) am a89ea7e5: (-s ours) Import translations. DO NOT MERGE

* commit '6ad2920915336af2c2241d27ac662d9101bd4948':
  Import translations. DO NOT MERGE