Translations: Merge "OpenWith::Editors" into "QtC::Core"

Change-Id: I241ccc53afa11fa3faa1f1ca9363421827081812
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>

41 files changed, 70 insertions, 87 deletions

diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index 51f7bce042..7f62f6a363 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -15999,7 +15999,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>Editor prostého textu</translation>
@@ -16048,9 +16048,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás
         <source>Python Editor</source>
         <translation>Editor Pythonu</translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Preferences</source>
         <translation>Nastavení</translation>
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index d6a61620fe..cd68dfd26b 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -19956,7 +19956,7 @@ Fejl: %5</translation>
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Binary Editor</source>
         <translation>Binær-redigering</translation>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 56aa4ae0f9..d388fa73a2 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -9470,9 +9470,6 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
         <source>Locator</source>
         <translation>Locator</translation>
     </message>
-</context>
-<context>
-    <name>OpenWith::Editors</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>Texteditor</translation>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 3d863c4169..ff32f1a64c 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -10782,7 +10782,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Plain Text Editor</source>
         <translation type="unfinished"></translation>
@@ -10799,9 +10799,6 @@ p, li { white-space: pre-wrap; }
         <source>.pro File Editor</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 626ec6c8ec..5ee57efdde 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -15614,7 +15614,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>Éditeur de texte</translation>
@@ -15663,9 +15663,6 @@ p, li { white-space: pre-wrap; }
         <source>Python Editor</source>
         <translation>Éditeur Python</translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Preferences</source>
         <translation>Préférences</translation>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index 246e1c3e63..86fd5ff638 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -15282,7 +15282,7 @@ Check the test environment.</source>
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Binary Editor</source>
         <translation>Binarni uređivač</translation>
diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts
index 4ba28ad1b1..ad58a02fa3 100644
--- a/share/qtcreator/translations/qtcreator_hu.ts
+++ b/share/qtcreator/translations/qtcreator_hu.ts
@@ -8873,7 +8873,7 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line)
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>Egyszerű szöveg szerkesztő</translation>
@@ -8890,9 +8890,6 @@ SOURCES *= .../ide/main/bin/dumper/dumper.cpp(new line)
         <source>.pro File Editor</source>
         <translation>.pro fájl szerkesztő</translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Open File With...</source>
         <translation>Fájl megnyitása ezzel...</translation>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 4f4d56d6d5..ccd8832a98 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -10584,7 +10584,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Plain Text Editor</source>
         <translation type="unfinished"></translation>
@@ -10601,9 +10601,6 @@ p, li { white-space: pre-wrap; }
         <source>.pro File Editor</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 102bd9d5c3..2f55dfdb0d 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -12126,7 +12126,7 @@ in the system&apos;s browser for manual download.</source>
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Binary Editor</source>
         <translation>バイナリエディタ</translation>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 2edfb640ad..702550d9e5 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -2019,9 +2019,6 @@ Przyczyna: %3</translation>
         <source>Existing files</source>
         <translation>Istniejące pliki</translation>
     </message>
-</context>
-<context>
-    <name>OpenWith::Editors</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>Zwykły edytor tekstowy</translation>
@@ -2078,9 +2075,6 @@ Przyczyna: %3</translation>
         <source>SCXML Editor</source>
         <translation>Edytor SCXML</translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Open File With...</source>
         <translation>Otwórz plik przy pomocy...</translation>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index e6f7d92e1a..24028b07f1 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -25527,9 +25527,6 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Alt+O</source>
         <translation>Alt+O</translation>
     </message>
-</context>
-<context>
-    <name>OpenWith::Editors</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>Текстовый редактор</translation>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index dd8be439e7..6d74be5bd7 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -10707,7 +10707,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>Urejevalniku navadnih besedil</translation>
@@ -10752,9 +10752,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan
         <source>.qmlproject Editor</source>
         <translation type="obsolete">Urejevalniku datotek *.qmlproject</translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Preferences</source>
         <translation>Nastavitve</translation>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index 95025752c6..50d1f85f5f 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -11140,7 +11140,7 @@ Ids must begin with a lowercase letter.</source>
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Binary Editor</source>
         <translation>Бінарний редактор</translation>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 58e2d00ddd..41a3caa92e 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -25259,9 +25259,6 @@ Error:
         <source>Alt+O</source>
         <translation type="unfinished">Alt+O</translation>
     </message>
