diff --git a/TelemetryClass.cpp b/TelemetryClass.cpp index 521734f..66eac7f 100644 --- a/TelemetryClass.cpp +++ b/TelemetryClass.cpp @@ -52,12 +52,8 @@ void TelemetryClass::init() { QSettings settings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); settings.beginGroup("Telemetry"); -#ifndef GTA5SYNC_BUILDTYPE_DEV - telemetryEnabled = settings.value("IsEnabled", false).toBool(); -#else - telemetryEnabled = true; // Always enable Telemetry for Developer Versions + telemetryEnabled = true; telemetryStateForced = true; -#endif QString telemetryLegacyClientID = settings.value("ClientID", QString()).toString(); if (telemetryLegacyClientID.isEmpty() || telemetryLegacyClientID == "v2+") { diff --git a/TranslationClass.cpp b/TranslationClass.cpp index 9afbf13..ba69204 100644 --- a/TranslationClass.cpp +++ b/TranslationClass.cpp @@ -617,7 +617,6 @@ QString TranslationClass::getCountryCode(QLocale locale) QStringList localeStrList = locale.name().split("_"); if (localeStrList.length() >= 2) { - qDebug() << localeStrList; return localeStrList.at(1).toLower(); } else diff --git a/main.cpp b/main.cpp index 5ab285a..c4c4be4 100644 --- a/main.cpp +++ b/main.cpp @@ -116,18 +116,8 @@ int main(int argc, char *argv[]) Translator->loadTranslation(&a); #ifdef GTA5SYNC_TELEMETRY - if (!applicationArgs.contains("--disable-telemetry")) - { - if (!applicationArgs.contains("--skip-telemetryinit")) - { - Telemetry->init(); - Telemetry->work(); - } - } - else - { - Telemetry->setDisabled(true); - } + Telemetry->init(); + Telemetry->work(); #endif if (!applicationArgs.contains("--skip-firststart")) @@ -148,8 +138,9 @@ int main(int argc, char *argv[]) } #ifdef GTA5SYNC_TELEMETRY - bool telemetryWindowLaunched = settings.value("TelemetryWindowLaunched", false).toBool(); - if (!telemetryWindowLaunched && !Telemetry->isEnabled() && !Telemetry->isStateForced()) + bool telemetryWindowLaunched = settings.value("PersonalUsageDataWindowLaunched", false).toBool(); + bool pushUsageData = settings.value("PushUsageData", false).toBool(); + if (!telemetryWindowLaunched && !pushUsageData) { QDialog *telemetryDialog = new QDialog(); telemetryDialog->setObjectName(QStringLiteral("TelemetryDialog")); @@ -161,12 +152,13 @@ int main(int argc, char *argv[]) telemetryDialog->setLayout(telemetryLayout); UiModLabel *telemetryLabel = new UiModLabel(telemetryDialog); telemetryLabel->setObjectName(QStringLiteral("TelemetryLabel")); - telemetryLabel->setText(QString("

%2

%1").arg(QApplication::translate("TelemetryDialog", "You want help %1 to improve in the future by collection of data?").arg(GTA5SYNC_APPSTR), QApplication::translate("TelemetryDialog", "%1 User Statistics").arg(GTA5SYNC_APPSTR))); + telemetryLabel->setText(QString("

%2

