Added missing btn-default.
Language tweak (thanks to Markus Fischer).
Merge branch 'release-2.3'