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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-16 13:01:20 +02:00
parent 308f44a17b af4f69402f
commit bee773c61a
20 changed files with 5 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/system/locals.h
View File

@@ -377,9 +377,6 @@ typedef enum
LOCALE_COLORCHOOSER_BLUE,
LOCALE_COLORCHOOSER_GREEN,
LOCALE_COLORCHOOSER_RED,
LOCALE_COLORCHOOSER_SAVE,
LOCALE_COLORMENU_ADVANCED_MODE_OFF,
LOCALE_COLORMENU_ADVANCED_MODE_ON,
LOCALE_COLORMENU_BACKGROUND,
LOCALE_COLORMENU_CLOCK_TEXTCOLOR,
LOCALE_COLORMENU_FADE,
@@ -549,7 +546,6 @@ typedef enum
LOCALE_EXTRA_KEY_PIP_CLOSE,
LOCALE_EXTRA_KEY_PIP_SETUP,
LOCALE_EXTRA_KEY_PIP_SWAP,
LOCALE_EXTRA_KEY_PLUGIN,
LOCALE_EXTRA_KEY_RECORD,
LOCALE_EXTRA_KEY_SCREENSHOT,
LOCALE_EXTRA_KEY_SWITCHFORMAT,
@@ -594,7 +590,6 @@ typedef enum
LOCALE_EXTRA_TP_DELSYS_DSS,
LOCALE_EXTRA_TP_DELSYS_DTMB,
LOCALE_EXTRA_TP_DELSYS_DVBC,
LOCALE_EXTRA_TP_DELSYS_DVBC2,
LOCALE_EXTRA_TP_DELSYS_DVBS,
LOCALE_EXTRA_TP_DELSYS_DVBS2,
LOCALE_EXTRA_TP_DELSYS_DVBT,
@@ -661,7 +656,6 @@ typedef enum
LOCALE_EXTRA_ZAP_CYCLE,
LOCALE_EXTRA_ZAPIT_FE_TIMEOUT,
LOCALE_EXTRA_ZAPIT_HVOLTAGE,
LOCALE_EXTRA_ZAPIT_MAKE_BOUQUET,
LOCALE_EXTRA_ZAPIT_MOTOR_SPEED,
LOCALE_EXTRA_ZAPIT_SCANPIDS,
LOCALE_EXTRA_ZAPIT_SDT_CHANGED,
@@ -733,7 +727,6 @@ typedef enum
LOCALE_FLASHUPDATE_GETINFOFILEERROR,
LOCALE_FLASHUPDATE_GETUPDATEFILE,
LOCALE_FLASHUPDATE_GETUPDATEFILEERROR,
LOCALE_FLASHUPDATE_GLOBALPROGRESS,
LOCALE_FLASHUPDATE_HEAD,
LOCALE_FLASHUPDATE_INSTALL_IMAGE,
LOCALE_FLASHUPDATE_INSTALL_PACKAGE,
@@ -745,7 +738,6 @@ typedef enum
LOCALE_FLASHUPDATE_MKFS_PREPARING_FILES,
LOCALE_FLASHUPDATE_MKFS_USING_SUMTOOL,
LOCALE_FLASHUPDATE_MSGBOX,
LOCALE_FLASHUPDATE_MSGBOX_MANUAL,
LOCALE_FLASHUPDATE_MTDSELECTOR,
LOCALE_FLASHUPDATE_NAMEMODE1,
LOCALE_FLASHUPDATE_NAMEMODE1_DEFAULT,
@@ -794,7 +786,6 @@ typedef enum
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_ERROR,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_PROCESSED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SKIPPED,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SUCCESSFULLY,
LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_WARNING,
LOCALE_FLASHUPDATE_UPDATEMODE,
LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET,
@@ -870,7 +861,6 @@ typedef enum
LOCALE_HDD_ALLOW_SET_RECDIR,
LOCALE_HDD_CHECK,
LOCALE_HDD_CHECK_FAILED,
LOCALE_HDD_CHECK_FORMAT_BAD,
LOCALE_HDD_EXTENDED_SETTINGS,
LOCALE_HDD_FAST,
LOCALE_HDD_FORMAT,
@@ -878,7 +868,6 @@ typedef enum
LOCALE_HDD_FORMAT_ON_MOUNT_FAILED,
LOCALE_HDD_FORMAT_WARN,
LOCALE_HDD_FS,
LOCALE_HDD_FS_UNKNOWN,
LOCALE_HDD_INFO_CAPACITY,
LOCALE_HDD_INFO_FIRMWARE,
LOCALE_HDD_INFO_HEAD,
@@ -900,7 +889,6 @@ typedef enum
LOCALE_HDD_NOISE,
LOCALE_HDD_NOT_FOUND,
LOCALE_HDD_POWER,
LOCALE_HDD_REMOVABLE_DEVICE,
LOCALE_HDD_SET_RECDIR,
LOCALE_HDD_SETTINGS,
LOCALE_HDD_SLEEP,
@@ -979,13 +967,11 @@ typedef enum
LOCALE_INFOVIEWER_NOEPG,
LOCALE_INFOVIEWER_NOTAVAILABLE,
LOCALE_INFOVIEWER_NOW,
LOCALE_INFOVIEWER_SELECTTIME,
LOCALE_INFOVIEWER_SUBCHAN_DISP_POS,
LOCALE_INFOVIEWER_SUBCHAN_INFOBAR,
LOCALE_INFOVIEWER_WAITTIME,
LOCALE_IPSETUP_HINT_1,
LOCALE_IPSETUP_HINT_2,
LOCALE_KEYBINDINGMENU_RC,
LOCALE_KEYBINDINGMENU_ADDRECORD,
LOCALE_KEYBINDINGMENU_ADDREMIND,
LOCALE_KEYBINDINGMENU_ALLCHANNELS_ON_OK,
@@ -1147,7 +1133,6 @@ typedef enum
LOCALE_MENU_HINT_A_PIC,
LOCALE_MENU_HINT_ADZAP,
LOCALE_MENU_HINT_ADZAP_ACTIVE,
LOCALE_MENU_HINT_ADZAP_SETUP,
LOCALE_MENU_HINT_ADZAP_WRITEDATA,
LOCALE_MENU_HINT_APLAY,
LOCALE_MENU_HINT_APLAY_SETUP,
@@ -1322,7 +1307,6 @@ typedef enum
LOCALE_MENU_HINT_KEEP_NUMBERS,
LOCALE_MENU_HINT_KEY_ADDRECORD,
LOCALE_MENU_HINT_KEY_ADDREMIND,
LOCALE_MENU_HINT_KEY_AUDIO,
LOCALE_MENU_HINT_KEY_BINDING,
LOCALE_MENU_HINT_KEY_BOUQUETDOWN,
LOCALE_MENU_HINT_KEY_BOUQUETUP,
@@ -1357,8 +1341,6 @@ typedef enum
LOCALE_MENU_HINT_KEY_PIC_SIZE_ACTIVE,
LOCALE_MENU_HINT_KEY_PIP_CLOSE,
LOCALE_MENU_HINT_KEY_PIP_SETUP,
LOCALE_MENU_HINT_KEY_PIP_SWAP,
LOCALE_MENU_HINT_KEY_PLUGIN,
LOCALE_MENU_HINT_KEY_POWEROFF,
LOCALE_MENU_HINT_KEY_QUICKZAP,
LOCALE_MENU_HINT_KEY_RECORD,
@@ -1807,7 +1789,6 @@ typedef enum
LOCALE_MISCSETTINGS_INFOCLOCK,
LOCALE_MISCSETTINGS_ONLINESERVICES,
LOCALE_MISCSETTINGS_PROGRESSBAR,
LOCALE_MISCSETTINGS_PROGRESSBAR_COLOR,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_0,
LOCALE_MISCSETTINGS_PROGRESSBAR_DESIGN_1,
@@ -1918,7 +1899,6 @@ typedef enum
LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO1,
LOCALE_MOVIEBROWSER_EDIT_BOOK_TYPE_INFO2,
LOCALE_MOVIEBROWSER_EDIT_SERIE,
LOCALE_MOVIEBROWSER_ERROR_NO_MOVIES,
LOCALE_MOVIEBROWSER_FILTER_OFF,
LOCALE_MOVIEBROWSER_FOOT_FILTER,
LOCALE_MOVIEBROWSER_FOOT_FOCUS,
@@ -1989,7 +1969,6 @@ typedef enum
LOCALE_MOVIEBROWSER_MENU_CUT,
LOCALE_MOVIEBROWSER_MENU_CUT_HEAD,
LOCALE_MOVIEBROWSER_MENU_DIRECTORIES_HEAD,
LOCALE_MOVIEBROWSER_MENU_HELP_HEAD,
LOCALE_MOVIEBROWSER_MENU_MAIN_BOOKMARKS,
LOCALE_MOVIEBROWSER_MENU_MAIN_HEAD,
LOCALE_MOVIEBROWSER_MENU_NFS_HEAD,
@@ -2056,7 +2035,6 @@ typedef enum
LOCALE_MOVIEBROWSER_YT_MAX_RESULTS,
LOCALE_MOVIEBROWSER_YT_MOST_POPULAR,
LOCALE_MOVIEBROWSER_YT_MOST_POPULAR_ALL_TIME,
LOCALE_MOVIEBROWSER_YT_NEXT_RESULTS,
LOCALE_MOVIEBROWSER_YT_ORDERBY,
LOCALE_MOVIEBROWSER_YT_ORDERBY_PUBLISHED,
LOCALE_MOVIEBROWSER_YT_ORDERBY_RATING,
@@ -2064,8 +2042,6 @@ typedef enum
LOCALE_MOVIEBROWSER_YT_ORDERBY_VIEWCOUNT,
LOCALE_MOVIEBROWSER_YT_PENDING,
LOCALE_MOVIEBROWSER_YT_PREF_QUALITY,
LOCALE_MOVIEBROWSER_YT_PREV_RESULTS,
LOCALE_MOVIEBROWSER_YT_RECENTLY_FEATURED,
LOCALE_MOVIEBROWSER_YT_REGION,
LOCALE_MOVIEBROWSER_YT_RELATED,
LOCALE_MOVIEBROWSER_YT_SEARCH,
@@ -2284,7 +2260,6 @@ typedef enum
LOCALE_PERSONALIZE_PINSTATUS,
LOCALE_PERSONALIZE_PLUGINS,
LOCALE_PERSONALIZE_USERMENU_PLUGIN_TYPES,
LOCALE_PERSONALIZE_USERMENU_PREFERRED_BUTTONS,
LOCALE_PERSONALIZE_USERMENU_SHOW_CANCEL,
LOCALE_PERSONALIZE_VISIBLE,
LOCALE_PICTUREVIEWER_DEFDIR,
@@ -2445,11 +2420,6 @@ typedef enum
LOCALE_SATSETUP_FASTSCAN_SD,
LOCALE_SATSETUP_FASTSCAN_TYPE,
LOCALE_SATSETUP_FASTSCAN_UPDATE,
LOCALE_SATSETUP_FE_DELSYS_MODE,
LOCALE_SATSETUP_FE_DELSYS_MODE_AUTO,
LOCALE_SATSETUP_FE_DELSYS_MODE_CABLE,
LOCALE_SATSETUP_FE_DELSYS_MODE_SAT,
LOCALE_SATSETUP_FE_DELSYS_MODE_TERRESTRIAL,
LOCALE_SATSETUP_FE_MODE,
LOCALE_SATSETUP_FE_MODE_INDEPENDENT,
LOCALE_SATSETUP_FE_MODE_LINK_LOOP,
@@ -2515,7 +2485,6 @@ typedef enum
LOCALE_SCANTS_NUMBEROFTOTALSERVICES,
LOCALE_SCANTS_NUMBEROFTVSERVICES,
LOCALE_SCANTS_PREVERENCES_RECEIVING_SYSTEM,
LOCALE_SCANTS_PREVERENCES_SCAN,
LOCALE_SCANTS_PROVIDER,
LOCALE_SCANTS_SELECT_TP,
LOCALE_SCANTS_STARTNOW,
@@ -2695,17 +2664,11 @@ typedef enum
LOCALE_TIMERLIST_WEEKDAYS_HINT_2,
LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_1,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_2,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_BEFORE,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_BEFORE_HINT_1,
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_BEFORE_HINT_2,
LOCALE_TIMERSETTINGS_SEPARATOR,
LOCALE_TIMING_CHANLIST,
LOCALE_TIMING_EPG,
LOCALE_TIMING_FILEBROWSER,
LOCALE_TIMING_HINT_1,
LOCALE_TIMING_HINT_2,
LOCALE_TIMING_INFOBAR,
LOCALE_TIMING_INFOBAR_MOVIEPLAYER,
LOCALE_TIMING_INFOBAR_RADIO,
@@ -2746,7 +2709,6 @@ typedef enum
LOCALE_USERMENU_KEY,
LOCALE_USERMENU_KEY_SELECT,
LOCALE_USERMENU_MSG_INFO_IS_EMPTY,
LOCALE_USERMENU_MSG_WARNING_NAME,
LOCALE_USERMENU_MSG_WARNING_NO_ITEMS,
LOCALE_USERMENU_NAME,
LOCALE_USERMENU_TITLE_BLUE,
@@ -2802,8 +2764,6 @@ typedef enum
LOCALE_VIDEOMENU_SHARPNESS,
LOCALE_VIDEOMENU_TV_SCART,
LOCALE_VIDEOMENU_VCRSIGNAL,
LOCALE_VIDEOMENU_VCRSIGNAL_COMPOSITE,
LOCALE_VIDEOMENU_VCRSIGNAL_SVIDEO,
LOCALE_VIDEOMENU_VIDEOFORMAT,
LOCALE_VIDEOMENU_VIDEOFORMAT_149,
LOCALE_VIDEOMENU_VIDEOFORMAT_169,