Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

26 files changed, 240 insertions, 218 deletions

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 35a8d04a..2a6016e0 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -894,8 +894,8 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 				csw = band;
 			}
 
-			if (sendDiSEqC)
-				sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
+//			if (sendDiSEqC)
+			sec_sequence.push_front( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeStatic) );
 
 			sec_fe->setData(eDVBFrontend::NEW_CSW, csw);
 			sec_fe->setData(eDVBFrontend::NEW_UCSW, ucsw);
@@ -923,8 +923,9 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 				sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
 			}
 
-			if (sendDiSEqC)
-				sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
+//			if (sendDiSEqC)
+			sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) );
+			sec_sequence.push_back( eSecCommand(eSecCommand::SET_POWER_LIMITING_MODE, eSecCommand::modeDynamic) );
 
 			frontend.setSecSequence(sec_sequence);
 
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index e1d3b068..17297e67 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -39,8 +39,8 @@ class SecConfigure:
 		sec.addSatellite(orbpos)
 		self.configuredSatellites.add(orbpos)
 
-	def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST, useInputPower=True, inputPowerDelta=50):
-		if orbpos is None:
+	def addLNBSimple(self, sec, slotid, diseqcmode, toneburstmode = diseqcParam.NO, diseqcpos = diseqcParam.SENDNO, orbpos = 0, longitude = 0, latitude = 0, loDirection = 0, laDirection = 0, turningSpeed = rotorParam.FAST, useInputPower=True, inputPowerDelta=50, fastDiSEqC = False, setVoltageTone = True):
+		if orbpos is None or orbpos == 3601:
 			return
 		#simple defaults
 		sec.addLNB()
@@ -56,10 +56,16 @@ class SecConfigure:
 		sec.setLNBThreshold(11700000)
 		sec.setLNBIncreasedVoltage(lnbParam.OFF)
 		sec.setRepeats(0)
-		sec.setFastDiSEqC(0)
+		sec.setFastDiSEqC(fastDiSEqC)
 		sec.setSeqRepeat(0)
-		sec.setVoltageMode(switchParam.HV)
-		sec.setToneMode(switchParam.HILO)
+
+		if setVoltageTone:
+			sec.setVoltageMode(switchParam.HV)
+			sec.setToneMode(switchParam.HILO)
+		else:
+			sec.setVoltageMode(switchParam._14V)
+			sec.setToneMode(switchParam.OFF)
+
 		sec.setCommandOrder(0)
 
 		#user values
@@ -167,18 +173,25 @@ class SecConfigure:
 					elif nim.configMode.value == "simple":		#simple config
 						print "diseqcmode: ", nim.diseqcMode.value
 						if nim.diseqcMode.value == "single":			#single
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
+							if nim.simpleSingleSendDiSEqC.value:
+								self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
+							else:
+								self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.NONE, diseqcpos = diseqcParam.SENDNO)
 						elif nim.diseqcMode.value == "toneburst_a_b":		#Toneburst A/B
 							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.A, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
 							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.B, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.SENDNO)
 						elif nim.diseqcMode.value == "diseqc_a_b":		#DiSEqC A/B
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
+							fastDiSEqC = nim.simpleDiSEqCOnlyOnSatChange.value
+							setVoltageTone = nim.simpleDiSEqCSetVoltageTone.value
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
 						elif nim.diseqcMode.value == "diseqc_a_b_c_d":		#DiSEqC A/B/C/D
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA)
-							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB)
+							fastDiSEqC = nim.simpleDiSEqCOnlyOnSatChange.value
+							setVoltageTone = nim.simpleDiSEqCSetVoltageTone.value
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcB.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcC.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BA, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
+							self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcD.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.BB, fastDiSEqC = fastDiSEqC, setVoltageTone = setVoltageTone)
 						elif nim.diseqcMode.value == "positioner":		#Positioner
 							if nim.latitudeOrientation.value == "north":
 								laValue = rotorParam.NORTH
@@ -893,10 +906,13 @@ def InitNimManager(nimmgr):
 				if id != x:
 					choices.append((str(id), nimmgr.getNimDescription(id)))
 			nim.connectedTo = ConfigSelection(choices = choices)
