Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'

This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
This commit is contained in:
Stefan Seyfried
2012-07-22 14:09:43 +02:00
354 changed files with 17604 additions and 32020 deletions

View File

@@ -5,4 +5,4 @@ SUBDIRS += lcd
endif
configdir = $(CONFIGDIR)
config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf
config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml

View File

@@ -2,7 +2,8 @@
<cables>
<cable name="KMS Muenchen" satfeed="true" flags="9">
<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -13,29 +14,27 @@
<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="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<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"/>
<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="583000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="650000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="674000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
@@ -221,6 +220,7 @@
<cable name="Unitymedia" 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="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -253,6 +253,12 @@
<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="722000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
</cable>
<cable name="Kabel BW" satfeed="true" flags="9">
<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -502,7 +508,31 @@
<transponder frequency="538000" symbol_rate="6790000" fec_inner="0" modulation="3"/>
<transponder frequency="540000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
</cable>
<cable name="M-net Muenchen" satfeed="true" flags="9">
<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"/>
<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="154000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="162000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="170000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="178000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="186000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="194000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="202000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="210000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="218000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="226000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="242000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="250000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="258000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="266000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="274000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="282000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="290000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="298000" 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="5"/>
@@ -1280,4 +1310,31 @@
<transponder frequency="786000000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
<transponder frequency="786000000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
</cable>
<cable name="Kabel Deutschland - Offensive 2012" 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="3"/>
<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<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="5"/>
<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
</cable>
</cables>

View File

@@ -185,6 +185,8 @@ install_DATA = \
suomi.png \
svenska.png \
timer.png \
tuner_1.png \
tuner_2.png \
up.png \
upnp.png \
via_green.png \

BIN
data/icons/tuner_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

BIN
data/icons/tuner_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

View File

