am 211e5672: (-s ours) am c4482650: (-s ours) Import translations. DO NOT MERGE

* commit '211e5672ec4ade618f56b8f2e141392bf0c0f904':
  Import translations. DO NOT MERGE