diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 059243456..68a81bb48 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -120,7 +120,7 @@ adzap.writedata Schreibe Status-Daten adzap.zap Zap bei der Timer Aktivierung auf adzap.zap_off nicht adzap.zap_to_last_channel Letzter-Kanal -adzap.zap_to_strat_channel Start-Kanal +adzap.zap_to_start_channel Start-Kanal apidselector.head Sprachauswahl audio.srs_algo Art audio.srs_algo_heavy stark @@ -1045,7 +1045,7 @@ menu.hint_a_pic Konfigurieren Sie den Audioplayer und den Bildbetrachter menu.hint_adzap Der Werbezapper schaltet nach der eingestellten Zeit wieder auf den ursprünglichen Kanal zurück menu.hint_adzap_active Der Werbezapper ist aktiv. Mit einem erneuten Aufruf wird er deaktiviert. menu.hint_adzap_writedata Schreibe Daten über den Status des Werbezappers nach /tmp/adzap.data -menu.hint_adzap_zap Umschalten bei der Timer-Aktivierung auf Letzten oder Strat Kanal +menu.hint_adzap_zap Umschalten bei der Timer-Aktivierung auf Letzten oder Start Kanal menu.hint_aplay Audioplayer menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner. menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen usw. diff --git a/data/locale/english.locale b/data/locale/english.locale index adbd00125..6ad3d3139 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -120,7 +120,7 @@ adzap.writedata Write status data adzap.zap zap on timer activation to adzap.zap_off off adzap.zap_to_last_channel last-channel -adzap.zap_to_strat_channel start-channel +adzap.zap_to_start_channel start-channel apidselector.head Select language audio.srs_algo Type audio.srs_algo_heavy Heavy @@ -1045,7 +1045,7 @@ menu.hint_a_pic Configure audio player and picture viewer menu.hint_adzap AdZap will switch back to the current channel when the selected time is up menu.hint_adzap_active AdZap is active. With a new call it will be deactivated. menu.hint_adzap_writedata Write data according to adzap status to /tmp/adzap.data -menu.hint_adzap_zap zap Switch to last or strat channel during timer activation +menu.hint_adzap_zap zap Switch to last or start channel during timer activation menu.hint_aplay Audio player menu.hint_aplay_setup Change title display, start directory, screen saver and more menu.hint_audio Audio output, DD\nSRS True volume options diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp index c96ce7e1e..2f623e762 100644 --- a/src/gui/adzap.cpp +++ b/src/gui/adzap.cpp @@ -323,7 +323,7 @@ void CAdZapMenu::ShowMenu() { { SNeutrinoSettings::ADZAP_ZAP_OFF,LOCALE_ADZAP_ZAP_OFF}, { SNeutrinoSettings::ADZAP_ZAP_TO_LAST,LOCALE_ADZAP_ZAP_TO_LAST_CHANNEL}, - { SNeutrinoSettings::ADZAP_ZAP_TO_STRAT,LOCALE_ADZAP_ZAP_TO_STRAT_CHANNEL}, + { SNeutrinoSettings::ADZAP_ZAP_TO_START,LOCALE_ADZAP_ZAP_TO_START_CHANNEL}, }; bool show_monitor = monitorLifeTime.tv_sec; diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 70b36e165..4eee17770 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -1252,7 +1252,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start if(g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_LAST) CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel); - else if(g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_STRAT){ + else if(g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_START){ int mode = CNeutrinoApp::getInstance()->getMode(); bool isRadioMode = (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio); const t_channel_id cur_channel_id = isRadioMode ? g_settings.startchannelradio_id : g_settings.startchanneltv_id; diff --git a/src/system/locals.h b/src/system/locals.h index 196647dee..6a33da738 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -147,7 +147,7 @@ typedef enum LOCALE_ADZAP_ZAP, LOCALE_ADZAP_ZAP_OFF, LOCALE_ADZAP_ZAP_TO_LAST_CHANNEL, - LOCALE_ADZAP_ZAP_TO_STRAT_CHANNEL, + LOCALE_ADZAP_ZAP_TO_START_CHANNEL, LOCALE_APIDSELECTOR_HEAD, LOCALE_AUDIO_SRS_ALGO, LOCALE_AUDIO_SRS_ALGO_HEAVY, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 14c1fffb2..aed1778c3 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -147,7 +147,7 @@ const char * locale_real_names[] = "adzap.zap", "adzap.zap_off", "adzap.zap_to_last_channel", - "adzap.zap_to_strat_channel", + "adzap.zap_to_start_channel", "apidselector.head", "audio.srs_algo", "audio.srs_algo_heavy", diff --git a/src/system/settings.h b/src/system/settings.h index 2a435c54e..79154e161 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -885,7 +885,7 @@ struct SNeutrinoSettings int adzap_zapBackPeriod; int adzap_writeData; int adzap_zapOnActivation; - enum{ADZAP_ZAP_OFF,ADZAP_ZAP_TO_LAST,ADZAP_ZAP_TO_STRAT}; + enum{ADZAP_ZAP_OFF,ADZAP_ZAP_TO_LAST,ADZAP_ZAP_TO_START}; int power_standby; int hdd_sleep;