35 files changed, 62 insertions, 39 deletions

diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
index a33fb24f7..d6045c1a4 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/incdecvolumeoption.cpp
@@ -78,7 +78,7 @@ const QString IncDecVolumeCommandLineOption::name() const
 QTranslator *IncDecVolumeCommandLineOption::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/incdecvolume_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp
index b594b41d1..d9dbb2595 100644
--- a/src/plugins/Effect/bs2b/effectbs2bfactory.cpp
+++ b/src/plugins/Effect/bs2b/effectbs2bfactory.cpp
@@ -20,6 +20,7 @@
 
 #include <QtGui>
 #include <bs2b/bs2bversion.h>
+#include <qmmp/qmmp.h>
 #include "effectbs2bfactory.h"
 #include "settingsdialog.h"
 #include "bs2bplugin.h"
@@ -61,7 +62,7 @@ void EffectBs2bFactory::showAbout(QWidget *parent)
 QTranslator *EffectBs2bFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/bs2b_plugin_") + locale);
     return translator;
 };
diff --git a/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp b/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp
index f7606d641..fc09727b6 100644
--- a/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp
+++ b/src/plugins/Effect/srconverter/effectsrconverterfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "settingsdialog.h"
 #include "effectsrconverterfactory.h"
 #include "srconverter.h"
@@ -55,7 +55,7 @@ void EffectSRConverterFactory::showAbout(QWidget *parent)
 QTranslator *EffectSRConverterFactory::createTranslator(QObject *parent) 
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/srconverter_plugin_") + locale);
     return translator;
 };
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
index dce394398..d496bb0ed 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
+++ b/src/plugins/FileDialogs/QmmpFileDialog/qmmpfiledialog.cpp
@@ -21,7 +21,7 @@
 #include <QtPlugin>
 #include <QTranslator>
 #include <QMessageBox>
-
+#include <qmmp/qmmp.h>
 #include "qmmpfiledialogimpl.h"
 #include "qmmpfiledialog.h"
 
@@ -138,7 +138,7 @@ void QmmpFileDialogFactory::showAbout(QWidget *parent)
 QTranslator *QmmpFileDialogFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/qmmp_file_dialog_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/fileops/fileopsfactory.cpp b/src/plugins/General/fileops/fileopsfactory.cpp
index 09bf0d919..a99e65deb 100644
--- a/src/plugins/General/fileops/fileopsfactory.cpp
+++ b/src/plugins/General/fileops/fileopsfactory.cpp
@@ -55,7 +55,7 @@ void FileOpsFactory::showAbout(QWidget *parent)
 QTranslator *FileOpsFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/fileops_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/hal/halfactory.cpp b/src/plugins/General/hal/halfactory.cpp
index 513f8642a..4c7cfd04b 100644
--- a/src/plugins/General/hal/halfactory.cpp
+++ b/src/plugins/General/hal/halfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "settingsdialog.h"
 #include "halplugin.h"
 #include "halfactory.h"
@@ -57,7 +57,7 @@ void HalFactory::showAbout(QWidget *parent)
 QTranslator *HalFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/hal_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/hotkey/hotkeyfactory.cpp b/src/plugins/General/hotkey/hotkeyfactory.cpp
index afe694fe8..2c469f74f 100644
--- a/src/plugins/General/hotkey/hotkeyfactory.cpp
+++ b/src/plugins/General/hotkey/hotkeyfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "settingsdialog.h"
 #include "hotkeymanager.h"
 #include "hotkeyfactory.h"
@@ -56,7 +56,7 @@ void HotkeyFactory::showAbout(QWidget *parent)
 QTranslator *HotkeyFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/hotkey_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/lyrics/lyricsfactory.cpp b/src/plugins/General/lyrics/lyricsfactory.cpp
index 5f9c29bf2..5fef65803 100644
--- a/src/plugins/General/lyrics/lyricsfactory.cpp
+++ b/src/plugins/General/lyrics/lyricsfactory.cpp
@@ -56,7 +56,7 @@ void LyricsFactory::showAbout(QWidget *parent)
 QTranslator *LyricsFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/lyrics_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/mpris/mprisfactory.cpp b/src/plugins/General/mpris/mprisfactory.cpp
index 6b27fb33d..0d8ae0a28 100644
--- a/src/plugins/General/mpris/mprisfactory.cpp
+++ b/src/plugins/General/mpris/mprisfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "mpris.h"
 #include "mprisfactory.h"
 
@@ -54,7 +54,7 @@ void MPRISFactory::showAbout(QWidget *parent)
 QTranslator *MPRISFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/mpris_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp
index f0da9352a..a1095fccf 100644
--- a/src/plugins/General/notifier/notifierfactory.cpp
+++ b/src/plugins/General/notifier/notifierfactory.cpp
@@ -55,7 +55,7 @@ void NotifierFactory::showAbout(QWidget *parent)
 QTranslator *NotifierFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/notifier_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp
index 69b3d9b82..6491b8b98 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.cpp
+++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp
@@ -55,7 +55,7 @@ void ScrobblerFactory::showAbout(QWidget *parent)
 QTranslator *ScrobblerFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/scrobbler_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp
