gui/channellist: make displaying channel numbers optional

Conflicts:
	data/locale/deutsch.locale
	src/gui/channellist.cpp
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 94e6cf9a25
Author: martii <m4rtii@gmx.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)



------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-07-19 20:09:13 +02:00
committed by [CST] Focus
parent 18b1cc817d
commit 821c34add7
8 changed files with 24 additions and 5 deletions

View File

@@ -275,6 +275,7 @@ typedef enum
LOCALE_CHANNELLIST_RESET_FLAGS,
LOCALE_CHANNELLIST_SATS,
LOCALE_CHANNELLIST_SHOW_CHANNELLOGO,
LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER,
LOCALE_CHANNELLIST_SINCE,
LOCALE_CHANNELLIST_START,
LOCALE_CI_CLOCK,
@@ -869,6 +870,7 @@ typedef enum
LOCALE_MENU_HINT_CHANNELLIST_MODE_RADIO,
LOCALE_MENU_HINT_CHANNELLIST_SETUP,
LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO,
LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER,
LOCALE_MENU_HINT_CHANNELS,
LOCALE_MENU_HINT_CI,
LOCALE_MENU_HINT_CLOCK_BACKGROUND,