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

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Browse Source 
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2012-12-07 14:39:05 +08:00
parent 92476e7afd e65c2fa303
commit fe727eb954
96 changed files with 960 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/system/locals.h
View File

@@ -238,6 +238,7 @@ typedef enum
LOCALE_CHANNELLIST_FOOT_NEXT,
LOCALE_CHANNELLIST_FOOT_OFF,
LOCALE_CHANNELLIST_FOOT_SORT_ALPHA,
LOCALE_CHANNELLIST_FOOT_SORT_CHNUM,
LOCALE_CHANNELLIST_FOOT_SORT_FREQ,
LOCALE_CHANNELLIST_FOOT_SORT_SAT,
LOCALE_CHANNELLIST_HEAD,
@@ -512,6 +513,7 @@ typedef enum
LOCALE_FLASHUPDATE_SQUASHFS_NOVERSION,
LOCALE_FLASHUPDATE_TITLEREADFLASH,
LOCALE_FLASHUPDATE_TITLEWRITEFLASH,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_DEL_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SUCCESSFULLY,
@@ -776,6 +778,7 @@ typedef enum
LOCALE_MENU_HINT_EPG_MAX_EVENTS,
LOCALE_MENU_HINT_EPG_OLD_EVENTS,
LOCALE_MENU_HINT_EPG_SAVE,
LOCALE_MENU_HINT_EPG_SAVE_STANDBY,
LOCALE_MENU_HINT_EVENT_TEXTCOLOR,
LOCALE_MENU_HINT_EVENTLIST_FONTS,
LOCALE_MENU_HINT_EXTENDED,
@@ -1060,6 +1063,7 @@ typedef enum
LOCALE_MENU_HINT_SLEEPTIMER,
LOCALE_MENU_HINT_SOFT_RESTART,
LOCALE_MENU_HINT_SOFTUPDATE_CHECK,
LOCALE_MENU_HINT_SOFTUPDATE_CHECK_LOCAL,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_READ,
LOCALE_MENU_HINT_SOFTUPDATE_EXPERT_WRITE,
@@ -1127,6 +1131,7 @@ typedef enum
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1,
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
LOCALE_MISCSETTINGS_EPG_SAVE,
LOCALE_MISCSETTINGS_EPG_SAVE_STANDBY,
LOCALE_MISCSETTINGS_GENERAL,
LOCALE_MISCSETTINGS_HEAD,
LOCALE_MISCSETTINGS_INFOBAR,
@@ -1193,6 +1198,7 @@ typedef enum
LOCALE_MOTORCONTROL_TIMED_MODE,
LOCALE_MOTORCONTROL_USER_MENU,
LOCALE_MOTORCONTROL_WEST_LIMIT,
LOCALE_MOVIEBROWSER_ASK_REC_TO_DELETE,
LOCALE_MOVIEBROWSER_BOOK_ADD,
LOCALE_MOVIEBROWSER_BOOK_CLEAR_ALL,
LOCALE_MOVIEBROWSER_BOOK_HEAD,
@@ -1210,6 +1216,7 @@ typedef enum
LOCALE_MOVIEBROWSER_BROWSER_ROW_ITEM,
LOCALE_MOVIEBROWSER_BROWSER_ROW_NR,
LOCALE_MOVIEBROWSER_BROWSER_ROW_WIDTH,
LOCALE_MOVIEBROWSER_DELETE_INFO,
LOCALE_MOVIEBROWSER_DIR,
LOCALE_MOVIEBROWSER_DIR_HEAD,
LOCALE_MOVIEBROWSER_EDIT_BOOK,
@@ -1472,6 +1479,12 @@ typedef enum
LOCALE_PICTUREVIEWER_HELP21,
LOCALE_PICTUREVIEWER_HELP22,
LOCALE_PICTUREVIEWER_HELP3,
LOCALE_PICTUREVIEWER_HELP30,
LOCALE_PICTUREVIEWER_HELP31,
LOCALE_PICTUREVIEWER_HELP32,
LOCALE_PICTUREVIEWER_HELP33,
LOCALE_PICTUREVIEWER_HELP34,
LOCALE_PICTUREVIEWER_HELP35,
LOCALE_PICTUREVIEWER_HELP4,
LOCALE_PICTUREVIEWER_HELP5,
LOCALE_PICTUREVIEWER_HELP6,