am 2962df69: (-s ours) am eb41844b: (-s ours) Import translations. DO NOT MERGE

* commit '2962df6990830b72f7139475d7238ecdb4dda851':
  Import translations. DO NOT MERGE