mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 10:21:04 +02:00
check for active downloads before shutting down; indicate dl on vfd
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/driver/lcdd.h
src/driver/simple_display.cpp
src/neutrino.cpp
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3adf2798a
Author: martii <m4rtii@gmx.de>
Date: 2013-12-15 (Sun, 15 Dec 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2074,7 +2074,7 @@ typedef enum
|
||||
LOCALE_SETTINGS_POS_TOP_RIGHT,
|
||||
LOCALE_SETTINGS_RESTORE,
|
||||
LOCALE_SETTINGS_RESTORE_WARN,
|
||||
LOCALE_SHUTDOWN_RECODING_QUERY,
|
||||
LOCALE_SHUTDOWN_RECORDING_QUERY,
|
||||
LOCALE_SHUTDOWNTIMER_ANNOUNCE,
|
||||
LOCALE_SLEEPTIMERBOX_ANNOUNCE,
|
||||
LOCALE_SLEEPTIMERBOX_HINT1,
|
||||
|
Reference in New Issue
Block a user