mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +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
------------------
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
This commit is contained in:
[CST] Bas
2012-12-07 14:39:05 +08:00
parent 3c24269cc4 b61c736020
commit 375e3056b3
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_intern.h
View File

@@ -238,6 +238,7 @@ const char * locale_real_names[] =
"channellist.foot_next",
"channellist.foot_off",
"channellist.foot_sort_alpha",
"channellist.foot_sort_chnum",
"channellist.foot_sort_freq",
"channellist.foot_sort_sat",
"channellist.head",
@@ -512,6 +513,7 @@ const char * locale_real_names[] =
"flashupdate.squashfs.noversion",
"flashupdate.titlereadflash",
"flashupdate.titlewriteflash",
"flashupdate.update_with_settings_del_skipped",
"flashupdate.update_with_settings_processed",
"flashupdate.update_with_settings_skipped",
"flashupdate.update_with_settings_successfully",
@@ -776,6 +778,7 @@ const char * locale_real_names[] =
"menu.hint_epg_max_events",
"menu.hint_epg_old_events",
"menu.hint_epg_save",
"menu.hint_epg_save_standby",
"menu.hint_event_textcolor",
"menu.hint_eventlist_fonts",
"menu.hint_extended",
@@ -1060,6 +1063,7 @@ const char * locale_real_names[] =
"menu.hint_sleeptimer",
"menu.hint_soft_restart",
"menu.hint_softupdate_check",
"menu.hint_softupdate_check_local",
"menu.hint_softupdate_expert",
"menu.hint_softupdate_expert_read",
"menu.hint_softupdate_expert_write",
@@ -1127,6 +1131,7 @@ const char * locale_real_names[] =
"miscsettings.epg_old_events_hint1",
"miscsettings.epg_old_events_hint2",
"miscsettings.epg_save",
"miscsettings.epg_save_standby",
"miscsettings.general",
"miscsettings.head",
"miscsettings.infobar",
@@ -1193,6 +1198,7 @@ const char * locale_real_names[] =
"motorcontrol.timed_mode",
"motorcontrol.user_menu",
"motorcontrol.west_limit",
"moviebrowser.ask_rec_to_delete",
"moviebrowser.book_add",
"moviebrowser.book_clear_all",
"moviebrowser.book_head",
@@ -1210,6 +1216,7 @@ const char * locale_real_names[] =
"moviebrowser.browser_row_item",
"moviebrowser.browser_row_nr",
"moviebrowser.browser_row_width",
"moviebrowser.delete_info",
"moviebrowser.dir",
"moviebrowser.dir_head",
"moviebrowser.edit_book",
@@ -1472,6 +1479,12 @@ const char * locale_real_names[] =
"pictureviewer.help21",
"pictureviewer.help22",
"pictureviewer.help3",
"pictureviewer.help30",
"pictureviewer.help31",
"pictureviewer.help32",
"pictureviewer.help33",
"pictureviewer.help34",
"pictureviewer.help35",
"pictureviewer.help4",
"pictureviewer.help5",
"pictureviewer.help6",