am 956f958d: (-s ours) am 953068b9: (-s ours) Import translations. DO NOT MERGE

* commit '956f958d3799a66d18b149c79ad426a70edacd73':
  Import translations. DO NOT MERGE