mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent 51bbb756e8 d1ca82ab44
commit 48fdfc5e5e
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/osdlang_setup.cpp
View File

@@ -178,7 +178,7 @@ void COsdLangSetup::showLanguageSetup(CMenuWidget *osdl_setup)
{
struct dirent **namelist;
int n;
const char *pfad[] = {DATADIR "/neutrino/locale", CONFIGDIR "/locale"};
const char *pfad[] = {DATADIR "/neutrino/locale", "/var/tuxbox/locale"};
osdl_setup->addIntroItems();