mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 17:31:11 +02:00
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
src/gui/moviebrowser.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -768,6 +768,7 @@ fontsize.infobar_info Info
|
||||
fontsize.infobar_number Nummer
|
||||
fontsize.infobar_small Klein
|
||||
fontsize.menu Menütext
|
||||
fontsize.menu_foot Fußleiste (in allen GUI-Elementen)
|
||||
fontsize.menu_hint Menü-Hilfe
|
||||
fontsize.menu_info Menüinfo
|
||||
fontsize.menu_title Menütitel
|
||||
|
@@ -768,6 +768,7 @@ fontsize.infobar_info info
|
||||
fontsize.infobar_number Number
|
||||
fontsize.infobar_small Small
|
||||
fontsize.menu Menu text
|
||||
fontsize.menu_foot Footer (in all GUI elements)
|
||||
fontsize.menu_hint Menu hints
|
||||
fontsize.menu_info Menu Info
|
||||
fontsize.menu_title Menu Title
|
||||
|
Reference in New Issue
Block a user