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

Revert "- movieplayer: ask before stop temporary timeshift"

Browse Source 
This reverts commit 3ee1d987a2.

Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed6816068c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-10-01 16:09:46 +04:00
parent 511f4ba3c5
commit 0aee7a5f08
5 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/locals.h
View File

@@ -1909,7 +1909,6 @@ typedef enum
LOCALE_RECORDINGMENU_MULTIMENU_REC_AKT,
LOCALE_RECORDINGMENU_MULTIMENU_STOP_ALL,
LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT,
LOCALE_RECORDINGMENU_MULTIMENU_TIMESHIFT_STOP,
LOCALE_RECORDINGMENU_OFF,
LOCALE_RECORDINGMENU_RECORD_IS_NOT_RUNNING,
LOCALE_RECORDINGMENU_RECORD_IS_RUNNING,

1
src/system/locals_intern.h
View File

@@ -1909,7 +1909,6 @@ const char * locale_real_names[] =
"recordingmenu.multimenu.rec_akt",
"recordingmenu.multimenu.stop_all",
"recordingmenu.multimenu.timeshift",
"recordingmenu.multimenu.timeshift.stop",
"recordingmenu.off",
"recordingmenu.record_is_not_running",
"recordingmenu.record_is_running",