-			nim.diseqcA = getConfigSatlist(192, nimmgr.satList)
-			nim.diseqcB = getConfigSatlist(130, nimmgr.satList)
-			nim.diseqcC = ConfigSatlist(list = nimmgr.satList)
-			nim.diseqcD = ConfigSatlist(list = nimmgr.satList)
+			nim.simpleSingleSendDiSEqC = ConfigYesNo(default=False)
+			nim.simpleDiSEqCSetVoltageTone = ConfigYesNo(default=True)
+			nim.simpleDiSEqCOnlyOnSatChange = ConfigYesNo(default=False)
+			nim.diseqcA = getConfigSatlist(192, [(3601, _('nothing connected'), 1)] + nimmgr.satList)
+			nim.diseqcB = getConfigSatlist(130, [(3601, _('nothing connected'), 1)] + nimmgr.satList)
+			nim.diseqcC = ConfigSatlist(list = [(3601, _('nothing connected'), 1)] + nimmgr.satList)
+			nim.diseqcD = ConfigSatlist(list = [(3601, _('nothing connected'), 1)] + nimmgr.satList)
 			nim.positionerMode = ConfigSelection(
 				choices = [
 					("usals", _("USALS")),
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index ccb776ea..6489f28f 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -14,16 +14,21 @@ from datetime import datetime
 
 class NimSetup(Screen, ConfigListScreen):
 	def createSimpleSetup(self, list, mode):
+		nim = self.nimConfig
 		if mode == "single":
-			list.append(getConfigListEntry(_("Satellite"), self.nimConfig.diseqcA))
+			list.append(getConfigListEntry(_("Satellite"), nim.diseqcA))
+			list.append(getConfigListEntry(_("Send DiSEqC"), nim.simpleSingleSendDiSEqC))
 		else:
-			list.append(getConfigListEntry(_("Port A"), self.nimConfig.diseqcA))
+			list.append(getConfigListEntry(_("Port A"), nim.diseqcA))
 
 		if mode in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-			list.append(getConfigListEntry(_("Port B"), self.nimConfig.diseqcB))
+			list.append(getConfigListEntry(_("Port B"), nim.diseqcB))
 			if mode == "diseqc_a_b_c_d":
-				list.append(getConfigListEntry(_("Port C"), self.nimConfig.diseqcC))
-				list.append(getConfigListEntry(_("Port D"), self.nimConfig.diseqcD))
+				list.append(getConfigListEntry(_("Port C"), nim.diseqcC))
+				list.append(getConfigListEntry(_("Port D"), nim.diseqcD))
+			if mode != "toneburst_a_b":
+				list.append(getConfigListEntry(_("Set Voltage and 22KHz"), nim.simpleDiSEqCSetVoltageTone))
+				list.append(getConfigListEntry(_("Send DiSEqC only on satellite change"), nim.simpleDiSEqCOnlyOnSatChange))
 
 	def createPositionerSetup(self, list):
 		nim = self.nimConfig
@@ -88,7 +93,7 @@ class NimSetup(Screen, ConfigListScreen):
 			self.list.append(self.configMode)
 
 			if self.nimConfig.configMode.value == "simple":			#simple setup
-				self.diseqcModeEntry = getConfigListEntry(_("DiSEqC Mode"), self.nimConfig.diseqcMode)
+				self.diseqcModeEntry = getConfigListEntry(_("Mode"), self.nimConfig.diseqcMode)
 				self.list.append(self.diseqcModeEntry)
 				if self.nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
 					self.createSimpleSetup(self.list, self.nimConfig.diseqcMode.value)
@@ -407,12 +412,17 @@ class NimSelection(Screen):
 					text = _("nothing connected")
 				elif nimConfig.configMode.value == "simple":
 					if nimConfig.diseqcMode.value in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-						text = _("Sats") + ": " + nimmanager.getSatName(int(nimConfig.diseqcA.value))
+						text = _("Sats") + ": " 
+						if nimConfig.diseqcA.orbital_position != 3601:
+							text += nimmanager.getSatName(int(nimConfig.diseqcA.value))
 						if nimConfig.diseqcMode.value in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-							text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value))
+							if nimConfig.diseqcB.orbital_position != 3601:
+								text += "," + nimmanager.getSatName(int(nimConfig.diseqcB.value))
 						if nimConfig.diseqcMode.value == "diseqc_a_b_c_d":
-							text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value))
-							text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value))
+							if nimConfig.diseqcC.orbital_position != 3601:
+								text += "," + nimmanager.getSatName(int(nimConfig.diseqcC.value))
+							if nimConfig.diseqcD.orbital_position != 3601:
+								text += "," + nimmanager.getSatName(int(nimConfig.diseqcD.value))
 					elif nimConfig.diseqcMode.value == "positioner":
 						text = _("Positioner") + ":"
 						if nimConfig.positionerMode.value == "usals":
diff --git a/po/ar.po b/po/ar.po
index 0c9f0248..c76ced21 100755
--- a/po/ar.po
+++ b/po/ar.po
@@ -820,8 +820,8 @@ msgstr "دايزك أ/ب"
 msgid "DiSEqC A/B/C/D"
 msgstr "دايزك أ/ب/ج/د"
 
-msgid "DiSEqC Mode"
-msgstr "وضع الدايزك"
+msgid "Mode"
+msgstr ""
 
 msgid "DiSEqC mode"
 msgstr "وضعيـه الدايزك"
@@ -1561,9 +1561,6 @@ msgstr "رسـاله"
 msgid "Mkfs failed"
 msgstr ""
 
-msgid "Mode"
-msgstr ""
-
 msgid "Model: "
 msgstr "موديل :"
 
diff --git a/po/ca.po b/po/ca.po
index 331ebe3c..c108b63d 100755
--- a/po/ca.po
+++ b/po/ca.po
@@ -851,8 +851,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Mode DiSEqC"
+msgid "Mode"
+msgstr "Mode"
 
 msgid "DiSEqC mode"
 msgstr "mode DiSEqC"
@@ -1613,9 +1613,6 @@ msgstr "Missatge"
 msgid "Mkfs failed"
 msgstr "Ha fallat el mkfs"
 
-msgid "Mode"
-msgstr ""
-
 msgid "Model: "
 msgstr "Model: "
 
diff --git a/po/cs.po b/po/cs.po
index 1638798b..1754268d 100755
--- a/po/cs.po
+++ b/po/cs.po
@@ -840,8 +840,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Mód"
+msgid "Mode"
+msgstr "Mód"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC Mód"
@@ -1609,9 +1609,6 @@ msgstr "Vzkaz"
 msgid "Mkfs failed"
 msgstr "Mkfs selhalo"
 
-msgid "Mode"
-msgstr "Mód"
-
 msgid "Model: "
 msgstr "Model:"
 
diff --git a/po/da.po b/po/da.po
index 55016cd8..703f5fc5 100755
--- a/po/da.po
+++ b/po/da.po
@@ -849,8 +849,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Type"
+msgid "Mode"
+msgstr "Type"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC type"
@@ -1623,9 +1623,6 @@ msgstr "Besked"
 msgid "Mkfs failed"
 msgstr "Mkfs fejlede"
 
-msgid "Mode"
-msgstr "Format"
-
 msgid "Model: "
 msgstr "Model:"
 
diff --git a/po/de.po b/po/de.po
index e5f33eec..6314a9e9 100755
--- a/po/de.po
+++ b/po/de.po
@@ -879,8 +879,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-Modus"
+msgid "Mode"
+msgstr "Modus"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-Modus"
@@ -1673,9 +1673,6 @@ msgstr "Nachricht"
 msgid "Mkfs failed"
 msgstr "Mkfs fehlgeschlagen"
 
-msgid "Mode"
-msgstr "Modus"
-
 msgid "Model: "
 msgstr "Modell:"
 
@@ -2645,6 +2642,12 @@ msgstr "Wähle Video-Modus"
 msgid "Selected source image"
 msgstr "Wähle Quell-Image"
 
