am 15dc8171: (-s ours) Import translations. DO NOT MERGE

* commit '15dc817177a6eeb7b00b1448283f808f3559641b':
  Import translations. DO NOT MERGE