index dae733dc7..129414cc6 100644
--- a/src/plugins/General/statusicon/statusiconfactory.cpp
+++ b/src/plugins/General/statusicon/statusiconfactory.cpp
@@ -55,7 +55,7 @@ void StatusIconFactory::showAbout(QWidget *parent)
 QTranslator *StatusIconFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/statusicon_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/aac/decoderaacfactory.cpp b/src/plugins/Input/aac/decoderaacfactory.cpp
index dce8c0ef4..7e3926687 100644
--- a/src/plugins/Input/aac/decoderaacfactory.cpp
+++ b/src/plugins/Input/aac/decoderaacfactory.cpp
@@ -95,7 +95,7 @@ void DecoderAACFactory::showAbout(QWidget *parent)
 QTranslator *DecoderAACFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/aac_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
index 838ada717..ac846f069 100644
--- a/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
+++ b/src/plugins/Input/cdaudio/decodercdaudiofactory.cpp
@@ -92,7 +92,7 @@ void DecoderCDAudioFactory::showAbout(QWidget *parent)
 QTranslator *DecoderCDAudioFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/cdaudio_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/cue/decodercuefactory.cpp b/src/plugins/Input/cue/decodercuefactory.cpp
index 0aeaa1f1c..ac057db9b 100644
--- a/src/plugins/Input/cue/decodercuefactory.cpp
+++ b/src/plugins/Input/cue/decodercuefactory.cpp
@@ -89,7 +89,7 @@ void DecoderCUEFactory::showAbout(QWidget *parent)
 QTranslator *DecoderCUEFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/cue_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 00930f864..f8ddb4733 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -164,7 +164,7 @@ void DecoderFFmpegFactory::showAbout(QWidget *parent)
 QTranslator *DecoderFFmpegFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/ffmpeg_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp
index c1be22805..5e953f851 100644
--- a/src/plugins/Input/flac/decoderflacfactory.cpp
+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
@@ -125,7 +125,7 @@ void DecoderFLACFactory::showAbout(QWidget *parent)
 QTranslator *DecoderFLACFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/flac_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index b0efdc1d6..2574cd028 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -221,7 +221,7 @@ void DecoderMADFactory::showAbout(QWidget *parent)
 QTranslator *DecoderMADFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/mad_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/modplug/decodermodplugfactory.cpp b/src/plugins/Input/modplug/decodermodplugfactory.cpp
index 3d8f5c91a..dc913e654 100644
--- a/src/plugins/Input/modplug/decodermodplugfactory.cpp
+++ b/src/plugins/Input/modplug/decodermodplugfactory.cpp
@@ -143,7 +143,7 @@ void DecoderModPlugFactory::showAbout(QWidget *parent)
 QTranslator *DecoderModPlugFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/modplug_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp
index 6d17179f6..a5d8efb5b 100644
--- a/src/plugins/Input/mpc/decodermpcfactory.cpp
+++ b/src/plugins/Input/mpc/decodermpcfactory.cpp
@@ -108,7 +108,7 @@ void DecoderMPCFactory::showAbout(QWidget *parent)
 QTranslator *DecoderMPCFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/mpc_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/mplayer/decodermplayerfactory.cpp b/src/plugins/Input/mplayer/decodermplayerfactory.cpp
index 28f81663b..15db7cd34 100644
--- a/src/plugins/Input/mplayer/decodermplayerfactory.cpp
+++ b/src/plugins/Input/mplayer/decodermplayerfactory.cpp
@@ -100,7 +100,7 @@ void DecoderMplayerFactory::showAbout(QWidget *parent)
 QTranslator *DecoderMplayerFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/mplayer_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/sndfile/decodersndfilefactory.cpp b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
index 3202a39c7..cce4e9801 100644
--- a/src/plugins/Input/sndfile/decodersndfilefactory.cpp
+++ b/src/plugins/Input/sndfile/decodersndfilefactory.cpp
@@ -142,7 +142,7 @@ void DecoderSndFileFactory::showAbout(QWidget *parent)
 QTranslator *DecoderSndFileFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/sndfile_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index c19bd4882..124b001e7 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -120,7 +120,7 @@ void DecoderVorbisFactory::showAbout(QWidget *parent)
 QTranslator *DecoderVorbisFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/vorbis_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
index ac4aafbb0..30dd24bf3 100644
--- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
+++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp
@@ -136,7 +136,7 @@ void DecoderWavPackFactory::showAbout(QWidget *parent)
 QTranslator *DecoderWavPackFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/wavpack_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp
index a708d9df0..c2f8711e5 100644
--- a/src/plugins/Output/alsa/outputalsafactory.cpp
+++ b/src/plugins/Output/alsa/outputalsafactory.cpp
@@ -61,7 +61,7 @@ void OutputALSAFactory::showAbout(QWidget *parent)
 QTranslator *OutputALSAFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/alsa_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index fbbe6f135..2a9709e5e 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -53,7 +53,7 @@ void OutputJACKFactory::showAbout(QWidget *parent)
 QTranslator *OutputJACKFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/jack_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Output/oss/outputossfactory.cpp b/src/plugins/Output/oss/outputossfactory.cpp
