diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 6fa44c2b0a6..d4274350844 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -21107,7 +21107,7 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením. - Mercurial::Internal::MercurialCommitPanel + Mercurial General Information Obecné informace @@ -21140,9 +21140,6 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením. Email: E-mailová adresa: - - - Mercurial::Internal::OptionsPage Form Formulář @@ -21199,17 +21196,10 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením. Prompt on submit Ptát se na potvrzení - - Mercurial - Mercurial - The number of recent commit logs to show, choose 0 to see all entries. Počet nedávných záznamů které se vypisují v historii změn. Při volbě 0 budou vidět všechny záznamy. - - - Mercurial::Internal::RevertDialog Revert Vrátit @@ -21222,9 +21212,6 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením. Revision: Revize: - - - Mercurial::Internal::SrcDestDialog Dialog Dialog @@ -24663,7 +24650,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl. - Mercurial::Internal::CloneWizard + Mercurial Cloning Klonování @@ -24680,9 +24667,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Mercurial Clone Klon Mercurialu - - - Mercurial::Internal::CloneWizardPage Location Umístění @@ -24695,16 +24679,10 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Clone URL: Klonovat z adresy (URL): - - - Mercurial::Internal::CommitEditor Commit Editor Editor zápisu (commit) - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 Nadřazenou revizi %1 ve skladišti %2 se nepodařilo určit: %3 @@ -24737,16 +24715,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Working... Pracuje... - - - Mercurial::Internal::MercurialControl - - Mercurial - Mercurial - - - - Mercurial::Internal::MercurialEditor Annotate %1 Vypsat anotace pro %1 @@ -24755,9 +24723,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Annotate parent revision %1 Vypsat anotace nadřazené revize "%1" - - - Mercurial::Internal::MercurialJobRunner Executing: %1 %2 @@ -24772,9 +24737,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Timed out after %1s waiting for mercurial process to finish. Překročení času %1s při čekání na ukončení Procesu Mercurialu. - - - Mercurial::Internal::MercurialPlugin Mercurial Mercurial @@ -24991,9 +24953,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl. Message check failed. Do you want to proceed? Ověření popisu se nezdařilo. Přesto chcete pokračovat? - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Příkaz 'Mercurial' @@ -35134,7 +35093,7 @@ když bude zavolán mimo git bash. - Mercurial::Internal::MercurialDiffParameterWidget + Mercurial Ignore whitespace Nevšímat si bílých znaků @@ -55320,11 +55279,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - Mercurial::Internal::AuthenticationDialog - - Dialog - Dialog - + Mercurial User name: Uživatelské jméno: diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index d37a777ea3a..23ed9c91805 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -20641,7 +20641,7 @@ Fejl: %5 - Mercurial::Internal::AuthenticationDialog + Mercurial Dialog Dialog @@ -20654,16 +20654,10 @@ Fejl: %5 Password: Adgangskode: - - - Mercurial::Internal::CommitEditor Commit Editor Commit-redigering - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 Kunne ikke finde forælder revisioner af %1 i %2: %3 @@ -20680,9 +20674,6 @@ Fejl: %5 Hg outgoing %1 Hg udgående %1 - - - Mercurial::Internal::MercurialCommitPanel General Information Generel information @@ -20715,16 +20706,10 @@ Fejl: %5 Email: E-mail: - - - Mercurial::Internal::MercurialControl Mercurial Mercurial - - - Mercurial::Internal::MercurialDiffConfig Ignore Whitespace Ignorer blanktegn @@ -20733,9 +20718,6 @@ Fejl: %5 Ignore Blank Lines Ignorer tomme linjer - - - Mercurial::Internal::MercurialEditorWidget &Annotate %1 &Annotate %1 @@ -20744,9 +20726,6 @@ Fejl: %5 Annotate &parent revision %1 Annotate &forælder revision %1 - - - Mercurial::Internal::MercurialPlugin Me&rcurial Me&rcurial @@ -20943,9 +20922,6 @@ Fejl: %5 Message check failed. Do you want to proceed? Meddelelsestjek mislykkedes. Vil du fortsætte? - - - Mercurial::Internal::OptionsPage Configuration Konfiguration @@ -20994,20 +20970,10 @@ Fejl: %5 Log count: Log antal: - - Mercurial - Mercurial - - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Mercurial-kommando - - - Mercurial::Internal::RevertDialog Revert Tilbagefør @@ -21020,13 +20986,6 @@ Fejl: %5 Revision: Revision: - - - Mercurial::Internal::SrcDestDialog - - Dialog - Dialog - Default Location Standard placering diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index e67d8ec8351..d1ef5e2ff29 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -8638,7 +8638,7 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen. - Mercurial::Internal::MercurialCommitPanel + Mercurial General Information Allgemeine Informationen @@ -8671,9 +8671,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.Email: E-Mail-Adresse: - - - Mercurial::Internal::OptionsPage Configuration Konfiguration @@ -8722,9 +8719,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.The number of recent commit logs to show, choose 0 to see all entries. Zahl der anzuzeigenden Logeinträge, 0 für unbegrenzt. - - - Mercurial::Internal::RevertDialog Revert Rückgängig machen @@ -8737,9 +8731,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.Revision: Revision: - - - Mercurial::Internal::SrcDestDialog Dialog Dialog @@ -9185,14 +9176,11 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen. - Mercurial::Internal::CommitEditor + Mercurial Commit Editor Commit-Editor - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 Die übergeordnete Revision von %1 im Repository %2 konnte nicht bestimmt werden: %3 @@ -9217,9 +9205,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.Mercurial Diff "%1" Mercurial Diff für "%1" - - - Mercurial::Internal::MercurialPlugin Me&rcurial Me&rcurial @@ -9392,17 +9377,10 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.Mercurial Mercurial - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Ausführbare Datei - - Mercurial - Mercurial - Perforce::Internal::PerforceChecker @@ -23088,11 +23066,7 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind. - Mercurial::Internal::AuthenticationDialog - - Dialog - Dialog - + Mercurial Password: Passwort: @@ -30445,7 +30419,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü - Mercurial::Internal::MercurialEditorWidget + Mercurial &Annotate %1 &Annotate %1 diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index b69d5ba75b8..a04e2d9c68a 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -21302,7 +21302,7 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband - Mercurial::Internal::MercurialCommitPanel + Mercurial General Information Informations générales @@ -21335,9 +21335,6 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband Email: Email : - - - Mercurial::Internal::OptionsPage Form Formulaire @@ -21394,17 +21391,10 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband Prompt on submit Invite lors du submit - - Mercurial - Mercurial - 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. - - - Mercurial::Internal::RevertDialog Revert Rétablir @@ -21417,9 +21407,6 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband Revision: Révision : - - - Mercurial::Internal::SrcDestDialog Dialog Boîte de dialogue @@ -24738,7 +24725,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - Mercurial::Internal::CloneWizard + Mercurial Cloning Cloner @@ -24755,9 +24742,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Mercurial Clone Clone de Mercurial - - - Mercurial::Internal::CloneWizardPage Location Emplacement @@ -24770,16 +24754,10 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Clone URL: URL de clone : - - - Mercurial::Internal::CommitEditor Commit Editor Faire un commit de l'éditeur - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 Impossible de trouver la révision parente de %1 dans %2 : %3 @@ -24812,16 +24790,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Working... Travail en cours... - - - Mercurial::Internal::MercurialControl - - Mercurial - Mercurial - - - - Mercurial::Internal::MercurialEditor Annotate %1 Annoter %1 @@ -24830,9 +24798,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Annotate parent revision %1 Annoter la révision parente %1 - - - Mercurial::Internal::MercurialJobRunner Executing: %1 %2 @@ -24847,9 +24812,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Timed out after %1s waiting for mercurial process to finish. Interruption après %1s d'attente que le processus mercurial se termine. - - - Mercurial::Internal::MercurialPlugin Mercurial Mercurial @@ -25066,9 +25028,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. Message check failed. Do you want to proceed? Vérification du message échouée. Voulez-vous continuer ? - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Commande Mercurial @@ -38664,7 +38623,7 @@ These files are preserved. - Mercurial::Internal::MercurialDiffParameterWidget + Mercurial Ignore whitespace Ignorer les espaces @@ -50983,11 +50942,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - Mercurial::Internal::AuthenticationDialog - - Dialog - Boîte de dialogue - + Mercurial User name: Nom d'utilisateur : diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 9a53446af43..e9ce06e3fe0 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -5027,7 +5027,7 @@ Greška: %5 - Mercurial::Internal::AuthenticationDialog + Mercurial Dialog Dijalog @@ -5040,9 +5040,6 @@ Greška: %5 Password: Lozinka: - - - Mercurial::Internal::MercurialCommitPanel General Information Opće informacije @@ -5075,9 +5072,6 @@ Greška: %5 Email: E-pošta: - - - Mercurial::Internal::OptionsPage Configuration Konfiguracija @@ -5126,13 +5120,6 @@ Greška: %5 Log count: Broj zapisa: - - Mercurial - Mercurial - - - - Mercurial::Internal::RevertDialog Revert Vrati natrag @@ -5145,13 +5132,6 @@ Greška: %5 Revision: Revizija: - - - Mercurial::Internal::SrcDestDialog - - Dialog - Dijalog - Default Location Zadano mjesto @@ -26913,14 +26893,11 @@ Rok upotrebe: %3 - Mercurial::Internal::CommitEditor + Mercurial Commit Editor - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 @@ -26945,16 +26922,10 @@ Rok upotrebe: %3 Mercurial Diff "%1" - - - Mercurial::Internal::MercurialControl Mercurial - - - Mercurial::Internal::MercurialEditorWidget &Annotate %1 @@ -26963,9 +26934,6 @@ Rok upotrebe: %3 Annotate &parent revision %1 - - - Mercurial::Internal::MercurialPlugin Me&rcurial @@ -27134,9 +27102,6 @@ Rok upotrebe: %3 Commit changes for "%1". - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Mercurial naredba diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index cb9da2d5444..080025c14a9 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -3836,7 +3836,7 @@ Add, modify, and remove document filters, which determine the documentation set - Mercurial::Internal::AuthenticationDialog + Mercurial Dialog ダイアログ @@ -3849,9 +3849,6 @@ Add, modify, and remove document filters, which determine the documentation set Username: ユーザー名: - - - Mercurial::Internal::MercurialCommitPanel General Information 概要 @@ -3884,9 +3881,6 @@ Add, modify, and remove document filters, which determine the documentation set Email: メールアドレス: - - - Mercurial::Internal::OptionsPage Form フォーム @@ -3943,9 +3937,6 @@ Add, modify, and remove document filters, which determine the documentation set Mercurial Mercurial - - - Mercurial::Internal::RevertDialog Revert 元に戻す @@ -3958,13 +3949,6 @@ Add, modify, and remove document filters, which determine the documentation set Revision: リビジョン: - - - Mercurial::Internal::SrcDestDialog - - Dialog - ダイアログ - Default Location 既定のパス @@ -22288,14 +22272,11 @@ instead of its installation directory when run outside git bash. - Mercurial::Internal::CommitEditor + Mercurial Commit Editor コミットエディタ - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 %2 (リビジョン: %1) の親リビジョンが見つかりません: %3 @@ -22320,9 +22301,6 @@ instead of its installation directory when run outside git bash. Mercurial Diff "%1" Mercurial 差分 "%1" - - - Mercurial::Internal::MercurialDiffParameterWidget Ignore Whitespace 空白を無視 @@ -22331,16 +22309,6 @@ instead of its installation directory when run outside git bash. Ignore Blank Lines 空行を無視 - - - Mercurial::Internal::MercurialControl - - Mercurial - Mercurial - - - - Mercurial::Internal::MercurialPlugin Me&rcurial Me&rcurial @@ -22497,10 +22465,6 @@ instead of its installation directory when run outside git bash. Incoming Source サーバーとの差分検出 - - Mercurial - Mercurial - Commit コミット @@ -22541,17 +22505,10 @@ instead of its installation directory when run outside git bash. Message check failed. Do you want to proceed? メッセージチェックに失敗しました。続けて処理しますか？ - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Mercurial コマンド - - Mercurial - Mercurial - Perforce::Internal::PerforceChecker @@ -42101,7 +42058,7 @@ Would you like to overwrite it? - Mercurial::Internal::MercurialEditorWidget + Mercurial &Annotate %1 %1 のアノテーション(&A) diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 44c66c74a04..4d075e89137 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -10126,7 +10126,7 @@ Możesz odłożyć zmiany lub je porzucić. - Mercurial::Internal::MercurialCommitPanel + Mercurial General Information Ogólne informacje @@ -10159,9 +10159,6 @@ Możesz odłożyć zmiany lub je porzucić. Email: E-mail: - - - Mercurial::Internal::OptionsPage Form Formularz @@ -10218,9 +10215,6 @@ Możesz odłożyć zmiany lub je porzucić. 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. - - - Mercurial::Internal::RevertDialog Revert Odwróć zmiany @@ -10233,9 +10227,6 @@ Możesz odłożyć zmiany lub je porzucić. Revision: Wersja: - - - Mercurial::Internal::SrcDestDialog Dialog Dialog @@ -11109,14 +11100,11 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - Mercurial::Internal::CommitEditor + Mercurial Commit Editor Edytor poprawek - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 Nie można odnaleźć macierzystej wersji dla %1 w %2: %3 @@ -11133,16 +11121,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM Hg outgoing %1 Hg outgoing %1 - - - Mercurial::Internal::MercurialControl - - Mercurial - Mercurial - - - - Mercurial::Internal::MercurialPlugin Me&rcurial Me&rcurial @@ -11339,9 +11317,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM Message check failed. Do you want to proceed? Błąd sprawdzania opisu. Czy kontynuować? - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Komenda Mercurial @@ -23825,11 +23800,7 @@ Można używać nazw częściowych, jeśli są one unikalne. - Mercurial::Internal::AuthenticationDialog - - Dialog - Dialog - + Mercurial Password: Hasło: @@ -32459,7 +32430,7 @@ Use this only if you are prototyping. You cannot create a full application with - Mercurial::Internal::MercurialEditorWidget + Mercurial &Annotate %1 Dołącz &adnotację do %1 @@ -41758,7 +41729,7 @@ Termin wygaśnięcia: %3 - Mercurial::Internal::MercurialDiffConfig + Mercurial Ignore Whitespace Ignoruj białe znaki diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 8512f1b870f..d262e9e999a 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -26411,11 +26411,7 @@ Error: %5 - Mercurial::Internal::AuthenticationDialog - - Dialog - - + Mercurial Password: Пароль: @@ -26424,16 +26420,10 @@ Error: %5 Username: Имя пользователя: - - - Mercurial::Internal::CommitEditor Commit Editor Редактор фиксаций - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 Не удалось найти родительскую ревизию для %1 в %2: %3 @@ -26458,9 +26448,6 @@ Error: %5 Mercurial Diff "%1" Сравнение Mercurial «%1» - - - Mercurial::Internal::MercurialCommitPanel General Information Основная информация @@ -26493,9 +26480,6 @@ Error: %5 Email: Email: - - - Mercurial::Internal::MercurialEditorWidget &Annotate %1 &Аннотация %1 @@ -26504,9 +26488,6 @@ Error: %5 Annotate &parent revision %1 Аннотация &родительской ревизии %1 - - - Mercurial::Internal::MercurialPlugin Me&rcurial Me&rcurial @@ -26679,9 +26660,6 @@ Error: %5 Mercurial Mercurial - - - Mercurial::Internal::OptionsPage Configuration Настройка @@ -26731,20 +26709,10 @@ Error: %5 Количество отображаемых последних сообщений о фиксации, выберите 0, чтобы видеть все. - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Команда Mercurial - - Mercurial - Mercurial - - - - Mercurial::Internal::RevertDialog Revert Откатить @@ -26757,9 +26725,6 @@ Error: %5 Revision: Ревизия: - - - Mercurial::Internal::SrcDestDialog Dialog Диалог diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index e58c95cb9ef..a73fc184003 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -13696,7 +13696,7 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. - Mercurial::Internal::MercurialCommitPanel + Mercurial General Information Splošni podatki @@ -13736,9 +13736,6 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Email: E-pošta: - - - Mercurial::Internal::OptionsPage Form Obrazec @@ -13812,9 +13809,6 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Mercurial Mercurial - - - Mercurial::Internal::RevertDialog Revert Povrni @@ -13829,9 +13823,6 @@ Spremembe lahko zapišete na stran ali pa jih zavržete. Revision: Revizija: - - - Mercurial::Internal::SrcDestDialog Dialog Pogovorno okno @@ -16034,7 +16025,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - Mercurial::Internal::CloneWizard + Mercurial Clones a Mercurial repository and tries to load the contained project. Sklonira skladišče Mercurial in poskusi naložiti vsebovani projekt. @@ -16043,9 +16034,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Mercurial Clone Klon skladišča Mercurial - - - Mercurial::Internal::CloneWizardPage Location Mesto @@ -16058,16 +16046,10 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Clone URL: URL za kloniranje: - - - Mercurial::Internal::CommitEditor Commit Editor Urejevalnik zapisov - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 Ni moč najti starševskih revizij za %1 v %2: %3 @@ -16100,16 +16082,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Working... Delam … - - - Mercurial::Internal::MercurialControl - - Mercurial - Mercurial - - - - Mercurial::Internal::MercurialEditor Annotate %1 Dodaj opombo za %1 @@ -16118,13 +16090,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Annotate parent revision %1 Dodaj opombo za starševsko revizijo %1 - - - Mercurial::Internal::MercurialPlugin - - Mercurial - Mercurial - Annotate Current File Dodaj opombo za trenutno datoteko @@ -16317,9 +16282,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 Close commit editor Zapri urejevalnik za zapise - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Ukaz Mercurial @@ -24616,7 +24578,7 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. - Mercurial::Internal::MercurialDiffParameterWidget + Mercurial Ignore whitespace Prezri presledke @@ -32237,7 +32199,7 @@ Preverite, ali je telefon priključen in ali App TRK teče. - Mercurial::Internal::MercurialJobRunner + Mercurial Executing: %1 %2 diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 7a5c6ab9962..65c04d2d502 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -12239,7 +12239,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t - Mercurial::Internal::CloneWizard + Mercurial Cloning Клонування @@ -12252,9 +12252,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Clones a Mercurial repository and tries to load the contained project. Клонує сховище Mercurial та намагається завантажити з нього проект. - - - Mercurial::Internal::CloneWizardPage Location Розташування @@ -12263,16 +12260,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Clone URL: URL для клонування: - - - Mercurial::Internal::CommitEditor Commit Editor - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 @@ -12289,9 +12280,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Hg outgoing %1 - - - Mercurial::Internal::MercurialCommitPanel General Information Загальна інформація @@ -12324,16 +12312,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Email: Email: - - - Mercurial::Internal::MercurialControl Mercurial Mercurial - - - Mercurial::Internal::MercurialDiffParameterWidget Ignore whitespace Ігнорувати пропуски @@ -12350,13 +12332,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Ignore Blank Lines Ігнорувати порожні рядки - - - Mercurial::Internal::MercurialPlugin - - Clones a Mercurial repository and tries to load the contained project. - Клонує сховище Mercurial та намагається завантажити з нього проект. - Me&rcurial Me&rcurial @@ -12569,9 +12544,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Message check failed. Do you want to proceed? - - - Mercurial::Internal::OptionsPage Form Форма @@ -12620,24 +12592,14 @@ To do this, you type this shortcut and a space in the Locator entry field, and t s с - - Mercurial - Mercurial - The number of recent commit logs to show, choose 0 to see all entries. - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Команда Mercurial - - - Mercurial::Internal::RevertDialog Revert @@ -12650,9 +12612,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t Revision: Ревізія: - - - Mercurial::Internal::SrcDestDialog Dialog Діалог @@ -36445,11 +36404,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d - Mercurial::Internal::AuthenticationDialog - - Dialog - Діалог - + Mercurial User name: Ім'я користувача: @@ -42314,11 +42269,7 @@ Install an SDK of at least API version %1. - Mercurial::Internal::CloneWizardFactory - - Clones a Mercurial repository and tries to load the contained project. - Клонує сховище Mercurial та намагається завантажити з нього проект. - + Mercurial ProjectExplorer::DeploymentDataModel @@ -47562,7 +47513,7 @@ Setting breakpoints by file name and line number may fail. - Mercurial::Internal::MercurialEditorWidget + Mercurial &Annotate %1 diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index bcfb18f37b0..5317dd6902f 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -19596,7 +19596,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name - Mercurial::Internal::MercurialCommitPanel + Mercurial General Information 概要信息 @@ -19629,9 +19629,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameEmail: 电子邮件: - - - Mercurial::Internal::OptionsPage Form 界面 @@ -19700,9 +19697,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameThe number of recent commit logs to show, choose 0 to see all entries. 要显示的最近提交的日志数, 选择0 来查看所有项. - - - Mercurial::Internal::RevertDialog Revert 还原 @@ -19715,9 +19709,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameRevision: 修订版本: - - - Mercurial::Internal::SrcDestDialog Dialog 对话框 @@ -19847,7 +19838,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name - Mercurial::Internal::CloneWizard + Mercurial Clone a Mercurial repository 克隆一个 Mercurial 仓库 @@ -19860,9 +19851,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameMercurial Clone Mercurial 克隆 - - - Mercurial::Internal::CloneWizardPage Location 位置 @@ -19875,16 +19863,10 @@ S60 emulator run configuration default display name, %1 is base pro-File nameClone URL: 克隆 URL: - - - Mercurial::Internal::CommitEditor Commit Editor Commit编辑器 - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 无法在 %2 找到 %1 的父修订版本: %3 @@ -19906,16 +19888,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameWorking... 工作中... - - - Mercurial::Internal::MercurialControl - - Mercurial - Mercurial - - - - Mercurial::Internal::MercurialJobRunner Executing: %1 %2 @@ -19930,13 +19902,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameTimed out after %1s waiting for mercurial process to finish. 等待 mercurial 进程结束，等待%1 秒后超时。 - - - Mercurial::Internal::MercurialPlugin - - Mercurial - Mercurial - Annotate Current File Annotate 当前文件 @@ -20145,9 +20110,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameMessage check failed. Do you want to proceed? 信息检查失败，您想要继续吗？ - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Mercurial 命令 @@ -22488,7 +22450,7 @@ Previous decimal signed value (big endian): %4 - Mercurial::Internal::MercurialEditor + Mercurial Annotate %1 注释 "%1" @@ -35967,7 +35929,7 @@ These files are preserved. - Mercurial::Internal::MercurialDiffParameterWidget + Mercurial Ignore whitespace 忽略空白 diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 8f3568db07b..179f6d3a3d3 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -11870,7 +11870,7 @@ Reason: %2 - Mercurial::Internal::MercurialCommitPanel + Mercurial General Information 一般資訊 @@ -11903,9 +11903,6 @@ Reason: %2 Email: 電子郵件： - - - Mercurial::Internal::OptionsPage Form 表單 @@ -11966,9 +11963,6 @@ Reason: %2 The number of recent commit logs to show, choose 0 to see all entries. 要顯示的最近提交的紀錄數。選擇 0 表示看全部的紀錄。 - - - Mercurial::Internal::RevertDialog Revert 復原 @@ -11981,9 +11975,6 @@ Reason: %2 Revision: 版本： - - - Mercurial::Internal::SrcDestDialog Dialog 對話框 @@ -12101,7 +12092,7 @@ Reason: %2 - Mercurial::Internal::CloneWizard + Mercurial Clones a Mercurial repository and tries to load the contained project. 複製一個 Mercurial 主目錄，並試著載入裡面包含的專案。 @@ -12110,9 +12101,6 @@ Reason: %2 Mercurial Clone Mercurial 複製 - - - Mercurial::Internal::CloneWizardPage Location 位置 @@ -12125,16 +12113,10 @@ Reason: %2 Clone URL: 複製網址： - - - Mercurial::Internal::CommitEditor Commit Editor 提交編輯器 - - - Mercurial::Internal::MercurialClient Unable to find parent revisions of %1 in %2: %3 無法在 %2 找到 %1 的父版本：%3 @@ -12151,20 +12133,6 @@ Reason: %2 Hg outgoing %1 Hg 傳出 %1 - - - Mercurial::Internal::MercurialControl - - Mercurial - Mercurial - - - - Mercurial::Internal::MercurialPlugin - - Mercurial - Mercurial - Annotate Current File 目前檔案最後註記 @@ -12361,9 +12329,6 @@ Reason: %2 Message check failed. Do you want to proceed? 訊息檢查失敗。您要繼續嗎？ - - - Mercurial::Internal::OptionsPageWidget Mercurial Command Mercurial 指令 @@ -13286,7 +13251,7 @@ For qmlproject projects, use the importPaths property to add import paths. - Mercurial::Internal::MercurialEditor + Mercurial Annotate %1 最後註記 %1 @@ -22378,7 +22343,7 @@ These files are preserved. - Mercurial::Internal::MercurialDiffParameterWidget + Mercurial Ignore whitespace 忽略空白 diff --git a/src/plugins/mercurial/annotationhighlighter.cpp b/src/plugins/mercurial/annotationhighlighter.cpp index 7135f0c010b..a63eb9f2eb1 100644 --- a/src/plugins/mercurial/annotationhighlighter.cpp +++ b/src/plugins/mercurial/annotationhighlighter.cpp @@ -4,8 +4,7 @@ #include "annotationhighlighter.h" #include "constants.h" -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const ChangeNumbers &changeNumbers, QTextDocument *document) @@ -22,5 +21,4 @@ QString MercurialAnnotationHighlighter::changeNumber(const QString &block) const return QString(); } -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h index 4d6c9438afd..08846f8e267 100644 --- a/src/plugins/mercurial/annotationhighlighter.h +++ b/src/plugins/mercurial/annotationhighlighter.h @@ -4,10 +4,10 @@ #pragma once #include + #include -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { @@ -20,5 +20,4 @@ private: const QRegularExpression changeset; }; -} //namespace Internal -}// namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/authenticationdialog.cpp b/src/plugins/mercurial/authenticationdialog.cpp index c04fb34d655..f64be98b7e9 100644 --- a/src/plugins/mercurial/authenticationdialog.cpp +++ b/src/plugins/mercurial/authenticationdialog.cpp @@ -3,6 +3,8 @@ #include "authenticationdialog.h" +#include "mercurialtr.h" + #include #include @@ -26,8 +28,8 @@ AuthenticationDialog::AuthenticationDialog(const QString &username, const QStrin Column { Form { - tr("Username:"), m_username, br, - tr("Password:"), m_password + Tr::tr("Username:"), m_username, br, + Tr::tr("Password:"), m_password }, buttonBox }.attachTo(this); diff --git a/src/plugins/mercurial/authenticationdialog.h b/src/plugins/mercurial/authenticationdialog.h index 2b6eb454401..b1f6108e74a 100644 --- a/src/plugins/mercurial/authenticationdialog.h +++ b/src/plugins/mercurial/authenticationdialog.h @@ -13,8 +13,6 @@ namespace Mercurial::Internal { class AuthenticationDialog : public QDialog { - Q_OBJECT - public: explicit AuthenticationDialog(const QString &username, const QString &password, QWidget *parent = nullptr); diff --git a/src/plugins/mercurial/commiteditor.cpp b/src/plugins/mercurial/commiteditor.cpp index dacfb9f89ab..3288d63389e 100644 --- a/src/plugins/mercurial/commiteditor.cpp +++ b/src/plugins/mercurial/commiteditor.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 "commiteditor.h" + #include "mercurialcommitwidget.h" +#include "mercurialtr.h" #include #include @@ -11,16 +13,15 @@ using namespace VcsBase; -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { CommitEditor::CommitEditor() : VcsBaseSubmitEditor(new MercurialCommitWidget) { - document()->setPreferredDisplayName(tr("Commit Editor")); + document()->setPreferredDisplayName(Tr::tr("Commit Editor")); } -MercurialCommitWidget *CommitEditor::commitWidget() +MercurialCommitWidget *CommitEditor::commitWidget() const { return static_cast(widget()); } @@ -59,15 +60,14 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra setFileModel(fileModel); } -QString CommitEditor::committerInfo() +QString CommitEditor::committerInfo() const { return commitWidget()->committer(); } -QString CommitEditor::repoRoot() +QString CommitEditor::repoRoot() const { return commitWidget()->repoRoot(); } -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/commiteditor.h b/src/plugins/mercurial/commiteditor.h index f94fec5ca13..867775da984 100644 --- a/src/plugins/mercurial/commiteditor.h +++ b/src/plugins/mercurial/commiteditor.h @@ -10,8 +10,7 @@ namespace VcsBase { class SubmitFileModel; } -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialCommitWidget; @@ -26,13 +25,12 @@ public: const QString &userName, const QString &email, const QList &repoStatus); - QString committerInfo(); - QString repoRoot(); + QString committerInfo() const; + QString repoRoot() const; private: - MercurialCommitWidget *commitWidget(); + MercurialCommitWidget *commitWidget() const; VcsBase::SubmitFileModel *fileModel = nullptr; }; -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/constants.h b/src/plugins/mercurial/constants.h index 677136a04a3..6e5cf9d1b8d 100644 --- a/src/plugins/mercurial/constants.h +++ b/src/plugins/mercurial/constants.h @@ -5,8 +5,7 @@ #include -namespace Mercurial { -namespace Constants { +namespace Mercurial::Constants { enum { debug = 0 }; const char MERCURIAL_PLUGIN[] = "MercurialPlugin"; @@ -65,5 +64,4 @@ const char OUTGOING[] = "Mercurial.Action.Outgoing"; const char COMMIT[] = "Mercurial.Action.Commit"; const char CREATE_REPOSITORY[] = "Mercurial.Action.CreateRepository"; -} // namespace Constants -} // namespace mercurial +} // Mercurial::Constants diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index ee43b9ef96e..265320b98bc 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.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 "mercurialclient.h" + #include "constants.h" +#include "mercurialtr.h" #include @@ -31,8 +33,7 @@ using namespace DiffEditor; using namespace Utils; using namespace VcsBase; -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialDiffEditorController : public VcsBaseDiffEditorController { @@ -163,13 +164,13 @@ static QString msgParentRevisionFailed(const FilePath &workingDirectory, const QString &revision, const QString &why) { - return MercurialClient::tr("Unable to find parent revisions of %1 in %2: %3"). + return Tr::tr("Unable to find parent revisions of %1 in %2: %3"). arg(revision, workingDirectory.toUserOutput(), why); } static inline QString msgParseParentsOutputFailed(const QString &output) { - return MercurialClient::tr("Cannot parse output: %1").arg(output); + return Tr::tr("Cannot parse output: %1").arg(output); } QStringList MercurialClient::parentRevisionsSync(const FilePath &workingDirectory, @@ -257,7 +258,7 @@ void MercurialClient::incoming(const FilePath &repositoryRoot, const QString &re if (!repository.isEmpty()) id += QLatin1Char('/') + repository; - const QString title = tr("Hg incoming %1").arg(id); + const QString title = Tr::tr("Hg incoming %1").arg(id); VcsBaseEditorWidget *editor = createVcsEditor(Constants::DIFFLOG_ID, title, repositoryRoot.toString(), VcsBaseEditor::getCodec(repositoryRoot.toString()), @@ -270,7 +271,7 @@ void MercurialClient::outgoing(const FilePath &repositoryRoot) QStringList args; args << QLatin1String("outgoing") << QLatin1String("-g") << QLatin1String("-p"); - const QString title = tr("Hg outgoing %1").arg(repositoryRoot.toUserOutput()); + const QString title = Tr::tr("Hg outgoing %1").arg(repositoryRoot.toUserOutput()); VcsBaseEditorWidget *editor = createVcsEditor(Constants::DIFFLOG_ID, title, repositoryRoot.toString(), VcsBaseEditor::getCodec(repositoryRoot.toString()), @@ -304,20 +305,20 @@ void MercurialClient::diff(const FilePath &workingDir, const QStringList &files, QString fileName; if (files.empty()) { - const QString title = tr("Mercurial Diff"); + const QString title = Tr::tr("Mercurial Diff"); const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName); const QString documentId = QString(Constants::MERCURIAL_PLUGIN) + ".DiffRepo." + sourceFile; requestReload(documentId, sourceFile, title, workingDir, {"diff"}); } else if (files.size() == 1) { fileName = files.at(0); - const QString title = tr("Mercurial Diff \"%1\"").arg(fileName); + const QString title = Tr::tr("Mercurial Diff \"%1\"").arg(fileName); const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName); const QString documentId = QString(Constants::MERCURIAL_PLUGIN) + ".DiffFile." + sourceFile; requestReload(documentId, sourceFile, title, workingDir, {"diff", fileName}); } else { - const QString title = tr("Mercurial Diff \"%1\"").arg(workingDir.toString()); + const QString title = Tr::tr("Mercurial Diff \"%1\"").arg(workingDir.toString()); const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName); const QString documentId = QString(Constants::MERCURIAL_PLUGIN) + ".DiffFile." + workingDir.toString(); @@ -443,5 +444,4 @@ void MercurialClient::parsePullOutput(const QString &output) emit needMerge(); } -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h index 9b85a1c2e6c..2351d3e7610 100644 --- a/src/plugins/mercurial/mercurialclient.h +++ b/src/plugins/mercurial/mercurialclient.h @@ -9,8 +9,7 @@ namespace VcsBase { class VcsBaseDiffEditorController; } -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialDiffEditorController; @@ -74,5 +73,4 @@ private: void parsePullOutput(const QString &output); }; -} //namespace Internal -} //namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/mercurialcommitwidget.cpp b/src/plugins/mercurial/mercurialcommitwidget.cpp index 993a3dbdfda..3299508eba3 100644 --- a/src/plugins/mercurial/mercurialcommitwidget.cpp +++ b/src/plugins/mercurial/mercurialcommitwidget.cpp @@ -3,6 +3,8 @@ #include "mercurialcommitwidget.h" +#include "mercurialtr.h" + #include #include #include @@ -12,23 +14,14 @@ #include #include +#include +#include #include #include #include //see the git submit widget for details of the syntax Highlighter -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - namespace Mercurial::Internal { // Highlighter for Mercurial submit messages. Make the first line bold, indicates @@ -99,8 +92,6 @@ void MercurialSubmitHighlighter::highlightBlock(const QString &text) class MercurialCommitPanel : public QWidget { - Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::MercurialCommitPanel) - public: MercurialCommitPanel() { @@ -114,18 +105,18 @@ public: Column { Group { - title(tr("General Information")), + title(Tr::tr("General Information")), Form { - tr("Repository:"), m_repositoryLabel, br, - tr("Branch:"), m_branchLabel, + Tr::tr("Repository:"), m_repositoryLabel, br, + Tr::tr("Branch:"), m_branchLabel, } }, Group { - title(tr("Commit Information")), + title(Tr::tr("Commit Information")), Row { Form { - tr("Author:"), m_authorLineEdit, br, - tr("Email:"), m_emailLineEdit, + Tr::tr("Author:"), m_authorLineEdit, br, + Tr::tr("Email:"), m_emailLineEdit, }, } } diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp index c267da174cf..7682b9a9556 100644 --- a/src/plugins/mercurial/mercurialeditor.cpp +++ b/src/plugins/mercurial/mercurialeditor.cpp @@ -2,10 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "mercurialeditor.h" + #include "annotationhighlighter.h" #include "constants.h" -#include "mercurialplugin.h" #include "mercurialclient.h" +#include "mercurialtr.h" #include #include @@ -19,8 +20,7 @@ using namespace Utils; -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { // use QRegularExpression::anchoredPattern() when minimum Qt is raised to 5.12+ MercurialEditorWidget::MercurialEditorWidget(MercurialClient *client) : @@ -31,8 +31,8 @@ MercurialEditorWidget::MercurialEditorWidget(MercurialClient *client) : { setDiffFilePattern(Constants::DIFFIDENTIFIER); setLogEntryPattern("^changeset:\\s+(\\S+)$"); - setAnnotateRevisionTextFormat(tr("&Annotate %1")); - setAnnotatePreviousRevisionTextFormat(tr("Annotate &parent revision %1")); + setAnnotateRevisionTextFormat(Tr::tr("&Annotate %1")); + setAnnotatePreviousRevisionTextFormat(Tr::tr("Annotate &parent revision %1")); setAnnotationEntryPattern(Constants::CHANGESETID12); } @@ -71,5 +71,4 @@ QStringList MercurialEditorWidget::annotationPreviousVersions(const QString &rev return m_client->parentRevisionsSync(FilePath::fromString(workingDirectory), fi.fileName(), revision); } -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/mercurialeditor.h b/src/plugins/mercurial/mercurialeditor.h index 291718b4e9a..6dbcf4206b7 100644 --- a/src/plugins/mercurial/mercurialeditor.h +++ b/src/plugins/mercurial/mercurialeditor.h @@ -7,14 +7,12 @@ #include -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialClient; class MercurialEditorWidget : public VcsBase::VcsBaseEditorWidget { - Q_OBJECT public: explicit MercurialEditorWidget(MercurialClient *client); @@ -32,5 +30,4 @@ private: MercurialClient *m_client; }; -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 5ac0181f240..389accbd641 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -8,6 +8,7 @@ #include "mercurialclient.h" #include "mercurialeditor.h" #include "mercurialsettings.h" +#include "mercurialtr.h" #include "revertdialog.h" #include "srcdestdialog.h" @@ -49,8 +50,7 @@ using namespace VcsBase; using namespace Utils; using namespace std::placeholders; -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialTopicCache : public Core::IVersionControl::TopicCache { @@ -102,8 +102,6 @@ const VcsBaseSubmitEditorParameters submitEditorParameters { class MercurialPluginPrivate final : public VcsBase::VcsBasePluginPrivate { - Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::MercurialPlugin) - public: MercurialPluginPrivate(); @@ -256,7 +254,7 @@ MercurialPluginPrivate::MercurialPluginPrivate() const QString prefix = QLatin1String("hg"); m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix, this); - m_commandLocator->setDescription(tr("Triggers a Mercurial version control operation.")); + m_commandLocator->setDescription(Tr::tr("Triggers a Mercurial version control operation.")); createMenu(context); @@ -268,7 +266,7 @@ void MercurialPluginPrivate::createMenu(const Core::Context &context) // Create menu item for Mercurial m_mercurialContainer = Core::ActionManager::createMenu("Mercurial.MercurialMenu"); QMenu *menu = m_mercurialContainer->menu(); - menu->setTitle(tr("Me&rcurial")); + menu->setTitle(Tr::tr("Me&rcurial")); createFileActions(context); m_mercurialContainer->addSeparator(context); @@ -287,54 +285,54 @@ void MercurialPluginPrivate::createFileActions(const Core::Context &context) { Core::Command *command; - annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); + annotateFile = new ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(annotateFile, Utils::Id(Constants::ANNOTATE), context); command->setAttribute(Core::Command::CA_UpdateText); connect(annotateFile, &QAction::triggered, this, &MercurialPluginPrivate::annotateCurrentFile); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); + diffFile = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(diffFile, Utils::Id(Constants::DIFF), context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+D") : tr("Alt+G,Alt+D"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+D") : Tr::tr("Alt+G,Alt+D"))); connect(diffFile, &QAction::triggered, this, &MercurialPluginPrivate::diffCurrentFile); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this); + logFile = new ParameterAction(Tr::tr("Log Current File"), Tr::tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(logFile, Utils::Id(Constants::LOG), context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+L") : tr("Alt+G,Alt+L"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+L") : Tr::tr("Alt+G,Alt+L"))); connect(logFile, &QAction::triggered, this, &MercurialPluginPrivate::logCurrentFile); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this); + statusFile = new ParameterAction(Tr::tr("Status Current File"), Tr::tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(statusFile, Utils::Id(Constants::STATUS), context); command->setAttribute(Core::Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+S") : tr("Alt+G,Alt+S"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+S") : Tr::tr("Alt+G,Alt+S"))); connect(statusFile, &QAction::triggered, this, &MercurialPluginPrivate::statusCurrentFile); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); m_mercurialContainer->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 = Core::ActionManager::registerAction(m_addAction, Utils::Id(Constants::ADD), context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_addAction, &QAction::triggered, this, &MercurialPluginPrivate::addCurrentFile); m_mercurialContainer->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 = Core::ActionManager::registerAction(m_deleteAction, Utils::Id(Constants::DELETE), context); command->setAttribute(Core::Command::CA_UpdateText); connect(m_deleteAction, &QAction::triggered, this, &MercurialPluginPrivate::promptToDeleteCurrentFile); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - revertFile = new ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); + revertFile = new ParameterAction(Tr::tr("Revert Current File..."), Tr::tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); command = Core::ActionManager::registerAction(revertFile, Utils::Id(Constants::REVERT), context); command->setAttribute(Core::Command::CA_UpdateText); connect(revertFile, &QAction::triggered, this, &MercurialPluginPrivate::revertCurrentFile); @@ -394,28 +392,28 @@ void MercurialPluginPrivate::statusCurrentFile() void MercurialPluginPrivate::createDirectoryActions(const Core::Context &context) { - auto action = new QAction(tr("Diff"), this); + auto action = new QAction(Tr::tr("Diff"), this); m_repositoryActionList.append(action); Core::Command *command = Core::ActionManager::registerAction(action, Utils::Id(Constants::DIFFMULTI), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::diffRepository); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Log"), this); + action = new QAction(Tr::tr("Log"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::LOGMULTI), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::logRepository); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Revert..."), this); + action = new QAction(Tr::tr("Revert..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::REVERTMULTI), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::revertMulti); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Status"), this); + action = new QAction(Tr::tr("Status"), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::STATUSMULTI), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::statusMulti); @@ -458,57 +456,57 @@ void MercurialPluginPrivate::statusMulti() void MercurialPluginPrivate::createRepositoryActions(const Core::Context &context) { - auto action = new QAction(tr("Pull..."), this); + auto action = new QAction(Tr::tr("Pull..."), this); m_repositoryActionList.append(action); Core::Command *command = Core::ActionManager::registerAction(action, Utils::Id(Constants::PULL), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::pull); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Push..."), this); + action = new QAction(Tr::tr("Push..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::PUSH), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::push); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Update..."), this); + action = new QAction(Tr::tr("Update..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::UPDATE), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::update); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Import..."), this); + action = new QAction(Tr::tr("Import..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::IMPORT), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::import); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Incoming..."), this); + action = new QAction(Tr::tr("Incoming..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::INCOMING), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::incoming); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Outgoing..."), this); + action = new QAction(Tr::tr("Outgoing..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::OUTGOING), context); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::outgoing); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - action = new QAction(tr("Commit..."), this); + action = new QAction(Tr::tr("Commit..."), this); m_repositoryActionList.append(action); command = Core::ActionManager::registerAction(action, Utils::Id(Constants::COMMIT), context); - command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+C") : tr("Alt+G,Alt+C"))); + command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+C") : Tr::tr("Alt+G,Alt+C"))); connect(action, &QAction::triggered, this, &MercurialPluginPrivate::commit); m_mercurialContainer->addAction(command); m_commandLocator->appendCommand(command); - m_createRepositoryAction = new QAction(tr("Create Repository..."), this); + m_createRepositoryAction = new QAction(Tr::tr("Create Repository..."), this); command = Core::ActionManager::registerAction(m_createRepositoryAction, Utils::Id(Constants::CREATE_REPOSITORY), context); connect(m_createRepositoryAction, &QAction::triggered, this, &MercurialPluginPrivate::createRepository); m_mercurialContainer->addAction(command); @@ -520,7 +518,7 @@ void MercurialPluginPrivate::pull() QTC_ASSERT(state.hasTopLevel(), return); SrcDestDialog dialog(state, SrcDestDialog::incoming, Core::ICore::dialogParent()); - dialog.setWindowTitle(tr("Pull Source")); + dialog.setWindowTitle(Tr::tr("Pull Source")); if (dialog.exec() != QDialog::Accepted) return; m_client.synchronousPull(dialog.workingDir(), dialog.getRepositoryString()); @@ -532,7 +530,7 @@ void MercurialPluginPrivate::push() QTC_ASSERT(state.hasTopLevel(), return); SrcDestDialog dialog(state, SrcDestDialog::outgoing, Core::ICore::dialogParent()); - dialog.setWindowTitle(tr("Push Destination")); + dialog.setWindowTitle(Tr::tr("Push Destination")); if (dialog.exec() != QDialog::Accepted) return; m_client.synchronousPush(dialog.workingDir(), dialog.getRepositoryString()); @@ -544,7 +542,7 @@ void MercurialPluginPrivate::update() QTC_ASSERT(state.hasTopLevel(), return); RevertDialog updateDialog(Core::ICore::dialogParent()); - updateDialog.setWindowTitle(tr("Update")); + updateDialog.setWindowTitle(Tr::tr("Update")); if (updateDialog.exec() != QDialog::Accepted) return; m_client.update(state.topLevel(), updateDialog.revision()); @@ -572,7 +570,7 @@ void MercurialPluginPrivate::incoming() QTC_ASSERT(state.hasTopLevel(), return); SrcDestDialog dialog(state, SrcDestDialog::incoming, Core::ICore::dialogParent()); - dialog.setWindowTitle(tr("Incoming Source")); + dialog.setWindowTitle(Tr::tr("Incoming Source")); if (dialog.exec() != QDialog::Accepted) return; m_client.incoming(state.topLevel(), dialog.getRepositoryString()); @@ -608,7 +606,7 @@ void MercurialPluginPrivate::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 QString branch = vcsTopic(m_submitRepository); @@ -716,7 +714,7 @@ void MercurialPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as) QString MercurialPluginPrivate::displayName() const { - return tr("Mercurial"); + return Tr::tr("Mercurial"); } Utils::Id MercurialPluginPrivate::id() const @@ -896,5 +894,4 @@ void MercurialPlugin::testLogResolving() } #endif -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h index be127f8d4aa..7bb45e48de3 100644 --- a/src/plugins/mercurial/mercurialplugin.h +++ b/src/plugins/mercurial/mercurialplugin.h @@ -5,8 +5,7 @@ #include -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialPlugin final : public ExtensionSystem::IPlugin { @@ -27,5 +26,4 @@ private slots: }; -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/mercurialsettings.cpp b/src/plugins/mercurial/mercurialsettings.cpp index 08a82343aad..368e2ce416a 100644 --- a/src/plugins/mercurial/mercurialsettings.cpp +++ b/src/plugins/mercurial/mercurialsettings.cpp @@ -4,6 +4,7 @@ #include "mercurialsettings.h" #include "constants.h" +#include "mercurialtr.h" #include @@ -11,8 +12,7 @@ using namespace Utils; -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { MercurialSettings::MercurialSettings() { @@ -23,19 +23,19 @@ MercurialSettings::MercurialSettings() binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay); binaryPath.setExpectedKind(PathChooser::ExistingCommand); binaryPath.setDefaultValue(Constants::MERCURIALDEFAULT); - binaryPath.setDisplayName(tr("Mercurial Command")); + binaryPath.setDisplayName(Tr::tr("Mercurial Command")); binaryPath.setHistoryCompleter("Bazaar.Command.History"); - binaryPath.setLabelText(tr("Command:")); + binaryPath.setLabelText(Tr::tr("Command:")); 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(&diffIgnoreWhiteSpace); diffIgnoreWhiteSpace.setSettingsKey("diffIgnoreWhiteSpace"); @@ -49,7 +49,7 @@ MercurialSettings::MercurialSettings() MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings) { setId(VcsBase::Constants::VCS_ID_MERCURIAL); - setDisplayName(MercurialSettings::tr("Mercurial")); + setDisplayName(Tr::tr("Mercurial")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); setSettings(settings); @@ -59,12 +59,12 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings) Column { Group { - title(MercurialSettings::tr("Configuration")), + title(Tr::tr("Configuration")), Row { s.binaryPath } }, Group { - title(MercurialSettings::tr("User")), + title(Tr::tr("User")), Form { s.userName, s.userEmail @@ -72,7 +72,7 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings) }, Group { - title(MercurialSettings::tr("Miscellaneous")), + title(Tr::tr("Miscellaneous")), Row { s.logCount, s.timeout, @@ -85,5 +85,4 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings) }); } -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/mercurialsettings.h b/src/plugins/mercurial/mercurialsettings.h index 0a1482a6ca4..a09946838aa 100644 --- a/src/plugins/mercurial/mercurialsettings.h +++ b/src/plugins/mercurial/mercurialsettings.h @@ -7,18 +7,15 @@ #include -namespace Mercurial { -namespace Internal { +namespace Mercurial::Internal { class MercurialSettings : public VcsBase::VcsBaseSettings { - Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::MercurialSettings) - public: + MercurialSettings(); + Utils::StringAspect diffIgnoreWhiteSpace; Utils::StringAspect diffIgnoreBlankLines; - - MercurialSettings(); }; class MercurialSettingsPage final : public Core::IOptionsPage @@ -27,5 +24,4 @@ public: explicit MercurialSettingsPage(MercurialSettings *settings); }; -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/revertdialog.cpp b/src/plugins/mercurial/revertdialog.cpp index fb89bb238bf..27111f148bb 100644 --- a/src/plugins/mercurial/revertdialog.cpp +++ b/src/plugins/mercurial/revertdialog.cpp @@ -3,6 +3,8 @@ #include "revertdialog.h" +#include "mercurialtr.h" + #include #include @@ -17,9 +19,9 @@ RevertDialog::RevertDialog(QWidget *parent) : QDialog(parent) { 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); @@ -30,7 +32,7 @@ RevertDialog::RevertDialog(QWidget *parent) using namespace Layouting; Form { - tr("Revision:"), m_revisionLineEdit, + Tr::tr("Revision:"), m_revisionLineEdit, }.attachTo(groupBox, WithMargins); Column { diff --git a/src/plugins/mercurial/revertdialog.h b/src/plugins/mercurial/revertdialog.h index d480f0a8191..46e5321e006 100644 --- a/src/plugins/mercurial/revertdialog.h +++ b/src/plugins/mercurial/revertdialog.h @@ -13,8 +13,6 @@ namespace Mercurial::Internal { class RevertDialog : public QDialog { - Q_OBJECT - public: RevertDialog(QWidget *parent = nullptr); ~RevertDialog() override; diff --git a/src/plugins/mercurial/srcdestdialog.cpp b/src/plugins/mercurial/srcdestdialog.cpp index 792eb41cc4d..ffcac62f6a3 100644 --- a/src/plugins/mercurial/srcdestdialog.cpp +++ b/src/plugins/mercurial/srcdestdialog.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 "authenticationdialog.h" + +#include "mercurialtr.h" #include "srcdestdialog.h" #include @@ -25,13 +27,13 @@ SrcDestDialog::SrcDestDialog(const VcsBasePluginState &state, Direction dir, QWi { resize(400, 187); - 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:")); - 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_localPathChooser = new Utils::PathChooser; m_localPathChooser->setEnabled(false); @@ -39,14 +41,14 @@ SrcDestDialog::SrcDestDialog(const VcsBasePluginState &state, Direction dir, QWi m_localPathChooser->setHistoryCompleter("Hg.SourceDir.History"); m_urlLineEdit = new QLineEdit; - m_urlLineEdit->setToolTip(tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.", nullptr)); + m_urlLineEdit->setToolTip(Tr::tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.", nullptr)); m_urlLineEdit->setEnabled(false); QUrl repoUrl = getRepoUrl(); if (!repoUrl.password().isEmpty()) repoUrl.setPassword(QLatin1String("***")); - m_promptForCredentials = new QCheckBox(tr("Prompt for credentials")); + m_promptForCredentials = new QCheckBox(Tr::tr("Prompt for credentials")); m_promptForCredentials->setChecked(!repoUrl.scheme().isEmpty() && repoUrl.scheme() != QLatin1String("file")); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); diff --git a/src/plugins/mercurial/srcdestdialog.h b/src/plugins/mercurial/srcdestdialog.h index b448af2ba81..78510ed454e 100644 --- a/src/plugins/mercurial/srcdestdialog.h +++ b/src/plugins/mercurial/srcdestdialog.h @@ -19,8 +19,6 @@ namespace Mercurial::Internal { class SrcDestDialog : public QDialog { - Q_OBJECT - public: enum Direction { outgoing, incoming };