Update locale

- Sort english.locale
- Add missing entries to deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 72f5700cec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-20 (Fri, 20 Apr 2012)

Origin message was:
------------------
* Update locale

- Sort english.locale
- Add missing entries to deutsch.locale


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

data/locale/deutsch.locale

@@ -194,6 +194,10 @@ bouqueteditor.savingchanges Änderungen werden gespeichert. Bitte warten ...
 bouqueteditor.switch Kanal aufnehmen/entfernen
 bouqueteditor.switchmode TV/Radio
 bouquetlist.head Bouquets
+bouquetname.hdtv HD Kanäle
+bouquetname.new Neue Kanäle
+bouquetname.other Unbekannter Provider
+bouquetname.removed Gelöschte Kanäle
 cablesetup.provider Kabelanbieter
 channellist.current_tp Aktueller Transponder
 channellist.edit Bearbeiten
@@ -215,6 +219,7 @@ channellist.recording_not_possible Aufnahme nicht möglich!
 channellist.sats Satelliten
 channellist.since seit
 channellist.start Start
+ci.clock CI Takt (Mhz)
 ci.empty Kein CAM im Slot
 ci.init_failed CAM-Init fehlgeschlagen
 ci.init_ok CAM-Init beendet
@@ -377,6 +382,8 @@ extra.tp_mod_32 QAM/32
 extra.tp_mod_64 QAM/64
 extra.tp_pol Polarisation
 extra.tp_pol_h H
+extra.tp_pol_l L
+extra.tp_pol_r R
 extra.tp_rate Symbolrate
 extra.update_dir Update-Verzeichnis
 extra.use_gotoxx Benutze gotoXX
@@ -1118,6 +1125,7 @@ reset_confirm Sind Sie sich sicher?
 reset_settings Einstellungen auf Standardwerte
 satsetup.auto_scan Automatisch einen gewählten %s
 satsetup.auto_scan_all Automatisch alle Satelliten
+satsetup.cable_nid Netzwerk ID
 satsetup.comm_input Committed Input
 satsetup.diseqc DiSEqC
 satsetup.diseqc10 DiSEqC 1.0
@@ -1139,18 +1147,28 @@ satsetup.fastscan_prov_telesat TéléSAT
 satsetup.fastscan_prov_tvv TV Vlaanderen
 satsetup.fastscan_sd nur SD
 satsetup.fastscan_type Scantyp
+satsetup.fe_mode Tuner Modus
+satsetup.fe_mode_alone independent
+satsetup.fe_mode_loop loop
+satsetup.fe_mode_single single
+satsetup.fe_mode_twin twin
+satsetup.fe_setup Setup tuner
 satsetup.lofh LNB High Offset
 satsetup.lofl LNB Low Offset
 satsetup.lofs LNB Switch Offset
+satsetup.logical_numbers Nutze logische Nummern
 satsetup.manual_scan Manueller Frequenzscan
 satsetup.minidiseqc Mini-DiSEqC
 satsetup.motor_pos Rotor-Position
 satsetup.nodiseqc Kein DiSEqC
+satsetup.reset_numbers Reset Kanalnummern
 satsetup.sat_setup LNB-Konfiguration
 satsetup.satellite Satellit
+satsetup.select_sat Auswahl Satellit
 satsetup.smatvremote SMATV Remote Tuning
 satsetup.uncomm_input Uncommitted
 satsetup.usals_repeat USALS wiederholen
+satsetup.use_bat Benutze BAT
 satsetup.use_fta_flag nur FTA Kanäle
 satsetup.use_nit Auswertung NIT
 satsetup.use_usals Benutze USALS

data/locale/english.locale

@@ -194,9 +194,9 @@ bouqueteditor.savingchanges Saving changes. Please wait ...
 bouqueteditor.switch add/remove
 bouqueteditor.switchmode TV/Radio
 bouquetlist.head Bouquets
-bouquetname.other Unknown provider
 bouquetname.hdtv HD channels
 bouquetname.new New channels
+bouquetname.other Unknown provider
 bouquetname.removed Removed channels
 cablesetup.provider cable provider
 channellist.current_tp Current transponder
@@ -219,8 +219,8 @@ channellist.recording_not_possible Recording not possible!
 channellist.sats Satellites
 channellist.since since
 channellist.start starts
