ExtensionSystem: Tr::tr

Change-Id: I93266b536d441634ce5f8017c4b77b6d4ffe5b89
Reviewed-by: hjk <hjk@qt.io>

share/qtcreator/translations/qtcreator_cs.ts

@@ -4605,7 +4605,7 @@ Také se automaticky nastaví správná verze Qt.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Název:</translation>
@@ -4662,9 +4662,6 @@ Také se automaticky nastaví správná verze Qt.</translation>
         <source>Platforms:</source>
         <translation>Platformy:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Stav:</translation>
@@ -4677,9 +4674,6 @@ Také se automaticky nastaví správná verze Qt.</translation>
         <source>Error message:</source>
         <translation>Hlášení o chybě:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>File does not exist: %1</source>
         <translation type="obsolete">Soubor neexistuje: &apos;%1&apos;</translation>
@@ -4696,9 +4690,6 @@ Také se automaticky nastaví správná verze Qt.</translation>
         <source>Error parsing file %1: %2, at line %3, column %4</source>
         <translation>Chyba při čtení souboru %1: %2 na řádku %3, sloupec %4</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
     <message>
         <source>State</source>
         <translation type="obsolete">Stav</translation>
@@ -4723,9 +4714,6 @@ Také se automaticky nastaví správná verze Qt.</translation>
         <source>Load</source>
         <translation>Nahrát</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Neplatný</translation>
@@ -4826,9 +4814,6 @@ Také se automaticky nastaví správná verze Qt.</translation>
         <source>Plugin ended its life cycle and was deleted</source>
         <translation>Přídavný modul byl po uplynutí své doby životnosti smazán</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -9093,7 +9078,7 @@ ve svém .pro souboru.</translation>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; is specified twice for testing.</source>
         <translation>Přídavný modul &apos;%1&apos; je ve zkušebním seznamu přítomen dvakrát.</translation>
@@ -9114,9 +9099,6 @@ ve svém .pro souboru.</translation>
         <source>Failed Plugins</source>
         <translation>Přídavné moduly které selhaly při nahrávání</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation>U &apos;%1&apos; chybí vlastnost &apos;%2&apos;</translation>
