Merge branch 'dvbsi++' into next

Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)

data/icons/Makefile.am

@@ -69,7 +69,6 @@ install_DATA += \
 	dd.png \
 	dd_avail.png \
 	dd_gray.png \
-	ddfill.png \
 	down.png \
 	error.png \
 	features.png \
@@ -81,6 +80,7 @@ install_DATA += \
 	help.png \
 	help_small.png \
 	hidden.png \
+	hint_a_pic.png \
 	hint_aplay.png \
 	hint_audio.png \
 	hint_back.png \
@@ -110,6 +110,7 @@ install_DATA += \
 	hint_reboot.png \
 	hint_recording.png \
 	hint_reload.png \
+	hint_restart.png \
 	hint_save.png \
 	hint_scan.png \
 	hint_scripts.png \
@@ -162,6 +163,7 @@ install_DATA += \
 	mp3-5.jpg \
 	mp3-6.jpg \
 	mp3-7.jpg \
+	multimedia.png \
 	mute.png \
 	mute_small.png \
 	mute_zap_gray.png \

data/locale/deutsch.locale

@@ -1627,17 +1627,17 @@ scants.transponders Transponder:
 scrambled_channel Verschlüsselung aktiv
 screensetup.lowerright grün = Bildrand unten, rechts
 screensetup.upperleft rot = Bildrand oben, links
-screenshot.count Screenshot Anzahl
+screenshot.count Anzahl
 screenshot.cover Erzeuge Filmcover für Moviebrowser
-screenshot.defdir Screenshot Verzeichnis
-screenshot.format Screenshot Format
+screenshot.defdir Ziel-Verzeichnis
+screenshot.format Format
 screenshot.info Screenshot Taste ist nicht belegt
 screenshot.menu Screenshot
-screenshot.osd OSD Auflösung
-screenshot.res Screenshot Auflösung
-screenshot.scale Screenshot Skalierung
-screenshot.tv TV Auflösung
-screenshot.video Screenshot mit Video Hintergrund
+screenshot.osd OSD-Auflösung
+screenshot.res Auflösung
+screenshot.scale Skalierung
+screenshot.tv TV-Auflösung
+screenshot.video Video im Hintergrund
 servicemenu.getplugins Plugins neu laden
 servicemenu.getplugins_hint Plugins werden neu geladen,\nbitte warten...
 servicemenu.head Service

data/locale/english.locale

@@ -1631,17 +1631,17 @@ scants.transponders Transponders:
 scrambled_channel Scrambled channel
 screensetup.lowerright green = setup lower right
 screensetup.upperleft red = setup upper left
-screenshot.count Screenshot count
+screenshot.count Count
 screenshot.cover Create Moviecover for Moviebrowser
-screenshot.defdir Screenshot directory
-screenshot.format Screenshot format
+screenshot.defdir Destination directory
+screenshot.format Format
 screenshot.info Screenshot key is unused
 screenshot.menu Screenshot
 screenshot.osd OSD resolution
-screenshot.res Screenshot resolution
-screenshot.scale Screenshot scale
+screenshot.res Resolution
+screenshot.scale Scale
 screenshot.tv TV resolution
-screenshot.video Screenshot with video background
+screenshot.video Video in the background
 servicemenu.getplugins Reload plugins
 servicemenu.getplugins_hint Reloading plugins,\nplease be patient.
 servicemenu.head Service