am 1e4ab88d: (-s ours) am 5a1d1557: (-s ours) Import translations. DO NOT MERGE

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