simpler translation

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index b0c2cf35732f56dcc9a69c3ec36562286e32fbd8..1d8e354ce43cd2e29d2f66dbb0a4195dcbe5a7a6 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -276,8 +276,9 @@ class SecConfigure:
                                elif dm == "1_2":
                                        sec.setDiSEqCMode(diseqcParam.V1_2)
 
-                                       if self.satposdepends.has_key(slotid):  # only useable with rotors
-                                               tunermask |= (1 << self.satposdepends[slotid])
+                               if self.satposdepends.has_key(slotid):
+                                       for slot in self.satposdepends[slotid]:
+                                               tunermask |= (1 << slot)
 
                                if dm != "none":
                                        if currLnb.toneburst.value == "none":
@@ -847,15 +848,6 @@ def InitNimManager(nimmgr):
                                choices["loopthrough"] = _("loopthrough to")
                        nim.configMode = ConfigSelection(choices = choices, default = "nothing")
 
-                       #important - check if just the 2nd one is LT only and the first one is DVB-S
-                       # CHECKME: is this logic correct for >2 slots?
-#                      if nim.configMode.value in ["loopthrough", "satposdepends", "equal"]:
-#                              if x == 0: # first one can never be linked to anything
-#                                      # reset to simple
-#                                      nim.configMode.value = "simple"
-#                                      nim.configMode.save()
-#                              else:
-                                       #FIXME: make it better
                        for y in nimmgr.nim_slots:
                                if y.slot == 0:
                                        if not y.isCompatible("DVB-S"):
@@ -900,7 +892,7 @@ def InitNimManager(nimmgr):
 
                        # advanced config:
                        nim.advanced = ConfigSubsection()
-                       tmp = [(3601, _('All Satellites 1'), 1), (3602, _('All Satellites 2'), 1), (3603, _('All Satellites 3'), 1), (3604, _('All Satellites 4'), 1)]
+                       tmp = [(3601, _('All Satellites')+' 1', 1), (3602, _('All Satellites')+' 2', 1), (3603, _('All Satellites')+' 3', 1), (3604, _('All Satellites')+' 4', 1)]
                        nim.advanced.sats = getConfigSatlist(192,nimmgr.satList+tmp)
                        nim.advanced.sat = ConfigSubDict()
                        lnbs = [("0", "not available")]