Nim: Convert to Tr::tr

Change-Id: Iad4641479d566347ef9acdfb0a04f37907ac4a2d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

34 files changed, 132 insertions, 716 deletions

diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index cf54251fc4..f11aa1e9c3 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -21036,21 +21036,15 @@ Fejl: %5</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimBuildConfigurationFactory</name>
+    <name>Nim</name>
     <message>
         <source>Build</source>
         <translation>Byg</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfigurationWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>Bygmappe:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStepConfigWidget</name>
     <message>
         <source>Target:</source>
         <translation>Mål:</translation>
@@ -21079,16 +21073,10 @@ Fejl: %5</translation>
         <source>Release</source>
         <translation>Udgivelse</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStepFactory</name>
     <message>
         <source>Nim Compiler Build Step</source>
         <translation>Nim-kompiler byggetrin</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStep</name>
     <message>
         <source>Nim Clean Step</source>
         <translation>Nim renstrin</translation>
@@ -21109,24 +21097,15 @@ Fejl: %5</translation>
         <source>Clean step completed successfully.</source>
         <translation>Renstrin fuldført.</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStepConfigWidget</name>
     <message>
         <source>Working directory:</source>
         <translation>Arbejdsmappe:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimPlugin</name>
     <message>
         <source>Nim</source>
         <comment>SnippetProvider</comment>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimProject</name>
     <message>
         <source>Scanning for Nim files</source>
         <translation>Skanner efter Nim-filer</translation>
@@ -21139,9 +21118,6 @@ Fejl: %5</translation>
         <source>Nim compiler does not exist.</source>
         <translation>Nim-kompiler findes ikke.</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimSettings</name>
     <message>
         <source>Global</source>
         <comment>Settings</comment>
@@ -21151,9 +21127,6 @@ Fejl: %5</translation>
         <source>Nim</source>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimToolChainConfigWidget</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>&amp;Kompilersti:</translation>
@@ -21162,62 +21135,22 @@ Fejl: %5</translation>
         <source>&amp;Compiler version:</source>
         <translation>&amp;Kompiler-version:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimToolChainFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimBuildConfigurationWidget</name>
     <message>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStylePreferencesFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimCodeStyleSettingsPage</name>
     <message>
         <source>Code Style</source>
         <translation>Kodestil</translation>
     </message>
     <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimCompilerBuildStep</name>
-    <message>
-        <source>Nim Compiler Build Step</source>
-        <translation>Nim-kompiler byggetrin</translation>
-    </message>
-</context>
-<context>
-    <name>NimCompilerBuildStepConfigWidget</name>
-    <message>
         <source>Nim build step</source>
         <translation>Nim-byggetrin</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepFactory</name>
     <message>
         <source>Nim Compiler Clean Step</source>
         <translation>Nim-kompiler renstrin</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepWidget</name>
     <message>
         <source>Nim clean step</source>
         <translation>Nim renstrin</translation>
@@ -42742,20 +42675,13 @@ Vil du overskrive dem?</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimRunConfiguration</name>
+    <name>Nim</name>
     <message>
         <source>Current Build Target</source>
         <translation>Aktuelle byggemål</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimCodeStyleSettingsPage</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
     <name>ProjectExplorer::BuildStepList</name>
     <message>
         <source>Build</source>
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 675304a58f..704edc9a2e 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -35294,7 +35294,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimCompilerBuildStepConfigWidget</name>
+    <name>Nim</name>
     <message>
         <source>Target:</source>
         <translation>Ziel:</translation>
@@ -35771,21 +35771,15 @@ Siehe auch die Einstellungen für Google Test.</translation>
     </message>
 </context>
 <context>
-    <name>NimCompilerBuildStep</name>
+    <name>Nim</name>
     <message>
         <source>Nim Compiler Build Step</source>
         <translation>Nim-Compiler Build-Schritt</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerBuildStepConfigWidget</name>
     <message>
         <source>Nim build step</source>
         <translation>Nim-Build-Schritt</translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStyleSettingsPage</name>
     <message>
         <source>Code Style</source>
         <translation>Coding-Stil</translation>
@@ -35794,16 +35788,6 @@ Siehe auch die Einstellungen für Google Test.</translation>
         <source>Nim</source>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStylePreferencesFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStep</name>
     <message>
         <source>Nim Clean Step</source>
         <translation>Nim-Schritt zur Bereinigung</translation>
@@ -35832,18 +35816,11 @@ Siehe auch die Einstellungen für Google Test.</translation>
         <source>Nim Compiler Clean Step</source>
         <translation>Nim-Compiler-Schritt zur Bereinigung</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimSettings</name>
     <message>
         <source>Global</source>
         <comment>Settings</comment>
         <translation>Global</translation>
     </message>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
 </context>
 <context>
     <name>ProjectExplorer::CustomExecutableRunConfiguration</name>
@@ -37741,15 +37718,12 @@ Ablaufdatum: %3</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimPlugin</name>
+    <name>Nim</name>
     <message>
         <source>Nim</source>
         <comment>SnippetProvider</comment>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimProject</name>
     <message>
         <source>No Nim compiler set.</source>
         <translation>Es ist kein Nim-Compiler eingerichtet.</translation>
@@ -37758,9 +37732,6 @@ Ablaufdatum: %3</translation>
         <source>Nim compiler does not exist.</source>
         <translation>Der Nim-Compiler existiert nicht.</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimToolChainConfigWidget</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>&amp;Compiler-Pfad:</translation>
@@ -40861,7 +40832,7 @@ Möchten Sie sie überschreiben?</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimRunConfiguration</name>
+    <name>Nim</name>
     <message>
         <source>Current Build Target</source>
         <translation>Aktuelles Build-Ziel</translation>
@@ -41922,11 +41893,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
     </message>
 </context>
 <context>
-    <name>Nim::NimCompilerBuildStep</name>
-    <message>
-        <source>Nim Compiler Build Step</source>
-        <translation>Nim-Compiler Build-Schritt</translation>
-    </message>
+    <name>Nim</name>
 </context>
 <context>
     <name>ProjectExplorer::MakeStep</name>
@@ -42198,7 +42165,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
     </message>
 </context>
 <context>
-    <name>Nim::NimToolsSettingsWidget</name>
+    <name>Nim</name>
     <message>
         <source>Nimsuggest</source>
         <translation>Nimsuggest</translation>
@@ -42821,15 +42788,11 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni
     </message>
 </context>
 <context>
-    <name>NimToolsSettingsPage</name>
+    <name>Nim</name>
     <message>
         <source>Tools</source>
         <translation>Werkzeuge</translation>
     </message>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
 </context>
 <context>
     <name>PerfProfiler</name>
@@ -43865,7 +43828,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>Nim::NimbleBuildStepWidget</name>
+    <name>Nim</name>
     <message>
         <source>Arguments:</source>
         <translation>Argumente:</translation>
@@ -46401,27 +46364,13 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>Nim::NimbleBuildConfiguration</name>
+    <name>Nim</name>
     <message>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimBuildConfiguration</name>
-    <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::CodeStyleSettings</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
     <name>ProjectExplorer::Internal::AddRunConfigDialog</name>
     <message>
         <source>Name</source>
@@ -47462,11 +47411,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>Nim::ToolSettingsPage</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
+    <name>Nim</name>
 </context>
 <context>
     <name>ProjextExplorer::Internal::KitOptionsPageWidget</name>
@@ -48273,11 +48218,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>Nim::NimToolChain</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
+    <name>Nim</name>
 </context>
 <context>
     <name>ProjectExplorer::Internal::BuildEnvironmentWidget</name>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index deff7f29d7..84c83f75cc 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -5128,7 +5128,7 @@ Greška: %5</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimCompilerBuildStepConfigWidget</name>
+    <name>Nim</name>
     <message>
         <source>Target:</source>
         <translation>Odredište:</translation>
@@ -5150,23 +5150,13 @@ Greška: %5</translation>
         <translation>Bez</translation>
     </message>
     <message>
-        <source>Debug</source>
-        <translation>Ukloni greške</translation>
-    </message>
-    <message>
         <source>Release</source>
         <translation>Objavi</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStepConfigWidget</name>
     <message>
         <source>Working directory:</source>
         <translation>Radni direktorij:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimToolsSettingsWidget</name>
     <message>
         <source>Nimsuggest</source>
         <translation>Nimsuggest</translation>
