Adjust service numbers while moving services
Finetune moving services within user bouquets

-When move mode is selected you can directly move the current selected service
-Remove some not required code
-When coming back to the infobar the service has the currect number (may need improvement later)
ChannelNumber: Remove some not required code
Also correct channelnumber on infobar when channels are removed

And use the same code when the same channel is selected from a different
bouquet
ChannelSelection: Streamline correctChannelNumber
ChannelSelection: Handle behavior of empty bouquets

Avoid strange behavior when selecting nothing in an empty bouquet
Avoid to add a Marker as adding a marker ends up in an endless loop
pt_BR translation update

by pingflood
Norwegian translation update

by andy1
Merge remote-tracking branch 'pli/master'

Conflicts:
	lib/python/Screens/ChannelSelection.py