Merge pull request #6022

b74dcb3 Separate CTranslationInterface from CClientUIInterface (Jorge Timón)

src/qt/bitcoin.cpp

@@ -532,7 +532,7 @@ int main(int argc, char *argv[])
     // Now that QSettings are accessible, initialize translations
     QTranslator qtTranslatorBase, qtTranslator, translatorBase, translator;
     initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator);
-    uiInterface.Translate.connect(Translate);
+    translationInterface.Translate.connect(Translate);
 
     // Show help message immediately after parsing command-line options (for "-lang") and setting locale,
     // but before showing splash screen.

src/qt/transactiondesc.cpp

@@ -14,7 +14,6 @@
 #include "main.h"
 #include "script/script.h"
 #include "timedata.h"
-#include "ui_interface.h"
 #include "util.h"
 #include "wallet/db.h"
 #include "wallet/wallet.h"