Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: 98ed3d9448
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-19 (Mon, 19 Dec 2016)
This commit is contained in:
vanhofen
2016-12-19 17:23:28 +01:00
17 changed files with 54 additions and 25 deletions

View File

@@ -21,6 +21,7 @@ install_DATA = \
multimedia.png \
network.png \
personalize.png \
pictureviewer.png \
recording.png \
settings.png \
shell.png \

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

View File

@@ -2688,6 +2688,7 @@ usermenu.title_blue Erweiterungen
usermenu.title_green Tonwahl
usermenu.title_red EPG
usermenu.title_yellow Bildoptionen
usermenus.head Benutzermenüs
video_mode_ok Video-Einstellungen OK?
videomenu.43mode 4:3 Anzeigeverhalten
videomenu.analog_auto AUTO

View File

@@ -2687,6 +2687,7 @@ usermenu.title_blue Features
usermenu.title_green Audio
usermenu.title_red Event-List
usermenu.title_yellow Video
usermenus.head User menus
video_mode_ok Is this video mode working ok ?
videomenu.43mode 4:3 Content mode
videomenu.analog_auto AUTO