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

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