3 files changed, 12 insertions, 7 deletions
diff --git a/src/plugins/cpptools/completionsettingspage.cpp b/src/plugins/cpptools/completionsettingspage.cpp
index d74cec00ea..8c5e7ba2a4 100644
--- a/src/plugins/cpptools/completionsettingspage.cpp
+++ b/src/plugins/cpptools/completionsettingspage.cpp
@@ -32,9 +32,11 @@
 #include "ui_completionsettingspage.h"
 
 #include <coreplugin/icore.h>
+#include <texteditor/texteditorconstants.h>
 #include <extensionsystem/pluginmanager.h>
 
 #include <QtCore/QTextStream>
+#include <QtCore/QCoreApplication>
 
 using namespace CppTools::Internal;
 
@@ -51,7 +53,7 @@ CompletionSettingsPage::~CompletionSettingsPage()
 
 QString CompletionSettingsPage::id() const
 {
-    return QLatin1String("Completion");
+    return QLatin1String("P.Completion");
 }
 
 QString CompletionSettingsPage::trName() const
@@ -61,12 +63,13 @@ QString CompletionSettingsPage::trName() const
 
 QString CompletionSettingsPage::category() const
 {
-    return QLatin1String("TextEditor");
+
+    return QLatin1String(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY);
 }
 
 QString CompletionSettingsPage::trCategory() const
 {
-    return tr("Text Editor");
+    return QCoreApplication::translate("Text Editor", TextEditor::Constants::TEXT_EDITOR_SETTINGS_TR_CATEGORY);
 }
 
 QWidget *CompletionSettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index f1b7cce869..017c35cdf0 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -306,7 +306,7 @@ QString CppFileSettingsPage::id() const
 
 QString CppFileSettingsPage::trName() const
 {
-    return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_ID);
+    return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_NAME);
 }
 
 QString CppFileSettingsPage::category() const
@@ -316,7 +316,7 @@ QString CppFileSettingsPage::category() const
 
 QString CppFileSettingsPage::trCategory() const
 {
-    return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_CATEGORY);
+    return QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY);
 }
 
 QWidget *CppFileSettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h
index cb61027bd4..1fb65cc11e 100644
--- a/src/plugins/cpptools/cpptoolsconstants.h
+++ b/src/plugins/cpptools/cpptoolsconstants.h
@@ -50,8 +50,10 @@ const char * const CPPTOOLS_SETTINGSGROUP = "CppTools";
 const char * const LOWERCASE_CPPFILES_KEY = "LowerCaseFiles";
 enum { lowerCaseFilesDefault = 1 };
 
-const char * const CPP_SETTINGS_ID = QT_TRANSLATE_NOOP("CppTools", "File Naming");
-const char * const CPP_SETTINGS_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++");
+const char * const CPP_SETTINGS_ID = "File Naming";
+const char * const CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "File Naming");
+const char * const CPP_SETTINGS_CATEGORY = "I.C++";
+const char * const CPP_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++");
 
 } // namespace Constants
 } // namespace CppTools