vanhofen c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

2017-09-12 22:32:07 +02:00

..

helpers

fix create-locals-work helper script

2016-05-13 19:14:17 +02:00

unmaintained

Remove obsolete 'contrast_fonts' code from osd menu

2017-01-31 16:36:40 +01:00

_readme.txt

add and use LOCALEDIR variable; move LOCALEDIR_VAR to global.h

2015-05-06 22:58:54 +02:00

deutsch.locale

network-setup: small changes in locales; move npt-at-boot item up

2017-09-12 22:30:35 +02:00

english.locale

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

2017-09-12 22:32:07 +02:00

Makefile.am

Merge branch 'ni/mp' into ni/cst-next

2016-08-26 19:13:47 +02:00

nederlands.locale

Remove obsolete 'contrast_fonts' code from osd menu

2017-01-31 16:36:40 +01:00

slovak.locale

Update slovak.locale

2017-03-15 09:32:43 +01:00