Merge with default

1 files changed, 5 insertions, 4 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 27a56812..31fbeef3 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -197,7 +197,7 @@ private:
   void actionToToolButton(QAction *&sourceAction);
   bool verifyPlugin(MOBase::IPlugin *plugin);
   void registerPluginTool(MOBase::IPluginTool *tool);
-  bool registerPlugin(QObject *pluginObj);
+  bool registerPlugin(QObject *pluginObj, const QString &fileName);
 
   void updateToolBar();
   void activateSelectedProfile();
@@ -286,6 +286,7 @@ private:
 
   static void setupNetworkProxy(bool activate);
   void activateProxy(bool activate);
+  void installTranslator(const QString &name);
 
 private:
 
@@ -332,9 +333,6 @@ private:
   DownloadManager m_DownloadManager;
   InstallationManager m_InstallationManager;
 
-  QTranslator *m_Translator;
-  QTranslator *m_TranslatorQt;
-
   SelfUpdater m_Updater;
 
   CategoryFactory &m_CategoryFactory;
@@ -366,6 +364,9 @@ private:
 
   SignalAboutToRunApplication m_AboutToRun;
 
+  QString m_CurrentLanguage;
+  std::vector<QTranslator*> m_Translators;
+
 private slots:
 
   void showMessage(const QString &message);