mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
Merge branch 'check/pu-cc' into master
needs buildfixing... Conflicts: data/Makefile.am src/driver/framebuffer.h src/driver/volume.cpp src/gui/bedit/bouqueteditor_bouquets.cpp src/gui/bedit/bouqueteditor_channels.cpp src/gui/bouquetlist.cpp src/gui/channellist.cpp src/gui/filebrowser.cpp src/gui/imageinfo.cpp src/gui/infoviewer.cpp src/gui/streaminfo2.cpp src/gui/widget/textbox.cpp
This commit is contained in:
Stefan Seyfried
@@ -1,4 +1,4 @@
|
||||
SUBDIRS = fonts icons inetradio iso-codes locale scripts themes
|
||||
SUBDIRS = fonts icons inetradio iso-codes license locale scripts themes
|
||||
|
||||
if BOXTYPE_TRIPLE
|
||||
SUBDIRS += lcd
|
||||
|
||||
5
data/license/Makefile.am
Normal file
5
data/license/Makefile.am
Normal file
@@ -0,0 +1,5 @@
|
||||
installdir = $(DATADIR)/neutrino/license
|
||||
|
||||
install_DATA = \
|
||||
deutsch.license \
|
||||
english.license
|
||||
5
data/license/deutsch.license
Normal file
5
data/license/deutsch.license
Normal file
@@ -0,0 +1,5 @@
|
||||
Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version.
|
||||
|
||||
Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.
|
||||
|
||||
Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, Inc, 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
|
||||
5
data/license/english.license
Normal file
5
data/license/english.license
Normal file
@@ -0,0 +1,5 @@
|
||||
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
@@ -736,7 +736,7 @@ menu.hint_auto_subs Automatische Anzeige der Untertitel in Ihrer bevorzugten Spr
|
||||
menu.hint_back Zurück zum vorherigen Menü.\nDie Taste 'Menü' schließt alle Menüs
|
||||
menu.hint_backup Sichern von Konfigurationen und Kanallisten
|
||||
menu.hint_bedit Bearbeiten ihrer Favoriten und der Bouquets
|
||||
menu.hint_bigwindows EPG-Informationen werden immer im großen Fenster angezeigt. Dies erreichen Sie auch mit der Taste 'Info'
|
||||
menu.hint_bigwindows Kanalliste, EPG-Infos, Audioplayer und einige andere Fenster werden bildschirmfüllend angezeigt
|
||||
menu.hint_cache_txt Startet das Zwischenspeichern des Teletextes nach einem Kanalwechsel
|
||||
menu.hint_cec_mode CEC-Modus
|
||||
menu.hint_cec_standby CEC-Standby
|
||||
@@ -943,6 +943,9 @@ menu.hint_record_apid_std Schließt bei einer Aufnahme die durch den Sender defi
|
||||
menu.hint_record_apids Konfigurieren Sie die Tonspuren für die Aufnahme
|
||||
menu.hint_record_apply Hiermit werden die Aufnahmeoptionen übernommen
|
||||
menu.hint_record_chandir Diese Option speichert Aufnahmen mit dem Namen des Kanals in ein eigenes Verzeichnis
|
||||
menu.hint_record_data Daten-Spuren (Teletext, Untertitel) für die Aufnahme
|
||||
menu.hint_record_data_dvbsub Untertitel-Spur zu Aufnahme hinzufügen
|
||||
menu.hint_record_data_vtxt Teletext-Spur zu Aufnahme hinzufügen
|
||||
menu.hint_record_dir Wählen Sie das Aufnahmeverzeichnis
|
||||
menu.hint_record_end Wählen Sie zwischen max. Aufnahmezeit oder einem Aufnahmeende anhand der EPG-Daten
|
||||
menu.hint_record_slow_warn Zeige Warnung, wenn der Aufnahmepuffer zu überlaufen droht
|
||||
@@ -1516,7 +1519,9 @@ recordingmenu.apids Tonspuren
|
||||
recordingmenu.apids_ac3 AC3 Tonspuren aufnehmen
|
||||
recordingmenu.apids_alt Alternative Tonspuren aufn.
|
||||
recordingmenu.apids_std Standard Tonspur aufnehmen
|
||||
recordingmenu.data_pids Daten-Spuren
|
||||
recordingmenu.defdir Aufnahmeverzeichnis
|
||||
recordingmenu.dvbsub_pids Untertitel aufnehmen
|
||||
recordingmenu.end_of_recording_epg EPG aktuelles Event
|
||||
recordingmenu.end_of_recording_max max. Aufnahmezeit
|
||||
recordingmenu.end_of_recording_name Ende der Sofortaufnahme
|
||||
@@ -1538,6 +1543,7 @@ recordingmenu.slow_warn Warnung bei langsamen Aufnahmemedien
|
||||
recordingmenu.timeshift Timeshift
|
||||
recordingmenu.tsdir Timeshift Aufnahmeverzeichnis
|
||||
recordingmenu.vcr Videorekorder
|
||||
recordingmenu.vtxt_pid Teletext aufnehmen
|
||||
recordingmenu.zap_on_announce Umschalten bei Ankündigung
|
||||
recordtimer.announce Die Aufnahme beginnt in wenigen Minuten.
|
||||
repeatblocker.hint_1 Mindestzeit (in ms) zwischen 2 Tastendrücken
|
||||
|
||||
@@ -736,7 +736,7 @@ menu.hint_auto_subs Auto-start subtitles for preferred language
|
||||
menu.hint_back Return to previous menu\nPress menu key to close all menus
|
||||
menu.hint_backup Backup configs and channels to selected dir
|
||||
menu.hint_bedit Edit favorites and bouquets
|
||||
menu.hint_bigwindows Always show big epg detail window\nelse 'info' button switch big font + window size
|
||||
menu.hint_bigwindows Channellist, EPG-infos, audioplayer and some other windows are displayed full screen
|
||||
menu.hint_cache_txt Start teletext caching after channel switch
|
||||
menu.hint_cec_mode CEC mode
|
||||
menu.hint_cec_standby CEC standby
|
||||
@@ -943,6 +943,9 @@ menu.hint_record_apid_std Record first audio pid
|
||||
menu.hint_record_apids Configure audio pids to record
|
||||
menu.hint_record_apply Apply record options
|
||||
menu.hint_record_chandir Create directory with name of channel\nto store recording
|
||||
menu.hint_record_data Record (VideoText, subtitles) data streams
|
||||
menu.hint_record_data_dvbsub subtitle stream
|
||||
menu.hint_record_data_vtxt VideoText stream
|
||||
menu.hint_record_dir Select directory to store recordings
|
||||
menu.hint_record_end Stop direct record after max. time\nor after current event end time
|
||||
menu.hint_record_slow_warn Show warning, when record buffer is close to overflow
|
||||
@@ -1516,7 +1519,9 @@ recordingmenu.apids Audio streams
|
||||
recordingmenu.apids_ac3 record AC3 streams
|
||||
recordingmenu.apids_alt record alternative streams
|
||||
recordingmenu.apids_std record standard stream
|
||||
recordingmenu.data_pids Data streams
|
||||
recordingmenu.defdir Recording directory
|
||||
recordingmenu.dvbsub_pids record dvbsub stream
|
||||
recordingmenu.end_of_recording_epg EPG act. Event
|
||||
recordingmenu.end_of_recording_max max. Recordingtime
|
||||
recordingmenu.end_of_recording_name Endtime of Recording
|
||||
@@ -1538,6 +1543,7 @@ recordingmenu.slow_warn Enable slow record warning
|
||||
recordingmenu.timeshift Timeshift
|
||||
recordingmenu.tsdir Timeshift directory
|
||||
recordingmenu.vcr vcr
|
||||
recordingmenu.vtxt_pid record teletext
|
||||
recordingmenu.zap_on_announce zap on recording announce
|
||||
recordtimer.announce Recording starts in a few minutes
|
||||
repeatblocker.hint_1 Shortest time (in ms) to recognize 2 keystrokes
|
||||
|
||||
@@ -1179,33 +1179,43 @@
|
||||
<sat name="Eurobird 9A (9.0E)" flags="0" position="90">
|
||||
<transponder frequency="11727000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11747000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11766000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11785000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="11804000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11823000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11843000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11861000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="11881000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="11900000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11900000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="11919000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11938000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11958000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11958000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="11977000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="11996000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12015000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12034000" symbol_rate="27500000" polarization="1" fec_inner="3" system="1" modulation="2"/>
|
||||
<transponder frequency="12054000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12074000" symbol_rate="27500000" polarization="1" fec_inner="3" system="1" modulation="2"/>
|
||||
<transponder frequency="12092000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12092000" symbol_rate="27500000" polarization="0" fec_inner="3" system="1" modulation="2"/>
|
||||
<transponder frequency="12111000" symbol_rate="27500000" polarization="1" fec_inner="7" system="1" modulation="2"/>
|
||||
<transponder frequency="12130000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12207000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12149000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12168000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12207000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12226000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12245000" symbol_rate="27500000" polarization="0" fec_inner="3" system="1" modulation="2"/>
|
||||
<transponder frequency="12265000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12284000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12303000" symbol_rate="26400000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12322000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12360000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12380000" symbol_rate="26400000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12399000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12437000" symbol_rate="27500000" polarization="0" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12341000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12360000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12380000" symbol_rate="27500000" polarization="1" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12399000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12418000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12437000" symbol_rate="27500000" polarization="0" fec_inner="2" system="1" modulation="2"/>
|
||||
<transponder frequency="12456000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
<transponder frequency="12476000" symbol_rate="27500000" polarization="1" fec_inner="3" system="0" modulation="1"/>
|
||||
</sat>
|
||||
<sat name="Eutelsat W2A (10.0E)" flags="0" position="100">
|
||||
<transponder frequency="3843000" symbol_rate="20204000" polarization="1" fec_inner="3" system="1" modulation="1"/>
|
||||
|
||||
Reference in New Issue
Block a user