44 files changed, 15 insertions, 12 deletions

diff --git a/plugin-telemetry.pro b/plugin-telemetry.pro
new file mode 100644
index 0000000..2e26c06
--- /dev/null
+++ b/plugin-telemetry.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS += src
+
+QMAKE_EXTRA_TARGETS += docs install_docs # dummy targets for consistency
diff --git a/UsageStatistic.json.in b/src/UsageStatistic.json.in
index 0ed40e6..9a999e4 100644
--- a/UsageStatistic.json.in
+++ b/src/UsageStatistic.json.in
@@ -5,7 +5,7 @@
     \"Vendor\" : \"The Qt Company Ltd\",
     \"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\",
     \"License\" : \"GNU GPL v3\",
-    \"Description\" : \"This plugin is used to collect usage statistic. All statistics are anonymous. You can switch off the plugin any time you want.\",
+    \"Description\" : \"This plugin collects statistics on how Qt Creator is used. All statistics are anonymous. You can switch off the plugin any time you want.\",
     \"Url\" : \"https://www.qt.io/\",
     $$dependencyList
 }
diff --git a/common/scopedsettingsgroupsetter.cpp b/src/common/scopedsettingsgroupsetter.cpp
index 472b6fd..472b6fd 100644
--- a/common/scopedsettingsgroupsetter.cpp
+++ b/src/common/scopedsettingsgroupsetter.cpp
diff --git a/common/scopedsettingsgroupsetter.h b/src/common/scopedsettingsgroupsetter.h
index adcaa61..adcaa61 100644
--- a/common/scopedsettingsgroupsetter.h
+++ b/src/common/scopedsettingsgroupsetter.h
diff --git a/common/utils.h b/src/common/utils.h
index 592728a..592728a 100644
--- a/common/utils.h
+++ b/src/common/utils.h
diff --git a/datasources/buildcountsource.cpp b/src/datasources/buildcountsource.cpp
index 1a42305..1a42305 100644
--- a/datasources/buildcountsource.cpp
+++ b/src/datasources/buildcountsource.cpp
diff --git a/datasources/buildcountsource.h b/src/datasources/buildcountsource.h
index 0cee9c4..0cee9c4 100644
--- a/datasources/buildcountsource.h
+++ b/src/datasources/buildcountsource.h
diff --git a/datasources/buildsystemsource.cpp b/src/datasources/buildsystemsource.cpp
index 95c22a2..5b9e4bf 100644
--- a/datasources/buildsystemsource.cpp
+++ b/src/datasources/buildsystemsource.cpp
@@ -84,7 +84,7 @@ QString BuildSystemSource::name() const
 
 QString BuildSystemSource::description() const
 {
-    return tr("Count of each used build systems");
+    return tr("Count of projects configured for a particular build system.");
 }
 
 QVariant BuildSystemSource::data()
