diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 6b1c9d15613..adca0c251ce 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -4605,7 +4605,7 @@ Také se automaticky nastaví správná verze Qt. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Název: @@ -4662,9 +4662,6 @@ Také se automaticky nastaví správná verze Qt. Platforms: Platformy: - - - ExtensionSystem::Internal::PluginErrorView State: Stav: @@ -4677,9 +4674,6 @@ Také se automaticky nastaví správná verze Qt. Error message: Hlášení o chybě: - - - ExtensionSystem::Internal::PluginSpecPrivate File does not exist: %1 Soubor neexistuje: '%1' @@ -4696,9 +4690,6 @@ Také se automaticky nastaví správná verze Qt. Error parsing file %1: %2, at line %3, column %4 Chyba při čtení souboru %1: %2 na řádku %3, sloupec %4 - - - ExtensionSystem::Internal::PluginView State Stav @@ -4723,9 +4714,6 @@ Také se automaticky nastaví správná verze Qt. Load Nahrát - - - ExtensionSystem::PluginErrorView Invalid Neplatný @@ -4826,9 +4814,6 @@ Také se automaticky nastaví správná verze Qt. Plugin ended its life cycle and was deleted Přídavný modul byl po uplynutí své doby životnosti smazán - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -9093,7 +9078,7 @@ ve svém .pro souboru. - PluginManager + ExtensionSystem The plugin '%1' is specified twice for testing. Přídavný modul '%1' je ve zkušebním seznamu přítomen dvakrát. @@ -9114,9 +9099,6 @@ ve svém .pro souboru. Failed Plugins Přídavné moduly které selhaly při nahrávání - - - PluginSpec '%1' misses attribute '%2' U '%1' chybí vlastnost '%2' @@ -21331,7 +21313,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - ExtensionSystem::PluginDetailsView + ExtensionSystem None Žádná @@ -21340,25 +21322,6 @@ should a repository require SSH-authentication (see documentation on SSH and the All Vše - - - ExtensionSystem::PluginView - - Name - Název - - - Load - Nahrát - - - Version - Verze - - - Vendor - Prodejce - Load on Startup Nahrát při spuštění @@ -37802,7 +37765,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. - ExtensionSystem::Internal::PluginErrorOverview + ExtensionSystem Qt Creator - Plugin loader messages Qt Creator - Zprávy zavaděče přídavných modulů @@ -38173,13 +38136,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Qt Creator - - ExtensionSystem::Internal::PluginErrorOverviewPrivate - - Continue - Pokračovat - - QmlJsDebugClient::QmlProfilerEventList @@ -49451,7 +49407,7 @@ nelze najít v cestě. - ExtensionSystem::PluginErrorOverview + ExtensionSystem Continue Pokračovat diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 77bca0c1767..8c790b08afa 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -14284,7 +14284,7 @@ Det hjælper måske at genbygge projektet. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Description: Beskrivelse: @@ -14333,9 +14333,6 @@ Det hjælper måske at genbygge projektet. License: Licens: - - - ExtensionSystem::Internal::PluginErrorOverview The following plugins have errors and cannot be loaded: Følgende plugins har fejl og kan ikke indlæses: @@ -14348,9 +14345,6 @@ Det hjælper måske at genbygge projektet. Plugin Loader Messages Plugin-indlæser meddelelser - - - ExtensionSystem::Internal::PluginErrorView State: Tilstand: @@ -14359,9 +14353,6 @@ Det hjælper måske at genbygge projektet. Error message: Fejlmeddelelse: - - - ExtensionSystem::Internal::PluginSpecPrivate Plugin meta data not found Plugin-metadata ikke fundet @@ -14386,9 +14377,6 @@ Det hjælper måske at genbygge projektet. Argument: "%1" is empty Argument: "%1" er tom - - - ExtensionSystem::PluginDetailsView None Ingen @@ -14401,16 +14389,10 @@ Det hjælper måske at genbygge projektet. %1 (current: "%2") %1 (aktuel: "%2") - - - ExtensionSystem::PluginErrorOverview Continue Fortsæt - - - ExtensionSystem::PluginErrorView Invalid Ugyldig @@ -14475,9 +14457,6 @@ Det hjælper måske at genbygge projektet. Plugin ended its life cycle and was deleted. Plugin afsluttede sin livscyklus og blev slettet. - - - ExtensionSystem::PluginManager Circular dependency detected: Cirkulær afhængighed detekteret: @@ -14502,9 +14481,6 @@ Reason: %3 Kan ikke indlæse plugin fordi afhængighed ikke kunne indlæses: %1(%2) Årsag: %3 - - - ExtensionSystem::PluginView %1 (experimental) %1 (eksperimentel) @@ -20967,7 +20943,7 @@ Fejl: %5 - PluginManager + ExtensionSystem The plugin "%1" is specified twice for testing. Pluginet "%1" er angivet to gange for testing. @@ -20992,9 +20968,6 @@ Fejl: %5 Failed Plugins Mislykkede plugins - - - PluginSpec "%1" is missing "%1" mangler diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 8a4ff707afd..06035cfc442 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -6681,7 +6681,7 @@ Versuchen Sie, das Projekt neu zu erstellen. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Name: @@ -6730,9 +6730,6 @@ Versuchen Sie, das Projekt neu zu erstellen. Platforms: Plattformen: - - - ExtensionSystem::Internal::PluginErrorView State: Status: @@ -6741,9 +6738,6 @@ Versuchen Sie, das Projekt neu zu erstellen. Error message: Fehlermeldung: - - - ExtensionSystem::Internal::PluginSpecPrivate Plugin meta data not found Plugin-Metadaten nicht gefunden @@ -6768,9 +6762,6 @@ Versuchen Sie, das Projekt neu zu erstellen. Argument: "%1" is empty Argument: "%1" ist leer - - - ExtensionSystem::PluginErrorView Invalid Ungültig @@ -6835,9 +6826,6 @@ Versuchen Sie, das Projekt neu zu erstellen. Deleted Gelöscht - - - ExtensionSystem::PluginManager Circular dependency detected: Zirkuläre Abhängigkeit festgestellt: @@ -10009,7 +9997,7 @@ Leer lassen, um das Dateisystem zu durchsuchen. - PluginManager + ExtensionSystem The plugin "%1" is specified twice for testing. Das Plugin "%1" ist in der Testliste doppelt vorhanden. @@ -10038,9 +10026,6 @@ Leer lassen, um das Dateisystem zu durchsuchen. Failed Plugins Nicht geladene Plugins (Fehlschlag beim Ladevorgang) - - - PluginSpec "%1" is missing "%1" fehlt @@ -14727,7 +14712,7 @@ Locked components cannot be modified or selected. - ExtensionSystem::PluginDetailsView + ExtensionSystem None Keine @@ -14740,9 +14725,6 @@ Locked components cannot be modified or selected. %1 (current: "%2") %1 (aktuell: "%2") - - - ExtensionSystem::PluginView Name Name @@ -20837,7 +20819,7 @@ When disabled, moves targets straight to the current mouse position. - ExtensionSystem::Internal::PluginErrorOverview + ExtensionSystem The following plugins have errors and cannot be loaded: Die folgenden Plugins sind fehlerhaft und können nicht geladen werden: @@ -25990,7 +25972,7 @@ wirklich löschen? - ExtensionSystem::PluginErrorOverview + ExtensionSystem Continue Fortsetzen @@ -44024,7 +44006,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. - ExtensionSystem::Internal::PluginManagerPrivate + ExtensionSystem %1 > About Plugins %1 > Plugins @@ -44053,10 +44035,6 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. Disable Plugin Plugin deaktivieren - - Continue - Fortsetzen - Utils::NameValueModel diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 445c883dfc4..b19594e0c91 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -4263,7 +4263,7 @@ Adicionalmente ajustará automáticamente la versión de Qt. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Nombre: @@ -4313,9 +4313,6 @@ Adicionalmente ajustará automáticamente la versión de Qt. Dependencies: Dependencias: - - - ExtensionSystem::Internal::PluginErrorView State: Estado: @@ -4325,9 +4322,6 @@ Adicionalmente ajustará automáticamente la versión de Qt. Error Message: Mensaje de error: - - - ExtensionSystem::Internal::PluginSpecPrivate File does not exist: %1 El archivo no existe: %1 @@ -4340,9 +4334,6 @@ Adicionalmente ajustará automáticamente la versión de Qt. Error parsing file %1: %2, at line %3, column %4 Error interpretando el archivo %1: %2, en línea %3, columna %4 - - - ExtensionSystem::Internal::PluginView State Estado @@ -4367,9 +4358,6 @@ Adicionalmente ajustará automáticamente la versión de Qt. Location Localización - - - ExtensionSystem::PluginErrorView Invalid Inválido @@ -4438,9 +4426,6 @@ Adicionalmente ajustará automáticamente la versión de Qt. Plugin ended it's life cycle and was deleted El plugin culminó su ciclo de vida y fue removido - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -6498,7 +6483,7 @@ en su archivo .pro. - PluginManager + ExtensionSystem The plugin '%1' does not exist. El plugin '%1' no existe. @@ -6511,9 +6496,6 @@ en su archivo .pro. The option %1 requires an argument. La opción %1 requiere un argumento. - - - PluginSpec '%1' misses attribute '%2' '%1' carece del atributo '%2' diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 1a8d5cd0ded..d263ac96401 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -5406,7 +5406,7 @@ La version de Qt est aussi définie automatiquement. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Nom : @@ -5465,9 +5465,6 @@ La version de Qt est aussi définie automatiquement. Platforms: Plateformes : - - - ExtensionSystem::Internal::PluginErrorView State: État : @@ -5480,9 +5477,6 @@ La version de Qt est aussi définie automatiquement. Error message: Message d'erreur : - - - ExtensionSystem::Internal::PluginSpecPrivate File does not exist: %1 Le fichier n'existe pas : %1 @@ -5499,9 +5493,6 @@ La version de Qt est aussi définie automatiquement. Error parsing file %1: %2, at line %3, column %4 Erreur pendant l'analyse du fichier %1 : %2, ligne %3, colonne %4 - - - ExtensionSystem::Internal::PluginView State État @@ -5526,9 +5517,6 @@ La version de Qt est aussi définie automatiquement. Load Charge - - - ExtensionSystem::PluginErrorView Invalid Invalide @@ -5597,9 +5585,6 @@ La version de Qt est aussi définie automatiquement. Plugin ended its life cycle and was deleted Le plug-in a terminé son cycle de vie et a été supprimé - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -9695,7 +9680,7 @@ francis : voila une nouvelle suggestion :) - PluginManager + ExtensionSystem The plugin '%1' is specified twice for testing. Le plugin "%1' est spécifié deux fois pour les tests. @@ -9716,9 +9701,6 @@ francis : voila une nouvelle suggestion :) Failed Plugins Plug-ins défectueux - - - PluginSpec '%1' misses attribute '%2' L'attribute '%1' est manquant pour "%2" @@ -20484,7 +20466,7 @@ francis : ouai assez d'accord. - ExtensionSystem::PluginDetailsView + ExtensionSystem None Aucune @@ -20493,9 +20475,6 @@ francis : ouai assez d'accord. All Tout - - - ExtensionSystem::PluginView Load on Startup Charger au démarrage @@ -36493,7 +36472,7 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle - ExtensionSystem::Internal::PluginErrorOverview + ExtensionSystem Qt Creator - Plugin loader messages Qt Creator - messages du chargeur de plug-in @@ -36742,13 +36721,6 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle Qt Creator - - ExtensionSystem::Internal::PluginErrorOverviewPrivate - - Continue - Continue - - QmlJsDebugClient::QmlProfilerEventList @@ -46870,7 +46842,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - ExtensionSystem::PluginErrorOverview + ExtensionSystem Continue Continue diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 15cfa1d2a4c..500dccd5566 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -2,7 +2,7 @@ - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Description: Opis: @@ -51,9 +51,6 @@ License: Licenca: - - - ExtensionSystem::Internal::PluginErrorOverview Plugin Loader Messages Poruke učitača dodataka @@ -66,9 +63,6 @@ Details: Detalji: - - - ExtensionSystem::Internal::PluginErrorView State: Stanje: @@ -10438,7 +10432,7 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u - PluginManager + ExtensionSystem The plugin "%1" is specified twice for testing. @@ -10463,9 +10457,6 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u Failed Plugins Neuspjeli dodaci - - - ExtensionSystem::PluginDetailsView None Bez @@ -10478,16 +10469,10 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u %1 (current: "%2") - - - ExtensionSystem::PluginErrorOverview Continue Nastavi - - - ExtensionSystem::PluginErrorView Invalid @@ -10552,9 +10537,6 @@ onemogućit će sve takve funkcije kad nisu potrebne, što će poboljšati rad u Plugin ended its life cycle and was deleted. - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -10577,9 +10559,6 @@ Reason: %3 Reason: %3 - - - PluginSpec "%1" is missing @@ -10644,9 +10623,6 @@ Reason: %3 Internal error: have no plugin instance to perform delayedInitialize - - - ExtensionSystem::Internal::PluginSpecPrivate Plugin meta data not found @@ -10671,9 +10647,6 @@ Reason: %3 Argument: "%1" is empty - - - ExtensionSystem::PluginView %1 (experimental) diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 279726a6151..06650942c02 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -5596,7 +5596,7 @@ Ez automatikus beállítja a megfelelő Qt verziót is. - ExtensionSystem::0 + ExtensionSystem Invalid Érvénytelen @@ -5691,9 +5691,6 @@ Reason: %3 Nem lehet betölteni a beépülőt, mert nem sikerült betölten a függőséget: %1(%2) Ok: %3 - - - ExtensionSystem::Internal::0 Name: Név: @@ -5774,9 +5771,6 @@ Ok: %3 Location Hely - - - ExtensionSystem::Internal::PluginDetailsView Name: Név: @@ -5817,9 +5811,6 @@ Ok: %3 Dependencies: Függőségek: - - - ExtensionSystem::Internal::PluginErrorView State: Státusz: @@ -5828,9 +5819,6 @@ Ok: %3 Error Message: Hiba üzenet: - - - ExtensionSystem::Internal::PluginSpecPrivate File does not exist: %1 A fájl nem létezik: '%1' @@ -5843,9 +5831,6 @@ Ok: %3 Error parsing file %1: %2, at line %3, column %4 Hiba történt a(z) %1 fájl elemzése közben: %2, %3 sorban, %4 oszlopban - - - ExtensionSystem::Internal::PluginView State Státusz @@ -5866,9 +5851,6 @@ Ok: %3 Location Hely - - - ExtensionSystem::PluginErrorView Invalid Érvénytelen @@ -5933,9 +5915,6 @@ Ok: %3 Plugin ended its life cycle and was deleted A beépülő modul elérte az élettartamának és törölték - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -9967,7 +9946,7 @@ p, li { white-space: pre-wrap; } - PluginManager + ExtensionSystem The plugin '%1' does not exist. A(z) '%1' beépülő modul nem létezik. @@ -9980,9 +9959,6 @@ p, li { white-space: pre-wrap; } The option %1 requires an argument. A(z) %1 opció egy argumentumot igényel. - - - PluginSpec '%1' misses attribute '%2' diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index ff8b4167383..e00201e71c3 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -4165,7 +4165,7 @@ Imposta automaticamente la Versione di Qt corretta. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Nome: @@ -4215,9 +4215,6 @@ Imposta automaticamente la Versione di Qt corretta. Dependencies: Dipendenze: - - - ExtensionSystem::Internal::PluginErrorView State: Stato: @@ -4227,9 +4224,6 @@ Imposta automaticamente la Versione di Qt corretta. Error Message: Messaggio d'Errore: - - - ExtensionSystem::Internal::PluginSpecPrivate File does not exist: %1 Il file non esiste: %1 @@ -4242,9 +4236,6 @@ Imposta automaticamente la Versione di Qt corretta. Error parsing file %1: %2, at line %3, column %4 Errore leggendo dal file %1: %2, alla riga %3, colonna %4 - - - ExtensionSystem::Internal::PluginView State Stato @@ -4269,9 +4260,6 @@ Imposta automaticamente la Versione di Qt corretta. Location Posizione - - - ExtensionSystem::PluginErrorView Invalid Non valido @@ -4336,9 +4324,6 @@ Imposta automaticamente la Versione di Qt corretta. Plugin ended its life cycle and was deleted Il plugin ha concluso il suo ciclo di vita ed è stato cancellato - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -6398,7 +6383,7 @@ nel tuo file .pro. - PluginManager + ExtensionSystem The plugin '%1' does not exist. Il plugin '%1' non esiste. @@ -6411,9 +6396,6 @@ nel tuo file .pro. The option %1 requires an argument. L'opzione %1 richiede un parametro. - - - PluginSpec '%1' misses attribute '%2' In '%1' manca l'attributo '%2' diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index b8cd413b6de..6eae56f94a5 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -2,7 +2,7 @@ - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Description: 説明: @@ -51,9 +51,6 @@ License: ライセンス: - - - ExtensionSystem::Internal::PluginErrorOverview Qt Creator - Plugin loader messages Qt Creator - プラグインローダーからのメッセージ @@ -70,9 +67,6 @@ Plugin Loader Messages プラグインローダーからのメッセージ - - - ExtensionSystem::Internal::PluginErrorView State: 状態: @@ -8856,7 +8850,7 @@ preferShaping プロパティを false に設定すると、このような機 - PluginManager + ExtensionSystem The plugin "%1" is specified twice for testing. プラグイン "%1" はテスト用に2回指定されています。 @@ -8881,9 +8875,6 @@ preferShaping プロパティを false に設定すると、このような機 Failed Plugins 読み込みに失敗したプラグイン - - - ExtensionSystem::PluginDetailsView None なし @@ -8896,16 +8887,10 @@ preferShaping プロパティを false に設定すると、このような機 %1 (current: "%2") %1 (現在: "%2") - - - ExtensionSystem::PluginErrorOverview Continue 続行 - - - ExtensionSystem::PluginErrorView Invalid 無効 @@ -8970,9 +8955,6 @@ preferShaping プロパティを false に設定すると、このような機 Deleted 削除済み - - - ExtensionSystem::PluginManager Circular dependency detected: 循環依存関係が検出されました: @@ -9005,9 +8987,6 @@ Reason: %3 依存関係が解決できなかったため、以下のプラグインを読み込めませんでした: %1(%2) 理由: %3 - - - PluginSpec "%1" is missing "%1" が見つかりません @@ -9072,9 +9051,6 @@ Reason: %3 Internal error: have no plugin instance to perform delayedInitialize 内部エラー: delayedInitialize を実行するプラグインインスタンスが存在しません - - - ExtensionSystem::PluginView Name 名前 @@ -34648,7 +34624,7 @@ the program. - ExtensionSystem::Internal::PluginSpecPrivate + ExtensionSystem Plugin meta data not found プラグインのメタデータが見つかりません @@ -43457,7 +43433,7 @@ Output: - ExtensionSystem::Internal::PluginManagerPrivate + ExtensionSystem %1 > About Plugins %1 > プラグインについて @@ -43486,10 +43462,6 @@ Output: Disable Plugin プラグインを無効にする - - Continue - 続行 - BaseMessage diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 9df04ccbffa..d4887990572 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -2,7 +2,7 @@ - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Nazwa: @@ -51,9 +51,6 @@ Platforms: Platformy: - - - ExtensionSystem::Internal::PluginErrorView State: Stan: @@ -1464,7 +1461,7 @@ - PluginManager + ExtensionSystem The plugin "%1" is specified twice for testing. Wtyczka "%1" występuje dwukrotnie w testach. @@ -1507,9 +1504,6 @@ Reason: %3 Nie można załadować wtyczki, ponieważ nie udało się załadować zależności: %1(%2) Przyczyna: %3 - - - ExtensionSystem::PluginErrorView Invalid Niepoprawna @@ -1574,9 +1568,6 @@ Przyczyna: %3 Deleted Usunięta - - - ExtensionSystem::Internal::PluginSpecPrivate Plugin meta data not found Brak danych o wtyczce @@ -1601,9 +1592,6 @@ Przyczyna: %3 Argument: "%1" is empty Argument: "%1" jest pusty - - - PluginSpec "%1" is missing Brak "%1" @@ -10192,7 +10180,7 @@ Możesz odłożyć zmiany lub je porzucić. - ExtensionSystem::PluginDetailsView + ExtensionSystem None Brak @@ -10206,9 +10194,6 @@ Możesz odłożyć zmiany lub je porzucić. What current? platform? %1 (bieżąca platforma: "%2") - - - ExtensionSystem::PluginView Name Nazwa @@ -17448,7 +17433,7 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. - ExtensionSystem::Internal::PluginErrorOverview + ExtensionSystem Qt Creator - Plugin loader messages Qt Creator - komunikaty ładowania wtyczek @@ -23289,7 +23274,7 @@ Można używać nazw częściowych, jeśli są one unikalne. - ExtensionSystem::PluginErrorOverview + ExtensionSystem Continue Kontynuuj diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 06b7311e296..521abfd9224 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -17886,7 +17886,7 @@ Rebuilding the project might help. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Название: @@ -17935,9 +17935,6 @@ Rebuilding the project might help. Platforms: Платформы: - - - ExtensionSystem::Internal::PluginErrorOverview The following plugins have errors and cannot be loaded: Следующие модули содержат ошибки и не могут быть загружены: @@ -17950,9 +17947,6 @@ Rebuilding the project might help. Plugin Loader Messages Сообщения загрузчика модулей - - - ExtensionSystem::Internal::PluginErrorView State: Состояние: @@ -17962,9 +17956,6 @@ Rebuilding the project might help. Сообщение об ошибке: - - - ExtensionSystem::Internal::PluginManagerPrivate %1 > About Plugins %1 > О модулях @@ -17997,9 +17988,6 @@ Rebuilding the project might help. Continue Продолжить - - - ExtensionSystem::Internal::PluginSpecPrivate Plugin meta data not found Мета-данные модуля не найдены @@ -18024,9 +18012,6 @@ Rebuilding the project might help. Argument: "%1" is empty Аргумент: «%1» пустой - - - ExtensionSystem::PluginDetailsView None Нет @@ -18039,16 +18024,6 @@ Rebuilding the project might help. %1 (current: "%2") %1 (текущая: «%2») - - - ExtensionSystem::PluginErrorOverview - - Continue - Продолжить - - - - ExtensionSystem::PluginErrorView Invalid Некорректный @@ -18113,9 +18088,6 @@ Rebuilding the project might help. Deleted Удалён - - - ExtensionSystem::PluginManager Circular dependency detected: Обнаружена циклическая зависимость: @@ -18140,9 +18112,6 @@ Reason: %3 Невозможно загрузить модуль, так как не удалось загрузить его зависимость: %1 (%2) Причина: %3 - - - ExtensionSystem::PluginView Name Название @@ -27236,7 +27205,7 @@ You might find further explanations in the Application Output view. - PluginManager + ExtensionSystem The plugin "%1" is specified twice for testing. Модуль «%1» указан для тестирования дважды. @@ -27261,9 +27230,6 @@ You might find further explanations in the Application Output view. Failed Plugins Проблемные модули - - - PluginSpec "%1" is missing «%1» отсутствует diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 58c54dc5663..3b9ebb87975 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -3900,7 +3900,7 @@ Morda lahko pomaga ponovna gradnja projekta. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Ime: @@ -3963,9 +3963,6 @@ Morda lahko pomaga ponovna gradnja projekta. Url: URL: - - - ExtensionSystem::Internal::PluginErrorView State: Stanje: @@ -3979,9 +3976,6 @@ Morda lahko pomaga ponovna gradnja projekta. Error Message: Sporočilo napake: - - - ExtensionSystem::Internal::PluginSpecPrivate Cannot open file %1 for reading: %2 Datoteke %1 ni moč odpreti za branje: %2 @@ -3998,9 +3992,6 @@ Morda lahko pomaga ponovna gradnja projekta. Could not open file for read: %1 Ni moč odpreti datoteke za branje: %1 - - - ExtensionSystem::Internal::PluginView Name Ime @@ -4020,9 +4011,6 @@ Morda lahko pomaga ponovna gradnja projekta. Load Naloži - - - ExtensionSystem::PluginErrorView Invalid Neveljavno @@ -4087,9 +4075,6 @@ Morda lahko pomaga ponovna gradnja projekta. Plugin ended its life cycle and was deleted Vstavek je končal svoj življenjski cikel in je bil izbrisan - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -6766,7 +6751,7 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - PluginManager + ExtensionSystem The plugin '%1' does not exist. Vstavek »%1« ne obstaja. @@ -6783,9 +6768,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Failed Plugins Neuspeli vstavki - - - PluginSpec '%1' misses attribute '%2' »%1« pogreša lastnost »%2« @@ -14240,14 +14222,11 @@ okoljsko spremenljivko SSH_ASKPASS. - ExtensionSystem::PluginDetailsView + ExtensionSystem None Brez - - - ExtensionSystem::PluginView Load on Startup Naloži ob zagonu diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index dce93dddfdb..c6664f8cc5c 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -7234,7 +7234,7 @@ Rebuilding the project might help. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: Назва: @@ -7283,9 +7283,6 @@ Rebuilding the project might help. Platforms: Платформи: - - - ExtensionSystem::Internal::PluginErrorOverview Qt Creator - Plugin loader messages Qt Creator - Повідомлення завантажувача додатків @@ -7298,9 +7295,6 @@ Rebuilding the project might help. Details: Деталі: - - - ExtensionSystem::Internal::PluginErrorView State: Стан: @@ -7309,9 +7303,6 @@ Rebuilding the project might help. Error message: Повідомлення про помилку: - - - ExtensionSystem::Internal::PluginSpecPrivate Cannot open file %1 for reading: %2 Неможливо відкрити файл %1 для читання: %2 @@ -7344,28 +7335,6 @@ Rebuilding the project might help. Argument: "%1" is empty Аргумент: "%1" порожній - - - ExtensionSystem::Internal::PluginView - - Name - Назва - - - Load - Завантажено - - - Version - Версія - - - Vendor - Постачальник - - - - ExtensionSystem::PluginDetailsView None Немає @@ -7378,9 +7347,6 @@ Rebuilding the project might help. %1 (current: "%2") %1 (зараз: "%2") - - - ExtensionSystem::PluginErrorView Invalid Неправильний @@ -7481,9 +7447,6 @@ Rebuilding the project might help. Plugin ended its life cycle and was deleted Життєвий цикл додатка завершився і він був видалений - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -7514,9 +7477,6 @@ Reason: %3 Неможливо завантажити додаток через збій завантаження залежності: %1(%2) Причина: %3 - - - ExtensionSystem::PluginView Name Назва @@ -12051,7 +12011,7 @@ Ids must begin with a lowercase letter. - PluginManager + ExtensionSystem The plugin '%1' is specified twice for testing. Додаток для тестування '%1' вказано двічі. @@ -12084,9 +12044,6 @@ Ids must begin with a lowercase letter. Failed Plugins Збій додатків - - - PluginSpec '%1' misses attribute '%2' У '%1' відсутній атрибут '%2' @@ -29300,7 +29257,7 @@ cannot be found in the path. - ExtensionSystem::PluginErrorOverview + ExtensionSystem Continue Продовжити diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 31980e66113..d77589627f1 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -18485,7 +18485,7 @@ Rebuilding the project might help. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: 名称: @@ -18534,9 +18534,6 @@ Rebuilding the project might help. Platforms: - - - ExtensionSystem::Internal::PluginErrorOverview The following plugins have errors and cannot be loaded: 以下插件有错误，无法被载入: @@ -18549,9 +18546,6 @@ Rebuilding the project might help. Plugin Loader Messages - - - ExtensionSystem::Internal::PluginErrorView State: 状态: @@ -18560,9 +18554,6 @@ Rebuilding the project might help. Error message: 错误信息: - - - ExtensionSystem::Internal::PluginManagerPrivate %1 > About Plugins @@ -18593,9 +18584,6 @@ Rebuilding the project might help. Continue 继续 - - - ExtensionSystem::Internal::PluginSpecPrivate Plugin meta data not found @@ -18620,9 +18608,6 @@ Rebuilding the project might help. Argument: "%1" is empty - - - ExtensionSystem::PluginDetailsView None 无 @@ -18635,16 +18620,6 @@ Rebuilding the project might help. %1 (current: "%2") - - - ExtensionSystem::PluginErrorOverview - - Continue - 继续 - - - - ExtensionSystem::PluginErrorView Invalid 无效 @@ -18709,9 +18684,6 @@ Rebuilding the project might help. Plugin ended its life cycle and was deleted. - - - ExtensionSystem::PluginManager Cannot load plugin because dependency failed to load: %1(%2) Reason: %3 @@ -18735,9 +18707,6 @@ Reason: %3 Reason: %3 - - - ExtensionSystem::PluginView Load on Startup 启动时载入 @@ -26610,7 +26579,7 @@ You might find further explanations in the Application Output view. - PluginManager + ExtensionSystem Unknown option %1 未知选项 %1 @@ -26639,9 +26608,6 @@ You might find further explanations in the Application Output view. Cannot request scenario "%1" as it was already requested. - - - PluginSpec Resolving dependencies failed because state != Read 解决依赖关系失败因为 state != Read diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 10156d101f5..f21802724b6 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -4021,7 +4021,7 @@ Rebuilding the project might help. - ExtensionSystem::Internal::PluginDetailsView + ExtensionSystem Name: 名稱： @@ -4066,9 +4066,6 @@ Rebuilding the project might help. URL: 網址： - - - ExtensionSystem::Internal::PluginErrorView State: 狀態： @@ -4077,9 +4074,6 @@ Rebuilding the project might help. Error message: 錯誤訊息： - - - ExtensionSystem::Internal::PluginSpecPrivate Cannot open file %1 for reading: %2 無法開啟檔案 %1 以讀取：%2 @@ -4088,9 +4082,6 @@ Rebuilding the project might help. Error parsing file %1: %2, at line %3, column %4 剖析檔案時發生錯誤 %1：%2，於第 %3 行第 %4 欄 - - - ExtensionSystem::Internal::PluginView Name 名稱 @@ -4107,9 +4098,6 @@ Rebuilding the project might help. Load 載入 - - - ExtensionSystem::PluginErrorView Invalid 無效 @@ -4174,9 +4162,6 @@ Rebuilding the project might help. Plugin ended its life cycle and was deleted 外掛程式結束了其生命週期並且已被刪除 - - - ExtensionSystem::PluginManager Circular dependency detected: @@ -6302,7 +6287,7 @@ Add, modify, and remove document filters, which determine the documentation set - PluginManager + ExtensionSystem The plugin '%1' does not exist. 外掛程式 '%1' 不存在。 @@ -6319,9 +6304,6 @@ Add, modify, and remove document filters, which determine the documentation set Failed Plugins 發生錯誤的外掛程式 - - - PluginSpec '%1' misses attribute '%2' '%1' 缺少屬性 '%2' @@ -12077,14 +12059,11 @@ You can choose between stashing the changes or discarding them. - ExtensionSystem::PluginDetailsView + ExtensionSystem None 無 - - - ExtensionSystem::PluginView Load on Startup 啟動時載入 @@ -23513,7 +23492,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - ExtensionSystem::Internal::PluginErrorOverview + ExtensionSystem Qt Creator - Plugin loader messages Qt Creator - 外掛程式載入器訊息 @@ -23577,7 +23556,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - ExtensionSystem::Internal::PluginErrorOverviewPrivate + ExtensionSystem Continue 繼續 diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index c7db96bf526..8e3a5d900e7 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/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", - "The plugin \"%1\" is specified twice for testing.").arg(pluginName); + *m_errorString = Tr::tr("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", - "The plugin \"%1\" does not exist.").arg(pluginName); + *m_errorString = Tr::tr("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", - "The plugin \"%1\" is not tested.").arg(m_currentArg); + *m_errorString = Tr::tr("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", - "The plugin \"%1\" does not exist.").arg(m_currentArg); + *m_errorString = Tr::tr("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", - "The plugin \"%1\" does not exist.") - .arg(m_currentArg); + *m_errorString = Tr::tr("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", - "The plugin \"%1\" does not exist.").arg(m_currentArg); + *m_errorString = Tr::tr("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", - "Unknown option %1").arg(m_currentArg); + *m_errorString = Tr::tr("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", - "The option %1 requires an argument.").arg(m_currentArg); + *m_errorString = Tr::tr("The option %1 requires an argument.").arg(m_currentArg); } return false; } diff --git a/src/libs/extensionsystem/plugindetailsview.cpp b/src/libs/extensionsystem/plugindetailsview.cpp index 6b52f28e069..8242d8dac60 100644 --- a/src/libs/extensionsystem/plugindetailsview.cpp +++ b/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("Version:"), version, br, - tr("Compatibility version:"), compatVersion, br, - tr("Vendor:"), vendor, br, - tr("Group:"), component, br, - tr("URL:"), url, br, - tr("Location:"), location, br, - tr("Platforms:"), platforms, br, - tr("Description:"), description, br, - tr("Copyright:"), copyright, br, - tr("License:"), license, br, - tr("Dependencies:"), dependencies + Tr::tr("Name:"), name, br, + Tr::tr("Version:"), version, br, + Tr::tr("Compatibility version:"), compatVersion, br, + Tr::tr("Vendor:"), vendor, br, + Tr::tr("Group:"), component, br, + Tr::tr("URL:"), url, br, + Tr::tr("Location:"), location, br, + Tr::tr("Platforms:"), platforms, br, + Tr::tr("Description:"), description, br, + Tr::tr("Copyright:"), copyright, br, + Tr::tr("License:"), license, br, + 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("%1").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 platformString = tr("%1 (current: \"%2\")") + const QString platform = pattern.isEmpty() ? Tr::tr("All") : pattern; + const QString platformString = Tr::tr("%1 (current: \"%2\")") .arg(platform, PluginManager::platformName()); d->platforms->setText(platformString); QString description = spec->description(); diff --git a/src/libs/extensionsystem/pluginerroroverview.cpp b/src/libs/extensionsystem/pluginerroroverview.cpp index adc9bbd5d7e..20e6f5ac900 100644 --- a/src/libs/extensionsystem/pluginerroroverview.cpp +++ b/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", - "The following plugins have errors and cannot be loaded:")), + createLabel(Tr::tr("The following plugins have errors and cannot be loaded:")), pluginList, - createLabel(QCoreApplication::translate("ExtensionSystem::Internal::PluginErrorOverview", - "Details:")), + createLabel(Tr::tr("Details:")), pluginError, buttonBox }.attachTo(this); diff --git a/src/libs/extensionsystem/pluginerrorview.cpp b/src/libs/extensionsystem/pluginerrorview.cpp index dddca1cea4c..fac7fd9a427 100644 --- a/src/libs/extensionsystem/pluginerrorview.cpp +++ b/src/libs/extensionsystem/pluginerrorview.cpp @@ -3,6 +3,7 @@ #include "pluginerrorview.h" +#include "extensionsystemtr.h" #include "pluginspec.h" #include @@ -43,10 +44,8 @@ public: using namespace Utils::Layouting; Form { - QCoreApplication::translate("ExtensionSystem::Internal::PluginErrorView", - "State:"), state, br, - QCoreApplication::translate("ExtensionSystem::Internal::PluginErrorView", - "Error message:"), errorString + Tr::tr("State:"), state, br, + Tr::tr("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"); - tooltip = tr("Description file found, but error on read."); + text = Tr::tr("Invalid"); + tooltip = Tr::tr("Description file found, but error on read."); break; case PluginSpec::Read: - text = tr("Read"); - tooltip = tr("Description successfully read."); + text = Tr::tr("Read"); + tooltip = Tr::tr("Description successfully read."); break; case PluginSpec::Resolved: - text = tr("Resolved"); - tooltip = tr("Dependencies are successfully resolved."); + text = Tr::tr("Resolved"); + tooltip = Tr::tr("Dependencies are successfully resolved."); break; case PluginSpec::Loaded: - text = tr("Loaded"); - tooltip = tr("Library is loaded."); + text = Tr::tr("Loaded"); + tooltip = Tr::tr("Library is loaded."); break; case PluginSpec::Initialized: - text = tr("Initialized"); - tooltip = tr("Plugin's initialization function succeeded."); + text = Tr::tr("Initialized"); + tooltip = Tr::tr("Plugin's initialization function succeeded."); break; case PluginSpec::Running: - text = tr("Running"); - tooltip = tr("Plugin successfully loaded and running."); + text = Tr::tr("Running"); + tooltip = Tr::tr("Plugin successfully loaded and running."); break; case PluginSpec::Stopped: - text = tr("Stopped"); - tooltip = tr("Plugin was shut down."); + text = Tr::tr("Stopped"); + tooltip = Tr::tr("Plugin was shut down."); break; case PluginSpec::Deleted: - text = tr("Deleted"); - tooltip = tr("Plugin ended its life cycle and was deleted."); + text = Tr::tr("Deleted"); + tooltip = Tr::tr("Plugin ended its life cycle and was deleted."); break; } diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index a38302070aa..c3c86bce011 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/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 #include @@ -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,26 +1520,26 @@ 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 " - "it are also disabled: %2.\n\n") + = 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); - const QString text = tr("The last time you started %1, it seems to have closed because " - "of a problem with the \"%2\" " - "plugin. Temporarily disable the plugin?") + + Tr::tr("Disable plugins permanently in %1.").arg(pluginsMenu); + 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()); QMessageBox dialog; 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; } diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index 1e48d89937c..9968d691b73 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/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 #include @@ -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( - ::ExtensionSystem::Internal::PluginSpecPrivate::tr("Plugin meta data not found")); + return reportError(::ExtensionSystem::Tr::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( - "Invalid platform specification \"%1\": %2") + return reportError(::ExtensionSystem::Tr::tr("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 &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 &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(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; } diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index 10ae04a3319..693dd3c471e 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/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(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 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 &plugins, bool enabl } additionalPlugins.subtract(plugins); if (!additionalPlugins.isEmpty()) { - if (QMessageBox::question(this, tr("Enabling Plugins"), - tr("Enabling\n%1\nwill also enable the following plugins:\n\n%2") + if (QMessageBox::question(this, Tr::tr("Enabling Plugins"), + 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 &plugins, bool enabl } additionalPlugins.subtract(plugins); if (!additionalPlugins.isEmpty()) { - if (QMessageBox::question(this, tr("Disabling Plugins"), - tr("Disabling\n%1\nwill also disable the following plugins:\n\n%2") + if (QMessageBox::question(this, Tr::tr("Disabling Plugins"), + 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) {