@@ -27012,42 +27002,27 @@ Rok upotrebe: %3</translation>
     </message>
 </context>
 <context>
-    <name>NimBuildConfigurationWidget</name>
+    <name>Nim</name>
     <message>
         <source>General</source>
         <translation>Opće</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerBuildStep</name>
     <message>
         <source>Nim Compiler Build Step</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerBuildStepConfigWidget</name>
     <message>
         <source>Nim build step</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepFactory</name>
     <message>
         <source>Nim Compiler Clean Step</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepWidget</name>
     <message>
         <source>Nim clean step</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStyleSettingsPage</name>
     <message>
         <source>Code Style</source>
         <translation>Stil kodiranja</translation>
@@ -27056,35 +27031,15 @@ Rok upotrebe: %3</translation>
         <source>Nim</source>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimToolsSettingsPage</name>
     <message>
         <source>Tools</source>
         <translation>Alati</translation>
     </message>
     <message>
         <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimCodeStylePreferencesFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimPlugin</name>
-    <message>
-        <source>Nim</source>
         <comment>SnippetProvider</comment>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfigurationFactory</name>
     <message>
         <source>Debug</source>
         <translation>Uklanjanje grešaka</translation>
@@ -27094,26 +27049,9 @@ Rok upotrebe: %3</translation>
         <translation>Profil</translation>
     </message>
     <message>
-        <source>Release</source>
-        <translation>Objavljivanje</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfigurationWidget</name>
-    <message>
         <source>Build directory:</source>
         <translation>Direktorij gradnje:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStep</name>
-    <message>
-        <source>Nim Compiler Build Step</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStep</name>
     <message>
         <source>Nim Clean Step</source>
         <translation type="unfinished"></translation>
@@ -27134,9 +27072,6 @@ Rok upotrebe: %3</translation>
         <source>Clean step completed successfully.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimProject</name>
     <message>
         <source>Scanning for Nim files</source>
         <translation>Traženje Nim datoteka</translation>
@@ -27149,23 +27084,10 @@ Rok upotrebe: %3</translation>
         <source>Nim compiler does not exist.</source>
         <translation>Nim kompajler ne postoji.</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimRunConfiguration</name>
     <message>
         <source>Current Build Target</source>
         <translation>Trenutačno odredište gradnje</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimToolChainFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimToolChainConfigWidget</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>Staza za &amp;kompajler:</translation>
@@ -27174,32 +27096,11 @@ Rok upotrebe: %3</translation>
         <source>&amp;Compiler version:</source>
         <translation>Verzija &amp;kompajlera:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCodeStyleSettingsPage</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimSettings</name>
     <message>
         <source>Global</source>
         <comment>Settings</comment>
         <translation>Globalno</translation>
     </message>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimToolsSettingsPage</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
 </context>
 <context>
     <name>Perforce::Internal::PerforceChecker</name>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index d6b1ea9665..428aef36a7 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -44262,7 +44262,7 @@ Android パッケージソースディレクトリのファイルはビルドデ
     </message>
 </context>
 <context>
-    <name>Nim::NimCompilerBuildStepConfigWidget</name>
+    <name>Nim</name>
     <message>
         <source>Form</source>
         <translation>フォーム</translation>
@@ -44295,13 +44295,6 @@ Android パッケージソースディレクトリのファイルはビルドデ
         <source>Release</source>
         <translation>リリース</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStepConfigWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>フォーム</translation>
-    </message>
     <message>
         <source>Working directory:</source>
         <translation>作業ディレクトリ:</translation>
@@ -44586,49 +44579,31 @@ Output:
     </message>
 </context>
 <context>
-    <name>NimRunConfiguration</name>
+    <name>Nim</name>
     <message>
         <source>Current Build Target</source>
         <translation>現在のビルドターゲット</translation>
     </message>
-</context>
-<context>
-    <name>NimBuildConfigurationWidget</name>
     <message>
         <source>General</source>
         <translation>一般</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerBuildStep</name>
     <message>
         <source>Nim Compiler Build Step</source>
         <translation>Nim コンパイラビルドステップ</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerBuildStepConfigWidget</name>
     <message>
         <source>Nim build step</source>
         <translation>Nim ビルドステップ</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepFactory</name>
     <message>
         <source>Nim Compiler Clean Step</source>
         <translation>Nim コンパイラクリーンステップ</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepWidget</name>
     <message>
         <source>Nim clean step</source>
         <translation>Nim クリーンステップ</translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStyleSettingsPage</name>
     <message>
         <source>Code Style</source>
         <translation>コードスタイル</translation>
@@ -44637,44 +44612,14 @@ Output:
         <source>Nim</source>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStylePreferencesFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimSnippetProvider</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfigurationFactory</name>
     <message>
         <source>Build</source>
         <translation>ビルド</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfigurationWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>ビルドディレクトリ:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStepFactory</name>
-    <message>
-        <source>Nim Compiler Build Step</source>
-        <translation>Nim コンパイラビルドステップ</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStep</name>
     <message>
         <source>Nim Clean Step</source>
         <translation>Nim クリーンステップ</translation>
@@ -44684,10 +44629,6 @@ Output:
         <translation>ビルドディレクトリ &quot;%1&quot; が存在しません。</translation>
     </message>
     <message>
-        <source>Working directory:</source>
-        <translation>作業ディレクトリ:</translation>
-    </message>
-    <message>
         <source>Failed to delete the cache directory.</source>
         <translation>キャッシュディレクトリの削除に失敗しました。</translation>
     </message>
@@ -44699,16 +44640,10 @@ Output:
         <source>Clean step completed successfully.</source>
         <translation>クリーンステップが正常に完了しました。</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimProjectManager</name>
     <message>
         <source>Failed opening project &quot;%1&quot;: Project is not a file.</source>
         <translation>プロジェクト &quot;%1&quot; が開けません: プロジェクトがファイルではありません。</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimRunControl</name>
     <message>
         <source>%1 crashed</source>
         <translation>%1 がクラッシュしました</translation>
@@ -44717,18 +44652,11 @@ Output:
         <source>%1 exited with code %2</source>
         <translation>%1 は終了コード %2 で終了しました</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimSettings</name>
     <message>
         <source>Global</source>
         <comment>Settings</comment>
         <translation>グローバル</translation>
     </message>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
 </context>
 <context>
     <name>QmakeProjectManager</name>
@@ -45709,7 +45637,7 @@ Output:
     </message>
 </context>
 <context>
-    <name>Nim::NimToolsSettingsWidget</name>
+    <name>Nim</name>
     <message>
         <source>Path</source>
         <translation>パス</translation>
@@ -49342,97 +49270,18 @@ Stepping into the module or setting breakpoints by file and line is expected to
     </message>
 </context>
 <context>
-    <name>NimToolsSettingsPage</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimPlugin</name>
+    <name>Nim</name>
     <message>
         <source>Nim</source>
         <comment>SnippetProvider</comment>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimbleBuildConfiguration</name>
-    <message>
-        <source>General</source>
-        <translation>一般</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfiguration</name>
-    <message>
-        <source>General</source>
-        <translation>一般</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStep</name>
-    <message>
-        <source>Nim build step</source>
-        <translation>Nim ビルドステップ</translation>
-    </message>
-    <message>
-        <source>Target:</source>
-        <translation>ターゲット:</translation>
-    </message>
-    <message>
-        <source>Default arguments:</source>
-        <translation>デフォルト引数:</translation>
-    </message>
-    <message>
-        <source>Extra arguments:</source>
-        <translation>追加引数:</translation>
-    </message>
-    <message>
-        <source>Command:</source>
-        <translation>コマンド:</translation>
-    </message>
-    <message>
-        <source>Nim Compiler Build Step</source>
-        <translation>Nim コンパイラビルドステップ</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimRunConfiguration</name>
-    <message>
-        <source>Current Build Target</source>
-        <translation>現在のビルドターゲット</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimToolChain</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimToolChainConfigWidget</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>コンパイラのパス(&amp;C):</translation>
     </message>
 </context>
 <context>
