Update translations

cockatrice/src/dlg_settings.cpp

@@ -39,7 +39,7 @@ GeneralSettingsPage::GeneralSettingsPage()
     for (int i = 0; i < qmFiles.size(); i++) {
         QString langName = languageName(qmFiles[i]);
         languageBox.addItem(langName, qmFiles[i]);
-        if ((qmFiles[i] == setLanguage) || (setLanguage.isEmpty() && langName == tr(DEFAULT_LANG_NAME)))
+        if ((qmFiles[i] == setLanguage) || (setLanguage.isEmpty() && langName == QCoreApplication::translate("i18n", DEFAULT_LANG_NAME)))
             languageBox.setCurrentIndex(i);
     }
 
@@ -158,7 +158,7 @@ QString GeneralSettingsPage::languageName(const QString &qmFile)
     QTranslator translator;
     translator.load(translationPrefix + "_" + qmFile + ".qm", translationPath);
     
-    return translator.translate("GeneralSettingsPage", DEFAULT_LANG_NAME);
+    return translator.translate("i18n", DEFAULT_LANG_NAME);
 }
 
 void GeneralSettingsPage::defaultUrlRestoreButtonClicked()

cockatrice/src/settingscache.cpp

@@ -146,6 +146,9 @@ QString SettingsCache::getSafeConfigFilePath(QString configEntry, QString defaul
 }
 SettingsCache::SettingsCache()
 {
+    // define a dummy context that will be used where needed
+    QString dummy = QT_TRANSLATE_NOOP("i18n", "English");
+
     QString dataPath = getDataPath();
     QString settingsPath = getSettingsPath();
     settings = new QSettings(settingsPath+"global.ini", QSettings::IniFormat, this);