diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index fbf4de9cd..943e6093c 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -247,8 +247,6 @@ ca_init_1 CI-Modul ca_init_2 Conax-Karte und CI-Modul cablesetup.provider Kabelanbieter camd_control camd-Steuerung -camd_item_ciplushelper_hint CI+ Helfer -camd_item_ciplushelper_name ciplushelper camd_item_cs2gbox_hint cs2gbox - Newcamd Bridge camd_item_cs2gbox_name cs2gbox camd_item_doscam_hint DOSCam - Softcam und Emulator diff --git a/data/locale/english.locale b/data/locale/english.locale index 9851befea..f108af6eb 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -247,8 +247,6 @@ ca_init_1 CI module ca_init_2 Conax-Card and CI module cablesetup.provider cable provider camd_control camd control -camd_item_ciplushelper_hint CI+ helper -camd_item_ciplushelper_name ciplushelper camd_item_cs2gbox_hint cs2gbox - Newcamd bridge camd_item_cs2gbox_name cs2gbox camd_item_doscam_hint DOSCam - Softcam and emulator diff --git a/src/gui/daemon_control.cpp b/src/gui/daemon_control.cpp index cb84897ac..1943a9f99 100644 --- a/src/gui/daemon_control.cpp +++ b/src/gui/daemon_control.cpp @@ -152,9 +152,6 @@ camds_data_t camds_data[]= {LOCALE_CAMD_ITEM_NEWCS_NAME, LOCALE_CAMD_ITEM_NEWCS_HINT, "NEWCS", "newcs", 0, 0}, {LOCALE_CAMD_ITEM_GBOX_NAME, LOCALE_CAMD_ITEM_GBOX_HINT, "GBOX.NET", "gbox", 0, 0}, {LOCALE_CAMD_ITEM_CS2GBOX_NAME, LOCALE_CAMD_ITEM_CS2GBOX_HINT, "CS2GBOX", "cs2gbox", 0, 0} -#if HAVE_ARM_HARDWARE - ,{LOCALE_CAMD_ITEM_CIPLUSHELPER_NAME, LOCALE_CAMD_ITEM_CIPLUSHELPER_HINT, "CIPLUSHELPER", "ciplushelper", 0, 0} -#endif }; #define CAMDS_COUNT (sizeof(camds_data)/sizeof(struct camds_data_t)) diff --git a/src/system/locals.h b/src/system/locals.h index df3a99ec6..e79a5c663 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -273,8 +273,6 @@ typedef enum LOCALE_CA_INIT_2, LOCALE_CABLESETUP_PROVIDER, LOCALE_CAMD_CONTROL, - LOCALE_CAMD_ITEM_CIPLUSHELPER_HINT, - LOCALE_CAMD_ITEM_CIPLUSHELPER_NAME, LOCALE_CAMD_ITEM_CS2GBOX_HINT, LOCALE_CAMD_ITEM_CS2GBOX_NAME, LOCALE_CAMD_ITEM_DOSCAM_HINT, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index e95b29ae3..5dc03a3c7 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -273,8 +273,6 @@ const char * locale_real_names[] = "ca_init_2", "cablesetup.provider", "camd_control", - "camd_item_ciplushelper_hint", - "camd_item_ciplushelper_name", "camd_item_cs2gbox_hint", "camd_item_cs2gbox_name", "camd_item_doscam_hint", diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 3f6a1ad41..3c24d847b 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -182,7 +182,6 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) strstr(filename, "ncam") || strstr(filename, "oscam") || strstr(filename, "cs2gbox") || - strstr(filename, "ciplushelper")|| strstr(filename, "gbox")) { CHintBox hintbox(LOCALE_CAMD_CONTROL, g_Locale->getText(LOCALE_CAMD_MSG_START)); @@ -231,7 +230,6 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) strstr(filename, "ncam") || strstr(filename, "oscam") || strstr(filename, "cs2gbox") || - strstr(filename, "ciplushelper")|| strstr(filename, "gbox")) { CHintBox hintbox(LOCALE_CAMD_CONTROL, g_Locale->getText(LOCALE_CAMD_MSG_STOP)); @@ -252,8 +250,6 @@ bool CFlagFileNotifier::changeNotify(const neutrino_locale_t, void * data) } remove(flagfile.c_str()); } - if (strstr(filename, "ciplushelper")) - CNeutrinoApp::getInstance()->exec(NULL, "need_reboot"); return menu_return::RETURN_REPAINT; }