Improve norwegian bokmål. Fixes #1850

With tests changed.