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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 848ca904f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-28 14:31:38 +02:00
parent 7797a02a19 cf82a4e8a8
commit 8815c20c50
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/epgview.cpp
View File

@@ -1269,12 +1269,12 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
//NI //NI
std::string tmp_msg; std::string tmp_msg;
tmp_msg = g_Locale->getText(LOCALE_ADZAP); tmp_msg = g_Locale->getText(LOCALE_WORD_IN);
tmp_msg += " in "; tmp_msg += " ";
tmp_msg += to_string(g_settings.adzap_zapBackPeriod / 60); tmp_msg += to_string(g_settings.adzap_zapBackPeriod / 60);
tmp_msg += " "; tmp_msg += " ";
tmp_msg += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE); tmp_msg += g_Locale->getText(LOCALE_UNIT_SHORT_MINUTE);
ShowMsg(tmp_msg, "", CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); ShowMsg(LOCALE_ADZAP, tmp_msg, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
} }
//CTimerdClient timerdclient; //CTimerdClient timerdclient;
else if (g_Timerd->isTimerdAvailable()) else if (g_Timerd->isTimerdAvailable())