add iconv and spanish translation
Merge master

Conflicts:
	7c-tweaks.tp2
	lang/english/setup.tra