diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 0ac02e17f39..e8f5cd61e29 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -4944,9 +4944,6 @@ Rebuilding the project might help. Automaticky vytvořený soubor hlavičky '%1 se v modelu kódu nepodařilo najít. Zkuste projekt vytvořit znovu. - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Třída formuláře programu Qt Designer @@ -4959,9 +4956,6 @@ Zkuste projekt vytvořit znovu. Class Details Podrobnosti o třídě - - - Designer::Internal::FormClassWizardPage %1 - Error %1 - Chyba @@ -4982,9 +4976,6 @@ Zkuste projekt vytvořit znovu. Choose a Class Name Vyberte název třídy - - - Designer::Internal::FormEditorPlugin Qt Qt @@ -5029,13 +5020,6 @@ Zkuste projekt vytvořit znovu. Creates a Qt Designer form file (.ui) with a matching class. Vytvoří soubor formuláře programu Qt Designer (.ui) s odpovídající třídou. - - Qt Designer Form Class - Třída formuláře programu Qt Designer - - - - Designer::Internal::FormEditorW Widget Box Krabice s prvky @@ -5088,10 +5072,6 @@ Zkuste projekt vytvořit znovu. Edit tab order Upravit pořadí zarážek - - For&m Editor - Editor for&mulářů - Edit Widgets Upravit prvky @@ -5144,14 +5124,6 @@ Zkuste projekt vytvořit znovu. Alt+Shift+R Alt+Shift+R - - Switch Source/Form - Přepnout mezi formulářem a zdrojem - - - Shift+F4 - Shift+F4 - About Qt Designer Plugins... O přídavných modulech programu Qt Designer... @@ -5184,17 +5156,10 @@ Zkuste projekt vytvořit znovu. Preview in Náhled v - - Designer - Designer - The image could not be created: %1 Obrázek se nepodařilo vytvořit: %1 - - - Designer::Internal::FormTemplateWizardPage Choose a form template Vyberte předlohu formuláře @@ -5203,13 +5168,6 @@ Zkuste projekt vytvořit znovu. Choose a Form Template Vyberte předlohu formuláře - - %1 - Error - %1 - Chyba - - - - Designer::Internal::FormWindowFile Error saving %1 Chyba při ukládání %1 @@ -5222,20 +5180,6 @@ Zkuste projekt vytvořit znovu. Unable to write to %1: %2 Soubor %1 nelze zapsat: %2 - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Formulář programu Qt Designer - - - Form Template - Předloha formuláře - - - - Designer::Internal::QtCreatorIntegration The class definition of '%1' could not be found in %2. Vymezení třídy '%1' se nepodařilo nalézt v %2. @@ -17192,7 +17136,7 @@ p, li { white-space: pre-wrap; } - Designer::Internal::CppSettingsPageWidget + Designer Form Formulář @@ -19525,7 +19469,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás - Designer::FormWindowEditor + Designer untitled Bez názvu @@ -25313,7 +25257,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl. - Designer::Internal::FormEditorFactory + Designer This file can only be edited in <b>Design</b> mode. Tento soubor lze upravovat pouze v <b>Režimu návrhu</b>. @@ -25326,9 +25270,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Switch mode Přepnout režim - - - Designer::Internal::FormFileWizardDialog Location Umístění diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 8f238b0a012..86cf22c9907 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -15144,16 +15144,10 @@ Det hjælper måske at genbygge projektet. Designer Designer - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Qt Designer-udformningsklasse - - - Designer::Internal::FormClassWizardPage Choose a Class Name Vælg et klassenavn @@ -15170,17 +15164,10 @@ Det hjælper måske at genbygge projektet. %1 - Error %1 - fejl - - - Designer::Internal::FormEditorPlugin Switch Source/Form Skift kilde/udformning - - Qt Designer Form Class - Qt Designer-udformningsklasse - Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. Opretter en Qt Designer-udformning sammen med en matchende klasse (C++-header og kildefil) til implementeringsformål. Du kan tilføje udformningen og klassen til et eksisterende Qt widget-projekt. @@ -15193,9 +15180,6 @@ Det hjælper måske at genbygge projektet. Shift+F4 Skift+F4 - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template Vælg en udformningsskabelon @@ -15204,13 +15188,6 @@ Det hjælper måske at genbygge projektet. Form Template Udformningsskabelon - - %1 - Error - %1 - fejl - - - - Designer::Internal::QtCreatorIntegration The class containing "%1" could not be found in %2. Please verify the #include-directives. @@ -16628,7 +16605,7 @@ når de ikke kræves, hvilket i de fleste tilfælde vil forbedre ydelsen. - FormEditorW + Designer Widget box Widget-boks @@ -16721,10 +16698,6 @@ når de ikke kræves, hvilket i de fleste tilfælde vil forbedre ydelsen.Preview in Forhåndsvis i - - Designer - Designer - This file can only be edited in <b>Design</b> mode. Denne fil kan kun redigeres i <b>Design</b>-tilstand. diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 438b8df6fe0..e32fdf5cc4f 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -3720,16 +3720,10 @@ Rebuilding the project might help. Die automatisch erstellte Header-Datei "%1" konnte nicht im Codemodell gefunden werden. Versuchen Sie, das Projekt neu zu erstellen. - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Qt-Designer-Formularklasse - - - Designer::Internal::FormClassWizardPage Class Details Klassendetails @@ -3746,9 +3740,6 @@ Versuchen Sie, das Projekt neu zu erstellen. Choose a Class Name Name der Klasse - - - Designer::Internal::FormEditorPlugin Switch Source/Form Zwischen Quelldatei und Formular wechseln @@ -3765,13 +3756,6 @@ Versuchen Sie, das Projekt neu zu erstellen. Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. Erstellt ein Qt-Designer-Formular mit zugehörigem Klassenrumpf (bestehend aus C++-Header- und -Quelldatei) für Implementierungszwecke. Sie können Formular und Klasse zu einem existierenden Qt-Widget-Projekt hinzufügen. - - Qt Designer Form Class - Qt-Designer-Formularklasse - - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template Formularvorlage auswählen @@ -3780,13 +3764,6 @@ Versuchen Sie, das Projekt neu zu erstellen. Form Template Formularvorlage - - %1 - Error - %1 - Fehler - - - - Designer::Internal::QtCreatorIntegration The class containing "%1" could not be found in %2. Please verify the #include-directives. @@ -28950,7 +28927,7 @@ Dies betrifft die Haltepunkte %1 - FormEditorW + Designer Widget box Widget-Box @@ -29043,10 +29020,6 @@ Dies betrifft die Haltepunkte %1 Preview in Vorschau in - - Designer - Designer - This file can only be edited in <b>Design</b> mode. Datei kann nur im <b>Design</b>-Modus bearbeitet werden. @@ -44468,7 +44441,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - Designer::Internal::NewClassWidget + Designer &Class name: &Klassenname: diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 05ca6f1083a..bfe0e450e40 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -4216,9 +4216,6 @@ Es recomendado usar gdb 6.7 o posterior. Class Generation - - - Designer::Internal::EditorWidget Action editor Editor de acciones @@ -4227,16 +4224,10 @@ Es recomendado usar gdb 6.7 o posterior. Signals and slots editor Editor de signals/slots - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Clase del formulario Qt Designer - - - Designer::Internal::FormClassWizardPage %1 - Error @@ -4279,9 +4270,6 @@ Es recomendado usar gdb 6.7 o posterior. Support for changing languages at runtime Permitir el cambio de idioma en tiempo de ejecución - - - Designer::Internal::FormEditorPlugin Qt @@ -4302,9 +4290,6 @@ Es recomendado usar gdb 6.7 o posterior. Qt Designer Form Class Clase del formulario de Qt Designer - - - Designer::Internal::FormEditorW Object inspector Inspector de objetos @@ -4317,10 +4302,6 @@ Es recomendado usar gdb 6.7 o posterior. Signals and slots editor Editor de Signals/Slots - - Action editor - Editor de acciones - Widget Box @@ -4437,27 +4418,14 @@ Es recomendado usar gdb 6.7 o posterior. The image could not be created: %1 No se pudo crear la imagen: %1 - - - Designer::Internal::FormTemplateWizardPage Choose a form template Seleccione una plantilla para el formulario - - %1 - Error - - - - - Designer::Internal::FormWindowEditor untitled sin título - - - Designer::Internal::FormWindowFile Error saving %1 Error guardando %1 @@ -4470,16 +4438,10 @@ Es recomendado usar gdb 6.7 o posterior. Unable to write to %1: %2 Imposible escribir a %1: %2 - - - Designer::Internal::FormWizardDialog Qt Designer Form Formulario de Qt Designer - - - Designer::Internal::QtCreatorIntegration The class definition of '%1' could not be found in %2. La definición de la clase '%1' no pudo ser encontrada en %2. @@ -4498,9 +4460,6 @@ Reconstruir el proyecto puede ayudar. Unable to add the method definition. Imposible agregar la definición del método. - - - Designer::Internal::SettingsPage Designer Designer @@ -11518,7 +11477,7 @@ p, li { white-space: pre-wrap; } - Designer::Internal::CppSettingsPageWidget + Designer Form Formulario @@ -12938,7 +12897,7 @@ p, li { white-space: pre-wrap; } - Designer::FormWindowEditor + Designer untitled sin título diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 3e4c41f51f4..886150ede1a 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -5891,9 +5891,6 @@ Rebuilding the project might help. Impossible de trouver l'en-tête généré %1 dans le modèle de code. Regénérer le projet peut résoudre ce problème. - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Classe d'interface graphique Qt Designer @@ -5906,9 +5903,6 @@ Regénérer le projet peut résoudre ce problème. Class Details Détails de la classe - - - Designer::Internal::FormClassWizardPage Choose a class name Choisissez un nom de classe @@ -5929,9 +5923,6 @@ Regénérer le projet peut résoudre ce problème. Choose a Class Name Choisissez un nom de classe - - - Designer::Internal::FormEditorPlugin Qt Qt @@ -5960,17 +5951,10 @@ Regénérer le projet peut résoudre ce problème. Creates a Qt Designer form file (.ui). Crée un fichier d'interface graphique Qt Designer (.ui). - - Qt Designer Form Class - Classe d'interface graphique Qt Designer - Creates a Qt Designer form file (.ui) with a matching class. Crée un fichier d'interface graphique Qt Designer (.ui) avec une classe correspondante. - - - Designer::Internal::FormEditorW Widget Box this translation must coherent with the translation of Qt Designer @@ -6130,17 +6114,10 @@ Regénérer le projet peut résoudre ce problème. Preview in Aperçu dans - - Designer - Designer - The image could not be created: %1 L'image ne peut pas être créée : %1 - - - Designer::Internal::FormTemplateWizardPage Choose a form template Choisir un modèle d'interface graphique @@ -6149,13 +6126,6 @@ Regénérer le projet peut résoudre ce problème. Choose a Form Template Choisir un modèle d'interface graphique - - %1 - Error - %1 - Erreur - - - - Designer::Internal::FormWindowFile Error saving %1 Erreur lors de l'enregistrement de %1 @@ -6168,20 +6138,6 @@ Regénérer le projet peut résoudre ce problème. Unable to write to %1: %2 Impossible d'écrire dans %1 : %2 - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Interface graphique Qt Designer - - - Form Template - Modèle d'interface graphique - - - - Designer::Internal::QtCreatorIntegration The class definition of '%1' could not be found in %2. La déclaration de la classe %1 est introuvable dans %2. @@ -18466,7 +18422,7 @@ p, li { white-space: pre-wrap; } - Designer::Internal::CppSettingsPageWidget + Designer Form Formulaire @@ -20305,7 +20261,7 @@ p, li { white-space: pre-wrap; } - Designer::FormWindowEditor + Designer untitled sans titre @@ -25570,7 +25526,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - Designer::Internal::FormEditorFactory + Designer This file can only be edited in <b>Design</b> mode. Ce fichier ne peut être édité qu'en mode <b>Design</b>. @@ -25579,9 +25535,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Switch mode Changer de mode - - - Designer::Internal::FormFileWizardDialog Location Emplacement diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 0c4a4ee38c4..0887a23b1a9 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -3735,7 +3735,7 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju - Designer::Internal::FormClassWizardPage + Designer Choose a Class Name Odaberi naziv klase @@ -3748,10 +3748,6 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju Class Details Detalji klase - - %1 - Error - %1 - greška - FakeVim::Internal::FakeVimOptionPage @@ -23092,28 +23088,14 @@ Rebuilding the project might help. Form Editor - - Designer - Designer - - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class - - - Designer::Internal::FormEditorPlugin Switch Source/Form - - Qt Designer Form Class - - Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. @@ -23126,9 +23108,6 @@ Rebuilding the project might help. Shift+F4 - - - FormEditorW Widget box Okvir programčića @@ -24244,7 +24223,7 @@ Use this only if you are prototyping. You cannot create a full application with - Designer::Internal::FormTemplateWizardPage + Designer Choose a Form Template Odaberi predložak za obrasce @@ -24257,9 +24236,6 @@ Use this only if you are prototyping. You cannot create a full application with %1 - Error %1 – Greška - - - Designer::Internal::QtCreatorIntegration The class containing "%1" could not be found in %2. Please verify the #include-directives. diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 80173da922d..d578f3d5bc2 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -5452,9 +5452,6 @@ Gdb 6.7 vagy későbbi használata erősen ajánlott. The <RCC> root element is missing. Az <RCC> rendszergazda elem hiányzik. - - - Designer::FormWindowEditor untitled címtelen @@ -5670,7 +5667,7 @@ A projekt újraépítése talán segít. - Designer::Internal::CppSettingsPageWidget + Designer Form Forma @@ -5703,16 +5700,10 @@ A projekt újraépítése talán segít. Use Qt module name in #include-directive Qt modulnevek használata az #include irányelvekben - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Qt Designer forma osztály - - - Designer::Internal::FormClassWizardPage Choose a class name Egy osztálynév kiválasztása @@ -5729,9 +5720,6 @@ A projekt újraépítése talán segít. %1 - Error %1 - Hiba - - - Designer::Internal::FormEditorPlugin Qt Qt @@ -5744,17 +5732,10 @@ A projekt újraépítése talán segít. Creates a Qt Designer form file (.ui). Qt Designer forma fájl (.ui) létrehozása. - - Qt Designer Form Class - Qt Designer forma osztály - Creates a Qt Designer form file (.ui) with a matching class. Qt Designer forma fájl(.ui) létrehozása illeszkedő osztályokkal. - - - Designer::Internal::FormEditorW Widget Box @@ -5863,28 +5844,14 @@ A projekt újraépítése talán segít. Preview in Előnézet - - Designer - Tervező - The image could not be created: %1 Nem sikerült létrehozni a képet: %1 - - - Designer::Internal::FormTemplateWizardPage Choose a form template Forma sablonok kiválasztása - - %1 - Error - %1 - Hiba - - - - Designer::Internal::FormWindowFile Error saving %1 Hiba történt a(z) %1 mentése közben @@ -5897,16 +5864,6 @@ A projekt újraépítése talán segít. Unable to write to %1: %2 Nem lehet a(z) %1-be írni: %2 - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Qt Designer forma - - - - Designer::Internal::QtCreatorIntegration The class definition of '%1' could not be found in %2. A(z) '%1' osztálydefiniciója nem található a(z) %2-ben. diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index ee5f2e0eafd..fa137df7767 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -4119,9 +4119,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Class Generation - - - Designer::Internal::EditorWidget Action editor Editor delle azioni @@ -4130,16 +4127,10 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Signals and slots editor Editor di segnali e slot - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Classe Form di Qt Designer - - - Designer::Internal::FormClassWizardPage Choose a class name Scegli il nome della classe @@ -4182,9 +4173,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. %1 - Error %1 - Errore - - - Designer::Internal::FormEditorPlugin Qt Qt @@ -4201,13 +4189,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Creates a Qt Designer form file (.ui) with a matching class. Crea un file form Qt Designer (.ui) e la relativa classe. - - Qt Designer Form Class - Classe Form di Qt Designer - - - - Designer::Internal::FormEditorW Designer widgetbox Collezione Widget @@ -4220,14 +4201,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Property editor Editor delle Proprietà - - Signals and slots editor - Editor di segnali e slot - - - Action editor - Editor delle azioni - Widget Box @@ -4344,27 +4317,14 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. The image could not be created: %1 L'immagine non può essere creata: %1 - - - Designer::Internal::FormTemplateWizardPage Choose a form template Scegli un modello di form - - %1 - Error - %1 - Errore - - - - Designer::Internal::FormWindowEditor untitled senza titolo - - - Designer::Internal::FormWindowFile Error saving %1 Errore durante il salvataggio di %1 @@ -4377,16 +4337,6 @@ L'utilizzo di gdb 6.7 o successivi è fortemente consigliato. Unable to write to %1: %2 Impossibile scrivere su %1: %2 - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Form di Qt Designer - - - - Designer::Internal::QtCreatorIntegration The class definition of '%1' could not be found in %2. La definizione della classe '%1' non è stata trovata in %2. @@ -4405,9 +4355,6 @@ La ricompilazione del progetto potrebbe aiutare. Unable to add the method definition. Impossibile aggiungere la definizione del metodo. - - - Designer::Internal::SettingsPage Designer Designer @@ -11377,7 +11324,7 @@ p, li { white-space: pre-wrap; } - Designer::Internal::CppSettingsPageWidget + Designer Form @@ -12712,7 +12659,7 @@ p, li { white-space: pre-wrap; } - Designer::FormWindowEditor + Designer untitled senza titolo diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 3ae2208bb75..c1da81fcd02 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -2693,7 +2693,7 @@ These prefixes are used in addition to current file name on Switch Header/Source - Designer::Internal::FormClassWizardPage + Designer Choose a Class Name クラス名を選択してください @@ -20371,16 +20371,10 @@ Rebuilding the project might help. 生成されたヘッダファイル "%1" がコードモデル内に見つかりませんでした。 プロジェクトのリビルドをお奨めします。 - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Qt Designer フォームクラス - - - Designer::Internal::FormEditorPlugin Switch Source/Form ソース/フォームの切替 @@ -20393,17 +20387,10 @@ Rebuilding the project might help. Shift+F4 Shift+F4 - - Qt Designer Form Class - Qt Designer フォームクラス - Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. 既存の Qt ウィジェットプロジェクトに追加可能な Qt Designer フォームとそれに対応したクラス (C++ ヘッダとソースファイル) を作成します。 - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template フォームテンプレートを選択してください @@ -20412,13 +20399,6 @@ Rebuilding the project might help. Form Template フォームテンプレート - - %1 - Error - %1 - エラー - - - - Designer::Internal::QtCreatorIntegration The class containing "%1" could not be found in %2. Please verify the #include-directives. @@ -41267,7 +41247,7 @@ Affected are breakpoints %1 - FormEditorW + Designer Widget box ウィジェットボックス @@ -41360,10 +41340,6 @@ Affected are breakpoints %1 Preview in プレビュー - - Designer - デザイナ - This file can only be edited in <b>Design</b> mode. このファイルは<b>デザイン</b>モード以外では編集できません。 @@ -47052,7 +47028,7 @@ Output: - Designer::Internal::NewClassWidget + Designer &Class name: クラス名(&C): diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index ebeeb81cce4..3b61b96fb54 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -386,7 +386,7 @@ - Designer::Internal::FormClassWizardPage + Designer Class Klasa @@ -5303,14 +5303,11 @@ Więcej szczegółów w /etc/sysctl.d/10-ptrace.conf - Designer::Internal::FormClassWizardDialog + Designer Qt Designer Form Class Klasa formularza Qt Designer - - - Designer Designer Designer @@ -5331,9 +5328,6 @@ Rebuilding the project might help. Nie można odnaleźć wygenerowanego pliku nagłówkowego "%1" w modelu kodu. Spróbuj ponownie przebudować projekt. - - - Designer::Internal::FormEditorPlugin Switch Source/Form Przełącz między źródłem a formularzem @@ -5350,13 +5344,6 @@ Spróbuj ponownie przebudować projekt. Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. Tworzy formularz Qt Designera wraz z klasą implementującą (plik nagłówkowy i źródłowy C++). Utworzony formularz i klasę można dodać do istniejącego projektu Qt Widget. - - Qt Designer Form Class - Klasa formularza Qt Designer - - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template Wybierz szablon formularza @@ -5365,13 +5352,6 @@ Spróbuj ponownie przebudować projekt. Form Template Szablon formularza - - %1 - Error - %1 - Błąd - - - - Designer::Internal::QtCreatorIntegration The class containing "%1" could not be found in %2. Please verify the #include-directives. @@ -31430,7 +31410,7 @@ Dotyczy to następujących pułapek: %1 - FormEditorW + Designer Widget box Panel widżetów @@ -31523,10 +31503,6 @@ Dotyczy to następujących pułapek: %1 Preview in Podgląd w stylu - - Designer - Designer - This file can only be edited in <b>Design</b> mode. Ten plik może być modyfikowany jedynie w trybie <b>Design</b>. diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index af5a3edba40..9eea9537a37 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -19010,16 +19010,10 @@ Rebuilding the project might help. Не удалось найти сгенерированный заголовочный файл «%1» в модели кода. Пересборка проекта может помочь. - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Класс формы Qt Designer - - - Designer::Internal::FormClassWizardPage Class Details Характеристики класса @@ -19036,9 +19030,6 @@ Rebuilding the project might help. Choose a Class Name Выбор названия класса - - - Designer::Internal::FormEditorPlugin Switch Source/Form Переключить исходник/форму @@ -19055,13 +19046,6 @@ Rebuilding the project might help. Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. Создание формы дизайнера Qt и соответствующего класса (исходный и заголовочный файлы C++) для реализации. Их можно будет добавить к существующему проекту Qt Widget. - - Qt Designer Form Class - Класс формы Qt Designer - - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template Выбор шаблона формы @@ -19070,13 +19054,6 @@ Rebuilding the project might help. Form Template Шаблон формы - - %1 - Error - %1 - Ошибка - - - - Designer::Internal::NewClassWidget &Class name: &Имя класса: @@ -19141,9 +19118,6 @@ Rebuilding the project might help. Invalid form file name: "%1" Недопустимое имя файла формы: «%1» - - - Designer::Internal::QtCreatorIntegration The class containing "%1" could not be found in %2. Please verify the #include-directives. @@ -20799,7 +20773,7 @@ when they are not required, which will improve performance in most cases. - FormEditorW + Designer Widget box Панель виджетов @@ -20892,10 +20866,6 @@ when they are not required, which will improve performance in most cases.Preview in Предпросмотр в - - Designer - Дизайнер - This file can only be edited in <b>Design</b> mode. Этот файл можно редактировать только в режиме <b>дизайна</b>. diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 0afcdb8812f..b1e99f0a315 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -3905,10 +3905,6 @@ To lahko privede do napačnih rezultatov. Cannot write file. Disk full? Datoteke ni moč zapisati. Ali je disk poln? - - Designer - Designer - Class Generation Ustvarjanje razreda @@ -3933,9 +3929,6 @@ Morda lahko pomaga ponovna gradnja projekta. Xml Editor Urejevalnik XML - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Razred obrazca Qt Designer @@ -3948,9 +3941,6 @@ Morda lahko pomaga ponovna gradnja projekta. Class Details Podrobnosti razreda - - - Designer::Internal::FormClassWizardPage %1 - Error %1 - Napaka @@ -3968,9 +3958,6 @@ Morda lahko pomaga ponovna gradnja projekta. Configure... Nastavitve … - - - Designer::Internal::FormEditorPlugin Qt Designer Form Obrazec Qt Designer @@ -3983,10 +3970,6 @@ Morda lahko pomaga ponovna gradnja projekta. Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. Ustvari obrazec Qt Designerja, skupaj z ustreznim razredom (glavo in izvorno kodo C++) za implementacijo. Obrazec in razred lahko dodate v obstoječ projekt iz gradnikov Qt. - - Qt Designer Form Class - Razred obrazca Qt Designer - Creates a Qt Designer form that you can add to a Qt C++ project. This is useful if you already have an existing class for the UI business logic. Ustvari obrazec Qt Designerja, ki ga lahko dodate v projekt C++. To je uporabno, če že imate obstoječ razred, ki vsebuje logiko za uporabniški vmesnik. @@ -3995,9 +3978,6 @@ Morda lahko pomaga ponovna gradnja projekta. Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt C++ Project. Ustvari obrazec Qt Designerja, skupaj z ustreznim razredom (glavo in izvorno kodo C++) za implementacijo. Obrazec in razred lahko dodate v obstoječ projekt Qt/C++. - - - Designer::Internal::FormEditorW Widget Box Podokno z gradniki @@ -4114,31 +4094,10 @@ Morda lahko pomaga ponovna gradnja projekta. Ctrl+Alt+R Ctrl+Alt+R - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template Izberite predlogo za obrazec - - %1 - Error - %1 - Napaka - - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Obrazec Qt Designer - - - Form Template - Predloga obrazca - - - - Designer::Internal::QtCreatorIntegration The class definition of '%1' could not be found in %2. Definicije razreda »%1« ni bilo moč najti v %2. @@ -11249,7 +11208,7 @@ p, li { white-space: pre-wrap; } - Designer::Internal::CppSettingsPageWidget + Designer Form Obrazec @@ -12950,7 +12909,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - Designer::FormWindowEditor + Designer untitled brez naslova @@ -16284,7 +16243,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - Designer::Internal::FormEditorFactory + Designer This file can only be edited in <b>Design</b> mode. Datoteko je moč urejati le v načinu <b>Oblikovanje</b>. @@ -16293,9 +16252,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Switch mode Preklopi način - - - Designer::Internal::FormFileWizardDialog Location Mesto @@ -30750,7 +30706,7 @@ Preverite pravice za dostop do mape. - Designer::Internal::FormWindowFile + Designer Error saving %1 Napaka shranjevanja %1 diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 1e7323d9672..afc0b822d2e 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -7930,16 +7930,10 @@ Rebuilding the project might help. Не вдалось знайти згенерований заголовочний файл форми "%1" в моделі коду. Перезбірка проекту може допомогти. - - - Designer::FormWindowEditor untitled без назви - - - Designer::Internal::CppSettingsPageWidget Form Форма @@ -7976,24 +7970,10 @@ Rebuilding the project might help. Add Qt version #ifdef for module names Додавати версію Qt в #ifdef для імен модулів - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Клас форми Qt Designer - - Form Template - Шаблон форми - - - Class Details - Деталі класу - - - - Designer::Internal::FormClassWizardPage Choose a Class Name Оберіть назву класу @@ -8010,24 +7990,10 @@ Rebuilding the project might help. %1 - Error %1 - Помилка - - - Designer::Internal::FormEditorFactory - - This file can only be edited in <b>Design</b> mode. - Це файл можна редагувати лише в режимі <b>дизайну</b>. - - - Switch Mode - Перемкнути режим - Switch mode Перемкнути режим - - - Designer::Internal::FormEditorPlugin Switch Source/Form Перемкнути код/форма @@ -8052,135 +8018,10 @@ Rebuilding the project might help. Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. Створює форму Qt Designer разом з відповідним класом (файли заголовку та коду C++) з метою реалізації.. Ви можете додати форму та клас до існуючого проекту Qt Widget. - - Qt Designer Form Class - Клас форми Qt Designer - - - - Designer::Internal::FormEditorW - - Widget box - Панель віджетів - - - Object Inspector - Інспектор об'єктів - - - Property Editor - Редактор властивостей - - - Signals && Slots Editor - Редактор сигналів та слотів - - - Action Editor - Редактор дій - - - Widget Box - Панель віджетів - - - For&m Editor - Редактор &форм - - - Edit Widgets - Редагувати віджети - - - F3 - F3 - - - Edit Signals/Slots - Редагувати сигнали/слоти - - - F4 - F4 - - - Edit Buddies - Редагувати прив'язки - - - Edit Tab Order - Редагувати порядок обходу - - - Ctrl+H - Ctrl+H - - - Meta+Shift+H - Meta+Shift+H - - - Meta+L - Meta+L - - - Ctrl+L - Ctrl+L - - - Ctrl+G - Ctrl+G - - - Meta+Shift+G - Meta+Shift+G - - - Meta+J - Meta+J - - - Ctrl+J - Ctrl+J - - - Alt+Shift+R - Alt+Shift+R - - - Switch Source/Form - Перемкнути код/форма - - - Shift+F4 - Shift+F4 - - - About Qt Designer Plugins... - Про додатки Qt Designer.... - - - Preview in - Попередній перегляд в - - - Designer - Designer - - - The image could not be created: %1 - Не вдалось створити зображення: %1 - - - - Designer::Internal::FormFileWizardDialog Location Розташування - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template Оберіть шаблон форми @@ -8189,24 +8030,6 @@ Rebuilding the project might help. Form Template Шаблон форми - - %1 - Error - %1 - Помилка - - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Форма Qt Designer - - - Form Template - Шаблон форми - - - - Designer::Internal::QtCreatorIntegration The class containing '%1' could not be found in %2. Please verify the #include-directives. @@ -45605,7 +45428,7 @@ The statements may not contain '{' nor '}' characters. - FormEditorW + Designer Widget box Панель віджетів @@ -45698,10 +45521,6 @@ The statements may not contain '{' nor '}' characters.Preview in Попередній перегляд в - - Designer - - This file can only be edited in <b>Design</b> mode. Це файл можна редагувати лише в режимі <b>дизайну</b>. diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 46c86107a24..8c89a1a5d6d 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -5719,9 +5719,6 @@ Rebuilding the project might help. 代码模型中找不到生成的头文件"%1"。 重新构建项目可能有帮助。 - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Qt 设计器界面类 @@ -5734,9 +5731,6 @@ Rebuilding the project might help. Class Details 类详情 - - - Designer::Internal::FormClassWizardPage %1 - Error %1 - 错误 @@ -5757,9 +5751,6 @@ Rebuilding the project might help. Choose a Class Name 选择类名 - - - Designer::Internal::FormEditorPlugin Qt Qt @@ -5784,13 +5775,6 @@ Rebuilding the project might help. Creates a Qt Designer form file (.ui) with a matching class. 创建与类匹配的Qt设计师界面文件(.ui)。 - - Qt Designer Form Class - Qt 设计师界面类 - - - - Designer::Internal::FormEditorW Widget Box 控件盒子 @@ -5935,17 +5919,10 @@ Rebuilding the project might help. Preview in 预览于 - - Designer - 设计师 - The image could not be created: %1 无法创建图片: %1 - - - Designer::Internal::FormTemplateWizardPage Choose a form template 选择 界面模板 @@ -5954,13 +5931,6 @@ Rebuilding the project might help. Choose a Form Template 选择界面模板 - - %1 - Error - %1 - 错误 - - - - Designer::Internal::FormWindowFile Error saving %1 保存 %1出错 @@ -5973,20 +5943,6 @@ Rebuilding the project might help. Unable to write to %1: %2 无法写入 %1: %2 - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Qt 设计师文件 - - - Form Template - 界面模板 - - - - Designer::Internal::QtCreatorIntegration The class definition of '%1' could not be found in %2. 类 '%1' 的定义 在 %2中找不到. @@ -16972,7 +16928,7 @@ Will not be applied to whitespace in comments and strings. - Designer::Internal::CppSettingsPageWidget + Designer Form 界面 @@ -18703,7 +18659,7 @@ Will not be applied to whitespace in comments and strings. - Designer::FormWindowEditor + Designer untitled 未命名 @@ -22975,7 +22931,7 @@ Previous decimal signed value (big endian): %4 - Designer::Internal::FormEditorFactory + Designer This file can only be edited in Design Mode. 此文件仅可在设计模式中编辑。 @@ -22992,9 +22948,6 @@ Previous decimal signed value (big endian): %4 Switch mode 切换模式 - - - Designer::Internal::FormFileWizardDialog Location 位置 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index d4174ba723d..a3ccc84501b 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -4096,9 +4096,6 @@ Rebuilding the project might help. 代碼模型中找不到產生的標頭 "%1"。 重新建置專案可能有幫助。 - - - Designer::Internal::FormClassWizardDialog Qt Designer Form Class Qt 設計器表單類別 @@ -4111,9 +4108,6 @@ Rebuilding the project might help. Class Details 類別詳情 - - - Designer::Internal::FormClassWizardPage %1 - Error %1 - 錯誤 @@ -4126,9 +4120,6 @@ Rebuilding the project might help. Choose a Class Name 選擇類別名稱 - - - Designer::Internal::FormEditorPlugin Qt Designer Form Qt 設計師表單 @@ -4141,13 +4132,6 @@ Rebuilding the project might help. Creates a Qt Designer form along with a matching class (C++ header and source file) for implementation purposes. You can add the form and class to an existing Qt Widget Project. 建立 Qt 設計師表單以及對應的類別檔（包括 C++ 標頭檔與源碼檔），讓您可以新增到 Qt 元件專案中直接進行實作。 - - Qt Designer Form Class - Qt 設計師表單類別 - - - - Designer::Internal::FormEditorW Widget Box 元件盒 @@ -4260,39 +4244,14 @@ Rebuilding the project might help. Preview in 預覽於 - - Designer - 設計師 - The image could not be created: %1 無法建立影像：%1 - - - Designer::Internal::FormTemplateWizardPage Choose a Form Template 選擇表單樣本 - - %1 - Error - %1 - 錯誤 - - - - Designer::Internal::FormWizardDialog - - Qt Designer Form - Qt 設計師表單 - - - Form Template - 表單樣本 - - - - Designer::Internal::QtCreatorIntegration The class containing '%1' could not be found in %2. Please verify the #include-directives. @@ -10458,7 +10417,7 @@ Will not be applied to whitespace in comments and strings. - Designer::Internal::CppSettingsPageWidget + Designer Form 表單 @@ -11347,7 +11306,7 @@ Will not be applied to whitespace in comments and strings. - Designer::FormWindowEditor + Designer untitled 未命名 @@ -13474,7 +13433,7 @@ For qmlproject projects, use the importPaths property to add import paths. - Designer::Internal::FormEditorFactory + Designer This file can only be edited in <b>Design</b> mode. 此檔案只能在<b>設計</b>模式中編輯。 @@ -13483,9 +13442,6 @@ For qmlproject projects, use the importPaths property to add import paths.Switch mode 切換模式 - - - Designer::Internal::FormFileWizardDialog Location 位置 diff --git a/src/plugins/designer/codemodelhelpers.cpp b/src/plugins/designer/codemodelhelpers.cpp index 72743f0dfcd..50fcd77abd6 100644 --- a/src/plugins/designer/codemodelhelpers.cpp +++ b/src/plugins/designer/codemodelhelpers.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "codemodelhelpers.h" +#include "designertr.h" #include @@ -101,13 +102,13 @@ bool navigateToSlot(const QString &uiFileName, // Find the generated header. const FilePath generatedHeaderFile = generatedHeaderOf(FilePath::fromString(uiFileName)); if (generatedHeaderFile.isEmpty()) { - *errorMessage = QCoreApplication::translate("Designer", "The generated header of the form \"%1\" could not be found.\nRebuilding the project might help.").arg(uiFileName); + *errorMessage = Tr::tr("The generated header of the form \"%1\" could not be found.\nRebuilding the project might help.").arg(uiFileName); return false; } const CPlusPlus::Snapshot snapshot = CppEditor::CppModelManager::instance()->snapshot(); const DocumentPtr generatedHeaderDoc = snapshot.document(generatedHeaderFile); if (!generatedHeaderDoc) { - *errorMessage = QCoreApplication::translate("Designer", "The generated header \"%1\" could not be found in the code model.\nRebuilding the project might help.").arg(generatedHeaderFile.toUserOutput()); + *errorMessage = Tr::tr("The generated header \"%1\" could not be found in the code model.\nRebuilding the project might help.").arg(generatedHeaderFile.toUserOutput()); return false; } diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp index 749b002b8d7..05d98acaee4 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.cpp +++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp @@ -1,6 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "designertr.h" #include "formclasswizarddialog.h" #include "formclasswizardpage.h" #include "formclasswizardparameters.h" @@ -24,7 +25,7 @@ FormClassWizardDialog::FormClassWizardDialog(const Core::BaseFileWizardFactory * m_formPage(new FormTemplateWizardPage), m_classPage(new FormClassWizardPage) { - setWindowTitle(tr("Qt Designer Form Class")); + setWindowTitle(Tr::tr("Qt Designer Form Class")); setPage(FormPageId, m_formPage); setPage(ClassPageId, m_classPage); diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp index f38a5d3aee7..eb339be454b 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.cpp +++ b/src/plugins/designer/cpp/formclasswizardpage.cpp @@ -1,8 +1,8 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "designertr.h" #include "formclasswizardpage.h" - #include "formclasswizardparameters.h" #include "newclasswidget.h" @@ -24,10 +24,10 @@ namespace Internal { FormClassWizardPage::FormClassWizardPage() { - setTitle(tr("Choose a Class Name")); + setTitle(Tr::tr("Choose a Class Name")); auto classGroupBox = new QGroupBox(this); - classGroupBox->setTitle(tr("Class")); + classGroupBox->setTitle(Tr::tr("Class")); m_newClassWidget = new NewClassWidget(classGroupBox); m_newClassWidget->setHeaderExtension( @@ -39,7 +39,7 @@ FormClassWizardPage::FormClassWizardPage() connect(m_newClassWidget, &NewClassWidget::validChanged, this, &FormClassWizardPage::slotValidChanged); - setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Class Details")); + setProperty(Utils::SHORT_TITLE_PROPERTY, Tr::tr("Class Details")); auto verticalLayout = new QVBoxLayout(classGroupBox); verticalLayout->addWidget(m_newClassWidget); @@ -105,7 +105,7 @@ bool FormClassWizardPage::validatePage() QString errorMessage; const bool rc = m_newClassWidget->isValid(&errorMessage); if (!rc) - QMessageBox::warning(this, tr("%1 - Error").arg(title()), errorMessage); + QMessageBox::warning(this, Tr::tr("%1 - Error").arg(title()), errorMessage); return rc; } diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index f0fd50df07e..7a1c7f640bb 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -19,8 +19,6 @@ class NewClassWidget; class FormClassWizardPage : public QWizardPage { - Q_DECLARE_TR_FUNCTIONS(Designer::Internal::FormClassWizardPage) - public: FormClassWizardPage(); ~FormClassWizardPage() override; diff --git a/src/plugins/designer/cpp/newclasswidget.cpp b/src/plugins/designer/cpp/newclasswidget.cpp index 5038e393be8..37bd883b372 100644 --- a/src/plugins/designer/cpp/newclasswidget.cpp +++ b/src/plugins/designer/cpp/newclasswidget.cpp @@ -1,6 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "designertr.h" #include "newclasswidget.h" #include @@ -66,11 +67,11 @@ NewClassWidget::NewClassWidget(QWidget *parent) : using namespace Utils::Layouting; Form { - tr("&Class name:"), d->m_classLineEdit, br, - tr("&Header file:"), d->m_headerFileLineEdit, br, - tr("&Source file:"), d->m_sourceFileLineEdit, br, - tr("&Form file:"), d->m_formFileLineEdit, br, - tr("&Path:"), d->m_pathChooser, br, + Tr::tr("&Class name:"), d->m_classLineEdit, br, + Tr::tr("&Header file:"), d->m_headerFileLineEdit, br, + Tr::tr("&Source file:"), d->m_sourceFileLineEdit, br, + Tr::tr("&Form file:"), d->m_formFileLineEdit, br, + Tr::tr("&Path:"), d->m_pathChooser, br, }.attachTo(this, WithoutMargins); connect(d->m_classLineEdit, &ClassNameValidatingLineEdit::updateFileName, @@ -211,21 +212,21 @@ bool NewClassWidget::isValid(QString *error) const if (!d->m_headerFileLineEdit->isValid()) { if (error) - *error = tr("Invalid header file name: \"%1\""). + *error = Tr::tr("Invalid header file name: \"%1\""). arg(d->m_headerFileLineEdit->errorMessage()); return false; } if (!d->m_sourceFileLineEdit->isValid()) { if (error) - *error = tr("Invalid source file name: \"%1\""). + *error = Tr::tr("Invalid source file name: \"%1\""). arg(d->m_sourceFileLineEdit->errorMessage()); return false; } if (!d->m_formFileLineEdit->isValid()) { if (error) - *error = tr("Invalid form file name: \"%1\""). + *error = Tr::tr("Invalid form file name: \"%1\""). arg(d->m_formFileLineEdit->errorMessage()); return false; } diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp index 6fdb1367718..c6d3108ba25 100644 --- a/src/plugins/designer/formeditorfactory.cpp +++ b/src/plugins/designer/formeditorfactory.cpp @@ -1,6 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "designertr.h" #include "formeditorfactory.h" #include "formeditorw.h" #include "formwindoweditor.h" @@ -22,7 +23,7 @@ namespace Internal { FormEditorFactory::FormEditorFactory() { setId(K_DESIGNER_XML_EDITOR_ID); - setDisplayName(QCoreApplication::translate("Designer", C_DESIGNER_XML_DISPLAY_NAME)); + setDisplayName(Tr::tr(C_DESIGNER_XML_DISPLAY_NAME)); addMimeType(FORM_MIMETYPE); setEditorCreator([] { return FormEditorW::createEditor(); }); diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index c5251f69809..e089ebba3d2 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -1,8 +1,9 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "formeditorplugin.h" +#include "designertr.h" #include "formeditorfactory.h" +#include "formeditorplugin.h" #include "formeditorw.h" #include "formtemplatewizardpage.h" @@ -43,7 +44,7 @@ namespace Internal { class FormEditorPluginPrivate { public: - QAction actionSwitchSource{FormEditorPlugin::tr("Switch Source/Form"), nullptr}; + QAction actionSwitchSource{Tr::tr("Switch Source/Form"), nullptr}; FormEditorFactory formEditorFactory; SettingsPageProvider settingsPageProvider; @@ -68,10 +69,10 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error) IWizardFactory *wizard = new FormClassWizard; wizard->setCategory(Core::Constants::WIZARD_CATEGORY_QT); wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT)); - wizard->setDisplayName(tr("Qt Designer Form Class")); + wizard->setDisplayName(Tr::tr("Qt Designer Form Class")); wizard->setIcon({}, "ui/h"); wizard->setId("C.FormClass"); - wizard->setDescription(tr("Creates a Qt Designer form along with a matching class (C++ header and source file) " + wizard->setDescription(Tr::tr("Creates a Qt Designer form along with a matching class (C++ header and source file) " "for implementation purposes. You can add the form and class to an existing Qt Widget Project.")); return {wizard}; @@ -101,14 +102,14 @@ void FormEditorPlugin::extensionsInitialized() ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS); ActionContainer *mformtools = ActionManager::createMenu(M_FORMEDITOR); - mformtools->menu()->setTitle(tr("For&m Editor")); + mformtools->menu()->setTitle(Tr::tr("For&m Editor")); mtools->addMenu(mformtools); connect(&d->actionSwitchSource, &QAction::triggered, this, &FormEditorPlugin::switchSourceForm); Context context(C_FORMEDITOR, Core::Constants::C_EDITORMANAGER); Command *cmd = ActionManager::registerAction(&d->actionSwitchSource, "FormEditor.FormSwitchSource", context); - cmd->setDefaultKeySequence(tr("Shift+F4")); + cmd->setDefaultKeySequence(Tr::tr("Shift+F4")); mformtools->addAction(cmd, Core::Constants::G_DEFAULT_THREE); } diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index 072fcb6e7ef..550454f39cb 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -1,15 +1,16 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "designercontext.h" +#include "designertr.h" +#include "editordata.h" +#include "editorwidget.h" #include "formeditorw.h" #include "formwindoweditor.h" #include "formwindowfile.h" +#include "qtcreatorintegration.h" #include "settingsmanager.h" #include "settingspage.h" -#include "editorwidget.h" -#include "editordata.h" -#include "qtcreatorintegration.h" -#include "designercontext.h" #include #include @@ -126,9 +127,6 @@ public: class FormEditorData { -public: - Q_DECLARE_TR_FUNCTIONS(FormEditorW) - public: FormEditorData(); ~FormEditorData(); @@ -293,19 +291,19 @@ void FormEditorData::setupViewActions() QTC_ASSERT(viewMenu, return); addDockViewAction(viewMenu, WidgetBoxSubWindow, m_contexts, - tr("Widget box"), "FormEditor.WidgetBox"); + Tr::tr("Widget box"), "FormEditor.WidgetBox"); addDockViewAction(viewMenu, ObjectInspectorSubWindow, m_contexts, - tr("Object Inspector"), "FormEditor.ObjectInspector"); + Tr::tr("Object Inspector"), "FormEditor.ObjectInspector"); addDockViewAction(viewMenu, PropertyEditorSubWindow, m_contexts, - tr("Property Editor"), "FormEditor.PropertyEditor"); + Tr::tr("Property Editor"), "FormEditor.PropertyEditor"); addDockViewAction(viewMenu, SignalSlotEditorSubWindow, m_contexts, - tr("Signals && Slots Editor"), "FormEditor.SignalsAndSlotsEditor"); + Tr::tr("Signals && Slots Editor"), "FormEditor.SignalsAndSlotsEditor"); addDockViewAction(viewMenu, ActionEditorSubWindow, m_contexts, - tr("Action Editor"), "FormEditor.ActionEditor"); + Tr::tr("Action Editor"), "FormEditor.ActionEditor"); // Lock/Reset Command *cmd = addToolAction(m_editorWidget->menuSeparator1(), m_contexts, "FormEditor.SeparatorLock", viewMenu); cmd->setAttribute(Command::CA_Hide); @@ -413,30 +411,30 @@ void FormEditorData::initDesignerSubWindows() std::fill(m_designerSubWindows, m_designerSubWindows + DesignerSubWindowCount, static_cast(nullptr)); QDesignerWidgetBoxInterface *wb = QDesignerComponents::createWidgetBox(m_formeditor, nullptr); - wb->setWindowTitle(tr("Widget Box")); + wb->setWindowTitle(Tr::tr("Widget Box")); wb->setObjectName("WidgetBox"); m_formeditor->setWidgetBox(wb); m_designerSubWindows[WidgetBoxSubWindow] = wb; QDesignerObjectInspectorInterface *oi = QDesignerComponents::createObjectInspector(m_formeditor, nullptr); - oi->setWindowTitle(tr("Object Inspector")); + oi->setWindowTitle(Tr::tr("Object Inspector")); oi->setObjectName("ObjectInspector"); m_formeditor->setObjectInspector(oi); m_designerSubWindows[ObjectInspectorSubWindow] = oi; QDesignerPropertyEditorInterface *pe = QDesignerComponents::createPropertyEditor(m_formeditor, nullptr); - pe->setWindowTitle(tr("Property Editor")); + pe->setWindowTitle(Tr::tr("Property Editor")); pe->setObjectName("PropertyEditor"); m_formeditor->setPropertyEditor(pe); m_designerSubWindows[PropertyEditorSubWindow] = pe; QWidget *se = QDesignerComponents::createSignalSlotEditor(m_formeditor, nullptr); - se->setWindowTitle(tr("Signals and Slots Editor")); + se->setWindowTitle(Tr::tr("Signals and Slots Editor")); se->setObjectName("SignalsAndSlotsEditor"); m_designerSubWindows[SignalSlotEditorSubWindow] = se; QDesignerActionEditorInterface *ae = QDesignerComponents::createActionEditor(m_formeditor, nullptr); - ae->setWindowTitle(tr("Action Editor")); + ae->setWindowTitle(Tr::tr("Action Editor")); ae->setObjectName("ActionEditor"); m_formeditor->setActionEditor(ae); m_designerSubWindows[ActionEditorSubWindow] = ae; @@ -513,32 +511,32 @@ void FormEditorData::setupActions() m_toolActionIds.push_back("FormEditor.WidgetEditor"); createEditModeAction(m_actionGroupEditMode, m_contexts, medit, - tr("Edit Widgets"), m_toolActionIds.back(), - EditModeWidgetEditor, "widgettool.png", tr("F3")); + Tr::tr("Edit Widgets"), m_toolActionIds.back(), + EditModeWidgetEditor, "widgettool.png", Tr::tr("F3")); m_toolActionIds.push_back("FormEditor.SignalsSlotsEditor"); createEditModeAction(m_actionGroupEditMode, m_contexts, medit, - tr("Edit Signals/Slots"), m_toolActionIds.back(), - EditModeSignalsSlotEditor, "signalslottool.png", tr("F4")); + Tr::tr("Edit Signals/Slots"), m_toolActionIds.back(), + EditModeSignalsSlotEditor, "signalslottool.png", Tr::tr("F4")); m_toolActionIds.push_back("FormEditor.BuddyEditor"); createEditModeAction(m_actionGroupEditMode, m_contexts, medit, - tr("Edit Buddies"), m_toolActionIds.back(), + Tr::tr("Edit Buddies"), m_toolActionIds.back(), EditModeBuddyEditor, "buddytool.png"); m_toolActionIds.push_back("FormEditor.TabOrderEditor"); createEditModeAction(m_actionGroupEditMode, m_contexts, medit, - tr("Edit Tab Order"), m_toolActionIds.back(), + Tr::tr("Edit Tab Order"), m_toolActionIds.back(), EditModeTabOrderEditor, "tabordertool.png"); //tool actions m_toolActionIds.push_back("FormEditor.LayoutHorizontally"); - const QString horizLayoutShortcut = useMacShortcuts ? tr("Meta+Shift+H") : tr("Ctrl+H"); + const QString horizLayoutShortcut = useMacShortcuts ? Tr::tr("Meta+Shift+H") : Tr::tr("Ctrl+H"); addToolAction(m_fwm->actionHorizontalLayout(), m_contexts, m_toolActionIds.back(), mformtools, horizLayoutShortcut); m_toolActionIds.push_back("FormEditor.LayoutVertically"); - const QString vertLayoutShortcut = useMacShortcuts ? tr("Meta+L") : tr("Ctrl+L"); + const QString vertLayoutShortcut = useMacShortcuts ? Tr::tr("Meta+L") : Tr::tr("Ctrl+L"); addToolAction(m_fwm->actionVerticalLayout(), m_contexts, m_toolActionIds.back(), mformtools, vertLayoutShortcut); @@ -555,7 +553,7 @@ void FormEditorData::setupActions() m_toolActionIds.back(), mformtools); m_toolActionIds.push_back("FormEditor.LayoutGrid"); - const QString gridShortcut = useMacShortcuts ? tr("Meta+Shift+G") : tr("Ctrl+G"); + const QString gridShortcut = useMacShortcuts ? Tr::tr("Meta+Shift+G") : Tr::tr("Ctrl+G"); addToolAction(m_fwm->actionGridLayout(), m_contexts, m_toolActionIds.back(), mformtools, gridShortcut); @@ -564,7 +562,7 @@ void FormEditorData::setupActions() m_toolActionIds.back(), mformtools); m_toolActionIds.push_back("FormEditor.LayoutAdjustSize"); - const QString adjustShortcut = useMacShortcuts ? tr("Meta+J") : tr("Ctrl+J"); + const QString adjustShortcut = useMacShortcuts ? Tr::tr("Meta+J") : Tr::tr("Ctrl+J"); addToolAction(m_fwm->actionAdjustSize(), m_contexts, m_toolActionIds.back(), mformtools, adjustShortcut); @@ -582,7 +580,7 @@ void FormEditorData::setupActions() m_actionPreview = m_fwm->action(QDesignerFormWindowManagerInterface::DefaultPreviewAction); QTC_ASSERT(m_actionPreview, return); - addToolAction(m_actionPreview, m_contexts, "FormEditor.Preview", mformtools, tr("Alt+Shift+R")); + addToolAction(m_actionPreview, m_contexts, "FormEditor.Preview", mformtools, Tr::tr("Alt+Shift+R")); // Preview in style... m_actionGroupPreviewInStyle = m_fwm->actionGroup(QDesignerFormWindowManagerInterface::StyledPreviewActionGroup); @@ -603,7 +601,7 @@ void FormEditorData::setupActions() QString(), Core::Constants::G_DEFAULT_THREE); mformtools->addSeparator(m_contexts, Core::Constants::G_DEFAULT_THREE); - m_actionAboutPlugins = new QAction(tr("About Qt Designer Plugins..."), m_instance); + m_actionAboutPlugins = new QAction(Tr::tr("About Qt Designer Plugins..."), m_instance); addToolAction(m_actionAboutPlugins, m_contexts, "FormEditor.AboutPlugins", mformtools, QString(), Core::Constants::G_DEFAULT_THREE); QObject::connect(m_actionAboutPlugins, &QAction::triggered, @@ -638,7 +636,7 @@ ActionContainer *FormEditorData::createPreviewStyleMenu(QActionGroup *actionGrou { const QString menuId = M_FORMEDITOR_PREVIEW; ActionContainer *menuPreviewStyle = ActionManager::createMenu(M_FORMEDITOR_PREVIEW); - menuPreviewStyle->menu()->setTitle(tr("Preview in")); + menuPreviewStyle->menu()->setTitle(Tr::tr("Preview in")); // The preview menu is a list of invisible actions for the embedded design // device profiles (integer data) followed by a separator and the styles @@ -685,7 +683,7 @@ void FormEditorData::saveSettings(QSettings *s) void FormEditorData::critical(const QString &errorMessage) { - QMessageBox::critical(ICore::dialogParent(), tr("Designer"), errorMessage); + QMessageBox::critical(ICore::dialogParent(), Tr::tr("Designer"), errorMessage); } // Apply the command shortcut to the action and connects to the command's keySequenceChanged signal @@ -755,8 +753,8 @@ IEditor *FormEditorData::createEditor() if (formWindowEditor) { Utils::InfoBarEntry info(Id(Constants::INFO_READ_ONLY), - tr("This file can only be edited in Design mode.")); - info.addCustomButton(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); }); + Tr::tr("This file can only be edited in Design mode.")); + info.addCustomButton(Tr::tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); }); formWindowEditor->document()->infoBar()->addInfo(info); } return formWindowEditor; @@ -836,7 +834,7 @@ void FormEditorData::print() QString errorMessage; const QPixmap pixmap = m_fwm->createPreviewPixmap(); if (pixmap.isNull()) { - critical(tr("The image could not be created: %1").arg(errorMessage)); + critical(Tr::tr("The image could not be created: %1").arg(errorMessage)); break; } diff --git a/src/plugins/designer/formtemplatewizardpage.cpp b/src/plugins/designer/formtemplatewizardpage.cpp index 4a5babe56ca..6d0ac1b6d2e 100644 --- a/src/plugins/designer/formtemplatewizardpage.cpp +++ b/src/plugins/designer/formtemplatewizardpage.cpp @@ -1,8 +1,9 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "formtemplatewizardpage.h" +#include "designertr.h" #include "formeditorw.h" +#include "formtemplatewizardpage.h" #include @@ -60,7 +61,7 @@ FormTemplateWizardPage::FormTemplateWizardPage(QWidget * parent) : m_newFormWidget(QDesignerNewFormWidgetInterface::createNewFormWidget(FormEditorW::designerEditor())), m_templateSelected(m_newFormWidget->hasCurrentTemplate()) { - setTitle(tr("Choose a Form Template")); + setTitle(Tr::tr("Choose a Form Template")); QVBoxLayout *layout = new QVBoxLayout; connect(m_newFormWidget, &QDesignerNewFormWidgetInterface::currentTemplateChanged, @@ -70,7 +71,7 @@ FormTemplateWizardPage::FormTemplateWizardPage(QWidget * parent) : layout->addWidget(m_newFormWidget); setLayout(layout); - setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Form Template")); + setProperty(Utils::SHORT_TITLE_PROPERTY, Tr::tr("Form Template")); } bool FormTemplateWizardPage::isComplete() const @@ -91,7 +92,7 @@ bool FormTemplateWizardPage::validatePage() QString errorMessage; m_templateContents = m_newFormWidget->currentTemplate(&errorMessage); if (m_templateContents.isEmpty()) { - QMessageBox::critical(this, tr("%1 - Error").arg(title()), errorMessage); + QMessageBox::critical(this, Tr::tr("%1 - Error").arg(title()), errorMessage); return false; } wizard()->setProperty("FormContents", m_templateContents); diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp index 3b906bbe1a0..85e57a3db9a 100644 --- a/src/plugins/designer/qtcreatorintegration.cpp +++ b/src/plugins/designer/qtcreatorintegration.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "qtcreatorintegration.h" -#include "formwindoweditor.h" -#include "formeditorw.h" +#include "designertr.h" #include "editordata.h" +#include "formeditorw.h" +#include "formwindoweditor.h" +#include "qtcreatorintegration.h" #include #include @@ -53,7 +54,7 @@ static QString msgClassNotFound(const QString &uiClassName, const QListfileName()); } - return QtCreatorIntegration::tr( + return Designer::Tr::tr( "The class containing \"%1\" could not be found in %2.\n" "Please verify the #include-directives.") .arg(uiClassName, files); @@ -366,7 +367,7 @@ void QtCreatorIntegration::slotNavigateToSlot(const QString &objectName, const Q { QString errorMessage; if (!navigateToSlot(objectName, signalSignature, parameterNames, &errorMessage) && !errorMessage.isEmpty()) - QMessageBox::warning(FormEditorW::designerEditor()->topLevel(), tr("Error finding/adding a slot."), errorMessage); + QMessageBox::warning(FormEditorW::designerEditor()->topLevel(), Tr::tr("Error finding/adding a slot."), errorMessage); } // Build name of the class as generated by uic, insert Ui namespace @@ -461,7 +462,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName, if (Designer::Constants::Internal::debug) qDebug() << Q_FUNC_INFO << objectName << signalSignature << "Looking for " << uicedName << " returned " << docList.size(); if (docMap.isEmpty()) { - *errorMessage = tr("No documents matching \"%1\" could be found.\nRebuilding the project might help.").arg(uicedName); + *errorMessage = Tr::tr("No documents matching \"%1\" could be found.\nRebuilding the project might help.").arg(uicedName); return false; } @@ -560,7 +561,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName, return true; } - *errorMessage = tr("Unable to add the method definition."); + *errorMessage = Tr::tr("Unable to add the method definition."); return false; } diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index afff4f3027b..c84cc4f1e54 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -1,8 +1,9 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "settingspage.h" +#include "designertr.h" #include "formeditorw.h" +#include "settingspage.h" #include @@ -47,8 +48,7 @@ void SettingsPage::finish() SettingsPageProvider::SettingsPageProvider() { setCategory(Designer::Constants::SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Designer", - Designer::Constants::SETTINGS_TR_CATEGORY)); + setDisplayCategory(Tr::tr(Designer::Constants::SETTINGS_TR_CATEGORY)); setCategoryIcon(Utils::Icon({{":/core/images/settingscategory_design.png", Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); }