This needs more fine tuning wrt scan setup etc, but should work for now.
Conflicts:
data/Makefile.am
data/locale/english.locale
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/neutrino.cpp
src/zapit/include/zapit/getservices.h
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