@@ -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
@@ -205,16 +209,24 @@ channellist.foot Kanalinformationen
channellist.foot_freq Tuning-Parameter
channellist.foot_next Nachfolgesendung
channellist.foot_off aus
channellist.foot_sort_alpha Sortiert[alpha]
channellist.foot_sort_freq Sortiert[freq]
channellist.foot_sort_sat Sortiert[sat]
channellist.head Alle Kanäle
channellist.history Verlauf
channellist.make_hdlist Erzeuge "HD"- Bouquet
channellist.keep_numbers Dauerhafte Kanalnummern
channellist.make_hdlist Erzeuge Bouquet mit HD-Kanälen
channellist.make_newlist Erzeuge Bouquet mit neuen Kanälen
channellist.make_removedlist Erzeuge Bouquet mit gelöschten Kanälen
channellist.new_zap_mode Quickzap in Liste
channellist.nonefound Es wurden keine Kanäle gefunden!\nFühren Sie bitte eine Kanalsuche durch\n(MENU-Taste -> Service)
channellist.provs Anbieter
channellist.recording_not_possible Aufnahme nicht möglich!
channellist.reset_flags Entferne Kanal-Markierung "Neu"
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
@@ -234,7 +246,7 @@ colorchooser.red rot
colormenu.background Hintergrundfarbe
colormenu.contrast_fonts Schriftkontrast
colormenu.fade Menüs faden
colormenu.font Neutrino Schriftart
colormenu.font Neutrino-HD Schriftart
colormenu.font_ttx Teletext Schriftart
colormenu.hd_preset LCD
colormenu.menucolors Menüfarben
@@ -343,10 +355,9 @@ extra.key_timeshift Timeshift
extra.key_unlock Entsperrtaste
extra.ladirection Breitengrad-Ausrichtung
extra.latitude Breitengrad
extra.loadconfig Neutrino-Einstellungen: Laden von
extra.loadconfig Neutrino-HD Einstellungen: Laden von
extra.loadkeys Lade Tastenbelegung von
extra.lodirection Längengrad-Ausrichtung
extra.logo Logonummer
extra.longitude Längengrad
extra.menu_left_exit "links" = Menü zurück
extra.north Norden
@@ -355,10 +366,8 @@ extra.rotor_swap Rotor dreht Ost/West
extra.rounded_corners Eckendarstellung
extra.rounded_corners_off eckig
extra.rounded_corners_on abgerundet
extra.saveconfig Neutrino-Einstellungen: Sichern als
extra.saveconfig Neutrino-HD Einstellungen: Sichern als
extra.savekeys Speichere Tastenbelegung als
extra.scan_fast Schnell
extra.scan_full Total
extra.scrambled_message Verschlüsselung melden
extra.show_mute_icon Mute-Icon bei Lautstärke 0
extra.sms_channel SMS-Modus Kanal
@@ -377,8 +386,10 @@ 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.update_dir Lokales Update-Verzeichnis
extra.use_gotoxx Benutze gotoXX
extra.volume_pos Lautstärkeanzeige
extra.west Westen
@@ -386,11 +397,9 @@ extra.zap_cycle Zap nur in Bouquet
extra.zapit_fe_timeout Tuning Timeout (1=10ms)
extra.zapit_hvoltage High (13.5/ 18.5) Voltage
extra.zapit_make_bouquet Kanalliste auffüllen
extra.zapit_menu Zapit-Einstellungen
extra.zapit_motor_speed Rotor Drehzeit (10 = 1°/ sec)
extra.zapit_scanpids PIDs scannen/nutzen
extra.zapit_sdt_changed Kanalliste wird neu geladen.
extra.zapit_write_names Schreibe Kanalname
fan_speed CPU-Lüftergeschwindigkeit
favorites.addchannel Der aktuelle Kanal wird dem Bouquet \n"Meine Favoriten" hinzugefügt. \nDie Speicherung benötigt einen Moment...
favorites.bouquetname Meine Favoriten
@@ -425,7 +434,7 @@ filesystem.is.utf8.option.utf8 UTF-8
flashupdate.actionreadflash lese Flash
flashupdate.cantopenfile kann Datei nicht öffnen
flashupdate.cantopenmtd kann das MTD-Device nicht öffnen
flashupdate.checkupdate nach neuer Version suchen
flashupdate.checkupdate Nach Updates suchen
flashupdate.currentversion_sep Installierte Version
flashupdate.currentversiondate Datum
flashupdate.currentversiontime Uhrzeit
@@ -466,13 +475,14 @@ flashupdate.ready fertig
flashupdate.reallyflashmtd Wollen Sie den Flashvorgang wirklich durchführen?\n\nFalls ein Fehler auftritt oder das Image nicht\nfunktionfähig ist, wird Ihre Box nicht mehr booten.\n\nImagename: %s\nZiel: %s
flashupdate.savesuccess Das Image wurde erfolgreich unter dem\nDateinamen %s gespeichert.
flashupdate.selectimage Verfügbare Images/Files
flashupdate.settings Update-Einstellungen
flashupdate.squashfs.noversion Bei Updates werden Versionsüberprüfungen derzeit nur über Web-Updates unterstützt.\nWollen Sie das ausgewählte Image wirklich installieren?
flashupdate.titlereadflash Flash auslesen
flashupdate.titlewriteflash Flash schreiben
flashupdate.updatemode Updatemodus
flashupdate.updatemode_internet Internet
flashupdate.updatemode_manual manuell (ftp)
flashupdate.url_file Konfigfile
flashupdate.updatemode_manual von lokalem Update-Verzeichnis
flashupdate.url_file Internet Konfigurations-Datei
flashupdate.versioncheck Versionsüberprüfung
flashupdate.writeflash ganzes Flashimage einspielen
flashupdate.writeflashmtd einzelne Partition einspielen
@@ -513,8 +523,6 @@ fontsize.infobar_small Klein
fontsize.menu Menütext
fontsize.menu_info Menüinfo
fontsize.menu_title Menütitel
gtxalpha.alpha1 Alpha 1
gtxalpha.alpha2 Alpha 2
hdd_10min 10 min.
hdd_1min 1 min.
hdd_20min 20 min.
@@ -593,7 +601,7 @@ keybindingmenu.mode_left_right_key_tv_zap Umschalten
keybindingmenu.modechange Moduswechsel
keybindingmenu.pagedown Seite weiter
keybindingmenu.pageup Seite zurück
keybindingmenu.poweroff Umschalter
keybindingmenu.poweroff Standby EIN/AUS
keybindingmenu.quickzap Schnellumschaltung
keybindingmenu.remotecontrol_hardware Hardware
keybindingmenu.remotecontrol_hardware_coolstream Coolstream
@@ -625,7 +633,6 @@ lcd_info_line_clock Uhrzeit
lcdcontroler.brightness normale
lcdcontroler.brightnessdeepstandby Deep-Standby
lcdcontroler.brightnessstandby Standby
lcdcontroler.contrast Kontrast
lcdmenu.dim_brightness nach Dimm-Timeout
lcdmenu.dim_time Dimm-Timeout
lcdmenu.head VFD Einstellungen
@@ -729,9 +736,11 @@ miscsettings.infobar_disp_log Logo
miscsettings.infobar_logo_hdd_dir Logo Verz.
miscsettings.infobar_sat_display Kabel-/Satellitenanbieter
miscsettings.infobar_show Info bei EPG Änderungen
miscsettings.infobar_show_dd_available DD-Verfügbarkeit anzeigen
miscsettings.infobar_show_res Auflösung anzeigen
miscsettings.infobar_show_res_simple einfach
miscsettings.infobar_show_var_hdd Füllstandanzeige (var & hdd)
miscsettings.infobar_show_sysfs_hdd Füllstandanzeige (sysFS & hdd)
miscsettings.infobar_show_tuner Aktiven Tuner anzeigen
miscsettings.radiotext Radiotext
miscsettings.shutdown_count Komplett ausschalten nach
miscsettings.shutdown_count_hint1 Zeit (in Minuten), nach der vom Standby in
@@ -948,7 +957,7 @@ networkmenu.setuponstartup Beim Start Netzwerk setzen
networkmenu.show Aktive Einstellungen zeigen
networkmenu.ssid Netzwerkname
networkmenu.test Netzwerk testen
neutrino_starting Neutrino wird gestartet...
neutrino_starting Neutrino-HD wird gestartet...
nfs.alreadymounted Verzeichnis bereits gemountet.
nfs.automount Beim Start mounten
nfs.dir Verzeichnis/Freigabe
@@ -1011,7 +1020,6 @@ personalize.button_red Rot
personalize.button_yellow Gelb
personalize.disabled deaktiviert
personalize.enabled aktiviert
personalize.features Erweiterungen
personalize.head Menüs anpassen
personalize.help Hilfe
personalize.help_line1 Die Personalisierung ermöglicht es, die wichtigsten
@@ -1033,7 +1041,6 @@ personalize.pinhint Personalisierungs PIN Code eingeben
personalize.pinprotect ja
personalize.pinstatus mit PIN
personalize.plugins Plugins
personalize.setupmenuwithpin Einstellungen-Menü mit PIN
personalize.usermenu_preferred_buttons Bevorzugte Tasten zuweisen
personalize.usermenu_show_cancel Zeige Schalter "Abbrechen"
personalize.visible sichtbar
@@ -1121,6 +1128,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
@@ -1142,18 +1150,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
@@ -1211,8 +1229,8 @@ servicemenu.head Service
servicemenu.imageinfo Imageinfo
servicemenu.reload Kanallisten neu laden
servicemenu.reload_hint Kanallisten werden neu geladen,\nbitte warten...
servicemenu.restart Neutrino neu starten
servicemenu.restart_hint Neutrino wird neu gestartet...
servicemenu.restart Neutrino-HD neu starten
servicemenu.restart_hint Neutrino-HD wird neu gestartet...
servicemenu.restart_refused_recording Aufnahme läuft. Neustart nicht möglich.
servicemenu.scants Kanalsuche
servicemenu.update Software-Aktualisierung
@@ -1220,8 +1238,8 @@ settings.backup Image-Einstellungen: Sichern
settings.backup_failed Sicherung fehlgeschlagen!
settings.help Hilfe
settings.menu_pos Menüposition
settings.missingoptionsconffile Die Neutrino-Einstellungen wurden erweitert.\nDie neuen Werte werden auf Standard gesetzt.
settings.noconffile Die Neutrino-Einstellungen wurden nicht\ngefunden. Es werden Standardwerte benutzt.
settings.missingoptionsconffile Die Neutrino-HD Einstellungen wurden erweitert.\nDie neuen Werte werden auf Standard gesetzt.
settings.noconffile Die Neutrino-HD Einstellungen wurden nicht\ngefunden. Es werden Standardwerte benutzt.
settings.pos_bottom_left unten links
settings.pos_bottom_right unten rechts
settings.pos_default_center oben Mitte
@@ -1249,7 +1267,7 @@ streaminfo.head Tech. Information
streaminfo.not_available nicht verfügbar
streaminfo.resolution Auflösung
streaminfo.signal Empfangssignal
streaming.busy Ein oder mehrere Aufnahmeprozesse sind aktiv.\nSollte die Aufnahme eigentlich beendet sein,\nschafft ein Neustart von Neutrino Abhilfe.
streaming.busy Ein oder mehrere Aufnahmeprozesse sind aktiv.\nSollte die Aufnahme eigentlich beendet sein,\nschafft ein Neustart von Neutrino-HD Abhilfe.
streaming.dir_not_writable Das Aufnahmeverzeichnis ist nicht beschreibbar.\nAufnahmen sind daher nicht möglich.
streaming.write_error Die Aufnahme wurde leider abgebrochen,\nda ein Fehler beim Schreiben der Daten auftrat.
stringinput.caps Groß-/Kleinbuchstaben
@@ -1373,7 +1391,6 @@ videomenu.auto Automatisch
videomenu.brightness Helligkeit
videomenu.cinch Cinch
videomenu.contrast Kontrast
videomenu.csync Sync.-Korrektur
videomenu.dbdr MPEG2 Filter
videomenu.dbdr_both deBlock & deRing
videomenu.dbdr_deblock deBlock