+msgid "Send DiSEqC"
+msgstr "DiSEqC senden"
+
+msgid "Send DiSEqC only on satellite change"
+msgstr "DiSEqC nur bei Sat-Wechsel senden"
+
 msgid "Seperate titles with a main menu"
 msgstr "Separate Titel mit Hauptmenü"
 
@@ -2696,6 +2699,9 @@ msgstr "Kanal-Infos"
 msgid "Services"
 msgstr "Kanäle"
 
+msgid "Set Voltage and 22KHz"
+msgstr "Spannung und 22KHz setzen"
+
 msgid "Set as default Interface"
 msgstr "Netzwerkadapter als Standard definieren"
 
diff --git a/po/el.po b/po/el.po
index 3053587f..7320e9f5 100755
--- a/po/el.po
+++ b/po/el.po
@@ -841,8 +841,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Mode"
+msgid "Mode"
+msgstr "Mode"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC mode"
@@ -1615,9 +1615,6 @@ msgstr "Μήνυμα"
 msgid "Mkfs failed"
 msgstr "Αποτυχία mkfs"
 
-msgid "Mode"
-msgstr "Mode"
-
 msgid "Model: "
 msgstr "Μοντέλο:"
 
diff --git a/po/en.po b/po/en.po
index daff3168..0b4ecb97 100644
--- a/po/en.po
+++ b/po/en.po
@@ -815,7 +815,7 @@ msgstr ""
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
-msgid "DiSEqC Mode"
+msgid "Mode"
 msgstr ""
 
 msgid "DiSEqC mode"
@@ -1554,9 +1554,6 @@ msgstr ""
 msgid "Mkfs failed"
 msgstr ""
 
-msgid "Mode"
-msgstr ""
-
 msgid "Model: "
 msgstr ""
 
diff --git a/po/enigma2.pot b/po/enigma2.pot
index 375931bd..9c131a79 100644
--- a/po/enigma2.pot
+++ b/po/enigma2.pot
@@ -783,7 +783,7 @@ msgid "DiSEqC A/B/C/D"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:74
-msgid "DiSEqC Mode"
+msgid "Mode"
 msgstr ""
 
 #: ../lib/python/Screens/Satconfig.py:180
diff --git a/po/es.po b/po/es.po
index 59a83032..e9da88d6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -856,8 +856,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Modo DiSEqC"
+msgid "Mode"
+msgstr "Modo"
 
 msgid "DiSEqC mode"
 msgstr "Modo DiSEqC"
@@ -1632,9 +1632,6 @@ msgstr "Mensaje"
 msgid "Mkfs failed"
 msgstr "Falló mkfs"
 
-msgid "Mode"
-msgstr "Modo"
-
 msgid "Model: "
 msgstr "Modelo: "
 
diff --git a/po/fi.po b/po/fi.po
index 19a3ddd9..bde40149 100755
--- a/po/fi.po
+++ b/po/fi.po
@@ -854,8 +854,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-tila"
+msgid "Mode"
+msgstr "Tila"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-tila"
@@ -1644,9 +1644,6 @@ msgstr "Viesti"
 msgid "Mkfs failed"
 msgstr "Tiedostojärjestelmän luonti epäonnistui"
 
-msgid "Mode"
-msgstr "Tila"
-
 msgid "Model: "
 msgstr "Malli: "
 
diff --git a/po/fr.po b/po/fr.po
index b71e1ce1..d72fa46b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -854,8 +854,8 @@ msgstr ""
 msgid "DiSEqC A/B/C/D"
 msgstr ""
 
-msgid "DiSEqC Mode"
-msgstr "Mode DiSEqC"
+msgid "Mode"
+msgstr "Mode"
 
 msgid "DiSEqC mode"
 msgstr "Mode DiSEqC"
@@ -1634,9 +1634,6 @@ msgstr "Message"
 msgid "Mkfs failed"
 msgstr "Echec Mkfs"
 
-msgid "Mode"
-msgstr ""
-
 msgid "Model: "
 msgstr "Modèle:"
 
diff --git a/po/hr.po b/po/hr.po
index 26b554f3..0ae7ea17 100755
--- a/po/hr.po
+++ b/po/hr.po
@@ -840,8 +840,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Mod"
+msgid "Mode"
+msgstr "Mod"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC mod"
@@ -1600,9 +1600,6 @@ msgstr "Poruka"
 msgid "Mkfs failed"
 msgstr "Mkfs neuspjelo"
 
-msgid "Mode"
-msgstr "Mod"
-
 msgid "Model: "
 msgstr "Model:"
 
diff --git a/po/hu.po b/po/hu.po
index 345f90b4..70d7f7a6 100755
--- a/po/hu.po
+++ b/po/hu.po
@@ -852,8 +852,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC mód"
+msgid "Mode"
+msgstr "Mód"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC mód"
@@ -1625,9 +1625,6 @@ msgstr "Üzenet"
 msgid "Mkfs failed"
 msgstr "Hibás Mkfs-ek"
 
-msgid "Mode"
-msgstr "Mód"
-
 msgid "Model: "
 msgstr "Modell:"
 
diff --git a/po/is.po b/po/is.po
index 71e0d6d3..3ebefab9 100755
--- a/po/is.po
+++ b/po/is.po
@@ -848,8 +848,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Gerð"
+msgid "Mode"
+msgstr "Gerð"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC gerð"
@@ -1616,9 +1616,6 @@ msgstr "Skilaboð"
 msgid "Mkfs failed"
 msgstr "Mkfs tókst ekki"
 
-msgid "Mode"
-msgstr "Hamur"
-
 msgid "Model: "
 msgstr "Gerð:"
 
diff --git a/po/it.po b/po/it.po
index 0b1bde29..ddcd5b87 100755
--- a/po/it.po
+++ b/po/it.po
@@ -847,9 +847,6 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Modalità DiSEqc"
-
 msgid "DiSEqC mode"
 msgstr "Modalità DiSEqC"
 
diff --git a/po/lt.po b/po/lt.po
index 2cdc4f79..0b5b8268 100755
--- a/po/lt.po
+++ b/po/lt.po
@@ -856,8 +856,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC pasirinkimas"
+msgid "Mode"
+msgstr "Pasirinkimas"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC pasirinkimas"
@@ -1640,9 +1640,6 @@ msgstr "Pranešimas"
 msgid "Mkfs failed"
 msgstr "Mkfs nepavyko"
 
