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

videosettings: reduce videomenu.zappingmode to mute and hold

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 424c335947
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-26 (Sun, 26 Jan 2020)

Origin message was:
------------------
- videosettings: reduce videomenu.zappingmode to mute and hold

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-01-26 22:31:45 +01:00
parent 5200c73764
commit 8cac71b903
5 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -2920,8 +2920,6 @@ videomenu.videomode Videosystem
videomenu.zappingmode Umschaltmodus
videomenu.zappingmode_mute Schwarzes Bild
videomenu.zappingmode_hold Standbild
videomenu.zappingmode_mutetilllock Schwarzes Bild bis lock
videomenu.zappingmode_holdtilllock Standbild bis lock
weather.api_key Wetter API Schlüssel (Dark Sky)
weather.enabled Wetter-Unterstützung
weather.location Wetter-Standort

2
data/locale/english.locale
View File

@@ -2920,8 +2920,6 @@ videomenu.videomode Digital video mode
videomenu.zappingmode Zap mode
videomenu.zappingmode_mute Black screen
videomenu.zappingmode_hold Hold screen
videomenu.zappingmode_mutetilllock Black screen until locked
videomenu.zappingmode_holdtilllock Hold screen until locked
weather.api_key Weather API key (Dark Sky)
weather.enabled Weather support
weather.location Weather location

6
src/gui/videosettings.cpp
View File

@@ -328,13 +328,11 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO
};
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 4
#define VIDEOMENU_ZAPPINGMODE_OPTION_COUNT 2
CMenuOptionChooser::keyval VIDEOMENU_ZAPPINGMODE_OPTIONS[VIDEOMENU_ZAPPINGMODE_OPTION_COUNT] =
{
{ 0, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE },
{ 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD },
{ 2, LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK },
{ 3, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK }
{ 1, LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD }
};
#endif

2
src/system/locals.h
View File

@@ -2947,8 +2947,6 @@ typedef enum
LOCALE_VIDEOMENU_ZAPPINGMODE,
LOCALE_VIDEOMENU_ZAPPINGMODE_MUTE,
LOCALE_VIDEOMENU_ZAPPINGMODE_HOLD,
LOCALE_VIDEOMENU_ZAPPINGMODE_MUTETILLLOCK,
LOCALE_VIDEOMENU_ZAPPINGMODE_HOLDTILLLOCK,
LOCALE_WEATHER_API_KEY,
LOCALE_WEATHER_ENABLED,
LOCALE_WEATHER_LOCATION,

2
src/system/locals_intern.h
View File

@@ -2947,8 +2947,6 @@ const char * locale_real_names[] =
"videomenu.zappingmode",
"videomenu.zappingmode_mute",
"videomenu.zappingmode_hold",
"videomenu.zappingmode_mutetilllock",
"videomenu.zappingmode_holdtilllock",
"weather.api_key",
"weather.enabled",
"weather.location",