am aa92bb8d: (-s ours) am b939039a: (-s ours) Import translations. DO NOT MERGE

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