fix translations

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 1910e4541fbe0a0cd6a18cf4de09b34e004bf14b..5a7b3dea5691628e4933526dd40397dc07ef0bf3 100644 (file)
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -30,7 +30,7 @@ class ServiceScan:
                                self.network.setText("")
                                self.transponder.setText("")
                        else:
-                               self.text.setText(_("scan in progress - %d %% done! %d services found!") % (self.scan.getProgress(), self.foundServices + self.scan.getNumServices()))
+                               self.text.setText(_("scan in progress - %d%% done!") % self.scan.getProgress() + ' ' + _("%d services found!") % (self.foundServices + self.scan.getNumServices()))
                                transponder = self.scan.getCurrentTransponder()
                                network = ""
                                tp_text = ""
@@ -88,12 +88,10 @@ class ServiceScan:
                                self.transponder.setText(tp_text)
                
                if self.state == self.Done:
-                       if self.scan.getNumServices() == 1:
-                               self.text.setText(_("scan done! One service found!"))
-                       elif self.scan.getNumServices() == 0:
-                               self.text.setText(_("scan done! No service found!"))
+                       if self.scan.getNumServices() == 0:
+                               self.text.setText(_("scan done!") + ' ' + _("%d services found!") % 0 )
                        else:
-                               self.text.setText(_("scan done! %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]) )

diff --git a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
index 9d75621d07114c01d45f1c8cda7a11ff7c965c61..02ed75adb86c01b45bea7e851742a903342e4182 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/DVDToolbox.py
@@ -102,13 +102,13 @@ class DVDToolbox(Screen):
                        self["key_yellow"].text = ""
                percent = 100 * used / capacity
                if capacity > 4600:
-                       self["space_label"].text = "%d / %d MB" % (used, capacity) + " (%.2f%% " % percent + _("of a DUAL layer medium used.)")
+                       self["space_label"].text = "%d / %d MB" % (used, capacity) + " (%.2f%% " % percent + _("of a DUAL layer medium used.") + ")"
                        self["space_bar"].value = int(percent)
                elif capacity > 1:
-                       self["space_label"].text = "%d / %d MB" % (used, capacity) + " (%.2f%% " % percent + _("of a SINGLE layer medium used.)")
+                       self["space_label"].text = "%d / %d MB" % (used, capacity) + " (%.2f%% " % percent + _("of a SINGLE layer medium used.") + ")"
                        self["space_bar"].value = int(percent)
                elif capacity == 1 and used > 0:
-                       self["space_label"].text = "%d MB" % (used) + _(" on READ ONLY medium.")
+                       self["space_label"].text = "%d MB " % (used) + _("on READ ONLY medium.")
                        self["space_bar"].value = int(percent)
                else:
                        self["space_label"].text = _("Medium is not a writeable DVD!")