-ci.empty No CAM in slot
 ci.clock CI clock (Mhz)
+ci.empty No CAM in slot
 ci.init_failed CAM init failed
 ci.init_ok CAM init complete
 ci.inserted CAM inserted in slot
@@ -1125,8 +1125,8 @@ reset_confirm Are you sure ?
 reset_settings Reset settings to defaults
 satsetup.auto_scan Auto-Scan selected %s
 satsetup.auto_scan_all Auto-Scan multiple Satellites
-satsetup.comm_input Commited input
 satsetup.cable_nid Network ID
+satsetup.comm_input Commited input
 satsetup.diseqc DiSEqC
 satsetup.diseqc10 DiSEqC 1.0
 satsetup.diseqc11 DiSEqC 1.1
@@ -1147,23 +1147,30 @@ satsetup.fastscan_prov_telesat TéléSAT
 satsetup.fastscan_prov_tvv TV Vlaanderen
 satsetup.fastscan_sd SD only
 satsetup.fastscan_type Scan type
+satsetup.fe_mode Tuner mode
+satsetup.fe_mode_alone independent
+satsetup.fe_mode_loop loop
+satsetup.fe_mode_single single
+satsetup.fe_mode_twin twin
+satsetup.fe_setup Setup tuner
 satsetup.lofh LNB High Offset
 satsetup.lofl LNB Low Offset
 satsetup.lofs LNB switch Offset
+satsetup.logical_numbers Use logical numbers
 satsetup.manual_scan Manual frequency scan
 satsetup.minidiseqc Mini-DiSEqC
 satsetup.motor_pos Rotor position
 satsetup.nodiseqc no DiSEqC
+satsetup.reset_numbers Reset channel numbers
 satsetup.sat_setup Setup satellites input / LNB
 satsetup.satellite Satellite
+satsetup.select_sat Select satellites
 satsetup.smatvremote SMATV Remote Tuning
 satsetup.uncomm_input Uncommited input
 satsetup.usals_repeat USALS command repeat
+satsetup.use_bat Use BAT
 satsetup.use_fta_flag just free Channels
 satsetup.use_nit Use NIT
-satsetup.use_bat Use BAT
-satsetup.reset_numbers Reset channel numbers
-satsetup.logical_numbers Use logical numbers
 satsetup.use_usals Use usals for all
 sc.empty No card in slot
 sc.init_failed Card init failed
@@ -1423,10 +1430,3 @@ zapitsetup.last_radio Radio Channel
 zapitsetup.last_tv TV Channel
 zapitsetup.last_use from last Channel
 zaptotimer.announce Zapto timer in one minute
-satsetup.fe_setup Setup tuner
-satsetup.fe_mode Tuner mode
-satsetup.fe_mode_single single
-satsetup.fe_mode_loop loop
-satsetup.fe_mode_twin twin
-satsetup.fe_mode_alone independent
-satsetup.select_sat Select satellites

src/system/locals.h

@@ -1152,8 +1152,8 @@ typedef enum
 	LOCALE_RESET_SETTINGS,
 	LOCALE_SATSETUP_AUTO_SCAN,
 	LOCALE_SATSETUP_AUTO_SCAN_ALL,
-	LOCALE_SATSETUP_COMM_INPUT,
 	LOCALE_SATSETUP_CABLE_NID,
+	LOCALE_SATSETUP_COMM_INPUT,
 	LOCALE_SATSETUP_DISEQC,
 	LOCALE_SATSETUP_DISEQC10,
 	LOCALE_SATSETUP_DISEQC11,
@@ -1174,33 +1174,30 @@ typedef enum
 	LOCALE_SATSETUP_FASTSCAN_PROV_TVV,
 	LOCALE_SATSETUP_FASTSCAN_SD,
 	LOCALE_SATSETUP_FASTSCAN_TYPE,
-
-	LOCALE_SATSETUP_FE_SETUP,
 	LOCALE_SATSETUP_FE_MODE,
-	LOCALE_SATSETUP_FE_MODE_SINGLE,
-	LOCALE_SATSETUP_FE_MODE_LOOP,
-	LOCALE_SATSETUP_FE_MODE_TWIN,
 	LOCALE_SATSETUP_FE_MODE_ALONE,
