mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/slovak.locale
	lib/libcoolstream/hardware_caps.cpp
	lib/libcoolstream/hardware_caps.h
	lib/libdvbsub/dvbsubtitle.cpp
	lib/timerdclient/timerdclient.cpp
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/framebuffer_ng.h
	src/driver/pictureviewer/Makefile.am
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgplus.cpp
	src/gui/epgview.cpp
	src/gui/plugins.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/gui/widget/listbox.cpp
	src/gui/widget/listhelpers.cpp
	src/neutrino.cpp
	src/system/helpers.cpp
	src/system/helpers.h
	src/system/settings.cpp
	src/system/settings.h
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 13:08:01 +02:00
parent 59c83b2c70 f3cc9f75a2
commit 8474ef8c98
16 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/slovak.locale
View File

@@ -1397,6 +1397,7 @@ menu.hint_sleeptimer Nastavenie časovača pre prechod prijímača do pohotovost
menu.hint_sleeptimer_min Prednastavené nastavenia pre časovač vypnutia
menu.hint_sms_channel Ak povolené, číselné klávesy v zozname kanálov budú použité pre vyhľadávanie kanálu v štýle SMS
menu.hint_sms_movie Ak povolené, číselné klávesy v prehliadači filmov budú použité pre vyhľadávanie filmu v štýle SMS
menu.hint_soft_restart Reštartovanie Neutrino bez rebootu
menu.hint_soft_restart Reštartovanie Neutrino-HD bez rebootu
menu.hint_softupdate_check Kontrola dostupných aktualizácií, stiahnutie a naprogramovanie firmware
menu.hint_softupdate_check_local Výber a programovanie firmware z lokálneho súboru