diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index bbb94e99e15..8f0af7a495e 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é - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Obecné informace @@ -29279,21 +29279,13 @@ Místní zápisy nejsou odevzdány do hlavní větve, dokud není proveden norm - Bazaar::Internal::CloneOptionsPanel - - Options - Volby - + Bazaar 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. Ve výchozím nastavení se větvení (branch) nepodaří, pokud existuje cílový adresář, ale ještě nemá adresář na správu verzí. Toto nastavení dovolí za těchto okolností v operaci pokračovat. - - Use existing directory - Použít existující adresář - Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations. @@ -29340,10 +29332,6 @@ Nová větev bude ve všech operacích závislá na dostupnosti zdrojové větve No working-tree Bez pracovního stromu - - Revision: - Revize: - Creates a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations. @@ -29368,7 +29356,7 @@ Nová větev bude ve všech operacích závislá na dostupnosti zdrojové větve - Bazaar::Internal::OptionsPage + Bazaar Form Formulář @@ -29425,13 +29413,6 @@ Nová větev bude ve všech operacích závislá na dostupnosti zdrojové větve Prompt on submit Ptát se na potvrzení - - Bazaar - Bazaar - - - - Bazaar::Internal::PullOrPushDialog Dialog Dialog @@ -29492,10 +29473,6 @@ Toto nastavení dovolí za těchto okolností v operaci odvedení pokračovat.Create prefix Vytvořit předponu - - Revision: - Revize: - Perform a local pull in a bound branch. Local pulls are not applied to the master branch. @@ -29536,7 +29513,7 @@ Místní přivedení nejsou použita na hlavní větev. - Bazaar::Internal::RevertDialog + Bazaar Revert Vrátit @@ -29545,10 +29522,6 @@ Místní přivedení nejsou použita na hlavní větev. Specify a revision other than the default? Chcete jinou než výchozí revizi? - - Revision: - Revize: - ClassView::Internal::NavigationWidget @@ -33573,7 +33546,7 @@ Server: %2. - Bazaar::Internal::BazaarDiffParameterWidget + Bazaar Ignore whitespace Nevšímat si bílých znaků @@ -33590,16 +33563,6 @@ Server: %2. Ignore Blank Lines Nevšímat si prázdných řádků - - - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarEditor Annotate %1 Opatřit anotacemi %1 @@ -33608,9 +33571,6 @@ Server: %2. Annotate parent revision %1 Opatření anotacemi nadřazenou revizi "%1" - - - Bazaar::Internal::BazaarPlugin Bazaar Bazaar @@ -33798,7 +33758,7 @@ Server: %2. - Bazaar::Internal::CloneWizard + Bazaar Cloning Klonování @@ -33817,7 +33777,7 @@ Server: %2. - Bazaar::Internal::CloneWizardPage + Bazaar Location Umístění @@ -33832,14 +33792,14 @@ Server: %2. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor Editor zápisu (commit) - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Příkaz Bazaar @@ -42862,7 +42822,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. - Bazaar::Internal::BazaarLogParameterWidget + Bazaar Verbose Podrobný @@ -61726,7 +61686,7 @@ Projekty Qt Quick 2 UI není potřeba sestavovat a lze je spouštět přímo v p - Bazaar::Internal::UnCommitDialog + Bazaar Uncommit diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index bfc5444bfdd..dc3dac78466 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 - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Generel information @@ -3036,16 +3036,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.Fixed bugs: Rettede fejl: - - - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarDiffConfig Ignore Whitespace Ignorer blanktegn @@ -3054,9 +3044,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.Ignore Blank Lines Ignorer tomme linjer - - - Bazaar::Internal::BazaarEditorWidget &Annotate %1 &Annotate %1 @@ -3065,9 +3052,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.Annotate &parent revision %1 Annotate &forælder revision %1 - - - Bazaar::Internal::BazaarLogConfig Verbose Detaljeret @@ -3108,13 +3092,6 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres.GNU Change Log GNU-ændringslog - - - Bazaar::Internal::BazaarPlugin - - Bazaar - Bazaar - Annotate Current File Annotate aktuel fil @@ -3293,14 +3270,14 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor Commit-redigering - Bazaar::Internal::OptionsPage + Bazaar Configuration Konfiguration @@ -3355,14 +3332,14 @@ Lokale commits pushes ikke til master-grenen inden en normal commit udføres. - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Bazaar-kommando - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog Dialog @@ -3423,10 +3400,6 @@ Dette flag vil tillade push at fortsætte. Create prefix Opret præfiks - - Revision: - Revision: - Performs a local pull in a bound branch. Local pulls are not applied to the master branch. @@ -3445,9 +3418,6 @@ Lokale pulls anvendes ikke på master-grenen. Push Destination Push destination - - - Bazaar::Internal::RevertDialog Revert Tilbagefør @@ -3456,13 +3426,6 @@ Lokale pulls anvendes ikke på master-grenen. Specify a revision other than the default? Angiv en revision anden end den som er standard? - - Revision: - Revision: - - - - Bazaar::Internal::UnCommitDialog Uncommit Uncommit diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index e8120cca652..344dcf02957 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? - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Allgemeine Informationen @@ -13089,7 +13089,7 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e - Bazaar::Internal::OptionsPage + Bazaar Configuration Konfiguration @@ -13140,7 +13140,7 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog Dialog @@ -13169,10 +13169,6 @@ Lokale Commits werden nicht zum Master-Branch gepusht, bis ein normaler Commit e Create prefix Präfix erzeugen - - Revision: - Revision: - Local Lokale Variable @@ -13223,9 +13219,6 @@ Local pulls are not applied to the master branch. Führt eine lokale Pull-Operation in einem gebundenem Branch aus. Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt. - - - Bazaar::Internal::RevertDialog Revert Rückgängig machen @@ -13234,10 +13227,6 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt.Specify a revision other than the default? Möchten Sie eine Revision angeben? - - Revision: - Revision: - Core::Internal::ExternalToolConfig @@ -13390,11 +13379,7 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt. - Bazaar::Internal::BazaarPlugin - - Bazaar - Bazaar - + Bazaar Annotate Current File Annotation für Datei @@ -13545,14 +13530,14 @@ Lokale Pull-Operationen werden nicht auf den Master-Branch angewandt. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor Commit-Editor - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Bazaar-Kommando @@ -25919,7 +25904,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D - Bazaar::Internal::UnCommitDialog + Bazaar Uncommit Commit rückgängig machen @@ -28297,7 +28282,7 @@ Der vom Kit mindestens benötigte API-Level ist %1. - Bazaar::Internal::BazaarEditorWidget + Bazaar &Annotate %1 &Annotation für %1 @@ -37582,7 +37567,7 @@ Fehler: %5 - Bazaar::Internal::BazaarDiffConfig + Bazaar Ignore Whitespace Leerzeichen ignorieren @@ -37593,7 +37578,7 @@ Fehler: %5 - Bazaar::Internal::BazaarLogConfig + Bazaar Verbose Ausführlich diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index b1bfd6e4b82..39e576d4a90 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. - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Informations générales @@ -32538,20 +32538,12 @@ Les commits locaux ne sont pas transmis à la branche principale avant qu'u - Bazaar::Internal::CloneOptionsPanel - - Options - Options - + Bazaar 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 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 - - Use existing directory - Utiliser le répertoire existant - Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations @@ -32597,10 +32589,6 @@ The new branch will depend on the availability of the source branch for all oper No working-tree Pas d'arbre de travail - - Revision: - Révision : - 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. @@ -32631,7 +32619,7 @@ La nouvelle branche dépendra de la disponibilité de la branche source pour tou - Bazaar::Internal::OptionsPage + Bazaar Form Formulaire @@ -32688,17 +32676,13 @@ La nouvelle branche dépendra de la disponibilité de la branche source pour tou Prompt on submit Invite lors du submit - - Bazaar - Bazaar - The number of recent commit logs to show. Choose 0 to see all entries. Le nombre de logs de commit récents à afficher, 0 pour tout afficher. - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog Boîte de dialogue @@ -32758,10 +32742,6 @@ Ce drapeau autorisera le push à procéder Create prefix Créer le préfixe - - Revision: - Révision : - Perform a local pull in a bound branch. Local pulls are not applied to the master branch @@ -32808,7 +32788,7 @@ Les pulls locaux ne sont pas appliqués à la branche maître. - Bazaar::Internal::RevertDialog + Bazaar Revert Rétablir @@ -34728,16 +34708,6 @@ Specifie comment retour arrière se comporte avec l'indentation. (External) (externe) - - - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarEditor Annotate %1 Annoter %1 @@ -34746,9 +34716,6 @@ Specifie comment retour arrière se comporte avec l'indentation. Annotate parent revision %1 Annoter la révision parente %1 - - - Bazaar::Internal::BazaarPlugin Bazaar Bazaar @@ -34935,7 +34902,7 @@ Specifie comment retour arrière se comporte avec l'indentation. - Bazaar::Internal::CloneWizard + Bazaar Cloning Cloner @@ -34954,7 +34921,7 @@ Specifie comment retour arrière se comporte avec l'indentation. - Bazaar::Internal::CloneWizardPage + Bazaar Location Emplacement @@ -34969,14 +34936,14 @@ Specifie comment retour arrière se comporte avec l'indentation. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor Faire un commit de l'éditeur - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Commande Bazaar @@ -39843,7 +39810,7 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac - Bazaar::Internal::BazaarDiffParameterWidget + Bazaar Ignore whitespace Ignorer les espaces @@ -43007,7 +42974,7 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle - Bazaar::Internal::BazaarLogParameterWidget + Bazaar Verbose Journal diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index fc3e7b83f72..999ea6fdfb2 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 - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Opće informacije @@ -1433,7 +1433,7 @@ Lokalne obveze se ne guraju u glavnu granu sve dok se ne izvrši normalna obveza - Bazaar::Internal::OptionsPage + Bazaar Configuration Konfiguracija @@ -1482,13 +1482,9 @@ Lokalne obveze se ne guraju u glavnu granu sve dok se ne izvrši normalna obveza s s - - Bazaar - Bazaar - - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog Dijalog @@ -1549,10 +1545,6 @@ Ova oznaka će omogućiti nastavak guranja. Create prefix Stvori predznak - - Revision: - Revizija: - Performs a local pull in a bound branch. Local pulls are not applied to the master branch. @@ -1571,9 +1563,6 @@ Lokalne povlačenja se ne primjenjuju na glavnu granu. Push Destination Odredište za guranje - - - Bazaar::Internal::RevertDialog Revert Vrati na izvorno @@ -1582,13 +1571,6 @@ Lokalne povlačenja se ne primjenjuju na glavnu granu. Specify a revision other than the default? Odrediti jednu drugu reviziju od zadane? - - Revision: - Revizija: - - - - Bazaar::Internal::UnCommitDialog Uncommit Ukini obvezu @@ -16028,7 +16010,7 @@ Check the test environment. - Bazaar::Internal::BazaarDiffConfig + Bazaar Ignore Whitespace Zanemari razmake @@ -16039,7 +16021,7 @@ Check the test environment. - Bazaar::Internal::BazaarLogConfig + Bazaar Verbose Verbalno @@ -16080,16 +16062,6 @@ Check the test environment. GNU Change Log Log-zapis GNU promjene - - - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarEditorWidget &Annotate %1 Pri&bilježi %1 @@ -16223,7 +16195,7 @@ Check the test environment. - Bazaar::Internal::BazaarPlugin + Bazaar Bazaar Bazaar @@ -16378,14 +16350,14 @@ Check the test environment. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Bazaar naredba diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 8d9c608cafd..a5b0d182bcb 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -897,7 +897,7 @@ - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information 概要 @@ -934,7 +934,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::OptionsPage + Bazaar Form フォーム @@ -987,13 +987,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo s 秒 - - Bazaar - Bazaar - - - - Bazaar::Internal::PullOrPushDialog Dialog ダイアログ @@ -1040,10 +1033,6 @@ This flag will allow push to proceed. Create prefix プレフィックスを作成する - - Revision: - リビジョン: - Local ローカルで実行する @@ -1077,7 +1066,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::RevertDialog + Bazaar Revert 元に戻す @@ -1086,10 +1075,6 @@ Local pulls are not applied to the master branch. Specify a revision other than the default? 既定以外のリビジョンを指定しますか？ - - Revision: - リビジョン: - ClassView::Internal::NavigationWidget @@ -12616,7 +12601,7 @@ in the system's browser for manual download. - Bazaar::Internal::BazaarDiffParameterWidget + Bazaar Ignore Whitespace 空白を無視 @@ -12625,63 +12610,6 @@ in the system's browser for manual download. Ignore Blank Lines 空行を無視 - - - Bazaar::Internal::BazaarLogParameterWidget - - Verbose - 冗長表示 - - - Show files changed in each revision. - 各リビジョンで変更されたファイルを表示します。 - - - Forward - 時系列順 - - - Show from oldest to newest. - 古いリビジョンから開始して最新のリビジョンを最後に表示します。 - - - Include Merges - マージ込み - - - Show merged revisions. - マージされたリビジョンを表示します。 - - - Detailed - 詳細形式 - - - Moderately Short - 概略表示 - - - One Line - 一行表示 - - - GNU Change Log - GNU形式 - - - - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarPlugin - - Bazaar - Bazaar - Annotate Current File 現在のファイルのアノテーション @@ -12860,7 +12788,7 @@ in the system's browser for manual download. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor コミットエディタ @@ -13002,7 +12930,7 @@ in the system's browser for manual download. - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Bazaar コマンド @@ -34150,7 +34078,7 @@ When a problem is detected, the application is interrupted and can be debugged.< - Bazaar::Internal::UnCommitDialog + Bazaar Uncommit コミットの取り消し @@ -39168,7 +39096,7 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop - Bazaar::Internal::BazaarEditorWidget + Bazaar &Annotate %1 %1 のアノテーション(&A) @@ -49402,18 +49330,7 @@ The name of the release build configuration created by default for a qmake proje - Bazaar::Internal::BazaarDiffConfig - - Ignore Whitespace - 空白を無視 - - - Ignore Blank Lines - 空行を無視 - - - - Bazaar::Internal::BazaarLogConfig + Bazaar Verbose 冗長表示 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 343dcd73308..98795f7f59a 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. - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Ogólne informacje @@ -14181,7 +14181,7 @@ Poprawki utworzone lokalnie nie są wrzucane do głównej gałęzi, dopóki nie - Bazaar::Internal::OptionsPage + Bazaar Form Formularz @@ -14230,17 +14230,10 @@ Poprawki utworzone lokalnie nie są wrzucane do głównej gałęzi, dopóki nie s s - - Bazaar - Bazaar - The number of recent commit logs to show. Choose 0 to see all entries. Liczba ostatnich poprawek, wyświetlanych w logu. Wybierz 0 aby ujrzeć wszystkie zmiany. - - - Bazaar::Internal::PullOrPushDialog Dialog Dialog @@ -14281,10 +14274,6 @@ Poprawki utworzone lokalnie nie są wrzucane do głównej gałęzi, dopóki nie Create prefix Utwórz przedrostek - - Revision: - Wersja: - Local Lokalnie @@ -14322,7 +14311,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::RevertDialog + Bazaar Revert Odwróć zmiany @@ -14331,10 +14320,6 @@ Local pulls are not applied to the master branch. Specify a revision other than the default? Podaj inną wersję niż domyślna - - Revision: - Wersja: - Core::Internal::ExternalToolConfig @@ -14859,14 +14844,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarPlugin + Bazaar Bazaar Bazaar @@ -15049,14 +15027,14 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor Edytor poprawek - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Komenda Bazaar @@ -28549,7 +28527,7 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani - Bazaar::Internal::UnCommitDialog + Bazaar Uncommit Wycofaj poprawkę @@ -30627,7 +30605,7 @@ Zainstaluj SDK o wersji %1 lub wyższej. - Bazaar::Internal::BazaarEditorWidget + Bazaar &Annotate %1 Dołącz &adnotację do %1 @@ -41924,7 +41902,7 @@ Błąd: %2 - Bazaar::Internal::BazaarDiffConfig + Bazaar Ignore Whitespace Ignoruj białe znaki @@ -41933,9 +41911,6 @@ Błąd: %2 Ignore Blank Lines Ignoruj puste linie - - - Bazaar::Internal::BazaarLogConfig Verbose Gadatliwy diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 48eb0ff3b64..6deb2994f74 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 - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Основная информация @@ -4714,7 +4714,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::BazaarDiffConfig + Bazaar Ignore Whitespace Игнорировать пробелы @@ -4725,7 +4725,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::BazaarEditorWidget + Bazaar &Annotate %1 &Аннотация %1 @@ -4736,7 +4736,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::BazaarLogConfig + Bazaar Verbose Подробно @@ -4783,11 +4783,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::BazaarPlugin - - Bazaar - - + Bazaar Annotate Current File Аннотация текущего файла (annotate) @@ -4938,14 +4934,14 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::CommitEditor + Bazaar Commit Editor Редактор фиксаций - Bazaar::Internal::OptionsPage + Bazaar Configuration Настройка @@ -4997,7 +4993,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Команда Bazaar @@ -5008,7 +5004,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog @@ -5033,10 +5029,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo Create prefix Создавать родительские каталоги - - Revision: - Ревизия: - Local Локально @@ -5094,7 +5086,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::RevertDialog + Bazaar Revert Откатить @@ -5103,13 +5095,6 @@ Local pulls are not applied to the master branch. Specify a revision other than the default? Указать ревизию отличную от умолчальной? - - Revision: - Ревизия: - - - - Bazaar::Internal::UnCommitDialog Uncommit Отмена фиксации diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 8daeddd8af0..c2f872c8edb 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. - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Splošni podatki @@ -18704,11 +18704,7 @@ Krajevnih zapisov se v vejo »master« ne potisne dokler ni izvršen običajen z - Bazaar::Internal::CloneOptionsPanel - - Options - Možnosti - + Bazaar By default, branch will fail if the target directory exists, but does not already have a control directory. @@ -18716,11 +18712,6 @@ This flag will allow branch to proceed. Če ciljna mapa obstaja in ne vsebuje nadzorne mape, ustvarjanje veje privzeto ne bo uspelo. Ta možnost omogoči, da se ustvarjanje veje nadaljuje. - - - Use existing directory - Uporabi obstoječo mapo - Create a stacked branch referring to the source branch. @@ -18778,14 +18769,6 @@ Nova veja bo za vsa dejanja odvisna od razpoložljivosti izvorne veje.No working-tree Brez delovnega drevesa - - - Revision: - Različica: - - - - Bazaar::Internal::OptionsPage Form Obrazec @@ -18855,13 +18838,6 @@ Nova veja bo za vsa dejanja odvisna od razpoložljivosti izvorne veje.Prompt on submit Vprašaj ob pošiljanju - - Bazaar - Bazaar - - - - Bazaar::Internal::PullOrPushDialog Dialog Pogovorno okno @@ -18961,7 +18937,7 @@ Krajevnih potegov se v vejo »master« ne uveljavi. - Bazaar::Internal::RevertDialog + Bazaar Revert Povrnitev @@ -18971,11 +18947,6 @@ Krajevnih potegov se v vejo »master« ne uveljavi. Specify a revision other than the default? Ali ste poskusili navesti različico, ki je različna od privzete? - - - Revision: - Različica: - ClassView::Internal::NavigationWidget @@ -22862,7 +22833,7 @@ Seznam za strežnik je: %2. - Bazaar::Internal::BazaarDiffParameterWidget + Bazaar Ignore whitespace Prezri presledke @@ -22871,16 +22842,6 @@ Seznam za strežnik je: %2. Ignore blank lines Prezri prazne vrstice - - - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarEditor Annotate %1 Dodaj opombo za %1 @@ -22889,9 +22850,6 @@ Seznam za strežnik je: %2. Annotate parent revision %1 Dodaj opombo za starševsko različico %1 - - - Bazaar::Internal::BazaarPlugin Bazaar Bazaar @@ -23058,7 +23016,7 @@ Seznam za strežnik je: %2. - Bazaar::Internal::CloneWizard + Bazaar Clones a Bazaar branch and tries to load the contained project. Sklonira vejo Bazaar in poskusi naložiti vsebovani projekt. @@ -23069,7 +23027,7 @@ Seznam za strežnik je: %2. - Bazaar::Internal::CloneWizardPage + Bazaar Location Mesto @@ -23084,14 +23042,14 @@ Seznam za strežnik je: %2. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor Urejevalnik zapisov - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Ukaz Bazaar diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 77907667908..c0c5ad9d610 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -344,7 +344,7 @@ - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information Загальна інформація @@ -378,16 +378,6 @@ Local commits are not pushed to the master branch until a normal commit is performed. - - - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarDiffParameterWidget Ignore whitespace Ігнорувати пропуски @@ -404,9 +394,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo Ignore Blank Lines Ігнорувати порожні рядки - - - Bazaar::Internal::BazaarLogParameterWidget Verbose Детально @@ -463,13 +450,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo GNU ChangeLog GNU ChangeLog - - - Bazaar::Internal::BazaarPlugin - - Bazaar - Bazaar - Annotate Current File @@ -618,10 +598,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo Diff &Selected Files &Зміни у вибраних файлах - - Clones a Bazaar branch and tries to load the contained project. - Клонує гілку Bazaar та намагається завантажити з нього проект. - There are no changes to commit. @@ -650,24 +626,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo Message check failed. Do you want to proceed? - - - Bazaar::Internal::CloneOptionsPanel - - Options - Опції - - - Use existing directory - Використовувати існуючу теку - - - Revision: - Ревізія: - - - - Bazaar::Internal::CloneWizard Cloning Клонування @@ -676,27 +634,14 @@ Local commits are not pushed to the master branch until a normal commit is perfo Cloning started... Клонування почалось... - - Clones a Bazaar branch and tries to load the contained project. - Клонує гілку Bazaar та намагається завантажити з нього проект. - - - - Bazaar::Internal::CloneWizardPage Location Розташування - - - Bazaar::Internal::CommitEditor Commit Editor - - - Bazaar::Internal::OptionsPage Form Форма @@ -755,14 +700,14 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Команда Bazaar - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog Діалог @@ -803,10 +748,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo Create prefix - - Revision: - Ревізія: - Local Локально @@ -854,7 +795,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::RevertDialog + Bazaar Revert @@ -863,10 +804,6 @@ Local pulls are not applied to the master branch. Specify a revision other than the default? Вказати ревізію відмінну від типової? - - Revision: - Ревізія: - BookmarkDialog @@ -40474,7 +40411,7 @@ Please close all running instances of your application before starting a build.< QbsProjectManager - Bazaar::Internal::UnCommitDialog + Bazaar Uncommit @@ -42937,7 +42874,7 @@ Install an SDK of at least API version %1. - Bazaar::Internal::CloneWizardFactory + Bazaar Clones a Bazaar branch and tries to load the contained project. Клонує гілку Bazaar та намагається завантажити з нього проект. @@ -48080,7 +48017,7 @@ Affected are breakpoints %1 - Bazaar::Internal::BazaarEditorWidget + Bazaar &Annotate %1 diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index fb57f813647..f2d66998f9b 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. - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information 概要信息 @@ -30521,23 +30521,12 @@ Local commits are not pushed to the master branch until a normal commit is perfo 本地提交到一个受限的分支. 直到一次正常提交之前，本地提交不会被推送到master分支。 - - - Bazaar::Internal::CloneOptionsPanel - - Options - 选项 - 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 默认情况下, 如果目标文件夹存在则分支将会失败, 但是如果还没有控制目录. 那么分支将被执行 - - Use existing directory - 使用存在的目录 - Create a stacked branch referring to the source branch. The new branch will depend on the availability of the source branch for all operations @@ -30584,10 +30573,6 @@ The new branch will depend on the availability of the source branch for all oper No working-tree 无工作树 - - Revision: - 修订版本: - 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. @@ -30618,7 +30603,7 @@ The new branch will depend on the availability of the source branch for all oper - Bazaar::Internal::OptionsPage + Bazaar Form 界面 @@ -30675,17 +30660,13 @@ The new branch will depend on the availability of the source branch for all oper Prompt on submit 提交时弹出提示 - - Bazaar - Bazaar - The number of recent commit logs to show. Choose 0 to see all entries. 要显示的最近提交日志的数目，选择 0 查看所有内容。 - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog 对话框 @@ -30796,7 +30777,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::RevertDialog + Bazaar Revert 还原 @@ -30805,10 +30786,6 @@ Local pulls are not applied to the master branch. Specify a revision other than the default? 指定一个修订版本而不使用默认版本? - - Revision: - 修订版本: - Core::Internal::ExternalToolConfig @@ -32516,14 +32493,14 @@ Specifies how backspace interacts with indentation. - Bazaar::Internal::BazaarControl + Bazaar Bazaar Bazaar - Bazaar::Internal::BazaarEditor + Bazaar Annotate %1 注释 "%1" @@ -32534,11 +32511,7 @@ Specifies how backspace interacts with indentation. - Bazaar::Internal::BazaarPlugin - - Bazaar - Bazaar - + Bazaar Annotate Current File Annotate 当前文件 @@ -32721,7 +32694,7 @@ Specifies how backspace interacts with indentation. - Bazaar::Internal::CloneWizard + Bazaar Clones a Bazaar branch and tries to load the contained project. 克隆一个Bazaar 分支并尝试载入其中的项目。 @@ -32732,7 +32705,7 @@ Specifies how backspace interacts with indentation. - Bazaar::Internal::CloneWizardPage + Bazaar Location 位置 @@ -32747,14 +32720,14 @@ Specifies how backspace interacts with indentation. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor 提交编辑器 - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Bazaar 命令 @@ -36867,7 +36840,7 @@ With cache simulation, further event counters are enabled: - Bazaar::Internal::BazaarDiffParameterWidget + Bazaar Ignore whitespace 忽略空白 @@ -40761,7 +40734,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - Bazaar::Internal::BazaarLogParameterWidget + Bazaar Verbose 详细 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 4350c085a29..7b5c22de031 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. - Bazaar::Internal::BazaarCommitPanel + Bazaar General Information 一般資訊 @@ -18375,15 +18375,7 @@ Local commits are not pushed to the master branch until a normal commit is perfo - Bazaar::Internal::CloneOptionsPanel - - Options - 選項 - - - Use existing directory - 使用現有的目錄 - + Bazaar Stacked 已堆疊 @@ -18408,10 +18400,6 @@ Local commits are not pushed to the master branch until a normal commit is perfo No working-tree 沒有工作樹 - - Revision: - 版本： - 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. @@ -18442,7 +18430,7 @@ The new branch will depend on the availability of the source branch for all oper - Bazaar::Internal::OptionsPage + Bazaar Form 表單 @@ -18495,17 +18483,13 @@ The new branch will depend on the availability of the source branch for all oper Prompt on submit 提交時彈出提示 - - Bazaar - Bazaar - The number of recent commit logs to show. Choose 0 to see all entries. 要顯示的最近提交的紀錄數。選擇 0 表示看全部的紀錄。 - Bazaar::Internal::PullOrPushDialog + Bazaar Dialog 對話框 @@ -18546,10 +18530,6 @@ The new branch will depend on the availability of the source branch for all oper Create prefix 建立前置字串 - - Revision: - 版本： - Local 本地 @@ -18589,7 +18569,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::RevertDialog + Bazaar Revert 還原 @@ -19244,14 +19224,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::BazaarControl - - Bazaar - Bazaar - - - - Bazaar::Internal::BazaarEditor + Bazaar Annotate %1 最後註記 %1 @@ -19260,9 +19233,6 @@ Local pulls are not applied to the master branch. Annotate parent revision %1 父版本 %1 最後註記 - - - Bazaar::Internal::BazaarPlugin Bazaar Bazaar @@ -19445,7 +19415,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::CloneWizard + Bazaar Clones a Bazaar branch and tries to load the contained project. 複製一個 Bazaar 分支，並試著載入裡面包含的專案。 @@ -19456,7 +19426,7 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::CloneWizardPage + Bazaar Location 位置 @@ -19471,14 +19441,14 @@ Local pulls are not applied to the master branch. - Bazaar::Internal::CommitEditor + Bazaar Commit Editor 提交編輯器 - Bazaar::Internal::OptionsPageWidget + Bazaar Bazaar Command Bazaar 指令 @@ -22726,7 +22696,7 @@ With cache simulation, further event counters are enabled: - Bazaar::Internal::BazaarDiffParameterWidget + Bazaar Ignore whitespace 忽略空白 @@ -25327,7 +25297,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - Bazaar::Internal::BazaarLogParameterWidget + Bazaar Verbose 詳細 diff --git a/src/plugins/bazaar/annotationhighlighter.cpp b/src/plugins/bazaar/annotationhighlighter.cpp index 9b0276e7039..07efdce3132 100644 --- a/src/plugins/bazaar/annotationhighlighter.cpp +++ b/src/plugins/bazaar/annotationhighlighter.cpp @@ -6,8 +6,7 @@ #include -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 9e0fc555722..8b9417eb599 100644 --- a/src/plugins/bazaar/annotationhighlighter.h +++ b/src/plugins/bazaar/annotationhighlighter.h @@ -4,10 +4,10 @@ #pragma once #include + #include -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 c1a26ee3bf8..8b9baf0ff91 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 @@ -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 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 afee03622c8..c59ca79bede 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 -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 f5c8fde6ef3..0dc694fc8b2 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 @@ -11,7 +13,6 @@ #include #include -#include #include #include #include @@ -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 91215cad8ca..5498e410747 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 @@ -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: // === '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 0606e101dff..91ca8b16c3b 100644 --- a/src/plugins/bazaar/bazaareditor.h +++ b/src/plugins/bazaar/bazaareditor.h @@ -7,13 +7,10 @@ #include -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 60b43773789..87db4074fb2 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(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 QListsetCheckScriptWorkingDirectory(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 04f2a964d9b..4086fee2649 100644 --- a/src/plugins/bazaar/bazaarplugin.h +++ b/src/plugins/bazaar/bazaarplugin.h @@ -5,8 +5,7 @@ #include -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 d632e5883cf..1f56a27aa1d 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 @@ -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 563014fd692..f3ce5b249c4 100644 --- a/src/plugins/bazaar/bazaarsettings.h +++ b/src/plugins/bazaar/bazaarsettings.h @@ -7,13 +7,10 @@ #include -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 2d1bb4851b7..cc0a55fc836 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 5c2c9534351..30c37feef87 100644 --- a/src/plugins/bazaar/branchinfo.h +++ b/src/plugins/bazaar/branchinfo.h @@ -5,8 +5,7 @@ #include -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 13c75de82db..2ceb0b6c939 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 @@ -11,12 +13,12 @@ #include -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 f09c0f89ba7..c2cc6741710 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 7d8ef79715f..4eac8901530 100644 --- a/src/plugins/bazaar/constants.h +++ b/src/plugins/bazaar/constants.h @@ -5,8 +5,7 @@ #include -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 2713474248f..3c18f2a5d67 100644 --- a/src/plugins/bazaar/pullorpushdialog.cpp +++ b/src/plugins/bazaar/pullorpushdialog.cpp @@ -3,10 +3,11 @@ #include "pullorpushdialog.h" +#include "bazaartr.h" + #include #include -#include #include #include #include @@ -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 a385ff00f94..0d13ba19112 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,