am ae17cde2: (-s ours) am d018c892: (-s ours) am f4807c6d: (-s ours) Import translations. DO NOT MERGE

* commit 'ae17cde203ffe19500febfc1d3d8dfe80b07e123':
  Import translations. DO NOT MERGE