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:
martii
2013-06-23 08:40:35 +02:00
committed by [CST] Focus
parent 6c1fe793fc
commit 2df91f2e87
8 changed files with 12 additions and 7 deletions

View File

@@ -1799,6 +1799,7 @@ typedef enum
LOCALE_PARENTALLOCK_ONSIGNAL,
LOCALE_PARENTALLOCK_PARENTALLOCK,
LOCALE_PARENTALLOCK_PROMPT,
LOCALE_PARENTALLOCK_ZAPTIME,
LOCALE_PERSONALIZE_ACCESS,
LOCALE_PERSONALIZE_APPLY_SETTINGS,
LOCALE_PERSONALIZE_BUTTON_AUTO,