index 529f065bb..d47f6607a 100644
--- a/src/plugins/Output/oss/outputossfactory.cpp
+++ b/src/plugins/Output/oss/outputossfactory.cpp
@@ -62,7 +62,7 @@ QMessageBox::about (parent, tr("About OSS Output Plugin"),
 QTranslator *OutputOSSFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/oss_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
index 032519cab..491a98a94 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
@@ -58,7 +58,7 @@ void OutputPulseAudioFactory::showAbout(QWidget *parent)
 QTranslator *OutputPulseAudioFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/pulseaudio_plugin_") + locale);
     return translator;
 }
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
index 72bc59b8f..2f80f11e1 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
@@ -59,7 +59,7 @@ void OutputWaveOutFactory::showAbout(QWidget *parent)
 QTranslator *OutputWaveOutFactory::createTranslator(QObject *parent)

 {

     QTranslator *translator = new QTranslator(parent);

-    QString locale = QLocale::system().name();

+    QString locale = Qmmp::systemLanguageID();

     translator->load(QString(":/waveout_plugin_") + locale);

     return translator;

 }

diff --git a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp
index ad9122a87..b5344ce15 100644
--- a/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp
+++ b/src/plugins/Visual/analyzer/visualanalyzerfactory.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
-
+#include <qmmp/qmmp.h>
 #include "settingsdialog.h"
 #include "visualanalyzerfactory.h"
 #include "analyzer.h"
@@ -54,7 +54,7 @@ void VisualAnalyzerFactory::showAbout(QWidget *parent)
 QTranslator *VisualAnalyzerFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/analyzer_plugin_") + locale);
     return translator;
 };
diff --git a/src/plugins/Visual/projectm/visualprojectmfactory.cpp b/src/plugins/Visual/projectm/visualprojectmfactory.cpp
index 5e1f0b961..c1fb0fe3c 100644
--- a/src/plugins/Visual/projectm/visualprojectmfactory.cpp
+++ b/src/plugins/Visual/projectm/visualprojectmfactory.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include <QtGui>
+#include <qmmp/qmmp.h>
 #include "visualprojectmfactory.h"
 #include "projectmplugin.h"
 
@@ -55,7 +56,7 @@ void VisualProjectMFactory::showAbout(QWidget *parent)
 QTranslator *VisualProjectMFactory::createTranslator(QObject *parent)
 {
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/projectm_plugin_") + locale);
     return translator;
 };
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index d80d050ec..e862d2f7e 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -21,6 +21,8 @@
 #include <QDir>
 #include <QApplication>
 #include <QSettings>
+#include <QLocale>
+#include <QByteArray>
 
 #ifndef QMMP_STR_VERSION
 #define QMMP_STR_VERSION "0.3.0"
@@ -103,3 +105,17 @@ const QString Qmmp::pluginsPath()
 #endif
     return dir.canonicalPath();
 }
+
+QString Qmmp::systemLanguageID()
+{
+#ifdef Q_OS_UNIX
+    QByteArray v = qgetenv ("LC_MESSAGES");
+    if (v.isEmpty())
+        v = qgetenv ("LC_ALL");
+    if (v.isEmpty())
+        v = qgetenv ("LANG");
+    if (!v.isEmpty())
+        return QLocale (v).name();
+#endif
+    return  QLocale::system().name();
+}
diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h
index 91950cce3..e04904ee5 100644
--- a/src/qmmp/qmmp.h
+++ b/src/qmmp/qmmp.h
@@ -96,6 +96,11 @@ public:
      * Returns the location of the installed Qmmp plugins.
      */
     static const QString pluginsPath();
+    /*!
+     * Returns system language
+     */
+    static QString systemLanguageID();
+
 
 private:
     static QString m_configFile;
diff --git a/src/qmmpui/mediaplayer.cpp b/src/qmmpui/mediaplayer.cpp
index 6c1224e1f..0f6b7a79f 100644
--- a/src/qmmpui/mediaplayer.cpp
+++ b/src/qmmpui/mediaplayer.cpp
@@ -42,7 +42,7 @@ MediaPlayer::MediaPlayer(QObject *parent)
     m_skips = 0;
     m_repeat = FALSE;
     QTranslator *translator = new QTranslator(parent);
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator->load(QString(":/libqmmpui_") + locale);
     qApp->installTranslator(translator);
 }
diff --git a/src/ui/mp3player.cpp b/src/ui/mp3player.cpp
index 130e71c36..65795dafb 100644
--- a/src/ui/mp3player.cpp
+++ b/src/ui/mp3player.cpp
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
     QApplication a (argc, argv );
     a.setApplicationName("qmmp");
     QTranslator translator;
-    QString locale = QLocale::system().name();
+    QString locale = Qmmp::systemLanguageID();
     translator.load(QString(":/qmmp_") + locale);
     a.installTranslator(&translator);