mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-02 10:21:10 +02:00
Conflicts: data/locale/deutsch.locale data/locale/english.locale src/gui/moviebrowser.cpp src/system/locals.h src/system/locals_intern.h