Merge remote-tracking branch 'pli/master'

Conflicts:
	RecordTimer.py
	data/display128/skin_display.xml
	data/keymap.xml
	data/setup.xml
	data/skin.xml
	data/skin_default.xml
	data/skin_default/Makefile.am
	data/skin_display_vuduo2.xml
	data/skin_text.xml
	e2reactor.py
	lib/actions/parseactions.py
	lib/dvb/epgcache.cpp
	lib/python/Components/AVSwitch.py
	lib/python/Components/ActionMap.py
	lib/python/Components/ChoiceList.py
	lib/python/Components/ConditionalWidget.py
	lib/python/Components/Converter/ClockToText.py
	lib/python/Components/Converter/EventName.py
	lib/python/Components/Converter/PliExtraInfo.py
	lib/python/Components/Converter/RemainingToText.py
	lib/python/Components/Converter/ServiceInfo.py
	lib/python/Components/EpgList.py
	lib/python/Components/FileList.py
	lib/python/Components/GUIComponent.py
	lib/python/Components/MovieList.py
	lib/python/Components/ParentalControl.py
	lib/python/Components/Pixmap.py
	lib/python/Components/Renderer/Pig.py
	lib/python/Components/ResourceManager.py
	lib/python/Components/Scanner.py
	lib/python/Components/Sensors.py
	lib/python/Components/ServiceList.py
	lib/python/Components/ServicePosition.py
	lib/python/Components/SetupDevices.py
	lib/python/Components/SystemInfo.py
	lib/python/Components/Task.py
	lib/python/Components/UsageConfig.py
	lib/python/Plugins/Extensions/DVDBurn/DVDProject.py
	lib/python/Plugins/Extensions/DVDBurn/Process.py
	lib/python/Plugins/Extensions/DVDBurn/TitleProperties.py
	lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
	lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpgSetup.py
	lib/python/Plugins/Extensions/GraphMultiEPG/Makefile.am
	lib/python/Plugins/Plugin.py
	lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
	lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
	lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
	lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
	lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
	lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py
	lib/python/Plugins/SystemPlugins/Videomode/plugin.py
	lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
	lib/python/Screens/AudioSelection.py
	lib/python/Screens/ChoiceBox.py
	lib/python/Screens/Console.py
	lib/python/Screens/DVD.py
	lib/python/Screens/EpgSelection.py
	lib/python/Screens/EventView.py
	lib/python/Screens/InfoBar.py
	lib/python/Screens/InfoBarGenerics.py
	lib/python/Screens/InstallWizard.py
	lib/python/Screens/LocationBox.py
	lib/python/Screens/MessageBox.py
	lib/python/Screens/MinuteInput.py
	lib/python/Screens/NetworkSetup.py
	lib/python/Screens/PiPSetup.py
	lib/python/Screens/PictureInPicture.py
	lib/python/Screens/PluginBrowser.py
	lib/python/Screens/RecordPaths.py
	lib/python/Screens/ScreenSaver.py
	lib/python/Screens/SleepTimerEdit.py
	lib/python/Screens/SoftwareUpdate.py
	lib/python/Screens/Standby.py
	lib/python/Screens/TimerEdit.py
	lib/python/Screens/TimerEntry.py
	lib/python/Screens/VideoWizard.py
	lib/python/Screens/VirtualKeyBoard.py
	lib/python/Screens/Wizard.py
	lib/python/Tools/FuzzyDate.py
	lib/python/Tools/Trashcan.py
	main/enigma.cpp
	po/fr.po
	skin.py
	tests/test_timer.py
	tools/host_tools/FormatConverter/lamedb.py
	tools/host_tools/FormatConverter/main.py

Author: Andy Blackburn

Diff for: data/display128/skin_display.xml

@@ -51,8 +51,8 @@
 			</widget>
 		</panel>
 	</screen>
-    
-  
+
+
 <!-- channelselection-->
 	<screen name="ChannelSelection_summary" position="fill">
 		<widget source="parent.ServiceEvent" render="Label" position="top" size="*,65" font="FdLcD;30" halign="center" >
@@ -66,7 +66,7 @@
 		</widget>
 		<panel position="bottom" size="*,44" name="SummaryClockPanel" />
 	</screen>
-  
+
 <!-- menus-->
 	<screen name="MenuSummary" position="fill">
 		<widget source="parent.title" render="Label" position="top" size="*,61" font="FdLcD;30" halign="center" valign="top" />
@@ -89,7 +89,7 @@
 			</widget>
 		</panel>
 	</screen>