-	LOCALE_SATSETUP_CONFIGURE_SAT,
+	LOCALE_SATSETUP_FE_MODE_LOOP,
-	LOCALE_SATSETUP_SELECT_SAT,
+	LOCALE_SATSETUP_FE_MODE_SINGLE,
-
+	LOCALE_SATSETUP_FE_MODE_TWIN,
+	LOCALE_SATSETUP_FE_SETUP,
 	LOCALE_SATSETUP_LOFH,
 	LOCALE_SATSETUP_LOFL,
 	LOCALE_SATSETUP_LOFS,
+	LOCALE_SATSETUP_LOGICAL_NUMBERS,
 	LOCALE_SATSETUP_MANUAL_SCAN,
 	LOCALE_SATSETUP_MINIDISEQC,
 	LOCALE_SATSETUP_MOTOR_POS,
 	LOCALE_SATSETUP_NODISEQC,
+	LOCALE_SATSETUP_RESET_NUMBERS,
 	LOCALE_SATSETUP_SAT_SETUP,
 	LOCALE_SATSETUP_SATELLITE,
+	LOCALE_SATSETUP_SELECT_SAT,
 	LOCALE_SATSETUP_SMATVREMOTE,
 	LOCALE_SATSETUP_UNCOMM_INPUT,
 	LOCALE_SATSETUP_USALS_REPEAT,
+	LOCALE_SATSETUP_USE_BAT,
 	LOCALE_SATSETUP_USE_FTA_FLAG,
 	LOCALE_SATSETUP_USE_NIT,
-	LOCALE_SATSETUP_USE_BAT,
-	LOCALE_SATSETUP_RESET_NUMBERS,
-	LOCALE_SATSETUP_LOGICAL_NUMBERS,
 	LOCALE_SATSETUP_USE_USALS,
 	LOCALE_SC_EMPTY,
 	LOCALE_SC_INIT_FAILED,

src/system/locals_intern.h

@@ -1058,7 +1058,7 @@ const char * locale_real_names[] =
 	"personalize.notprotected",
 	"personalize.notvisible",
 	"personalize.pin",
-	"personalize.pin_in_use",	
+	"personalize.pin_in_use",
 	"personalize.pincode",
 	"personalize.pinhint",
 	"personalize.pinprotect",
@@ -1152,8 +1152,8 @@ const char * locale_real_names[] =
 	"reset_settings",
 	"satsetup.auto_scan",
 	"satsetup.auto_scan_all",
-	"satsetup.comm_input",
 	"satsetup.cable_nid",
+	"satsetup.comm_input",
 	"satsetup.diseqc",
 	"satsetup.diseqc10",
 	"satsetup.diseqc11",
@@ -1174,33 +1174,30 @@ const char * locale_real_names[] =
 	"satsetup.fastscan_prov_tvv",
 	"satsetup.fastscan_sd",
 	"satsetup.fastscan_type",
-
-	"satsetup.fe_setup",
 	"satsetup.fe_mode",
-	"satsetup.fe_mode_single",
-	"satsetup.fe_mode_loop",
-	"satsetup.fe_mode_twin",
 	"satsetup.fe_mode_alone",
-	"satsetup.configure_sat",
+	"satsetup.fe_mode_loop",
-	"satsetup.select_sat",
+	"satsetup.fe_mode_single",
-
+	"satsetup.fe_mode_twin",
+	"satsetup.fe_setup",
 	"satsetup.lofh",
 	"satsetup.lofl",
 	"satsetup.lofs",
+	"satsetup.logical_numbers",
 	"satsetup.manual_scan",
 	"satsetup.minidiseqc",
 	"satsetup.motor_pos",
 	"satsetup.nodiseqc",
+	"satsetup.reset_numbers",
 	"satsetup.sat_setup",
 	"satsetup.satellite",
+	"satsetup.select_sat",
 	"satsetup.smatvremote",
 	"satsetup.uncomm_input",
 	"satsetup.usals_repeat",
+	"satsetup.use_bat",
 	"satsetup.use_fta_flag",
 	"satsetup.use_nit",
-	"satsetup.use_bat",
-	"satsetup.reset_numbers",
-	"satsetup.logical_numbers",
 	"satsetup.use_usals",
 	"sc.empty",
 	"sc.init_failed",