am 25503480: (-s ours) am 7c35c10e: (-s ours) Import translations. DO NOT MERGE

* commit '255034803c3301cbf93ce64a2740af2abe8dc1f9':
  Import translations. DO NOT MERGE