-msgid "Mode"
-msgstr "Būdas"
-
 msgid "Model: "
 msgstr "Modelis:"
 
diff --git a/po/nl.po b/po/nl.po
index e63e24b5..4a5708e6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -861,8 +861,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-modus"
+msgid "Mode"
+msgstr "Modus"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-modus"
@@ -1643,9 +1643,6 @@ msgstr "Bericht"
 msgid "Mkfs failed"
 msgstr "MakeFileSystem mislukt"
 
-msgid "Mode"
-msgstr "Modus"
-
 msgid "Model: "
 msgstr "Model: "
 
diff --git a/po/no.po b/po/no.po
index a16e0884..2bd2d5a3 100755
--- a/po/no.po
+++ b/po/no.po
@@ -844,8 +844,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-Modus"
+msgid "Mode"
+msgstr "Modus"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-Modus"
@@ -1614,9 +1614,6 @@ msgstr "Melding"
 msgid "Mkfs failed"
 msgstr "Mkfs feilet"
 
-msgid "Mode"
-msgstr "Modus"
-
 msgid "Model: "
 msgstr "Modell:"
 
diff --git a/po/pl.po b/po/pl.po
index eef53bc4..7de1eb21 100755
--- a/po/pl.po
+++ b/po/pl.po
@@ -851,8 +851,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Tryb DiSEqC"
+msgid "Mode"
+msgstr "Tryb"
 
 msgid "DiSEqC mode"
 msgstr "Tryb DiSEqC"
@@ -1629,9 +1629,6 @@ msgstr "Wiadomość"
 msgid "Mkfs failed"
 msgstr "Mkfs zawiódł"
 
-msgid "Mode"
-msgstr "Tryb"
-
 msgid "Model: "
 msgstr "Model: "
 
diff --git a/po/pt.po b/po/pt.po
index d37a8e87..5a645bb6 100755
--- a/po/pt.po
+++ b/po/pt.po
@@ -847,8 +847,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "Modo DiSEqC"
+msgid "Mode"
+msgstr "Modo"
 
 msgid "DiSEqC mode"
 msgstr "Modo DiSEqC"
@@ -1615,9 +1615,6 @@ msgstr "Mensagem"
 msgid "Mkfs failed"
 msgstr "Falha em Mkfs"
 
-msgid "Mode"
-msgstr "Mode"
-
 msgid "Model: "
 msgstr "Modelo:"
 
diff --git a/po/ru.po b/po/ru.po
index d5c8fff9..34440540 100755
--- a/po/ru.po
+++ b/po/ru.po
@@ -823,8 +823,8 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC-режим"
+msgid "Mode"
+msgstr "режим"
 
 msgid "DiSEqC mode"
 msgstr "DiSEqC-режим"
@@ -1568,9 +1568,6 @@ msgstr "Сообщение"
 msgid "Mkfs failed"
 msgstr ""
 
-msgid "Mode"
-msgstr ""
-
 msgid "Model: "
 msgstr "Модель:"
 
diff --git a/po/sv.po b/po/sv.po
index 8f8cb010..e7ddd30a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxbox-enigma 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-10 00:07+0100\n"
-"PO-Revision-Date: 2008-11-08 07:56+0100\n"
+"POT-Creation-Date: 2008-11-12 17:42+0100\n"
+"PO-Revision-Date: 2008-11-12 12:27+0100\n"
 "Last-Translator: WeeGull <weegull@hotmail.com>\n"
 "Language-Team: WeeGull <weegull@hotmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -92,10 +92,10 @@ msgid "(show optional DVD audio menu)"
 msgstr "(visa utökad DVD ljudmeny)"
 
 msgid "* Only available if more than one interface is active."
-msgstr ""
+msgstr "* Enbart tillgänglig om mer än ett kort är aktivt."
 
 msgid "* Only available when entering hidden SSID or network key"
-msgstr ""
+msgstr "* Enbart tillgänglig vid angiven dold SSID eller nätverksnyckel"
 
 msgid ".NFI Download failed:"
 msgstr ".NFI Nedladdning misslyckades:"
@@ -416,6 +416,8 @@ msgid ""
 "Are you sure you want to activate this network configuration?\n"
 "\n"
 msgstr ""
+"Är du säker på att du vill aktivera den här nätverkskonfigurationen?\n"
+"\n"
 
 msgid ""
 "Are you sure you want to restart your network interfaces?\n"
@@ -530,7 +532,7 @@ msgid "Burn DVD"
 msgstr "Skapa DVD"
 
 msgid "Burn existing image to DVD"
-msgstr ""
+msgstr "Bränn existerande image till DVD"
 
 msgid "Burn to DVD..."
 msgstr "Bränn till DVD..."
@@ -728,10 +730,10 @@ msgid "Content does not fit on DVD!"
 msgstr "Innehåll för stort för en DVD!"
 
 msgid "Continue in background"
-msgstr "Forsätta i bakgrund"
+msgstr "Fortsätta i bakgrund"
 
 msgid "Continue playing"
-msgstr "Forsätt spela"
+msgstr "Fortsätt spela"
 
 msgid "Contrast"
 msgstr "Kontrast"
@@ -746,7 +748,7 @@ msgid "Could not load Medium! No disc inserted?"
 msgstr "Kunde inte ladda media! Ingen disk istoppad?"
 
 msgid "Create DVD-ISO"
-msgstr ""
+msgstr "Skapa DVD-ISO"
 
 msgid "Create movie folder failed"
 msgstr "Det gick inte att skapa en filmkatalog"
@@ -868,9 +870,6 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Läge"
-
 msgid "DiSEqC mode"
 msgstr "DiSEqC läge"
 
@@ -1068,11 +1067,14 @@ msgid "East"
 msgstr "Öst"
 
 msgid "Edit"
-msgstr ""
+msgstr "Ändra"
 
 msgid "Edit DNS"
 msgstr "Ändra DNS"
 