@@ -21331,7 +21313,7 @@ should a repository require SSH-authentication (see documentation on SSH and the
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>None</source>
         <translation>Žádná</translation>
@@ -21340,25 +21322,6 @@ should a repository require SSH-authentication (see documentation on SSH and the
         <source>All</source>
         <translation>Vše</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
-    <message>
-        <source>Name</source>
-        <translation>Název</translation>
-    </message>
-    <message>
-        <source>Load</source>
-        <translation>Nahrát</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation>Verze</translation>
-    </message>
-    <message>
-        <source>Vendor</source>
-        <translation>Prodejce</translation>
-    </message>
     <message>
         <source>Load on Startup</source>
         <translation>Nahrát při spuštění</translation>
@@ -37802,7 +37765,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Qt Creator - Plugin loader messages</source>
         <translation>Qt Creator - Zprávy zavaděče přídavných modulů</translation>
@@ -38173,13 +38136,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři.</translation>
         <translation>Qt Creator</translation>
     </message>
 </context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverviewPrivate</name>
-    <message>
-        <source>Continue</source>
-        <translation type="obsolete">Pokračovat</translation>
-    </message>
-</context>
 <context>
     <name>QmlJsDebugClient::QmlProfilerEventList</name>
     <message>
@@ -49451,7 +49407,7 @@ nelze najít v cestě.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Continue</source>
         <translation>Pokračovat</translation>

share/qtcreator/translations/qtcreator_da.ts

@@ -14284,7 +14284,7 @@ Det hjælper måske at genbygge projektet.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
@@ -14333,9 +14333,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>License:</source>
         <translation>Licens:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
     <message>
         <source>The following plugins have errors and cannot be loaded:</source>
         <translation>Følgende plugins har fejl og kan ikke indlæses:</translation>
@@ -14348,9 +14345,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Plugin Loader Messages</source>
         <translation>Plugin-indlæser meddelelser</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Tilstand:</translation>
@@ -14359,9 +14353,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Error message:</source>
         <translation>Fejlmeddelelse:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Plugin meta data not found</source>
         <translation>Plugin-metadata ikke fundet</translation>
@@ -14386,9 +14377,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Argument: &quot;%1&quot; is empty</source>
         <translation>Argument: &quot;%1&quot; er tom</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginDetailsView</name>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
@@ -14401,16 +14389,10 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>%1 (current: &quot;%2&quot;)</source>
         <translation>%1 (aktuel: &quot;%2&quot;)</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
     <message>
         <source>Continue</source>
         <translation>Fortsæt</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Ugyldig</translation>
@@ -14475,9 +14457,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Plugin ended its life cycle and was deleted.</source>
         <translation>Plugin afsluttede sin livscyklus og blev slettet.</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:</source>
         <translation>Cirkulær afhængighed detekteret:</translation>
@@ -14502,9 +14481,6 @@ Reason: %3</source>
         <translation>Kan ikke indlæse plugin fordi afhængighed ikke kunne indlæses: %1(%2)
 Årsag: %3</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>%1 (experimental)</source>
         <translation>%1 (eksperimentel)</translation>
@@ -20967,7 +20943,7 @@ Fejl: %5</translation>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &quot;%1&quot; is specified twice for testing.</source>
         <translation>Pluginet &quot;%1&quot; er angivet to gange for testing.</translation>
@@ -20992,9 +20968,6 @@ Fejl: %5</translation>
         <source>Failed Plugins</source>
         <translation>Mislykkede plugins</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&quot;%1&quot; is missing</source>
         <translation>&quot;%1&quot; mangler</translation>

share/qtcreator/translations/qtcreator_de.ts

@@ -6681,7 +6681,7 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
@@ -6730,9 +6730,6 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <source>Platforms:</source>
         <translation>Plattformen:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Status:</translation>
@@ -6741,9 +6738,6 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <source>Error message:</source>
         <translation>Fehlermeldung:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Plugin meta data not found</source>
         <translation>Plugin-Metadaten nicht gefunden</translation>
@@ -6768,9 +6762,6 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <source>Argument: &quot;%1&quot; is empty</source>
         <translation>Argument: &quot;%1&quot; ist leer</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Ungültig</translation>
@@ -6835,9 +6826,6 @@ Versuchen Sie, das Projekt neu zu erstellen.</translation>
         <source>Deleted</source>
         <translation>Gelöscht</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:</source>
         <translation>Zirkuläre Abhängigkeit festgestellt:</translation>
@@ -10009,7 +9997,7 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &quot;%1&quot; is specified twice for testing.</source>
         <translation>Das Plugin &quot;%1&quot; ist in der Testliste doppelt vorhanden.</translation>
@@ -10038,9 +10026,6 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
         <source>Failed Plugins</source>
         <translation>Nicht geladene Plugins (Fehlschlag beim Ladevorgang)</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&quot;%1&quot; is missing</source>
         <translation>&quot;%1&quot; fehlt</translation>
@@ -14727,7 +14712,7 @@ Locked components cannot be modified or selected.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>None</source>
         <translation>Keine</translation>
@@ -14740,9 +14725,6 @@ Locked components cannot be modified or selected.</source>
         <source>%1 (current: &quot;%2&quot;)</source>
         <translation>%1 (aktuell: &quot;%2&quot;)</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
@@ -20837,7 +20819,7 @@ When disabled, moves targets straight to the current mouse position.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The following plugins have errors and cannot be loaded:</source>
         <translation>Die folgenden Plugins sind fehlerhaft und können nicht geladen werden:</translation>
@@ -25990,7 +25972,7 @@ wirklich löschen?</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Continue</source>
         <translation>Fortsetzen</translation>
@@ -44024,7 +44006,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginManagerPrivate</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>%1 &gt; About Plugins</source>
         <translation>%1 &gt; Plugins</translation>
@@ -44053,10 +44035,6 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern.</translation>
         <source>Disable Plugin</source>
         <translation>Plugin deaktivieren</translation>
     </message>
-    <message>
-        <source>Continue</source>
-        <translation>Fortsetzen</translation>
-    </message>
 </context>
 <context>
     <name>Utils::NameValueModel</name>

share/qtcreator/translations/qtcreator_es.ts

@@ -4263,7 +4263,7 @@ Adicionalmente ajustará automáticamente la versión de Qt.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
@@ -4313,9 +4313,6 @@ Adicionalmente ajustará automáticamente la versión de Qt.</translation>
         <source>Dependencies:</source>
         <translation>Dependencias:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Estado:</translation>
@@ -4325,9 +4322,6 @@ Adicionalmente ajustará automáticamente la versión de Qt.</translation>
         <source>Error Message:</source>
         <translation>Mensaje de error:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>File does not exist: %1</source>
         <translation>El archivo no existe: %1</translation>
@@ -4340,9 +4334,6 @@ Adicionalmente ajustará automáticamente la versión de Qt.</translation>
         <source>Error parsing file %1: %2, at line %3, column %4</source>
         <translation>Error interpretando el archivo %1: %2, en línea %3, columna %4</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
     <message>
         <source>State</source>
         <translation>Estado</translation>
@@ -4367,9 +4358,6 @@ Adicionalmente ajustará automáticamente la versión de Qt.</translation>
         <source>Location</source>
         <translation>Localización</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Inválido</translation>
@@ -4438,9 +4426,6 @@ Adicionalmente ajustará automáticamente la versión de Qt.</translation>
         <source>Plugin ended it&apos;s life cycle and was deleted</source>
         <translation type="obsolete">El plugin culminó su ciclo de vida y fue removido</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -6498,7 +6483,7 @@ en su archivo .pro.</translation>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; does not exist.</source>
         <translation>El plugin &apos;%1&apos; no existe.</translation>
@@ -6511,9 +6496,6 @@ en su archivo .pro.</translation>
         <source>The option %1 requires an argument.</source>
         <translation>La opción %1 requiere un argumento.</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation>&apos;%1&apos; carece del atributo &apos;%2&apos;</translation>

share/qtcreator/translations/qtcreator_fr.ts

@@ -5406,7 +5406,7 @@ La version de Qt est aussi définie automatiquement.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Nom :</translation>
@@ -5465,9 +5465,6 @@ La version de Qt est aussi définie automatiquement.</translation>
         <source>Platforms:</source>
         <translation>Plateformes :</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>État :</translation>
@@ -5480,9 +5477,6 @@ La version de Qt est aussi définie automatiquement.</translation>
         <source>Error message:</source>
         <translation>Message d&apos;erreur : </translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>File does not exist: %1</source>
         <translation type="obsolete">Le fichier n&apos;existe pas : %1</translation>
@@ -5499,9 +5493,6 @@ La version de Qt est aussi définie automatiquement.</translation>
         <source>Error parsing file %1: %2, at line %3, column %4</source>
         <translation>Erreur pendant l&apos;analyse du fichier %1 : %2, ligne %3, colonne %4</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
     <message>
         <source>State</source>
         <translation type="obsolete">État</translation>
@@ -5526,9 +5517,6 @@ La version de Qt est aussi définie automatiquement.</translation>
         <source>Load</source>
         <translation>Charge</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Invalide</translation>
@@ -5597,9 +5585,6 @@ La version de Qt est aussi définie automatiquement.</translation>
         <source>Plugin ended its life cycle and was deleted</source>
         <translation>Le plug-in a terminé son cycle de vie et a été supprimé</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -9695,7 +9680,7 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; is specified twice for testing.</source>
         <translation>Le plugin &quot;%1&apos; est spécifié deux fois pour les tests.</translation>
@@ -9716,9 +9701,6 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
         <source>Failed Plugins</source>
         <translation>Plug-ins défectueux</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation>L&apos;attribute &apos;%1&apos; est manquant pour &quot;%2&quot;</translation>
@@ -20484,7 +20466,7 @@ francis : ouai assez d&apos;accord.</translatorcomment>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>None</source>
         <translation>Aucune</translation>
@@ -20493,9 +20475,6 @@ francis : ouai assez d&apos;accord.</translatorcomment>
         <source>All</source>
         <translation>Tout</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Load on Startup</source>
         <translation>Charger au démarrage</translation>
@@ -36493,7 +36472,7 @@ Pour compiler l&apos;observateur QML, allez à la page des versions de Qt, séle
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Qt Creator - Plugin loader messages</source>
         <translation>Qt Creator - messages du chargeur de plug-in</translation>
@@ -36742,13 +36721,6 @@ Pour compiler l&apos;observateur QML, allez à la page des versions de Qt, séle
         <translation>Qt Creator</translation>
     </message>
 </context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverviewPrivate</name>
-    <message>
-        <source>Continue</source>
-        <translation type="obsolete">Continue</translation>
-    </message>
-</context>
 <context>
     <name>QmlJsDebugClient::QmlProfilerEventList</name>
     <message>
@@ -46870,7 +46842,7 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Continue</source>
         <translation>Continue</translation>

share/qtcreator/translations/qtcreator_hr.ts

@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="hr">
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
@@ -51,9 +51,6 @@
         <source>License:</source>
         <translation>Licenca:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
     <message>
         <source>Plugin Loader Messages</source>
         <translation>Poruke učitača dodataka</translation>
@@ -66,9 +63,6 @@
         <source>Details:</source>
         <translation>Detalji:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Stanje:</translation>
@@ -10438,7 +10432,7 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &quot;%1&quot; is specified twice for testing.</source>
         <translation type="unfinished"></translation>
@@ -10463,9 +10457,6 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u
         <source>Failed Plugins</source>
         <translation type="unfinished">Neuspjeli dodaci</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginDetailsView</name>
     <message>
         <source>None</source>
         <translation>Bez</translation>
@@ -10478,16 +10469,10 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u
         <source>%1 (current: &quot;%2&quot;)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
     <message>
         <source>Continue</source>
         <translation>Nastavi</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation type="unfinished"></translation>
@@ -10552,9 +10537,6 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u
         <source>Plugin ended its life cycle and was deleted.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:</source>
         <translation type="unfinished"></translation>
@@ -10577,9 +10559,6 @@ Reason: %3</source>
 Reason: %3</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&quot;%1&quot; is missing</source>
         <translation type="unfinished"></translation>
@@ -10644,9 +10623,6 @@ Reason: %3</source>
         <source>Internal error: have no plugin instance to perform delayedInitialize</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Plugin meta data not found</source>
         <translation type="unfinished"></translation>
@@ -10671,9 +10647,6 @@ Reason: %3</source>
         <source>Argument: &quot;%1&quot; is empty</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>%1 (experimental)</source>
         <translation type="unfinished"></translation>

share/qtcreator/translations/qtcreator_hu.ts

@@ -5596,7 +5596,7 @@ Ez automatikus beállítja a megfelelő Qt verziót is.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::0</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Invalid</source>
         <translation type="obsolete">Érvénytelen</translation>
@@ -5691,9 +5691,6 @@ Reason: %3</source>
         <translation type="obsolete">Nem lehet betölteni a beépülőt, mert nem sikerült betölten a függőséget: %1(%2)
 Ok: %3</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::0</name>
     <message>
         <source>Name:</source>
         <translation type="obsolete">Név:</translation>
@@ -5774,9 +5771,6 @@ Ok: %3</translation>
         <source>Location</source>
         <translation type="obsolete">Hely</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
     <message>
         <source>Name:</source>
         <translation>Név:</translation>
@@ -5817,9 +5811,6 @@ Ok: %3</translation>
         <source>Dependencies:</source>
         <translation>Függőségek:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Státusz:</translation>
@@ -5828,9 +5819,6 @@ Ok: %3</translation>
         <source>Error Message:</source>
         <translation>Hiba üzenet:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>File does not exist: %1</source>
         <translation>A fájl nem létezik: &apos;%1&apos;</translation>
@@ -5843,9 +5831,6 @@ Ok: %3</translation>
         <source>Error parsing file %1: %2, at line %3, column %4</source>
         <translation>Hiba történt a(z) %1 fájl elemzése közben: %2, %3 sorban, %4 oszlopban</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
     <message>
         <source>State</source>
         <translation>Státusz</translation>
@@ -5866,9 +5851,6 @@ Ok: %3</translation>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Érvénytelen</translation>
@@ -5933,9 +5915,6 @@ Ok: %3</translation>
         <source>Plugin ended its life cycle and was deleted</source>
         <translation>A beépülő modul elérte az élettartamának és törölték</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -9967,7 +9946,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; does not exist.</source>
         <translation>A(z) &apos;%1&apos; beépülő modul nem létezik.</translation>
@@ -9980,9 +9959,6 @@ p, li { white-space: pre-wrap; }
         <source>The option %1 requires an argument.</source>
         <translation>A(z) %1 opció egy argumentumot igényel.</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation></translation>

share/qtcreator/translations/qtcreator_it.ts

@@ -4165,7 +4165,7 @@ Imposta automaticamente la Versione di Qt corretta.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
@@ -4215,9 +4215,6 @@ Imposta automaticamente la Versione di Qt corretta.</translation>
         <source>Dependencies:</source>
         <translation>Dipendenze:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Stato:</translation>
@@ -4227,9 +4224,6 @@ Imposta automaticamente la Versione di Qt corretta.</translation>
         <source>Error Message:</source>
         <translation>Messaggio d&apos;Errore:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>File does not exist: %1</source>
         <translation>Il file non esiste: %1</translation>
@@ -4242,9 +4236,6 @@ Imposta automaticamente la Versione di Qt corretta.</translation>
         <source>Error parsing file %1: %2, at line %3, column %4</source>
         <translation>Errore leggendo dal file %1: %2, alla riga %3, colonna %4</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
     <message>
         <source>State</source>
         <translation>Stato</translation>
@@ -4269,9 +4260,6 @@ Imposta automaticamente la Versione di Qt corretta.</translation>
         <source>Location</source>
         <translation>Posizione</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Non valido</translation>
@@ -4336,9 +4324,6 @@ Imposta automaticamente la Versione di Qt corretta.</translation>
         <source>Plugin ended its life cycle and was deleted</source>
         <translation>Il plugin ha concluso il suo ciclo di vita ed è stato cancellato</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -6398,7 +6383,7 @@ nel tuo file .pro.</translation>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; does not exist.</source>
         <translation>Il plugin &apos;%1&apos; non esiste.</translation>
@@ -6411,9 +6396,6 @@ nel tuo file .pro.</translation>
         <source>The option %1 requires an argument.</source>
         <translation>L&apos;opzione %1 richiede un parametro.</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation>In &apos;%1&apos; manca l&apos;attributo &apos;%2&apos;</translation>

share/qtcreator/translations/qtcreator_ja.ts

@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="ja">
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Description:</source>
         <translation>説明:</translation>
@@ -51,9 +51,6 @@
         <source>License:</source>
         <translation>ライセンス:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
     <message>
         <source>Qt Creator - Plugin loader messages</source>
         <translation>Qt Creator - プラグインローダーからのメッセージ</translation>
@@ -70,9 +67,6 @@
         <source>Plugin Loader Messages</source>
         <translation>プラグインローダーからのメッセージ</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>状態:</translation>
@@ -8856,7 +8850,7 @@ preferShaping プロパティを false に設定すると、このような機
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &quot;%1&quot; is specified twice for testing.</source>
         <translation>プラグイン &quot;%1&quot; はテスト用に2回指定されています。</translation>
@@ -8881,9 +8875,6 @@ preferShaping プロパティを false に設定すると、このような機
         <source>Failed Plugins</source>
         <translation>読み込みに失敗したプラグイン</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginDetailsView</name>
     <message>
         <source>None</source>
         <translation>なし</translation>
@@ -8896,16 +8887,10 @@ preferShaping プロパティを false に設定すると、このような機
         <source>%1 (current: &quot;%2&quot;)</source>
         <translation>%1 (現在: &quot;%2&quot;)</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
     <message>
         <source>Continue</source>
         <translation>続行</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>無効</translation>
@@ -8970,9 +8955,6 @@ preferShaping プロパティを false に設定すると、このような機
         <source>Deleted</source>
         <translation>削除済み</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:</source>
         <translation>循環依存関係が検出されました:</translation>
@@ -9005,9 +8987,6 @@ Reason: %3</source>
         <translation>依存関係が解決できなかったため、以下のプラグインを読み込めませんでした: %1(%2)
 理由: %3</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&quot;%1&quot; is missing</source>
         <translation>&quot;%1&quot; が見つかりません</translation>
@@ -9072,9 +9051,6 @@ Reason: %3</source>
         <source>Internal error: have no plugin instance to perform delayedInitialize</source>
         <translation>内部エラー: delayedInitialize を実行するプラグインインスタンスが存在しません</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Name</source>
         <translation>名前</translation>
@@ -34648,7 +34624,7 @@ the program.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Plugin meta data not found</source>
         <translation>プラグインのメタデータが見つかりません</translation>
@@ -43457,7 +43433,7 @@ Output:
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginManagerPrivate</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>%1 &gt; About Plugins</source>
         <translation>%1 &gt; プラグインについて</translation>
@@ -43486,10 +43462,6 @@ Output:
         <source>Disable Plugin</source>
         <translation>プラグインを無効にする</translation>
     </message>
-    <message>
-        <source>Continue</source>
-        <translation>続行</translation>
-    </message>
 </context>
 <context>
     <name>BaseMessage</name>

share/qtcreator/translations/qtcreator_pl.ts

@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="pl_PL" sourcelanguage="en">
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
@@ -51,9 +51,6 @@
         <source>Platforms:</source>
         <translation>Platformy:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Stan:</translation>
@@ -1464,7 +1461,7 @@
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &quot;%1&quot; is specified twice for testing.</source>
         <translation>Wtyczka &quot;%1&quot; występuje dwukrotnie w testach.</translation>
@@ -1507,9 +1504,6 @@ Reason: %3</source>
         <translation>Nie można załadować wtyczki, ponieważ nie udało się załadować zależności: %1(%2)
 Przyczyna: %3</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Niepoprawna</translation>
@@ -1574,9 +1568,6 @@ Przyczyna: %3</translation>
         <source>Deleted</source>
         <translation>Usunięta</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Plugin meta data not found</source>
         <translation>Brak danych o wtyczce</translation>
@@ -1601,9 +1592,6 @@ Przyczyna: %3</translation>
         <source>Argument: &quot;%1&quot; is empty</source>
         <translation>Argument: &quot;%1&quot; jest pusty</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&quot;%1&quot; is missing</source>
         <translation>Brak &quot;%1&quot;</translation>
@@ -10192,7 +10180,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>None</source>
         <translation>Brak</translation>
@@ -10206,9 +10194,6 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
         <translatorcomment>What current? platform?</translatorcomment>
         <translation>%1 (bieżąca platforma: &quot;%2&quot;)</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
@@ -17448,7 +17433,7 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Qt Creator - Plugin loader messages</source>
         <translation>Qt Creator - komunikaty ładowania wtyczek</translation>
@@ -23289,7 +23274,7 @@ Można używać nazw częściowych, jeśli są one unikalne.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Continue</source>
         <translation>Kontynuuj</translation>

share/qtcreator/translations/qtcreator_ru.ts

@@ -17886,7 +17886,7 @@ Rebuilding the project might help.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Название:</translation>
@@ -17935,9 +17935,6 @@ Rebuilding the project might help.</source>
         <source>Platforms:</source>
         <translation>Платформы:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
     <message>
         <source>The following plugins have errors and cannot be loaded:</source>
         <translation>Следующие модули содержат ошибки и не могут быть загружены:</translation>
@@ -17950,9 +17947,6 @@ Rebuilding the project might help.</source>
         <source>Plugin Loader Messages</source>
         <translation>Сообщения загрузчика модулей</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Состояние:</translation>
@@ -17962,9 +17956,6 @@ Rebuilding the project might help.</source>
         <translation>Сообщение
 об ошибке:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginManagerPrivate</name>
     <message>
         <source>%1 &gt; About Plugins</source>
         <translation>%1 &gt; О модулях</translation>
@@ -17997,9 +17988,6 @@ Rebuilding the project might help.</source>
         <source>Continue</source>
         <translation>Продолжить</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Plugin meta data not found</source>
         <translation>Мета-данные модуля не найдены</translation>
@@ -18024,9 +18012,6 @@ Rebuilding the project might help.</source>
         <source>Argument: &quot;%1&quot; is empty</source>
         <translation>Аргумент: «%1» пустой</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginDetailsView</name>
     <message>
         <source>None</source>
         <translation>Нет</translation>
@@ -18039,16 +18024,6 @@ Rebuilding the project might help.</source>
         <source>%1 (current: &quot;%2&quot;)</source>
         <translation>%1 (текущая: «%2»)</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
-    <message>
-        <source>Continue</source>
-        <translation>Продолжить</translation>
-    </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Некорректный</translation>
@@ -18113,9 +18088,6 @@ Rebuilding the project might help.</source>
         <source>Deleted</source>
         <translation>Удалён</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:</source>
         <translation>Обнаружена циклическая зависимость:</translation>
@@ -18140,9 +18112,6 @@ Reason: %3</source>
         <translation>Невозможно загрузить модуль, так как не удалось загрузить его зависимость: %1 (%2)
 Причина: %3</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Name</source>
         <translation>Название</translation>
@@ -27236,7 +27205,7 @@ You might find further explanations in the Application Output view.</source>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &quot;%1&quot; is specified twice for testing.</source>
         <translation>Модуль «%1» указан для тестирования дважды.</translation>
@@ -27261,9 +27230,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Failed Plugins</source>
         <translation>Проблемные модули</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&quot;%1&quot; is missing</source>
         <translation>«%1» отсутствует</translation>

share/qtcreator/translations/qtcreator_sl.ts

@@ -3900,7 +3900,7 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
@@ -3963,9 +3963,6 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <source>Url:</source>
         <translation type="obsolete">URL:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Stanje:</translation>
@@ -3979,9 +3976,6 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <source>Error Message:</source>
         <translation type="obsolete">Sporočilo napake:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Cannot open file %1 for reading: %2</source>
         <translation>Datoteke %1 ni moč odpreti za branje: %2</translation>
@@ -3998,9 +3992,6 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <source>Could not open file for read: %1</source>
         <translation type="obsolete">Ni moč odpreti datoteke za branje: %1</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
     <message>
         <source>Name</source>
         <translation>Ime</translation>
@@ -4020,9 +4011,6 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <source>Load</source>
         <translation>Naloži</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Neveljavno</translation>
@@ -4087,9 +4075,6 @@ Morda lahko pomaga ponovna gradnja projekta.</translation>
         <source>Plugin ended its life cycle and was deleted</source>
         <translation>Vstavek je končal svoj življenjski cikel in je bil izbrisan</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -6766,7 +6751,7 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; does not exist.</source>
         <translation>Vstavek »%1« ne obstaja.</translation>
@@ -6783,9 +6768,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>Failed Plugins</source>
         <translation>Neuspeli vstavki</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation>»%1« pogreša lastnost »%2«</translation>
@@ -14240,14 +14222,11 @@ okoljsko spremenljivko SSH_ASKPASS.</translation>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Load on Startup</source>
         <translation>Naloži ob zagonu</translation>

share/qtcreator/translations/qtcreator_uk.ts

@@ -7234,7 +7234,7 @@ Rebuilding the project might help.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>Назва:</translation>
@@ -7283,9 +7283,6 @@ Rebuilding the project might help.</source>
         <source>Platforms:</source>
         <translation>Платформи:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
     <message>
         <source>Qt Creator - Plugin loader messages</source>
         <translation>Qt Creator - Повідомлення завантажувача додатків</translation>
@@ -7298,9 +7295,6 @@ Rebuilding the project might help.</source>
         <source>Details:</source>
         <translation>Деталі:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>Стан:</translation>
@@ -7309,9 +7303,6 @@ Rebuilding the project might help.</source>
         <source>Error message:</source>
         <translation>Повідомлення про помилку:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Cannot open file %1 for reading: %2</source>
         <translation type="vanished">Неможливо відкрити файл %1 для читання: %2</translation>
@@ -7344,28 +7335,6 @@ Rebuilding the project might help.</source>
         <source>Argument: &quot;%1&quot; is empty</source>
         <translation>Аргумент: &quot;%1&quot; порожній</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
-    <message>
-        <source>Name</source>
-        <translation type="vanished">Назва</translation>
-    </message>
-    <message>
-        <source>Load</source>
-        <translation type="vanished">Завантажено</translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="vanished">Версія</translation>
-    </message>
-    <message>
-        <source>Vendor</source>
-        <translation type="vanished">Постачальник</translation>
-    </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginDetailsView</name>
     <message>
         <source>None</source>
         <translation>Немає</translation>
@@ -7378,9 +7347,6 @@ Rebuilding the project might help.</source>
         <source>%1 (current: &quot;%2&quot;)</source>
         <translation>%1 (зараз: &quot;%2&quot;)</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>Неправильний</translation>
@@ -7481,9 +7447,6 @@ Rebuilding the project might help.</source>
         <source>Plugin ended its life cycle and was deleted</source>
         <translation type="vanished">Життєвий цикл додатка завершився і він був видалений</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -7514,9 +7477,6 @@ Reason: %3</source>
         <translation>Неможливо завантажити додаток через збій завантаження залежності: %1(%2)
 Причина: %3</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Name</source>
         <translation>Назва</translation>
@@ -12051,7 +12011,7 @@ Ids must begin with a lowercase letter.</source>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; is specified twice for testing.</source>
         <translation type="vanished">Додаток для тестування &apos;%1&apos; вказано двічі.</translation>
@@ -12084,9 +12044,6 @@ Ids must begin with a lowercase letter.</source>
         <source>Failed Plugins</source>
         <translation>Збій додатків</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation type="vanished">У &apos;%1&apos; відсутній атрибут &apos;%2&apos;</translation>
@@ -29300,7 +29257,7 @@ cannot be found in the path.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Continue</source>
         <translation>Продовжити</translation>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -18485,7 +18485,7 @@ Rebuilding the project might help.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>名称:</translation>
@@ -18534,9 +18534,6 @@ Rebuilding the project might help.</source>
         <source>Platforms:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
     <message>
         <source>The following plugins have errors and cannot be loaded:</source>
         <translation>以下插件有错误，无法被载入:</translation>
@@ -18549,9 +18546,6 @@ Rebuilding the project might help.</source>
         <source>Plugin Loader Messages</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>状态:</translation>
@@ -18560,9 +18554,6 @@ Rebuilding the project might help.</source>
         <source>Error message:</source>
         <translation>错误信息:</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginManagerPrivate</name>
     <message>
         <source>%1 &gt; About Plugins</source>
         <translation type="unfinished"></translation>
@@ -18593,9 +18584,6 @@ Rebuilding the project might help.</source>
         <source>Continue</source>
         <translation type="unfinished">继续</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Plugin meta data not found</source>
         <translation type="unfinished"></translation>
@@ -18620,9 +18608,6 @@ Rebuilding the project might help.</source>
         <source>Argument: &quot;%1&quot; is empty</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginDetailsView</name>
     <message>
         <source>None</source>
         <translation>无</translation>
@@ -18635,16 +18620,6 @@ Rebuilding the project might help.</source>
         <source>%1 (current: &quot;%2&quot;)</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorOverview</name>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished">继续</translation>
-    </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>无效</translation>
@@ -18709,9 +18684,6 @@ Rebuilding the project might help.</source>
         <source>Plugin ended its life cycle and was deleted.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Cannot load plugin because dependency failed to load: %1(%2)
 Reason: %3</source>
@@ -18735,9 +18707,6 @@ Reason: %3</source>
 Reason: %3</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Load on Startup</source>
         <translation>启动时载入</translation>
@@ -26610,7 +26579,7 @@ You might find further explanations in the Application Output view.</source>
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Unknown option %1</source>
         <translation>未知选项 %1</translation>
@@ -26639,9 +26608,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Cannot request scenario &quot;%1&quot; as it was already requested.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>Resolving dependencies failed because state != Read</source>
         <translation>解决依赖关系失败因为 state != Read</translation>

share/qtcreator/translations/qtcreator_zh_TW.ts

@@ -4021,7 +4021,7 @@ Rebuilding the project might help.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Name:</source>
         <translation>名稱：</translation>
@@ -4066,9 +4066,6 @@ Rebuilding the project might help.</source>
         <source>URL:</source>
         <translation>網址：</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginErrorView</name>
     <message>
         <source>State:</source>
         <translation>狀態：</translation>
@@ -4077,9 +4074,6 @@ Rebuilding the project might help.</source>
         <source>Error message:</source>
         <translation>錯誤訊息：</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginSpecPrivate</name>
     <message>
         <source>Cannot open file %1 for reading: %2</source>
         <translation>無法開啟檔案 %1 以讀取：%2</translation>
@@ -4088,9 +4082,6 @@ Rebuilding the project might help.</source>
         <source>Error parsing file %1: %2, at line %3, column %4</source>
         <translation>剖析檔案時發生錯誤 %1：%2，於第 %3 行第 %4 欄</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::Internal::PluginView</name>
     <message>
         <source>Name</source>
         <translation>名稱</translation>
@@ -4107,9 +4098,6 @@ Rebuilding the project might help.</source>
         <source>Load</source>
         <translation>載入</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginErrorView</name>
     <message>
         <source>Invalid</source>
         <translation>無效</translation>
@@ -4174,9 +4162,6 @@ Rebuilding the project might help.</source>
         <source>Plugin ended its life cycle and was deleted</source>
         <translation>外掛程式結束了其生命週期並且已被刪除</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginManager</name>
     <message>
         <source>Circular dependency detected:
 </source>
@@ -6302,7 +6287,7 @@ Add, modify, and remove document filters, which determine the documentation set
     </message>
 </context>
 <context>
-    <name>PluginManager</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>The plugin &apos;%1&apos; does not exist.</source>
         <translation>外掛程式 &apos;%1&apos; 不存在。</translation>
@@ -6319,9 +6304,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Failed Plugins</source>
         <translation>發生錯誤的外掛程式</translation>
     </message>
-</context>
-<context>
-    <name>PluginSpec</name>
     <message>
         <source>&apos;%1&apos; misses attribute &apos;%2&apos;</source>
         <translation>&apos;%1&apos; 缺少屬性 &apos;%2&apos; </translation>
@@ -12077,14 +12059,11 @@ You can choose between stashing the changes or discarding them.</source>
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::PluginDetailsView</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
-</context>
-<context>
-    <name>ExtensionSystem::PluginView</name>
     <message>
         <source>Load on Startup</source>
         <translation>啟動時載入</translation>
@@ -23513,7 +23492,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginErrorOverview</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Qt Creator - Plugin loader messages</source>
         <translation>Qt Creator - 外掛程式載入器訊息</translation>
@@ -23577,7 +23556,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi
     </message>
 </context>
 <context>
-    <name>ExtensionSystem::Internal::PluginErrorOverviewPrivate</name>
+    <name>ExtensionSystem</name>
     <message>
         <source>Continue</source>
         <translation>繼續</translation>

src/libs/extensionsystem/optionsparser.cpp

@@ -3,6 +3,7 @@
 
 #include "optionsparser.h"
 
+#include "extensionsystemtr.h"
 #include "pluginmanager.h"
 #include "pluginmanager_p.h"
 #include "pluginspec_p.h"
@@ -110,16 +111,14 @@ bool OptionsParser::checkForTestOptions()
                 if (PluginSpec *spec = m_pmPrivate->pluginByName(pluginName)) {
                     if (m_pmPrivate->containsTestSpec(spec)) {
                         if (m_errorString)
-                            *m_errorString = QCoreApplication::translate("PluginManager",
+                            *m_errorString = Tr::tr("The plugin \"%1\" is specified twice for testing.").arg(pluginName);
-                                                                         "The plugin \"%1\" is specified twice for testing.").arg(pluginName);
                         m_hasError = true;
                     } else {
                         m_pmPrivate->testSpecs.emplace_back(spec, args);
                     }
                 } else  {
                     if (m_errorString)
-                        *m_errorString = QCoreApplication::translate("PluginManager",
+                        *m_errorString = Tr::tr("The plugin \"%1\" does not exist.").arg(pluginName);
-                                                                     "The plugin \"%1\" does not exist.").arg(pluginName);
                     m_hasError = true;
                 }
             }
@@ -130,16 +129,14 @@ bool OptionsParser::checkForTestOptions()
             if (PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg)) {
                 if (!m_pmPrivate->containsTestSpec(spec)) {
                     if (m_errorString)
-                        *m_errorString = QCoreApplication::translate("PluginManager",
+                        *m_errorString = Tr::tr("The plugin \"%1\" is not tested.").arg(m_currentArg);
-                                                                     "The plugin \"%1\" is not tested.").arg(m_currentArg);
                     m_hasError = true;
                 } else {
                     m_pmPrivate->removeTestSpec(spec);
                 }
             } else {
                 if (m_errorString)
-                    *m_errorString = QCoreApplication::translate("PluginManager",
+                    *m_errorString = Tr::tr("The plugin \"%1\" does not exist.").arg(m_currentArg);
-                                                                 "The plugin \"%1\" does not exist.").arg(m_currentArg);
                 m_hasError = true;
             }
         }