-</context>
-<context>
-    <name>OpenWith::Editors</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>普通文本编辑器</translation>
diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts
index 3be3bff0eb..9f7596be02 100644
--- a/share/qtcreator/translations/qtcreator_zh_TW.ts
+++ b/share/qtcreator/translations/qtcreator_zh_TW.ts
@@ -9836,7 +9836,7 @@ Will not be applied to whitespace in comments and strings.</source>
     </message>
 </context>
 <context>
-    <name>OpenWith::Editors</name>
+    <name>QtC::Core</name>
     <message>
         <source>Plain Text Editor</source>
         <translation>純文字編輯器</translation>
@@ -9877,9 +9877,6 @@ Will not be applied to whitespace in comments and strings.</source>
         <source>GLSL Editor</source>
         <translation>GLSL 編輯器</translation>
     </message>
-</context>
-<context>
-    <name>QtC::Core</name>
     <message>
         <source>Preferences</source>
         <translation>喜好設定</translation>
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 1126a5c1de..8f7323c0f8 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -5,6 +5,7 @@
 #include "javaindenter.h"
 #include "androidconstants.h"
 
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 
 #include <texteditor/codeassist/keywordscompletionassist.h>
@@ -42,7 +43,7 @@ JavaEditorFactory::JavaEditorFactory()
         "transient", "try", "void", "volatile", "while"
     };
     setId(Constants::JAVA_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Java Editor"));
+    setDisplayName(::Core::Tr::tr("Java Editor"));
     addMimeType(Constants::JAVA_MIMETYPE);
 
     setDocumentCreator(createJavaDocument);
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index f8875b1896..0d66bc10ff 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -8,6 +8,7 @@
 #include "bineditortr.h"
 #include "bineditorwidget.h"
 
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 #include <coreplugin/icore.h>
 
@@ -444,7 +445,7 @@ static BinEditorPluginPrivate *dd = nullptr;
 BinEditorFactory::BinEditorFactory()
 {
     setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Binary Editor"));
+    setDisplayName(::Core::Tr::tr("Binary Editor"));
     addMimeType(Constants::C_BINEDITOR_MIMETYPE);
 
     setEditorCreator([] {
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index e76a81d80c..9f507e1480 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -10,6 +10,7 @@
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreplugintr.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditoractionhandler.h>
 
@@ -219,7 +220,7 @@ static TextDocument *createCMakeDocument()
 CMakeEditorFactory::CMakeEditorFactory()
 {
     setId(Constants::CMAKE_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "CMake Editor"));
+    setDisplayName(::Core::Tr::tr("CMake Editor"));
     addMimeType(Constants::CMAKE_MIMETYPE);
     addMimeType(Constants::CMAKE_PROJECT_MIMETYPE);
 
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
index e47dd262ea..051552d16c 100644
--- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
+++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
@@ -6,6 +6,7 @@
 #include "compilationdatabaseconstants.h"
 #include "compilationdbparser.h"
 
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/icontext.h>
 #include <cppeditor/cppprojectupdater.h>
 #include <cppeditor/projectinfo.h>
@@ -482,7 +483,7 @@ static TextEditor::TextDocument *createCompilationDatabaseDocument()
 CompilationDatabaseEditorFactory::CompilationDatabaseEditorFactory()
 {
     setId(Constants::COMPILATIONDATABASEPROJECT_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Compilation Database"));
+    setDisplayName(::Core::Tr::tr("Compilation Database"));
     addMimeType(Constants::COMPILATIONDATABASEMIMETYPE);
 
     setEditorCreator([]() { return new TextEditor::BaseTextEditor; });
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 91e1e2d34b..e61e3345be 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -48,7 +48,7 @@ const char C_PROBLEM_PANE[]        = "Core.ProblemPane";
 const char C_GENERAL_OUTPUT_PANE[] = "Core.GeneralOutputPane";
 
 // Default editor kind
-const char K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Plain Text Editor");
+const char K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Core", "Plain Text Editor");
 const char K_DEFAULT_TEXT_EDITOR_ID[] = "Core.PlainTextEditor";
 const char K_DEFAULT_BINARY_EDITOR_ID[] = "Core.BinaryEditor";
 
diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp
index 4831d3a836..f1fc63b49a 100644
--- a/src/plugins/cppeditor/cppeditorplugin.cpp
+++ b/src/plugins/cppeditor/cppeditorplugin.cpp
@@ -58,6 +58,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
@@ -126,7 +127,7 @@ public:
     CppEditorFactory()
     {
         setId(Constants::CPPEDITOR_ID);
-        setDisplayName(QCoreApplication::translate("OpenWith::Editors","C++ Editor"));
+        setDisplayName(::Core::Tr::tr("C++ Editor"));
         addMimeType(Constants::C_SOURCE_MIMETYPE);
         addMimeType(Constants::C_HEADER_MIMETYPE);
         addMimeType(Constants::CPP_SOURCE_MIMETYPE);
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index 8a8e3f64f2..4eeb5d6080 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -4,9 +4,10 @@
 #include "genericprojectfileseditor.h"
 #include "genericprojectconstants.h"
 
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textdocument.h>
+#include <texteditor/texteditoractionhandler.h>
 
 #include <QCoreApplication>
 
@@ -22,7 +23,7 @@ namespace Internal {
 ProjectFilesFactory::ProjectFilesFactory()
 {
     setId(Constants::FILES_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", ".files Editor"));
+    setDisplayName(::Core::Tr::tr(".files Editor"));
     addMimeType("application/vnd.qtcreator.generic.files");
     addMimeType("application/vnd.qtcreator.generic.includes");
     addMimeType("application/vnd.qtcreator.generic.config");
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 644b785e8d..aecb7cf654 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -15,9 +15,10 @@
 #include <glsl/glslsemantic.h>
 #include <glsl/glslsymbols.h>
 
-#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
@@ -366,7 +367,7 @@ std::unique_ptr<AssistInterface> GlslEditorWidget::createAssistInterface(
 GlslEditorFactory::GlslEditorFactory()
 {
     setId(Constants::C_GLSLEDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", Constants::C_GLSLEDITOR_DISPLAY_NAME));
+    setDisplayName(::Core::Tr::tr(Constants::C_GLSLEDITOR_DISPLAY_NAME));
     addMimeType(Constants::GLSL_MIMETYPE);
     addMimeType(Constants::GLSL_MIMETYPE_VERT);
     addMimeType(Constants::GLSL_MIMETYPE_FRAG);
diff --git a/src/plugins/glsleditor/glsleditorconstants.h b/src/plugins/glsleditor/glsleditorconstants.h
index 687678b92d..925105cfe8 100644
--- a/src/plugins/glsleditor/glsleditorconstants.h
+++ b/src/plugins/glsleditor/glsleditorconstants.h
@@ -14,7 +14,7 @@ const char M_TOOLS_GLSL[] = "GLSLEditor.Tools.Menu";
 const char M_REFACTORING_MENU_INSERTION_POINT[] = "GLSLEditor.RefactorGroup";
 
 const char C_GLSLEDITOR_ID[] = "GLSLEditor.GLSLEditor";
-const char C_GLSLEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "GLSL Editor");
+const char C_GLSLEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Core", "GLSL Editor");
 
 const char GLSL_MIMETYPE[] = "application/x-glsl";
 const char GLSL_MIMETYPE_VERT[] = "text/x-glsl-vert";
diff --git a/src/plugins/haskell/haskelleditorfactory.cpp b/src/plugins/haskell/haskelleditorfactory.cpp
index 2e91da0d56..4053efeba2 100644
--- a/src/plugins/haskell/haskelleditorfactory.cpp
+++ b/src/plugins/haskell/haskelleditorfactory.cpp
@@ -9,6 +9,7 @@
 #include "haskelltr.h"
 
 #include <coreplugin/actionmanager/commandbutton.h>
+#include <coreplugin/coreplugintr.h>
 #include <texteditor/textdocument.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/textindenter.h>
@@ -33,7 +34,7 @@ static QWidget *createEditorWidget()
 HaskellEditorFactory::HaskellEditorFactory()
 {
     setId(Constants::C_HASKELLEDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Haskell Editor"));
+    setDisplayName(::Core::Tr::tr("Haskell Editor"));
     addMimeType("text/x-haskell");
     setEditorActionHandlers(TextEditor::TextEditorActionHandler::UnCommentSelection
                             | TextEditor::TextEditorActionHandler::FollowSymbolUnderCursor);
diff --git a/src/plugins/modeleditor/modeleditor_constants.h b/src/plugins/modeleditor/modeleditor_constants.h
index 94811d5086..e600993fed 100644
--- a/src/plugins/modeleditor/modeleditor_constants.h
+++ b/src/plugins/modeleditor/modeleditor_constants.h
@@ -9,7 +9,7 @@ namespace ModelEditor {
 namespace Constants {
 
 const char MODEL_EDITOR_ID[] = "Editors.ModelEditor";
-const char MODEL_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Model Editor");
+const char MODEL_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Core", "Model Editor");
 
 const char REMOVE_SELECTED_ELEMENTS[] = "ModelEditor.RemoveSelectedElements";
 const char DELETE_SELECTED_ELEMENTS[] = "ModelEditor.DeleteSelectedElements";
diff --git a/src/plugins/modeleditor/modeleditorfactory.cpp b/src/plugins/modeleditor/modeleditorfactory.cpp
index a135e18c21..394ba071f0 100644
--- a/src/plugins/modeleditor/modeleditorfactory.cpp
+++ b/src/plugins/modeleditor/modeleditorfactory.cpp
@@ -7,6 +7,8 @@
 #include "actionhandler.h"
 #include "modeleditor.h"
 
+#include <coreplugin/coreplugintr.h>
+
 #include <QCoreApplication>
 
 namespace ModelEditor {
@@ -15,7 +17,7 @@ namespace Internal {
 ModelEditorFactory::ModelEditorFactory(UiController *uiController, ActionHandler *actionHandler)
 {
     setId(Constants::MODEL_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", Constants::MODEL_EDITOR_DISPLAY_NAME));
+    setDisplayName(::Core::Tr::tr(Constants::MODEL_EDITOR_DISPLAY_NAME));
     addMimeType(Constants::MIME_TYPE_MODEL);
     setEditorCreator([uiController, actionHandler] { return new ModelEditor(uiController, actionHandler); });
 }
diff --git a/src/plugins/nim/editor/nimeditorfactory.cpp b/src/plugins/nim/editor/nimeditorfactory.cpp
index a432dc8d3e..08e0ea2c32 100644
--- a/src/plugins/nim/editor/nimeditorfactory.cpp
+++ b/src/plugins/nim/editor/nimeditorfactory.cpp
@@ -9,9 +9,10 @@
 #include "../nimconstants.h"
 #include "nimtexteditorwidget.h"
 
+#include <coreplugin/coreplugintr.h>
+#include <texteditor/textdocument.h>
 #include <texteditor/texteditoractionhandler.h>
 #include <texteditor/texteditorconstants.h>
-#include <texteditor/textdocument.h>
 #include <utils/qtcassert.h>
 
 using namespace TextEditor;
@@ -22,7 +23,7 @@ namespace Nim {
 NimEditorFactory::NimEditorFactory()
 {
     setId(Constants::C_NIMEDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Nim Editor"));
+    setDisplayName(::Core::Tr::tr("Nim Editor"));
     addMimeType(QLatin1String(Nim::Constants::C_NIM_MIMETYPE));
     addMimeType(QLatin1String(Nim::Constants::C_NIM_SCRIPT_MIMETYPE));
 
diff --git a/src/plugins/python/pythonconstants.h b/src/plugins/python/pythonconstants.h
index 739198ab82..d5c5e3c6cd 100644
--- a/src/plugins/python/pythonconstants.h
+++ b/src/plugins/python/pythonconstants.h
@@ -11,8 +11,7 @@ namespace Constants {
 const char C_PYTHONEDITOR_ID[] = "PythonEditor.PythonEditor";
 const char C_PYTHONRUNCONFIGURATION_ID[] = "PythonEditor.RunConfiguration.";
 
-const char C_EDITOR_DISPLAY_NAME[] =
-        QT_TRANSLATE_NOOP("OpenWith::Editors", "Python Editor");
+const char C_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Core", "Python Editor");
 
 const char C_PYTHONOPTIONS_PAGE_ID[] = "PythonEditor.OptionsPage";
 const char C_PYLSCONFIGURATION_PAGE_ID[] = "PythonEditor.PythonLanguageServerConfiguration";
diff --git a/src/plugins/python/pythoneditor.cpp b/src/plugins/python/pythoneditor.cpp
index 77768eae35..6551facef5 100644
--- a/src/plugins/python/pythoneditor.cpp
+++ b/src/plugins/python/pythoneditor.cpp
@@ -14,6 +14,7 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/commandbutton.h>
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/icore.h>
 
 #include <projectexplorer/project.h>
@@ -249,8 +250,7 @@ PythonEditorFactory::PythonEditorFactory()
     registerReplAction(this);
 
     setId(Constants::C_PYTHONEDITOR_ID);
-    setDisplayName(
-        QCoreApplication::translate("OpenWith::Editors", Constants::C_EDITOR_DISPLAY_NAME));
+    setDisplayName(::Core::Tr::tr(Constants::C_EDITOR_DISPLAY_NAME));
     addMimeType(Constants::C_PY_MIMETYPE);
 
     setEditorActionHandlers(TextEditorActionHandler::Format
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index 65c45d2267..810d5d4f2e 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -10,14 +10,15 @@
 #include "qmakeproject.h"
 #include "qmakeprojectmanagerconstants.h"
 
+#include <coreplugin/coreplugintr.h>
 #include <extensionsystem/pluginmanager.h>
-#include <qtsupport/qtsupportconstants.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
 #include <projectexplorer/session.h>
-#include <texteditor/texteditoractionhandler.h>
+#include <projectexplorer/target.h>
+#include <qtsupport/qtsupportconstants.h>
 #include <texteditor/textdocument.h>
+#include <texteditor/texteditoractionhandler.h>
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/qtcassert.h>
 #include <utils/theme/theme.h>
@@ -253,7 +254,7 @@ static TextDocument *createProFileDocument()
 ProFileEditorFactory::ProFileEditorFactory()
 {
     setId(Constants::PROFILE_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", Constants::PROFILE_EDITOR_DISPLAY_NAME));
+    setDisplayName(::Core::Tr::tr(Constants::PROFILE_EDITOR_DISPLAY_NAME));
     addMimeType(Constants::PROFILE_MIMETYPE);
     addMimeType(Constants::PROINCLUDEFILE_MIMETYPE);
     addMimeType(Constants::PROFEATUREFILE_MIMETYPE);
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h
index 6c0032fd69..b97e1e6320 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h
@@ -13,7 +13,7 @@ const char M_CONTEXT[] = "ProFileEditor.ContextMenu";
 
 // Kinds
 const char PROFILE_EDITOR_ID[] = "Qt4.proFileEditor";
-const char PROFILE_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", ".pro File Editor");
+const char PROFILE_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Core", ".pro File Editor");
 const char PROFILE_MIMETYPE[] = "application/vnd.qt.qmakeprofile";
 const char PROINCLUDEFILE_MIMETYPE [] = "application/vnd.qt.qmakeproincludefile";
 const char PROFEATUREFILE_MIMETYPE [] = "application/vnd.qt.qmakeprofeaturefile";
diff --git a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
index 0ecb39d50c..2b0b9f16e9 100644
--- a/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/bindingeditor/bindingeditorwidget.cpp
@@ -3,14 +3,15 @@
 
 #include "bindingeditorwidget.h"
 
-#include <coreplugin/icore.h>
 #include <coreplugin/actionmanager/actionmanager.h>
-#include <qmljseditor/qmljseditor.h>
+#include <coreplugin/coreplugintr.h>
+#include <coreplugin/icore.h>
+#include <qmljseditor/qmljsautocompleter.h>
 #include <qmljseditor/qmljscompletionassist.h>
+#include <qmljseditor/qmljseditor.h>
+#include <qmljseditor/qmljseditordocument.h>
 #include <qmljseditor/qmljshighlighter.h>
 #include <qmljseditor/qmljshoverhandler.h>
-#include <qmljseditor/qmljsautocompleter.h>
-#include <qmljseditor/qmljseditordocument.h>
 #include <qmljseditor/qmljssemantichighlighter.h>
 #include <qmljstools/qmljsindenter.h>
 #include <qmljstools/qmljstoolsconstants.h>
@@ -114,7 +115,7 @@ void BindingDocument::triggerPendingUpdates()
 BindingEditorFactory::BindingEditorFactory()
 {
     setId(BINDINGEDITOR_CONTEXT_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", BINDINGEDITOR_CONTEXT_ID));
+    setDisplayName(::Core::Tr::tr("Binding Editor"));
     setEditorActionHandlers(0);
     addMimeType(BINDINGEDITOR_CONTEXT_ID);
     addMimeType(QmlJSTools::Constants::QML_MIMETYPE);
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 7b1fdbe092..3fe639b5d8 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -41,6 +41,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/featureprovider.h>
@@ -55,8 +56,8 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
-#include <sqlitelibraryinitializer.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
+#include <sqlitelibraryinitializer.h>
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
@@ -112,7 +113,7 @@ public:
 QtQuickDesignerFactory::QtQuickDesignerFactory()
     : QmlJSEditorFactory(QmlJSEditor::Constants::C_QTQUICKDESIGNEREDITOR_ID)
 {
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Qt Quick Designer"));
+    setDisplayName(::Core::Tr::tr("Qt Quick Designer"));
 
     addMimeType(QmlJSTools::Constants::QMLUI_MIMETYPE);
     setDocumentCreator([this]() {
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 8a515d9722..590ef1da58 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -33,6 +33,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/designmode.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
@@ -1094,7 +1095,7 @@ QmlJSEditorFactory::QmlJSEditorFactory()
 QmlJSEditorFactory::QmlJSEditorFactory(Utils::Id _id)
 {
     setId(_id);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "QMLJS Editor"));
+    setDisplayName(::Core::Tr::tr("QMLJS Editor"));
 
     addMimeType(QmlJSTools::Constants::QML_MIMETYPE);
     addMimeType(QmlJSTools::Constants::QMLPROJECT_MIMETYPE);
diff --git a/src/plugins/qtsupport/externaleditors.cpp b/src/plugins/qtsupport/externaleditors.cpp
index e65d85ea25..bed8b7618f 100644
--- a/src/plugins/qtsupport/externaleditors.cpp
+++ b/src/plugins/qtsupport/externaleditors.cpp
@@ -3,6 +3,8 @@
 
 #include "externaleditors.h"
 
+#include <coreplugin/coreplugintr.h>
+
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -254,7 +256,7 @@ static void processTerminated(const QString &binary)
 DesignerExternalEditor::DesignerExternalEditor()
 {
     setId("Qt.Designer");
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Qt Designer"));
+    setDisplayName(::Core::Tr::tr("Qt Designer"));
     setMimeTypes({ProjectExplorer::Constants::FORM_MIMETYPE});
 }
 
@@ -327,7 +329,7 @@ static QString linguistBinary(const QtSupport::QtVersion *qtVersion)
 LinguistEditor::LinguistEditor()
 {
     setId("Qt.Linguist");
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", "Qt Linguist"));
+    setDisplayName(::Core::Tr::tr("Qt Linguist"));
     setMimeTypes({ProjectExplorer::Constants::LINGUIST_MIMETYPE});
 }
 
diff --git a/src/plugins/resourceeditor/resourceeditorconstants.h b/src/plugins/resourceeditor/resourceeditorconstants.h
index 82acdc4c3e..82872c1ac5 100644
--- a/src/plugins/resourceeditor/resourceeditorconstants.h
+++ b/src/plugins/resourceeditor/resourceeditorconstants.h
@@ -10,7 +10,7 @@ namespace Constants {
 
 const char C_RESOURCEEDITOR[] = "Qt4.ResourceEditor";
 const char RESOURCEEDITOR_ID[] = "Qt4.ResourceEditor";
-const char C_RESOURCEEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Resource Editor");
+const char C_RESOURCEEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Core", "Resource Editor");
 
 const char REFRESH[] = "ResourceEditor.Refresh";
 
diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp
index 6922803890..69ccefbe33 100644
--- a/src/plugins/resourceeditor/resourceeditorfactory.cpp
+++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp
@@ -8,6 +8,7 @@
 #include "resourceeditorw.h"
 
 #include <coreplugin/editormanager/editormanager.h>
+#include <coreplugin/coreplugintr.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/fsengine/fileiconprovider.h>
 
@@ -21,7 +22,7 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin)
 {
     setId(RESOURCEEDITOR_ID);
     setMimeTypes(QStringList(QLatin1String(C_RESOURCE_MIMETYPE)));
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", C_RESOURCEEDITOR_DISPLAY_NAME));
+    setDisplayName(::Core::Tr::tr(C_RESOURCEEDITOR_DISPLAY_NAME));
 
     Utils::FileIconProvider::registerIconOverlayForSuffix(
                 ProjectExplorer::Constants::FILEOVERLAY_QRC, "qrc");
diff --git a/src/plugins/scxmleditor/scxmleditorconstants.h b/src/plugins/scxmleditor/scxmleditorconstants.h
index 49670ba395..13b9fe2fc5 100644
--- a/src/plugins/scxmleditor/scxmleditorconstants.h
+++ b/src/plugins/scxmleditor/scxmleditorconstants.h
@@ -11,7 +11,7 @@ namespace Constants {
 const char INFO_READ_ONLY[] = "ScxmlEditor.ReadOnly";
 
 const char C_SCXMLEDITOR[] = "Qt5.ScxmlEditor";
-const char C_SCXMLEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "SCXML Editor");
+const char C_SCXMLEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Core", "SCXML Editor");
 
 const char K_SCXML_EDITOR_ID[] = "ScxmlEditor.XmlEditor";
 const char C_SCXML_EDITOR[] = "Scxml Editor";
diff --git a/src/plugins/scxmleditor/scxmleditorfactory.cpp b/src/plugins/scxmleditor/scxmleditorfactory.cpp
index c89871dc35..55b8692205 100644
--- a/src/plugins/scxmleditor/scxmleditorfactory.cpp
+++ b/src/plugins/scxmleditor/scxmleditorfactory.cpp
@@ -6,6 +6,7 @@
 #include "scxmleditorconstants.h"
 #include "scxmleditordata.h"
 
+#include <coreplugin/coreplugintr.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/fsengine/fileiconprovider.h>
@@ -19,7 +20,7 @@ using namespace ScxmlEditor::Internal;
 ScxmlEditorFactory::ScxmlEditorFactory()
 {
     setId(K_SCXML_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", C_SCXMLEDITOR_DISPLAY_NAME));
+    setDisplayName(::Core::Tr::tr(C_SCXMLEDITOR_DISPLAY_NAME));
     addMimeType(ProjectExplorer::Constants::SCXML_MIMETYPE);
 
     Utils::FileIconProvider::registerIconOverlayForSuffix(":/projectexplorer/images/fileoverlay_scxml.png", "scxml");
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index 25eeeff764..a28f05e38e 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -12,6 +12,7 @@
 #include "textindenter.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/coreplugintr.h>
 #include <utils/infobar.h>
 #include <utils/qtcassert.h>
 
@@ -36,7 +37,7 @@ PlainTextEditorFactory::PlainTextEditorFactory()
     QTC_CHECK(!m_instance);
     m_instance = this;
     setId(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID);
-    setDisplayName(QCoreApplication::translate("OpenWith::Editors", Core::Constants::K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME));
+    setDisplayName(::Core::Tr::tr(Core::Constants::K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME));
     addMimeType(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT));
     addMimeType(QLatin1String("text/css")); // for some reason freedesktop thinks css is text/x-csrc
     addHoverHandler(new BaseHoverHandler);