aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2023-02-03 16:46:59 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2023-02-06 22:45:18 +0000
commitc4f6887b1d880e17899fdf0d1643c5d60caa951f (patch)
tree3d5a069033e3386633409185171e74a2ae949172
parentb919171375652d612ad5bc1a31fd9f9a3402a10a (diff)
GlslEditor: Tr::tr()
Change-Id: I261cad5b85535d42a9b96d1a0ade53dbc7addf86 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-rw-r--r--share/qtcreator/translations/qtcreator_cs.ts12
-rw-r--r--share/qtcreator/translations/qtcreator_da.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_de.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_fr.ts15
-rw-r--r--share/qtcreator/translations/qtcreator_hr.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_ja.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_pl.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_ru.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_sl.ts12
-rw-r--r--share/qtcreator/translations/qtcreator_uk.ts19
-rw-r--r--share/qtcreator/translations/qtcreator_zh_CN.ts9
-rw-r--r--share/qtcreator/translations/qtcreator_zh_TW.ts12
-rw-r--r--src/plugins/glsleditor/glsleditorplugin.cpp4
-rw-r--r--src/plugins/glsleditor/glsleditortr.h4
14 files changed, 18 insertions, 123 deletions
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index 50a6ae3a8fb..fcfac6a2a09 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -30957,14 +30957,7 @@ když bude zavolán mimo git bash.</translation>
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
- <name>GLSLEditor::Internal::GLSLEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
@@ -31002,9 +30995,6 @@ když bude zavolán mimo git bash.</translation>
<source>Vertex Shader (Desktop OpenGL)</source>
<translation>Vertex Shader (Desktop OpenGL)</translation>
</message>
-</context>
-<context>
- <name>GLSLEditor::GLSLFileWizard</name>
<message>
<source>New %1</source>
<translation>Nový %1</translation>
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index 1ad75507045..2d869f5a331 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -15027,13 +15027,6 @@ når de ikke kræves, hvilket i de fleste tilfælde vil forbedre ydelsen.</trans
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
<name>::Autotest</name>
<message>
<source>Google Test</source>
@@ -17161,7 +17154,7 @@ Lad være tom for at gennemsøge filsystemet.</translation>
</message>
</context>
<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index e054f6b3131..eb385c821d2 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -16292,13 +16292,6 @@ konnte nicht unter Versionsverwaltung (%2) gestellt werden
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
<name>::Macros</name>
<message>
<source>Text Editing Macros</source>
@@ -33662,7 +33655,7 @@ Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anw
</message>
</context>
<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index b05f1711e09..57a06d9884e 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -29843,21 +29843,11 @@ Do you want to retry?</source>
</message>
</context>
<context>
- <name>GLSLEditor::Internal::FunctionArgumentWidget</name>
+ <name>::GlslEditor</name>
<message>
<source>%1 of %2</source>
<translation type="obsolete">%1 de %2</translation>
</message>
-</context>
-<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
- <name>GLSLEditor::Internal::GLSLEditorPlugin</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
@@ -29895,9 +29885,6 @@ Do you want to retry?</source>
<source>Vertex Shader (Desktop OpenGL)</source>
<translation>Vertex shader (OpenGL)</translation>
</message>
-</context>
-<context>
- <name>GLSLEditor::GLSLFileWizard</name>
<message>
<source>New %1</source>
<translation>Nouveau %1</translation>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index 8d3ce7b8ece..c99439ab236 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -24009,14 +24009,7 @@ instead of its installation directory when run outside git bash.</source>
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 90dd8946ddd..1c2ec847100 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -20706,13 +20706,6 @@ instead of its installation directory when run outside git bash.</source>
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>シェーダ記述言語(GLSL)</translation>
- </message>
-</context>
-<context>
<name>::Help</name>
<message>
<source>Help</source>
@@ -38768,7 +38761,7 @@ Leave empty to search through the file system.</source>
</message>
</context>
<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 1e8bfdf9170..15de566f1ea 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -14887,13 +14887,6 @@ Ponowić próbę?</translation>
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
<name>::Macros</name>
<message>
<source>Text Editing Macros</source>
@@ -30301,7 +30294,7 @@ Use this only if you are prototyping. You cannot create a full application with
</message>
</context>
<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 5715fedf828..18530f6bd7d 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -18748,13 +18748,6 @@ when they are not required, which will improve performance in most cases.</sourc
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation></translation>
- </message>
-</context>
-<context>
<name>::Autotest</name>
<message>
<source>Google Test</source>
@@ -21143,7 +21136,7 @@ Leave empty to search through the file system.</source>
</message>
</context>
<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 809ce57844f..bfc5e00f2c6 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -21598,14 +21598,7 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen.</translation>
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
- <name>GLSLEditor::Internal::GLSLEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu
@@ -21644,9 +21637,6 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen.</translation>
<source>Vertex Shader (Desktop OpenGL)</source>
<translation>Senčilnik za oglišča (Desktop OpenGL)</translation>
</message>
-</context>
-<context>
- <name>GLSLEditor::GLSLFileWizard</name>
<message>
<source>New %1</source>
<translation>Nov %1</translation>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index f9d72d149df..7493f4a7fbc 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -7618,26 +7618,11 @@ will also disable the following plugins:
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
- <name>GLSLEditor::GLSLFileWizard</name>
+ <name>::GlslEditor</name>
<message>
<source>New %1</source>
<translation type="vanished">Новий %1</translation>
</message>
-</context>
-<context>
- <name>GLSLEditor::Internal::GLSLEditorPlugin</name>
- <message>
- <source>GLSL</source>
- <extracomment>GLSL sub-menu in the Tools menu</extracomment>
- <translation type="vanished">GLSL</translation>
- </message>
<message>
<source>Creates a fragment shader in the OpenGL/ES 2.0 Shading Language (GLSL/ES). Fragment shaders generate the final pixel colors for triangles, points and lines rendered with OpenGL.</source>
<translation type="vanished">Створює фрагментний шейдер мовою шейдерів OpenGL/ES 2.0 (GLSL/ES). Фрагментний шейдер генерує остаточні кольори пікселів для трикутників, точок та ліній, що відмальовуються за допомогою OpenGL.</translation>
@@ -38577,7 +38562,7 @@ Preselects a desktop Qt for building the application if available.</source>
</message>
</context>
<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts
index 2a004d7af3a..16707adf67c 100644
--- a/share/qtcreator/translations/qtcreator_zh_CN.ts
+++ b/share/qtcreator/translations/qtcreator_zh_CN.ts
@@ -19185,13 +19185,6 @@ will also disable the following plugins:
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
<name>::CppEditor</name>
<message>
<source>Constructor</source>
@@ -21731,7 +21724,7 @@ Note: This can expose you to man-in-the-middle attack.</source>
</message>
</context>
<context>
- <name>GlslEditor::Internal::GlslEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts
index 5b922f9382d..c31fe46819f 100644
--- a/share/qtcreator/translations/qtcreator_zh_TW.ts
+++ b/share/qtcreator/translations/qtcreator_zh_TW.ts
@@ -18791,14 +18791,7 @@ Do you want to retry?</source>
</message>
</context>
<context>
- <name>::GLSLEditor</name>
- <message>
- <source>GLSL</source>
- <translation>GLSL</translation>
- </message>
-</context>
-<context>
- <name>GLSLEditor::Internal::GLSLEditorPlugin</name>
+ <name>::GlslEditor</name>
<message>
<source>GLSL</source>
<extracomment>GLSL sub-menu in the Tools menu</extracomment>
@@ -18836,9 +18829,6 @@ Do you want to retry?</source>
<source>Vertex Shader (Desktop OpenGL)</source>
<translation type="unfinished">頂點著色器 (Desktop OpenGL)</translation>
</message>
-</context>
-<context>
- <name>GLSLEditor::GLSLFileWizard</name>
<message>
<source>New %1</source>
<translation>新增 %1 </translation>
diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp
index eff94565279..5d238a4f2b4 100644
--- a/src/plugins/glsleditor/glsleditorplugin.cpp
+++ b/src/plugins/glsleditor/glsleditorplugin.cpp
@@ -2,9 +2,11 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "glsleditorplugin.h"
+
#include "glslcompletionassist.h"
#include "glsleditor.h"
#include "glsleditorconstants.h"
+#include "glsleditortr.h"
#include "glslhighlighter.h"
#include <glsl/glslengine.h>
@@ -101,7 +103,7 @@ void GlslEditorPlugin::initialize()
glslToolsMenu->setOnAllDisabledBehavior(ActionContainer::Hide);
QMenu *menu = glslToolsMenu->menu();
//: GLSL sub-menu in the Tools menu
- menu->setTitle(tr("GLSL"));
+ menu->setTitle(Tr::tr("GLSL"));
ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(glslToolsMenu);
// Insert marker for "Refactoring" menu:
diff --git a/src/plugins/glsleditor/glsleditortr.h b/src/plugins/glsleditor/glsleditortr.h
index 8c16d30d486..e5c4023c932 100644
--- a/src/plugins/glsleditor/glsleditortr.h
+++ b/src/plugins/glsleditor/glsleditortr.h
@@ -5,11 +5,11 @@
#include <QCoreApplication>
-namespace GLSLEditor {
+namespace GlslEditor {
struct Tr
{
- Q_DECLARE_TR_FUNCTIONS(::GLSLEditor)
+ Q_DECLARE_TR_FUNCTIONS(::GlslEditor)
};
} // namespace GLSLEditor