View File

@@ -194,6 +194,10 @@ bouqueteditor.savingchanges Saving changes. Please wait ...
bouqueteditor.switch add/remove
bouqueteditor.switchmode TV/Radio
bouquetlist.head Bouquets
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
channellist.edit Edit
@@ -205,16 +209,24 @@ channellist.foot Channel Information
channellist.foot_freq Sat/Freq Info
channellist.foot_next next Event
channellist.foot_off off
channellist.foot_sort_alpha sorted[alpha]
channellist.foot_sort_freq sorted[freq]
channellist.foot_sort_sat sorted[sat]
channellist.head All Services
channellist.history History
channellist.keep_numbers Persistent channel numbers
channellist.make_hdlist Create list of HD channels
channellist.make_newlist Create list of new channels
channellist.make_removedlist Create list of removed channels
channellist.new_zap_mode Quickzap in list
channellist.nonefound No channels were found!\nPlease execute a scan\n(MENU-key -> service)
channellist.provs Providers
channellist.recording_not_possible Recording not possible!
channellist.reset_flags Reset 'new' channel flag
channellist.sats Satellites
channellist.since since
channellist.start starts
ci.clock CI clock (Mhz)
ci.empty No CAM in slot
ci.init_failed CAM init failed
ci.init_ok CAM init complete
@@ -343,10 +355,9 @@ extra.key_timeshift Timeshift
extra.key_unlock Unlock key
extra.ladirection LaDirection
extra.latitude Latitude
extra.loadconfig Neutrino-Settings: Load from
extra.loadconfig Neutrino-HD Settings: Load from
extra.loadkeys Load keys from
extra.lodirection LoDirection
extra.logo Logo number
extra.longitude Longitude
extra.menu_left_exit "Left" = menu back
extra.north North
@@ -355,10 +366,8 @@ 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 Neutrino-Settings: Save as
extra.saveconfig Neutrino-HD Settings: Save as
extra.savekeys Save keys as
extra.scan_fast Fast
extra.scan_full Full
extra.scrambled_message Scrambled Message
extra.show_mute_icon mute-icon at volume 0
extra.sms_channel sms-mode channel
@@ -377,8 +386,10 @@ extra.tp_mod_32 QAM/32
extra.tp_mod_64 QAM/64
extra.tp_pol Polarization
extra.tp_pol_h H
extra.tp_pol_l L
extra.tp_pol_r R
extra.tp_rate Symbol rate
extra.update_dir Directory for updates
extra.update_dir Local update directory
extra.use_gotoxx Use gotoXX
extra.volume_pos Volumebar
extra.west West
@@ -386,11 +397,9 @@ extra.zap_cycle Zap cycle
extra.zapit_fe_timeout Tune timeout (1 = 10 msec)
extra.zapit_hvoltage 18V for rotor moving
extra.zapit_make_bouquet Make Remaining Channels list
extra.zapit_menu Zapit options
extra.zapit_motor_speed Motor moving speed (10 = 1deg/sec)
extra.zapit_scanpids Scan/Use pids
extra.zapit_sdt_changed Channels changed, reload settings.
extra.zapit_write_names Write channel names
fan_speed CPU Fan speed
favorites.addchannel The current channel will be added \nto the bouquet "My Favorites". \n This will take a few seconds...
favorites.bouquetname My Favorites
@@ -425,7 +434,7 @@ filesystem.is.utf8.option.utf8 UTF-8
flashupdate.actionreadflash reading
flashupdate.cantopenfile can't open file
flashupdate.cantopenmtd can't open mtd-device
flashupdate.checkupdate search for new version
flashupdate.checkupdate Check for updates
flashupdate.currentversion_sep Current version
flashupdate.currentversiondate Date
flashupdate.currentversiontime Time
@@ -466,12 +475,13 @@ flashupdate.ready ready
flashupdate.reallyflashmtd Do you really want to flash?\n\nIf a error occurs or the image is not\nvalid, the box will not boot after flashing.\n\nImagename: %s\nTarget: %s
flashupdate.savesuccess The image was successfully saved \nunder %s.
flashupdate.selectimage Available Images/Files
flashupdate.settings Update settings
flashupdate.squashfs.noversion SquashFS version checks are currently only supported when updating over the web.\nAre you sure that you wish to install this image?
flashupdate.titlereadflash Reading Flash
flashupdate.titlewriteflash Writing Flash
flashupdate.updatemode Updatemode
flashupdate.updatemode_internet internet
flashupdate.updatemode_manual manual (ftp)
flashupdate.updatemode_manual from local update directory
flashupdate.url_file config file
flashupdate.versioncheck checking version
flashupdate.writeflash Write whole image
@@ -513,8 +523,6 @@ fontsize.infobar_small Small
fontsize.menu Menutext
fontsize.menu_info Menu Info
fontsize.menu_title Menu Title
gtxalpha.alpha1 Alpha 1
gtxalpha.alpha2 Alpha 2
hdd_10min 10 min.
hdd_1min 1 min.
hdd_20min 20 min.
@@ -625,7 +633,6 @@ lcd_info_line_clock clock
lcdcontroler.brightness normal Brightness
lcdcontroler.brightnessdeepstandby DeepStandby Brightness
lcdcontroler.brightnessstandby Standby Brightness
lcdcontroler.contrast Contrast
lcdmenu.dim_brightness Brightness after dim timeout
lcdmenu.dim_time Dim timeout
lcdmenu.head VFD Settings
@@ -729,9 +736,11 @@ miscsettings.infobar_disp_log Logo
miscsettings.infobar_logo_hdd_dir Logo dir
miscsettings.infobar_sat_display Satellite display on infobar
miscsettings.infobar_show show Info on EPG change
miscsettings.infobar_show_dd_available show DD availability
miscsettings.infobar_show_res show resolution on infobar
miscsettings.infobar_show_res_simple simple
miscsettings.infobar_show_var_hdd Fill level (var & hdd )
miscsettings.infobar_show_sysfs_hdd Fill level (sysFS & hdd)
miscsettings.infobar_show_tuner Display active tuner
miscsettings.radiotext Radiotext
miscsettings.shutdown_count In standby, switch off after
miscsettings.shutdown_count_hint1 time (in minutes) to switch from standby
@@ -943,12 +952,13 @@ networkmenu.ntptitle Time-Syncronisation
networkmenu.password Key
networkmenu.reset_settings_now Do you want restore the previous settings?
networkmenu.select_if Interface
networkmenu.services Network services
networkmenu.setupnow Apply network settings now
networkmenu.setuponstartup Setup network on startup
networkmenu.show Show active Network settings
networkmenu.ssid Network name
networkmenu.test Test network now
neutrino_starting Neutrino starting...
neutrino_starting Neutrino-HD starting...
nfs.alreadymounted directory already mounted
nfs.automount Mount on startup
nfs.dir directory/share
@@ -1011,7 +1021,6 @@ personalize.button_red red
personalize.button_yellow yellow
personalize.disabled Disabled
personalize.enabled Enabled
personalize.features Features menue
personalize.head Personalization
personalize.help Help
personalize.help_line1 Personalization makes it possible to adapt the most
@@ -1033,7 +1042,6 @@ personalize.pinhint Enter the Personalization PIN Code
personalize.pinprotect Yes
personalize.pinstatus Require PIN
personalize.plugins Plugins
personalize.setupmenuwithpin Settings Menu with PIN
personalize.usermenu_preferred_buttons Assigning of preferred keys
personalize.usermenu_show_cancel Show "Cancel"-Button
personalize.visible Visible
@@ -1121,6 +1129,7 @@ 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.cable_nid Network ID
satsetup.comm_input Commited input
satsetup.diseqc DiSEqC
satsetup.diseqc10 DiSEqC 1.0
@@ -1142,18 +1151,28 @@ 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_usals Use usals for all
@@ -1220,8 +1239,8 @@ settings.backup Image-Settings: Backup
settings.backup_failed Backup failed!
settings.help Help
settings.menu_pos Menu position
settings.missingoptionsconffile The neutrino-settings have been updated.\nNew Options will be set to default.
settings.noconffile No neutrino-settings found.\nUsing defaults.
settings.missingoptionsconffile The Neutrino-HD settings have been updated.\nNew Options will be set to default.
settings.noconffile No Neutrino-HD settings found.\nUsing defaults.
settings.pos_bottom_left bottom left
settings.pos_bottom_right bottom right
settings.pos_default_center top center
@@ -1249,7 +1268,7 @@ streaminfo.head Stream-Information
streaminfo.not_available not available
streaminfo.resolution Resolution
streaminfo.signal Receipt signal
streaming.busy One or several recording processes are active.\nIf you encounter this message and no recording is active, please restart Neutrino.
streaming.busy One or several recording processes are active.\nIf you encounter this message and no recording is active, please restart Neutrino-HD.
streaming.dir_not_writable The recording directory is not writable.\nRecording will not work.
streaming.write_error The recording was aborted,\nsince an error occured during the writing process.
stringinput.caps caps / no caps
@@ -1373,7 +1392,6 @@ videomenu.auto Auto
videomenu.brightness Brightness
videomenu.cinch Cinch
videomenu.contrast Contrast
videomenu.csync sync correction
videomenu.dbdr MPEG2 de-block/de-ring
videomenu.dbdr_both de-block+de-ring
videomenu.dbdr_deblock de-block