-    <name>Nim::CodeStyleSettings</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::ToolSettingsPage</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
     <name>Perforce::Internal::PerforceDiffConfig</name>
     <message>
         <source>Ignore Whitespace</source>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index ba482c9d0f..5f8b7b600a 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -37874,7 +37874,7 @@ Czy nadpisać go?</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimCompilerBuildStepConfigWidget</name>
+    <name>Nim</name>
     <message>
         <source>Form</source>
         <translation>Formularz</translation>
@@ -37907,13 +37907,6 @@ Czy nadpisać go?</translation>
         <source>Release</source>
         <translation>Release</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStepConfigWidget</name>
-    <message>
-        <source>Form</source>
-        <translation>Formularz</translation>
-    </message>
     <message>
         <source>Working directory:</source>
         <translation>Katalog roboczy:</translation>
@@ -38469,49 +38462,31 @@ Komunikat:
     </message>
 </context>
 <context>
-    <name>NimRunConfiguration</name>
+    <name>Nim</name>
     <message>
         <source>Current Build Target</source>
         <translation>Bieżący cel budowania</translation>
     </message>
-</context>
-<context>
-    <name>NimBuildConfigurationWidget</name>
     <message>
         <source>General</source>
         <translation>Ogólne</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerBuildStep</name>
     <message>
         <source>Nim Compiler Build Step</source>
         <translation>Krok budowania kompilatora Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerBuildStepConfigWidget</name>
     <message>
         <source>Nim build step</source>
         <translation>Krok budowania Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepFactory</name>
     <message>
         <source>Nim Compiler Clean Step</source>
         <translation>Krok czyszczenia kompilatora Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimCompilerCleanStepWidget</name>
     <message>
         <source>Nim clean step</source>
         <translation>Krok czyszczenia Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStyleSettingsPage</name>
     <message>
         <source>Code Style</source>
         <translation>Styl kodu</translation>
@@ -38520,37 +38495,14 @@ Komunikat:
         <source>Nim</source>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimCodeStylePreferencesFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfigurationFactory</name>
     <message>
         <source>Build</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfigurationWidget</name>
     <message>
         <source>Build directory:</source>
         <translation>Katalog budowania:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStepFactory</name>
-    <message>
-        <source>Nim Compiler Build Step</source>
-        <translation>Krok budowania kompilatora Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStep</name>
     <message>
         <source>Nim Clean Step</source>
         <translation>Krok czyszczenia Nim</translation>
@@ -38571,18 +38523,11 @@ Komunikat:
         <source>Clean step completed successfully.</source>
         <translation>Krok czyszczenia poprawnie zakończony.</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimSettings</name>
     <message>
         <source>Global</source>
         <comment>Settings</comment>
         <translation>Globalne</translation>
     </message>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
 </context>
 <context>
     <name>ProjectExplorer::Internal::CustomExecutableConfigurationWidget</name>
@@ -41422,7 +41367,7 @@ Termin wygaśnięcia: %3</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimProject</name>
+    <name>Nim</name>
     <message>
         <source>Scanning for Nim files</source>
         <translation>Skanowanie w poszukiwaniu plików Nim</translation>
@@ -41435,16 +41380,6 @@ Termin wygaśnięcia: %3</translation>
         <source>Nim compiler does not exist</source>
         <translation>Brak kompilatora Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimToolChainFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimToolChainConfigWidget</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>Ścieżka do &amp;kompilatora:</translation>
@@ -42111,7 +42046,7 @@ Błąd: %5</translation>
     </message>
 </context>
 <context>
-    <name>Nim::NimPlugin</name>
+    <name>Nim</name>
     <message>
         <source>Nim</source>
         <comment>SnippetProvider</comment>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index b3ccca5111..77d2c6d7cd 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -26906,28 +26906,19 @@ If set to false, the target will be moved straight to the current mouse position
     </message>
 </context>
 <context>
-    <name>Nim::CodeStyleSettings</name>
+    <name>Nim</name>
     <message>
         <source>Nim</source>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimBuildConfiguration</name>
     <message>
         <source>General</source>
         <translation>Основное</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStep</name>
     <message>
         <source>Nim Compiler Build Step</source>
         <translation>Этап сборки компилятора Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerBuildStepConfigWidget</name>
     <message>
         <source>Target:</source>
         <translation>Цель:</translation>
@@ -26956,9 +26947,6 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Release</source>
         <translation>Выпуск</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimCompilerCleanStep</name>
     <message>
         <source>Nim Clean Step</source>
         <translation>Этап очистки компилятора Nim</translation>
@@ -26987,17 +26975,11 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Nim Compiler Clean Step</source>
         <translation>Этап очистки компилятора Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimPlugin</name>
     <message>
         <source>Nim</source>
         <comment>SnippetProvider</comment>
         <translation>Nim</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimProject</name>
     <message>
         <source>No Nim compiler set.</source>
         <translation>Компилятор Nim не задан.</translation>
@@ -27006,36 +26988,16 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Nim compiler does not exist.</source>
         <translation>Компилятор Nim отсутствует.</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimRunConfiguration</name>
     <message>
         <source>Current Build Target</source>
         <translation>Цель текущей сборки</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimSettings</name>
     <message>
         <source>Global</source>
         <comment>Settings</comment>
         <translation>Общие</translation>
     </message>
     <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimToolChain</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimToolChainConfigWidget</name>
-    <message>
         <source>&amp;Compiler path:</source>
         <translation>Путь к &amp;компилятору:</translation>
     </message>
@@ -27043,9 +27005,6 @@ If set to false, the target will be moved straight to the current mouse position
         <source>&amp;Compiler version:</source>
         <translation>&amp;Версия компилятора:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimToolsSettingsWidget</name>
     <message>
         <source>Nimsuggest</source>
         <translation>Nimsuggest</translation>
@@ -27054,23 +27013,10 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Path</source>
         <translation>Путь</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimbleBuildConfiguration</name>
-    <message>
-        <source>General</source>
-        <translation>Основное</translation>
-    </message>
-</context>
-<context>
-    <name>Nim::NimbleBuildStep</name>
     <message>
         <source>Nimble Build</source>
         <translation>Сборка Nimble</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimbleBuildStepWidget</name>
     <message>
         <source>Form</source>
         <translation></translation>
@@ -27083,9 +27029,6 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Reset to Default</source>
         <translation>Сбросить на умолчальные</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimbleTaskStep</name>
     <message>
         <source>Nimble task %1 not found.</source>
         <translation>Не удалось найти задачу Nimble %1.</translation>
@@ -27094,13 +27037,6 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Nimble Task</source>
         <translation>Задача Nimble</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimbleTaskStepWidget</name>
-    <message>
-        <source>Form</source>
-        <translation></translation>
-    </message>
     <message>
         <source>Task arguments:</source>
         <translation>Параметры задачи:</translation>
@@ -27109,77 +27045,22 @@ If set to false, the target will be moved straight to the current mouse position
         <source>Tasks:</source>
         <translation>Задачи:</translation>
     </message>
-</context>
-<context>
-    <name>Nim::NimbleTestConfiguration</name>
     <message>
         <source>Nimble Test</source>
         <translation>Тест Nimble</translation>
     </message>
-</context>
-<context>
-    <name>Nim::ToolSettingsPage</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimCodeStylePreferencesFactory</name>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimCodeStyleSettingsPage</name>
     <message>
         <source>Code Style</source>
         <translation>Стиль кода</translation>
     </message>
     <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimCompilerBuildStep</name>
-    <message>
-        <source>Nim Compiler Build Step</source>
-        <translation>Этап сборки компилятора Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimCompilerBuildStepConfigWidget</name>
-    <message>
         <source>Nim build step</source>
         <translation>Этап сборки Nim</translation>
     </message>
-</context>
-<context>
-    <name>NimToolsSettingsPage</name>
     <message>
         <source>Tools</source>
         <translation>Инструменты</translation>
     </message>
-    <message>
-        <source>Nim</source>
-        <translation>Nim</translation>
-    </message>
-</context>
-<context>
-    <name>NimbleBuildStep</name>
-    <message>
-        <source>Nimble Build</source>
-        <translation>Сборка Nimble</translation>
-    </message>
-</context>
-<context>
-    <name>NimbleTaskStep</name>
-    <message>
-        <source>Nimble Task</source>
-        <translation>Задача Nimble</translation>
-    </message>
 </context>
 <context>
     <name>NoShowCheckbox</name>
