Language: add Norwegian Bokmål
Correct the channel number on the OSD without zapping
Also correct the channelnumber on OSD with numberzap

As you can change to the first userbouquet with blue this channel number
can also change
Merge remote-tracking branch 'pli/master'