+msgid "Edit Title"
+msgstr ""
+
 msgid "Edit chapters of current title"
 msgstr "Ändra kapitel i nuvarande titel"
 
@@ -1119,7 +1121,7 @@ msgid "Encryption Key"
 msgstr "Krypteringsnyckel"
 
 msgid "Encryption Keytype"
-msgstr ""
+msgstr "Krypterings Nyckelvariant"
 
 msgid "Encryption Type"
 msgstr "Krypteringstyp"
@@ -1163,10 +1165,10 @@ msgid "Enter Rewind at speed"
 msgstr "Ange hastighet för snabbspolning bakåt"
 
 msgid "Enter WLAN network name/SSID:"
-msgstr ""
+msgstr "Ange WLAN nätverks namn/SSID:"
 
 msgid "Enter WLAN passphrase/key:"
-msgstr ""
+msgstr "Ange WLAN passphrase/nyckel:"
 
 msgid "Enter main menu..."
 msgstr "Gå till huvudmeny..."
@@ -1261,10 +1263,10 @@ msgid "Finished"
 msgstr "Klart"
 
 msgid "Finished configuring your network"
-msgstr ""
+msgstr "Klar med konfigureringen av ditt nätverk"
 
 msgid "Finished restarting your network"
-msgstr ""
+msgstr "Klar med omstarten av ditt nätverk"
 
 msgid "Finnish"
 msgstr "Finska"
@@ -1372,7 +1374,7 @@ msgid "Harddisk standby after"
 msgstr "Viloläge för hårddisk efter"
 
 msgid "Hidden network SSID"
-msgstr ""
+msgstr "Dold nätverks SSID"
 
 msgid "Hierarchy Information"
 msgstr "Hierarkisk information "
@@ -1390,10 +1392,10 @@ msgid "IP Address"
 msgstr "IP adress"
 
 msgid "ISO file is too large for this filesystem!"
-msgstr ""
+msgstr "ISO fil är för stor för använt filsystem!"
 
 msgid "ISO path"
-msgstr ""
+msgstr "ISO sökväg"
 
 msgid "Icelandic"
 msgstr "Isländska"
@@ -1876,18 +1878,27 @@ msgid ""
 "Please verify that you have attached a network cable and your network is "
 "configured correctly."
 msgstr ""
+"Inget fungerandes lokalt nätverkskort funnet.\n"
+"Vänligen bekräfta att du har anslutit en nätverkskabel och att ditt nätverk "
+"är korrekt konfigurerat."
 
 msgid ""
 "No working wireless network adapter found.\n"
 "Please verify that you have attached a compatible WLAN device and your "
 "network is configured correctly."
 msgstr ""
+"Inget fungerandes trådlöst nätverkskort funnet.\n"
+"Vänligen bekräfta att du har anslutit ett kompatibelt WLAN enhet och att din "
+"nätverkskonfiguration är korrekt."
 
 msgid ""
 "No working wireless network interface found.\n"
 " Please verify that you have attached a compatible WLAN device or enable "
 "your local network interface."
 msgstr ""
+"Inget fungerandes trådlöst nätverkskort funnet.\n"
+"Vänligen bekräfta att du har anslutit ett kompatibelt WLAN enhet eller "
+"aktiverat ditt lokala nätverkskort."
 
 msgid "No, but restart from begin"
 msgstr "Nej, men starta om från början"
@@ -2159,19 +2170,19 @@ msgstr ""
 "knappen."
 
 msgid "Please wait for activation of your network configuration..."
-msgstr ""
+msgstr "Vänligen vänta för aktivering av din nätverkskonfiguration..."
 
 msgid "Please wait for md5 signature verification..."
 msgstr "Vänligen vänta för md5 signatur verifiering..."
 
 msgid "Please wait while we configure your network..."
-msgstr ""
+msgstr "Vänligen vänta medans ditt nätverk konfigureras..."
 
 msgid "Please wait while your network is restarting..."
-msgstr ""
+msgstr "Vänligen vänta medans ditt nätverk startas om..."
 
 msgid "Please wait..."
-msgstr ""
+msgstr "Vänligen vänta..."
 
 msgid "Please wait... Loading list..."
 msgstr "Vänligen vänta... Laddar lista..."
@@ -2231,7 +2242,7 @@ msgid "Preparing... Please wait"
 msgstr "Förbereder... Vänligen vänta"
 
 msgid "Press OK on your remote control to continue."
-msgstr "Tryck OK på din fjärrkontroll för att forsätta."
+msgstr "Tryck OK på din fjärrkontroll för att fortsätta."
 
 msgid "Press OK to activate the settings."
 msgstr "Tryck OK för aktivera inställningarna."
@@ -2628,6 +2639,12 @@ msgstr "Välj videoläge"
 msgid "Selected source image"
 msgstr "Välj käll image"
 
+msgid "Send DiSEqC"
+msgstr ""
+
+msgid "Send DiSEqC only on satellite change"
+msgstr ""
+
 msgid "Seperate titles with a main menu"
 msgstr "Separera titlar med en huvudmeny"
 
@@ -2679,11 +2696,14 @@ msgstr "Kanalinfo"
 msgid "Services"
 msgstr "Kanaler"
 
+msgid "Set Voltage and 22KHz"
+msgstr ""
+
 msgid "Set as default Interface"
 msgstr "Använd som standard Interface"
 
 msgid "Set interface as default Interface"
-msgstr ""
+msgstr "Använd kort som standard kort"
 
 msgid "Set limits"
 msgstr "Ange gräns"
@@ -2918,7 +2938,7 @@ msgstr ""
 "weegull@hotmail.com"
 
 msgid "TS file is too large for ISO9660 level 1!"
-msgstr ""
+msgstr "TS fil för stor för ISO9660 level 1!"
 
 msgid "TV System"
 msgstr "TV System"
@@ -3070,7 +3090,7 @@ msgid ""
 msgstr ""
 "Det är inte säkert att det finns tillräckligt med utrymme på vald "
 "partition.\n"
-"Vill du verkligen forsätta?"
+"Vill du verkligen fortsätta?"
 
 #, python-format
 msgid "This .NFI file does not contain a valid %s image!"