diff --git a/src/plugins/nim/editor/nimeditorfactory.cpp b/src/plugins/nim/editor/nimeditorfactory.cpp
index 66a7f49ca0..b514b7e186 100644
--- a/src/plugins/nim/editor/nimeditorfactory.cpp
+++ b/src/plugins/nim/editor/nimeditorfactory.cpp
@@ -7,7 +7,6 @@
 #include "nimcompletionassistprovider.h"
 
 #include "../nimconstants.h"
-#include "../nimplugin.h"
 #include "nimtexteditorwidget.h"
 
 #include <texteditor/texteditoractionhandler.h>
@@ -55,4 +54,4 @@ void NimEditorFactory::decorateEditor(TextEditorWidget *editor)
     editor->textDocument()->setIndenter(new NimIndenter(editor->textDocument()->document()));
 }
 
-}
+} // Nim
diff --git a/src/plugins/nim/editor/nimhighlighter.cpp b/src/plugins/nim/editor/nimhighlighter.cpp
index 577d83dcac..2ded9a5ccf 100644
--- a/src/plugins/nim/editor/nimhighlighter.cpp
+++ b/src/plugins/nim/editor/nimhighlighter.cpp
@@ -92,4 +92,4 @@ int NimHighlighter::highlightLine(const QString &text, int initialState)
     return lexer.state();
 }
 
-}
+} // Nim
diff --git a/src/plugins/nim/editor/nimindenter.cpp b/src/plugins/nim/editor/nimindenter.cpp
index 4bc879382e..4d209a6447 100644
--- a/src/plugins/nim/editor/nimindenter.cpp
+++ b/src/plugins/nim/editor/nimindenter.cpp
@@ -151,4 +151,4 @@ QString NimIndenter::rightTrimmed(const QString &str)
     return QString();
 }
 
-}
+} // Nim
diff --git a/src/plugins/nim/editor/nimtexteditorwidget.cpp b/src/plugins/nim/editor/nimtexteditorwidget.cpp
index a2357323fb..0a3862fb8f 100644
--- a/src/plugins/nim/editor/nimtexteditorwidget.cpp
+++ b/src/plugins/nim/editor/nimtexteditorwidget.cpp
@@ -15,12 +15,11 @@
 #include <QTemporaryFile>
 #include <QTextDocument>
 
-using namespace Nim;
-using namespace Suggest;
+using namespace Nim::Suggest;
 
-namespace {
+namespace Nim {
 
-std::unique_ptr<QTemporaryFile> writeDirtyFile(const TextEditor::TextDocument *doc)
+static std::unique_ptr<QTemporaryFile> writeDirtyFile(const TextEditor::TextDocument *doc)
 {
     auto result = std::make_unique<QTemporaryFile>("qtcnim.XXXXXX.nim");
     QTC_ASSERT(result->open(), return nullptr);
@@ -30,8 +29,6 @@ std::unique_ptr<QTemporaryFile> writeDirtyFile(const TextEditor::TextDocument *d
     return result;
 }
 
-}
-
 NimTextEditorWidget::NimTextEditorWidget(QWidget *parent)
     : TextEditorWidget(parent)
 {
@@ -87,3 +84,5 @@ void NimTextEditorWidget::onFindLinkFinished(Suggest::NimSuggestClientRequest *r
     const Line &line = m_request->lines().front();
     m_callback(Utils::Link{Utils::FilePath::fromString(line.abs_path), line.row, line.column});
 }
+
+} // Nim
diff --git a/src/plugins/nim/nimconstants.h b/src/plugins/nim/nimconstants.h
index 5b0c4d17eb..d8821cf360 100644
--- a/src/plugins/nim/nimconstants.h
+++ b/src/plugins/nim/nimconstants.h
@@ -30,7 +30,6 @@ const char C_NIMBLEBUILDSTEP_ARGUMENTS[] = "Nim.NimbleBuildStep.Arguments";
 
 // NimbleTaskStep
 const char C_NIMBLETASKSTEP_ID[] = "Nim.NimbleTaskStep";
-const char C_NIMBLETASKSTEP_DISPLAY[] = QT_TRANSLATE_NOOP("NimbleTaskStep", "Nimble Task");
 const QString C_NIMBLETASKSTEP_TASKNAME = QStringLiteral("Nim.NimbleTaskStep.TaskName");
 const QString C_NIMBLETASKSTEP_TASKARGS = QStringLiteral("Nim.NimbleTaskStep.TaskArgs");
 
@@ -48,16 +47,12 @@ const char C_NIMPARSE_ID[] = "Nim.NimParse";
 
 const char C_NIMLANGUAGE_ID[] = "Nim";
 const char C_NIMCODESTYLESETTINGSPAGE_ID[] = "Nim.NimCodeStyleSettings";
-const char C_NIMCODESTYLESETTINGSPAGE_DISPLAY[] = QT_TRANSLATE_NOOP("NimCodeStyleSettingsPage", "Code Style");
 const char C_NIMCODESTYLESETTINGSPAGE_CATEGORY[] = "Z.Nim";
-const char C_NIMCODESTYLESETTINGSPAGE_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("NimCodeStyleSettingsPage", "Nim");
 
 const char C_NIMTOOLSSETTINGSPAGE_ID[] = "Nim.NimToolsSettings";
-const char C_NIMTOOLSSETTINGSPAGE_DISPLAY[] = QT_TRANSLATE_NOOP("NimToolsSettingsPage", "Tools");
 const char C_NIMTOOLSSETTINGSPAGE_CATEGORY[] = "Z.Nim";
-const char C_NIMTOOLSSETTINGSPAGE_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("NimToolsSettingsPage", "Nim");
 
-const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("NimCodeStylePreferencesFactory", "Nim");
+const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("Nim", "Nim");
 const char C_NIMGLOBALCODESTYLE_ID[] = "NimGlobal";
 const QString C_NIMSNIPPETSGROUP_ID = QStringLiteral("Nim.NimSnippetsGroup");
 
diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp
index b1b5329432..eeac1db145 100644
--- a/src/plugins/nim/nimplugin.cpp
+++ b/src/plugins/nim/nimplugin.cpp
@@ -4,6 +4,7 @@
 #include "nimplugin.h"
 
 #include "nimconstants.h"
+#include "nimtr.h"
 #include "editor/nimeditorfactory.h"
 #include "project/nimblerunconfiguration.h"
 #include "project/nimblebuildconfiguration.h"
@@ -94,7 +95,7 @@ bool NimPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     ToolChainManager::registerLanguage(Constants::C_NIMLANGUAGE_ID, Constants::C_NIMLANGUAGE_NAME);
 
     TextEditor::SnippetProvider::registerGroup(Constants::C_NIMSNIPPETSGROUP_ID,
-                                               tr("Nim", "SnippetProvider"),
+                                               Tr::tr("Nim", "SnippetProvider"),
                                                &NimEditorFactory::decorateEditor);
 
     ProjectManager::registerProjectType<NimProject>(Constants::C_NIM_PROJECT_MIMETYPE);
diff --git a/src/plugins/nim/project/nimblebuildconfiguration.cpp b/src/plugins/nim/project/nimblebuildconfiguration.cpp
index f4d48be2e5..5946f511a8 100644
--- a/src/plugins/nim/project/nimblebuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimblebuildconfiguration.cpp
@@ -4,9 +4,7 @@
 #include "nimblebuildconfiguration.h"
 
 #include "nimconstants.h"
-//#include "nimblebuildstep.h"
-#include "nimbleproject.h"
-#include "nimblebuildsystem.h"
+#include "nimtr.h"
 
 #include <projectexplorer/buildinfo.h>
 #include <projectexplorer/buildstep.h>
@@ -14,20 +12,16 @@
 #include <projectexplorer/kit.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
-#include <utils/fileutils.h>
-#include <utils/osspecificaspects.h>
 
-#include <QFileInfo>
-#include <QDir>
-
-using namespace Nim;
 using namespace ProjectExplorer;
 using namespace Utils;
 
-NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Utils::Id id)
+namespace Nim {
+
+NimbleBuildConfiguration::NimbleBuildConfiguration(Target *target, Id id)
     : BuildConfiguration(target, id)
 {
-    setConfigWidgetDisplayName(tr("General"));
+    setConfigWidgetDisplayName(Tr::tr("General"));
     setConfigWidgetHasFrame(true);
     setBuildDirectorySettingsKey("Nim.NimbleBuildConfiguration.BuildDirectory");
     appendInitialBuildStep(Constants::C_NIMBLEBUILDSTEP_ID);
@@ -82,8 +76,10 @@ NimbleBuildConfigurationFactory::NimbleBuildConfigurationFactory()
             return info;
         };
         return QList<BuildInfo>{
-            oneBuild(BuildConfiguration::Debug, BuildConfiguration::tr("Debug")),
-            oneBuild(BuildConfiguration::Release, BuildConfiguration::tr("Release"))
+            oneBuild(BuildConfiguration::Debug, Tr::tr("Debug")),
+            oneBuild(BuildConfiguration::Release, Tr::tr("Release"))
         };
     });
 }