49
data/providermap.xml Normal file
View File

@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<zapit>
<TS id="03F0" on="0001" name="Digital+" />
<TS id="03F8" on="0001" name="Digital+" />
<TS id="0404" on="0001" name="Digital+" />
<TS id="0408" on="0001" name="Digital+" />
<TS id="040A" on="0001" name="Digital+" />
<TS id="040E" on="0001" name="Digital+" />
<TS id="0412" on="0001" name="Digital+" />
<TS id="0414" on="0001" name="Digital+" />
<TS id="0416" on="0001" name="Digital+" />
<TS id="041A" on="0001" name="Digital+" />
<TS id="041E" on="0001" name="Digital+" />
<TS id="0420" on="0001" name="Digital+" />
<TS id="0422" on="0001" name="Digital+" />
<TS id="0424" on="0001" name="Digital+" />
<TS id="0428" on="0001" name="Digital+" />
<TS name="AB" newname="AB SAT" />
<TS name="ABSAT" newname="AB SAT" />
<TS name="ARABSAT" newname="AB SAT" />
<TS name="Arqiv" newname="Arqiva" />
<TS name="ATV+" newname="ATV" />
<TS name="BBC" newname="BBC World Service" />
<TS name="Canaaldigitaal" newname="CanalDigitaal" />
<TS name="Canaldigitaal" newname="CanalDigitaal" />
<TS name="CANALDIGITAAL" newname="CanalDigitaal" />
<TS name="CSAT" newname="CanalSat France" />
<TS name="Cyfrowy Polsat S.A" newname="Cyfrowy Polsat" />
<TS name="Cyfrowy Polsat S.A." newname="Cyfrowy Polsat" />
<TS name="Cyfrowy Polsat SA" newname="Cyfrowy Polsat" />
<TS name="Du" newname="Dubai" />
<TS name="du" newname="Dubai" />
<TS name="Globecast" newname="GlobeCast" />
<TS name="Globecast Italia" newname="GlobeCast" />
<TS name="GlobeCast France" newname="GlobeCast" />
<TS name="GlobeCast Asia" newname="GlobeCast" />
<TS name="EUTELSAT" newname="Eutelsat" />
<TS name="MEDIA BRODCAST" newname="Media Broadcast" />
<TS name="MEDIA Broadcast" newname="Media Broadcast" />
<TS name="MEDIA BROADCAST" newname="Media Broadcast" />
<TS name="Netmed" newname="NetMed" />
<TS name="OVERON" newname="Overon" />
<TS name="Rai" newname="RAI" />
<TS name="RRsat" newname="RRSat" />
<TS name="SES ASTRA" newname="SES Astra" />
<TS name="SKY" newname="Sky" />
<TS name="Telewizja Polska SA" newname="Telewizja Polska" />
<TS name="TVP" newname="Telewizja Polska" />
</zapit>

