Merge remote-tracking branch 'check/next-cc'

untested, probably needs some buildfixing


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-12-22 21:25:05 +01:00
67 changed files with 1637 additions and 894 deletions

View File

@@ -512,7 +512,13 @@
<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="538000" symbol_rate="6790000" fec_inner="0" modulation="3"/>
<transponder frequency="540000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
<transponder frequency="546000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="570000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
<cable name="Antennengemeinschaft Penig" satfeed="true" flags="9">
<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -541,6 +547,46 @@
<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
<cable name="Antennenverein Hohenmoelsen" satfeed="true" flags="9">
<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="137000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="145000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="153000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="161000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="169000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="177000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="185000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="193000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="201000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="209000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="217000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="256000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="264000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="272000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="280000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="288000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="296000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
</cable>
<cable name="M-net" satfeed="true" flags="9">
<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

View File

@@ -256,7 +256,8 @@ ci.reset_standby Reset nach Standby
ci.settings Zugangskontrolle
ci.timeout CAM antwortet nicht
ci.waiting Warte auf CAM-Antwort
clock_size Info Uhr
clock_background Hintergrund anzeigen
clock_seconds Sekunden anzeigen
clock_size_height Höhe der Anzeige
clock_switch_off Uhr ausblenden
clock_switch_on Uhr einblenden
@@ -433,7 +434,7 @@ extra.volume_pos Lautstärkeanzeige
extra.volume_size Höhe der Anzeige
extra.west Westen
extra.zap_cycle Zap nur in Bouquet
extra.zapit_fe_timeout Tuning Timeout (1=10ms)
extra.zapit_fe_timeout Tuning Timeout
extra.zapit_hvoltage High (13.5/ 18.5) Voltage
extra.zapit_make_bouquet Kanalliste auffüllen
extra.zapit_motor_speed Rotor Drehzeit (10 = 1°/ sec)
@@ -812,7 +813,10 @@ menu.hint_channellist_foot Definiert, welche Informationen im unteren Sendungsfe
menu.hint_channellist_setup Wählen Sie die Anzeigeoptionen für die Kanalliste
menu.hint_channels Kanalliste öffnen
menu.hint_ci Conditional-Access-Menü zum Einrichten Ihres CI-Moduls oder der eingebetteten Conax-Karte
menu.hint_clock_size Stellen Sie die Größe der Info Uhr ein.
menu.hint_clock_background Lassen Sie die Uhr mit Hintergrund anzeigen
menu.hint_clock_mode Schalten Sie die Uhr ein oder aus
menu.hint_clock_seconds Legen Sie fest, ob die Sekunden angezeigt werden sollen
menu.hint_clock_size Stellen Sie die Größe der Uhr ein
menu.hint_colors Konfigurieren Sie die Menü-Farben
menu.hint_content_back Ändern Sie die Hintergrundfarbe für den Fensterinhalt
menu.hint_content_textcolor Ändern Sie die Textfarbe für den Fensterinhalt
@@ -1242,7 +1246,7 @@ miscsettings.infobar_show_res Auflösung anzeigen
miscsettings.infobar_show_res_simple einfach
miscsettings.infobar_show_sysfs_hdd Füllstandanzeige (sysFS & hdd)
miscsettings.infobar_show_tuner Aktiven Tuner anzeigen
miscsettings.infoclock Info Uhr
miscsettings.infoclock Uhr
miscsettings.progressbar Fortschrittsbalken
miscsettings.progressbar_color Farbe
miscsettings.progressbar_design Design
@@ -1945,6 +1949,11 @@ timing.volumebar Lautstärkeanzeige
unicable.lnb Unicable Eingang
unicable.qrg Unicable Frequenz
unicable.scr Unicable SCR
unit.decimal ,
unit.short.hour h
unit.short.millisecond ms
unit.short.minute min
unit.short.second s
upnpbrowser.head UPnP Browser
upnpbrowser.noservers Kein UPnP-Server gefunden
upnpbrowser.rescan Neue Suche

View File

@@ -256,7 +256,8 @@ ci.reset_standby Reset after standby
ci.settings Conditional access
ci.timeout Timeout waiting CI menu ready
ci.waiting Waiting for CI answer
clock_size Info clock
clock_background Show background
clock_seconds Show seconds
clock_size_height Display height
clock_switch_off Clock off
clock_switch_on Clock on
@@ -433,7 +434,7 @@ extra.volume_pos Volumebar
extra.volume_size Height of display
extra.west West
extra.zap_cycle Zap cycle
extra.zapit_fe_timeout Tune timeout (1 = 10 msec)
extra.zapit_fe_timeout Tune timeout
extra.zapit_hvoltage 18V for rotor moving
extra.zapit_make_bouquet Make Remaining Channels list
extra.zapit_motor_speed Motor moving speed (10 = 1deg/sec)
@@ -812,7 +813,10 @@ menu.hint_channellist_foot Show additional information\nin bottom box
menu.hint_channellist_setup Configure channel list GUI options
menu.hint_channels Open channel list
menu.hint_ci Conditional access menu\nto setup your CI CAM or embeded Conax card
menu.hint_clock_size Set the size of the info clock.
menu.hint_clock_background Show clock with theme's background color
menu.hint_clock_mode Switch clock on or off
menu.hint_clock_seconds Show time format with seconds
menu.hint_clock_size Set the size of the info clock
menu.hint_colors Configure GUI colors
menu.hint_content_back Change GUI window background color
menu.hint_content_textcolor Change GUI window text color
@@ -1242,7 +1246,7 @@ miscsettings.infobar_show_res show resolution on infobar
miscsettings.infobar_show_res_simple simple
miscsettings.infobar_show_sysfs_hdd Fill level (sysFS & hdd)
miscsettings.infobar_show_tuner Display active tuner
miscsettings.infoclock Info clock
miscsettings.infoclock Clock
miscsettings.progressbar Progressbar
miscsettings.progressbar_color Color
miscsettings.progressbar_design Design
@@ -1945,6 +1949,11 @@ timing.volumebar Volume bar
unicable.lnb Unicable Input
unicable.qrg Unicable Frequency
unicable.scr Unicable SCR
unit.decimal .
unit.short.hour h
unit.short.millisecond ms
unit.short.minute min
unit.short.second s
upnpbrowser.head UPnP Browser
upnpbrowser.noservers No UPnP servers found
upnpbrowser.rescan Scan again