am 6ba0977d: (-s ours) Import translations. DO NOT MERGE

* commit '6ba0977dcebb38910bd5afdd9259e1e3e3edd524':
  Import translations. DO NOT MERGE