diff options
| author | hjk <hjk@qt.io> | 2022-09-23 14:25:49 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-09-26 06:00:44 +0000 |
| commit | ded650092262ff0b66c907e99fcdeb71cc5f4f15 (patch) | |
| tree | 082bdb4b098f45ff6939b5b88d2c208036d16724 | |
| parent | 6da227925ae3405497583e36f65206b13799b47a (diff) | |
Bazaar: Convert to Tr::tr
Change-Id: If49e9ccf9426f049bff842b1facbd408d1d54d4e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
30 files changed, 270 insertions, 739 deletions
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index bbb94e99e1..8f0af7a495 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -29236,7 +29236,7 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Obecné informace</translation> @@ -29279,11 +29279,7 @@ Místní zápisy nejsou odevzdány do hlavní větve, dokud není proveden norm </message> </context> <context> - <name>Bazaar::Internal::CloneOptionsPanel</name> - <message> - <source>Options</source> - <translation>Volby</translation> - </message> + <name>Bazaar</name> <message> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed.</source> @@ -29291,10 +29287,6 @@ This flag will allow branch to proceed.</source> Toto nastavení dovolí za těchto okolností v operaci pokračovat.</translation> </message> <message> - <source>Use existing directory</source> - <translation>Použít existující adresář</translation> - </message> - <message> <source>Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations.</source> <translation>Vytvořit nastavující (stacked) větev, která nastavuje zdrojovou větev. @@ -29341,10 +29333,6 @@ Nová větev bude ve všech operacích závislá na dostupnosti zdrojové větve <translation>Bez pracovního stromu</translation> </message> <message> - <source>Revision:</source> - <translation>Revize:</translation> - </message> - <message> <source>Creates a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations.</source> <translation>Vytvoří nastavující (stacked) větev, která nastavuje zdrojovou větev. @@ -29368,7 +29356,7 @@ Nová větev bude ve všech operacích závislá na dostupnosti zdrojové větve </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Form</source> <translation>Formulář</translation> @@ -29426,13 +29414,6 @@ Nová větev bude ve všech operacích závislá na dostupnosti zdrojové větve <translation>Ptát se na potvrzení</translation> </message> <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::PullOrPushDialog</name> - <message> <source>Dialog</source> <translation>Dialog</translation> </message> @@ -29493,10 +29474,6 @@ Toto nastavení dovolí za těchto okolností v operaci odvedení pokračovat.</ <translation>Vytvořit předponu</translation> </message> <message> - <source>Revision:</source> - <translation>Revize:</translation> - </message> - <message> <source>Perform a local pull in a bound branch. Local pulls are not applied to the master branch.</source> <translation>Provést místní přivedení (pull) ve vázané větvi. @@ -29536,7 +29513,7 @@ Místní přivedení nejsou použita na hlavní větev.</translation> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>Vrátit</translation> @@ -29545,10 +29522,6 @@ Místní přivedení nejsou použita na hlavní větev.</translation> <source>Specify a revision other than the default?</source> <translation>Chcete jinou než výchozí revizi?</translation> </message> - <message> - <source>Revision:</source> - <translation>Revize:</translation> - </message> </context> <context> <name>ClassView::Internal::NavigationWidget</name> @@ -33573,7 +33546,7 @@ Server: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffParameterWidget</name> + <name>Bazaar</name> <message> <source>Ignore whitespace</source> <translation>Nevšímat si bílých znaků</translation> @@ -33590,16 +33563,6 @@ Server: %2.</translation> <source>Ignore Blank Lines</source> <translation>Nevšímat si prázdných řádků</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarEditor</name> <message> <source>Annotate %1</source> <translation>Opatřit anotacemi %1</translation> @@ -33608,9 +33571,6 @@ Server: %2.</translation> <source>Annotate parent revision %1</source> <translation>Opatření anotacemi nadřazenou revizi "%1"</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> <message> <source>Bazaar</source> <translation>Bazaar</translation> @@ -33798,7 +33758,7 @@ Server: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::CloneWizard</name> + <name>Bazaar</name> <message> <source>Cloning</source> <translation>Klonování</translation> @@ -33817,7 +33777,7 @@ Server: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::CloneWizardPage</name> + <name>Bazaar</name> <message> <source>Location</source> <translation>Umístění</translation> @@ -33832,14 +33792,14 @@ Server: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>Editor zápisu (commit)</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Příkaz Bazaar</translation> @@ -42862,7 +42822,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři.</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarLogParameterWidget</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>Podrobný</translation> @@ -61726,7 +61686,7 @@ Projekty Qt Quick 2 UI není potřeba sestavovat a lze je spouštět přímo v p </message> </context> <context> - <name>Bazaar::Internal::UnCommitDialog</name> + <name>Bazaar</name> <message> <source>Uncommit</source> <translation type="unfinished"></translation> diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index bfc5444bfd..dc3dac7846 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -3001,7 +3001,7 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Generel information</translation> @@ -3036,16 +3036,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t <source>Fixed bugs:</source> <translation>Rettede fejl:</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarDiffConfig</name> <message> <source>Ignore Whitespace</source> <translation>Ignorer blanktegn</translation> @@ -3054,9 +3044,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t <source>Ignore Blank Lines</source> <translation>Ignorer tomme linjer</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarEditorWidget</name> <message> <source>&Annotate %1</source> <translation>&Annotate %1</translation> @@ -3065,9 +3052,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t <source>Annotate &parent revision %1</source> <translation>Annotate &forælder revision %1</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarLogConfig</name> <message> <source>Verbose</source> <translation>Detaljeret</translation> @@ -3108,13 +3092,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t <source>GNU Change Log</source> <translation>GNU-ændringslog</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> <message> <source>Annotate Current File</source> <translation>Annotate aktuel fil</translation> @@ -3293,14 +3270,14 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>Commit-redigering</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Configuration</source> <translation>Konfiguration</translation> @@ -3355,14 +3332,14 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.</t </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Bazaar-kommando</translation> </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation>Dialog</translation> @@ -3424,10 +3401,6 @@ Dette flag vil tillade push at fortsætte.</translation> <translation>Opret præfiks</translation> </message> <message> - <source>Revision:</source> - <translation>Revision:</translation> - </message> - <message> <source>Performs a local pull in a bound branch. Local pulls are not applied to the master branch.</source> <translation>Udfører en lokal pull på en bound gren. @@ -3445,9 +3418,6 @@ Lokale pulls anvendes ikke på master-grenen.</translation> <source>Push Destination</source> <translation>Push destination</translation> </message> -</context> -<context> - <name>Bazaar::Internal::RevertDialog</name> <message> <source>Revert</source> <translation>Tilbagefør</translation> @@ -3457,13 +3427,6 @@ Lokale pulls anvendes ikke på master-grenen.</translation> <translation>Angiv en revision anden end den som er standard?</translation> </message> <message> - <source>Revision:</source> - <translation>Revision:</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::UnCommitDialog</name> - <message> <source>Uncommit</source> <translation>Uncommit</translation> </message> diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index e8120cca65..344dcf0295 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -13052,7 +13052,7 @@ Soll es noch einmal versucht werden?</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Allgemeine Informationen</translation> @@ -13089,7 +13089,7 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Configuration</source> <translation>Konfiguration</translation> @@ -13140,7 +13140,7 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation>Dialog</translation> @@ -13170,10 +13170,6 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e <translation>Präfix erzeugen</translation> </message> <message> - <source>Revision:</source> - <translation>Revision:</translation> - </message> - <message> <source>Local</source> <translation>Lokale Variable</translation> </message> @@ -13223,9 +13219,6 @@ Local pulls are not applied to the master branch.</source> <translation>Führt eine lokale Pull-Operation in einem gebundenem Branch aus. Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.</translation> </message> -</context> -<context> - <name>Bazaar::Internal::RevertDialog</name> <message> <source>Revert</source> <translation>Rückgängig machen</translation> @@ -13234,10 +13227,6 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.</translati <source>Specify a revision other than the default?</source> <translation>Möchten Sie eine Revision angeben?</translation> </message> - <message> - <source>Revision:</source> - <translation>Revision:</translation> - </message> </context> <context> <name>Core::Internal::ExternalToolConfig</name> @@ -13390,11 +13379,7 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.</translati </message> </context> <context> - <name>Bazaar::Internal::BazaarPlugin</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> + <name>Bazaar</name> <message> <source>Annotate Current File</source> <translation>Annotation für Datei</translation> @@ -13545,14 +13530,14 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.</translati </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>Commit-Editor</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Bazaar-Kommando</translation> @@ -25919,7 +25904,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D </message> </context> <context> - <name>Bazaar::Internal::UnCommitDialog</name> + <name>Bazaar</name> <message> <source>Uncommit</source> <translation>Commit rückgängig machen</translation> @@ -28297,7 +28282,7 @@ Der vom Kit mindestens benötigte API-Level ist %1.</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarEditorWidget</name> + <name>Bazaar</name> <message> <source>&Annotate %1</source> <translation>&Annotation für %1</translation> @@ -37582,7 +37567,7 @@ Fehler: %5</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffConfig</name> + <name>Bazaar</name> <message> <source>Ignore Whitespace</source> <translation>Leerzeichen ignorieren</translation> @@ -37593,7 +37578,7 @@ Fehler: %5</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarLogConfig</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>Ausführlich</translation> diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index b1bfd6e4b8..39e576d4a9 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -32495,7 +32495,7 @@ Veuillez vérifier les droits d'accès du répertoire.</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Informations générales</translation> @@ -32538,21 +32538,13 @@ Les commits locaux ne sont pas transmis à la branche principale avant qu'u </message> </context> <context> - <name>Bazaar::Internal::CloneOptionsPanel</name> - <message> - <source>Options</source> - <translation>Options</translation> - </message> + <name>Bazaar</name> <message> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed</source> <translation type="obsolete">Par défaut, la branche va échouer si le répertoire cible existe, mais n'a pas déjà de répertoire de contrôle. Ce drapeau autorisera la branche à procéder</translation> </message> <message> - <source>Use existing directory</source> - <translation>Utiliser le répertoire existant</translation> - </message> - <message> <source>Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations</source> <translation type="obsolete">Créer une branche empilée se référant à la branche source. La nouvelle branche dépendra de la disponibilité de la branche source pour toutes les opérations</translation> @@ -32598,10 +32590,6 @@ The new branch will depend on the availability of the source branch for all oper <translation>Pas d'arbre de travail</translation> </message> <message> - <source>Revision:</source> - <translation>Révision :</translation> - </message> - <message> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed.</source> <translation>Par défaut, la branche va échouer si le répertoire cible existe, mais n'a pas déjà de répertoire de contrôle. @@ -32631,7 +32619,7 @@ La nouvelle branche dépendra de la disponibilité de la branche source pour tou </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Form</source> <translation>Formulaire</translation> @@ -32689,16 +32677,12 @@ La nouvelle branche dépendra de la disponibilité de la branche source pour tou <translation>Invite lors du submit</translation> </message> <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> - <message> <source>The number of recent commit logs to show. Choose 0 to see all entries.</source> <translation>Le nombre de logs de commit récents à afficher, 0 pour tout afficher. </translation> </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation>Boîte de dialogue</translation> @@ -32759,10 +32743,6 @@ Ce drapeau autorisera le push à procéder</translation> <translation>Créer le préfixe</translation> </message> <message> - <source>Revision:</source> - <translation>Révision :</translation> - </message> - <message> <source>Perform a local pull in a bound branch. Local pulls are not applied to the master branch</source> <translation type="obsolete">Réalise un pull locale dans une branche limité. @@ -32808,7 +32788,7 @@ Les pulls locaux ne sont pas appliqués à la branche maître. </translation> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>Rétablir</translation> @@ -34728,16 +34708,6 @@ Specifie comment retour arrière se comporte avec l'indentation. <source> (External)</source> <translation> (externe)</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarEditor</name> <message> <source>Annotate %1</source> <translation>Annoter %1</translation> @@ -34746,9 +34716,6 @@ Specifie comment retour arrière se comporte avec l'indentation. <source>Annotate parent revision %1</source> <translation>Annoter la révision parente %1</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> <message> <source>Bazaar</source> <translation>Bazaar</translation> @@ -34935,7 +34902,7 @@ Specifie comment retour arrière se comporte avec l'indentation. </message> </context> <context> - <name>Bazaar::Internal::CloneWizard</name> + <name>Bazaar</name> <message> <source>Cloning</source> <translation>Cloner</translation> @@ -34954,7 +34921,7 @@ Specifie comment retour arrière se comporte avec l'indentation. </message> </context> <context> - <name>Bazaar::Internal::CloneWizardPage</name> + <name>Bazaar</name> <message> <source>Location</source> <translation>Emplacement</translation> @@ -34969,14 +34936,14 @@ Specifie comment retour arrière se comporte avec l'indentation. </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>Faire un commit de l'éditeur</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Commande Bazaar</translation> @@ -39843,7 +39810,7 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffParameterWidget</name> + <name>Bazaar</name> <message> <source>Ignore whitespace</source> <translation>Ignorer les espaces</translation> @@ -43007,7 +42974,7 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle </message> </context> <context> - <name>Bazaar::Internal::BazaarLogParameterWidget</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>Journal</translation> diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index fc3e7b83f7..999ea6fdfb 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -1396,7 +1396,7 @@ Upozorenje: ovo je eksperimentalna funkcija i može dovesti do neuspjeha izvrša </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Opće informacije</translation> @@ -1433,7 +1433,7 @@ Lokalne obveze se ne guraju u glavnu granu sve dok se ne izvrši normalna obveza </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Configuration</source> <translation>Konfiguracija</translation> @@ -1482,13 +1482,9 @@ Lokalne obveze se ne guraju u glavnu granu sve dok se ne izvrši normalna obveza <source>s</source> <translation>s</translation> </message> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation>Dijalog</translation> @@ -1550,10 +1546,6 @@ Ova oznaka će omogućiti nastavak guranja.</translation> <translation>Stvori predznak</translation> </message> <message> - <source>Revision:</source> - <translation>Revizija:</translation> - </message> - <message> <source>Performs a local pull in a bound branch. Local pulls are not applied to the master branch.</source> <translation>Izvodi lokalno povlačenje u ograničenoj grani. @@ -1571,9 +1563,6 @@ Lokalne povlačenja se ne primjenjuju na glavnu granu.</translation> <source>Push Destination</source> <translation>Odredište za guranje</translation> </message> -</context> -<context> - <name>Bazaar::Internal::RevertDialog</name> <message> <source>Revert</source> <translation>Vrati na izvorno</translation> @@ -1583,13 +1572,6 @@ Lokalne povlačenja se ne primjenjuju na glavnu granu.</translation> <translation>Odrediti jednu drugu reviziju od zadane?</translation> </message> <message> - <source>Revision:</source> - <translation>Revizija:</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::UnCommitDialog</name> - <message> <source>Uncommit</source> <translation>Ukini obvezu</translation> </message> @@ -16028,7 +16010,7 @@ Check the test environment.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffConfig</name> + <name>Bazaar</name> <message> <source>Ignore Whitespace</source> <translation>Zanemari razmake</translation> @@ -16039,7 +16021,7 @@ Check the test environment.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarLogConfig</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>Verbalno</translation> @@ -16080,16 +16062,6 @@ Check the test environment.</source> <source>GNU Change Log</source> <translation>Log-zapis GNU promjene</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarEditorWidget</name> <message> <source>&Annotate %1</source> <translation>Pri&bilježi %1</translation> @@ -16223,7 +16195,7 @@ Check the test environment.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarPlugin</name> + <name>Bazaar</name> <message> <source>Bazaar</source> <translation>Bazaar</translation> @@ -16378,14 +16350,14 @@ Check the test environment.</source> </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Bazaar naredba</translation> diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 8d9c608caf..a5b0d182bc 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -897,7 +897,7 @@ </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>概要</translation> @@ -934,7 +934,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Form</source> <translation>フォーム</translation> @@ -988,13 +988,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <translation>秒</translation> </message> <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::PullOrPushDialog</name> - <message> <source>Dialog</source> <translation>ダイアログ</translation> </message> @@ -1041,10 +1034,6 @@ This flag will allow push to proceed.</source> <translation>プレフィックスを作成する</translation> </message> <message> - <source>Revision:</source> - <translation>リビジョン:</translation> - </message> - <message> <source>Local</source> <translation>ローカルで実行する</translation> </message> @@ -1077,7 +1066,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>元に戻す</translation> @@ -1086,10 +1075,6 @@ Local pulls are not applied to the master branch.</source> <source>Specify a revision other than the default?</source> <translation>既定以外のリビジョンを指定しますか？</translation> </message> - <message> - <source>Revision:</source> - <translation>リビジョン:</translation> - </message> </context> <context> <name>ClassView::Internal::NavigationWidget</name> @@ -12616,7 +12601,7 @@ in the system's browser for manual download.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffParameterWidget</name> + <name>Bazaar</name> <message> <source>Ignore Whitespace</source> <translation>空白を無視</translation> @@ -12625,63 +12610,6 @@ in the system's browser for manual download.</source> <source>Ignore Blank Lines</source> <translation>空行を無視</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarLogParameterWidget</name> - <message> - <source>Verbose</source> - <translation>冗長表示</translation> - </message> - <message> - <source>Show files changed in each revision.</source> - <translation>各リビジョンで変更されたファイルを表示します。</translation> - </message> - <message> - <source>Forward</source> - <translation>時系列順</translation> - </message> - <message> - <source>Show from oldest to newest.</source> - <translation>古いリビジョンから開始して最新のリビジョンを最後に表示します。</translation> - </message> - <message> - <source>Include Merges</source> - <translation>マージ込み</translation> - </message> - <message> - <source>Show merged revisions.</source> - <translation>マージされたリビジョンを表示します。</translation> - </message> - <message> - <source>Detailed</source> - <translation>詳細形式</translation> - </message> - <message> - <source>Moderately Short</source> - <translation>概略表示</translation> - </message> - <message> - <source>One Line</source> - <translation>一行表示</translation> - </message> - <message> - <source>GNU Change Log</source> - <translation>GNU形式</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> <message> <source>Annotate Current File</source> <translation>現在のファイルのアノテーション</translation> @@ -12860,7 +12788,7 @@ in the system's browser for manual download.</source> </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>コミットエディタ</translation> @@ -13002,7 +12930,7 @@ in the system's browser for manual download.</source> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Bazaar コマンド</translation> @@ -34150,7 +34078,7 @@ When a problem is detected, the application is interrupted and can be debugged.< </message> </context> <context> - <name>Bazaar::Internal::UnCommitDialog</name> + <name>Bazaar</name> <message> <source>Uncommit</source> <translation>コミットの取り消し</translation> @@ -39168,7 +39096,7 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop </message> </context> <context> - <name>Bazaar::Internal::BazaarEditorWidget</name> + <name>Bazaar</name> <message> <source>&Annotate %1</source> <translation>%1 のアノテーション(&A)</translation> @@ -49402,18 +49330,7 @@ The name of the release build configuration created by default for a qmake proje </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffConfig</name> - <message> - <source>Ignore Whitespace</source> - <translation>空白を無視</translation> - </message> - <message> - <source>Ignore Blank Lines</source> - <translation>空行を無視</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarLogConfig</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>冗長表示</translation> diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 343dcd7330..98795f7f59 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -14144,7 +14144,7 @@ Adds the library and include paths to the .pro file.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Ogólne informacje</translation> @@ -14181,7 +14181,7 @@ Poprawki utworzone lokalnie nie są wrzucane do głównej gałęzi, dopóki nie </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Form</source> <translation>Formularz</translation> @@ -14231,16 +14231,9 @@ Poprawki utworzone lokalnie nie są wrzucane do głównej gałęzi, dopóki nie <translation>s</translation> </message> <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> - <message> <source>The number of recent commit logs to show. Choose 0 to see all entries.</source> <translation>Liczba ostatnich poprawek, wyświetlanych w logu. Wybierz 0 aby ujrzeć wszystkie zmiany.</translation> </message> -</context> -<context> - <name>Bazaar::Internal::PullOrPushDialog</name> <message> <source>Dialog</source> <translation>Dialog</translation> @@ -14282,10 +14275,6 @@ Poprawki utworzone lokalnie nie są wrzucane do głównej gałęzi, dopóki nie <translation>Utwórz przedrostek</translation> </message> <message> - <source>Revision:</source> - <translation>Wersja:</translation> - </message> - <message> <source>Local</source> <translation>Lokalnie</translation> </message> @@ -14322,7 +14311,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>Odwróć zmiany</translation> @@ -14331,10 +14320,6 @@ Local pulls are not applied to the master branch.</source> <source>Specify a revision other than the default?</source> <translation>Podaj inną wersję niż domyślna</translation> </message> - <message> - <source>Revision:</source> - <translation>Wersja:</translation> - </message> </context> <context> <name>Core::Internal::ExternalToolConfig</name> @@ -14859,14 +14844,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> + <name>Bazaar</name> <message> <source>Bazaar</source> <translation>Bazaar</translation> @@ -15049,14 +15027,14 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>Edytor poprawek</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Komenda Bazaar</translation> @@ -28549,7 +28527,7 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani </message> </context> <context> - <name>Bazaar::Internal::UnCommitDialog</name> + <name>Bazaar</name> <message> <source>Uncommit</source> <translation>Wycofaj poprawkę</translation> @@ -30627,7 +30605,7 @@ Zainstaluj SDK o wersji %1 lub wyższej.</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarEditorWidget</name> + <name>Bazaar</name> <message> <source>&Annotate %1</source> <translation>Dołącz &adnotację do %1</translation> @@ -41924,7 +41902,7 @@ Błąd: %2</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffConfig</name> + <name>Bazaar</name> <message> <source>Ignore Whitespace</source> <translation>Ignoruj białe znaki</translation> @@ -41933,9 +41911,6 @@ Błąd: %2</translation> <source>Ignore Blank Lines</source> <translation>Ignoruj puste linie</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarLogConfig</name> <message> <source>Verbose</source> <translation>Gadatliwy</translation> diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 48eb0ff3b6..6deb2994f7 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -4677,7 +4677,7 @@ Warning: this is an experimental feature and might lead to failing to execute th </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Основная информация</translation> @@ -4714,7 +4714,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffConfig</name> + <name>Bazaar</name> <message> <source>Ignore Whitespace</source> <translation>Игнорировать пробелы</translation> @@ -4725,7 +4725,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::BazaarEditorWidget</name> + <name>Bazaar</name> <message> <source>&Annotate %1</source> <translation>&Аннотация %1</translation> @@ -4736,7 +4736,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::BazaarLogConfig</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>Подробно</translation> @@ -4783,11 +4783,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::BazaarPlugin</name> - <message> - <source>Bazaar</source> - <translation></translation> - </message> + <name>Bazaar</name> <message> <source>Annotate Current File</source> <translation>Аннотация текущего файла (annotate)</translation> @@ -4938,14 +4934,14 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>Редактор фиксаций</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Configuration</source> <translation>Настройка</translation> @@ -4997,7 +4993,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Команда Bazaar</translation> @@ -5008,7 +5004,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation></translation> @@ -5034,10 +5030,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <translation>Создавать родительские каталоги</translation> </message> <message> - <source>Revision:</source> - <translation>Ревизия:</translation> - </message> - <message> <source>Local</source> <translation>Локально</translation> </message> @@ -5094,7 +5086,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>Откатить</translation> @@ -5104,13 +5096,6 @@ Local pulls are not applied to the master branch.</source> <translation>Указать ревизию отличную от умолчальной?</translation> </message> <message> - <source>Revision:</source> - <translation>Ревизия:</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::UnCommitDialog</name> - <message> <source>Uncommit</source> <translation>Отмена фиксации</translation> </message> diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 8daeddd8af..c2f872c8ed 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -18660,7 +18660,7 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.</t </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Splošni podatki</translation> @@ -18704,11 +18704,7 @@ Krajevnih zapisov se v vejo »master« ne potisne dokler ni izvršen običajen z </message> </context> <context> - <name>Bazaar::Internal::CloneOptionsPanel</name> - <message> - <source>Options</source> - <translation>Možnosti</translation> - </message> + <name>Bazaar</name> <message> <location/> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. @@ -18718,11 +18714,6 @@ Ta možnost omogoči, da se ustvarjanje veje nadaljuje.</translation> </message> <message> <location/> - <source>Use existing directory</source> - <translation>Uporabi obstoječo mapo</translation> - </message> - <message> - <location/> <source>Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations.</source> <translation>Ustvari naloženo vajo, ki se nanaša na izvorno vejo. @@ -18779,14 +18770,6 @@ Nova veja bo za vsa dejanja odvisna od razpoložljivosti izvorne veje.</translat <translation>Brez delovnega drevesa</translation> </message> <message> - <location/> - <source>Revision:</source> - <translation>Različica:</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::OptionsPage</name> - <message> <source>Form</source> <translation>Obrazec</translation> </message> @@ -18856,13 +18839,6 @@ Nova veja bo za vsa dejanja odvisna od razpoložljivosti izvorne veje.</translat <translation>Vprašaj ob pošiljanju</translation> </message> <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::PullOrPushDialog</name> - <message> <source>Dialog</source> <translation>Pogovorno okno</translation> </message> @@ -18961,7 +18937,7 @@ Krajevnih potegov se v vejo »master« ne uveljavi.</translation> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>Povrnitev</translation> @@ -18971,11 +18947,6 @@ Krajevnih potegov se v vejo »master« ne uveljavi.</translation> <source>Specify a revision other than the default?</source> <translation>Ali ste poskusili navesti različico, ki je različna od privzete?</translation> </message> - <message> - <location/> - <source>Revision:</source> - <translation>Različica:</translation> - </message> </context> <context> <name>ClassView::Internal::NavigationWidget</name> @@ -22862,7 +22833,7 @@ Seznam za strežnik je: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffParameterWidget</name> + <name>Bazaar</name> <message> <source>Ignore whitespace</source> <translation>Prezri presledke</translation> @@ -22871,16 +22842,6 @@ Seznam za strežnik je: %2.</translation> <source>Ignore blank lines</source> <translation>Prezri prazne vrstice</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarEditor</name> <message> <source>Annotate %1</source> <translation>Dodaj opombo za %1</translation> @@ -22889,9 +22850,6 @@ Seznam za strežnik je: %2.</translation> <source>Annotate parent revision %1</source> <translation>Dodaj opombo za starševsko različico %1</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> <message> <source>Bazaar</source> <translation>Bazaar</translation> @@ -23058,7 +23016,7 @@ Seznam za strežnik je: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::CloneWizard</name> + <name>Bazaar</name> <message> <source>Clones a Bazaar branch and tries to load the contained project.</source> <translation>Sklonira vejo Bazaar in poskusi naložiti vsebovani projekt.</translation> @@ -23069,7 +23027,7 @@ Seznam za strežnik je: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::CloneWizardPage</name> + <name>Bazaar</name> <message> <source>Location</source> <translation>Mesto</translation> @@ -23084,14 +23042,14 @@ Seznam za strežnik je: %2.</translation> </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>Urejevalnik zapisov</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Ukaz Bazaar</translation> diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 7790766790..c0c5ad9d61 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -344,7 +344,7 @@ </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>Загальна інформація</translation> @@ -378,16 +378,6 @@ Local commits are not pushed to the master branch until a normal commit is performed.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarDiffParameterWidget</name> <message> <source>Ignore whitespace</source> <translation type="vanished">Ігнорувати пропуски</translation> @@ -404,9 +394,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <source>Ignore Blank Lines</source> <translation>Ігнорувати порожні рядки</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarLogParameterWidget</name> <message> <source>Verbose</source> <translation>Детально</translation> @@ -463,13 +450,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <source>GNU ChangeLog</source> <translation type="vanished">GNU ChangeLog</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> <message> <source>Annotate Current File</source> <translation type="unfinished"></translation> @@ -619,10 +599,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <translation>&Зміни у вибраних файлах</translation> </message> <message> - <source>Clones a Bazaar branch and tries to load the contained project.</source> - <translation type="vanished">Клонує гілку Bazaar та намагається завантажити з нього проект.</translation> - </message> - <message> <source>There are no changes to commit.</source> <translation type="unfinished"></translation> </message> @@ -650,24 +626,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <source>Message check failed. Do you want to proceed?</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Bazaar::Internal::CloneOptionsPanel</name> - <message> - <source>Options</source> - <translation type="vanished">Опції</translation> - </message> - <message> - <source>Use existing directory</source> - <translation type="vanished">Використовувати існуючу теку</translation> - </message> - <message> - <source>Revision:</source> - <translation type="vanished">Ревізія:</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::CloneWizard</name> <message> <source>Cloning</source> <translation type="vanished">Клонування</translation> @@ -677,26 +635,13 @@ Local commits are not pushed to the master branch until a normal commit is perfo <translation type="vanished">Клонування почалось...</translation> </message> <message> - <source>Clones a Bazaar branch and tries to load the contained project.</source> - <translation type="vanished">Клонує гілку Bazaar та намагається завантажити з нього проект.</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::CloneWizardPage</name> - <message> <source>Location</source> <translation type="vanished">Розташування</translation> </message> -</context> -<context> - <name>Bazaar::Internal::CommitEditor</name> <message> <source>Commit Editor</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Bazaar::Internal::OptionsPage</name> <message> <source>Form</source> <translation>Форма</translation> @@ -755,14 +700,14 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Команда Bazaar</translation> </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation>Діалог</translation> @@ -804,10 +749,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <translation type="unfinished"></translation> </message> <message> - <source>Revision:</source> - <translation>Ревізія:</translation> - </message> - <message> <source>Local</source> <translation>Локально</translation> </message> @@ -854,7 +795,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation type="unfinished"></translation> @@ -863,10 +804,6 @@ Local pulls are not applied to the master branch.</source> <source>Specify a revision other than the default?</source> <translation>Вказати ревізію відмінну від типової?</translation> </message> - <message> - <source>Revision:</source> - <translation>Ревізія:</translation> - </message> </context> <context> <name>BookmarkDialog</name> @@ -40474,7 +40411,7 @@ Please close all running instances of your application before starting a build.< <name>QbsProjectManager</name> </context> <context> - <name>Bazaar::Internal::UnCommitDialog</name> + <name>Bazaar</name> <message> <source>Uncommit</source> <translation type="unfinished"></translation> @@ -42937,7 +42874,7 @@ Install an SDK of at least API version %1.</source> </message> </context> <context> - <name>Bazaar::Internal::CloneWizardFactory</name> + <name>Bazaar</name> <message> <source>Clones a Bazaar branch and tries to load the contained project.</source> <translation type="vanished">Клонує гілку Bazaar та намагається завантажити з нього проект.</translation> @@ -48080,7 +48017,7 @@ Affected are breakpoints %1</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarEditorWidget</name> + <name>Bazaar</name> <message> <source>&Annotate %1</source> <translation type="unfinished"></translation> diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index fb57f81364..f2d66998f9 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -30480,7 +30480,7 @@ Please check the directory's access rights.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>概要信息</translation> @@ -30521,13 +30521,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <translation>本地提交到一个受限的分支. 直到一次正常提交之前，本地提交不会被推送到master分支。</translation> </message> -</context> -<context> - <name>Bazaar::Internal::CloneOptionsPanel</name> - <message> - <source>Options</source> - <translation>选项</translation> - </message> <message> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed</source> @@ -30535,10 +30528,6 @@ This flag will allow branch to proceed</source> 那么分支将被执行</translation> </message> <message> - <source>Use existing directory</source> - <translation>使用存在的目录</translation> - </message> - <message> <source>Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations</source> <translation type="obsolete">创建一个stacked分支来指向源分支. @@ -30585,10 +30574,6 @@ The new branch will depend on the availability of the source branch for all oper <translation>无工作树</translation> </message> <message> - <source>Revision:</source> - <translation>修订版本:</translation> - </message> - <message> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed.</source> <translation>默认情况下，如果目标目录存在但还没有控制目录则branch将会失败。 @@ -30618,7 +30603,7 @@ The new branch will depend on the availability of the source branch for all oper </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Form</source> <translation>界面</translation> @@ -30676,16 +30661,12 @@ The new branch will depend on the availability of the source branch for all oper <translation>提交时弹出提示</translation> </message> <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> - <message> <source>The number of recent commit logs to show. Choose 0 to see all entries.</source> <translation>要显示的最近提交日志的数目，选择 0 查看所有内容。</translation> </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation>对话框</translation> @@ -30796,7 +30777,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>还原</translation> @@ -30805,10 +30786,6 @@ Local pulls are not applied to the master branch.</source> <source>Specify a revision other than the default?</source> <translation>指定一个修订版本而不使用默认版本?</translation> </message> - <message> - <source>Revision:</source> - <translation>修订版本:</translation> - </message> </context> <context> <name>Core::Internal::ExternalToolConfig</name> @@ -32516,14 +32493,14 @@ Specifies how backspace interacts with indentation. </message> </context> <context> - <name>Bazaar::Internal::BazaarControl</name> + <name>Bazaar</name> <message> <source>Bazaar</source> <translation>Bazaar</translation> </message> </context> <context> - <name>Bazaar::Internal::BazaarEditor</name> + <name>Bazaar</name> <message> <source>Annotate %1</source> <translation>注释 "%1" </translation> @@ -32534,11 +32511,7 @@ Specifies how backspace interacts with indentation. </message> </context> <context> - <name>Bazaar::Internal::BazaarPlugin</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> + <name>Bazaar</name> <message> <source>Annotate Current File</source> <translation>Annotate 当前文件</translation> @@ -32721,7 +32694,7 @@ Specifies how backspace interacts with indentation. </message> </context> <context> - <name>Bazaar::Internal::CloneWizard</name> + <name>Bazaar</name> <message> <source>Clones a Bazaar branch and tries to load the contained project.</source> <translation>克隆一个Bazaar 分支并尝试载入其中的项目。</translation> @@ -32732,7 +32705,7 @@ Specifies how backspace interacts with indentation. </message> </context> <context> - <name>Bazaar::Internal::CloneWizardPage</name> + <name>Bazaar</name> <message> <source>Location</source> <translation>位置</translation> @@ -32747,14 +32720,14 @@ Specifies how backspace interacts with indentation. </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>提交编辑器</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Bazaar 命令</translation> @@ -36867,7 +36840,7 @@ With cache simulation, further event counters are enabled: </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffParameterWidget</name> + <name>Bazaar</name> <message> <source>Ignore whitespace</source> <translation>忽略空白</translation> @@ -40761,7 +40734,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi </message> </context> <context> - <name>Bazaar::Internal::BazaarLogParameterWidget</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>详细</translation> diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 4350c085a2..7b5c22de03 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -18338,7 +18338,7 @@ Please check the directory's access rights.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarCommitPanel</name> + <name>Bazaar</name> <message> <source>General Information</source> <translation>一般資訊</translation> @@ -18375,15 +18375,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo </message> </context> <context> - <name>Bazaar::Internal::CloneOptionsPanel</name> - <message> - <source>Options</source> - <translation>選項</translation> - </message> - <message> - <source>Use existing directory</source> - <translation>使用現有的目錄</translation> - </message> + <name>Bazaar</name> <message> <source>Stacked</source> <translation>已堆疊</translation> @@ -18409,10 +18401,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo <translation>沒有工作樹</translation> </message> <message> - <source>Revision:</source> - <translation>版本：</translation> - </message> - <message> <source>By default, branch will fail if the target directory exists, but does not already have a control directory. This flag will allow branch to proceed.</source> <translation>預設情況下，如果目標資料夾存在，但裡面沒有控制目錄，則分支將會失敗。 @@ -18442,7 +18430,7 @@ The new branch will depend on the availability of the source branch for all oper </message> </context> <context> - <name>Bazaar::Internal::OptionsPage</name> + <name>Bazaar</name> <message> <source>Form</source> <translation>表單</translation> @@ -18496,16 +18484,12 @@ The new branch will depend on the availability of the source branch for all oper <translation>提交時彈出提示</translation> </message> <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> - <message> <source>The number of recent commit logs to show. Choose 0 to see all entries.</source> <translation>要顯示的最近提交的紀錄數。選擇 0 表示看全部的紀錄。</translation> </message> </context> <context> - <name>Bazaar::Internal::PullOrPushDialog</name> + <name>Bazaar</name> <message> <source>Dialog</source> <translation>對話框</translation> @@ -18547,10 +18531,6 @@ The new branch will depend on the availability of the source branch for all oper <translation>建立前置字串</translation> </message> <message> - <source>Revision:</source> - <translation>版本：</translation> - </message> - <message> <source>Local</source> <translation>本地</translation> </message> @@ -18589,7 +18569,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::RevertDialog</name> + <name>Bazaar</name> <message> <source>Revert</source> <translation>還原</translation> @@ -19244,14 +19224,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::BazaarControl</name> - <message> - <source>Bazaar</source> - <translation>Bazaar</translation> - </message> -</context> -<context> - <name>Bazaar::Internal::BazaarEditor</name> + <name>Bazaar</name> <message> <source>Annotate %1</source> <translation>最後註記 %1</translation> @@ -19260,9 +19233,6 @@ Local pulls are not applied to the master branch.</source> <source>Annotate parent revision %1</source> <translation>父版本 %1 最後註記</translation> </message> -</context> -<context> - <name>Bazaar::Internal::BazaarPlugin</name> <message> <source>Bazaar</source> <translation>Bazaar</translation> @@ -19445,7 +19415,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::CloneWizard</name> + <name>Bazaar</name> <message> <source>Clones a Bazaar branch and tries to load the contained project.</source> <translation>複製一個 Bazaar 分支，並試著載入裡面包含的專案。</translation> @@ -19456,7 +19426,7 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::CloneWizardPage</name> + <name>Bazaar</name> <message> <source>Location</source> <translation>位置</translation> @@ -19471,14 +19441,14 @@ Local pulls are not applied to the master branch.</source> </message> </context> <context> - <name>Bazaar::Internal::CommitEditor</name> + <name>Bazaar</name> <message> <source>Commit Editor</source> <translation>提交編輯器</translation> </message> </context> <context> - <name>Bazaar::Internal::OptionsPageWidget</name> + <name>Bazaar</name> <message> <source>Bazaar Command</source> <translation>Bazaar 指令</translation> @@ -22726,7 +22696,7 @@ With cache simulation, further event counters are enabled: </message> </context> <context> - <name>Bazaar::Internal::BazaarDiffParameterWidget</name> + <name>Bazaar</name> <message> <source>Ignore whitespace</source> <translation>忽略空白</translation> @@ -25327,7 +25297,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi </message> </context> <context> - <name>Bazaar::Internal::BazaarLogParameterWidget</name> + <name>Bazaar</name> <message> <source>Verbose</source> <translation>詳細</translation> diff --git a/src/plugins/bazaar/annotationhighlighter.cpp b/src/plugins/bazaar/annotationhighlighter.cpp index 9b0276e703..07efdce313 100644 --- a/src/plugins/bazaar/annotationhighlighter.cpp +++ b/src/plugins/bazaar/annotationhighlighter.cpp @@ -6,8 +6,7 @@ #include <QRegularExpression> -using namespace Bazaar::Internal; -using namespace Bazaar; +namespace Bazaar::Internal { BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const ChangeNumbers &changeNumbers, QTextDocument *document) @@ -22,3 +21,5 @@ QString BazaarAnnotationHighlighter::changeNumber(const QString &block) const return match.captured(1); return QString(); } + +} // Bazaar::Internal diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h index 9e0fc55572..8b9417eb59 100644 --- a/src/plugins/bazaar/annotationhighlighter.h +++ b/src/plugins/bazaar/annotationhighlighter.h @@ -4,10 +4,10 @@ #pragma once #include <vcsbase/baseannotationhighlighter.h> + #include <QRegularExpression> -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { class BazaarAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { @@ -20,5 +20,4 @@ private: const QRegularExpression m_changeset; }; -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp index c1a26ee3bf..8b9baf0ff9 100644 --- a/src/plugins/bazaar/bazaarclient.cpp +++ b/src/plugins/bazaar/bazaarclient.cpp @@ -2,6 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "bazaarclient.h" + +#include "bazaarsettings.h" +#include "bazaartr.h" #include "constants.h" #include <vcsbase/vcsbaseplugin.h> @@ -20,20 +23,18 @@ using namespace Utils; using namespace VcsBase; -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { // Parameter widget controlling whitespace diff mode, associated with a parameter class BazaarDiffConfig : public VcsBaseEditorConfig { - Q_OBJECT public: BazaarDiffConfig(BazaarSettings &settings, QToolBar *toolBar) : VcsBaseEditorConfig(toolBar) { - mapSetting(addToggleButton("-w", tr("Ignore Whitespace")), + mapSetting(addToggleButton("-w", Tr::tr("Ignore Whitespace")), &settings.diffIgnoreWhiteSpace); - mapSetting(addToggleButton("-B", tr("Ignore Blank Lines")), + mapSetting(addToggleButton("-B", Tr::tr("Ignore Blank Lines")), &settings.diffIgnoreBlankLines); } @@ -52,28 +53,27 @@ public: class BazaarLogConfig : public VcsBaseEditorConfig { - Q_OBJECT public: BazaarLogConfig(BazaarSettings &settings, QToolBar *toolBar) : VcsBaseEditorConfig(toolBar) { - mapSetting(addToggleButton("--verbose", tr("Verbose"), - tr("Show files changed in each revision.")), + mapSetting(addToggleButton("--verbose", Tr::tr("Verbose"), + Tr::tr("Show files changed in each revision.")), &settings.logVerbose); - mapSetting(addToggleButton("--forward", tr("Forward"), - tr("Show from oldest to newest.")), + mapSetting(addToggleButton("--forward", Tr::tr("Forward"), + Tr::tr("Show from oldest to newest.")), &settings.logForward); - mapSetting(addToggleButton("--include-merges", tr("Include Merges"), - tr("Show merged revisions.")), + mapSetting(addToggleButton("--include-merges", Tr::tr("Include Merges"), + Tr::tr("Show merged revisions.")), &settings.logIncludeMerges); const QList<ChoiceItem> logChoices = { - {tr("Detailed"), "long"}, - {tr("Moderately Short"), "short"}, - {tr("One Line"), "line"}, - {tr("GNU Change Log"), "gnu-changelog"} + {Tr::tr("Detailed"), "long"}, + {Tr::tr("Moderately Short"), "short"}, + {Tr::tr("One Line"), "line"}, + {Tr::tr("GNU Change Log"), "gnu-changelog"} }; - mapSetting(addChoices(tr("Format"), { "--log-format=%1" }, logChoices), + mapSetting(addChoices(Tr::tr("Format"), { "--log-format=%1" }, logChoices), &settings.logFormat); } }; @@ -267,7 +267,4 @@ BazaarClient::StatusItem BazaarClient::parseStatusLine(const QString &line) cons return item; } -} // namespace Internal -} // namespace Bazaar - -#include "bazaarclient.moc" +} // namespace Bazaar::Internal diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h index afee03622c..c59ca79bed 100644 --- a/src/plugins/bazaar/bazaarclient.h +++ b/src/plugins/bazaar/bazaarclient.h @@ -3,19 +3,16 @@ #pragma once -#include "bazaarsettings.h" #include "branchinfo.h" + #include <vcsbase/vcsbaseclient.h> -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { class BazaarSettings; class BazaarClient : public VcsBase::VcsBaseClient { - Q_OBJECT - public: explicit BazaarClient(BazaarSettings *settings); @@ -44,5 +41,4 @@ private: friend class CloneWizard; }; -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaarcommitwidget.cpp b/src/plugins/bazaar/bazaarcommitwidget.cpp index f5c8fde6ef..0dc694fc8b 100644 --- a/src/plugins/bazaar/bazaarcommitwidget.cpp +++ b/src/plugins/bazaar/bazaarcommitwidget.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "bazaarcommitwidget.h" + +#include "bazaartr.h" #include "branchinfo.h" #include <texteditor/texteditorsettings.h> @@ -11,7 +13,6 @@ #include <utils/layoutbuilder.h> #include <utils/qtcassert.h> -#include <QCoreApplication> #include <QCheckBox> #include <QDebug> #include <QLineEdit> @@ -23,8 +24,7 @@ //TODO Check to see when the Highlighter has been moved to a base class and use that instead -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { // Retrieve the comment char format from the text editor. static QTextCharFormat commentFormat() @@ -34,18 +34,16 @@ static QTextCharFormat commentFormat() class BazaarCommitPanel : public QWidget { - Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::BazaarCommitPanel) - public: BazaarCommitPanel() { branchLineEdit = new QLineEdit; branchLineEdit->setReadOnly(true); - isLocalCheckBox = new QCheckBox(tr("Local commit")); - isLocalCheckBox->setToolTip(tr("Performs a local commit in a bound branch.\n" - "Local commits are not pushed to the master " - "branch until a normal commit is performed.")); + isLocalCheckBox = new QCheckBox(Tr::tr("Local commit")); + isLocalCheckBox->setToolTip(Tr::tr("Performs a local commit in a bound branch.\n" + "Local commits are not pushed to the master " + "branch until a normal commit is performed.")); authorLineEdit = new QLineEdit; emailLineEdit = new QLineEdit; @@ -54,19 +52,22 @@ public: using namespace Utils::Layouting; Column { Group { - title(tr("General Information")), + title(Tr::tr("General Information")), Form { - tr("Branch:"), branchLineEdit, br, + Tr::tr("Branch:"), branchLineEdit, br, empty, isLocalCheckBox } }, Group { - title(tr("Commit Information")), - Form { - tr("Author:"), authorLineEdit, br, - tr("Email:"), emailLineEdit, br, - tr("Fixed bugs:"), fixedBugsLineEdit - }, + title(Tr::tr("Commit Information")), + Row { + Form { + Tr::tr("Author:"), authorLineEdit, br, + Tr::tr("Email:"), emailLineEdit, br, + Tr::tr("Fixed bugs:"), fixedBugsLineEdit + }, + st + } } }.attachTo(this, WithoutMargins); } @@ -181,5 +182,4 @@ bool BazaarCommitWidget::isLocalOptionEnabled() const return m_bazaarCommitPanel->isLocalCheckBox->isChecked(); } -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaareditor.cpp b/src/plugins/bazaar/bazaareditor.cpp index 91215cad8c..5498e41074 100644 --- a/src/plugins/bazaar/bazaareditor.cpp +++ b/src/plugins/bazaar/bazaareditor.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "bazaareditor.h" + #include "annotationhighlighter.h" +#include "bazaartr.h" #include "constants.h" #include <utils/qtcassert.h> @@ -12,15 +14,14 @@ #define BZR_CHANGE_PATTERN "[0-9]+" -using namespace Bazaar::Internal; -using namespace Bazaar; +namespace Bazaar::Internal { BazaarEditorWidget::BazaarEditorWidget() : m_changesetId(QLatin1String(Constants::CHANGESET_ID)), m_exactChangesetId(QLatin1String(Constants::CHANGESET_ID_EXACT)) { - setAnnotateRevisionTextFormat(tr("&Annotate %1")); - setAnnotatePreviousRevisionTextFormat(tr("Annotate &parent revision %1")); + setAnnotateRevisionTextFormat(Tr::tr("&Annotate %1")); + setAnnotatePreviousRevisionTextFormat(Tr::tr("Annotate &parent revision %1")); // Diff format: // === <change> <file|dir> 'mainwindow.cpp' setDiffFilePattern("^=== [a-z]+ [a-z]+ '(.+)'\\s*"); @@ -62,3 +63,5 @@ VcsBase::BaseAnnotationHighlighter *BazaarEditorWidget::createAnnotationHighligh { return new BazaarAnnotationHighlighter(changes); } + +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaareditor.h b/src/plugins/bazaar/bazaareditor.h index 0606e101df..91ca8b16c3 100644 --- a/src/plugins/bazaar/bazaareditor.h +++ b/src/plugins/bazaar/bazaareditor.h @@ -7,13 +7,10 @@ #include <QRegularExpression> -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { class BazaarEditorWidget : public VcsBase::VcsBaseEditorWidget { - Q_OBJECT - public: BazaarEditorWidget(); @@ -26,5 +23,4 @@ private: const QRegularExpression m_exactChangesetId; }; -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 60b4377378..87db4074fb 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -7,6 +7,7 @@ #include "bazaarcommitwidget.h" #include "bazaareditor.h" #include "bazaarsettings.h" +#include "bazaartr.h" #include "commiteditor.h" #include "constants.h" #include "pullorpushdialog.h" @@ -59,8 +60,7 @@ using namespace Utils; using namespace VcsBase; using namespace std::placeholders; -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { // Submit editor parameters const char COMMIT_ID[] = "Bazaar Commit Log Editor"; @@ -121,15 +121,13 @@ const VcsBaseSubmitEditorParameters submitEditorParameters { class RevertDialog : public QDialog { - Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::RevertDialog) - public: RevertDialog() : QDialog(ICore::dialogParent()) { resize(400, 162); - setWindowTitle(tr("Revert")); + setWindowTitle(Tr::tr("Revert")); - auto groupBox = new QGroupBox(tr("Specify a revision other than the default?")); + auto groupBox = new QGroupBox(Tr::tr("Specify a revision other than the default?")); groupBox->setCheckable(true); groupBox->setChecked(false); @@ -139,7 +137,7 @@ public: using namespace Layouting; Form { - tr("Revision:"), revisionLineEdit + Tr::tr("Revision:"), revisionLineEdit }.attachTo(groupBox); Column { @@ -156,8 +154,6 @@ public: class BazaarPluginPrivate final : public VcsBasePluginPrivate { - Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::BazaarPlugin) - public: BazaarPluginPrivate(); @@ -269,29 +265,27 @@ public: class UnCommitDialog : public QDialog { - Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::UnCommitDialog) - public: explicit UnCommitDialog(BazaarPluginPrivate *plugin) : QDialog(ICore::dialogParent()) { resize(412, 124); - setWindowTitle(tr("Uncommit")); + setWindowTitle(Tr::tr("Uncommit")); - keepTagsCheckBox = new QCheckBox(tr("Keep tags that point to removed revisions")); + keepTagsCheckBox = new QCheckBox(Tr::tr("Keep tags that point to removed revisions")); - localCheckBox = new QCheckBox(tr("Only remove the commits from the local branch when in a checkout")); + localCheckBox = new QCheckBox(Tr::tr("Only remove the commits from the local branch when in a checkout")); revisionLineEdit = new QLineEdit(this); - revisionLineEdit->setToolTip(tr("If a revision is specified, uncommits revisions to leave " + revisionLineEdit->setToolTip(Tr::tr("If a revision is specified, uncommits revisions to leave " "the branch at the specified revision.\n" "For example, \"Revision: 15\" will leave the branch at revision 15.")); - revisionLineEdit->setPlaceholderText(tr("Last committed")); + revisionLineEdit->setPlaceholderText(Tr::tr("Last committed")); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); - auto dryRunBtn = new QPushButton(tr("Dry Run")); - dryRunBtn->setToolTip(tr("Test the outcome of removing the last committed revision, without actually removing anything.")); + auto dryRunBtn = new QPushButton(Tr::tr("Dry Run")); + dryRunBtn->setToolTip(Tr::tr("Test the outcome of removing the last committed revision, without actually removing anything.")); buttonBox->addButton(dryRunBtn, QDialogButtonBox::ApplyRole); using namespace Utils::Layouting; @@ -299,7 +293,7 @@ public: Form { keepTagsCheckBox, br, localCheckBox, br, - tr("Revision:"), revisionLineEdit, br, + Tr::tr("Revision:"), revisionLineEdit, br, }, st, buttonBox, @@ -364,12 +358,12 @@ BazaarPluginPrivate::BazaarPluginPrivate() const QString prefix = QLatin1String("bzr"); m_commandLocator = new CommandLocator("Bazaar", prefix, prefix, this); - m_commandLocator->setDescription(tr("Triggers a Bazaar version control operation.")); + m_commandLocator->setDescription(Tr::tr("Triggers a Bazaar version control operation.")); // Create menu item for Bazaar m_bazaarContainer = ActionManager::createMenu("Bazaar.BazaarMenu"); QMenu *menu = m_bazaarContainer->menu(); - menu->setTitle(tr("Bazaar")); + menu->setTitle(Tr::tr("Bazaar")); createFileActions(context); m_bazaarContainer->addSeparator(context); @@ -388,54 +382,54 @@ BazaarPluginPrivate::BazaarPluginPrivate() void BazaarPluginPrivate::createFileActions(const Context &context) { - m_annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); + m_annotateFile = new ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); Command *command = ActionManager::registerAction(m_annotateFile, ANNOTATE, context); command->setAttribute(Command::CA_UpdateText); connect(m_annotateFile, &QAction::triggered, this, &BazaarPluginPrivate::annotateCurrentFile); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - m_diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); + m_diffFile = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_diffFile, DIFF, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+Z,Meta+D") : tr("ALT+Z,Alt+D"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+Z,Meta+D") : Tr::tr("ALT+Z,Alt+D"))); connect(m_diffFile, &QAction::triggered, this, &BazaarPluginPrivate::diffCurrentFile); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - m_logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this); + m_logFile = new ParameterAction(Tr::tr("Log Current File"), Tr::tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_logFile, LOG, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+Z,Meta+L") : tr("ALT+Z,Alt+L"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+Z,Meta+L") : Tr::tr("ALT+Z,Alt+L"))); connect(m_logFile, &QAction::triggered, this, &BazaarPluginPrivate::logCurrentFile); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - m_statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this); + m_statusFile = new ParameterAction(Tr::tr("Status Current File"), Tr::tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_statusFile, STATUS, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+Z,Meta+S") : tr("ALT+Z,Alt+S"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+Z,Meta+S") : Tr::tr("ALT+Z,Alt+S"))); connect(m_statusFile, &QAction::triggered, this, &BazaarPluginPrivate::statusCurrentFile); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); m_bazaarContainer->addSeparator(context); - m_addAction = new ParameterAction(tr("Add"), tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this); + m_addAction = new ParameterAction(Tr::tr("Add"), Tr::tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_addAction, ADD, context); command->setAttribute(Command::CA_UpdateText); connect(m_addAction, &QAction::triggered, this, &BazaarPluginPrivate::addCurrentFile); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - m_deleteAction = new ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this); + m_deleteAction = new ParameterAction(Tr::tr("Delete..."), Tr::tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_deleteAction, DELETE, context); command->setAttribute(Command::CA_UpdateText); connect(m_deleteAction, &QAction::triggered, this, &BazaarPluginPrivate::promptToDeleteCurrentFile); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - m_revertFile = new ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); + m_revertFile = new ParameterAction(Tr::tr("Revert Current File..."), Tr::tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_revertFile, REVERT, context); command->setAttribute(Command::CA_UpdateText); connect(m_revertFile, &QAction::triggered, this, &BazaarPluginPrivate::revertCurrentFile); @@ -494,28 +488,28 @@ void BazaarPluginPrivate::statusCurrentFile() void BazaarPluginPrivate::createDirectoryActions(const Context &context) { - auto action = new QAction(tr("Diff"), this); + auto action = new QAction(Tr::tr("Diff"), this); m_repositoryActionList.append(action); Command *command = ActionManager::registerAction(action, DIFFMULTI, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::diffRepository); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Log"), this); + action = new QAction(Tr::tr("Log"), this); m_repositoryActionList.append(action); command = ActionManager::registerAction(action, LOGMULTI, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::logRepository); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Revert..."), this); + action = new QAction(Tr::tr("Revert..."), this); m_repositoryActionList.append(action); command = ActionManager::registerAction(action, REVERTMULTI, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::revertAll); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Status"), this); + action = new QAction(Tr::tr("Status"), this); m_repositoryActionList.append(action); command = ActionManager::registerAction(action, STATUSMULTI, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::statusMulti); @@ -559,43 +553,43 @@ void BazaarPluginPrivate::statusMulti() void BazaarPluginPrivate::createRepositoryActions(const Context &context) { - auto action = new QAction(tr("Pull..."), this); + auto action = new QAction(Tr::tr("Pull..."), this); m_repositoryActionList.append(action); Command *command = ActionManager::registerAction(action, PULL, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::pull); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Push..."), this); + action = new QAction(Tr::tr("Push..."), this); m_repositoryActionList.append(action); command = ActionManager::registerAction(action, PUSH, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::push); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Update..."), this); + action = new QAction(Tr::tr("Update..."), this); m_repositoryActionList.append(action); command = ActionManager::registerAction(action, UPDATE, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::update); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Commit..."), this); + action = new QAction(Tr::tr("Commit..."), this); m_repositoryActionList.append(action); command = ActionManager::registerAction(action, COMMIT, context); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+Z,Meta+C") : tr("ALT+Z,Alt+C"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+Z,Meta+C") : Tr::tr("ALT+Z,Alt+C"))); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::commit); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Uncommit..."), this); + action = new QAction(Tr::tr("Uncommit..."), this); m_repositoryActionList.append(action); command = ActionManager::registerAction(action, UNCOMMIT, context); connect(action, &QAction::triggered, this, &BazaarPluginPrivate::uncommit); m_bazaarContainer->addAction(command); m_commandLocator->appendCommand(command); - auto createRepositoryAction = new QAction(tr("Create Repository..."), this); + auto createRepositoryAction = new QAction(Tr::tr("Create Repository..."), this); command = ActionManager::registerAction(createRepositoryAction, CREATE_REPOSITORY, context); connect(createRepositoryAction, &QAction::triggered, this, &BazaarPluginPrivate::createRepository); m_bazaarContainer->addAction(command); @@ -649,7 +643,7 @@ void BazaarPluginPrivate::update() QTC_ASSERT(state.hasTopLevel(), return); RevertDialog dialog; - dialog.setWindowTitle(tr("Update")); + dialog.setWindowTitle(Tr::tr("Update")); if (dialog.exec() != QDialog::Accepted) return; m_client.update(state.topLevel(), dialog.revisionLineEdit->text()); @@ -681,7 +675,7 @@ void BazaarPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusItem this, &BazaarPluginPrivate::showCommitWidget); if (status.isEmpty()) { - VcsOutputWindow::appendError(tr("There are no changes to commit.")); + VcsOutputWindow::appendError(Tr::tr("There are no changes to commit.")); return; } @@ -696,14 +690,14 @@ void BazaarPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusItem IEditor *editor = EditorManager::openEditor(saver.filePath(), COMMIT_ID); if (!editor) { - VcsOutputWindow::appendError(tr("Unable to create an editor for the commit.")); + VcsOutputWindow::appendError(Tr::tr("Unable to create an editor for the commit.")); return; } auto commitEditor = qobject_cast<CommitEditor *>(editor); if (!commitEditor) { - VcsOutputWindow::appendError(tr("Unable to create a commit editor.")); + VcsOutputWindow::appendError(Tr::tr("Unable to create a commit editor.")); return; } setSubmitEditor(commitEditor); @@ -712,7 +706,7 @@ void BazaarPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusItem this, &BazaarPluginPrivate::diffFromEditorSelected); commitEditor->setCheckScriptWorkingDirectory(m_submitRepository); - const QString msg = tr("Commit changes for \"%1\".").arg(m_submitRepository.toUserOutput()); + const QString msg = Tr::tr("Commit changes for \"%1\".").arg(m_submitRepository.toUserOutput()); commitEditor->document()->setPreferredDisplayName(msg); const BranchInfo branch = m_client.synchronousBranchQuery(m_submitRepository); @@ -876,7 +870,7 @@ void BazaarPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) QString BazaarPluginPrivate::displayName() const { - return tr("Bazaar"); + return Tr::tr("Bazaar"); } Utils::Id BazaarPluginPrivate::id() const @@ -992,5 +986,4 @@ void BazaarPluginPrivate::changed(const QVariant &v) } } -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaarplugin.h b/src/plugins/bazaar/bazaarplugin.h index 04f2a964d9..4086fee264 100644 --- a/src/plugins/bazaar/bazaarplugin.h +++ b/src/plugins/bazaar/bazaarplugin.h @@ -5,8 +5,7 @@ #include <extensionsystem/iplugin.h> -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { class BazaarPlugin final : public ExtensionSystem::IPlugin { @@ -29,5 +28,4 @@ private: class BazaarPluginPrivate *d = nullptr; }; -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaarsettings.cpp b/src/plugins/bazaar/bazaarsettings.cpp index d632e5883c..1f56a27aa1 100644 --- a/src/plugins/bazaar/bazaarsettings.cpp +++ b/src/plugins/bazaar/bazaarsettings.cpp @@ -3,7 +3,7 @@ #include "bazaarsettings.h" -#include "bazaarclient.h" +#include "bazaartr.h" #include "constants.h" #include <coreplugin/icore.h> @@ -14,8 +14,7 @@ using namespace Utils; -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { BazaarSettings::BazaarSettings() { @@ -26,9 +25,9 @@ BazaarSettings::BazaarSettings() binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay); binaryPath.setExpectedKind(PathChooser::ExistingCommand); binaryPath.setDefaultValue(Constants::BAZAARDEFAULT); - binaryPath.setDisplayName(tr("Bazaar Command")); + binaryPath.setDisplayName(Tr::tr("Bazaar Command")); binaryPath.setHistoryCompleter("Bazaar.Command.History"); - binaryPath.setLabelText(tr("Command:")); + binaryPath.setLabelText(Tr::tr("Command:")); registerAspect(&diffIgnoreWhiteSpace); diffIgnoreWhiteSpace.setSettingsKey("diffIgnoreWhiteSpace"); @@ -52,21 +51,21 @@ BazaarSettings::BazaarSettings() registerAspect(&userName); userName.setDisplayStyle(StringAspect::LineEditDisplay); - userName.setLabelText(tr("Default username:")); - userName.setToolTip(tr("Username to use by default on commit.")); + userName.setLabelText(Tr::tr("Default username:")); + userName.setToolTip(Tr::tr("Username to use by default on commit.")); registerAspect(&userEmail); userEmail.setDisplayStyle(StringAspect::LineEditDisplay); - userEmail.setLabelText(tr("Default email:")); - userEmail.setToolTip(tr("Email to use by default on commit.")); + userEmail.setLabelText(Tr::tr("Default email:")); + userEmail.setToolTip(Tr::tr("Email to use by default on commit.")); registerAspect(&logCount); - logCount.setLabelText(tr("Log count:")); - logCount.setToolTip(tr("The number of recent commit logs to show. Choose 0 to see all entries.")); + logCount.setLabelText(Tr::tr("Log count:")); + logCount.setToolTip(Tr::tr("The number of recent commit logs to show. Choose 0 to see all entries.")); registerAspect(&logCount); - timeout.setLabelText(tr("Timeout:")); - timeout.setSuffix(tr("s")); + timeout.setLabelText(Tr::tr("Timeout:")); + timeout.setSuffix(Tr::tr("s")); } // BazaarSettingsPage @@ -74,7 +73,7 @@ BazaarSettings::BazaarSettings() BazaarSettingsPage::BazaarSettingsPage(BazaarSettings *settings) { setId(VcsBase::Constants::VCS_ID_BAZAAR); - setDisplayName(BazaarSettings::tr("Bazaar")); + setDisplayName(Tr::tr("Bazaar")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); setSettings(settings); @@ -84,12 +83,12 @@ BazaarSettingsPage::BazaarSettingsPage(BazaarSettings *settings) Column { Group { - title(BazaarSettings::tr("Configuration")), + title(Tr::tr("Configuration")), Row { s.binaryPath } }, Group { - title(BazaarSettings::tr("User")), + title(Tr::tr("User")), Form { s.userName, s.userEmail @@ -97,7 +96,7 @@ BazaarSettingsPage::BazaarSettingsPage(BazaarSettings *settings) }, Group { - title(BazaarSettings::tr("Miscellaneous")), + title(Tr::tr("Miscellaneous")), Row { s.logCount, s.timeout, @@ -109,5 +108,4 @@ BazaarSettingsPage::BazaarSettingsPage(BazaarSettings *settings) }); } -} // Internal -} // Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/bazaarsettings.h b/src/plugins/bazaar/bazaarsettings.h index 563014fd69..f3ce5b249c 100644 --- a/src/plugins/bazaar/bazaarsettings.h +++ b/src/plugins/bazaar/bazaarsettings.h @@ -7,13 +7,10 @@ #include <vcsbase/vcsbaseclientsettings.h> -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { class BazaarSettings final : public VcsBase::VcsBaseSettings { - Q_DECLARE_TR_FUNCTIONS(Bazaar::Internal::BazaarSettings) - public: BazaarSettings(); @@ -31,5 +28,4 @@ public: explicit BazaarSettingsPage(BazaarSettings *settings); }; -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/branchinfo.cpp b/src/plugins/bazaar/branchinfo.cpp index 2d1bb4851b..cc0a55fc83 100644 --- a/src/plugins/bazaar/branchinfo.cpp +++ b/src/plugins/bazaar/branchinfo.cpp @@ -3,12 +3,10 @@ #include "branchinfo.h" -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { BranchInfo::BranchInfo(const QString &branchLoc, bool isBound) : branchLocation(branchLoc), isBoundToBranch(isBound) { } -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/branchinfo.h b/src/plugins/bazaar/branchinfo.h index 5c2c953435..30c37feef8 100644 --- a/src/plugins/bazaar/branchinfo.h +++ b/src/plugins/bazaar/branchinfo.h @@ -5,8 +5,7 @@ #include <QString> -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { class BranchInfo { @@ -16,5 +15,4 @@ public: const bool isBoundToBranch; }; -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/commiteditor.cpp b/src/plugins/bazaar/commiteditor.cpp index 13c75de82d..2ceb0b6c93 100644 --- a/src/plugins/bazaar/commiteditor.cpp +++ b/src/plugins/bazaar/commiteditor.cpp @@ -2,8 +2,10 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "commiteditor.h" -#include "branchinfo.h" + +#include "bazaartr.h" #include "bazaarcommitwidget.h" +#include "branchinfo.h" #include "constants.h" #include <coreplugin/idocument.h> @@ -11,12 +13,12 @@ #include <QDebug> -using namespace Bazaar::Internal; +namespace Bazaar::Internal { CommitEditor::CommitEditor() : VcsBase::VcsBaseSubmitEditor(new BazaarCommitWidget) { - document()->setPreferredDisplayName(tr("Commit Editor")); + document()->setPreferredDisplayName(Tr::tr("Commit Editor")); } BazaarCommitWidget *CommitEditor::commitWidget() @@ -36,9 +38,7 @@ void CommitEditor::setFields(const QString &repositoryRoot, m_fileModel = new VcsBase::SubmitFileModel(this); m_fileModel->setRepositoryRoot(repositoryRoot); - m_fileModel->setFileStatusQualifier([](const QString &status, const QVariant &) - -> VcsBase::SubmitFileModel::FileStatusHint - { + m_fileModel->setFileStatusQualifier([](const QString &status, const QVariant &) { if (status == QLatin1String(Constants::FSTATUS_CREATED)) return VcsBase::SubmitFileModel::FileAdded; if (status == QLatin1String(Constants::FSTATUS_MODIFIED)) @@ -55,3 +55,5 @@ void CommitEditor::setFields(const QString &repositoryRoot, m_fileModel->addFile(item.file, item.flags); setFileModel(m_fileModel); } + +} // Bazaar::Internal diff --git a/src/plugins/bazaar/commiteditor.h b/src/plugins/bazaar/commiteditor.h index f09c0f89ba..c2cc674171 100644 --- a/src/plugins/bazaar/commiteditor.h +++ b/src/plugins/bazaar/commiteditor.h @@ -8,8 +8,7 @@ namespace VcsBase { class SubmitFileModel; } -namespace Bazaar { -namespace Internal { +namespace Bazaar::Internal { class BranchInfo; class BazaarCommitWidget; @@ -31,5 +30,4 @@ private: VcsBase::SubmitFileModel *m_fileModel = nullptr; }; -} // namespace Internal -} // namespace Bazaar +} // Bazaar::Internal diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h index 7d8ef79715..4eac890153 100644 --- a/src/plugins/bazaar/constants.h +++ b/src/plugins/bazaar/constants.h @@ -5,8 +5,7 @@ #include <QtGlobal> -namespace Bazaar { -namespace Constants { +namespace Bazaar::Constants { const char BAZAAR[] = "bazaar"; const char BAZAARREPO[] = ".bzr"; @@ -41,5 +40,4 @@ const char FSTATUS_DELETED[] = "Deleted"; const char FSTATUS_MODIFIED[] = "Modified"; const char FSTATUS_RENAMED[] = "Renamed"; -} // namespace Constants -} // namespace Bazaar +} // Bazaar::Constants diff --git a/src/plugins/bazaar/pullorpushdialog.cpp b/src/plugins/bazaar/pullorpushdialog.cpp index 2713474248..3c18f2a5d6 100644 --- a/src/plugins/bazaar/pullorpushdialog.cpp +++ b/src/plugins/bazaar/pullorpushdialog.cpp @@ -3,10 +3,11 @@ #include "pullorpushdialog.h" +#include "bazaartr.h" + #include <utils/qtcassert.h> #include <utils/layoutbuilder.h> -#include <QApplication> #include <QCheckBox> #include <QDialogButtonBox> #include <QLabel> @@ -20,61 +21,61 @@ PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) { resize(477, 388); - setWindowTitle(tr("Dialog")); + setWindowTitle(Tr::tr("Dialog")); - m_defaultButton = new QRadioButton(tr("Default location")); + m_defaultButton = new QRadioButton(Tr::tr("Default location")); m_defaultButton->setChecked(true); - m_localButton = new QRadioButton(tr("Local filesystem:")); + m_localButton = new QRadioButton(Tr::tr("Local filesystem:")); m_localPathChooser = new Utils::PathChooser; m_localPathChooser->setEnabled(false); - auto urlButton = new QRadioButton(tr("Specify URL:")); - urlButton->setToolTip(tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.")); + auto urlButton = new QRadioButton(Tr::tr("Specify URL:")); + urlButton->setToolTip(Tr::tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.")); m_urlLineEdit = new QLineEdit; m_urlLineEdit->setEnabled(false); - m_urlLineEdit->setToolTip(tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.")); + m_urlLineEdit->setToolTip(Tr::tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.")); - m_rememberCheckBox = new QCheckBox(tr("Remember specified location as default")); + m_rememberCheckBox = new QCheckBox(Tr::tr("Remember specified location as default")); m_rememberCheckBox->setEnabled(false); - m_overwriteCheckBox = new QCheckBox(tr("Overwrite")); - m_overwriteCheckBox->setToolTip(tr("Ignores differences between branches and overwrites\n" + m_overwriteCheckBox = new QCheckBox(Tr::tr("Overwrite")); + m_overwriteCheckBox->setToolTip(Tr::tr("Ignores differences between branches and overwrites\n" "unconditionally.")); - m_useExistingDirCheckBox = new QCheckBox(tr("Use existing directory")); - m_useExistingDirCheckBox->setToolTip(tr("By default, push will fail if the target directory " + m_useExistingDirCheckBox = new QCheckBox(Tr::tr("Use existing directory")); + m_useExistingDirCheckBox->setToolTip(Tr::tr("By default, push will fail if the target directory " "exists, but does not already have a control directory.\n" "This flag will allow push to proceed.")); - m_createPrefixCheckBox = new QCheckBox(tr("Create prefix")); - m_createPrefixCheckBox->setToolTip(tr("Creates the path leading up to the branch " + m_createPrefixCheckBox = new QCheckBox(Tr::tr("Create prefix")); + m_createPrefixCheckBox->setToolTip(Tr::tr("Creates the path leading up to the branch " "if it does not already exist.")); m_revisionLineEdit = new QLineEdit; - m_localCheckBox = new QCheckBox(tr("Local")); - m_localCheckBox->setToolTip(tr("Performs a local pull in a bound branch.\n" + m_localCheckBox = new QCheckBox(Tr::tr("Local")); + m_localCheckBox->setToolTip(Tr::tr("Performs a local pull in a bound branch.\n" "Local pulls are not applied to the master branch.")); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); m_localPathChooser->setExpectedKind(Utils::PathChooser::Directory); if (m_mode == PullMode) { - setWindowTitle(tr("Pull Source")); + setWindowTitle(Tr::tr("Pull Source")); m_useExistingDirCheckBox->setVisible(false); m_createPrefixCheckBox->setVisible(false); } else { - setWindowTitle(tr("Push Destination")); + setWindowTitle(Tr::tr("Push Destination")); m_localCheckBox->setVisible(false); } using namespace Utils::Layouting; Column { Group { - title(tr("Branch Location")), + title(Tr::tr("Branch Location")), Form { m_defaultButton, br, m_localButton, m_localPathChooser, br, @@ -82,14 +83,14 @@ PullOrPushDialog::PullOrPushDialog(Mode mode, QWidget *parent) } }, Group { - title(tr("Options")), + title(Tr::tr("Options")), Column { m_rememberCheckBox, m_overwriteCheckBox, m_localCheckBox, m_useExistingDirCheckBox, m_createPrefixCheckBox, - Row { tr("Revision:"), m_revisionLineEdit }, + Row { Tr::tr("Revision:"), m_revisionLineEdit }, } }, buttonBox, @@ -152,5 +153,4 @@ bool PullOrPushDialog::isCreatePrefixOptionEnabled() const return m_createPrefixCheckBox->isChecked(); } - } // Bazaar::Internal diff --git a/src/plugins/bazaar/pullorpushdialog.h b/src/plugins/bazaar/pullorpushdialog.h index a385ff00f9..0d13ba1911 100644 --- a/src/plugins/bazaar/pullorpushdialog.h +++ b/src/plugins/bazaar/pullorpushdialog.h @@ -17,8 +17,6 @@ namespace Bazaar::Internal { class PullOrPushDialog : public QDialog { - Q_OBJECT - public: enum Mode { PullMode, |