Fixed redefinition of initialSetup()
added missing EBox::Gettext uses
Merge branch 'master' into jacalvo/3.2-final-changes

Conflicts:
	main/core/ChangeLog
	main/firewall/ChangeLog
	main/ftp/ChangeLog
	main/samba/ChangeLog
	main/trafficshaping/ChangeLog