@@ -3087,7 +3107,7 @@ msgid ""
 "This .NFI file has a valid md5 signature. Continue programming this image to "
 "flash memory?"
 msgstr ""
-"Denna .NFI har giltig md5sum. Forsätta programmera denna image till "
+"Denna .NFI har giltig md5sum. Fortsätta programmera denna image till "
 "flashminnet?"
 
 msgid ""
@@ -3230,6 +3250,9 @@ msgstr "Tidszon"
 msgid "Title"
 msgstr "Titel"
 
+msgid "Title properties"
+msgstr ""
+
 msgid "Title:"
 msgstr "Title:"
 
@@ -3478,7 +3501,7 @@ msgid "View teletext..."
 msgstr "Visa teletext..."
 
 msgid "Virtual KeyBoard"
-msgstr ""
+msgstr "Virtuellt tangentbord"
 
 msgid "Voltage mode"
 msgstr "Spännings läge"
@@ -3496,7 +3519,7 @@ msgid "WPA"
 msgstr "WPA"
 
 msgid "WPA or WPA2"
-msgstr ""
+msgstr "WPA eller WPA2"
 
 msgid "WPA2"
 msgstr "WPA2"
@@ -3604,7 +3627,7 @@ msgid "Yes"
 msgstr "Ja"
 
 msgid "Yes, and delete this movie"
-msgstr ""
+msgstr "Ja, och ta bort den här filmen."
 
 msgid "Yes, backup my settings!"
 msgstr "Ja, ta backup på inställningar!"
@@ -3765,7 +3788,7 @@ msgstr ""
 "Tryck OK för att starta."
 
 msgid "Your network configuration has been activated."
-msgstr ""
+msgstr "Din nätverkskonfiguration har aktiverats."
 
 msgid ""
 "Your network configuration has been activated.\n"
@@ -3773,6 +3796,10 @@ msgid ""
 "\n"
 "Do you want to disable the second network interface?"
 msgstr ""
+"Din nätverkskonfiguration har aktiverats.\n"
+"Ett annat konfigurerat kort har hittats.\n"
+"\n"
+"Vill du akaktivera det andra nätverkskortet?"
 
 msgid "Zap back to service before positioner setup?"
 msgstr "Gå till föregående kanal före motorinstallation?"
@@ -3805,10 +3832,10 @@ msgid "about to start"
 msgstr "håller på att starta"
 
 msgid "activate current configuration"
-msgstr ""
+msgstr "aktivera nuvarande konfiguration"
 
 msgid "add a nameserver entry"
-msgstr ""
+msgstr "lägga till en namnserver post"
 
 msgid "add alternatives"
 msgstr "lägg till alternativ"
@@ -4007,7 +4034,7 @@ msgid "end favourites edit"
 msgstr "avsluta favoriter editor"
 
 msgid "enigma2 and network"
-msgstr ""
+msgstr "enigma2 och nätverk"
 
 msgid "equal to"
 msgstr "lika med"
@@ -4025,19 +4052,19 @@ msgid "exit movielist"
 msgstr "avsluta filmlista"
 
 msgid "exit nameserver configuration"
-msgstr ""
+msgstr "avsluta namnserver konfiguration"
 
 msgid "exit network adapter configuration"
-msgstr ""
+msgstr "avsluta nätverkskorts konfiguration"
 
 msgid "exit network adapter setup menu"
-msgstr ""
+msgstr "avsluta nätverkskorts installationsmeny"
 
 msgid "exit network interface list"
-msgstr ""
+msgstr "avsluta nätverkskorts lista"
 
 msgid "exit networkadapter setup menu"
-msgstr ""
+msgstr "avsluta nätverkskort installationsmeny"
 
 msgid "failed"
 msgstr "misslyckades"
@@ -4183,16 +4210,16 @@ msgid "move PiP to main picture"
 msgstr "flytta BiB till huvudbild"
 
 msgid "move down to last entry"
-msgstr ""
+msgstr "flytta ner till sista posten"
 
 msgid "move down to next entry"
-msgstr ""
+msgstr "flytta ner till nästa post"
 
 msgid "move up to first entry"
-msgstr ""
+msgstr "flytta upp till första posten"
 
 msgid "move up to previous entry"
-msgstr ""
+msgstr "flytta upp till föregående post"
 
 msgid "movie list"
 msgstr "filmlista"
@@ -4255,7 +4282,7 @@ msgid "once"
 msgstr "en gång"
 
 msgid "open nameserver configuration"
-msgstr ""
+msgstr "öppna namnserver konfiguration"
 
 msgid "open servicelist"
 msgstr "öppna kanallista"
@@ -4267,7 +4294,7 @@ msgid "open servicelist(up)"
 msgstr "öppna kanallista(upp)"
 
 msgid "open virtual keyboard input help"
-msgstr ""
+msgstr "öppna virtuellt tangentbordsinmatningshjälp"
 
 msgid "pass"
 msgstr "klart"
@@ -4306,7 +4333,7 @@ msgid "recording..."
 msgstr "spelar in..."
 
 msgid "remove a nameserver entry"
-msgstr ""
+msgstr "ta bort en namnserver post"
 
 msgid "remove after this position"
 msgstr "ta bort efter denna position"
@@ -4385,10 +4412,10 @@ msgid "select image from server"
 msgstr "välj image från server"
 
 msgid "select interface"
-msgstr ""
+msgstr "välj kort"
 
 msgid "select menu entry"
-msgstr ""
+msgstr "välj meny post"
 
 msgid "select movie"
 msgstr "välj film"
@@ -4669,6 +4696,9 @@ msgstr "zapped"
 #~ msgid "Device Setup..."
 #~ msgstr "Nätverksinstallation..."
 
+#~ msgid "DiSEqC Mode"
+#~ msgstr "DiSEqC Läge"
+
 #~ msgid ""
 #~ "Do you really want to REMOVE\n"
 #~ "the plugin \""
diff --git a/po/tr.po b/po/tr.po
index aa9ffc7d..ac29f079 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enigma2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-10 22:36+0100\n"
+"POT-Creation-Date: 2008-11-12 17:42+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Zülfikar Veyisoğlu <zveyis@gmail.com>\n"
 "Language-Team: \n"