diff --git a/datasources/buildsystemsource.h b/src/datasources/buildsystemsource.h
index a6ab03c..a6ab03c 100644
--- a/datasources/buildsystemsource.h
+++ b/src/datasources/buildsystemsource.h
diff --git a/datasources/examplesdatasource.cpp b/src/datasources/examplesdatasource.cpp
index 8dc9b2d..0ff454e 100644
--- a/datasources/examplesdatasource.cpp
+++ b/src/datasources/examplesdatasource.cpp
@@ -62,7 +62,7 @@ QString ExamplesDataSource::name() const
 
 QString ExamplesDataSource::description() const
 {
-    return tr("The list of examples openned by the user. "
+    return tr("The list of examples opened by you. "
               "Only example paths are collected and sent, for example: "
               "widgets/mainwindows/application/application.pro");
 }
diff --git a/datasources/examplesdatasource.h b/src/datasources/examplesdatasource.h
index 19b5779..19b5779 100644
--- a/datasources/examplesdatasource.h
+++ b/src/datasources/examplesdatasource.h
diff --git a/datasources/kitsource.cpp b/src/datasources/kitsource.cpp
index 38d0ccc..9458853 100644
--- a/datasources/kitsource.cpp
+++ b/src/datasources/kitsource.cpp
@@ -56,7 +56,7 @@ QString KitSource::name() const
 
 QString KitSource::description() const
 {
-    return tr("Kits usage statistic: compilers, debuggers, target architecture etc.");
+    return tr("Kits usage statistics: compilers, debuggers, target architecture, and so on.");
 }
 
 static QString kitsInfoKey() { return QStringLiteral("kitsInfo"); }
diff --git a/datasources/kitsource.h b/src/datasources/kitsource.h
index 4256c01..4256c01 100644
--- a/datasources/kitsource.h
+++ b/src/datasources/kitsource.h
diff --git a/datasources/modeusagetimesource.cpp b/src/datasources/modeusagetimesource.cpp
index 445e419..80e7664 100644
--- a/datasources/modeusagetimesource.cpp
+++ b/src/datasources/modeusagetimesource.cpp
@@ -50,12 +50,12 @@ ModeUsageTimeSource::~ModeUsageTimeSource() = default;
 
 QString ModeUsageTimeSource::name() const
 {
-    return tr("Modes usage time");
+    return tr("Mode usage time");
 }
 
 QString ModeUsageTimeSource::description() const
 {
-    return tr("How much time a user spent working in each mode (edit, debug, design, etc.)");
+    return tr("How much time you spent working in different modes.");
 }
 
 // Keep synced with ModeUsageTimeSource::Mode {
diff --git a/datasources/modeusagetimesource.h b/src/datasources/modeusagetimesource.h
index f1fbde1..f1fbde1 100644
--- a/datasources/modeusagetimesource.h
+++ b/src/datasources/modeusagetimesource.h
diff --git a/datasources/qmldesignerusagetimesource.cpp b/src/datasources/qmldesignerusagetimesource.cpp
index 6bb4a32..5859345 100644
--- a/datasources/qmldesignerusagetimesource.cpp
+++ b/src/datasources/qmldesignerusagetimesource.cpp
@@ -60,12 +60,12 @@ QmlDesignerUsageTimeSource::~QmlDesignerUsageTimeSource() = default;
 
 QString QmlDesignerUsageTimeSource::name() const
 {
-    return tr("QmlDesigner usage time");
+    return tr("Qt Quick Designer usage time");
 }
 
 QString QmlDesignerUsageTimeSource::description() const
 {
-    return tr("How long a user spent editing QML files in designer mode");
+    return tr("How much time you spent editing QML files in Design mode.");
 }
 
 static bool isDesignMode(const QString &modeName)
diff --git a/datasources/qmldesignerusagetimesource.h b/src/datasources/qmldesignerusagetimesource.h
index 3cadf57..3cadf57 100644
--- a/datasources/qmldesignerusagetimesource.h
+++ b/src/datasources/qmldesignerusagetimesource.h
diff --git a/datasources/qtclicensesource.cpp b/src/datasources/qtclicensesource.cpp
index bee2c8c..bee2c8c 100644
--- a/datasources/qtclicensesource.cpp
+++ b/src/datasources/qtclicensesource.cpp
diff --git a/datasources/qtclicensesource.h b/src/datasources/qtclicensesource.h
index 80630d2..80630d2 100644
--- a/datasources/qtclicensesource.h
+++ b/src/datasources/qtclicensesource.h
diff --git a/datasources/servicesource.cpp b/src/datasources/servicesource.cpp
index 8bb71eb..8bb71eb 100644
--- a/datasources/servicesource.cpp
+++ b/src/datasources/servicesource.cpp
diff --git a/datasources/servicesource.h b/src/datasources/servicesource.h
index 707c407..707c407 100644
--- a/datasources/servicesource.h
+++ b/src/datasources/servicesource.h
diff --git a/datasources/timeusagesourcebase.cpp b/src/datasources/timeusagesourcebase.cpp
index ab4c1e1..ab4c1e1 100644
--- a/datasources/timeusagesourcebase.cpp
+++ b/src/datasources/timeusagesourcebase.cpp
diff --git a/datasources/timeusagesourcebase.h b/src/datasources/timeusagesourcebase.h
index e3d3730..e3d3730 100644
--- a/datasources/timeusagesourcebase.h
+++ b/src/datasources/timeusagesourcebase.h
diff --git a/images/settingscategory_usagestatistic.png b/src/images/settingscategory_usagestatistic.png
index e45c00b..e45c00b 100644
--- a/images/settingscategory_usagestatistic.png
+++ b/src/images/settingscategory_usagestatistic.png
diff --git a/images/settingscategory_usagestatistic.svg b/src/images/settingscategory_usagestatistic.svg
index c4bd019..c4bd019 100644
--- a/images/settingscategory_usagestatistic.svg
+++ b/src/images/settingscategory_usagestatistic.svg
diff --git a/images/settingscategory_usagestatistic@2x.png b/src/images/settingscategory_usagestatistic@2x.png
index 136c67e..136c67e 100644
--- a/images/settingscategory_usagestatistic@2x.png
+++ b/src/images/settingscategory_usagestatistic@2x.png
diff --git a/services/datasubmitter.cpp b/src/services/datasubmitter.cpp
index ea8d2c4..ea8d2c4 100644
--- a/services/datasubmitter.cpp
+++ b/src/services/datasubmitter.cpp
diff --git a/services/datasubmitter.h b/src/services/datasubmitter.h
index 1ae66ac..1ae66ac 100644
--- a/services/datasubmitter.h
+++ b/src/services/datasubmitter.h
diff --git a/usagestatistic.pro b/src/src.pro
index 94bb72d..897f53c 100644
--- a/usagestatistic.pro
+++ b/src/src.pro
@@ -90,7 +90,7 @@ QTC_PLUGIN_RECOMMENDS += \
 ###### End _dependencies.pri contents ######
 
 # KUserFeedback
-include(3rdparty/kuserfeedback/kuserfeedback.pri)
+include(../3rdparty/kuserfeedback/kuserfeedback.pri)
 
 include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri)
 
