mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 01:11:12 +02:00
Merge branch 'pu/cc' into next-cc
Conflicts: acinclude.m4 data/locale/deutsch.locale data/locale/english.locale src/driver/volume.cpp src/eitd/SIlanguage.cpp src/gui/bedit/bouqueteditor_channels.cpp src/gui/bedit/bouqueteditor_chanselect.cpp src/gui/bouquetlist.cpp src/gui/channellist.cpp src/gui/eventlist.cpp src/gui/osd_setup.cpp src/gui/scan.cpp src/gui/scan.h src/gui/test_menu.cpp src/gui/timeosd.cpp src/gui/widget/progressbar.cpp src/gui/widget/progressbar.h src/neutrino.cpp src/nhttpd/yconfig.h
This commit is contained in:
[CST] Focus
@@ -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.
|
||||
@@ -319,6 +319,8 @@ eventfinder.search_within_epg Suche innerhalb EPG-Daten
|
||||
eventfinder.search_within_list Suche innerhalb Text
|
||||
eventfinder.searching Suche...
|
||||
eventfinder.start_search Suche starten
|
||||
eventlist.additional Zusatzinformationen
|
||||
eventlist.name Eventliste
|
||||
eventlistbar.channelswitch Umschalten
|
||||
eventlistbar.eventsort Sortieren
|
||||
eventlistbar.recordevent Aufnehmen
|
||||
@@ -530,6 +532,7 @@ fontsize.epg_info1 EPG Info 1
|
||||
fontsize.epg_info2 EPG Info 2
|
||||
fontsize.epg_title EPG Titel
|
||||
fontsize.eventlist_datetime Datum/Zeit
|
||||
fontsize.eventlist_event Event Info
|
||||
fontsize.eventlist_itemlarge Groß
|
||||
fontsize.eventlist_itemsmall Klein
|
||||
fontsize.eventlist_title Titel
|
||||
@@ -578,6 +581,7 @@ imageinfo.forum Forum:
|
||||
imageinfo.head Image Info:
|
||||
imageinfo.homepage Homepage:
|
||||
imageinfo.image Image:
|
||||
imageinfo.kernel Kernel:
|
||||
imageinfo.license Lizenz:
|
||||
imageinfo.version Version:
|
||||
inetradio.name Internetradio
|
||||
@@ -765,7 +769,9 @@ menu.hint_epg_old_events Veraltete EPG-Daten werden nach dieser Zeit (in Stunden
|
||||
menu.hint_epg_save Speichert die EPG-Daten auf einem externen Datenträger und läd es von dort nach einen Neustart
|
||||
menu.hint_epg_save_standby Speichert die EPG-Daten auch im Standby-Modus
|
||||
menu.hint_event_textcolor Ändern Sie die Farbe für farbige Events in der Kanalliste und der Infobar
|
||||
menu.hint_eventlist_additional Definiert, ob zusätzliche Informationen im Hauptfenster angezeigt werden sollen
|
||||
menu.hint_eventlist_fonts Ändern Sie die Schriftgröße in der Event-Liste
|
||||
menu.hint_eventlist_setup Wählen Sie die Anzeigeoptionen für die Event-Liste
|
||||
menu.hint_extended Energiespar-, EPG-Speicher- und Lade-Optionen, HDMI-CEC, Startkanal und mehr
|
||||
menu.hint_factory Zurücksetzen der Box auf Werkseinstellungen.\nDie Box wird danach neu gestartet
|
||||
menu.hint_fade Bei aktivierter Funktion werden die Menüfenster 'weich' ein- bzw. ausgeblendet
|
||||
@@ -1139,6 +1145,13 @@ miscsettings.infobar_disp_5 Logo/Signalbalken
|
||||
miscsettings.infobar_disp_6 Logo+Kanalnummer/Signalbalken
|
||||
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_sysfs_hdd Füllstandanzeige (sysFS & hdd)
|
||||
miscsettings.infobar_show_tuner Aktiven Tuner anzeigen
|
||||
miscsettings.progressbar Fortschrittsbalken
|
||||
miscsettings.progressbar_color Farbe
|
||||
miscsettings.progressbar_design Design
|
||||
@@ -1151,13 +1164,6 @@ miscsettings.progressbar_infobar_position_0 Standard
|
||||
miscsettings.progressbar_infobar_position_1 unterhalb Kanalname
|
||||
miscsettings.progressbar_infobar_position_2 unterhalb Kanalname (schmal)
|
||||
miscsettings.progressbar_infobar_position_3 zwischen EPG-Events (schmal)
|
||||
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_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
|
||||
|
||||
@@ -321,6 +321,8 @@ eventfinder.search_within_epg Search within
|
||||
eventfinder.search_within_list Search within
|
||||
eventfinder.searching Search for keyword in EPG...
|
||||
eventfinder.start_search Start Search
|
||||
eventlist.additional Additional informations
|
||||
eventlist.name Eventlist
|
||||
eventlistbar.channelswitch schedule
|
||||
eventlistbar.eventsort sorting
|
||||
eventlistbar.recordevent record
|
||||
@@ -535,6 +537,7 @@ fontsize.epg_info1 EPG Info 1
|
||||
fontsize.epg_info2 EPG Info 2
|
||||
fontsize.epg_title EPG Title
|
||||
fontsize.eventlist_datetime Date / Time
|
||||
fontsize.eventlist_event Event Info
|
||||
fontsize.eventlist_itemlarge Large
|
||||
fontsize.eventlist_itemsmall Small
|
||||
fontsize.eventlist_title Title
|
||||
@@ -583,6 +586,7 @@ imageinfo.forum Forum:
|
||||
imageinfo.head Image info:
|
||||
imageinfo.homepage Home page:
|
||||
imageinfo.image Image:
|
||||
imageinfo.kernel Kernel:
|
||||
imageinfo.license License:
|
||||
imageinfo.version Version:
|
||||
inetradio.name Internetradio
|
||||
@@ -770,7 +774,9 @@ menu.hint_epg_old_events Hours after event end time to consider\nevent old and r
|
||||
menu.hint_epg_save Save cached EPG to harddisk or usb flash\nand load it after boot
|
||||
menu.hint_epg_save_standby Save EPG on soft standby mode
|
||||
menu.hint_event_textcolor Change event color for colored-event options\nin channel list and infobar
|
||||
menu.hint_eventlist_additional Show additional informations\nin main box
|
||||
menu.hint_eventlist_fonts Change event list font sizes
|
||||
menu.hint_eventlist_setup Configure event list GUI options
|
||||
menu.hint_extended Power saving, EPG save/load options\nHDMI-CEC, Start channel, zap options
|
||||
menu.hint_factory Reset box to factory state\nBox will reboot after reset
|
||||
menu.hint_fade Fade GUI windows
|
||||
@@ -1154,6 +1160,13 @@ miscsettings.infobar_disp_5 Logo+signal
|
||||
miscsettings.infobar_disp_6 Logo+channel number+signal
|
||||
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_sysfs_hdd Fill level (sysFS & hdd)
|
||||
miscsettings.infobar_show_tuner Display active tuner
|
||||
miscsettings.progressbar Progressbar
|
||||
miscsettings.progressbar_color Color
|
||||
miscsettings.progressbar_design Design
|
||||
@@ -1166,13 +1179,6 @@ miscsettings.progressbar_infobar_position_0 standard
|
||||
miscsettings.progressbar_infobar_position_1 below channel name
|
||||
miscsettings.progressbar_infobar_position_2 small below channel name
|
||||
miscsettings.progressbar_infobar_position_3 narrow between EPG-Events
|
||||
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_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
|
||||
|
||||
Reference in New Issue
Block a user