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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

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: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-06-02 21:42:10 +02:00
parent d9980f2d87 8e429f9e6a
commit cec7e5b8bb
12 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/locals.h
View File

@@ -1439,6 +1439,7 @@ typedef enum
LOCALE_MENU_HINT_PROTECTION,
LOCALE_MENU_HINT_RADIOMODE,
LOCALE_MENU_HINT_REBOOT,
LOCALE_MENU_HINT_RECORD_ALREADY_FOUND_CHECK,
LOCALE_MENU_HINT_RECORD_APID_AC3,
LOCALE_MENU_HINT_RECORD_APID_ALT,
LOCALE_MENU_HINT_RECORD_APID_STD,
@@ -2270,6 +2271,8 @@ typedef enum
LOCALE_RCLOCK_LOCKMSG,
LOCALE_RCLOCK_TITLE,
LOCALE_RCLOCK_UNLOCKMSG,
LOCALE_RECORDING_ALREADY_FOUND,
LOCALE_RECORDING_ALREADY_FOUND_CHECK,
LOCALE_RECORDING_END,
LOCALE_RECORDING_END_TEXT,
LOCALE_RECORDING_FILL_TEXT,
@@ -2280,6 +2283,7 @@ typedef enum
LOCALE_RECORDING_TIME_HOUR,
LOCALE_RECORDING_TIME_HOURS,
LOCALE_RECORDING_TIME_MIN,
LOCALE_RECORDINGMENU_ALREADY_FOUND_CHECK,
LOCALE_RECORDINGMENU_APIDS,
LOCALE_RECORDINGMENU_APIDS_AC3,
LOCALE_RECORDINGMENU_APIDS_ALT,