added more generic words
use a _ to seperate words in language keys
Revert "use a _ to seperate words in language keys"

This reverts commit 4bed64d2d88fcd79c6298ab5622af67d0367c3ec.
use _ to seperate words
Changed iconsize master to original
Merge branch 'pr-499'

Conflicts:
	languages/en.php
Small cleanup to en.php