View File

@@ -1406,6 +1406,7 @@
<transponder frequency="11508000" symbol_rate="27500000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11526000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11541000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11564000" symbol_rate="27500000" polarization="0" fec_inner="4" system="1" modulation="1"/>
<transponder frequency="11566000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11585000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="11604000" symbol_rate="27500000" polarization="0" fec_inner="4" system="0" modulation="1"/>
@@ -1575,18 +1576,23 @@
<transponder frequency="11243000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11302000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11317000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11347000" symbol_rate="22000000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11361000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11376000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11420000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11435000" symbol_rate="22000000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11464000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11479000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11493000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11508000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11523000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11538000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11567000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11582000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11597000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11611000" symbol_rate="22000000" polarization="0" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11626000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11641000" symbol_rate="22000000" polarization="0" fec_inner="3" system="1" modulation="2"/>
<transponder frequency="11670000" symbol_rate="22000000" polarization="0" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="11685000" symbol_rate="22000000" polarization="1" fec_inner="4" system="0" modulation="1"/>
<transponder frequency="11719000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
@@ -1616,7 +1622,7 @@
<transponder frequency="12187000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12207000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="12226000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12246000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12246000" symbol_rate="29700000" polarization="1" fec_inner="2" system="1" modulation="2"/>
<transponder frequency="12265000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12285000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
<transponder frequency="12304000" symbol_rate="27500000" polarization="0" fec_inner="9" system="1" modulation="1"/>