More renaming. Just for the life of me can't get the translations to be recognised. Also, while a clean install will use the new app folders, the nsi scripts are currently configured to retrieve the install folder from registry if present. Might want to think about whether we want to remove this or not.

companion/src/main.cpp

@@ -89,13 +89,13 @@ int main(int argc, char *argv[])
     QString locale = settings.value("locale",QLocale::system().name()).toString();
     bool showSplash = settings.value("show_splash", true).toBool();
 
-    QTranslator companion9xTranslator;
-    companion9xTranslator.load(":/companion9x_" + locale);
+    QTranslator companionTranslator;
+    companionTranslator.load(":/companion_" + locale);
     QTranslator qtTranslator;
     qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 //    qDebug() << locale;
 //    qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));    
-    app.installTranslator(&companion9xTranslator);
+    app.installTranslator(&companionTranslator);
     app.installTranslator(&qtTranslator);
 
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));