mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +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
------------------
Commit: 796bd79e0e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-06-02 (Thu, 02 Jun 2016)
This commit is contained in:
vanhofen
2016-06-02 21:42:10 +02:00
parent 5e86e01527 2c239533a6
commit cc0f541291
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_intern.h
View File

@@ -1439,6 +1439,7 @@ const char * locale_real_names[] =
"menu.hint_protection",
"menu.hint_radiomode",
"menu.hint_reboot",
"menu.hint_record_already_found_check",
"menu.hint_record_apid_ac3",
"menu.hint_record_apid_alt",
"menu.hint_record_apid_std",
@@ -2270,6 +2271,8 @@ const char * locale_real_names[] =
"rclock.lockmsg",
"rclock.title",
"rclock.unlockmsg",
"recording.already_found",
"recording.already_found_check",
"recording.end",
"recording.end_text",
"recording.fill_text",
@@ -2280,6 +2283,7 @@ const char * locale_real_names[] =
"recording.time_hour",
"recording.time_hours",
"recording.time_min",
"recordingmenu.already_found_check",
"recordingmenu.apids",
"recordingmenu.apids_ac3",
"recordingmenu.apids_alt",