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

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