-	
+
 	<screen name="MovieContextMenuSummary" position="fill">
 		<widget source="parent.Title" render="Label" position="top" size="*,14" font="FdLcD;12" halign="left" valign="top" noWrap="1" />
 		<widget source="selected" render="Label" position="top" size="*,32" font="FdLcD;16" />
@@ -184,7 +184,7 @@
 
 	<screen name="ChoiceBox_summary" position="fill">
 		<widget source="parent.summary_list" render="Label" position="top" size="*,181" font="FdLcD;25" halign="left" />
-    </screen>	
+	</screen>	
 
 	<screen name="MessageBox_summary" position="fill">
 		<widget source="parent.Text" render="Label" position="top" size="*,95" font="FdLcD;31" halign="center" valign="center" />

Diff for: data/display96/skin_display.xml

@@ -68,7 +68,7 @@
 			<convert type="ClockToText"></convert>
 		</widget>
 	</screen>
- 
+
 <!-- channelselection-->
 	<screen name="ChannelSelection_summary" position="0,0" size="96,64">
 		<widget source="parent.ServiceEvent" render="Label" position="0,0" size="96,21" font="FdLcD;20" halign="left" noWrap="1" >
@@ -87,7 +87,7 @@
 			<convert type="ConditionalShowHide"></convert>
 		</widget>
 	</screen>
-  
+
 <!-- menus-->
 	<screen name="MenuSummary" position="0,0" size="96,64">
 		<widget source="parent.title" render="Label" position="0,0" size="96,16" font="FdLcD;14" halign="center" valign="top" noWrap="1"  foregroundColor="lightyellow" />
@@ -114,7 +114,7 @@
 			<convert type="ClockToText"></convert>
 		</widget>
 	</screen>
-	
+
 	<screen name="MovieContextMenuSummary" position="0,0" size="96,64">
 		<widget source="parent.Title" render="Label" position="0,0" size="96,14" font="FdLcD;12" halign="left" valign="top" noWrap="1"  foregroundColor="lightyellow" />
 		<widget source="selected" render="Label" position="0,14" size="96,32" font="FdLcD;16" />
@@ -211,7 +211,7 @@
 	<screen name="ChoiceBox_summary" position="0,0" size="96,64">
 		<widget source="parent.Title" render="Label" position="0,0" size="96,14" font="FdLcD;14" halign="left" noWrap="1" foregroundColor="lightyellow" />
 		<widget source="parent.summary_selection" render="Label" position="0,14" size="96,50" font="FdLcD;14" halign="left" />
-	</screen>	
+	</screen>
 
 	<screen name="MessageBox_summary" position="0,0" size="96,64">
 		<widget source="parent.Text" render="Label" position="0,0" size="96,52" font="FdLcD;11" halign="center" valign="center" />

Diff for: data/unicable.xml

@@ -19,7 +19,7 @@ unicable (version)
   |  |  |\
   |  |  | \
   |  |  | product
-  |  |  
+  |  |
   |  |\
   |  | \
   |  | manufacturer
@@ -45,7 +45,7 @@ unicable (version)
      |  |\
      |  | \
      |  | product
-     |  
+     |
      |\
      | \
      | manufacturer

Diff for: e2reactor.py

@@ -31,10 +31,10 @@ def __init__(self):
 
 	def register(self, fd, eventmask = select.POLLIN | select.POLLERR | select.POLLOUT):
 		self.dict[fd] = eventmask
-	
+
 	def unregister(self, fd):
 		del self.dict[fd]
-	
+
 	def poll(self, timeout = None):
 		try:
 			r = self.eApp.poll(timeout, self.dict)
@@ -61,8 +61,8 @@ def _updateRegistration(self, fd):
 			poller.register(fd, mask)
 		else:
 			if selectables.has_key(fd): del selectables[fd]
-		
-		
+
+
 		poller.eApp.interruptPoll()
 
 	def _dictRemove(self, selectable, mdict):
@@ -125,7 +125,7 @@ def removeAll(self, reads=reads, writes=writes, selectables=selectables):
 		selectables.clear()
 		for fd in fds:
 			poller.unregister(fd)
-			
+
 		if self.waker is not None:
 			self.addReader(self.waker)
 		return result
@@ -139,7 +139,7 @@ def doPoll(self, timeout,
 			   POLLIN=select.POLLIN,
 			   POLLOUT=select.POLLOUT):
 		"""Poll the poller for new events."""
-		
+
 		if timeout is not None:
 			timeout = int(timeout * 1000) # convert seconds to milliseconds
 
@@ -198,7 +198,7 @@ def callLater(self, *args, **kwargs):
 
 def install():
 	"""Install the poll() reactor."""
-	
+
 	p = PollReactor()
 	main.installReactor(p)