mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
Conflicts: data/locale/deutsch.locale data/locale/english.locale src/neutrino.cpp src/system/locals.h src/system/locals_intern.h src/system/settings.h Signed-off-by: Thilo Graf <dbt@novatux.de>