Everything translated and revised till section 13.1; there were various different broken tags so the text became quite much longer...
merge