am 69780cd4: (-s ours) am 7b137020: (-s ours) Import translations. DO NOT MERGE

* commit '69780cd47476ddc3d100a36c37a3faa169d99a94':
  Import translations. DO NOT MERGE