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

fix 44fb2039e1f0fc6dd10352014bed69a66d217eae typo

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d6073de4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-04-28 (Sun, 28 Apr 2019)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2019-04-28 00:32:34 +02:00
committed by vanhofen
parent 03203eead3
commit 653c1004df
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/locale/deutsch.locale
View File

@@ -120,7 +120,7 @@ adzap.writedata Schreibe Status-Daten
adzap.zap Zap bei der Timer Aktivierung auf adzap.zap Zap bei der Timer Aktivierung auf
adzap.zap_off nicht adzap.zap_off nicht
adzap.zap_to_last_channel Letzter-Kanal adzap.zap_to_last_channel Letzter-Kanal
adzap.zap_to_strat_channel Start-Kanal adzap.zap_to_start_channel Start-Kanal
apidselector.head Sprachauswahl apidselector.head Sprachauswahl
audio.srs_algo Art audio.srs_algo Art
audio.srs_algo_heavy stark audio.srs_algo_heavy stark
@@ -1156,7 +1156,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 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_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_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 Audioplayer
menu.hint_aplay_setup Ändern Sie Audioplayer-Einstellungen wie Titel-Anzeige, Startverzeichnis oder Bildschirmschoner. 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. menu.hint_audio Audio-Ausgang, Dolby Digital und SRS TruVolume Optionen usw.

4
data/locale/english.locale
View File

@@ -120,7 +120,7 @@ adzap.writedata Write status data
adzap.zap zap on timer activation to adzap.zap zap on timer activation to
adzap.zap_off off adzap.zap_off off
adzap.zap_to_last_channel last-channel 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 apidselector.head Select language
audio.srs_algo Type audio.srs_algo Type
audio.srs_algo_heavy Heavy audio.srs_algo_heavy Heavy
@@ -1156,7 +1156,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 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_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_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 Audio player
menu.hint_aplay_setup Change title display, start directory, screen saver etc. menu.hint_aplay_setup Change title display, start directory, screen saver etc.
menu.hint_audio Audio output, DD\nSRS True volume options menu.hint_audio Audio output, DD\nSRS True volume options

2
src/gui/adzap.cpp
View File

@@ -323,7 +323,7 @@ void CAdZapMenu::ShowMenu()
{ {
{ SNeutrinoSettings::ADZAP_ZAP_OFF,LOCALE_ADZAP_ZAP_OFF}, { SNeutrinoSettings::ADZAP_ZAP_OFF,LOCALE_ADZAP_ZAP_OFF},
{ SNeutrinoSettings::ADZAP_ZAP_TO_LAST,LOCALE_ADZAP_ZAP_TO_LAST_CHANNEL}, { 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; bool show_monitor = monitorLifeTime.tv_sec;

2
src/gui/epgview.cpp
View File

@@ -1280,7 +1280,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) if(g_settings.adzap_zapOnActivation == SNeutrinoSettings::ADZAP_ZAP_TO_LAST)
CNeutrinoApp::getInstance()->channelList->numericZap(g_settings.key_lastchannel); 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(); int mode = CNeutrinoApp::getInstance()->getMode();
bool isRadioMode = (mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_webradio); 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; const t_channel_id cur_channel_id = isRadioMode ? g_settings.startchannelradio_id : g_settings.startchanneltv_id;

2
src/system/locals.h
View File

@@ -147,7 +147,7 @@ typedef enum
LOCALE_ADZAP_ZAP, LOCALE_ADZAP_ZAP,
LOCALE_ADZAP_ZAP_OFF, LOCALE_ADZAP_ZAP_OFF,
LOCALE_ADZAP_ZAP_TO_LAST_CHANNEL, LOCALE_ADZAP_ZAP_TO_LAST_CHANNEL,
LOCALE_ADZAP_ZAP_TO_STRAT_CHANNEL, LOCALE_ADZAP_ZAP_TO_START_CHANNEL,
LOCALE_APIDSELECTOR_HEAD, LOCALE_APIDSELECTOR_HEAD,
LOCALE_AUDIO_SRS_ALGO, LOCALE_AUDIO_SRS_ALGO,
LOCALE_AUDIO_SRS_ALGO_HEAVY, LOCALE_AUDIO_SRS_ALGO_HEAVY,

2
src/system/locals_intern.h
View File

@@ -147,7 +147,7 @@ const char * locale_real_names[] =
"adzap.zap", "adzap.zap",
"adzap.zap_off", "adzap.zap_off",
"adzap.zap_to_last_channel", "adzap.zap_to_last_channel",
"adzap.zap_to_strat_channel", "adzap.zap_to_start_channel",
"apidselector.head", "apidselector.head",
"audio.srs_algo", "audio.srs_algo",
"audio.srs_algo_heavy", "audio.srs_algo_heavy",

2
src/system/settings.h
View File

@@ -880,7 +880,7 @@ struct SNeutrinoSettings
int adzap_zapBackPeriod; int adzap_zapBackPeriod;
int adzap_writeData; int adzap_writeData;
int adzap_zapOnActivation; 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 power_standby;
int hdd_sleep; int hdd_sleep;