Made error message consistent with another one
Added a note about icons' license
Merge remote-tracking branch 'upstream/master' into translation

Conflicts:
	src/addfrienddialog.cpp