Merge pull request #275 from jtraulle/branch-32

Fix issue #2220
Merge pull request #277 from jtraulle/branch-32

Hotfix issue #2328
Merge pull request #278 from jtraulle/branch-32

Fix issue #2267
Renamed param, used same caption as for button
Merge pull request #280 from milkyway-git/patch-1

Renamed param, used same caption as for button
Update en_US strings.inc.php for Transifex sync