@@ -98,5 +98,3 @@ FORMS += \
     ui/usagestatisticwidget.ui \
     ui/encouragementwidget.ui
 
-QMAKE_EXTRA_TARGETS += docs install_docs # dummy targets for consistency
-
diff --git a/ui/encouragementwidget.cpp b/src/ui/encouragementwidget.cpp
index 457422e..457422e 100644
--- a/ui/encouragementwidget.cpp
+++ b/src/ui/encouragementwidget.cpp
diff --git a/ui/encouragementwidget.h b/src/ui/encouragementwidget.h
index 6386a54..6386a54 100644
--- a/ui/encouragementwidget.h
+++ b/src/ui/encouragementwidget.h
diff --git a/ui/encouragementwidget.ui b/src/ui/encouragementwidget.ui
index 19f24a1..19f24a1 100644
--- a/ui/encouragementwidget.ui
+++ b/src/ui/encouragementwidget.ui
diff --git a/ui/outputpane.cpp b/src/ui/outputpane.cpp
index 3529ca3..3529ca3 100644
--- a/ui/outputpane.cpp
+++ b/src/ui/outputpane.cpp
diff --git a/ui/outputpane.h b/src/ui/outputpane.h
index 039b3f2..039b3f2 100644
--- a/ui/outputpane.h
+++ b/src/ui/outputpane.h
diff --git a/ui/usagestatisticpage.cpp b/src/ui/usagestatisticpage.cpp
index a81fc87..c3c6558 100644
--- a/ui/usagestatisticpage.cpp
+++ b/src/ui/usagestatisticpage.cpp
@@ -85,7 +85,7 @@ void UsageStatisticPage::configure()
     setCategoryIcon(Utils::Icon({{":/usagestatistic/images/settingscategory_usagestatistic.png",
                     Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint));
 
-    setDisplayName(tr("Usage Statistic"));
+    setDisplayName(tr("Usage Statistics"));
     setDisplayCategory(tr("Telemetry"));
 }
 
diff --git a/ui/usagestatisticpage.h b/src/ui/usagestatisticpage.h
index 1052611..1052611 100644
--- a/ui/usagestatisticpage.h
+++ b/src/ui/usagestatisticpage.h
diff --git a/ui/usagestatisticwidget.cpp b/src/ui/usagestatisticwidget.cpp
index b6f7a3b..b6f7a3b 100644
--- a/ui/usagestatisticwidget.cpp
+++ b/src/ui/usagestatisticwidget.cpp
diff --git a/ui/usagestatisticwidget.h b/src/ui/usagestatisticwidget.h
index fb3341a..fb3341a 100644
--- a/ui/usagestatisticwidget.h
+++ b/src/ui/usagestatisticwidget.h
diff --git a/ui/usagestatisticwidget.ui b/src/ui/usagestatisticwidget.ui
index 484b69a..484b69a 100644
--- a/ui/usagestatisticwidget.ui
+++ b/src/ui/usagestatisticwidget.ui
diff --git a/usagestatistic.qrc b/src/usagestatistic.qrc
index 8ab02df..8ab02df 100644
--- a/usagestatistic.qrc
+++ b/src/usagestatistic.qrc
diff --git a/usagestatistic_global.h b/src/usagestatistic_global.h
index 094f51e..094f51e 100644
--- a/usagestatistic_global.h
+++ b/src/usagestatistic_global.h
diff --git a/usagestatisticconstants.h b/src/usagestatisticconstants.h
index 0abde08..0abde08 100644
--- a/usagestatisticconstants.h
+++ b/src/usagestatisticconstants.h
diff --git a/usagestatisticplugin.cpp b/src/usagestatisticplugin.cpp
index 5f04486..5f04486 100644
--- a/usagestatisticplugin.cpp
+++ b/src/usagestatisticplugin.cpp
diff --git a/usagestatisticplugin.h b/src/usagestatisticplugin.h
index 139acc3..139acc3 100644
--- a/usagestatisticplugin.h
+++ b/src/usagestatisticplugin.h