+
+} // Nim
diff --git a/src/plugins/nim/project/nimblebuildstep.cpp b/src/plugins/nim/project/nimblebuildstep.cpp
index 089d7813f2..ad0fe90a38 100644
--- a/src/plugins/nim/project/nimblebuildstep.cpp
+++ b/src/plugins/nim/project/nimblebuildstep.cpp
@@ -6,6 +6,7 @@
 #include "nimconstants.h"
 #include "nimbuildsystem.h"
 #include "nimoutputtaskparser.h"
+#include "nimtr.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/processparameters.h>
@@ -19,8 +20,6 @@ namespace Nim {
 
 class NimbleBuildStep : public AbstractProcessStep
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimbleBuilStep)
-
 public:
     NimbleBuildStep(BuildStepList *parentList, Id id);
 
@@ -77,7 +76,7 @@ QString NimbleBuildStep::defaultArguments() const
 NimbleBuildStepFactory::NimbleBuildStepFactory()
 {
     registerStep<NimbleBuildStep>(Constants::C_NIMBLEBUILDSTEP_ID);
-    setDisplayName(NimbleBuildStep::tr("Nimble Build"));
+    setDisplayName(Tr::tr("Nimble Build"));
     setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
     setSupportedConfiguration(Constants::C_NIMBLEBUILDCONFIGURATION_ID);
     setRepeatable(true);
diff --git a/src/plugins/nim/project/nimblebuildsystem.cpp b/src/plugins/nim/project/nimblebuildsystem.cpp
index 973d05b85f..ae8f7a7e58 100644
--- a/src/plugins/nim/project/nimblebuildsystem.cpp
+++ b/src/plugins/nim/project/nimblebuildsystem.cpp
@@ -4,8 +4,6 @@
 #include "nimblebuildsystem.h"
 
 #include "nimbuildsystem.h"
-#include "nimbleproject.h"
-#include "nimproject.h"
 #include "../nimconstants.h"
 
 #include <projectexplorer/target.h>
diff --git a/src/plugins/nim/project/nimbleproject.cpp b/src/plugins/nim/project/nimbleproject.cpp
index 9bf886b0c5..cbb61d3b64 100644
--- a/src/plugins/nim/project/nimbleproject.cpp
+++ b/src/plugins/nim/project/nimbleproject.cpp
@@ -9,9 +9,10 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <utils/qtcassert.h>
 
-using namespace Nim;
 using namespace ProjectExplorer;
 
+namespace Nim {
+
 NimbleProject::NimbleProject(const Utils::FilePath &fileName)
     : ProjectExplorer::Project(Constants::C_NIMBLE_MIMETYPE, fileName)
 {
@@ -46,4 +47,4 @@ void NimbleProject::setExcludedFiles(const QStringList &excludedFiles)
     m_excludedFiles = excludedFiles;
 }
 
-
+} // Nim
diff --git a/src/plugins/nim/project/nimbleproject.h b/src/plugins/nim/project/nimbleproject.h
index 202c3136ad..76231f1d53 100644
--- a/src/plugins/nim/project/nimbleproject.h
+++ b/src/plugins/nim/project/nimbleproject.h
@@ -28,4 +28,4 @@ protected:
     QStringList m_excludedFiles;
 };
 
-}
+} // Nim
diff --git a/src/plugins/nim/project/nimblerunconfiguration.cpp b/src/plugins/nim/project/nimblerunconfiguration.cpp
index 77b9ffa31d..a3744d0a37 100644
--- a/src/plugins/nim/project/nimblerunconfiguration.cpp
+++ b/src/plugins/nim/project/nimblerunconfiguration.cpp
@@ -5,6 +5,7 @@
 
 #include "nimbuildsystem.h"
 #include "nimconstants.h"
+#include "nimtr.h"
 
 #include <projectexplorer/localenvironmentaspect.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -23,8 +24,6 @@ namespace Nim {
 
 class NimbleRunConfiguration : public RunConfiguration
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimbleRunConfiguration)
-
 public:
     NimbleRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
@@ -61,8 +60,6 @@ NimbleRunConfigurationFactory::NimbleRunConfigurationFactory()
 
 class NimbleTestConfiguration : public RunConfiguration
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimbleTestConfiguration)
-
 public:
     NimbleTestConfiguration(ProjectExplorer::Target *target, Utils::Id id)
         : RunConfiguration(target, id)
@@ -74,8 +71,8 @@ public:
                 ->setDefaultWorkingDirectory(project()->projectDirectory());
         addAspect<TerminalAspect>();
 
-        setDisplayName(tr("Nimble Test"));
-        setDefaultDisplayName(tr("Nimble Test"));
+        setDisplayName(Tr::tr("Nimble Test"));
+        setDefaultDisplayName(Tr::tr("Nimble Test"));
     }
 };
 
diff --git a/src/plugins/nim/project/nimbletaskstep.cpp b/src/plugins/nim/project/nimbletaskstep.cpp
index 6a858f3281..2376dcb498 100644
--- a/src/plugins/nim/project/nimbletaskstep.cpp
+++ b/src/plugins/nim/project/nimbletaskstep.cpp
@@ -5,7 +5,7 @@
 
 #include "nimconstants.h"
 #include "nimblebuildsystem.h"
-#include "nimbleproject.h"
+#include "nimtr.h"
 
 #include <projectexplorer/abstractprocessstep.h>
 #include <projectexplorer/buildstep.h>
@@ -32,8 +32,6 @@ namespace Nim {
 
 class NimbleTaskStep final : public AbstractProcessStep
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimbleTaskStep)
-
 public:
     NimbleTaskStep(BuildStepList *parentList, Id id);
 
