am 494cd240: (-s ours) am 93ed9c86: (-s ours) Import translations. DO NOT MERGE

* commit '494cd24070530e16508668140c6e4300e5986582':
  Import translations. DO NOT MERGE