Shorten travel information in calendar entries

Avoids more newlines than before, more logical ordering (departure -
train - arrival).