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

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/osd_setup.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)



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

src/driver/fb_accel.h

@@ -108,6 +108,7 @@ class CFbAccelCSHD1
 		void setBlendLevel(int);
 		void add_gxa_sync_marker(void);
 		void setupGXA(void);
+		void setOsdResolutions();
 };
 
 class CFbAccelCSHD2
@@ -127,6 +128,9 @@ class CFbAccelCSHD2
 		void blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff);
 		void setBlendMode(uint8_t);
 		void setBlendLevel(int);
+		int scaleFont(int size);
+		bool fullHdAvailable();
+		void setOsdResolutions();
 };
 
 class CFbAccelGLFB