am 98bdb2c7: (-s ours) am b2339673: (-s ours) am 5186160e: (-s ours) Import translations. DO NOT MERGE

* commit '98bdb2c70ccfd21b90c0d02269f3f549fb1e70dc':
  Import translations. DO NOT MERGE