@@ -256,7 +256,8 @@ msgstr ""
 msgid ""
 "A recording is currently running. Please stop the recording before trying to "
 "start the satfinder."
-msgstr "Kayıt devam ediyor. Uydu Arayıcıyı başlatmadan önce kaydı durdurun."
+msgstr ""
+"Kayıt devam ediyor. Lütfen Uydu Arayıcıyı başlatmadan önce kaydı durdurun."
 
 #, python-format
 msgid "A required tool (%s) was not found."
@@ -440,7 +441,7 @@ msgid "Audio Options..."
 msgstr "Ses Ayarları..."
 
 msgid "Authoring mode"
-msgstr ""
+msgstr "Yayınlama kipi"
 
 msgid "Auto"
 msgstr "Otomatik"
@@ -649,16 +650,16 @@ msgid "Close"
 msgstr "Kapat"
 
 msgid "Code rate high"
-msgstr ""
+msgstr "Yüksek kod oranı"
 
 msgid "Code rate low"
-msgstr ""
+msgstr "Düşük kod oranı"
 
 msgid "Coderate HP"
-msgstr ""
+msgstr "Yüksek güç (HP) kod oranı"
 
 msgid "Coderate LP"
-msgstr ""
+msgstr "Düşük güç (LP) kod oranı"
 
 msgid "Collection name"
 msgstr "Kolleksiyon adı"
@@ -740,7 +741,7 @@ msgid "Could not connect to Dreambox .NFI Image Feed Server:"
 msgstr "Dreambox .NFI imaj sunucusuna bağlanamıyor:"
 
 msgid "Could not load Medium! No disc inserted?"
-msgstr "DVD medyası yüklenemedi. DVD medyası takılı değil mi?"
+msgstr "DVD medyası yüklenemedi. DVD diski takılı değil mi?"
 
 msgid "Create DVD-ISO"
 msgstr "DVD-ISO oluştur"
@@ -835,7 +836,7 @@ msgid "Delete entry"
 msgstr "Seçimi sil"
 
 msgid "Delete failed!"
-msgstr "Silmeişlemi başarısız!"
+msgstr "Silme işlemi başarısız!"
 
 #, python-format
 msgid ""
@@ -866,9 +867,6 @@ msgstr "DiSEqC A/B"
 msgid "DiSEqC A/B/C/D"
 msgstr "DiSEqC A/B/C/D"
 
-msgid "DiSEqC Mode"
-msgstr "DiSEqC Modu"
-
 msgid "DiSEqC mode"
 msgstr "DiSEqC modu"
 
@@ -932,7 +930,7 @@ msgid ""
 "This could take lots of time!"
 msgstr ""
 "Dosya sistemini kontrol etmek istediğinizden emin misiniz?\n"
-"Bu işlem çok uzun sürecektir!"
+"Bu işlem çok uzun sürebilir!"
 
 #, python-format
 msgid "Do you really want to delete %s?"
@@ -1072,6 +1070,9 @@ msgstr "Düzenle"
 msgid "Edit DNS"
 msgstr "DNS Düzenle"
 
+msgid "Edit Title"
+msgstr ""
+
 msgid "Edit chapters of current title"
 msgstr "Geçerli başlık için bölümleri düzenle"
 
@@ -1215,7 +1216,7 @@ msgid "Expert"
 msgstr "Uzman"
 
 msgid "Extended Networksetup Plugin..."
-msgstr "Geliştirilmiş Ağ Kurulum Eklentisi..."
+msgstr "Gelişmiş Ağ Kurulum Eklentisi..."
 
 msgid "Extended Setup..."
 msgstr "Gelişmiş Kurulum..."
@@ -1242,7 +1243,7 @@ msgid "Fast Forward speeds"
 msgstr "Hızlı sardırma (FF) hızları"
 
 msgid "Fast epoch"
-msgstr ""
+msgstr "Hızlı tur"
 
 msgid "Favourites"
 msgstr "Favoriler"
@@ -1290,7 +1291,7 @@ msgid "Format"
 msgstr "Biçimlendir"
 
 msgid "Frame repeat count during non-smooth winding"
-msgstr ""
+msgstr "Adım adım ilerletmede çerçeve tekrar sayısı "
 
 msgid "French"
 msgstr "Fransızca"
@@ -1358,10 +1359,10 @@ msgid "Greek"
 msgstr "Greek"
 
 msgid "Guard Interval"
-msgstr ""
+msgstr "Koruma Süresi"
 
 msgid "Guard interval mode"
-msgstr ""
+msgstr "Koruma süre kipi"
 
 msgid "Harddisk"
 msgstr "Sabitdisk"
@@ -1591,7 +1592,7 @@ msgid "Link:"
 msgstr "Link:"
 
 msgid "Linked titles with a DVD menu"
-msgstr ""
+msgstr "DVD Menüsü ile bağlı başlıklar"
 
 msgid "List of Storage Devices"
 msgstr "Depolama Aygıtları"
@@ -1615,7 +1616,7 @@ msgid "Lock:"
 msgstr "Kilitli:"
 
 msgid "Long Keypress"
-msgstr ""
+msgstr "Tuşa uzun basıldığında"
 
 msgid "Longitude"
 msgstr "Boylam"
@@ -1639,7 +1640,7 @@ msgid "Make this mark an 'out' point"
 msgstr "'dışında' noktası olarak işaretle"
 
 msgid "Make this mark just a mark"
-msgstr ""
+msgstr "Bu işareti sadece bir işaret olarak kullan"
 
 msgid "Manual Scan"
 msgstr "Elle arama"
@@ -2238,7 +2239,7 @@ msgid "Positioner storage"
 msgstr "Pozisyoner konumunu hafızaya al"
 
 msgid "Power threshold in mA"
-msgstr ""
+msgstr "Güç eşiği (mA)"
 
 msgid "Predefined transponder"
 msgstr "Önceden tanımlanmış transponder"
@@ -2647,8 +2648,14 @@ msgstr "Görüntü modunu seç"
 msgid "Selected source image"
 msgstr "Seçilen kaynak imaj"
 
