mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
parental protection: make zaptime configurable
Conflicts:
data/locale/english.locale
src/gui/channellist.cpp
src/gui/parentallock_setup.cpp
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a12f4c0274
Author: martii <m4rtii@gmx.de>
Date: 2013-06-23 (Sun, 23 Jun 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1772,6 +1772,7 @@ parentallock.never Nie
|
||||
parentallock.onsignal Bei gesendeter Vorsperre
|
||||
parentallock.parentallock Jugendschutz
|
||||
parentallock.prompt PIN-Eingabe
|
||||
parentallock.zaptime Zap-Zeit für vorgesperrte Bouquets (Minuten)
|
||||
personalize.access Zugangsoptionen
|
||||
personalize.apply_settings Änderungen übernehmen?
|
||||
personalize.button_auto Auto
|
||||
|
@@ -1772,6 +1772,7 @@ parentallock.never never
|
||||
parentallock.onsignal on broadcasted lock
|
||||
parentallock.parentallock Parental lock
|
||||
parentallock.prompt prompt for PIN
|
||||
parentallock.zaptime Zap time for locked bouquets (minutes)
|
||||
personalize.access Access options
|
||||
personalize.apply_settings Apply changes?
|
||||
personalize.button_auto auto
|
||||
|
Reference in New Issue
Block a user