ci "extra high" added

Conflicts:
	src/gui/cam_menu.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e005f3e654
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)



------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -326,6 +326,7 @@ channellist.show_res_icon Auflösung signalisieren
 channellist.since seit
 channellist.start Start
 ci.clock CI Takt (Mhz)
+ci.clock_extra_high extra hoch
 ci.clock_high hoch
 ci.clock_normal normal
 ci.empty Kein CAM im Slot

data/locale/english.locale

@@ -326,6 +326,7 @@ channellist.show_res_icon Signalize resolution
 channellist.since since
 channellist.start starts
 ci.clock CI clock (Mhz)
+ci.clock_extra_high extra high
 ci.clock_high high
 ci.clock_normal normal
 ci.empty No CAM in slot

src/gui/cam_menu.cpp

@@ -73,11 +73,20 @@ const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] =
 };
 #define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
 
+#if BOXMODEL_VUPLUS_ALL
+#define CI_CLOCK_OPTION_COUNT 3
+static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[CI_CLOCK_OPTION_COUNT] = {
+	{  6, LOCALE_CI_CLOCK_NORMAL },
+	{  7, LOCALE_CI_CLOCK_HIGH },
+	{ 12, LOCALE_CI_CLOCK_EXTRA_HIGH }
+};
+#else
 #define CI_CLOCK_OPTION_COUNT 2
 static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[CI_CLOCK_OPTION_COUNT] = {
 	{ 6, LOCALE_CI_CLOCK_NORMAL },
 	{ 7, LOCALE_CI_CLOCK_HIGH }
 };
+#endif
 
 void CCAMMenuHandler::init(void)
 {

src/system/locals.h

@@ -353,6 +353,7 @@ typedef enum
 	LOCALE_CHANNELLIST_SINCE,
 	LOCALE_CHANNELLIST_START,
 	LOCALE_CI_CLOCK,
+	LOCALE_CI_CLOCK_EXTRA_HIGH,
 	LOCALE_CI_CLOCK_HIGH,
 	LOCALE_CI_CLOCK_NORMAL,
 	LOCALE_CI_EMPTY,

src/system/locals_intern.h

@@ -353,6 +353,7 @@ const char * locale_real_names[] =
 	"channellist.since",
 	"channellist.start",
 	"ci.clock",
+	"ci.clock_extra_high",
 	"ci.clock_high",
 	"ci.clock_normal",
 	"ci.empty",