Merge branch 'master', remote-tracking branch 'origin' into dvbsi++

Origin commit data
------------------
Branch: ni/coolstream
Commit: f3d2895847
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -114,6 +114,8 @@ audiomenu.avsync_am Audio master
 audiomenu.clockrec 
 audiomenu.dolbydigital DD-Unterkanal automatisch
 audiomenu.hdmi_dd DolbyDigital über HDMI
+audiomenu.hdmi_dd_auto automatisch
+audiomenu.hdmi_dd_force erzwingen
 audiomenu.monoleft mono links
 audiomenu.monoright mono rechts
 audiomenu.pref_lang Sprache
@@ -341,7 +343,7 @@ extra.key_timeshift Timeshift
 extra.key_unlock Entsperrtaste
 extra.ladirection Breitengrad-Ausrichtung
 extra.latitude Breitengrad
-extra.loadconfig Lade Einstellungen von
+extra.loadconfig Neutrino-Einstellungen: Laden von
 extra.loadkeys Lade Tastenbelegung von
 extra.lodirection Längengrad-Ausrichtung
 extra.logo Logonummer
@@ -353,7 +355,7 @@ extra.rotor_swap Rotor dreht Ost/West
 extra.rounded_corners Eckendarstellung
 extra.rounded_corners_off eckig
 extra.rounded_corners_on abgerundet
-extra.saveconfig Speichere Einstellungen als
+extra.saveconfig Neutrino-Einstellungen: Sichern als
 extra.savekeys Speichere Tastenbelegung als
 extra.scan_fast Schnell
 extra.scan_full Total
@@ -1190,13 +1192,14 @@ scrambled_channel Verschlüsselung aktiv
 screensetup.lowerright grün = Bildrand unten, rechts
 screensetup.upperleft rot = Bildrand oben, links
 screenshot.count Screenshot Anzahl
-screenshot.cover Film Cover
-screenshot.defdir Screenshot Dir.
+screenshot.cover Erzeuge Filmcover für Moviebrowser
+screenshot.defdir Screenshot Verzeichnis
 screenshot.format Screenshot Format
 screenshot.info Screenshot Taste ist nicht belegt
 screenshot.menu Screenshot
 screenshot.osd OSD Auflösung
-screenshot.scale Scale
+screenshot.res Screenshot Auflösung
+screenshot.scale Screenshot Skalierung
 screenshot.tv TV Auflösung
 screenshot.video Screenshot mit Video Hintergrund
 servicemenu.getplugins Plugins neu laden
@@ -1210,7 +1213,7 @@ servicemenu.restart_hint Neutrino wird neu gestartet...
 servicemenu.restart_refused_recording Aufnahme läuft. Neustart nicht möglich.
 servicemenu.scants Kanalsuche
 servicemenu.update Software-Aktualisierung
-settings.backup Alle Settings sichern
+settings.backup Image-Einstellungen: Sichern
 settings.backup_failed Sicherung fehlgeschlagen!
 settings.help Hilfe
 settings.menu_pos Menüposition
@@ -1222,7 +1225,7 @@ settings.pos_default_center oben Mitte
 settings.pos_higher_center unten Mitte
 settings.pos_top_left oben links
 settings.pos_top_right oben rechts
-settings.restore Wiederherstellen aller Settings
+settings.restore Image-Einstellungen: Wiederherstellen
 settings.restore_warn Alle Settings werden ersetzt.\nDie Box wird neu gestartet.\nWeiter?
 shutdown.recoding_query Aufnahme läuft. Trotzdem beenden?
 shutdowntimer.announce Die Box wird in 1 Min. heruntergefahren.\nShutdown abbrechen?

data/locale/english.locale

@@ -114,6 +114,8 @@ audiomenu.avsync_am Audio master
 audiomenu.clockrec 
 audiomenu.dolbydigital Prefer Dolby Digital
 audiomenu.hdmi_dd Encoded DD on HDMI
+audiomenu.hdmi_dd_auto auto
+audiomenu.hdmi_dd_force force
 audiomenu.monoleft mono left
 audiomenu.monoright mono right
 audiomenu.pref_lang Prefered language
@@ -342,7 +344,7 @@ extra.key_timeshift Timeshift
 extra.key_unlock Unlock key
 extra.ladirection LaDirection
 extra.latitude Latitude
-extra.loadconfig Load settings from
+extra.loadconfig Neutrino-Settings: Load from
 extra.loadkeys Load keys from
 extra.lodirection LoDirection
 extra.logo Logo number
@@ -354,7 +356,7 @@ extra.rotor_swap Swap rotor east/west
 extra.rounded_corners Shape of corners
 extra.rounded_corners_off angular
 extra.rounded_corners_on rounded
-extra.saveconfig Save settings as
+extra.saveconfig Neutrino-Settings: Save as
 extra.savekeys Save keys as
 extra.scan_fast Fast
 extra.scan_full Full
@@ -1192,15 +1194,16 @@ scrambled_channel Scrambled channel
 screensetup.lowerright green = setup lower right
 screensetup.upperleft red = setup upper left
 screenshot.count Screenshot count
-screenshot.cover Movie Cover
-screenshot.defdir Screenshot dir.
+screenshot.cover Create Moviecover for Moviebrowser
+screenshot.defdir Screenshot directory
 screenshot.format Screenshot format
-screenshot.info Screenshot Key is not used
+screenshot.info Screenshot key is unused
 screenshot.menu Screenshot
 screenshot.osd OSD resolution
-screenshot.scale Scale
+screenshot.res Screenshot resolution
+screenshot.scale Screenshot scale
 screenshot.tv TV resolution
-screenshot.video Screenshot with Video background
+screenshot.video Screenshot with video background
 servicemenu.getplugins Reload plugins
 servicemenu.getplugins_hint Reloading plugins,\nplease be patient.
 servicemenu.head Service
@@ -1212,7 +1215,7 @@ servicemenu.restart_hint Restarting, please wait
 servicemenu.restart_refused_recording Cant restart, recording in progress
 servicemenu.scants Servicescan
 servicemenu.update Software Update
-settings.backup Backup all settings
+settings.backup Image-Settings: Backup
 settings.backup_failed Backup failed!
 settings.help Help
 settings.menu_pos Menu position
@@ -1224,7 +1227,7 @@ settings.pos_default_center top center
 settings.pos_higher_center higher center
 settings.pos_top_left top left
 settings.pos_top_right top right
-settings.restore Restore all settings
+settings.restore Image-Settings: Restore
 settings.restore_warn This will replace all settings and reboot\nContinue ?
 shutdown.recoding_query You really want to to stop record ?
 shutdowntimer.announce Box will shutdown in 1 min.\nCancel Shutdown ?

data/scripts/backup.sh

@@ -5,9 +5,10 @@ USRF="/var/tuxbox/config/tobackup.conf"
 
 if [ -e "${USRF}" ]; then
 # read user-files from $USRF
+	TOBACKUP="${USRF}"
 	while read i
-	do [ "${i:0:1}" = "#" ] || TOBACKUP="$TOBACKUP ${i%%#*}"
-	done < $USRF
+		do [ "${i:0:1}" = "#" ] || TOBACKUP="$TOBACKUP ${i%%#*}"
+		done < $USRF
 
 else
 	TOBACKUP="/var/tuxbox/config/"