am 1b2ee8c1: (-s ours) am 286ecf1e: (-s ours) Import translations. DO NOT MERGE

* commit '1b2ee8c1b3a525f02cf2d302744cf4c868985f5c':
  Import translations. DO NOT MERGE