Fix Formen => Formeln in de/HelpDialog, and make plural return n in en.js
Repack and recombine previous commits
Merge branch 'v2.2-beta' into develop