Revert "- movieplayer: ask before stop temporary timeshift"

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

View File

@@ -1886,7 +1886,6 @@ recordingmenu.multimenu.info_stop_all %d von %d Aufnahmen werden beendet.
recordingmenu.multimenu.rec_akt Aufnahme aktueller Kanal
recordingmenu.multimenu.stop_all Alle Aufnahmen beenden
recordingmenu.multimenu.timeshift Timeshift
recordingmenu.multimenu.timeshift.stop Zeitversetztes Fernsehen beenden?
recordingmenu.off aus
recordingmenu.record_is_not_running Keine laufende Aufnahme verfügbar!
recordingmenu.record_is_running Aufnahme läuft!

View File

@@ -1882,7 +1882,6 @@ recordingmenu.multimenu.info_stop_all %d of %d recordings will be stopped.
recordingmenu.multimenu.rec_akt record current channel
recordingmenu.multimenu.stop_all stop all recordings
recordingmenu.multimenu.timeshift Timeshift
recordingmenu.multimenu.timeshift.stop Stop timeshift?
recordingmenu.off off
recordingmenu.record_is_not_running No record is running!
recordingmenu.record_is_running Record is running!