@@ -154,7 +151,7 @@ bool OptionsParser::checkForScenarioOption()
         if (nextToken(RequiredToken)) {
             if (!m_pmPrivate->m_requestedScenario.isEmpty()) {
                 if (m_errorString) {
-                    *m_errorString = QCoreApplication::translate("PluginManager",
+                    *m_errorString = Tr::tr(
                         "Cannot request scenario \"%1\" as it was already requested.")
                         .arg(m_currentArg, m_pmPrivate->m_requestedScenario);
                 }
@@ -183,9 +180,7 @@ bool OptionsParser::checkForLoadOption()
             PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg);
             if (!spec) {
                 if (m_errorString)
-                    *m_errorString = QCoreApplication::translate("PluginManager",
+                    *m_errorString = Tr::tr("The plugin \"%1\" does not exist.").arg(m_currentArg);
-                                                                 "The plugin \"%1\" does not exist.")
-                        .arg(m_currentArg);
                 m_hasError = true;
             } else {
                 spec->d->setForceEnabled(true);
@@ -210,8 +205,7 @@ bool OptionsParser::checkForNoLoadOption()
             PluginSpec *spec = m_pmPrivate->pluginByName(m_currentArg);
             if (!spec) {
                 if (m_errorString)
-                    *m_errorString = QCoreApplication::translate("PluginManager",
+                    *m_errorString = Tr::tr("The plugin \"%1\" does not exist.").arg(m_currentArg);
-                                                                 "The plugin \"%1\" does not exist.").arg(m_currentArg);
                 m_hasError = true;
             } else {
                 spec->d->setForceDisabled(true);
@@ -277,8 +271,7 @@ bool OptionsParser::checkForUnknownOption()
     if (!m_currentArg.startsWith(QLatin1Char('-')))
         return false;
     if (m_errorString)
-        *m_errorString = QCoreApplication::translate("PluginManager",
+        *m_errorString = Tr::tr("Unknown option %1").arg(m_currentArg);
-                                                     "Unknown option %1").arg(m_currentArg);
     m_hasError = true;
     return true;
 }
@@ -299,8 +292,7 @@ bool OptionsParser::nextToken(OptionsParser::TokenType type)
         if (type == OptionsParser::RequiredToken) {
             m_hasError = true;
             if (m_errorString)
-                *m_errorString = QCoreApplication::translate("PluginManager",
+                *m_errorString = Tr::tr("The option %1 requires an argument.").arg(m_currentArg);
-                                                             "The option %1 requires an argument.").arg(m_currentArg);
         }
         return false;
     }

src/libs/extensionsystem/plugindetailsview.cpp

@@ -3,6 +3,7 @@
 
 #include "plugindetailsview.h"
 
+#include "extensionsystemtr.h"
 #include "pluginmanager.h"
 #include "pluginspec.h"
 
@@ -36,8 +37,6 @@ namespace ExtensionSystem::Internal {
 
 class PluginDetailsViewPrivate
 {
-    Q_DECLARE_TR_FUNCTIONS(ExtensionSystem::Internal::PluginDetailsView)
-
 public:
     PluginDetailsViewPrivate(PluginDetailsView *detailsView)
         : q(detailsView)
@@ -58,18 +57,18 @@ public:
 
         // clang-format off
         Form {
-            tr("Name:"), name, br,
+            Tr::tr("Name:"), name, br,
-            tr("Version:"), version, br,
+            Tr::tr("Version:"), version, br,
-            tr("Compatibility version:"), compatVersion, br,
+            Tr::tr("Compatibility version:"), compatVersion, br,
-            tr("Vendor:"), vendor, br,
+            Tr::tr("Vendor:"), vendor, br,
-            tr("Group:"), component, br,
+            Tr::tr("Group:"), component, br,
-            tr("URL:"), url, br,
+            Tr::tr("URL:"), url, br,
-            tr("Location:"), location, br,
+            Tr::tr("Location:"), location, br,
-            tr("Platforms:"), platforms, br,
+            Tr::tr("Platforms:"), platforms, br,
-            tr("Description:"), description, br,
+            Tr::tr("Description:"), description, br,
-            tr("Copyright:"), copyright, br,
+            Tr::tr("Copyright:"), copyright, br,
-            tr("License:"), license, br,
+            Tr::tr("License:"), license, br,
-            tr("Dependencies:"), dependencies
+            Tr::tr("Dependencies:"), dependencies
         }.attachTo(q, WithoutMargins);
         // clang-format on
     }
@@ -138,12 +137,12 @@ void PluginDetailsView::update(PluginSpec *spec)
     d->version->setText(versionString);
     d->compatVersion->setText(spec->compatVersion());
     d->vendor->setText(spec->vendor());
-    d->component->setText(spec->category().isEmpty() ? tr("None") : spec->category());
+    d->component->setText(spec->category().isEmpty() ? Tr::tr("None") : spec->category());
     d->url->setText(QString::fromLatin1("<a href=\"%1\">%1</a>").arg(spec->url()));
     d->location->setText(QDir::toNativeSeparators(spec->filePath()));
     const QString pattern = spec->platformSpecification().pattern();
-    const QString platform = pattern.isEmpty() ? tr("All") : pattern;
+    const QString platform = pattern.isEmpty() ? Tr::tr("All") : pattern;
-    const QString platformString = tr("%1 (current: \"%2\")")
+    const QString platformString = Tr::tr("%1 (current: \"%2\")")
                                    .arg(platform, PluginManager::platformName());
     d->platforms->setText(platformString);
     QString description = spec->description();

src/libs/extensionsystem/pluginerroroverview.cpp

@@ -3,6 +3,7 @@
 
 #include "pluginerroroverview.h"
 
+#include "extensionsystemtr.h"
 #include "pluginmanager.h"
 #include "pluginspec.h"
 
@@ -29,7 +30,7 @@ PluginErrorOverview::PluginErrorOverview(QWidget *parent)
     QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
     buttonBox->setOrientation(Qt::Horizontal);
     buttonBox->setStandardButtons(QDialogButtonBox::NoButton);
-    buttonBox->addButton(tr("Continue"), QDialogButtonBox::AcceptRole);
+    buttonBox->addButton(Tr::tr("Continue"), QDialogButtonBox::AcceptRole);
 
     connect(pluginList, &QListWidget::currentItemChanged,
             this, [pluginError](QListWidgetItem *item) {
@@ -50,11 +51,9 @@ PluginErrorOverview::PluginErrorOverview(QWidget *parent)
     };
 
     Column {
-        createLabel(QCoreApplication::translate("ExtensionSystem::Internal::PluginErrorOverview",
+        createLabel(Tr::tr("The following plugins have errors and cannot be loaded:")),
-                    "The following plugins have errors and cannot be loaded:")),
         pluginList,
-        createLabel(QCoreApplication::translate("ExtensionSystem::Internal::PluginErrorOverview",
+        createLabel(Tr::tr("Details:")),
-                    "Details:")),
         pluginError,
         buttonBox
     }.attachTo(this);

src/libs/extensionsystem/pluginerrorview.cpp

@@ -3,6 +3,7 @@
 
 #include "pluginerrorview.h"
 
+#include "extensionsystemtr.h"
 #include "pluginspec.h"
 
 #include <utils/layoutbuilder.h>
@@ -43,10 +44,8 @@ public:
         using namespace Utils::Layouting;
 
         Form {
-            QCoreApplication::translate("ExtensionSystem::Internal::PluginErrorView",
+            Tr::tr("State:"), state, br,
-                                        "State:"), state, br,
+            Tr::tr("Error message:"), errorString
-            QCoreApplication::translate("ExtensionSystem::Internal::PluginErrorView",
-                                        "Error message:"), errorString
         }.attachTo(q, WithoutMargins);
     }
 
@@ -83,36 +82,36 @@ void PluginErrorView::update(PluginSpec *spec)
     QString tooltip;
     switch (spec->state()) {
     case PluginSpec::Invalid:
-        text = tr("Invalid");
+        text = Tr::tr("Invalid");
-        tooltip = tr("Description file found, but error on read.");
+        tooltip = Tr::tr("Description file found, but error on read.");
         break;
     case PluginSpec::Read:
-        text = tr("Read");
+        text = Tr::tr("Read");
-        tooltip = tr("Description successfully read.");
+        tooltip = Tr::tr("Description successfully read.");
         break;
     case PluginSpec::Resolved:
-        text = tr("Resolved");
+        text = Tr::tr("Resolved");
-        tooltip = tr("Dependencies are successfully resolved.");
+        tooltip = Tr::tr("Dependencies are successfully resolved.");
         break;
     case PluginSpec::Loaded:
-        text = tr("Loaded");
+        text = Tr::tr("Loaded");
-        tooltip = tr("Library is loaded.");
+        tooltip = Tr::tr("Library is loaded.");
         break;
     case PluginSpec::Initialized:
-        text = tr("Initialized");
+        text = Tr::tr("Initialized");
-        tooltip = tr("Plugin's initialization function succeeded.");
+        tooltip = Tr::tr("Plugin's initialization function succeeded.");
         break;
     case PluginSpec::Running:
-        text = tr("Running");
+        text = Tr::tr("Running");
-        tooltip = tr("Plugin successfully loaded and running.");
+        tooltip = Tr::tr("Plugin successfully loaded and running.");
         break;
     case PluginSpec::Stopped:
-        text = tr("Stopped");
+        text = Tr::tr("Stopped");
-        tooltip = tr("Plugin was shut down.");
+        tooltip = Tr::tr("Plugin was shut down.");
         break;
     case PluginSpec::Deleted:
-        text = tr("Deleted");
+        text = Tr::tr("Deleted");
-        tooltip = tr("Plugin ended its life cycle and was deleted.");
+        tooltip = Tr::tr("Plugin ended its life cycle and was deleted.");
         break;
     }
 

src/libs/extensionsystem/pluginmanager.cpp

@@ -2,11 +2,13 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "pluginmanager.h"
+
+#include "extensionsystemtr.h"
+#include "iplugin.h"
+#include "optionsparser.h"
 #include "pluginmanager_p.h"
 #include "pluginspec.h"
 #include "pluginspec_p.h"
-#include "optionsparser.h"
-#include "iplugin.h"
 
 #include <QCoreApplication>
 #include <QCryptographicHash>
@@ -1415,16 +1417,16 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec,
     // check for circular dependencies
     if (circularityCheckQueue.contains(spec)) {
         spec->d->hasError = true;
-        spec->d->errorString = PluginManager::tr("Circular dependency detected:");
+        spec->d->errorString = Tr::tr("Circular dependency detected:");
         spec->d->errorString += QLatin1Char('\n');
         int index = circularityCheckQueue.indexOf(spec);
         for (int i = index; i < circularityCheckQueue.size(); ++i) {
             const PluginSpec *depSpec = circularityCheckQueue.at(i);
-            spec->d->errorString.append(PluginManager::tr("%1 (%2) depends on")
+            spec->d->errorString.append(Tr::tr("%1 (%2) depends on")
                                         .arg(depSpec->name(), depSpec->version()));
             spec->d->errorString += QLatin1Char('\n');
         }
-        spec->d->errorString.append(PluginManager::tr("%1 (%2)").arg(spec->name(), spec->version()));
+        spec->d->errorString.append(Tr::tr("%1 (%2)").arg(spec->name(), spec->version()));
         return false;
     }
     circularityCheckQueue.append(spec);
@@ -1445,7 +1447,7 @@ bool PluginManagerPrivate::loadQueue(PluginSpec *spec,
         if (!loadQueue(depSpec, queue, circularityCheckQueue)) {
             spec->d->hasError = true;
             spec->d->errorString =
-                PluginManager::tr("Cannot load plugin because dependency failed to load: %1 (%2)\nReason: %3")
+                Tr::tr("Cannot load plugin because dependency failed to load: %1 (%2)\nReason: %3")
                     .arg(depSpec->name(), depSpec->version(), depSpec->errorString());
             return false;
         }
@@ -1518,16 +1520,16 @@ void PluginManagerPrivate::checkForProblematicPlugins()
             std::sort(dependentsNames.begin(), dependentsNames.end());
             const QString dependentsList = dependentsNames.join(", ");
             const QString pluginsMenu = HostOsInfo::isMacHost()
-                                            ? tr("%1 > About Plugins")
+                                            ? Tr::tr("%1 > About Plugins")
                                                   .arg(QGuiApplication::applicationDisplayName())
-                                            : tr("Help > About Plugins");
+                                            : Tr::tr("Help > About Plugins");
             const QString otherPluginsText
-                = tr("If you temporarily disable %1, the following plugins that depend on "
+                = Tr::tr("If you temporarily disable %1, the following plugins that depend on "
                          "it are also disabled: %2.\n\n")
                       .arg(spec->name(), dependentsList);
             const QString detailsText = (dependents.isEmpty() ? QString() : otherPluginsText)
-                                        + tr("Disable plugins permanently in %1.").arg(pluginsMenu);
+                                        + Tr::tr("Disable plugins permanently in %1.").arg(pluginsMenu);
-            const QString text = tr("The last time you started %1, it seems to have closed because "
+            const QString text = Tr::tr("The last time you started %1, it seems to have closed because "
                                         "of a problem with the \"%2\" "
                                         "plugin. Temporarily disable the plugin?")
                                      .arg(QGuiApplication::applicationDisplayName(), spec->name());
@@ -1535,9 +1537,9 @@ void PluginManagerPrivate::checkForProblematicPlugins()
             dialog.setIcon(QMessageBox::Question);
             dialog.setText(text);
             dialog.setDetailedText(detailsText);
-            QPushButton *disableButton = dialog.addButton(tr("Disable Plugin"),
+            QPushButton *disableButton = dialog.addButton(Tr::tr("Disable Plugin"),
                                                           QMessageBox::AcceptRole);
-            dialog.addButton(tr("Continue"), QMessageBox::RejectRole);
+            dialog.addButton(Tr::tr("Continue"), QMessageBox::RejectRole);
             dialog.exec();
             if (dialog.clickedButton() == disableButton) {
                 spec->d->setForceDisabled(true);
@@ -1593,7 +1595,7 @@ void PluginManagerPrivate::loadPlugin(PluginSpec *spec, PluginSpec::State destSt
         if (depSpec->state() != destState) {
             spec->d->hasError = true;
             spec->d->errorString =
-                PluginManager::tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
+                Tr::tr("Cannot load plugin because dependency failed to load: %1(%2)\nReason: %3")
                     .arg(depSpec->name(), depSpec->version(), depSpec->errorString());
             return;
         }

src/libs/extensionsystem/pluginspec.cpp

@@ -3,10 +3,11 @@
 
 #include "pluginspec.h"
 
-#include "pluginspec_p.h"
+#include "extensionsystemtr.h"
 #include "iplugin.h"
 #include "iplugin_p.h"
 #include "pluginmanager.h"
+#include "pluginspec_p.h"
 
 #include <utils/algorithm.h>
 #include <utils/hostosinfo.h>
@@ -690,36 +691,36 @@ bool PluginSpecPrivate::reportError(const QString &err)
 
 static inline QString msgValueMissing(const char *key)
 {
-    return QCoreApplication::translate("PluginSpec", "\"%1\" is missing").arg(QLatin1String(key));
+    return Tr::tr("\"%1\" is missing").arg(QLatin1String(key));
 }
 
 static inline QString msgValueIsNotAString(const char *key)
 {
-    return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not a string")
+    return Tr::tr("Value for key \"%1\" is not a string")
             .arg(QLatin1String(key));
 }
 
 static inline QString msgValueIsNotABool(const char *key)
 {
-    return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not a bool")
+    return Tr::tr("Value for key \"%1\" is not a bool")
             .arg(QLatin1String(key));
 }
 
 static inline QString msgValueIsNotAObjectArray(const char *key)
 {
-    return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not an array of objects")
+    return Tr::tr("Value for key \"%1\" is not an array of objects")
             .arg(QLatin1String(key));
 }
 
 static inline QString msgValueIsNotAMultilineString(const char *key)
 {
-    return QCoreApplication::translate("PluginSpec", "Value for key \"%1\" is not a string and not an array of strings")
+    return Tr::tr("Value for key \"%1\" is not a string and not an array of strings")
             .arg(QLatin1String(key));
 }
 
 static inline QString msgInvalidFormat(const char *key, const QString &content)
 {
-    return QCoreApplication::translate("PluginSpec", "Value \"%2\" for key \"%1\" has invalid format")
+    return Tr::tr("Value \"%2\" for key \"%1\" has invalid format")
             .arg(QLatin1String(key), content);
 }
 
@@ -742,8 +743,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
 
     value = pluginMetaData.value(QLatin1String(PLUGIN_METADATA));
     if (!value.isObject()) {
-        return reportError(
+        return reportError(::ExtensionSystem::Tr::tr("Plugin meta data not found"));
-            ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Plugin meta data not found"));
     }
     metaData = value.toObject();
 
@@ -831,8 +831,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
     if (!platformSpec.isEmpty()) {
         platformSpecification.setPattern(platformSpec);
         if (!platformSpecification.isValid()) {
-            return reportError(::ExtensionSystem::Internal::PluginSpecPrivate::tr(
+            return reportError(::ExtensionSystem::Tr::tr("Invalid platform specification \"%1\": %2")
-                                   "Invalid platform specification \"%1\": %2")
                                    .arg(platformSpec, platformSpecification.errorString()));
         }
     }
@@ -850,32 +849,32 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
             value = dependencyObject.value(QLatin1String(DEPENDENCY_NAME));
             if (value.isUndefined()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                    ::ExtensionSystem::Tr::tr("Dependency: %1")
                         .arg(msgValueMissing(DEPENDENCY_NAME)));
             }
             if (!value.isString()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                    ::ExtensionSystem::Tr::tr("Dependency: %1")
                         .arg(msgValueIsNotAString(DEPENDENCY_NAME)));
             }
             dep.name = value.toString();
             value = dependencyObject.value(QLatin1String(DEPENDENCY_VERSION));
             if (!value.isUndefined() && !value.isString()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                    ::ExtensionSystem::Tr::tr("Dependency: %1")
                         .arg(msgValueIsNotAString(DEPENDENCY_VERSION)));
             }
             dep.version = value.toString();
             if (!isValidVersion(dep.version)) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                    ::ExtensionSystem::Tr::tr("Dependency: %1")
                         .arg(msgInvalidFormat(DEPENDENCY_VERSION, dep.version)));
             }
             dep.type = PluginDependency::Required;
             value = dependencyObject.value(QLatin1String(DEPENDENCY_TYPE));
             if (!value.isUndefined() && !value.isString()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Dependency: %1")
+                    ::ExtensionSystem::Tr::tr("Dependency: %1")
                         .arg(msgValueIsNotAString(DEPENDENCY_TYPE)));
             }
             if (!value.isUndefined()) {
@@ -888,7 +887,7 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
                     dep.type = PluginDependency::Test;
                 } else {
                     return reportError(
-                        ::ExtensionSystem::Internal::PluginSpecPrivate::tr(
+                        ::ExtensionSystem::Tr::tr(
                             "Dependency: \"%1\" must be \"%2\" or \"%3\" (is \"%4\").")
                             .arg(QLatin1String(DEPENDENCY_TYPE),
                                  QLatin1String(DEPENDENCY_TYPE_HARD),
@@ -913,31 +912,31 @@ bool PluginSpecPrivate::readMetaData(const QJsonObject &pluginMetaData)
             value = argumentObject.value(QLatin1String(ARGUMENT_NAME));
             if (value.isUndefined()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                    ::ExtensionSystem::Tr::tr("Argument: %1")
                         .arg(msgValueMissing(ARGUMENT_NAME)));
             }
             if (!value.isString()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                    ::ExtensionSystem::Tr::tr("Argument: %1")
                         .arg(msgValueIsNotAString(ARGUMENT_NAME)));
             }
             arg.name = value.toString();
             if (arg.name.isEmpty()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: \"%1\" is empty")
+                    ::ExtensionSystem::Tr::tr("Argument: \"%1\" is empty")
                         .arg(QLatin1String(ARGUMENT_NAME)));
             }
             value = argumentObject.value(QLatin1String(ARGUMENT_DESCRIPTION));
             if (!value.isUndefined() && !value.isString()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                    ::ExtensionSystem::Tr::tr("Argument: %1")
                         .arg(msgValueIsNotAString(ARGUMENT_DESCRIPTION)));
             }
             arg.description = value.toString();
             value = argumentObject.value(QLatin1String(ARGUMENT_PARAMETER));
             if (!value.isUndefined() && !value.isString()) {
                 return reportError(
-                    ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Argument: %1")
+                    ::ExtensionSystem::Tr::tr("Argument: %1")
                         .arg(msgValueIsNotAString(ARGUMENT_PARAMETER)));
             }
             arg.parameter = value.toString();
@@ -1008,7 +1007,7 @@ bool PluginSpecPrivate::resolveDependencies(const QVector<PluginSpec *> &specs)
     if (state == PluginSpec::Resolved)
         state = PluginSpec::Read; // Go back, so we just re-resolve the dependencies.
     if (state != PluginSpec::Read) {
-        errorString = QCoreApplication::translate("PluginSpec", "Resolving dependencies failed because state != Read");
+        errorString = ::ExtensionSystem::Tr::tr("Resolving dependencies failed because state != Read");
         hasError = true;
         return false;
     }
@@ -1022,7 +1021,7 @@ bool PluginSpecPrivate::resolveDependencies(const QVector<PluginSpec *> &specs)
                 hasError = true;
                 if (!errorString.isEmpty())
                     errorString.append(QLatin1Char('\n'));
-                errorString.append(QCoreApplication::translate("PluginSpec", "Could not resolve dependency '%1(%2)'")
+                errorString.append(::ExtensionSystem::Tr::tr("Could not resolve dependency '%1(%2)'")
                     .arg(dependency.name, dependency.version));
             }
             continue;
@@ -1068,7 +1067,8 @@ bool PluginSpecPrivate::loadLibrary()
     if (state != PluginSpec::Resolved) {
         if (state == PluginSpec::Loaded)
             return true;
-        errorString = QCoreApplication::translate("PluginSpec", "Loading the library failed because state != Resolved");
+        errorString =
+            ::ExtensionSystem::Tr::tr("Loading the library failed because state != Resolved");
         hasError = true;
         return false;
     }
@@ -1082,7 +1082,8 @@ bool PluginSpecPrivate::loadLibrary()
                                 : qobject_cast<IPlugin *>(staticPlugin->instance());
     if (!pluginObject) {
         hasError = true;
-        errorString = QCoreApplication::translate("PluginSpec", "Plugin is not valid (does not derive from IPlugin)");
+        errorString =
+            ::ExtensionSystem::Tr::tr("Plugin is not valid (does not derive from IPlugin)");
         if (loader)
             loader->unload();
         return false;
@@ -1103,18 +1104,20 @@ bool PluginSpecPrivate::initializePlugin()
     if (state != PluginSpec::Loaded) {
         if (state == PluginSpec::Initialized)
             return true;
-        errorString = QCoreApplication::translate("PluginSpec", "Initializing the plugin failed because state != Loaded");
+        errorString = ::ExtensionSystem::Tr::tr(
+            "Initializing the plugin failed because state != Loaded");
         hasError = true;
         return false;
     }
     if (!plugin) {
-        errorString = QCoreApplication::translate("PluginSpec", "Internal error: have no plugin instance to initialize");
+        errorString = ::ExtensionSystem::Tr::tr(
+            "Internal error: have no plugin instance to initialize");
         hasError = true;
         return false;
     }
     QString err;
     if (!plugin->initialize(arguments, &err)) {
-        errorString = QCoreApplication::translate("PluginSpec", "Plugin initialization failed: %1").arg(err);
+        errorString = ::ExtensionSystem::Tr::tr("Plugin initialization failed: %1").arg(err);
         hasError = true;
         return false;
     }
@@ -1132,12 +1135,14 @@ bool PluginSpecPrivate::initializeExtensions()
     if (state != PluginSpec::Initialized) {
         if (state == PluginSpec::Running)
             return true;
-        errorString = QCoreApplication::translate("PluginSpec", "Cannot perform extensionsInitialized because state != Initialized");
+        errorString = ::ExtensionSystem::Tr::tr(
+            "Cannot perform extensionsInitialized because state != Initialized");
         hasError = true;
         return false;
     }
     if (!plugin) {
-        errorString = QCoreApplication::translate("PluginSpec", "Internal error: have no plugin instance to perform extensionsInitialized");
+        errorString = ::ExtensionSystem::Tr::tr(
+            "Internal error: have no plugin instance to perform extensionsInitialized");
         hasError = true;
         return false;
     }
@@ -1156,7 +1161,8 @@ bool PluginSpecPrivate::delayedInitialize()
     if (state != PluginSpec::Running)
         return false;
     if (!plugin) {
-        errorString = QCoreApplication::translate("PluginSpec", "Internal error: have no plugin instance to perform delayedInitialize");
+        errorString = ::ExtensionSystem::Tr::tr(
+            "Internal error: have no plugin instance to perform delayedInitialize");
         hasError = true;
         return false;
     }

src/libs/extensionsystem/pluginview.cpp

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "pluginview.h"
+
+#include "extensionsystemtr.h"
 #include "pluginmanager.h"
 #include "pluginspec.h"
 #include "pluginspec_p.h"
@@ -98,22 +100,22 @@ public:
         switch (column) {
         case NameColumn:
             if (role == Qt::DisplayRole)
-                return m_spec->isExperimental() ? PluginView::tr("%1 (experimental)").arg(m_spec->name())
+                return m_spec->isExperimental() ? Tr::tr("%1 (experimental)").arg(m_spec->name())
                                                 : m_spec->name();
             if (role == SortRole)
                 return m_spec->name();
             if (role == Qt::ToolTipRole) {
                 QString toolTip;
                 if (!m_spec->isAvailableForHostPlatform())
-                    toolTip = PluginView::tr("Path: %1\nPlugin is not available on this platform.");
+                    toolTip = Tr::tr("Path: %1\nPlugin is not available on this platform.");
                 else if (m_spec->isEnabledIndirectly())
-                    toolTip = PluginView::tr("Path: %1\nPlugin is enabled as dependency of an enabled plugin.");
+                    toolTip = Tr::tr("Path: %1\nPlugin is enabled as dependency of an enabled plugin.");
                 else if (m_spec->isForceEnabled())
-                    toolTip = PluginView::tr("Path: %1\nPlugin is enabled by command line argument.");
+                    toolTip = Tr::tr("Path: %1\nPlugin is enabled by command line argument.");
                 else if (m_spec->isForceDisabled())
-                    toolTip = PluginView::tr("Path: %1\nPlugin is disabled by command line argument.");
+                    toolTip = Tr::tr("Path: %1\nPlugin is disabled by command line argument.");
                 else
-                    toolTip = PluginView::tr("Path: %1");
+                    toolTip = Tr::tr("Path: %1");
                 return toolTip.arg(QDir::toNativeSeparators(m_spec->filePath()));
             }
             if (role == Qt::DecorationRole) {
@@ -130,17 +132,17 @@ public:
                 if (role == Qt::CheckStateRole || role == SortRole)
                     return Qt::Unchecked;
                 if (role == Qt::ToolTipRole)
-                    return PluginView::tr("Plugin is not available on this platform.");
+                    return Tr::tr("Plugin is not available on this platform.");
             } else if (m_spec->isRequired()) {
                 if (role == Qt::CheckStateRole || role == SortRole)
                     return Qt::Checked;
                 if (role == Qt::ToolTipRole)
-                    return PluginView::tr("Plugin is required.");
+                    return Tr::tr("Plugin is required.");
             } else {
                 if (role == Qt::CheckStateRole || role == SortRole)
                     return m_spec->isEnabledBySettings() ? Qt::Checked : Qt::Unchecked;
                 if (role == Qt::ToolTipRole)
-                    return PluginView::tr("Load on startup");
+                    return Tr::tr("Load on startup");
             }
             break;
 
@@ -211,7 +213,7 @@ public:
 
         if (column == LoadedColumn) {
             if (role == Qt::ToolTipRole)
-                return PluginView::tr("Load on Startup");
+                return Tr::tr("Load on Startup");
             if (role == Qt::CheckStateRole || role == SortRole) {
                 int checkedCount = 0;
                 for (PluginSpec *spec : m_plugins) {
@@ -284,7 +286,7 @@ PluginView::PluginView(QWidget *parent)
     m_categoryView->setSelectionBehavior(QAbstractItemView::SelectRows);
 
     m_model = new TreeModel<TreeItem, CollectionItem, PluginItem>(this);
-    m_model->setHeader({ tr("Name"), tr("Load"), tr("Version"), tr("Vendor") });
+    m_model->setHeader({ Tr::tr("Name"), Tr::tr("Load"), Tr::tr("Version"), Tr::tr("Vendor") });
 
     m_sortModel = new CategorySortFilterModel(this);
     m_sortModel->setSourceModel(m_model);
@@ -353,7 +355,7 @@ void PluginView::updatePlugins()
     std::vector<CollectionItem *> collections;
     const auto end = pluginCollections.cend();
     for (auto it = pluginCollections.cbegin(); it != end; ++it) {
-        const QString name = it.key().isEmpty() ? tr("Utilities") : it.key();
+        const QString name = it.key().isEmpty() ? Tr::tr("Utilities") : it.key();
         collections.push_back(new CollectionItem(name, it.value(), this));
     }
     Utils::sort(collections, &CollectionItem::m_name);
@@ -384,8 +386,8 @@ bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enabl
         }
         additionalPlugins.subtract(plugins);
         if (!additionalPlugins.isEmpty()) {
-            if (QMessageBox::question(this, tr("Enabling Plugins"),
+            if (QMessageBox::question(this, Tr::tr("Enabling Plugins"),
-                             tr("Enabling\n%1\nwill also enable the following plugins:\n\n%2")
+                             Tr::tr("Enabling\n%1\nwill also enable the following plugins:\n\n%2")
                              .arg(pluginListString(plugins), pluginListString(additionalPlugins)),
                              QMessageBox::Ok | QMessageBox::Cancel,
                              QMessageBox::Ok) != QMessageBox::Ok) {
@@ -401,8 +403,8 @@ bool PluginView::setPluginsEnabled(const QSet<PluginSpec *> &plugins, bool enabl
         }
         additionalPlugins.subtract(plugins);
         if (!additionalPlugins.isEmpty()) {
-            if (QMessageBox::question(this, tr("Disabling Plugins"),
+            if (QMessageBox::question(this, Tr::tr("Disabling Plugins"),
-                             tr("Disabling\n%1\nwill also disable the following plugins:\n\n%2")
+                             Tr::tr("Disabling\n%1\nwill also disable the following plugins:\n\n%2")
                              .arg(pluginListString(plugins), pluginListString(additionalPlugins)),
                              QMessageBox::Ok | QMessageBox::Cancel,
                              QMessageBox::Ok) != QMessageBox::Ok) {