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 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-29 08:05:10 +02:00
parent f867d99444 3a34afe94e
commit 1a928cce60
14 changed files with 258 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -2584,8 +2584,10 @@ typedef enum
LOCALE_STREAMINFO_FRAMERATE_UNKNOWN,
LOCALE_STREAMINFO_HEAD,
LOCALE_STREAMINFO_NOT_AVAILABLE,
LOCALE_STREAMINFO_OSD_RESOLUTION,
LOCALE_STREAMINFO_RESOLUTION,
LOCALE_STREAMINFO_SIGNAL,
LOCALE_STREAMINFO_VIDEOSYSTEM,
LOCALE_STREAMING_BUSY,
LOCALE_STREAMING_DIR_NOT_WRITABLE,
LOCALE_STREAMING_OVERFLOW,

2
src/system/locals_intern.h
View File

@@ -2584,8 +2584,10 @@ const char * locale_real_names[] =
"streaminfo.framerate_unknown",
"streaminfo.head",
"streaminfo.not_available",
"streaminfo.osd_resolution",
"streaminfo.resolution",
"streaminfo.signal",
"streaminfo.videosystem",
"streaming.busy",
"streaming.dir_not_writable",
"streaming.overflow",