X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FServiceScan.py;h=15b7117684caa9e02ced831794f51536d93345d9;hb=005ae139dc263789ebad88e51f5f5e3d49f73768;hp=2406326dff0db5d260db3eaa1a63d777fdcda4d0;hpb=3e3832c8784e966dca29354c158ffb636f33c8cb;p=vuplus_dvbapp

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 2406326..15b7117 100644
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -29,7 +29,7 @@ class ServiceScan:
 				self.network.setText("")
 				self.transponder.setText("")
 			else:
-				self.text.setText(_("scan in progress - %d %% done!\n%d services found!") % (self.scan.getProgress(), self.foundServices + self.scan.getNumServices()))
+				self.text.setText(_("scan in progress - %d %% done! %d services found!") % (self.scan.getProgress(), self.foundServices + self.scan.getNumServices()))
 				transponder = self.scan.getCurrentTransponder()
 				network = ""
 				tp_text = ""
@@ -48,7 +48,7 @@ class ServiceScan:
 								except KeyError:
 									sat_name = ""
 								if orb_pos > 1800: # west
-									orb_pos = 3600 - orbpos
+									orb_pos = 3600 - orb_pos
 									h = _("W")
 								else:
 									h = _("E")
@@ -78,9 +78,9 @@ class ServiceScan:
 							tp = transponder.getDVBT()
 							if not tp[0]:
 								tp = tp[1]
-								tp_text = ("DVB-T %s %d / %d") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
+								tp_text = ("DVB-T %s %d %s") %( { 0 : "QPSK", 1 : "QAM16", 2 : "QAM64", 3 : "AUTO"}[tp.modulation],
 									tp.frequency,
-									tp.symbol_rate/1000)
+									{ 0 : "Bw 8MHz", 1 : "Bw 7MHz", 2 : "Bw 6MHz", 3 : "Bw Auto" }[tp.bandwidth])
 						else:
 							print "unknown transponder type in scanStatusChanged"
 				self.network.setText(network)
@@ -88,11 +88,11 @@ class ServiceScan:
 		
 		if self.state == self.Done:
 			if self.scan.getNumServices() == 1:
-				self.text.setText(_("scan done!\nOne service found!"))
+				self.text.setText(_("scan done! One service found!"))
 			elif self.scan.getNumServices() == 0:
-				self.text.setText(_("scan done!\nNo service found!"))
+				self.text.setText(_("scan done! No service found!"))
 			else:
-				self.text.setText(_("scan done!\n%d services found!") % (self.foundServices + self.scan.getNumServices()))
+				self.text.setText(_("scan done! %d services found!") % (self.foundServices + self.scan.getNumServices()))
 		
 		if self.state == self.Error:
 			self.text.setText(_("ERROR - failed to scan (%s)!") % (self.Errors[self.errorcode]) )