am 96b98fd4: (-s ours) am 0291f565: (-s ours) Import translations. DO NOT MERGE

* commit '96b98fd44144bcd6defc49dbf286f513a5fd36f8':
  Import translations. DO NOT MERGE