Merge branch 'lilypond/translation'