@@ -59,8 +57,9 @@ private:
 NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Id id)
     : AbstractProcessStep(parentList, id)
 {
-    setDefaultDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY));
-    setDisplayName(tr(Constants::C_NIMBLETASKSTEP_DISPLAY));
+    const QString display = Tr::tr("Nimble Task");
+    setDefaultDisplayName(display);
+    setDisplayName(display);
 
     setCommandLineProvider([this] {
         QString args = m_taskName->value() + " " + m_taskArgs->value();
@@ -75,7 +74,7 @@ NimbleTaskStep::NimbleTaskStep(BuildStepList *parentList, Id id)
     m_taskArgs = addAspect<StringAspect>();
     m_taskArgs->setSettingsKey(Constants::C_NIMBLETASKSTEP_TASKARGS);
     m_taskArgs->setDisplayStyle(StringAspect::LineEditDisplay);
-    m_taskArgs->setLabelText(tr("Task arguments:"));
+    m_taskArgs->setLabelText(Tr::tr("Task arguments:"));
 }
 
 QWidget *NimbleTaskStep::createConfigWidget()
@@ -89,7 +88,7 @@ QWidget *NimbleTaskStep::createConfigWidget()
     using namespace Layouting;
     auto widget = Form {
         m_taskArgs,
-        tr("Tasks:"), taskList
+        Tr::tr("Tasks:"), taskList
     }.emerge(WithoutMargins);
 
     auto buildSystem = dynamic_cast<NimbleBuildSystem *>(this->buildSystem());
@@ -215,7 +214,7 @@ bool NimbleTaskStep::validate()
 
     auto matchName = [this](const NimbleTask &task) { return task.name == m_taskName->value(); };
     if (!Utils::contains(nimbleBuildSystem->tasks(), matchName)) {
-        emit addTask(BuildSystemTask(Task::Error, tr("Nimble task %1 not found.")
+        emit addTask(BuildSystemTask(Task::Error, Tr::tr("Nimble task %1 not found.")
                                      .arg(m_taskName->value())));
         emitFaultyConfigurationMessage();
         return false;
@@ -229,7 +228,7 @@ bool NimbleTaskStep::validate()
 NimbleTaskStepFactory::NimbleTaskStepFactory()
 {
     registerStep<NimbleTaskStep>(Constants::C_NIMBLETASKSTEP_ID);
-    setDisplayName(NimbleTaskStep::tr("Nimble Task"));
+    setDisplayName(Tr::tr("Nimble Task"));
     setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_BUILD,
                            ProjectExplorer::Constants::BUILDSTEPS_CLEAN,
                            ProjectExplorer::Constants::BUILDSTEPS_DEPLOY});
diff --git a/src/plugins/nim/project/nimbuildconfiguration.cpp b/src/plugins/nim/project/nimbuildconfiguration.cpp
index 4196b57854..8b556d83d3 100644
--- a/src/plugins/nim/project/nimbuildconfiguration.cpp
+++ b/src/plugins/nim/project/nimbuildconfiguration.cpp
@@ -3,8 +3,8 @@
 
 #include "nimbuildconfiguration.h"
 #include "nimcompilerbuildstep.h"
-#include "nimproject.h"
 
+#include "../nimtr.h"
 #include "../nimconstants.h"
 
 #include <projectexplorer/buildconfiguration.h>
@@ -12,6 +12,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/kit.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
@@ -37,7 +38,7 @@ static FilePath defaultBuildDirectory(const Kit *k,
 NimBuildConfiguration::NimBuildConfiguration(Target *target, Utils::Id id)
     : BuildConfiguration(target, id)
 {
-    setConfigWidgetDisplayName(tr("General"));
+    setConfigWidgetDisplayName(Tr::tr("General"));
     setConfigWidgetHasFrame(true);
     setBuildDirectorySettingsKey("Nim.NimBuildConfiguration.BuildDirectory");
 
@@ -90,8 +91,8 @@ NimBuildConfigurationFactory::NimBuildConfigurationFactory()
             return info;
         };
         return QList<BuildInfo>{
-            oneBuild(BuildConfiguration::Debug, BuildConfiguration::tr("Debug")),
-            oneBuild(BuildConfiguration::Release, BuildConfiguration::tr("Release"))
+            oneBuild(BuildConfiguration::Debug, Tr::tr("Debug")),
+            oneBuild(BuildConfiguration::Release, Tr::tr("Release"))
         };
     });
 }
diff --git a/src/plugins/nim/project/nimbuildsystem.cpp b/src/plugins/nim/project/nimbuildsystem.cpp
index 5033080a02..67af305fcd 100644
--- a/src/plugins/nim/project/nimbuildsystem.cpp
+++ b/src/plugins/nim/project/nimbuildsystem.cpp
@@ -4,7 +4,6 @@
 #include "nimbuildsystem.h"
 
 #include "nimconstants.h"
-#include "nimproject.h"
 #include "nimbleproject.h"
 
 #include <projectexplorer/target.h>
diff --git a/src/plugins/nim/project/nimcompilerbuildstep.cpp b/src/plugins/nim/project/nimcompilerbuildstep.cpp
index 958b9388a2..31b335ebb7 100644
--- a/src/plugins/nim/project/nimcompilerbuildstep.cpp
+++ b/src/plugins/nim/project/nimcompilerbuildstep.cpp
@@ -4,16 +4,17 @@
 #include "nimcompilerbuildstep.h"
 
 #include "nimbuildconfiguration.h"
-#include "nimbuildsystem.h"
 #include "nimconstants.h"
 #include "nimoutputtaskparser.h"
-#include "nimtoolchain.h"
+#include "nimtr.h"
 
-#include <projectexplorer/processparameters.h>
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/ioutputparser.h>
 #include <projectexplorer/kitinformation.h>
+#include <projectexplorer/processparameters.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/toolchain.h>
 
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
@@ -30,12 +31,12 @@ using namespace Utils;
 
 namespace Nim {
 
-NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Utils::Id id)
+NimCompilerBuildStep::NimCompilerBuildStep(BuildStepList *parentList, Id id)
     : AbstractProcessStep(parentList, id)
 {
     setCommandLineProvider([this] { return commandLine(); });
 
-    connect(project(), &ProjectExplorer::Project::fileListChanged,
+    connect(project(), &Project::fileListChanged,
             this, &NimCompilerBuildStep::updateTargetNimFile);
 }
 
@@ -51,8 +52,8 @@ QWidget *NimCompilerBuildStep::createConfigWidget()
 {
     auto widget = new QWidget;
 
-    setDisplayName(tr("Nim build step"));
-    setSummaryText(tr("Nim build step"));
+    setDisplayName(Tr::tr("Nim build step"));
+    setSummaryText(Tr::tr("Nim build step"));
 
     auto targetComboBox = new QComboBox(widget);
 
@@ -63,15 +64,15 @@ QWidget *NimCompilerBuildStep::createConfigWidget()
     commandTextEdit->setMinimumSize(QSize(0, 0));
 
     auto defaultArgumentsComboBox = new QComboBox(widget);
-    defaultArgumentsComboBox->addItem(tr("None"));
-    defaultArgumentsComboBox->addItem(tr("Debug"));
-    defaultArgumentsComboBox->addItem(tr("Release"));
+    defaultArgumentsComboBox->addItem(Tr::tr("None"));
+    defaultArgumentsComboBox->addItem(Tr::tr("Debug"));
+    defaultArgumentsComboBox->addItem(Tr::tr("Release"));
 
     auto formLayout = new QFormLayout(widget);
-    formLayout->addRow(tr("Target:"), targetComboBox);
-    formLayout->addRow(tr("Default arguments:"), defaultArgumentsComboBox);
-    formLayout->addRow(tr("Extra arguments:"),  additionalArgumentsLineEdit);
-    formLayout->addRow(tr("Command:"), commandTextEdit);
+    formLayout->addRow(Tr::tr("Target:"), targetComboBox);
+    formLayout->addRow(Tr::tr("Default arguments:"), defaultArgumentsComboBox);
+    formLayout->addRow(Tr::tr("Extra arguments:"),  additionalArgumentsLineEdit);
+    formLayout->addRow(Tr::tr("Command:"), commandTextEdit);
 
     auto updateUi = [=] {
         const CommandLine cmd = commandLine();
@@ -211,7 +212,7 @@ void NimCompilerBuildStep::updateTargetNimFile()
 NimCompilerBuildStepFactory::NimCompilerBuildStepFactory()
 {
     registerStep<NimCompilerBuildStep>(Constants::C_NIMCOMPILERBUILDSTEP_ID);
-    setDisplayName(NimCompilerBuildStep::tr("Nim Compiler Build Step"));
+    setDisplayName(Tr::tr("Nim Compiler Build Step"));
     setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD);
     setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID);
     setRepeatable(false);
diff --git a/src/plugins/nim/project/nimcompilercleanstep.cpp b/src/plugins/nim/project/nimcompilercleanstep.cpp
index 6ed7aa920b..6eb22ce4e2 100644
--- a/src/plugins/nim/project/nimcompilercleanstep.cpp
+++ b/src/plugins/nim/project/nimcompilercleanstep.cpp
@@ -5,6 +5,7 @@
 #include "nimbuildconfiguration.h"
 
 #include "../nimconstants.h"
+#include "../nimtr.h"
 
 #include <projectexplorer/projectexplorerconstants.h>
 
@@ -21,10 +22,8 @@ namespace Nim {
 
 class NimCompilerCleanStep final : public BuildStep
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimCompilerCleanStep)
-
 public:
-    NimCompilerCleanStep(BuildStepList *parentList, Utils::Id id);
+    NimCompilerCleanStep(BuildStepList *parentList, Id id);
 
 private:
     bool init() final;
@@ -34,14 +33,14 @@ private:
     bool removeCacheDirectory();
     bool removeOutFilePath();
 
-    Utils::FilePath m_buildDir;
+    FilePath m_buildDir;
 };
 
-NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Utils::Id id)
+NimCompilerCleanStep::NimCompilerCleanStep(BuildStepList *parentList, Id id)
     : BuildStep(parentList, id)
 {
     auto workingDirectory = addAspect<StringAspect>();
-    workingDirectory->setLabelText(tr("Working directory:"));
+    workingDirectory->setLabelText(Tr::tr("Working directory:"));
     workingDirectory->setDisplayStyle(StringAspect::LineEditDisplay);
 
     setSummaryUpdater([this, workingDirectory] {
@@ -62,24 +61,24 @@ bool NimCompilerCleanStep::init()
 void NimCompilerCleanStep::doRun()
 {
     if (!m_buildDir.exists()) {
-        emit addOutput(tr("Build directory \"%1\" does not exist.").arg(m_buildDir.toUserOutput()), OutputFormat::ErrorMessage);
+        emit addOutput(Tr::tr("Build directory \"%1\" does not exist.").arg(m_buildDir.toUserOutput()), OutputFormat::ErrorMessage);
         emit finished(false);
         return;
     }
 
     if (!removeCacheDirectory()) {
-        emit addOutput(tr("Failed to delete the cache directory."), OutputFormat::ErrorMessage);
+        emit addOutput(Tr::tr("Failed to delete the cache directory."), OutputFormat::ErrorMessage);
         emit finished(false);
         return;
     }
 
     if (!removeOutFilePath()) {
-        emit addOutput(tr("Failed to delete the out file."), OutputFormat::ErrorMessage);
+        emit addOutput(Tr::tr("Failed to delete the out file."), OutputFormat::ErrorMessage);
         emit finished(false);
         return;
     }
 
-    emit addOutput(tr("Clean step completed successfully."), OutputFormat::NormalMessage);
+    emit addOutput(Tr::tr("Clean step completed successfully."), OutputFormat::NormalMessage);
     emit finished(true);
 }
 
@@ -115,7 +114,7 @@ NimCompilerCleanStepFactory::NimCompilerCleanStepFactory()
     setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
     setSupportedConfiguration(Constants::C_NIMBUILDCONFIGURATION_ID);
     setRepeatable(false);
-    setDisplayName(NimCompilerCleanStep::tr("Nim Clean Step"));
+    setDisplayName(Tr::tr("Nim Clean Step"));
 }
 
 } // Nim
diff --git a/src/plugins/nim/project/nimoutputtaskparser.cpp b/src/plugins/nim/project/nimoutputtaskparser.cpp
index 37858b62e7..f27ad121dd 100644
--- a/src/plugins/nim/project/nimoutputtaskparser.cpp
+++ b/src/plugins/nim/project/nimoutputtaskparser.cpp
@@ -10,7 +10,7 @@ using namespace Utils;
 
 namespace Nim {
 
-NimParser::Result NimParser::handleLine(const QString &lne, Utils::OutputFormat)
+NimParser::Result NimParser::handleLine(const QString &lne, OutputFormat)
 {
     const QString line = lne.trimmed();
     static const QRegularExpression regex("(.+.nim)\\((\\d+), (\\d+)\\) (.+)");
@@ -44,7 +44,7 @@ NimParser::Result NimParser::handleLine(const QString &lne, Utils::OutputFormat)
     return {Status::Done, linkSpecs};
 }
 
-} // namespace Nim
+} // Nim
 
 #ifdef WITH_TESTS
 
diff --git a/src/plugins/nim/project/nimproject.cpp b/src/plugins/nim/project/nimproject.cpp
index 6df37bca32..83d21ce234 100644
--- a/src/plugins/nim/project/nimproject.cpp
+++ b/src/plugins/nim/project/nimproject.cpp
@@ -4,6 +4,7 @@
 #include "nimproject.h"
 
 #include "../nimconstants.h"
+#include "../nimtr.h"
 #include "nimbuildsystem.h"
 #include "nimtoolchain.h"
 
@@ -31,11 +32,11 @@ Tasks NimProject::projectIssues(const Kit *k) const
     Tasks result = Project::projectIssues(k);
     auto tc = dynamic_cast<NimToolChain *>(ToolChainKitAspect::toolChain(k, Constants::C_NIMLANGUAGE_ID));
     if (!tc) {
-        result.append(createProjectTask(Task::TaskType::Error, tr("No Nim compiler set.")));
+        result.append(createProjectTask(Task::TaskType::Error, Tr::tr("No Nim compiler set.")));
         return result;
     }
     if (!tc->compilerCommand().exists())
-        result.append(createProjectTask(Task::TaskType::Error, tr("Nim compiler does not exist.")));
+        result.append(createProjectTask(Task::TaskType::Error, Tr::tr("Nim compiler does not exist.")));
 
     return result;
 }
