am 10d7fe69: (-s ours) am ecd9c570: (-s ours) am 78ef5443: Import translations. DO NOT MERGE

* commit '10d7fe69320297eb82ba089c2d689f30533d48ba':
  Import translations. DO NOT MERGE