+msgid "Send DiSEqC"
+msgstr "DiSEqC komutu gönder"
+
+msgid "Send DiSEqC only on satellite change"
+msgstr "DiSEqC komutunu yalnızca uydu değiştiğinde gönder"
+
 msgid "Seperate titles with a main menu"
-msgstr ""
+msgstr "Ana menü ile başlıkları ayır"
 
 msgid "Sequence repeat"
 msgstr "Sıralama tekrarı"
@@ -2698,6 +2705,9 @@ msgstr "Kanal bilgisi"
 msgid "Services"
 msgstr "Kanallar"
 
+msgid "Set Voltage and 22KHz"
+msgstr "Voltaj ve 22KHz ayarla"
+
 msgid "Set as default Interface"
 msgstr "Varsayılan arayüz olarak ayarla"
 
@@ -2870,7 +2880,7 @@ msgid "Stop"
 msgstr "Durdur"
 
 msgid "Stop Timeshift?"
-msgstr "Timeshift i durdur?"
+msgstr "Zaman bükmeyi (timeshift) durdur?"
 
 msgid "Stop current event and disable coming events"
 msgstr "Geçerli ve gelecek zamanlanmış eylemleri devre dışı bırak"
@@ -2909,7 +2919,7 @@ msgid "Sunday"
 msgstr "Pazar"
 
 msgid "Swap Services"
-msgstr ""
+msgstr "Ana <-> PiP yer değiştir"
 
 msgid "Swedish"
 msgstr "İsveççe"
@@ -3237,10 +3247,10 @@ msgid "Timer status:"
 msgstr "Zamanlayıcı durumu:"
 
 msgid "Timeshift"
-msgstr "Timeshift"
+msgstr "Zamanı bük (Timeshift)"
 
 msgid "Timeshift not possible!"
-msgstr "Timeshift kullanılamaz!"
+msgstr "Zaman bükme kullanılamaz!"
 
 msgid "Timezone"
 msgstr "Zaman dilimi"
@@ -3248,6 +3258,9 @@ msgstr "Zaman dilimi"
 msgid "Title"
 msgstr "Başlık"
 
+msgid "Title properties"
+msgstr ""
+
 msgid "Title:"
 msgstr "Başlık:"
 
@@ -3399,7 +3412,7 @@ msgid "Use Interface"
 msgstr "Arayüzü Kullan"
 
 msgid "Use Power Measurement"
-msgstr "Enerji Ölçümünü Kullan"
+msgstr "Güç Ölçümünü Kullan"
 
 msgid "Use a gateway"
 msgstr "Ağ geçidi kullan"
@@ -3417,10 +3430,10 @@ msgstr "Ağ geçidi kullan"
 #.       better suited for translation to other languages may be "stepwise
 #.       winding/playback", or "winding/playback using stills". 
 msgid "Use non-smooth winding at speeds above"
-msgstr ""
+msgstr "Adım adım ilerletmeyi bu hızlarda kullan"
 
 msgid "Use power measurement"
-msgstr "Eneji kullanımını ölç"
+msgstr "Güç kullanımını ölç"
 
 msgid "Use the Networkwizard to configure your Network\n"
 msgstr "Ağınızı yapılandırmak için Ağ sihirbazını kullanın\n"
@@ -3910,7 +3923,7 @@ msgid "blacklist"
 msgstr "kara liste"
 
 msgid "by Exif"
-msgstr ""
+msgstr "Exif'ten al"
 
 msgid "change recording (duration)"
 msgstr "kaydı değiştir (süre)"
@@ -4066,7 +4079,7 @@ msgid "exit network interface list"
 msgstr "ağ arayüzleri listesinden çık"
 
 msgid "exit networkadapter setup menu"
-msgstr ""
+msgstr "ağ donanımı kurulum menüsünden çık"
 
 msgid "failed"
 msgstr "başarısız"
@@ -4185,7 +4198,7 @@ msgid "locked"
 msgstr "kilitli"
 
 msgid "loopthrough to"
-msgstr ""
+msgstr "üzerinden bağla"
 
 msgid "manual"
 msgstr "elle"
@@ -4227,7 +4240,7 @@ msgid "movie list"
 msgstr "film listesi"
 
 msgid "multinorm"
-msgstr ""
+msgstr "PAL/NTSC"
 
 msgid "never"
 msgstr "hiç"
@@ -4251,10 +4264,10 @@ msgid "no module found"
 msgstr "modül bulunamadı"
 
 msgid "no standby"
-msgstr ""
+msgstr "uyku moduna geçilmesin"
 
 msgid "no timeout"
-msgstr ""
+msgstr "zaman aşımı kullanılmasın"
 
 msgid "none"
 msgstr "yok"
@@ -4266,10 +4279,10 @@ msgid "nothing connected"
 msgstr "bağlı değil"
 
 msgid "of a DUAL layer medium used."
-msgstr ""
+msgstr "ÇİFT katmanlı medya kullanıldığında."
 
 msgid "of a SINGLE layer medium used."
-msgstr ""
+msgstr "TEK katmanlı medya kullanıldığında"
 
 msgid "off"
 msgstr "kapalı"
@@ -4504,7 +4517,7 @@ msgid "start cut here"
 msgstr "buradan kes"
 
 msgid "start timeshift"
-msgstr "timeshift'i başlat"
+msgstr "zaman bükmeyi başlat"
 
 msgid "stereo"
 msgstr "stereo"
@@ -4519,7 +4532,7 @@ msgid "stop recording"
 msgstr "kaydır durdur"
 
 msgid "stop timeshift"
-msgstr "timeshift'i durdur"
+msgstr "zaman bükmeyi durdur"
 
 msgid "swap PiP and main picture"
 msgstr "PiP ile ana ekranın yerlerini değiştir"
@@ -4677,6 +4690,9 @@ msgstr "kanal değiştirildi"
 #~ msgid "DVD up key"
 #~ msgstr "DVD yukarı"
 
+#~ msgid "DiSEqC Mode"
+#~ msgstr "DiSEqC Modu"
+
 #~ msgid ""
 #~ "Do you really want to REMOVE\n"
 #~ "the plugin \""