am 6083ed0f: (-s ours) Import translations. DO NOT MERGE

* commit '6083ed0ff546b46bbfd4c704ce60bd59caed7c15':
  Import translations. DO NOT MERGE