Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)



------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -753,6 +753,7 @@ fontmenu.scaling_x_hint2 Horizontal (in %) min 50 / max 200
 fontmenu.scaling_y Vertikal (in %)
 fontmenu.scaling_y_hint2 Vertikal (in %) min 50 / max 200
 fontmenu.sizes Schriftgrößen
+fontsize.button_text Schaltflächen-Text
 fontsize.channel_num_zap Direktauswahl
 fontsize.channellist Kanalliste
 fontsize.channellist_descr Beschreibung

data/locale/english.locale

@@ -753,6 +753,7 @@ fontmenu.scaling_x_hint2 Horizontal (in %) min 50 / max 200
 fontmenu.scaling_y Vertical (in %)
 fontmenu.scaling_y_hint2 Vertical (in %) min 50 / max 200
 fontmenu.sizes Font sizes
+fontsize.button_text Button text
 fontsize.channel_num_zap direct selection
 fontsize.channellist Channellist
 fontsize.channellist_descr Description

data/locale/nederlands.locale

@@ -665,6 +665,7 @@ fontmenu.scaling_x_hint2 Horizontaal (in %) min 50 / max 200
 fontmenu.scaling_y Verticaal (in %)
 fontmenu.scaling_y_hint2 Verticaal (in %) min 50 / max 200
 fontmenu.sizes Lettertype grootte
+fontsize.button_text Button text
 fontsize.channel_num_zap directe selectie
 fontsize.channellist Kanalenlijst
 fontsize.channellist_descr Omschrijving

data/locale/slovak.locale

@@ -712,6 +712,7 @@ fontmenu.scaling_x_hint2 Vodorovne (v %) min 50 / max 200
 fontmenu.scaling_y Zvislo (v %)
 fontmenu.scaling_y_hint2 Zvislo (v %) min 50 / max 200
 fontmenu.sizes Veľkosti písma
+fontsize.button_text Button text
 fontsize.channel_num_zap Priamy výber
 fontsize.channellist Zoznam kanálov
 fontsize.channellist_descr Popis