@@ -64,4 +65,4 @@ void NimProject::setExcludedFiles(const QStringList &excludedFiles)
     m_excludedFiles = excludedFiles;
 }
 
-} // namespace Nim
+} // Nim
diff --git a/src/plugins/nim/project/nimrunconfiguration.cpp b/src/plugins/nim/project/nimrunconfiguration.cpp
index 2be3eadef5..0396eed359 100644
--- a/src/plugins/nim/project/nimrunconfiguration.cpp
+++ b/src/plugins/nim/project/nimrunconfiguration.cpp
@@ -5,6 +5,7 @@
 #include "nimbuildconfiguration.h"
 
 #include "../nimconstants.h"
+#include "../nimtr.h"
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/localenvironmentaspect.h>
@@ -21,8 +22,6 @@ namespace Nim {
 
 class NimRunConfiguration final : public RunConfiguration
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimRunConfiguration)
-
 public:
     NimRunConfiguration(Target *target, Utils::Id id)
         : RunConfiguration(target, id)
@@ -33,8 +32,8 @@ public:
         addAspect<WorkingDirectoryAspect>(macroExpander(), envAspect);
         addAspect<TerminalAspect>();
 
-        setDisplayName(tr("Current Build Target"));
-        setDefaultDisplayName(tr("Current Build Target"));
+        setDisplayName(Tr::tr("Current Build Target"));
+        setDefaultDisplayName(Tr::tr("Current Build Target"));
 
         setUpdater([this, target] {
             auto buildConfiguration = qobject_cast<NimBuildConfiguration *>(target->activeBuildConfiguration());
diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp
index 4a893f975b..c62de76b33 100644
--- a/src/plugins/nim/project/nimtoolchain.cpp
+++ b/src/plugins/nim/project/nimtoolchain.cpp
@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "nimtoolchain.h"
+
 #include "nimconstants.h"
 #include "nimtoolchainfactory.h"
+#include "nimtr.h"
 
 #include <projectexplorer/abi.h>
 #include <utils/environment.h>
 #include <utils/qtcprocess.h>
 
-#include <QFileInfo>
 #include <QRegularExpression>
 
 using namespace ProjectExplorer;
@@ -26,7 +27,7 @@ NimToolChain::NimToolChain(Utils::Id typeId)
     , m_version(std::make_tuple(-1,-1,-1))
 {
     setLanguage(Constants::C_NIMLANGUAGE_ID);
-    setTypeDisplayName(tr("Nim"));
+    setTypeDisplayName(Tr::tr("Nim"));
     setTargetAbiNoSignal(Abi::hostAbi());
     setCompilerCommandKey("Nim.NimToolChain.CompilerCommand");
 }
diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h
index f5e10ae62e..8ef087fe8a 100644
--- a/src/plugins/nim/project/nimtoolchain.h
+++ b/src/plugins/nim/project/nimtoolchain.h
@@ -10,8 +10,6 @@ namespace Nim {
 
 class NimToolChain : public ProjectExplorer::ToolChain
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimToolChain)
-
 public:
     NimToolChain();
     explicit NimToolChain(Utils::Id typeId);
diff --git a/src/plugins/nim/project/nimtoolchainfactory.cpp b/src/plugins/nim/project/nimtoolchainfactory.cpp
index e3e9feb9e1..bf14c9ca5c 100644
--- a/src/plugins/nim/project/nimtoolchainfactory.cpp
+++ b/src/plugins/nim/project/nimtoolchainfactory.cpp
@@ -5,6 +5,7 @@
 
 #include "nimconstants.h"
 #include "nimtoolchain.h"
+#include "nimtr.h"
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 
@@ -23,7 +24,7 @@ namespace Nim {
 
 NimToolChainFactory::NimToolChainFactory()
 {
-    setDisplayName(NimToolChain::tr("Nim"));
+    setDisplayName(Tr::tr("Nim"));
     setSupportedToolChainType(Constants::C_NIMTOOLCHAIN_TYPEID);
     setSupportedLanguages({Constants::C_NIMLANGUAGE_ID});
     setToolchainConstructor([] { return new NimToolChain; });
@@ -77,9 +78,9 @@ NimToolChainConfigWidget::NimToolChainConfigWidget(NimToolChain *tc)
     const auto gnuVersionArgs = QStringList("--version");
     m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand);
     m_compilerCommand->setCommandVersionArguments(gnuVersionArgs);
-    m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand);
+    m_mainLayout->addRow(Tr::tr("&Compiler path:"), m_compilerCommand);
     m_compilerVersion->setReadOnly(true);
-    m_mainLayout->addRow(tr("&Compiler version:"), m_compilerVersion);
+    m_mainLayout->addRow(Tr::tr("&Compiler version:"), m_compilerVersion);
 
     // Fill
     fillUI();
diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
index f17f4c7ad3..59f534d816 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
@@ -4,13 +4,17 @@
 #include "nimcodestylepreferencesfactory.h"
 #include "nimcodestylepreferenceswidget.h"
 
-#include "../nimconstants.h"
 #include "../editor/nimindenter.h"
+#include "../nimconstants.h"
+#include "../nimtr.h"
 
 #include <utils/id.h>
 
 #include <texteditor/simplecodestylepreferences.h>
 
+#include <QWidget>
+#include <QLayout>
+
 using namespace TextEditor;
 
 namespace Nim {
@@ -26,16 +30,16 @@ Utils::Id NimCodeStylePreferencesFactory::languageId()
 
 QString NimCodeStylePreferencesFactory::displayName()
 {
-    return tr(Constants::C_NIMLANGUAGE_NAME);
+    return Tr::tr(Constants::C_NIMLANGUAGE_NAME);
 }
 
-TextEditor::ICodeStylePreferences *NimCodeStylePreferencesFactory::createCodeStyle() const
+ICodeStylePreferences *NimCodeStylePreferencesFactory::createCodeStyle() const
 {
-    return new TextEditor::SimpleCodeStylePreferences();
+    return new SimpleCodeStylePreferences();
 }
 
-TextEditor::CodeStyleEditorWidget *NimCodeStylePreferencesFactory::createEditor(
-    TextEditor::ICodeStylePreferences *preferences,
+CodeStyleEditorWidget *NimCodeStylePreferencesFactory::createEditor(
+    ICodeStylePreferences *preferences,
     ProjectExplorer::Project *project,
     QWidget *parent) const
 {
@@ -44,7 +48,7 @@ TextEditor::CodeStyleEditorWidget *NimCodeStylePreferencesFactory::createEditor(
     return result;
 }
 
-TextEditor::Indenter *NimCodeStylePreferencesFactory::createIndenter(QTextDocument *doc) const
+Indenter *NimCodeStylePreferencesFactory::createIndenter(QTextDocument *doc) const
 {
     return new NimIndenter(doc);
 }
@@ -59,4 +63,4 @@ QString NimCodeStylePreferencesFactory::previewText() const
     return QLatin1String(Nim::Constants::C_NIMCODESTYLEPREVIEWSNIPPET);
 }
 
-}
+} // Nim
diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.h b/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
index f45a6acafa..c0686236fc 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
@@ -9,8 +9,6 @@ namespace Nim {
 
 class NimCodeStylePreferencesFactory : public TextEditor::ICodeStylePreferencesFactory
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimCodeStylePreferencesFactory)
-
 public:
     NimCodeStylePreferencesFactory();
 
diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp
index fe24473ec2..30bc0698f5 100644
--- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp
+++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "nimcodestylesettingspage.h"
-#include "nimcodestylepreferencesfactory.h"
-#include "nimsettings.h"
 
 #include "../nimconstants.h"
+#include "../nimtr.h"
+#include "nimsettings.h"
 
 #include <texteditor/simplecodestylepreferences.h>
 #include <texteditor/codestyleeditor.h>
@@ -20,8 +20,6 @@ namespace Nim {
 
 class NimCodeStyleSettingsWidget : public Core::IOptionsPageWidget
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::CodeStyleSettings)
-
 public:
     NimCodeStyleSettingsWidget()
     {
@@ -51,9 +49,9 @@ private:
 NimCodeStyleSettingsPage::NimCodeStyleSettingsPage()
 {
     setId(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_ID);
-    setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY));
+    setDisplayName(Tr::tr("Code Style"));
     setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY);
-    setDisplayCategory(NimCodeStyleSettingsWidget::tr("Nim"));
+    setDisplayCategory(Tr::tr("Nim"));
     setCategoryIconPath(":/nim/images/settingscategory_nim.png");
     setWidgetCreator([] { return new NimCodeStyleSettingsWidget; });
 }
diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp
index c0be992ef4..d85d1a80e9 100644
--- a/src/plugins/nim/settings/nimsettings.cpp
+++ b/src/plugins/nim/settings/nimsettings.cpp
@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
 
 #include "nimsettings.h"
-#include "nimcodestylepreferencesfactory.h"
 
 #include "../nimconstants.h"
+#include "../nimtr.h"
+#include "nimcodestylepreferencesfactory.h"
 
 #include <coreplugin/icore.h>
 
@@ -34,7 +35,7 @@ NimSettings::NimSettings()
     nimSuggestPath.setSettingsKey("Command");
     nimSuggestPath.setDisplayStyle(StringAspect::PathChooserDisplay);
     nimSuggestPath.setExpectedKind(PathChooser::ExistingCommand);
-    nimSuggestPath.setLabelText(tr("Path:"));
+    nimSuggestPath.setLabelText(Tr::tr("Path:"));
 
     readSettings(Core::ICore::settings());
 }
@@ -61,14 +62,14 @@ void NimSettings::InitializeCodeStyleSettings()
 
     m_globalCodeStyle = new SimpleCodeStylePreferences();
     m_globalCodeStyle->setDelegatingPool(pool);
-    m_globalCodeStyle->setDisplayName(tr("Global", "Settings"));
+    m_globalCodeStyle->setDisplayName(Tr::tr("Global", "Settings"));
     m_globalCodeStyle->setId(Nim::Constants::C_NIMGLOBALCODESTYLE_ID);
     pool->addCodeStyle(m_globalCodeStyle);
     TextEditorSettings::registerCodeStyle(Nim::Constants::C_NIMLANGUAGE_ID, m_globalCodeStyle);
 
     auto nimCodeStyle = new SimpleCodeStylePreferences();
     nimCodeStyle->setId("nim");
-    nimCodeStyle->setDisplayName(tr("Nim"));
+    nimCodeStyle->setDisplayName(Tr::tr("Nim"));
     nimCodeStyle->setReadOnly(true);
 
     TabSettings nimTabSettings;
@@ -110,9 +111,9 @@ void NimSettings::TerminateCodeStyleSettings()
 NimToolsSettingsPage::NimToolsSettingsPage(NimSettings *settings)
 {
     setId(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_ID);
-    setDisplayName(NimSettings::tr(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_DISPLAY));
+    setDisplayName(Tr::tr("Tools"));
     setCategory(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY);
-    setDisplayCategory(NimSettings::tr("Nim"));
+    setDisplayCategory(Tr::tr("Nim"));
     setCategoryIconPath(":/nim/images/settingscategory_nim.png");
     setSettings(settings);
 
diff --git a/src/plugins/nim/settings/nimsettings.h b/src/plugins/nim/settings/nimsettings.h
index 25e3d20134..a27efa2f4b 100644
--- a/src/plugins/nim/settings/nimsettings.h
+++ b/src/plugins/nim/settings/nimsettings.h
@@ -12,8 +12,6 @@ namespace Nim {
 
 class NimSettings : public Utils::AspectContainer
 {
-    Q_DECLARE_TR_FUNCTIONS(Nim::NimSettings)
-
 public:
     NimSettings();
     ~NimSettings();
@@ -33,5 +31,5 @@ public:
     explicit NimToolsSettingsPage(NimSettings *settings);
 };
 
-} // namespace Nim
+} // Nim