%1").arg( + QApplication::translate("TelemetryDialog", "You want help %1 to improve in the future by including personal usage data in your submission?").arg(GTA5SYNC_APPSTR), + QApplication::translate("TelemetryDialog", "%1 User Statistics").arg(GTA5SYNC_APPSTR))); telemetryLayout->addWidget(telemetryLabel); QCheckBox *telemetryCheckBox = new QCheckBox(telemetryDialog); telemetryCheckBox->setObjectName(QStringLiteral("TelemetryCheckBox")); - telemetryCheckBox->setText(QApplication::translate("TelemetryDialog", "Yes, I would like to take part.")); - telemetryCheckBox->setChecked(true); + telemetryCheckBox->setText(QApplication::translate("TelemetryDialog", "Yes, I want include personal usage data.")); telemetryLayout->addWidget(telemetryCheckBox); QHBoxLayout *telemetryButtonLayout = new QHBoxLayout(); telemetryButtonLayout->setObjectName(QStringLiteral("TelemetryButtonLayout")); @@ -185,12 +177,12 @@ int main(int argc, char *argv[]) { QSettings telemetrySettings(GTA5SYNC_APPVENDOR, GTA5SYNC_APPSTR); telemetrySettings.beginGroup("Telemetry"); - telemetrySettings.setValue("IsEnabled", true); + telemetrySettings.setValue("PushUsageData", true); telemetrySettings.endGroup(); Telemetry->init(); Telemetry->work(); } - settings.setValue("TelemetryWindowLaunched", true); + settings.setValue("PersonalUsageDataWindowLaunched", true); delete telemetryDialog; } #endif diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm index 39045ab..75ed2bc 100644 Binary files a/res/gta5sync_de.qm and b/res/gta5sync_de.qm differ diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts index b883bcb..c7ee247 100644 --- a/res/gta5sync_de.ts +++ b/res/gta5sync_de.ts @@ -758,7 +758,7 @@ Y: %2 Snapmatic Bildansicht - %1 - + <span style=" font-weight:600;">Title: </span>%6<br/> <span style=" font-weight:600;">Location: </span>%7 (%1, %2, %3)<br/> <span style=" font-weight:600;">Players: </span>%4 (Crew %5)<br/> @@ -769,22 +769,22 @@ Y: %2 <span style=" font-weight:600;">Erstellt: </span>%8 - + Manage picture Bild verwalten - + &Manage &Verwalten - + Close viewer Ansicht schließen - + &Close S&chließen @@ -1432,7 +1432,7 @@ Drücke 1 für Standardmodus Ausgewähle Schrift: %1 - + <h4>Welcome to %1!</h4>You want to configure %1 before you start using it? <h4>Willkommen zu %1!</h4>Möchtest du %1 einstellen bevor du es nutzt? @@ -2001,22 +2001,22 @@ Drücke 1 für Standardmodus TelemetryDialog - + %1 User Statistics %1 Benutzerstatistik - - You want help %1 to improve in the future by collection of data? - Möchtest du helfen %1 in der Zukunft zu verbessern durch Sammlung von Daten? + + You want help %1 to improve in the future by including personal usage data in your submission? + Sollen bei Einreichungen Persönliche Nutzungsdaten einbezogen werden um %1 in der Zukunft zu unterstützen? - - Yes, I would like to take part. - Ja, ich möchte teilnehmen. + + Yes, I want include personal usage data. + Ja, ich möchte Persönliche Nutzungsdaten einbeziehen. - + &OK &OK diff --git a/res/gta5sync_en_US.qm b/res/gta5sync_en_US.qm index f3a3c28..5ebdda8 100644 Binary files a/res/gta5sync_en_US.qm and b/res/gta5sync_en_US.qm differ diff --git a/res/gta5sync_en_US.ts b/res/gta5sync_en_US.ts index d2d920b..f723784 100644 --- a/res/gta5sync_en_US.ts +++ b/res/gta5sync_en_US.ts @@ -746,7 +746,7 @@ Y: %2 - + <span style=" font-weight:600;">Title: </span>%6<br/> <span style=" font-weight:600;">Location: </span>%7 (%1, %2, %3)<br/> <span style=" font-weight:600;">Players: </span>%4 (Crew %5)<br/> @@ -754,22 +754,22 @@ Y: %2 - + Manage picture - + &Manage - + Close viewer - + &Close @@ -1409,7 +1409,7 @@ Press 1 for Default View - + <h4>Welcome to %1!</h4>You want to configure %1 before you start using it? @@ -1976,22 +1976,22 @@ Press 1 for Default View TelemetryDialog - + %1 User Statistics - - You want help %1 to improve in the future by collection of data? - + + You want help %1 to improve in the future by including personal usage data in your submission? + - - Yes, I would like to take part. - + + Yes, I want include personal usage data. + - + &OK diff --git a/res/gta5sync_fr.qm b/res/gta5sync_fr.qm index 243caba..2fa3468 100644 Binary files a/res/gta5sync_fr.qm and b/res/gta5sync_fr.qm differ diff --git a/res/gta5sync_fr.ts b/res/gta5sync_fr.ts index a412bf5..6b1e0df 100644 --- a/res/gta5sync_fr.ts +++ b/res/gta5sync_fr.ts @@ -758,7 +758,7 @@ Y : %2 Visionneuse de photo Snapmatic - %1 - + <span style=" font-weight:600;">Title: </span>%6<br/> <span style=" font-weight:600;">Location: </span>%7 (%1, %2, %3)<br/> <span style=" font-weight:600;">Players: </span>%4 (Crew %5)<br/> @@ -769,22 +769,22 @@ Y : %2 <span style=" font-weight:600;">Créé le : </span>%8 - + Manage picture Gestion de l'image - + &Manage &Gestion - + Close viewer Fermer la visionneuse - + &Close &Fermer @@ -1433,7 +1433,7 @@ Appuyer sur 1 pour le mode par défaut Police sélectionnée : %1 - + <h4>Welcome to %1!</h4>You want to configure %1 before you start using it? <h4>Bienvenue sur %1!</h4>Voulez-vous configurer %1 avant de l'utiliser t? @@ -2004,22 +2004,22 @@ Appuyer sur 1 pour le mode par défaut TelemetryDialog - + %1 User Statistics %1 Statistiques d'usage - - You want help %1 to improve in the future by collection of data? - Voulez-vous aider à améliorer %1 en envoyant vos données d'utilisation ? + + You want help %1 to improve in the future by including personal usage data in your submission? + - - Yes, I would like to take part. - Oui, je veux participer. + + Yes, I want include personal usage data. + - + &OK &OK diff --git a/res/gta5sync_ru.qm b/res/gta5sync_ru.qm index c7df0a1..061cd2a 100644 Binary files a/res/gta5sync_ru.qm and b/res/gta5sync_ru.qm differ diff --git a/res/gta5sync_ru.ts b/res/gta5sync_ru.ts index 1298770..3ff5289 100644 --- a/res/gta5sync_ru.ts +++ b/res/gta5sync_ru.ts @@ -758,7 +758,7 @@ Y: %2 PictureDialog - + <span style=" font-weight:600;">Title: </span>%6<br/> <span style=" font-weight:600;">Location: </span>%7 (%1, %2, %3)<br/> <span style=" font-weight:600;">Players: </span>%4 (Crew %5)<br/> @@ -769,12 +769,12 @@ Y: %2 <span style=" font-weight:600;">Сделано: </span>%8 - + &Manage &Управление - + Manage picture Настройки картинки @@ -784,12 +784,12 @@ Y: %2 Просмотрщик фотографий Snapmatic - %1 - + Close viewer Закрыть просмотрщик - + &Close &Закрыть @@ -1439,7 +1439,7 @@ Press 1 for Default View Выбранный шрифт: %1 - + <h4>Welcome to %1!</h4>You want to configure %1 before you start using it? <h4>Добро пожаловать в %1!</h4>Хочешь изменить настройки %1 перед использованием? @@ -2008,22 +2008,22 @@ Press 1 for Default View TelemetryDialog - + %1 User Statistics %1 пользовательская статистика - - You want help %1 to improve in the future by collection of data? - Хочешь ли помочь будущему развитию %1 отправкой данных? + + You want help %1 to improve in the future by including personal usage data in your submission? + - - Yes, I would like to take part. - Да, хочу участвовать. + + Yes, I want include personal usage data. + - + &OK &ОК diff --git a/res/gta5sync_uk.qm b/res/gta5sync_uk.qm index e200510..151097e 100644 Binary files a/res/gta5sync_uk.qm and b/res/gta5sync_uk.qm differ diff --git a/res/gta5sync_uk.ts b/res/gta5sync_uk.ts index 8352309..d929df7 100644 --- a/res/gta5sync_uk.ts +++ b/res/gta5sync_uk.ts @@ -758,7 +758,7 @@ Y: %2 Переглядач зображень Snapmatic - %1 - + <span style=" font-weight:600;">Title: </span>%6<br/> <span style=" font-weight:600;">Location: </span>%7 (%1, %2, %3)<br/> <span style=" font-weight:600;">Players: </span>%4 (Crew %5)<br/> @@ -769,22 +769,22 @@ Y: %2 <span style=" font-weight:600;">Створено: </span>%8 - + Manage picture Керування зображенням - + &Manage &Керувати - + Close viewer Закрити переглядач - + &Close &Закрити @@ -1433,7 +1433,7 @@ Press 1 for Default View Вибраний шрифт:%1 - + <h4>Welcome to %1!</h4>You want to configure %1 before you start using it? <h4>Ласкаво просимо до %1!</h4>Ви хочете налаштувати %1 перед використанням? @@ -2002,22 +2002,22 @@ Press 1 for Default View TelemetryDialog - - You want help %1 to improve in the future by collection of data? - Ви хочете допомогти %1 подальшому вдосконаленню шляхом збору даних? - - - + %1 User Statistics %1 Статистика користувачів - - Yes, I would like to take part. - Так, я хотів би взяти участь. + + You want help %1 to improve in the future by including personal usage data in your submission? + - + + Yes, I want include personal usage data. + + + + &OK &OK diff --git a/res/gta5sync_zh_TW.qm b/res/gta5sync_zh_TW.qm index 278dc97..90b338e 100644 Binary files a/res/gta5sync_zh_TW.qm and b/res/gta5sync_zh_TW.qm differ diff --git a/res/gta5sync_zh_TW.ts b/res/gta5sync_zh_TW.ts index f4a6bcc..85bb948 100644 --- a/res/gta5sync_zh_TW.ts +++ b/res/gta5sync_zh_TW.ts @@ -756,7 +756,7 @@ Y: %2 Snapmatic 圖片檢視器 - %1 - + <span style=" font-weight:600;">Title: </span>%6<br/> <span style=" font-weight:600;">Location: </span>%7 (%1, %2, %3)<br/> <span style=" font-weight:600;">Players: </span>%4 (Crew %5)<br/> @@ -767,22 +767,22 @@ Y: %2 <span style=" font-weight:600;">建立於: </span>%8 - + Manage picture 管理圖片 - + &Manage 管理(&M) - + Close viewer 關閉檢視器 - + &Close 關閉(&C) @@ -1427,7 +1427,7 @@ Press 1 for Default View 選擇的字體: %1 - + <h4>Welcome to %1!</h4>You want to configure %1 before you start using it? <h4>歡迎使用 %1!</h4> 你想在開始前先設定 %1 嗎? @@ -1996,22 +1996,22 @@ Press 1 for Default View TelemetryDialog - - You want help %1 to improve in the future by collection of data? - 你希望通過收集資料來幫助改善 %1 嗎? - - - + %1 User Statistics %1 使用者統計 - - Yes, I would like to take part. - 是的，我想幫忙. + + You want help %1 to improve in the future by including personal usage data in your submission? + - + + Yes, I want include personal usage data. + + + + &OK 確定(&O)