From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 8 Oct 2010 12:04:38 +0000 (+0200)
Subject: refs bug #592
X-Git-Tag: 3.0.0~26^2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/912a4c273438b3b7afb7cbbdcae3372ea9e489c2

refs bug #592
"pin" => "PIN"
---

diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py
index eae12da4..f174b583 100644
--- a/lib/python/Screens/ParentalControlSetup.py
+++ b/lib/python/Screens/ParentalControlSetup.py
@@ -78,21 +78,21 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
 			#self.list.append(getConfigListEntry(_("Configuration mode"), config.ParentalControl.mode))
 			self.list.append(getConfigListEntry(_("Protect setup"), config.ParentalControl.setuppinactive))
 			if config.ParentalControl.setuppinactive.value:
-				self.changeSetupPin = getConfigListEntry(_("Change setup pin"), NoSave(ConfigNothing()))
+				self.changeSetupPin = getConfigListEntry(_("Change setup PIN"), NoSave(ConfigNothing()))
 				self.list.append(self.changeSetupPin)
 			self.list.append(getConfigListEntry(_("Protect services"), config.ParentalControl.servicepinactive))
 			if config.ParentalControl.servicepinactive.value:
 				self.list.append(getConfigListEntry(_("Parental control type"), config.ParentalControl.type))
 				if config.ParentalControl.mode.value == "complex":
-					self.changePin = getConfigListEntry(_("Change service pins"), NoSave(ConfigNothing()))
+					self.changePin = getConfigListEntry(_("Change service PINs"), NoSave(ConfigNothing()))
 					self.list.append(self.changePin)
 				elif config.ParentalControl.mode.value == "simple":	
-					self.changePin = getConfigListEntry(_("Change service pin"), NoSave(ConfigNothing()))
+					self.changePin = getConfigListEntry(_("Change service PIN"), NoSave(ConfigNothing()))
 					self.list.append(self.changePin)
 				#Added Option to remember the service pin
-				self.list.append(getConfigListEntry(_("Remember service pin"), config.ParentalControl.storeservicepin))	
+				self.list.append(getConfigListEntry(_("Remember service PIN"), config.ParentalControl.storeservicepin))	
 				#Added Option to remember the cancellation of service pin entry
-				self.list.append(getConfigListEntry(_("Remember service pin cancel"), config.ParentalControl.storeservicepincancel))	
+				self.list.append(getConfigListEntry(_("Remember service PIN cancel"), config.ParentalControl.storeservicepincancel))	
 				self.editListEntry = getConfigListEntry(_("Edit services list"), NoSave(ConfigNothing()))
 				self.list.append(self.editListEntry)
 				#New funtion: Possibility to add Bouquets to whitelist / blacklist
@@ -115,9 +115,9 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
 			if config.ParentalControl.mode.value == "complex":
 				pass
 			else:
-				self.session.open(ParentalControlChangePin, config.ParentalControl.servicepin[0], _("service pin"))
+				self.session.open(ParentalControlChangePin, config.ParentalControl.servicepin[0], _("service PIN"))
 		elif self["config"].l.getCurrentSelection() == self.changeSetupPin:
-			self.session.open(ParentalControlChangePin, config.ParentalControl.setuppin, _("setup pin"))
+			self.session.open(ParentalControlChangePin, config.ParentalControl.setuppin, _("setup PIN"))
 		elif self["config"].l.getCurrentSelection() == self.reloadLists:
 			parentalControl.open()
 		else:
@@ -137,14 +137,14 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen):
 
 	def SetupPinMessageCallback(self, value):
 		if value:
-			self.session.openWithCallback(self.cancelCB, ParentalControlChangePin, config.ParentalControl.setuppin, _("setup pin"))
+			self.session.openWithCallback(self.cancelCB, ParentalControlChangePin, config.ParentalControl.setuppin, _("setup PIN"))
 		else:
 			config.ParentalControl.setuppinactive.value = False
 			self.keyCancel()
 
 	def ServicePinMessageCallback(self, value):
 		if value:
-			self.session.openWithCallback(self.cancelCB, ParentalControlChangePin, config.ParentalControl.servicepin[0], _("service pin"))
+			self.session.openWithCallback(self.cancelCB, ParentalControlChangePin, config.ParentalControl.servicepin[0], _("service PIN"))
 		else:
 			config.ParentalControl.servicepinactive.value = False
 			self.keyCancel()
@@ -317,8 +317,8 @@ class ParentalControlChangePin(Screen, ConfigListScreen, ProtectedScreen):
 		self.pin2 = ConfigPIN(default = 1112, censor = "*")
 		self.pin1.addEndNotifier(boundFunction(self.valueChanged, 1))
 		self.pin2.addEndNotifier(boundFunction(self.valueChanged, 2))
-		self.list.append(getConfigListEntry(_("New pin"), NoSave(self.pin1)))
-		self.list.append(getConfigListEntry(_("Reenter new pin"), NoSave(self.pin2)))
+		self.list.append(getConfigListEntry(_("New PIN"), NoSave(self.pin1)))
+		self.list.append(getConfigListEntry(_("Reenter new PIN"), NoSave(self.pin2)))
 		ConfigListScreen.__init__(self, self.list)
 #		print "old pin:", pin
 		#if pin.value != "aaaa":
@@ -345,7 +345,7 @@ class ParentalControlChangePin(Screen, ConfigListScreen, ProtectedScreen):
 			self.keyOK()
 
 	def getPinText(self):
-		return _("Please enter the old pin code")
+		return _("Please enter the old PIN code")
 
 	def isProtected(self):
 		return (self.pin.value != "aaaa")
@@ -364,9 +364,9 @@ class ParentalControlChangePin(Screen, ConfigListScreen, ProtectedScreen):
 		if self.pin1.value == self.pin2.value:
 			self.pin.value = self.pin1.value
 			self.pin.save()
-			self.session.openWithCallback(self.close, MessageBox, _("The pin code has been changed successfully."), MessageBox.TYPE_INFO)
+			self.session.openWithCallback(self.close, MessageBox, _("The PIN code has been changed successfully."), MessageBox.TYPE_INFO)
 		else:
-			self.session.open(MessageBox, _("The pin codes you entered are different."), MessageBox.TYPE_ERROR)
+			self.session.open(MessageBox, _("The PIN codes you entered are different."), MessageBox.TYPE_ERROR)
 
 	def cancel(self):
 		self.close(None)