From 928a7d2087406abef2b076705ba4aa51b8ef3c92 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 6 Oct 2022 14:05:43 +0200 Subject: [PATCH] Git: Convert to Tr::tr Change-Id: I7fb1753109a9263c70c01713f5f4895db6b73662 Reviewed-by: Alessandro Portale --- share/qtcreator/translations/qtcreator_cs.ts | 364 +--------- share/qtcreator/translations/qtcreator_da.ts | 244 +------ share/qtcreator/translations/qtcreator_de.ts | 243 +------ share/qtcreator/translations/qtcreator_es.ts | 46 +- share/qtcreator/translations/qtcreator_fr.ts | 300 +------- share/qtcreator/translations/qtcreator_hr.ts | 244 +------ share/qtcreator/translations/qtcreator_hu.ts | 46 +- share/qtcreator/translations/qtcreator_it.ts | 42 +- share/qtcreator/translations/qtcreator_ja.ts | 659 +----------------- share/qtcreator/translations/qtcreator_pl.ts | 221 +----- share/qtcreator/translations/qtcreator_ru.ts | 273 +------- share/qtcreator/translations/qtcreator_sl.ts | 116 +-- share/qtcreator/translations/qtcreator_uk.ts | 262 +------ .../qtcreator/translations/qtcreator_zh_CN.ts | 203 +----- .../qtcreator/translations/qtcreator_zh_TW.ts | 140 +--- src/plugins/git/branchadddialog.cpp | 27 +- src/plugins/git/branchadddialog.h | 10 +- src/plugins/git/branchcheckoutdialog.cpp | 24 +- src/plugins/git/branchcheckoutdialog.h | 8 +- src/plugins/git/branchmodel.cpp | 17 +- src/plugins/git/branchmodel.h | 19 +- src/plugins/git/branchview.cpp | 79 ++- src/plugins/git/branchview.h | 12 +- src/plugins/git/changeselectiondialog.cpp | 43 +- src/plugins/git/changeselectiondialog.h | 7 +- src/plugins/git/commitdata.cpp | 32 +- src/plugins/git/commitdata.h | 15 +- .../git/gerrit/authenticationdialog.cpp | 14 +- src/plugins/git/gerrit/gerritdialog.cpp | 23 +- src/plugins/git/gerrit/gerritmodel.cpp | 47 +- src/plugins/git/gerrit/gerritoptionspage.cpp | 19 +- src/plugins/git/gerrit/gerritplugin.cpp | 24 +- src/plugins/git/gerrit/gerritpushdialog.cpp | 21 +- .../git/gerrit/gerritremotechooser.cpp | 5 +- src/plugins/git/gitclient.cpp | 297 ++++---- src/plugins/git/gitclient.h | 8 +- src/plugins/git/giteditor.cpp | 61 +- src/plugins/git/giteditor.h | 6 +- src/plugins/git/gitgrep.cpp | 34 +- src/plugins/git/gitgrep.h | 11 +- src/plugins/git/githighlighters.cpp | 8 +- src/plugins/git/githighlighters.h | 7 +- src/plugins/git/gitplugin.cpp | 193 +++-- src/plugins/git/gitplugin.h | 6 +- src/plugins/git/gitsettings.cpp | 40 +- src/plugins/git/gitsettings.h | 8 +- src/plugins/git/gitsubmiteditor.cpp | 14 +- src/plugins/git/gitsubmiteditor.h | 6 +- src/plugins/git/gitsubmiteditorwidget.cpp | 55 +- src/plugins/git/gitsubmiteditorwidget.h | 7 +- src/plugins/git/gitutils.cpp | 6 +- src/plugins/git/gitutils.h | 9 +- src/plugins/git/logchangedialog.cpp | 20 +- src/plugins/git/logchangedialog.h | 8 +- src/plugins/git/mergetool.cpp | 50 +- src/plugins/git/mergetool.h | 8 +- src/plugins/git/remotedialog.cpp | 33 +- src/plugins/git/remotedialog.h | 8 +- src/plugins/git/remotemodel.cpp | 11 +- src/plugins/git/remotemodel.h | 7 +- src/plugins/git/stashdialog.cpp | 43 +- src/plugins/git/stashdialog.h | 8 +- 62 files changed, 776 insertions(+), 4045 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index ef0a6913417..6fa44c2b0a6 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -6602,7 +6602,7 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš - Git::Internal::BranchDialog + Git Checkout Načíst (checkout) @@ -6615,14 +6615,6 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš Unable to find the repository directory for '%1'. Adresář skladiště pro '%1' se nepodařilo najít. - - Diff - Rozdíly (diff) - - - Refresh - Obnovit - Delete... Smazat... @@ -6715,30 +6707,14 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš General information Obecné informace - - Repository: - Skladiště: - Remote branches Vzdálené větve - - Remote Branches - Vzdálené větve - - - Re&fresh - &Obnovit - &Add... Přid&at... - - &Remove - Odst&ranit - &Diff Roz&díly @@ -6780,17 +6756,10 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš &Track &Sledovat - - Reset - - Set current branch to track the selected one. - - - Git::Internal::ChangeSelectionDialog Select a Git commit Vyberte odeslání do Git @@ -6807,10 +6776,6 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš Select Git Repository Vyberte skladiště Git - - Error - Chyba - Selected directory is not a Git repository. Vybraný adresář není skladištěm Git. @@ -6827,10 +6792,6 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš &Show Uká&zat - - Cherry &Pick - Cherry-&Pick - &Revert &Vrátit @@ -6887,9 +6848,6 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš HEAD HEAD - - - Git::Internal::GitClient Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work. Upozornění: přídavný modul Git pro QtCreator zatím ještě není schopen spolupracovat se serverem. Tudíž nebude pracovat ani ruční rozpoznání ssh a tak dále. @@ -7083,10 +7041,6 @@ více času, než je nastaveno. V takovém případě by se měla hodnota zvýš Unable to run show: %1: %2 Příkaz pro ukázání (show) se nepodařilo provést: %1: %2 - - Changes - Změny - You have modified files. Would you like to stash your changes? Soubory byly změněny. Chcete provést příkaz pro ulití (stash) těchto změn? @@ -7345,18 +7299,10 @@ Chcete nyní zapsat? What would you like to do with local changes in: Co chcete dělat s následujícími místními změnami: - - Stash && Pop - - Stash local changes and pop when %1 finishes. - - Stash - Odložit (stash) - Stash local changes and execute %1. Odložit místní změny a provést %1. @@ -7377,10 +7323,6 @@ Chcete nyní zapsat? Stash local changes and continue. Odložit místní změny a pokračovat. - - Discard - Odmítnout - Discard (reset) local changes and continue. Zahodit (reset) místní změny a pokračovat. @@ -7448,10 +7390,6 @@ Chcete nyní zapsat? Commit now? Pro dokončení vrácení změn je nutno provést zápis. Chcete nyní zapsat? - - Commit - Použít - Create Local Branch Vytvořit místní větev @@ -7545,10 +7483,6 @@ Commit now? - - Revert - Vrátit změny (revert) - The file has been changed. Do you want to revert it? Soubor byl změněn. Chcete vrátit změny? @@ -7605,9 +7539,6 @@ Commit now? Cannot determine git version: %1 Používanou verzi Gitu se nepodařilo určit. %1 - - - Git::Internal::GitPlugin &Git &Git @@ -7752,18 +7683,10 @@ Commit now? Abort Revert Zrušit vrácení změn - - Continue Rebase - Pokračovat v přeskládání - Continue Cherry Pick Pokračovat ve výběrovém slučování - - Continue Revert - Pokračovat ve vracení změn - Diff &Selected Files Rozdíly pro &vybrané soubory @@ -7902,10 +7825,6 @@ Commit now? Undo Project Changes Změny v projektu vrátit zpět - - Stash - Odložit (stash) - Saves the current state of your work. Uloží nynější stav vaší práce. @@ -8229,23 +8148,10 @@ Commit now? The commit message check failed. Do you want to commit the change? Ověření popisu týkajícího se odeslání se nezdařilo. Přesto chcete odeslání změn provést? - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' Spustitelný soubor '%1' se v cestě '%2' nepodařilo najít - - - Git::Internal::GitSubmitEditor - - Git Commit - Git Commit - - - - Git::Internal::GitSubmitPanel General Information Obecné informace @@ -8282,9 +8188,6 @@ Commit now? By&pass hooks O&bejít podmíněné akce (hooks) - - - Git::Internal::LocalBranchModel <New branch> <Nová větev> @@ -8293,9 +8196,6 @@ Commit now? Type to create a new branch Zadejte název pro novou větev - - - Git::Internal::SettingsPage Git Git @@ -8384,10 +8284,6 @@ Commit now? Set "HOME" environment variable Nastavit proměnnou prostředí "HOME" - - Gitk - Gitk - Arguments: Argumenty: @@ -8428,13 +8324,6 @@ Commit now? Show diff side-by-side Ukázat změny vedle sebe - - Repository Browser - Prohlížeč skladiště - - - - GitCommand '%1' failed (exit code %2). @@ -19055,7 +18944,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás - Git::Internal::CloneWizard + Git Clones a project from a git repository. Vytvoří přesnou kopii projektu ze skladiště jménem Git. @@ -19076,9 +18965,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Git Repository Clone Klon skladiště Git - - - Git::CloneWizardPage Location Umístění @@ -21089,7 +20975,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name - Git::Internal::StashDialog + Git Stashes Odložené změny @@ -21110,10 +20996,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameDelete all... Smazat vše... - - Delete... - Smazat... - Show Ukázat @@ -21176,10 +21058,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name&Delete... S&mazat... - - &Show - Uká&zat - R&estore... &Obnovit... @@ -21189,10 +21067,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameRestore a git stash to new branch to be created Obnovit jako &větev... - - Re&fresh - &Obnovit - Delete Stashes Smazat odložené změny @@ -21219,10 +21093,6 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením. Restore Stash to Branch Použít odloženou jako větev - - Branch: - Větev: - Stash Restore Použití odložené změny @@ -24706,28 +24576,15 @@ Proces Pdb po určité době od úspěšného spuštění spadl. - Git::Internal::RemoteBranchModel + Git (no branch) <žádná větev> - - - GitClient - - Unable to determine the repository for %1. - Skladiště pro %1 se nepodařilo určit. - - - - Git::Internal::GitCommand Error: Git timed out after %1s. Chyba: Překročení času u Gitu po %1s. - - - Git::Internal::GitEditor Blame %1 Anotace (blame) pro %1 @@ -29519,7 +29376,7 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap - Git::Internal::BranchAddDialog + Git Dialog Dialog @@ -29528,10 +29385,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Branch Name: Název větve: - - CheckBox - Zaškrtávací okénko - Add Branch Přidat větev @@ -29548,9 +29401,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Track local branch '%1' Sledovat místní větev '%1' - - - Git::Internal::RemoteAdditionDialog Add Remote Přidat vzdálené @@ -29563,9 +29413,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap URL: Adresa (URL): - - - Git::Internal::RemoteDialog Remotes Vzdálené (Remotes) @@ -29574,10 +29421,6 @@ Při GDB může být zadána posloupnost příkazů oddělená oddělovačem &ap Re&fresh O&bnovit - - &Add... - Přid&at... - F&etch &Přivést (fetch) @@ -34971,7 +34814,7 @@ Tyto soubory jsou zachovány. - Git::Internal::BranchModel + Git Local Branches Místní větve @@ -34984,9 +34827,6 @@ Tyto soubory jsou zachovány. Tags Značky - - - Git::Internal::BaseGitDiffArgumentsWidget Use the patience algorithm for calculating the differences. Použít algoritmus "patience diff" pro výpočet rozdílů. @@ -35003,9 +34843,6 @@ Tyto soubory jsou zachovány. Ignore Whitespace Nevšímat si bílých znaků - - - Git::Internal::GitShowArgumentsWidget Select the pretty printing format. Vybrat výstupní formát. @@ -35038,9 +34875,6 @@ Tyto soubory jsou zachovány. raw nezpracovaný - - - Git::Internal::GitBlameArgumentsWidget Hide the date of a change from the output. Datum změny ve výstupu neukazovat. @@ -35049,17 +34883,6 @@ Tyto soubory jsou zachovány. Omit Date Vynechat datum - - Ignore whitespace only changes. - Nevšímat si změn bílých znaků. - - - Ignore Whitespace - Nevšímat si bílých znaků - - - - Git::Internal::SettingsPageWidget Set the environment variable HOME to '%1' (%2). @@ -48095,7 +47918,7 @@ Nainstalujte, prosím, alespoň jedno SDK. - Git::Internal::CommitData + Git untracked neverzováno @@ -48140,9 +47963,6 @@ Nainstalujte, prosím, alespoň jedno SDK. updated aktualizováno - - - Gerrit::Internal::GerritDialog Gerrit %1@%2 Gerrit %1@%2 @@ -48195,18 +48015,10 @@ Nainstalujte, prosím, alespoň jedno SDK. &Checkout... Načíst (checkout)... - - &Show - Uká&zat - Cherry &Pick &Výběrově sloučit - - &Checkout - &Načíst (checkout) - Diff... Rozdíly... @@ -48215,21 +48027,10 @@ Nainstalujte, prosím, alespoň jedno SDK. Apply... Použít... - - Checkout... - Načíst (checkout)... - - - Refresh - Obnovit - Fetching "%1"... Natahuje se "%1"... - - - Gerrit::Internal::GerritModel Subject: %1 Number: %2 Id: %3 @@ -48278,10 +48079,6 @@ Schválení: %12 Approvals Schválení - - Status - Stav - Parse error: '%1' -> %2 Chyba ve zpracování: '%1' -> %2 @@ -48294,9 +48091,6 @@ Schválení: %12 Parse error in line '%1' Chyba ve zpracování na řádku: '%1' - - - Gerrit::Internal::QueryContext Gerrit Gerrit @@ -48333,16 +48127,6 @@ Chcete jej ukončit? Keep Running Pokračovat - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -48423,25 +48207,10 @@ asked to confirm the repository path. "canonicalWebUrl"není nastavena v souboru "gerrit.config". - - - Gerrit::Internal::FetchContext Gerrit Fetch Gerrit Fetch (přivedení) - - %1 crashed. - %1 spadl. - - - %1 returned %2. - %1 vrátil %2. - - - Error running %1: %2 - Chyba při spouštění %1: %2 - Error writing to temporary file. Chyba při zápisu do dočasného souboru. @@ -48454,9 +48223,6 @@ asked to confirm the repository path. Cherry-picking %1... Vybírá se %1... - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -48507,9 +48273,6 @@ nepatří k ověřeným Remotes v %3. Vybrat jinou složku? Enter Local Repository for '%1' (%2) Vstoupit do místního skladiště pro '%1' (%2) - - - Git::Internal::GitLogArgumentsWidget Show Diff Ukázat rozdíly @@ -48527,39 +48290,6 @@ nepatří k ověřeným Remotes v %3. Vybrat jinou složku? Ukázat graf jako text. - - Git::Internal::ResetDialog - - Sha1 - Sha1 - - - Subject - Předmět - - - Reset to: - Nastavit znovu na: - - - Reset type: - XXX: neověřeno za běhu - Druh znovunastavení: - - - Hard Reset - XXX: Včetně pracovního stromu (lepší, ale asi moc dlouhé?); Napevno (hard) - I pracovní strom (hard) - - - Soft Reset - Pouze HEAD (soft) - - - Undo Changes to %1 - Změny pro %1 vrátit zpět - - Locator::Internal::ExecuteFilter @@ -51221,11 +50951,7 @@ Zasáhnutí do modulu nebo nastavení bodů přerušení podle souboru, a oček - Git::Internal::GitSubmitEditorWidget - - Detached HEAD - Odpojená HEAD - + Git Select Change Vybrat změnu @@ -52582,11 +52308,7 @@ nelze najít v cestě. - Git::Internal::BranchCheckoutDialog - - Dialog - Dialog - + Git Local Changes Found. Choose Action: Nalezeny místní změny. Vyberte úkon: @@ -54252,11 +53974,7 @@ nelze najít v cestě. - Git::Internal::MergeTool - - Error - Chyba - + Git File input for the merge tool requires Git 1.7.8, or later. XXX: ověřit? @@ -54339,52 +54057,10 @@ Vzdálený: %4 Merge tool process finished successfully. Nástroj pro slučování doběhl úspěšně. - - No changes found. - Beze změn. - - - Skip - Přeskočit - Merge tool process finished successully. Nástroj pro slučování doběhl úspěšně. - - Continue Rebase - Pokračovat v přeskládání - - - Continue rebase? - Pokračovat v přeskládání? - - - Continue - Pokračovat - - - Continue Revert - Pokračovat ve vracení změn - - - You need to commit changes to finish revert. -Commit now? - Pro dokončení vrácení změn je nutno provést zápis. Chcete nyní zapsat? - - - Commit - Zapsat (commit) - - - Continue Cherry-Picking - Pokračovat ve výběrovém slučování - - - You need to commit changes to finish cherry-picking. -Commit now? - Pro dokončení výběrového slučování je nutno provést zápis. Chcete nyní zapsat? - Merge tool process terminated with exit code %1 Proces slučovacího nástroje ukončen, vrácená hodnota %1 @@ -55565,7 +55241,7 @@ Chcete je nyní načíst? - Gerrit::Internal::GerritPushDialog + Git Push to Gerrit Odvést do Gerritu... @@ -56681,7 +56357,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - Git::Internal::GitDiffHandler + Git Working tree Pracovní kopie @@ -56690,24 +56366,10 @@ Lze používat části jmen, pokud jsou jednoznačné. Index Index - - Waiting for data... - Čeká se na data... - - - - Git::Internal::LogChangeWidget Sha1 Sha1 - - Subject - Předmět - - - - Git::Internal::LogChangeDialog Reset to: Nastavit znovu na: @@ -58911,7 +58573,7 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr - Git::Internal::GitDiffSwitcher + Git Switch to Text Diff Editor Přepnout na editor rozdílů v textu diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 11295348df2..d37a777ea3a 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -16521,7 +16521,7 @@ Se også Google-test-indstillinger. - Gerrit::Internal::AuthenticationDialog + Git Authentication Autentifikation @@ -16546,9 +16546,6 @@ Se også Google-test-indstillinger. Anonymous Anonym - - - Gerrit::Internal::FetchContext Fetching from Gerrit Henter fra Gerrit @@ -16565,9 +16562,6 @@ Se også Google-test-indstillinger. Error running %1: %2 Fejl ved kørsel af %1: %2 - - - Gerrit::Internal::GerritDialog Changes Ændringer @@ -16624,17 +16618,10 @@ Note: This can expose you to man-in-the-middle attack. Vil du deaktivere SSL-verifikation for denne server? Bemærk: Dette kan udsætte dig for man-in-the-middle-angreb. - - - Gerrit::Internal::GerritModel (Draft) (kladde) - - Subject - Emne - Owner Ejer @@ -16683,16 +16670,6 @@ Bemærk: Dette kan udsætte dig for man-in-the-middle-angreb. Parse error: "%1" Parse-fejl: "%1" - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -16701,10 +16678,6 @@ Bemærk: Dette kan udsætte dig for man-in-the-middle-angreb. &Host: &Vært: - - &User: - &Bruger: - &ssh: &ssh: @@ -16729,9 +16702,6 @@ Bemærk: Dette kan udsætte dig for man-in-the-middle-angreb. "canonicalWebUrl" ikke er konfigureret i filen "gerrit.config". - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -16774,9 +16744,6 @@ blev ikke verificeret blandt fjerne i %3. Vælg anden mappe? Enter Local Repository for "%1" (%2) Indtast lokal repository for "%1" (%2) - - - Gerrit::Internal::GerritPushDialog Push to Gerrit Push til Gerrit @@ -16883,9 +16850,6 @@ Delvist tilvalg - Ændr ikke aktuelle tilstand. &Work-in-progress &Igangværende arbejde - - - Gerrit::Internal::GerritRemoteChooser Refresh Remote Servers Genopfrisk fjern-servere @@ -16894,25 +16858,10 @@ Delvist tilvalg - Ændr ikke aktuelle tilstand. Fallback Fallback - - - Gerrit::Internal::QueryContext Querying Gerrit Anmoder Gerrit - - Error running %1: %2 - Fejl ved kørsel af %1: %2 - - - %1 crashed. - %1 holdt op med at virke. - - - %1 returned %2. - %1 returnerede %2. - Timeout Timeout @@ -16933,9 +16882,6 @@ Vil du terminere den? Keep Running Fortsæt kørsel - - - Git::Internal::BaseGitDiffArgumentsWidget Patience Patience @@ -16952,9 +16898,6 @@ Vil du terminere den? Ignore whitespace only changes. Ignorer ændringer som kun består af mellemrum. - - - Git::Internal::BranchAddDialog Branch Name: Grennavn: @@ -16979,9 +16922,6 @@ Vil du terminere den? Track local branch '%1' Spor lokal grenen '%1' - - - Git::Internal::BranchCheckoutDialog Local Changes Found. Choose Action: Lokale ændringer fundet. Vælg handling: @@ -16994,10 +16934,6 @@ Vil du terminere den? Discard Local Changes Forkast lokale ændringer - - CheckBox - Afkrydsningsboks - Checkout branch "%1" Checkout grenen "%1" @@ -17018,9 +16954,6 @@ Vil du terminere den? Create Branch Stash for Current Branch Opret gren-stash for aktuel gren - - - Git::Internal::BranchDialog Branches Grene @@ -17092,21 +17025,10 @@ Vil du terminere den? Include ta&gs Inkluder &tags - - C&heckout - C&heckout - Re&set &Nulstil - - Cherry &Pick - Cherry &pick - - - - Git::Internal::BranchModel Local Branches Lokale grene @@ -17119,9 +17041,6 @@ Vil du terminere den? Tags Tags - - - Git::Internal::ChangeSelectionDialog Select a Git Commit Vælg et Git-commit @@ -17154,14 +17073,6 @@ Vil du terminere den? &Revert &Tilbagefør - - Cherry &Pick - Cherry &pick - - - &Show - &Vis - Select Git Directory Vælg Git-mappe @@ -17186,9 +17097,6 @@ Vil du terminere den? Fetching commit data... Henter commit-data... - - - Git::Internal::CommitData untracked untracked @@ -17233,9 +17141,6 @@ Vil du terminere den? by them af dem - - - Git::Internal::GitBlameArgumentsWidget Omit Date Udelad dato @@ -17244,21 +17149,10 @@ Vil du terminere den? Hide the date of a change from the output. Skjul ændringsdatoen fra outputtet. - - Ignore Whitespace - Ignorer blanktegn - - - Ignore whitespace only changes. - Ignorer ændringer som kun består af mellemrum. - Reload Genindlæs - - - Git::Internal::GitClient Cannot determine the repository for "%1". Kan ikke beslutte repository'et for "%1". @@ -17647,9 +17541,6 @@ Commit nu? Cancel %1. Annuller %1. - - - Git::Internal::GitEditorWidget &Blame %1 &Blame %1 @@ -17658,10 +17549,6 @@ Commit nu? Blame &Parent Revision %1 Blame &forælder revision %1 - - Chunk successfully staged - Bid staged - Stage Chunk... Stage bid... @@ -17702,9 +17589,6 @@ Commit nu? &Soft &Blødt - - - Git::Internal::GitLogArgumentsWidget Show Diff Vis forskel @@ -17729,13 +17613,6 @@ Commit nu? Show textual graph log. Vis textual graph log. - - Reload - Genindlæs - - - - Git::Internal::GitPlugin <No repository> <intet repository> @@ -17912,10 +17789,6 @@ Commit nu? Clean... Clean... - - Status - Status - Commit... Commit... @@ -17968,10 +17841,6 @@ Commit nu? Abort Revert Afbryd revert - - Continue Rebase - Fortsæt rebase - Skip Rebase Spring rebase over @@ -17980,10 +17849,6 @@ Commit nu? Continue Cherry Pick Fortsæt cherry pick - - Continue Revert - Fortsæt revert - Branches... Grene... @@ -18012,10 +17877,6 @@ Commit nu? Stashes... Stashes... - - Stash - Stash - Saves the current state of your work and resets the repository. Gemmer den aktuelle tilstand af dit arbejde og nulstiller repository'et. @@ -18136,10 +17997,6 @@ Commit nu? Create Repository... Opret repository... - - Commit - Commit - Diff &Selected Files Diff &valgte filer @@ -18216,31 +18073,18 @@ Commit nu? Patch %1 successfully applied to %2 Patch %1 anvendt på %2 med succes - - - Git::Internal::GitSettings The binary "%1" could not be located in the path "%2" Binæren "%1" kunne ikke findes i stien "%2" - - - Git::Internal::GitSubmitEditor Refreshing Commit Data Genindlæser commit-data - - - Git::Internal::GitSubmitEditorWidget Provide a valid email to commit. Giv en gyldig e-mail for at commit. - - Detached HEAD - Afkoblet HEAD - Select Change Vælg ændring @@ -18269,9 +18113,6 @@ Commit nu? &Commit &Commit - - - Git::Internal::GitSubmitPanel General Information Generel information @@ -18312,9 +18153,6 @@ Commit nu? Sign off Sign off - - - Git::Internal::LogChangeDialog Reset to: Nulstil til: @@ -18339,9 +18177,6 @@ Commit nu? Soft Blødt - - - Git::Internal::LogChangeWidget Sha1 Sha1 @@ -18350,9 +18185,6 @@ Commit nu? Subject Subjekt - - - Git::Internal::MergeTool Normal Normal @@ -18441,9 +18273,6 @@ Fjern: %4 Merge tool process terminated with exit code %1 Merge-værktøj-proces termineret med afslutningskode %1 - - - Git::Internal::RemoteAdditionDialog Add Remote Tilføj fjern @@ -18456,21 +18285,10 @@ Fjern: %4 URL: URL: - - - Git::Internal::RemoteDialog Remotes Fjern - - Re&fresh - &Genindlæs - - - &Add... - &Tilføj... - F&etch &Hent @@ -18479,10 +18297,6 @@ Fjern: %4 &Push &Push - - &Remove - &Fjern - A remote with the name "%1" already exists. En fjern med navnet "%1" findes allerede. @@ -18499,20 +18313,10 @@ Fjern: %4 Would you like to delete the remote "%1"? Vil du slette fjernen "%1"? - - - Git::Internal::RemoteModel Name Navn - - URL - URL - - - - Git::Internal::SettingsPage Configuration Konfiguration @@ -18557,18 +18361,10 @@ Fjern: %4 Note that huge amount of commits might take some time. Bemærk at kæmpe mængder af commits kan tage noget tid. - - Gitk - Gitk - Arguments: Argumenter: - - Repository Browser - Repositorybrowser - Command: Kommando: @@ -18581,9 +18377,6 @@ Fjern: %4 Git Settings Git-indstillinger - - - Git::Internal::SettingsPageWidget Set the environment variable HOME to "%1" (%2). @@ -18606,17 +18399,10 @@ i stedet for i dens installationsmappe når der køres udenfor git bash.Git Repository Browser Command Git repositorybrowser-kommando - - - Git::Internal::StashDialog Stashes Stashes - - Name - Navn - Branch Gren @@ -18633,10 +18419,6 @@ i stedet for i dens installationsmappe når der køres udenfor git bash.&Delete... &Slet... - - &Show - &Vis - R&estore... &Genskab... @@ -18646,10 +18428,6 @@ i stedet for i dens installationsmappe når der køres udenfor git bash.Restore a git stash to new branch to be created Genskab til &gren... - - Re&fresh - &Genindlæs - Delete Stashes Slet stashes @@ -18675,22 +18453,10 @@ You can choose between stashing the changes or discarding them. %1 kan ikke genskabes eftersom repository'et er ændret. Du kan vælge mellem stashing af ændringerne eller forkaste dem. - - Stash - Stash - - - Discard - Forkast - Restore Stash to Branch Genskab stash til gren - - Branch: - Gren: - Stash Restore Stash-genskab @@ -18703,9 +18469,6 @@ Du kan vælge mellem stashing af ændringerne eller forkaste dem. Error restoring %1 Fejl ved genskabelse af %1 - - - GitGrep Tree (optional) Træ (valgfrit) @@ -43281,7 +43044,7 @@ Kopiér stien til kildefilerne til udklipsholderen? - Git::Internal::BranchUtils + Git Checkout Checkout @@ -43322,9 +43085,6 @@ Kopiér stien til kildefilerne til udklipsholderen? Hard reset branch "%1" to "%2"? Hard reset gren "%1" til "%2"? - - - Git::Internal::GitDiffEditorController <None> <intet> diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index b8c545084c1..e67d8ec8351 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -4101,7 +4101,7 @@ Grund: %3 - Git::Internal::ChangeSelectionDialog + Git Browse &History... Von &History... @@ -4170,9 +4170,6 @@ Grund: %3 &Archive... &Archiv erzeugen... - - - Git::Internal::GitClient Invalid revision Ungültige Revision @@ -4261,10 +4258,6 @@ Jetzt Commit ausführen? Stash local changes and execute %1. Stash der lokalen Änderungen anlegen und %1 ausführen. - - Discard - Verwerfen - Git SVN Log Git SVN Log @@ -4671,9 +4664,6 @@ Jetzt Commit ausführen? What would you like to do with local changes in: Wie möchten Sie die folgenden lokalen Änderungen behandeln: - - - Git::Internal::GitPlugin <No repository> <Kein Repository> @@ -4682,16 +4672,10 @@ Jetzt Commit ausführen? Repository: %1 Repository: %1 - - - Git::Internal::GitSettings The binary "%1" could not be located in the path "%2" Die ausführbare Datei "%1" konnte nicht im Pfad "%2" gefunden werden - - - Git::Internal::GitSubmitPanel General Information Allgemeine Informationen @@ -4732,9 +4716,6 @@ Jetzt Commit ausführen? Sign off Unterschreiben - - - Git::Internal::SettingsPage <b>Note:</b> <b>Hinweis:</b> @@ -4791,10 +4772,6 @@ Jetzt Commit ausführen? Command: Kommando: - - Repository Browser - Repository Browser - Help @@ -8576,7 +8553,7 @@ Was möchten Sie tun? - Git::Internal::StashDialog + Git Stashes Stashes @@ -8612,10 +8589,6 @@ Was möchten Sie tun? &Delete... &Löschen... - - &Show - &Anzeigen - R&estore... &Wiederherstellen... @@ -8643,10 +8616,6 @@ You can choose between stashing the changes or discarding them. %1 kann nicht wiederhergestellt werden, da Änderungen im Repository vorhanden sind. Sie können die Änderungen in einem Stash ablegen oder zurücksetzen. - - Stash - Stash - Discard Zurücksetzen @@ -8655,10 +8624,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.Restore Stash to Branch Als Branch wiederherstellen - - Branch: - Branch: - Stash Restore Stash wiederherstellen @@ -11590,7 +11555,7 @@ Wenn Sie %2 aus den Quelltexten erstellen und eine ausführbare CDB-Datei mit ei - Git::Internal::SettingsPageWidget + Git Set the environment variable HOME to "%1" (%2). @@ -12743,7 +12708,7 @@ Soll es noch einmal versucht werden? - Git::Internal::BaseGitDiffArgumentsWidget + Git Use the patience algorithm for calculating the differences. "patience diff"-Algorithmus verwenden. @@ -12760,9 +12725,6 @@ Soll es noch einmal versucht werden? Ignore Whitespace Leerzeichen ignorieren - - - Git::Internal::GitBlameArgumentsWidget Hide the date of a change from the output. Datum der Änderung in Ausgabe nicht anzeigen. @@ -12771,10 +12733,6 @@ Soll es noch einmal versucht werden? Omit Date Datum weglassen - - Ignore whitespace only changes. - Änderungen der Leerzeichen ignorieren. - No Move Detection Keine verschobenen Daten erkennen @@ -12795,10 +12753,6 @@ Soll es noch einmal versucht werden? Move detection Verschobene Daten erkennen - - Ignore Whitespace - Leerzeichen ignorieren - GLSLEditor @@ -14262,7 +14216,7 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält. - Git::Internal::RemoteAdditionDialog + Git Add Remote Git Remote hinzufügen @@ -14275,17 +14229,10 @@ Gibt an, wie sich die Rücktaste bezüglich Einrückung verhält. URL: URL: - - - Git::Internal::RemoteDialog Remotes Git Remotes - - Re&fresh - &Aktualisieren - &Add... &Hinzufügen... @@ -15958,7 +15905,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet. - Git::Internal::BranchAddDialog + Git Branch Name: Branch: @@ -16004,7 +15951,7 @@ Zusätzlich wird die Verbindung zum Gerät getestet. - Git::Internal::BranchModel + Git Local Branches Lokale Branches @@ -16013,10 +15960,6 @@ Zusätzlich wird die Verbindung zum Gerät getestet. Remote Branches Remote Branches - - Detached HEAD - Detached HEAD - Tags Tags @@ -18151,7 +18094,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - Git::Internal::CommitData + Git untracked nicht unter Versionskontrolle @@ -18196,9 +18139,6 @@ should a repository require SSH-authentication (see documentation on SSH and the by them von ihnen - - - Git::Internal::GitLogArgumentsWidget First Parent Erster Eltern-Commit @@ -19324,7 +19264,7 @@ manuellen Herunterladen im Browser des System zu öffnen. - Gerrit::Internal::GerritDialog + Git Changes Änderungen @@ -19349,14 +19289,6 @@ manuellen Herunterladen im Browser des System zu öffnen. &Refresh &Aktualisieren - - &Show - An&zeigen - - - Cherry &Pick - Cherry-&Pick - Fetching "%1"... Hole "%1"... @@ -19381,9 +19313,6 @@ Note: This can expose you to man-in-the-middle attack. Möchten Sie die SSL-Verifikation für diesen Server abschalten? Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. - - - Gerrit::Internal::GerritModel (Draft) (Entwurf) @@ -19440,9 +19369,6 @@ Hinweis: Dies macht Sie anfällig für Man-in-the-middle-Angriffe. Parse error: "%1" Fehler bei Auswertung: "%1" - - - Gerrit::Internal::QueryContext Querying Gerrit Anfrage an Gerrit @@ -19479,16 +19405,6 @@ Möchten Sie ihn beenden? Terminate Beenden - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -19525,28 +19441,10 @@ Möchten Sie ihn beenden? "canonicalWebUrl" in der Datei "gerrit.config" nicht konfiguriert ist. - - - Gerrit::Internal::FetchContext Fetching from Gerrit Hole von Gerrit - - %1 crashed. - %1 ist abgestürzt. - - - %1 returned %2. - %1 gab %2 zurück. - - - Error running %1: %2 - Fehler bei Ausführung von %1: %2 - - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -19589,17 +19487,10 @@ gehören nicht zu den verifizierten Remotes in %3. Anderes Verzeichnis angeben?< Enter Local Repository for "%1" (%2) Geben Sie das lokale Repository für "%1" an (%2) - - - Git::Internal::GitSubmitEditorWidget Provide a valid email to commit. Geben Sie eine gültige Email-Adresse für Commits an. - - Detached HEAD - Detached HEAD - Select Change Änderung auswählen @@ -20621,7 +20512,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve - Git::Internal::BranchCheckoutDialog + Git Local Changes Found. Choose Action: Es wurden lokale Änderungen festgestellt: Wählen Sie eine Aktion: @@ -20829,7 +20720,7 @@ Sie können hier eine andere Verbindung wählen, beispielsweise eine serielle Ve - Git::Internal::MergeTool + Git Normal Normal @@ -22419,7 +22310,7 @@ Weitere Informationen finden Sie auf der Dokumentationsseite "Checking Code - Gerrit::Internal::GerritPushDialog + Git Push to Gerrit Push zu Gerrit @@ -22617,7 +22508,7 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind. - Git::Internal::LogChangeDialog + Git Reset to: Zurücksetzen auf: @@ -22878,15 +22769,11 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind. - Git::Internal::LogChangeWidget + Git Sha1 Sha1 - - Subject - Titel - CppEditor::Internal::InsertVirtualMethodsDialog @@ -27398,23 +27285,12 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer. - Git::Internal::GitSubmitEditor + Git Refreshing Commit Data Aktualisiere Commit-Daten - - Git::Internal::RemoteModel - - Name - Name - - - URL - URL - - Help @@ -30535,7 +30411,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü - Git::Internal::GitEditorWidget + Git &Blame %1 &Blame %1 @@ -30544,10 +30420,6 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü Blame &Parent Revision %1 Blame der über&geordneten Revision %1 - - Chunk successfully staged - Chunk wurde für Commit vorgesehen - Stage Chunk... Chunk für Commit vorsehen... @@ -35025,7 +34897,7 @@ Dies könnte Probleme während der Ausführung verursachen. - GitGrep + Git Tree (optional) Baum (optional) @@ -36532,7 +36404,7 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. - Gerrit::Internal::AuthenticationDialog + Git Authentication Authentifizierung @@ -36541,10 +36413,6 @@ Warnung: Reinem Text fehlen manche Informationen, etwa die Dauer. <html><head/><body><p>Gerrit server with HTTP was detected, but you need to set up credentials for it.</p><p>To get your password, <a href="LINK_PLACEHOLDER"><span style=" text-decoration: underline; color:#007af4;">click here</span></a> (sign in if needed). Click Generate Password if the password is blank, and copy the user name and password to this form.</p><p>Choose Anonymous if you do not want authentication for this server. In this case, changes that require authentication (like draft changes or private projects) will not be displayed.</p></body></html> <html><head/><body><p>Ein Gerrit-Server mit HTTP wurde erkannt, aber Sie müssen Zugangsdaten angeben.</p><p>Um Ihr Passwort zu erhalten, <a href="LINK_PLACEHOLDER"><span style=" text-decoration: underline; color:#007af4;">klicken Sie hier</span></a>. (Melden Sie sich an, wenn nötig.). Wenn das Passwortfeld leer ist, klicken Sie "Generate Password" und kopieren den Benutzernamen und das Passwort in dieses Formular.</p><p>Wählen Sie "Anonym", wenn Sie keine Authentifizierung für diesen Server wünschen. In diesem Fall werden Änderungen, die eine Authentifizierung benötigen (wie "Drafts" oder private Projekte), nicht angezeigt.</p></body></html> - - &User: - &Benutzer: - &Password: &Passwort: @@ -37947,7 +37815,7 @@ Einzelschritt in das Modul und das Setzen von Haltepunkten nach Datei und Zeilen - Gerrit::Internal::GerritRemoteChooser + Git Refresh Remote Servers Remote-Server aktualisieren @@ -42068,7 +41936,7 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni - Git::Internal::BranchView + Git Include Old Entries Alte Einträge einschließen @@ -42088,10 +41956,6 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni Branches und Tags einschließen, die seit %n Tagen nicht benutzt wurden. - - <No repository> - <Kein Repository> - Create Git Repository... Git-Repository erzeugen... @@ -42100,10 +41964,6 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni Add Branch... Branch hinzufügen... - - &Add... - &Hinzufügen... - &Fetch &Fetch @@ -42136,18 +41996,6 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni Re&set Zurück&setzen - - &Hard - &Hard - - - &Mixed - &Mixed - - - &Soft - &Soft - &Merge (Fast-Forward) &Merge (Fast-Forward) @@ -42164,18 +42012,10 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni &Rebase &Rebase - - Cherry &Pick - Cherry-&Pick - &Track &Folgen - - &Push - &Push - Would you like to delete the tag "%1"? Möchten Sie das Tag "%1" löschen? @@ -42200,9 +42040,6 @@ Die Dateien aus dem Quellverzeichnis des Android-Pakets werden in das Verzeichni Git Reset Git Reset - - - Git::Internal::BranchViewFactory Git Branches Git Branches @@ -46328,7 +46165,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - Git::Internal::BaseGitLogArgumentsWidget + Git Diff Diff @@ -46337,13 +46174,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Show difference. Änderung anzeigen. - - Filter - Filter - - - - Git::Internal::GitLogFilterWidget Filter: Filter: @@ -46352,9 +46182,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Case Sensitive Groß-/Kleinschreibung - - - Git::Internal::GitPluginPrivate &Copy "%1" "%1" &Kopieren @@ -46519,10 +46346,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e &Local Repository &Lokales Repository - - Diff - Diff - Log Log @@ -46535,10 +46358,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Clean... Repository bereinigen... - - Status - Status - Commit... Commit... @@ -46591,10 +46410,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Abort Revert Revert abbrechen - - Continue Rebase - Rebase fortsetzen - Skip Rebase Rebase überspringen @@ -46603,10 +46418,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Continue Cherry Pick Cherry-Pick fortsetzen - - Continue Revert - Revert fortsetzen - Branches... Branches... @@ -46635,10 +46446,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Stashes... Stashes... - - Stash - Stash - Saves the current state of your work and resets the repository. Speichert den gegenwärtigen Stand der Arbeit und setzt das Repository zurück. @@ -46727,10 +46534,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Git &Tools Git-&Werkzeuge - - Gitk - Gitk - Gitk Current File Gitk mit Datei @@ -46755,10 +46558,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Repository Browser Repository-Browser - - Merge Tool - Merge-Tool - Git Bash Git Bash diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 87c605a567b..5db41c08c69 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -5247,7 +5247,7 @@ Razón: %3 - Git::Internal::BranchDialog + Git Checkout Recuperar (Checkout) @@ -5311,9 +5311,6 @@ Razón: %3 Remote branches Ramas remotas - - - Git::Internal::ChangeSelectionDialog Select a Git commit Seleccione un commit de Git @@ -5330,9 +5327,6 @@ Razón: %3 Selected directory is not a Git repository El directorio seleccionado no es un repositorio de Git - - - Git::Internal::GitClient Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work. Tenga en cuenta que el plugin Git para Qt Creator no es capaz de interactuar con un servidor Git por ahora. Por lo tanto, identificación manual mediante ssh etc. no funcionará. @@ -5465,16 +5459,10 @@ Razón: %3 There are no modified files. No hay archivos modificados. - - - Git::Internal::GitOutputWindow Git Output Salida de Git - - - Git::Internal::GitPlugin &Git @@ -5663,10 +5651,6 @@ Razón: %3 Could not find working directory No se pudo encontrar el directorio de trabajo - - Revert - Revertir - Would you like to revert all pending changes to the project? @@ -5695,32 +5679,18 @@ Razón: %3 The commit message check failed. Do you want to commit the change? La comprobación del mensaje de commit ha fallado. ¿Quiere realizar un commit con los cambios de todos modos? - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' El binario '%1' no pudo ser localizado en la ruta '%2' - - - Git::Internal::GitSubmitEditor Git Commit Commit de Git - - - Git::Internal::GitSubmitPanel General Information Información general - - - Repository: - Repositorio: - repository @@ -5751,9 +5721,6 @@ Razón: %3 Email: Email: - - - Git::Internal::LocalBranchModel <New branch> <Nueva rama> @@ -5762,9 +5729,6 @@ Razón: %3 Type to create a new branch Nombre para la nueva rama - - - Git::Internal::SettingsPage Git @@ -5822,9 +5786,6 @@ Razón: %3 Omit date from annotation output - - - GitCommand '%1' failed (exit code %2). @@ -12672,7 +12633,7 @@ p, li { white-space: pre-wrap; } - Git::Internal::CloneWizard + Git Clones a project from a git repository. @@ -12681,9 +12642,6 @@ p, li { white-space: pre-wrap; } Git Repository Clone - - - Git::CloneWizardPage Specify repository URL, checkout directory and path. diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 2f5ad8d111b..b69d5ba75b8 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -7289,7 +7289,7 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e - Git::Internal::BranchDialog + Git Branches Branches @@ -7298,10 +7298,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e General information Informations générales - - Repository: - Dépôt : - Remote branches traduction de remote ici ? @@ -7319,14 +7315,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Unable to find the repository directory for '%1'. Impossible de trouver le dépôt de "%1". - - Diff - Diff - - - Log - Log - Refresh Rafraîchir @@ -7400,10 +7388,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e tracking branch ? Échec de la création d'une branche de suivi - - Remote Branches - Branches distantes - Re&fresh Ra&fraîchir @@ -7424,10 +7408,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e &Log &Log - - &Checkout - Import (&C) - Re&name Re&nommer @@ -7456,9 +7436,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e &Track &Suivre - - - Git::Internal::ChangeSelectionDialog Select a Git commit Sélectionner un commit Git @@ -7479,10 +7456,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e &Show &Montrer - - Cherry &Pick - I&mportation sélective - &Revert &Rétablir @@ -7551,9 +7524,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e HEAD HEAD - - - Git::Internal::GitClient Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work. marchera ou marcheront ? Le etc laisse sous-entendre qu'il y aurait d'autres choses qui ne marcheraient pas. @@ -7773,10 +7743,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e Unable to run show: %1: %2 Impossible d'exécuter show : %1 : %2 - - Changes - Modifications - You have modified files. Would you like to stash your changes? Vous avez modifié des fichiers. Souhaitez-vous mettre vos changements dans le stash ? @@ -7933,10 +7899,6 @@ Ajouter, modifier et supprimer des filtres de documents, qui détermine l'e MERGING FUSIONNEMENT - - Detached HEAD - HEAD détaché - Cannot retrieve top revision of "%1": %2 Impossible d'obtenir la dernière révision dans "%1" : %2 @@ -8112,10 +8074,6 @@ Valider maintenant ? Stash local changes and pop when %1 finishes. Remiser les changements locaux, puis les récupérer lorsque %1 est terminé. - - Stash - Remise - Stash local changes and continue. Remiser les changements locaux et continuer. @@ -8223,10 +8181,6 @@ Valider maintenant ? - - Revert - Rétablir - The file has been changed. Do you want to revert it? Le fichier a été modifié. Voulez-vous le rétablir ? @@ -8283,9 +8237,6 @@ Valider maintenant ? Cannot determine git version: %1 Impossible de déterminer la version de git : %1 - - - Git::Internal::GitPlugin &Git &Git @@ -8567,18 +8518,10 @@ Valider maintenant ? Abort Revert Annuler le rétablissement - - Continue Rebase - Continuer le rebasement - Continue Cherry Pick Continuer l'importation sélective - - Continue Revert - Continuer le rétablissement - &Patch &Patch @@ -8820,14 +8763,6 @@ Valider maintenant ? Actions on Commits... Actions sur les soumissions... - - Commit - Faire un commit - - - Undo Changes to %1 - Annuler les changements jusqu'à %1 - Interactive Rebase Changement de base interactif @@ -8862,10 +8797,6 @@ Valider maintenant ? Git Fixup Commit Soumission de correction Git - - Git Commit - Soumission Git - Closing Git Editor Fermer l'éditeur Git @@ -8914,23 +8845,14 @@ Valider maintenant ? The commit message check failed. Do you want to commit the change? La vérification du message de commit a échoué. Voulez-vous soumettre vos modifications ? - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' Le binaire '%1' n'a pas pu être trouvé dans le chemin "%2" - - - Git::Internal::GitSubmitEditor Git Commit Git commit - - - Git::Internal::GitSubmitPanel General Information Informations générales @@ -8968,9 +8890,6 @@ Valider maintenant ? contexte ? -> Les hooks dans git (ou SVN) sont des checks faites avant et après un commit. D'ailleurs, le projet Qt utilise les hooks :P . Dans le livre suivant, j'ai trouvé : http://git-scm.com/book/fr/Personnalisation-de-Git-Crochets-Git &Éviter les crochets - - - Git::Internal::LocalBranchModel <New branch> <Nouvelle branche> @@ -8980,9 +8899,6 @@ Valider maintenant ? Type pas facile à traduire dans ce contexte... Taper ? Saisir pour créer une nouvelle branche - - - Git::Internal::SettingsPage Environment variables Variables d'environnement @@ -9075,10 +8991,6 @@ Valider maintenant ? Ignore whitespace changes in annotation and diff Ignorer les changements relatifs aux espaces dans les annotations et le diff - - Gitk - Gitk - Arguments: Arguments : @@ -9115,13 +9027,6 @@ Valider maintenant ? Show tags in Branches dialog Montrer les tags dans le dialogue des branches - - Repository Browser - Explorateur de dépôt - - - - GitCommand '%1' failed (exit code %2). @@ -19620,7 +19525,7 @@ p, li { white-space: pre-wrap; } - Git::Internal::CloneWizard + Git Clones a project from a git repository. Clone un projet à partir d'un dépôt git. @@ -19641,9 +19546,6 @@ p, li { white-space: pre-wrap; } Git Repository Clone Clone du dépôt git - - - Git::CloneWizardPage Location Emplacement @@ -21281,7 +21183,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name - Git::Internal::StashDialog + Git Stashes Remises @@ -21302,10 +21204,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameDelete all... Tout supprimer... - - Delete... - Supprimer… - Show Afficher @@ -21319,10 +21217,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameRestore a git stash to new branch to be created Restaurer la branche... - - Refresh - Rafraîchir - <No repository> <Aucun dépôt> @@ -21367,10 +21261,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name&Delete... &Supprimer... - - &Show - &Montrer - R&estore... R&estaurer... @@ -21380,10 +21270,6 @@ S60 emulator run configuration default display name, %1 is base pro-File nameRestore a git stash to new branch to be created Restaurer dans la &branche... - - Re&fresh - Ra&fraîchir - Delete Stashes Supprimer les remises @@ -21398,22 +21284,10 @@ You can choose between stashing the changes or discarding them. %1 ne peut pas être restauré depuis que le dépôt a été modifié. Vous pouvez choisir entre mettre les changements dans une remise ou de les abandonner. - - Stash - Remise - - - Discard - Abandonner - Restore Stash to Branch Restaurer la remise dans la branche - - Branch: - Branche : - Stash Restore Restauration de la remise @@ -24790,28 +24664,15 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - Git::Internal::RemoteBranchModel + Git (no branch) (aucune banche) - - - GitClient - - Unable to determine the repository for %1. - Impossible de déterminer le dépôt de %1. - - - - Git::Internal::GitCommand Error: Git timed out after %1s. Erreur :Git est arrivé à échéance après %1s. - - - Git::Internal::GitEditor Blame %1 Blame %1 @@ -29891,7 +29752,7 @@ Details: %3 - Git::Internal::SettingsPageWidget + Git Set the environment variable HOME to '%1' (%2). @@ -35036,7 +34897,7 @@ Do you want to retry? - Git::Internal::BaseGitDiffArgumentsWidget + Git Use the patience algorithm for calculating the diff Utiliser l'algorithme patience pour calculer le diff @@ -35061,9 +34922,6 @@ Do you want to retry? Ignore Whitespace Ignorer les espaces - - - Git::Internal::GitShowArgumentsWidget Select the pretty printing format Sélectionner le format d'affichage @@ -35100,9 +34958,6 @@ Do you want to retry? raw brut - - - Git::Internal::GitBlameArgumentsWidget Do not show the date a change was made in the output Ne pas afficher à qu'elle date un changement a été fait sur la sortie @@ -35115,18 +34970,6 @@ Do you want to retry? Omit Date Omettre la date - - Ignore whitespace only changes. - Ignorer les changement relatifs aux espaces. - - - Ignore whitespace only changes - Ignorer les changement relatifs aux espaces - - - Ignore Whitespace - Ignorer les espaces - GLSLEditor::Internal::FunctionArgumentWidget @@ -37036,7 +36879,7 @@ if (a && - Git::Internal::BranchAddDialog + Git Dialog Boîte de dialogue @@ -37065,9 +36908,6 @@ if (a && Track local branch '%1' Pister la branche locale "%1" - - - Git::Internal::RemoteAdditionDialog Add Remote Ajouter distant @@ -37080,29 +36920,14 @@ if (a && URL: URL : - - - Git::Internal::RemoteDialog Remotes Distants - - Re&fresh - Ra&fraîchir - - - &Add... - &Ajouter... - F&etch Récupér&er - - &Remove - &Supprimer - Delete Remote Supprimer le distant @@ -38805,7 +38630,7 @@ These files are preserved. - Git::Internal::BranchModel + Git Local Branches Branches locales @@ -45297,7 +45122,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e - Git::Internal::CommitData + Git untracked non suivi @@ -45343,9 +45168,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e updated mis à jour - - - Git::Internal::GitLogArgumentsWidget Show Diff Montrer les différences @@ -49370,7 +49192,7 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi - Gerrit::Internal::GerritDialog + Git Apply in: Appliquer dans : @@ -49416,10 +49238,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi &Checkout... &Importer... - - &Show - &Afficher - Cherry &Pick Im&porter la sélection @@ -49440,17 +49258,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Apply... Appliquer... - - Checkout... - Importer... - - - Refresh - Rafraîchir - - - - Gerrit::Internal::GerritModel <html><head/><body><table><tr><td>Subject</td><td>%1</td></tr><tr><td>Number</td><td><a href="%11">%2</a></td></tr><tr><td>Owner</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Project</td><td>%5 (%6)</td></tr><tr><td>Status</td><td>%7, %8</td></tr><tr><td>Patch set</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html> <html><head/><body><table><tr><td>Sujet</td><td>%1</td></tr><tr><td>Numéro</td><td><a href="%11">%2</a></td></tr><tr><td>Propriétaire</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Projet</td><td>%5 (%6)</td></tr><tr><td>Statut</td><td>%7, %8</td></tr><tr><td>Ensemble de patchs</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html> @@ -49475,10 +49282,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Approvals Approbations - - Status - Statut - Parse error: '%1' -> %2 Erreur d'analyse : "%1" -> %2 @@ -49491,9 +49294,6 @@ Le pas à pas dans le module ou la définition de points d'arrêt par fichi Parse error in line '%1' Erreur d'analyse à la ligne "%1" - - - Gerrit::Internal::QueryContext Gerrit Gerrit @@ -49530,16 +49330,6 @@ Souhaitez-vous le terminer ? Keep Running Continuer l'exécution - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -49594,26 +49384,11 @@ asked to confirm the repository path. dans le cas où "canonicalWebUrl" n'est pas configuré dans le fichier "gerrit.config". - - - Gerrit::Internal::FetchContext Gerrit Fetch Traduire fetch ? Gerrit fetch - - %1 crashed. - %1 a crashé. - - - %1 returned %2. - %1 a retourné %2. - - - Error running %1: %2 - Erreur lors de l'exécution de %1 : %2 - Error writing to temporary file. Erreur lors de l'écriture dans le fichier temporaire. @@ -49626,9 +49401,6 @@ dans le fichier "gerrit.config". Cherry-picking %1... Sélectionner %1... - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -49672,9 +49444,6 @@ were not verified among remotes in %3. Select different folder? Enter Local Repository for '%1' (%2) Entrer un dépôt local pour "%1" (%2) - - - Git::Internal::GitSubmitEditorWidget Detached HEAD HEAD détachée @@ -49707,21 +49476,6 @@ were not verified among remotes in %3. Select different folder? &Commit &Soumettre - - - Git::Internal::ResetDialog - - Sha1 - SHA1 - - - Subject - Sujet - - - Reset to: - Réinitaliser à : - Undo Changes to %1 Annuler les changements jusqu'à %1 @@ -51130,7 +50884,7 @@ Souhaitez-vous les importer maintenant ? - Git::Internal::BranchCheckoutDialog + Git Local Changes Found. Choose Action: Changements locaux trouvés. Choisissez une action : @@ -51143,10 +50897,6 @@ Souhaitez-vous les importer maintenant ? Discard Local Changes Annuler les changements locaux - - CheckBox - Case à cocher - Checkout branch "%1" Importer la branche "%1" @@ -51167,9 +50917,6 @@ Souhaitez-vous les importer maintenant ? Create Branch Stash for Current Branch Créer une branche remise pour la branche courante - - - Gerrit::Internal::GerritPushDialog Push to Gerrit Pousser sur Gerrit @@ -53674,7 +53421,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - Git::Internal::GitDiffHandler + Git Working tree Arbre de travail @@ -53683,24 +53430,10 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Index Index - - Waiting for data... - En attente de données... - - - - Git::Internal::LogChangeWidget Sha1 SHA1 - - Subject - Sujet - - - - Git::Internal::LogChangeDialog Reset to: Réinitaliser à : @@ -53725,13 +53458,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Soft Soft - - - Git::Internal::MergeTool - - Error - Erreur - File input for the merge tool requires Git 1.7.8, or later. Le fichier d'entrée pour l'outil de fusion nécessite Git 1.7.8 ou supérieur. @@ -56882,7 +56608,7 @@ réinitialisation du moniteur - Git::Internal::GitDiffSwitcher + Git Switch to Text Diff Editor Basculer vers l'éditeur texte de différences diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 0daf6ffa57c..9a53446af43 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -3830,7 +3830,7 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju - Git::Internal::BranchAddDialog + Git Branch Name: Naziv grane: @@ -3859,9 +3859,6 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju Track local branch '%1' Prati lokalnu granu '%1' - - - Git::Internal::BranchCheckoutDialog Local Changes Found. Choose Action: Nađene su lokalne promjene. Odaberi radnju: @@ -3874,10 +3871,6 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju Discard Local Changes Zanemari lokalne promjene - - CheckBox - Potvrdni kvadratić - Checkout branch "%1" Odjavi granu "%1" @@ -3898,9 +3891,6 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju Create Branch Stash for Current Branch Stvori skladište grane za trenutačnu granu - - - Git::Internal::ChangeSelectionDialog Select a Git Commit Odaberi Git obvezu @@ -3965,9 +3955,6 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju Fetching commit data... Dohvaćanje podataka obveze … - - - Gerrit::Internal::AuthenticationDialog Authentication Autentifikacija @@ -3992,9 +3979,6 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju Anonymous Anonimno - - - Gerrit::Internal::GerritDialog Gerrit Gerrit @@ -4019,14 +4003,6 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju Details Detalji - - &Show - &Prikaži - - - Cherry &Pick - - C&heckout &Odjava @@ -4051,9 +4027,6 @@ Note: This can expose you to man-in-the-middle attack. Želiš li deaktivirati potvrdu SSL-a za ovaj poslužitelj? Napomena: To te može izložiti napadu čovjeka-u-sredini. - - - Gerrit::Internal::GerritPushDialog Push to Gerrit Gurni na Gerrit @@ -4161,9 +4134,6 @@ Deaktivirano – Promjena nije skica. ... Include older branches ... … Uključi starije grane … - - - Git::Internal::GitSubmitPanel General Information Opće informacije @@ -4204,9 +4174,6 @@ Deaktivirano – Promjena nije skica. Sign off Odjavi se - - - Git::Internal::RemoteAdditionDialog Add Remote Dodaj udaljeni @@ -4219,9 +4186,6 @@ Deaktivirano – Promjena nije skica. URL: URL: - - - Git::Internal::RemoteDialog Remotes Udaljeni @@ -4262,9 +4226,6 @@ Deaktivirano – Promjena nije skica. Would you like to delete the remote "%1"? Želiš li ukloniti udaljeni „%1”? - - - Git::Internal::SettingsPage Configuration Konfiguracija @@ -4333,9 +4294,6 @@ Deaktivirano – Promjena nije skica. Git Settings Git postavke - - - Git::Internal::StashDialog Stashes Skladišta @@ -4360,10 +4318,6 @@ Deaktivirano – Promjena nije skica. &Delete... &Ukloni … - - &Show - &Prikaži - R&estore... Vrati izvorno stanj&e … @@ -4373,10 +4327,6 @@ Deaktivirano – Promjena nije skica. Restore a git stash to new branch to be created Vrati izvorno stanje u &granu … - - Re&fresh - &Aktualiziraj - Delete Stashes Izbriši skladišta @@ -4403,10 +4353,6 @@ You can choose between stashing the changes or discarding them. %1 se ne može vratiti na izvorno stanje nakon promjene spremišta. Možeš birati između skladištenja promjena ili njihovih odbacivanja. - - Stash - Skladište - Discard Odbaci @@ -4415,10 +4361,6 @@ Možeš birati između skladištenja promjena ili njihovih odbacivanja.Restore Stash to Branch Vrati izvorno stanje skladišta u granu - - Branch: - Grana: - Stash Restore Vraćanje izvornog stanja skladišta @@ -24491,7 +24433,7 @@ Možda će ponovna gradnja projekta pomoći. - Git::Internal::BranchModel + Git Local Branches Lokalne grane @@ -24508,9 +24450,6 @@ Možda će ponovna gradnja projekta pomoći. Tags Oznake - - - Git::Internal::BranchView Include Old Entries Uključi stare unose @@ -24543,10 +24482,6 @@ Možda će ponovna gradnja projekta pomoći. Add Branch... Dodaj granu … - - &Add... - &Dodaj … - &Fetch D&ohvati @@ -24595,18 +24530,10 @@ Možda će ponovna gradnja projekta pomoći. &Rebase - - Cherry &Pick - Izabrano &biranje - &Track &Prati - - &Push - &Gurni - Would you like to delete the tag "%1"? Želiš li ukloniti oznaku"%1"? @@ -24639,9 +24566,6 @@ Možda će ponovna gradnja projekta pomoći. Hard reset branch "%1" to "%2"? Svakako resetiraj granu "%1" na "%2"? - - - Git::Internal::BranchViewFactory Git Branches Git grane @@ -24650,9 +24574,6 @@ Možda će ponovna gradnja projekta pomoći. Filter Filtar - - - Git::Internal::CommitData untracked nepraćeno @@ -24697,9 +24618,6 @@ Možda će ponovna gradnja projekta pomoći. by them od njih - - - Gerrit::Internal::GerritModel (Draft) (koncept) @@ -24756,9 +24674,6 @@ Možda će ponovna gradnja projekta pomoći. Parse error: "%1" Greška u obradi: "%1" - - - Gerrit::Internal::QueryContext Querying Gerrit Pretraživanje Gerrita @@ -24795,16 +24710,6 @@ Najvjerojatniji uzrok tome su problemi s SSH autentifikacijom. Keep Running Nastavi s pokretanjem - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -24813,10 +24718,6 @@ Najvjerojatniji uzrok tome su problemi s SSH autentifikacijom. &Host: &Glavno računalo: - - &User: - K&orisnik: - &ssh: &ssh: @@ -24839,28 +24740,10 @@ Najvjerojatniji uzrok tome su problemi s SSH autentifikacijom. "gerrit.config". - - - Gerrit::Internal::FetchContext Fetching from Gerrit Dohvaćanje od Gerrita - - %1 crashed. - %1 se urušio. - - - %1 returned %2. - %1 je vratio %2. - - - Error running %1: %2 - Greška u pokretanju %1: %2 - - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit … @@ -24903,9 +24786,6 @@ nisu provjereni između daljinskih u %3. Odabrati jednu drugu mapu?Enter Local Repository for "%1" (%2) Uđi u lokalno spremište za "%1" (%2) - - - Gerrit::Internal::GerritRemoteChooser Refresh Remote Servers Obnovi udaljene poslužitelje @@ -24914,9 +24794,6 @@ nisu provjereni između daljinskih u %3. Odabrati jednu drugu mapu?Fallback Rezerva - - - Git::Internal::GitClient and %n more Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" @@ -25048,10 +24925,6 @@ nisu provjereni između daljinskih u %3. Odabrati jednu drugu mapu?Invalid revision Neispravna revizija - - Detached HEAD - Odvojeni HEAD - Cannot describe revision "%1" in "%2": %3 Nije moguće opisati reviziju "%1" u "%2": %3 @@ -25135,10 +25008,6 @@ Commit now? Commit - - Continue Revert - - You need to commit changes to finish revert. Commit now? @@ -25291,10 +25160,6 @@ Commit now? Stash local changes and execute %1. - - Discard - Odbaci - Discard (reset) local changes and execute %1. @@ -25307,16 +25172,10 @@ Commit now? Cancel %1. - - - Git::Internal::GitDiffEditorController <None> <bez> - - - Git::Internal::BaseGitDiffArgumentsWidget Patience Patience @@ -25325,17 +25184,6 @@ Commit now? Use the patience algorithm for calculating the differences. Koristi patience algoritam za izračunavanje razlika. - - Ignore Whitespace - Zanemari bjeline - - - Ignore whitespace only changes. - Zanemari promjene samo u bjelinama. - - - - Git::Internal::GitBlameArgumentsWidget Omit Date Zanemari datum @@ -25372,9 +25220,6 @@ Commit now? Reload Učitaj ponovo - - - Git::Internal::GitLogArgumentsWidget Show Diff Prikaži razlike @@ -25399,13 +25244,6 @@ Commit now? Show textual graph log. Prikaži log-zapis tekstovnim dijagramom. - - Reload - Učitaj ponovo - - - - Git::Internal::GitEditorWidget &Blame %1 @@ -25414,10 +25252,6 @@ Commit now? Blame &Parent Revision %1 - - Chunk successfully staged - - Stage Chunk... @@ -25458,9 +25292,6 @@ Commit now? &Soft - - - GitGrep Tree (optional) @@ -25483,13 +25314,6 @@ Leave empty to search through the file system. Git Show %1:%2 - - - Git::Internal::GitPlugin - - <No repository> - <Nema spremišta> - Repository: %1 Spremište: %1 @@ -25662,10 +25486,6 @@ Leave empty to search through the file system. Clean... - - Status - Stanje - Commit... @@ -25718,10 +25538,6 @@ Leave empty to search through the file system. Abort Revert Prekini obnavljanje - - Continue Rebase - - Skip Rebase @@ -25762,10 +25578,6 @@ Leave empty to search through the file system. Stashes... - - Stash - - Saves the current state of your work and resets the repository. @@ -25850,10 +25662,6 @@ Leave empty to search through the file system. Git &Tools Git ala&ti - - Gitk - Gitk - Gitk Current File Gitk trenutačna datoteka @@ -25874,10 +25682,6 @@ Leave empty to search through the file system. Git Gui - - Repository Browser - Preglednik spremišta - Merge Tool Alat za sjedinjavanje @@ -25942,31 +25746,18 @@ Leave empty to search through the file system. Patch %1 successfully applied to %2 Zakrpa %1 uspješno primijenjena na %2 - - - Git::Internal::GitSettings The binary "%1" could not be located in the path "%2" - - - Git::Internal::GitSubmitEditor Refreshing Commit Data - - - Git::Internal::GitSubmitEditorWidget Provide a valid email to commit. - - Detached HEAD - Odvojeni HEAD - Select Change Odaberi promjenu @@ -26007,20 +25798,10 @@ Leave empty to search through the file system. &Commit - - - Git::Internal::LogChangeWidget Sha1 - - Subject - Predmet - - - - Git::Internal::LogChangeDialog Reset to: Resetiraj na: @@ -26045,9 +25826,6 @@ Leave empty to search through the file system. Soft Meko - - - Git::Internal::MergeTool Normal Normalna @@ -26128,10 +25906,6 @@ Udaljeni: %4 Continue merging other unresolved paths? - - Merge Tool - Alat za sjedinjavanje - Merge tool is not configured. Alat za sjedinjavanje nije konfiguriran. @@ -26148,20 +25922,6 @@ Udaljeni: %4 Merge tool process terminated with exit code %1 Proces alata za sjedinjavanje je prekinut s izlaznim kodom %1 - - - Git::Internal::RemoteModel - - Name - Naziv - - - URL - URL - - - - Git::Internal::SettingsPageWidget Set the environment variable HOME to "%1" (%2). diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 191fbb524f5..9f2faeca741 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -7129,7 +7129,7 @@ on slow machines. In this case, the value should be increased. - Git::CloneWizardPage + Git Specify repository URL, checkout directory and path. Határozza meg a tároló URL-t, megnézési könyvtárat és útvonalat. @@ -7138,9 +7138,6 @@ on slow machines. In this case, the value should be increased. Clone URL: Klón URL: - - - Git::Internal::0 Checkout Megnézés @@ -7677,9 +7674,6 @@ on slow machines. In this case, the value should be increased. Timeout (seconds): Időtúllépés (másodpercek): - - - Git::Internal::BranchDialog Branches Elágazások @@ -7740,9 +7734,6 @@ on slow machines. In this case, the value should be increased. Failed to create a tracking branch Nem sikerült létrehozni egy követő elágazást - - - Git::Internal::ChangeSelectionDialog Select a Git commit Egy Git kommit kiválasztása @@ -7759,9 +7750,6 @@ on slow machines. In this case, the value should be increased. Selected directory is not a Git repository A kiválaszott könyvtár nem egy Git tároló - - - Git::Internal::CloneWizard Clones a project from a git repository. Egy projekt klónozása egy git tárolóból. @@ -7770,9 +7758,6 @@ on slow machines. In this case, the value should be increased. Git Repository Clone Git Tároló Klónozása - - - Git::Internal::GitClient Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work. Ne felejtse el, hogy a git beépülő modul a QtCreatorban nem képes még együttmáködni a szerverel. Így, a manuális ssh azonosítás, stb. nem fog működni. @@ -7886,9 +7871,6 @@ on slow machines. In this case, the value should be increased. There are no modified files. Nincsenek módosítások. - - - Git::Internal::GitPlugin &Git &Git @@ -8065,10 +8047,6 @@ on slow machines. In this case, the value should be increased. &Redo &Helyrehozás - - Revert - Visszatérés - Would you like to revert all pending changes to the project? Vissza szeretné állítani minden függőben levő változtatását a projektre? @@ -8093,31 +8071,18 @@ on slow machines. In this case, the value should be increased. The commit message check failed. Do you want to commit the change? A kommit üzenet ellenőrzése nem sikerült. Kommitolni szeretné a változtatásokat? - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' A(z) '%1' binarás nincs telepítve a(z) '%2' útvonalon - - - Git::Internal::GitSubmitEditor Git Commit Git kommit - - - Git::Internal::GitSubmitPanel General Information Általános információ - - Repository: - Tároló: - repository tároló @@ -8142,9 +8107,6 @@ on slow machines. In this case, the value should be increased. Email: EMail: - - - Git::Internal::LocalBranchModel <New branch> <Új elágazás> @@ -8153,9 +8115,6 @@ on slow machines. In this case, the value should be increased. Type to create a new branch Gépelje be az új elágazás létrehozásához - - - Git::Internal::SettingsPage Environment variables Környezeti változók @@ -8204,9 +8163,6 @@ on slow machines. In this case, the value should be increased. Git Settings Git beállítások - - - GitCommand '%1' failed (exit code %2). diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 98c5e2e5c14..b475a4a7235 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -5152,7 +5152,7 @@ Causa: %3 - Git::Internal::BranchDialog + Git Branches Rami @@ -5216,9 +5216,6 @@ Causa: %3 Failed to create a tracking branch Creazione del ramo con traccia non riuscita - - - Git::Internal::ChangeSelectionDialog Select a Git commit Selezionare un commit Git @@ -5235,9 +5232,6 @@ Causa: %3 Selected directory is not a Git repository La cartella selezionata non è un deposito Git - - - Git::Internal::GitClient Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work. Il plugin git di Qt Creator non è ancora in grado di interagire con il server. Perciò l'identificazione ssh manuale e cose simili non funzioneranno. @@ -5368,9 +5362,6 @@ Causa: %3 There are no modified files. Non ci sono file modificati. - - - Git::Internal::GitOutputWindow Git Output Output di Git @@ -5379,9 +5370,6 @@ Causa: %3 Git Git - - - Git::Internal::GitPlugin &Git &Git @@ -5602,32 +5590,18 @@ Causa: %3 The commit message check failed. Do you want to commit the change? Il controllo sul messaggio della nuova revisione è fallito. Vuoi creare la revisione? - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' Impossibile trovare il binario '%1' nel percorso '%2' - - - Git::Internal::GitSubmitEditor Git Commit Nuova revisione git - - - Git::Internal::GitSubmitPanel General Information Informazioni Generali - - - Repository: - Deposito: - repository @@ -5658,9 +5632,6 @@ Causa: %3 Email: Email: - - - Git::Internal::LocalBranchModel <New branch> <nuovo branch> @@ -5669,9 +5640,6 @@ Causa: %3 Type to create a new branch Scrivi il nome del nuovo ramo - - - Git::Internal::SettingsPage Environment variables Variabili d'ambiente @@ -5728,9 +5696,6 @@ Causa: %3 Omit date from annotation output - - - GitCommand '%1' failed (exit code %2). @@ -12438,7 +12403,7 @@ p, li { white-space: pre-wrap; } - Git::Internal::CloneWizard + Git Clones a project from a git repository. @@ -12447,9 +12412,6 @@ p, li { white-space: pre-wrap; } Git Repository Clone - - - Git::CloneWizardPage Specify repository URL, checkout directory and path. diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 25c5cd6a553..cb9da2d5444 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -2842,7 +2842,7 @@ These prefixes are used in addition to current file name on Switch Header/Source - Git::Internal::BranchAddDialog + Git Branch Name: ブランチ名: @@ -2887,9 +2887,6 @@ These prefixes are used in addition to current file name on Switch Header/Source Checkout new branch 新しいブランチをチェックアウト - - - Git::Internal::BranchCheckoutDialog Local Changes Found. Choose Action: ローカルの変更が見つかりました。以下のアクションから選択してください: @@ -2902,10 +2899,6 @@ These prefixes are used in addition to current file name on Switch Header/Source Discard Local Changes ローカルの変更を破棄する - - CheckBox - チェックボックス - Checkout branch "%1" "%1" ブランチをチェックアウト @@ -2926,9 +2919,6 @@ These prefixes are used in addition to current file name on Switch Header/Source Create Branch Stash for Current Branch 現在のブランチをスタッシュする - - - Git::Internal::BranchDialog Branches ブランチ @@ -3011,14 +3001,6 @@ These prefixes are used in addition to current file name on Switch Header/Source Delete Tag タグを削除 - - Delete Branch - ブランチの削除 - - - Rename Tag - タグ名の変更 - Git Reset Git リセット @@ -3047,9 +3029,6 @@ These prefixes are used in addition to current file name on Switch Header/Source &Include old entries 古いエントリを含む(&I) - - - Git::Internal::ChangeSelectionDialog Working directory: 作業ディレクトリ: @@ -3118,9 +3097,6 @@ These prefixes are used in addition to current file name on Switch Header/Source &Archive... アーカイブする(&A)... - - - Gerrit::Internal::GerritPushDialog Push to Gerrit Gerrit へプッシュ @@ -3231,9 +3207,6 @@ Partially checked - Do not change current state. &Work-in-progress 作業中(&WIP) - - - Git::Internal::GitSubmitPanel General Information 概要 @@ -3279,9 +3252,6 @@ Partially checked - Do not change current state. Sign off サインオフ - - - Git::Internal::RemoteAdditionDialog Add Remote リモートを追加 @@ -3294,21 +3264,10 @@ Partially checked - Do not change current state. URL: URL: - - - Git::Internal::RemoteDialog Remotes リモート - - Re&fresh - 更新(&F) - - - &Add... - 追加(&A)... - F&etch フェッチ(&E) @@ -3317,10 +3276,6 @@ Partially checked - Do not change current state. &Push プッシュ(&P) - - &Remove - 削除(&R) - A remote with the name "%1" already exists. "%1" という名前のリモートは既に存在します。 @@ -3337,9 +3292,6 @@ Partially checked - Do not change current state. Would you like to delete the remote "%1"? リモート "%1" を削除しますか？ - - - Git::Internal::SettingsPage Configuration 設定 @@ -3388,10 +3340,6 @@ Partially checked - Do not change current state. Show tags in Branches dialog ブランチダイアログにタグを表示する - - Gitk - Gitk - Arguments: 引数: @@ -3412,9 +3360,6 @@ Partially checked - Do not change current state. Git Settings Git の設定 - - - Git::Internal::StashDialog Stashes スタッシュ @@ -3439,10 +3384,6 @@ Partially checked - Do not change current state. &Delete... 削除(&D)... - - &Show - 表示(&S) - R&estore... 復元(&E)... @@ -3452,10 +3393,6 @@ Partially checked - Do not change current state. Restore a git stash to new branch to be created ブランチに復元(&B)... - - Re&fresh - 更新(&F) - <No repository> <リポジトリなし> @@ -3488,10 +3425,6 @@ You can choose between stashing the changes or discarding them. リポジトリが変更されている為、%1 を復元できません。 変更内容をスタッシュするか破棄するかを選択してください。 - - Stash - スタッシュ - Discard 破棄 @@ -3500,10 +3433,6 @@ You can choose between stashing the changes or discarding them. Restore Stash to Branch スタッシュをブランチに復元 - - Branch: - ブランチ: - Stash Restore スタッシュの復元 @@ -20246,7 +20175,7 @@ Rebuilding the project might help. - Git::Internal::BranchModel + Git Local Branches ローカルブランチ @@ -20263,9 +20192,6 @@ Rebuilding the project might help. Tags タグ - - - Git::Internal::CommitData untracked 未トラック @@ -20310,9 +20236,6 @@ Rebuilding the project might help. by them リモート側 - - - Gerrit::Internal::GerritDialog Apply in: 適用先: @@ -20345,14 +20268,6 @@ Rebuilding the project might help. &Refresh 更新(&R) - - &Show - 表示(&S) - - - Cherry &Pick - チェリーピック(&P) - Fetching "%1"... "%1 を取得中... @@ -20377,9 +20292,6 @@ Note: This can expose you to man-in-the-middle attack. このサーバーの SSL 認証を無効にしますか？ 注意：これにより、中間者攻撃(man-in-the-middle attack)を受ける可能性があります。 - - - Gerrit::Internal::GerritModel (Draft) (下書き) @@ -20404,10 +20316,6 @@ Note: This can expose you to man-in-the-middle attack. Approvals 承認者 - - Status - ステータス - Number 番号 @@ -20436,9 +20344,6 @@ Note: This can expose you to man-in-the-middle attack. Parse error: "%1" 解析エラー: "%1" - - - Gerrit::Internal::QueryContext Querying Gerrit Gerrit へ問い合わせ中 @@ -20475,16 +20380,6 @@ Would you like to terminate it? Keep Running そのままにする - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -20523,28 +20418,10 @@ Would you like to terminate it? "gerrit.config". "gerrit.config" ファイルに "canonicalWebUrl" が設定されていない場合に、URL に使用されるプロトコルを指定します。 - - - Gerrit::Internal::FetchContext Fetching from Gerrit Gerrit から取得中 - - %1 crashed. - %1 がクラッシュしました。 - - - %1 returned %2. - %1 は %2 で終了しました。 - - - Error running %1: %2 - %1 実行中のエラー: %2 - - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -20591,9 +20468,6 @@ were not verified among remotes in %3. Select different folder? Enter Local Repository for "%1" (%2) "%1" (%2) のローカルリポジトリを入力 - - - Git::Internal::BaseGitDiffArgumentsWidget Patience Patience @@ -20610,9 +20484,6 @@ were not verified among remotes in %3. Select different folder? Ignore whitespace only changes. 空白だけの変更を無視します。 - - - Git::Internal::GitBlameArgumentsWidget Omit Date 日付を省略 @@ -20621,14 +20492,6 @@ were not verified among remotes in %3. Select different folder? Hide the date of a change from the output. 変更点を出力する際に日付を表示しません。 - - Ignore Whitespace - 空白を無視 - - - Ignore whitespace only changes. - 空白だけの変更を無視します。 - No Move Detection 移動検出なし @@ -20649,9 +20512,6 @@ were not verified among remotes in %3. Select different folder? Move detection 移動検出 - - - Git::Internal::GitLogArgumentsWidget Show Diff 差分表示 @@ -20692,9 +20552,6 @@ were not verified among remotes in %3. Select different folder? Show log also for previous names of the file. 以前のファイル名についてもログを表示する。 - - - Git::Internal::GitClient Cannot determine the repository for "%1". "%1" のリポジトリを特定できません。 @@ -20821,10 +20678,6 @@ were not verified among remotes in %3. Select different folder? Invalid revision 不正なリビジョン - - Detached HEAD - デタッチされた HEAD - Cannot describe revision "%1" in "%2": %3 "%2" (リビジョン: "%1") を表示できません: %3 @@ -20906,10 +20759,6 @@ Commit now? マージを完了させるには変更のコミットが必要です。 コミットしますか？ - - Commit - コミット - Continue Revert コミットの打ち消しの続行 @@ -20970,10 +20819,6 @@ Commit now? Cherr&y-Pick Change %1 コミット %1 をチェリーピック(&Y) - - Re&vert Change %1 - コミット %1 をリバート(&V) - C&heckout Change %1 コミット %1 をチェックアウト(&H) @@ -21191,18 +21036,10 @@ Would you like to create the branch "%1" on the remote and set it as u Stash local changes and pop when %1 finishes. ローカルの変更をスタッシュして %1 の完了後に復元します。 - - Stash - スタッシュ - Stash local changes and execute %1. ローカルの変更をスタッシュして %1 を実行します。 - - Discard - 破棄 - Discard (reset) local changes and execute %1. ローカルの変更を破棄(リセット)して %1 を実行します。 @@ -21215,13 +21052,6 @@ Would you like to create the branch "%1" on the remote and set it as u Cancel %1. %1 をキャンセルします。 - - Reset - リセット - - - - Git::Internal::GitPlugin &Git &Git @@ -21442,18 +21272,10 @@ Would you like to create the branch "%1" on the remote and set it as u Abort Revert コミット打ち消しの中止 - - Continue Rebase - リベースの続行 - Continue Cherry Pick チェリーピックの続行 - - Continue Revert - コミットの打ち消しの続行 - Branches... ブランチ (Branch)... @@ -21474,10 +21296,6 @@ Would you like to create the branch "%1" on the remote and set it as u Apply from File... ファイルから適用... - - &Stash - スタッシュ (&Stash) - Stashes... スタッシュ (Stash)... @@ -21590,10 +21408,6 @@ Would you like to create the branch "%1" on the remote and set it as u Git Gui Git GUI - - Repository Browser - リポジトリブラウザ - Merge Tool マージツール @@ -21686,32 +21500,14 @@ Would you like to create the branch "%1" on the remote and set it as u Patch %1 successfully applied to %2 パッチ %1 を %2 に適用しました - - <No repository> - <リポジトリなし> - - - Repository: %1 - リポジトリ: %1 - - - - Git::Internal::GitSettings The binary "%1" could not be located in the path "%2" パス "%2" から実行ファイル "%1" が見つかりませんでした - - - Git::Internal::GitSubmitEditorWidget Provide a valid email to commit. コミットするには有効なメールアドレスが必要です。 - - Detached HEAD - デタッチされた HEAD - Select Change 変更の選択 @@ -21752,20 +21548,10 @@ Would you like to create the branch "%1" on the remote and set it as u &Commit コミット(&C) - - - Git::Internal::LogChangeWidget Sha1 SHA1 - - Subject - 件名 - - - - Git::Internal::LogChangeDialog Reset to: リセット: @@ -21790,9 +21576,6 @@ Would you like to create the branch "%1" on the remote and set it as u Soft ソフト - - - Git::Internal::MergeTool Normal ノーマル @@ -21873,10 +21656,6 @@ Remote: %4 Continue merging other unresolved paths? 他の未解決なパスのマージを継続しますか？ - - Merge Tool - マージツール - Merge tool is not configured. マージツールが設定されていません。 @@ -21893,9 +21672,6 @@ Remote: %4 Merge tool process terminated with exit code %1 マージツールプロセスは終了コード %1 で終了しました - - - Git::Internal::SettingsPageWidget Set the environment variable HOME to "%1" (%2). @@ -21928,10 +21704,6 @@ instead of its installation directory when run outside git bash. Git Repository Browser Command Git リポジトリブラウザコマンド - - Git - Git - GLSLEditor @@ -35551,23 +35323,12 @@ API バージョンが %1 以上の SDK をインストールしてください - Git::Internal::GitSubmitEditor + Git Refreshing Commit Data コミットデータのリフレッシュ中 - - Git::Internal::RemoteModel - - Name - 名前 - - - URL - URL - - Help @@ -42178,7 +41939,7 @@ Preselects a desktop Qt for building the application if available. - Git::Internal::GitEditorWidget + Git &Blame %1 "%1" の編集者を表示(&B) @@ -42187,10 +41948,6 @@ Preselects a desktop Qt for building the application if available. Blame &Parent Revision %1 親リビジョン %1 の編集者を表示(&P) - - Chunk successfully staged - チャンクをステージに追加しました - Stage Chunk... チャンクをステージに追加... @@ -42199,41 +41956,10 @@ Preselects a desktop Qt for building the application if available. Unstage Chunk... チャンクをステージから削除... - - Cherr&y-Pick Change %1 - コミット %1 をチェリーピック(&Y) - Re&vert Change %1 コミット %1 を打ち消す(&V) - - C&heckout Change %1 - コミット %1 をチェックアウト(&H) - - - &Log for Change %1 - コミット %1 のログ(&L) - - - &Reset to Change %1 - コミット %1 へリセット(&R) - - - &Hard - ハード(&H) - - - &Mixed - 混在(&M) - - - &Soft - ソフト(&S) - - - - GitGrep &Use Git Grep Git Grep を使用する(&U) @@ -42262,10 +41988,6 @@ Leave empty to search through the file system. リファレンス: %1 %2 - - Git Show %1:%2 - Git Show %1:%2 - GlslEditor::Internal::GlslEditorPlugin @@ -46332,15 +46054,11 @@ Output: - Gerrit::Internal::AuthenticationDialog + Git Authentication 認証情報 - - &User: - ユーザー(&U): - &Password: パスワード(&P): @@ -50078,162 +49796,41 @@ Stepping into the module or setting breakpoints by file and line is expected to - Git::Internal::BranchView + Git Refresh 更新 - - Include branches and tags that have not been active for %n days. - - 直近の %n 日にアクティブではないブランチやタグを含みます。 - - - - <No repository> - <リポジトリなし> - - - &Add... - 追加(&A)... - - - &Checkout - チェックアウト(&C) - - - &Diff - 差分表示(&D) - - - &Log - ログ表示(&L) - - - &Hard - ハード(&H) - - - &Mixed - 混在(&M) - - - &Soft - ソフト(&S) - - - Cherry &Pick - チェリーピック(&P) - - - &Track - トラック(&T) - - - &Push - プッシュ(&P) - - - Would you like to delete the tag "%1"? - タグ "%1" を削除しますか？ - - - Would you like to delete the branch "%1"? - ブランチ "%1" を削除しますか？ - - - Would you like to delete the <b>unmerged</b> branch "%1"? - <b>マージされていない</b>ブランチ ”%1" を削除しますか？ - - - Delete Tag - タグを削除 - Delete Branch ブランチを削除する - - Git Reset - Git リセット - - - - Git::Internal::BranchViewFactory Filter フィルタ - - - Git::Internal::GitBaseDiffEditorController <None> <なし> - - - Git::Internal::BaseGitLogArgumentsWidget - - Show difference. - 差分を表示します。 - - - Filter - フィルタ - - - - Git::Internal::GitLogFilterWidget Filter: フィルタ: - - - Git::Internal::GitPluginPrivate &Describe Change %1 変更 %1 の説明(&D) - - Git Settings - Git の設定 - - - &Git - &Git - - - Current &File - 現在のファイル(&F) - Diff of "%1" Avoid translating "Diff" "%1" の差分表示 (Diff) - - Meta+G,Meta+D - Meta+G,Meta+D - - - Alt+G,Alt+D - Alt+G,Alt+D - Log of "%1" Avoid translating "Log" "%1" のログ (Log) - - Meta+G,Meta+L - Meta+G,Meta+L - - - Alt+G,Alt+L - Alt+G,Alt+L - Blame Current File Avoid translating "Blame" @@ -50244,87 +49841,11 @@ Stepping into the module or setting breakpoints by file and line is expected to Avoid translating "Blame" "%1" の編集者を表示 (Blame) - - Meta+G,Meta+B - Meta+G,Meta+B - - - Alt+G,Alt+B - Alt+G,Alt+B - - - Stage File for Commit - ファイルをステージ(コミット予定)に追加 (Add) - - - Stage "%1" for Commit - "%1" をステージ(コミット予定)に追加 (Add) - - - Meta+G,Meta+A - Meta+G,Meta+A - - - Alt+G,Alt+A - Alt+G,Alt+A - - - Unstage File from Commit - ファイルをステージ(コミット予定)から削除 (Reset) - - - Unstage "%1" from Commit - "%1" をステージ(コミット予定)から削除 (Reset) - - - Undo Unstaged Changes - ステージに無い変更を元に戻す - - - Undo Unstaged Changes for "%1" - "%1" のステージに無い変更を元に戻す - - - Undo Uncommitted Changes - コミットされていない変更を元に戻す - - - Undo Uncommitted Changes for "%1" - "%1" のコミットされていない変更を元に戻す - - - Meta+G,Meta+U - Meta+G,Meta+U - - - Alt+G,Alt+U - Alt+G,Alt+U - - - Current &Project - 現在のプロジェクト(&P) - Diff Current Project Avoid translating "Diff" 現在のプロジェクトの差分表示 (Diff) - - Meta+G,Meta+Shift+D - Meta+G,Meta+Shift+D - - - Alt+G,Alt+Shift+D - Alt+G,Alt+Shift+D - - - Meta+G,Meta+K - Meta+G,Meta+K - - - Alt+G,Alt+K - Alt+G,Alt+K - Clean Project... Avoid translating "Clean" @@ -50335,18 +49856,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Avoid translating "Clean" プロジェクト "%1" をクリーン (Clean)... - - &Local Repository - ローカルリポジトリ(&L) - - - Meta+G,Meta+C - Meta+G,Meta+C - - - Alt+G,Alt+C - Alt+G,Alt+C - Amend Last Commit... Avoid translating "Commit" @@ -50362,10 +49871,6 @@ Stepping into the module or setting breakpoints by file and line is expected to Avoid translating "Rebase" 対話的なリベース (Rebase)... - - Update Submodules - サブモジュールを更新 - Abort Merge Avoid translating "Merge" @@ -50386,172 +49891,20 @@ Stepping into the module or setting breakpoints by file and line is expected to Avoid translating "Revert" コミット打ち消しの中止 - - Continue Rebase - リベースの続行 - - - Continue Cherry Pick - チェリーピックの続行 - - - Continue Revert - コミットの打ち消しの続行 - - - Branches... - ブランチ (Branch)... - - - &Patch - パッチ(&P) - - - Apply from Editor - エディタから適用 - - - Apply "%1" - "%1" の適用 - - - Apply from File... - ファイルから適用... - &Stash スタッシュ (&Stash) - - Saves the current state of your work and resets the repository. - 現在の状態を保持し、リポジトリを元の状態に戻します。 - Stash Unstaged Files Avoid translating "Stash" ステージにないファイルをスタッシュ (Stash) - - Saves the current state of your unstaged files and resets the repository to its staged state. - ステージにないファイルの現在の状態を保存してリポジトリをステージ状態にリセットします。 - - - Take Snapshot... - スナップショットを取る... - - - Saves the current state of your work. - 現在の作業状況を保存します。 - Stash Pop Avoid translating "Stash" スタッシュのポップ (Stash Pop) - - Restores changes saved to the stash list using "Stash". - "スタッシュ (Stash)"で保存させた作業状況を復元します。 - - - &Remote Repository - リモートリポジトリ(&R) - - - &Subversion - &Subversion - - - Manage Remotes... - リモートの管理... - - - Git &Tools - Git ツール(&T) - - - Gitk Current File - 現在のファイルを Gitk で表示する - - - Gitk of "%1" - "%1" を Gitk で表示する - - - Gitk for folder of Current File - 現在のファイルのフォルダーを Gitk で表示する - - - Gitk for folder of "%1" - "%1" のフォルダーを Gitk で表示する - - - Git Gui - Git GUI - - - Repository Browser - リポジトリブラウザ - - - Merge Tool - マージツール - - - Actions on Commits... - コミット時のアクション... - - - Create Repository... - リポジトリの作成... - - - Undo Changes to %1 - コミット %1 まで元に戻す - - - Interactive Rebase - 対話的なリベース - - - Another submit is currently being executed. - 別のサブミットが実行中です。 - - - Unsupported version of Git found. Git %1 or later required. - サポート対象外のバージョンの Git が見つかりました。Git %1 以降が必要です。 - - - Amend %1 - %1 のログを修正する - - - Git Fixup Commit - Git コミットの Fixup - - - Git Commit - Git コミット - - - Repository Clean - リポジトリをクリーン - - - The repository is clean. - リポジトリは変更されていません。 - - - Patches (*.patch *.diff) - パッチ (*.patch *.diff) - - - Choose Patch - パッチの選択 - - - Patch %1 successfully applied to %2 - パッチ %1 を %2 に適用しました - Help diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 7e3fa2d64c4..44c66c74a04 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -402,7 +402,7 @@ - Git::Internal::BranchDialog + Git Branches Gałęzie @@ -527,9 +527,6 @@ Cherry &Pick - - - Git::Internal::GitSubmitPanel General Information Ogólne informacje @@ -570,9 +567,6 @@ Sign off - - - Git::Internal::SettingsPage <b>Note:</b> <b>Uwaga:</b> @@ -5541,7 +5535,7 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. - Git::Internal::ChangeSelectionDialog + Git Browse &History... Przeglądaj &historię... @@ -5550,10 +5544,6 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. &Show &Pokaż - - Cherry &Pick - - &Revert Odw&róć @@ -5606,9 +5596,6 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. HEAD HEAD - - - Git::Internal::GitClient Would you like to create a local branch? Czy utworzyć lokalną gałąź? @@ -5695,10 +5682,6 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. MERGING SCALANIE - - Detached HEAD - Odłączony HEAD - Reset @@ -5809,14 +5792,6 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. Stash local changes and pop when %1 finishes. - - Stash - Odłóż zmiany - - - Discard - Porzuć - There were warnings while applying "%1" to "%2": %3 @@ -5996,9 +5971,6 @@ Commit now? Cancel %1. Anuluj %1. - - - Git::Internal::GitPlugin &Git &Git @@ -6251,10 +6223,6 @@ Commit now? Abort Revert Przerwij odwracanie - - Continue Rebase - - Skip Rebase @@ -6263,10 +6231,6 @@ Commit now? Continue Cherry Pick - - Continue Revert - Kontynuuj odwracanie - &Patch Ła&ty @@ -6323,10 +6287,6 @@ Commit now? Git &Tools Narzędzia Gi&ta - - Gitk - Gitk - Gitk Current File Gitk dla bieżącego pliku @@ -6347,10 +6307,6 @@ Commit now? Git Gui Git Gui - - Repository Browser - Przeglądarka repozytorium - Merge Tool Narzędzie scalania @@ -6455,10 +6411,6 @@ Commit now? Meta+G,Meta+C Meta+G,Meta+C - - Commit - Utwórz poprawkę - &Undo &Cofnij @@ -6475,9 +6427,6 @@ Commit now? Do you want to commit the change? Czy utworzyć poprawkę? - - - Git::Internal::GitSettings The binary "%1" could not be located in the path "%2" Nie można odnaleźć pliku binarnego "%1" w ścieżce "%2" @@ -10095,7 +10044,7 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych - Git::Internal::StashDialog + Git Stashes Odłożone zmiany @@ -10132,10 +10081,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych &Delete... &Usuń... - - &Show - &Pokaż - R&estore... P&rzywróć... @@ -10145,10 +10090,6 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych Restore a git stash to new branch to be created Przywróć do &gałęzi... - - Re&fresh - &Odśwież - Delete Stashes Usuń odłożone zmiany @@ -10163,10 +10104,6 @@ You can choose between stashing the changes or discarding them. Nie można przywrócić %1, ponieważ repozytorium zostało zmodyfikowane. Możesz odłożyć zmiany lub je porzucić. - - Stash - Odłóż zmiany - Discard Odrzuć @@ -10175,10 +10112,6 @@ Możesz odłożyć zmiany lub je porzucić. Restore Stash to Branch Przywróć odłożone zmiany w gałęzi - - Branch: - Gałąź: - Stash Restore Przywróć odłożone zmiany @@ -13406,7 +13339,7 @@ Możesz zostać poproszony o podzielenie się zawartością tego loga podczas tw - Git::Internal::SettingsPageWidget + Git Set the environment variable HOME to "%1" (%2). @@ -15713,7 +15646,7 @@ Ponowić próbę? - Git::Internal::BaseGitDiffArgumentsWidget + Git Use the patience algorithm for calculating the differences. Użyj algorytmu "patience" przy pokazywaniu różnic. @@ -15730,9 +15663,6 @@ Ponowić próbę? Ignore Whitespace Ignoruj białe znaki - - - Git::Internal::GitBlameArgumentsWidget Hide the date of a change from the output. Ukrywa datę zmiany na wyjściu. @@ -15741,14 +15671,6 @@ Ponowić próbę? Omit Date Pomiń datę - - Ignore whitespace only changes. - Ignoruj zmiany w białych znakach. - - - Ignore Whitespace - Ignoruj białe znaki - GLSLEditor @@ -16382,7 +16304,7 @@ if (a && - Git::Internal::RemoteAdditionDialog + Git Add Remote Dodaj zdalne repozytorium @@ -16403,29 +16325,14 @@ if (a && The URL may not be valid. Podany URL może nie być poprawny. - - - Git::Internal::RemoteDialog Remotes Zdalne repozytoria - - Re&fresh - &Odśwież - - - &Add... - &Dodaj... - F&etch Po&bierz - - &Remove - &Usuń - Delete Remote Usuń zdalne repozytorium @@ -17982,7 +17889,7 @@ Kiedy zostaje wykryty problem, aplikacja jest zatrzymywana i może zostać zdebu - Git::Internal::BranchAddDialog + Git Branch Name: Nazwa gałęzi: @@ -18067,7 +17974,7 @@ Kiedy zostaje wykryty problem, aplikacja jest zatrzymywana i może zostać zdebu - Git::Internal::BranchModel + Git Local Branches Lokalne gałęzie @@ -21691,7 +21598,7 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt. - Git::Internal::CommitData + Git untracked nieśledzony @@ -21736,9 +21643,6 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt. by them przez nich - - - Gerrit::Internal::GerritDialog Changes Zmiany @@ -21755,22 +21659,10 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Details Szczegóły - - C&heckout - - &Refresh &Odśwież - - &Show - &Pokaż - - - Cherry &Pick - - Fetching "%1"... Pobieranie "%1"... @@ -21793,9 +21685,6 @@ Do you want to disable SSL verification for this server? Note: This can expose you to man-in-the-middle attack. - - - Gerrit::Internal::GerritModel (Draft) (wersja robocza) @@ -21820,10 +21709,6 @@ Note: This can expose you to man-in-the-middle attack. Approvals Zatwierdzenia - - Status - Stan - Number Numer @@ -21852,9 +21737,6 @@ Note: This can expose you to man-in-the-middle attack. Parse error: "%1" Błąd parsowania: "%1" - - - Gerrit::Internal::QueryContext Querying Gerrit Komunikacja z Gerritem @@ -21891,16 +21773,6 @@ Czy zakończyć proces? Keep Running Pozostaw uruchomionym - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -21935,28 +21807,10 @@ Czy zakończyć proces? "gerrit.config". Określa protokół użyty do formowania URL w przypadku braku konfiguracji "canonicalWebUrl" w pliku "gerrit.config". - - - Gerrit::Internal::FetchContext Fetching from Gerrit Pobieranie danych z Gerrita - - %1 crashed. - %1 przerwał pracę. - - - %1 returned %2. - %1 zwrócił %2. - - - Error running %1: %2 - Błąd podczas uruchamiania %1: %2 - - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -22000,9 +21854,6 @@ were not verified among remotes in %3. Select different folder? Enter Local Repository for "%1" (%2) Podaj lokalne repozytorium dla "%1" (%2) - - - Git::Internal::GitLogArgumentsWidget Show Diff Pokaż różnice @@ -22027,9 +21878,6 @@ were not verified among remotes in %3. Select different folder? Show textual graph log. Pokazuj log grafu tekstowego. - - - Git::Internal::GitSubmitEditorWidget Provide a valid email to commit. Podaj poprawny e-mail używany przy tworzeniu poprawek. @@ -23874,7 +23722,7 @@ You can choose another communication channel here, such as a serial line or cust - Git::Internal::BranchCheckoutDialog + Git Local Changes Found. Choose Action: Wykryto lokalne zmiany. Wybierz akcję: @@ -23887,10 +23735,6 @@ You can choose another communication channel here, such as a serial line or cust Discard Local Changes Porzuć lokalne zmiany - - CheckBox - Przycisk wyboru - Checkout branch "%1" Kopia robocza gałęzi "%1" @@ -23911,9 +23755,6 @@ You can choose another communication channel here, such as a serial line or cust Create Branch Stash for Current Branch Utwórz gałąź z odłożoną zmianą dla bieżącej gałęzi - - - Gerrit::Internal::GerritPushDialog Push to Gerrit Wyślij do Gerrita @@ -25440,18 +25281,11 @@ Więcej informacji w dokumentacji "Checking Code Syntax". - Git::Internal::LogChangeWidget + Git Sha1 Sha1 - - Subject - Temat - - - - Git::Internal::LogChangeDialog Reset to: Zresetuj do: @@ -25476,9 +25310,6 @@ Więcej informacji w dokumentacji "Checking Code Syntax".Soft Soft - - - Git::Internal::MergeTool Normal Normalny @@ -32446,7 +32277,7 @@ Use this only if you are prototyping. You cannot create a full application with - Git::Internal::GitEditorWidget + Git &Blame %1 @@ -32455,10 +32286,6 @@ Use this only if you are prototyping. You cannot create a full application with Blame &Parent Revision %1 - - Chunk successfully staged - - Stage Chunk... @@ -32499,25 +32326,11 @@ Use this only if you are prototyping. You cannot create a full application with &Soft - - - Git::Internal::GitSubmitEditor Refreshing Commit Data Odświeżanie danych poprawki - - Git::Internal::RemoteModel - - Name - Nazwa - - - URL - URL - - GlslEditor::Internal::GlslEditorPlugin @@ -37986,7 +37799,7 @@ Ustaw prawdziwy plik wykonywalny Clang. - GitGrep + Git Tree (optional) Drzewo (opcjonalnie) @@ -40977,7 +40790,7 @@ Wiersz: %4, kolumna: %5 - Gerrit::Internal::AuthenticationDialog + Git Authentication Autoryzacja @@ -40986,10 +40799,6 @@ Wiersz: %4, kolumna: %5 <html><head/><body><p>Gerrit server with HTTP was detected, but you need to set up credentials for it.</p><p>To get your password, <a href="LINK_PLACEHOLDER"><span style=" text-decoration: underline; color:#007af4;">click here</span></a> (sign in if needed). Click Generate Password if the password is blank, and copy the user name and password to this form.</p><p>Choose Anonymous if you do not want authentication for this server. In this case, changes that require authentication (like draft changes or private projects) will not be displayed.</p></body></html> - - &User: - &Użytkownik: - &Password: H&asło: @@ -42605,7 +42414,7 @@ Błąd: %5 - Gerrit::Internal::GerritRemoteChooser + Git Refresh Remote Servers Odśwież zdalne serwery diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 8f8b850c6d4..8512f1b870f 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -20694,7 +20694,7 @@ See also Google Test settings. - Gerrit::Internal::AuthenticationDialog + Git Authentication Авторизация @@ -20719,9 +20719,6 @@ See also Google Test settings. Anonymous Анонимно - - - Gerrit::Internal::FetchContext Fetching from Gerrit Загрузка из Gerrit @@ -20738,9 +20735,6 @@ See also Google Test settings. Error running %1: %2 Ошибка выполнения %1: %2 - - - Gerrit::Internal::GerritDialog Changes Изменения @@ -20797,9 +20791,6 @@ Note: This can expose you to man-in-the-middle attack. Отключить SSL проверку для этого сервера? Внимание: Это может повлечь атаку «человек посередине». - - - Gerrit::Internal::GerritModel (Draft) (черновик) @@ -20856,16 +20847,6 @@ Note: This can expose you to man-in-the-middle attack. Parse error: "%1" Ошибка разбора: «%1» - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -20874,10 +20855,6 @@ Note: This can expose you to man-in-the-middle attack. &Host: &Сервер: - - &User: - Поль&зователь: - &ssh: &ssh: @@ -20902,9 +20879,6 @@ Note: This can expose you to man-in-the-middle attack. создания URL в случае, если «canonicalWebUrl» не настроен в «gerrit.config». - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -20947,9 +20921,6 @@ were not verified among remotes in %3. Select different folder? Enter Local Repository for "%1" (%2) Ввод локального хранилища для «%1» (%2) - - - Gerrit::Internal::GerritPushDialog Push to Gerrit Отправка в Gerrit @@ -21052,9 +21023,6 @@ Partially checked - Do not change current state. &Work-in-progress В р&аботе - - - Gerrit::Internal::GerritRemoteChooser Refresh Remote Servers Обновить внешние хранилища @@ -21063,25 +21031,10 @@ Partially checked - Do not change current state. Fallback Резервный - - - Gerrit::Internal::QueryContext Querying Gerrit Запрос к Gerrit - - Error running %1: %2 - Ошибка выполнения %1: %2 - - - %1 crashed. - %1 аварийно завершился. - - - %1 returned %2. - %1 возвратил %2. - Timeout Время вышло @@ -21102,9 +21055,6 @@ Would you like to terminate it? Terminate Завершить - - - Git::Internal::BaseGitDiffArgumentsWidget Use the patience algorithm for calculating the differences. Использовать устойчивый алгоритм для расчёта различий. @@ -21121,28 +21071,14 @@ Would you like to terminate it? Ignore Whitespace Игнорировать пробелы - - - Git::Internal::BaseGitLogArgumentsWidget - - Diff - Сравнить - Show difference. Показать изменения. - - Filter - Фильтровать - Filter commits by message or content. Отбирать фиксации по сообщению или содержимому. - - - Git::Internal::BranchAddDialog Branch Name: Название ветки: @@ -21179,9 +21115,6 @@ Would you like to terminate it? Checkout new branch Выгрузить новую ветку - - - Git::Internal::BranchCheckoutDialog Local Changes Found. Choose Action: Имеются локальные изменения. Следует: @@ -21218,9 +21151,6 @@ Would you like to terminate it? Create Branch Stash for Current Branch Спрятать изменения текущей ветки - - - Git::Internal::BranchModel Local Branches Локальные ветки @@ -21229,17 +21159,10 @@ Would you like to terminate it? Remote Branches Внешние ветки - - Detached HEAD - Отцеплённая HEAD - Tags Метки - - - Git::Internal::BranchView Include Old Entries Включать старые элементы @@ -21316,18 +21239,10 @@ Would you like to terminate it? Re&set С&бросить - - &Hard - Жё&стко (--hard) - &Mixed С&мешанно - - &Soft - &Мягко (--soft) - &Merge (Fast-Forward) О&бъединить (промотать) @@ -21344,18 +21259,10 @@ Would you like to terminate it? &Rebase Переба&зировать - - Cherry &Pick - Перенести &изменения - &Track С&вязать - - &Push - О&тправить (push) - Would you like to delete the tag "%1"? Удалить метку «%1»? @@ -21384,9 +21291,6 @@ Would you like to terminate it? Git Reset Git: Сброс изменений - - - Git::Internal::BranchViewFactory Git Branches Ветки Git @@ -21395,21 +21299,10 @@ Would you like to terminate it? Filter Фильтр - - - Git::Internal::ChangeSelectionDialog Browse &History... Открыть &историю... - - &Show - &Показать - - - Cherry &Pick - Перенести &изменения - &Revert &Откатить @@ -21466,9 +21359,6 @@ Would you like to terminate it? &Archive... &Сжать... - - - Git::Internal::CommitData untracked не контролируется @@ -21513,16 +21403,10 @@ Would you like to terminate it? by them ими - - - Git::Internal::GitBaseDiffEditorController <None> <Нет> - - - Git::Internal::GitBlameArgumentsWidget Hide the date of a change from the output. Скрывать дату изменений в выводе. @@ -21531,10 +21415,6 @@ Would you like to terminate it? Omit Date Пропускать дату - - Ignore whitespace only changes. - Игнорировать изменения пробелов. - No Move Detection Без обнаружения перемещений @@ -21555,13 +21435,6 @@ Would you like to terminate it? Move detection Определение перемещений - - Ignore Whitespace - Игнорировать пробелы - - - - Git::Internal::GitClient Invalid revision Некорректная ревизия @@ -21781,10 +21654,6 @@ Commit now? MERGING ОБЪЕДИНЕНИЕ - - Detached HEAD - Отцеплённая HEAD - Cannot reset %n files in "%1": %2 @@ -21832,10 +21701,6 @@ Commit now? Continue Продолжить - - Continue Revert - Продолжить откат - You need to commit changes to finish revert. Commit now? @@ -22008,14 +21873,6 @@ Would you like to create the branch "%1" on the remote and set it as u Stash local changes and pop when %1 finishes. Спрятать локальные изменения и восстановить после завершения %1. - - Stash - Спрятать - - - Discard - Отменить - Cherr&y-Pick Change %1 &Внести изменение %1 @@ -22048,10 +21905,6 @@ Would you like to create the branch "%1" on the remote and set it as u &Hard Жё&стко - - &Mixed - С&мешанно - &Soft &Мягко @@ -22068,9 +21921,6 @@ Would you like to create the branch "%1" on the remote and set it as u &Save for Diff С&охранить для сравнения - - - Git::Internal::GitEditorWidget &Blame %1 &Аннотация %1 @@ -22079,10 +21929,6 @@ Would you like to create the branch "%1" on the remote and set it as u Blame &Parent Revision %1 Аннотация &родительской ревизии %1 - - Chunk successfully staged - Фрагмент успешно применён - Stage Chunk... Применить фрагмент... @@ -22091,9 +21937,6 @@ Would you like to create the branch "%1" on the remote and set it as u Unstage Chunk... Отменить фрагмент... - - - Git::Internal::GitLogArgumentsWidget First Parent Первый родитель @@ -22126,9 +21969,6 @@ Would you like to create the branch "%1" on the remote and set it as u Show log also for previous names of the file. Показывать историю до переименования файла. - - - Git::Internal::GitLogFilterWidget Filter by message Отбор по сообщению @@ -22153,20 +21993,10 @@ Would you like to create the branch "%1" on the remote and set it as u Case Sensitive Учитывать регистр - - - Git::Internal::GitPlugin - - <No repository> - <Нет хранилища> - Repository: %1 Хранилище: %1 - - - Git::Internal::GitPluginPrivate &Copy "%1" &Копировать «%1» @@ -22373,11 +22203,6 @@ Would you like to create the branch "%1" on the remote and set it as u Очистить... Clean... - - Status - Состояние - Status - Commit... Фиксировать... @@ -22441,11 +22266,6 @@ Would you like to create the branch "%1" on the remote and set it as u Прервать откат Abort Revert - - Continue Rebase - Продолжение перебазирования - Continue Rebase - Skip Rebase Пропустить перебазирование @@ -22613,10 +22433,6 @@ Would you like to create the branch "%1" on the remote and set it as u Git &Tools Сре&дства Git - - Gitk - Gitk - Gitk Current File Открыть текущий файл в Gitk @@ -22642,16 +22458,6 @@ Would you like to create the branch "%1" on the remote and set it as u Интерфейс Git Git Gui - - Repository Browser - Обозреватель хранилища - Repository Browser - - - Merge Tool - Программа объединения - Merge Tool - Actions on Commits... Действия при фиксации... @@ -22709,9 +22515,6 @@ Would you like to create the branch "%1" on the remote and set it as u Patch %1 successfully applied to %2 Исправление %1 успешно наложено на %2 - - - Git::Internal::GitRefLogArgumentsWidget Show Date Показывать дату @@ -22720,23 +22523,14 @@ Would you like to create the branch "%1" on the remote and set it as u Show date instead of sequence. Показывать дату вместо последовательности. - - - Git::Internal::GitSettings The binary "%1" could not be located in the path "%2" Программа «%1» отсутствует в «%2» - - - Git::Internal::GitSubmitEditor Refreshing Commit Data Обновление данных фиксации - - - Git::Internal::GitSubmitEditorWidget Provide a valid email to commit. Для фиксации необходим рабочий адрес электронной почты. @@ -22785,9 +22579,6 @@ Would you like to create the branch "%1" on the remote and set it as u &Commit &Фиксировать - - - Git::Internal::GitSubmitPanel General Information Основная информация @@ -22828,9 +22619,6 @@ Would you like to create the branch "%1" on the remote and set it as u Sign off Выходить - - - Git::Internal::LogChangeDialog Reset to: Сбросить до: @@ -22855,20 +22643,10 @@ Would you like to create the branch "%1" on the remote and set it as u Soft Мягкий (--soft) - - - Git::Internal::LogChangeWidget Sha1 Sha1 - - Subject - Описание - - - - Git::Internal::MergeTool Normal Обычный @@ -22969,9 +22747,6 @@ Remote: %4 Merge tool process terminated with exit code %1 Процесс объединения завершился с кодом %1 - - - Git::Internal::RemoteAdditionDialog Add Remote Добавление внешнего хранилища @@ -22984,9 +22759,6 @@ Remote: %4 URL: - - - Git::Internal::RemoteDialog Remotes Внешние хранилища @@ -23011,10 +22783,6 @@ Remote: %4 Re&fresh &Обновить - - &Add... - &Добавить... - F&etch &Получить @@ -23027,20 +22795,6 @@ Remote: %4 &Push О&тправить - - - Git::Internal::RemoteModel - - Name - Имя - - - URL - URL - - - - Git::Internal::SettingsPage <b>Note:</b> <b>Внимание:</b> @@ -23102,9 +22856,6 @@ Perl через переменные среды окружения.Repository Browser Обозреватель хранилища - - - Git::Internal::SettingsPageWidget Set the environment variable HOME to "%1" (%2). @@ -23131,9 +22882,6 @@ instead of its installation directory when run outside git bash. Git Git - - - Git::Internal::StashDialog Stashes Спрятанное @@ -23170,10 +22918,6 @@ instead of its installation directory when run outside git bash. &Delete... &Удалить... - - &Show - &Показать - R&estore... &Восстановить... @@ -23183,10 +22927,6 @@ instead of its installation directory when run outside git bash. Restore a git stash to new branch to be created Восстановить в в&етку... - - Re&fresh - &Обновить - Delete Stashes Удалить спрятанное @@ -23201,10 +22941,6 @@ You can choose between stashing the changes or discarding them. Невозможно восстановить %1, так как хранилище изменилось. Вы можете выбрать между скрытием изменений или отказа от них. - - Stash - Спрятать - Discard Отказаться @@ -23213,10 +22949,6 @@ You can choose between stashing the changes or discarding them. Restore Stash to Branch Восстановить спрятанное в ветку - - Branch: - Ветка: - Stash Restore Восстановление спрятанного @@ -23229,9 +22961,6 @@ You can choose between stashing the changes or discarding them. Error restoring %1 Ошибка восстановления %1 - - - GitGrep Tree (optional) Дерево (опционально) diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index edd214d9eb5..e58c95cb9ef 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -5119,7 +5119,7 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - Git::Internal::BranchDialog + Git Would you like to delete the <b>unmerged</b> branch '%1'? Ali želite izbrisati <b>nezdruženo</b> vejo »%1«? @@ -5170,18 +5170,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Checkout Prevzemi - - Diff - Razlike - - - Refresh - Osveži - - - Delete... - Izbriši … - Failed to delete branch Izbris veje ni uspel @@ -5214,9 +5202,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Remote Branches Oddaljene veje - - - Git::Internal::ChangeSelectionDialog Select a Git Commit Izberite zapis Git @@ -5233,9 +5218,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Selected directory is not a Git repository Izbrana mapa ni skladišče Git - - - Git::Internal::GitClient Waiting for data... Čakanje na podatke … @@ -5463,10 +5445,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr %n datotek ni moč zapisati: %1 - - Revert - Povrni - The file has been changed. Do you want to revert it? Datoteka je bila spremenjena. Ali jo želite povrniti? @@ -5698,9 +5676,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - - - Git::Internal::GitPlugin &Git &Git @@ -5847,10 +5822,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Amend %1 Sprememba %1 - - Git Commit - Zapis v Git - Closing Git Editor Zapiranje urejevalnika Git @@ -6073,16 +6044,10 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Undo Changes for "%1" Razveljavi spremembe v »%1« - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' Izvršljive datoteke »%1« na poti »%2« ni bilo moč najti - - - Git::Internal::GitSubmitPanel General Information Splošni podatki @@ -6097,11 +6062,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr repository skladišče - - - Branch: - Veja: - branch @@ -6122,9 +6082,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Email: E-pošta: - - - Git::Internal::SettingsPage Git Git @@ -6219,9 +6176,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Use "patience diff" algorithm Uporabi algoritem za razlike po pasjansi - - - GitCommand '%1' failed (exit code %2). @@ -12714,7 +12668,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - Git::Internal::CloneWizard + Git Clones a Git repository and tries to load the contained project. Sklonira skladišče Git in poskusi naložiti vsebovani projekt. @@ -12723,9 +12677,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Git Repository Clone Klon skladišča Git - - - Git::CloneWizardPage Location Mesto @@ -13623,7 +13574,7 @@ Razlog: %2 - Git::Internal::StashDialog + Git Stashes Zapisi na strani @@ -13701,10 +13652,6 @@ You can choose between stashing the changes or discarding them. %1 ni moč obnoviti, ker je bilo skladišče spremenjeno. Spremembe lahko zapišete na stran ali pa jih zavržete. - - Stash - Zapiši na stran - Discard Zavrzi @@ -16057,14 +16004,11 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - Git::Internal::GitCommand + Git Error: Git timed out after %1s. Napaka: po %1 s je Git-u potekel čas. - - - Git::Internal::GitEditor Blame %1 Odgovornost za %1 @@ -19361,7 +19305,7 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. - Git::Internal::BranchAddDialog + Git Dialog Pogovorno okno @@ -19384,9 +19328,6 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. Track local branch '%1' Spremljaj krajevno vejo »%1« - - - Git::Internal::RemoteAdditionDialog Add Remote Dodajanje oddaljene @@ -19401,33 +19342,15 @@ GDB omogoča navedbo zaporedja ukazov, ki so ločeni z »\n«. URL: URL: - - - Git::Internal::RemoteDialog Remotes Oddaljene - - - Re&fresh - Os&veži - - - - &Add... - &Dodaj ... - F&etch &Pridobi - - - &Remove - &Odstrani - Delete Remote Izbriši oddaljeno @@ -24415,14 +24338,11 @@ Datoteke se ohrani. - Git::Internal::BranchModel + Git Local Branches Krajevne veje - - - Git::Internal::BaseGitDiffArgumentsWidget Use the patience algorithm for calculating the differences. Za ugotovitev razlik uporabi potrpežljiv algoritem. @@ -24439,9 +24359,6 @@ Datoteke se ohrani. Ignore Whitespace Prezri praznine - - - Git::Internal::GitShowArgumentsWidget Select the pretty printing format. Izberite obliko lepega izpisa. @@ -24474,9 +24391,6 @@ Datoteke se ohrani. raw surovo - - - Git::Internal::GitBlameArgumentsWidget Hide the date of a change from the output. V izhodu skrij datum spremembe. @@ -24485,17 +24399,6 @@ Datoteke se ohrani. Omit Date Izpusti datum - - Ignore whitespace only changes. - Prezri spremembe s samimi prazninami. - - - Ignore Whitespace - Prezri praznine - - - - Git::Internal::SettingsPageWidget Set the environment variable HOME to '%1' (%2). @@ -30144,14 +30047,11 @@ Preverite pravice za dostop do mape. - Git::Internal::GitSubmitEditor + Git Git Commit Git – zapis - - - Git::Internal::LocalBranchModel <New branch> <nova veja> @@ -32317,7 +32217,7 @@ Preverite, ali je telefon priključen in ali App TRK teče. - Git::Internal::RemoteBranchModel + Git (no branch) (brez vej) diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index a4e4fd22fe9..7a5c6ab9962 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -9377,7 +9377,7 @@ These files are preserved. - Git::CloneWizardPage + Git Location Розташування @@ -9390,9 +9390,6 @@ These files are preserved. Recursive Рекурсивно - - - Git::Internal::BaseGitDiffArgumentsWidget Patience @@ -9409,9 +9406,6 @@ These files are preserved. Ignore whitespace only changes. Ігнорувати зміни в пропусках. - - - Git::Internal::BranchAddDialog Branch Name: Назва гілки: @@ -9436,9 +9430,6 @@ These files are preserved. Track local branch '%1' Відстежувати локальну гілку '%1' - - - Git::Internal::BranchDialog Branches Гілки @@ -9555,10 +9546,6 @@ These files are preserved. &Track &Стежити - - Reset - Скинути - Set current branch to track the selected one. Встановити, щоб поточна гілка стежила за вибраною. @@ -9567,9 +9554,6 @@ These files are preserved. &Include old entries - - - Git::Internal::BranchModel Local Branches Локальні гілки @@ -9582,9 +9566,6 @@ These files are preserved. Tags Теги - - - Git::Internal::ChangeSelectionDialog Browse &Directory... Оглянути &теку... @@ -9653,9 +9634,6 @@ These files are preserved. Select a Git Commit - - - Git::Internal::CloneWizard Cloning Клонування @@ -9672,9 +9650,6 @@ These files are preserved. Git Repository Clone Клонування сховища Git - - - Git::Internal::GitBlameArgumentsWidget Omit Date Пропускати дату @@ -9683,17 +9658,6 @@ These files are preserved. Hide the date of a change from the output. Приховати дату зміни у виведенні. - - Ignore Whitespace - Ігнорувати пропуски - - - Ignore whitespace only changes. - Ігнорувати зміни в пропусках. - - - - Git::Internal::GitClient Waiting for data... Очікування на дані... @@ -9844,14 +9808,6 @@ These files are preserved. Git Diff Project Зміни в проекті (Git) - - Reset - - - - All changes in working directory will be discarded. Are you sure? - Усі зміни в робочій теці будуть відкинуті. Ви впевнені? - Cannot describe revision "%1" in "%2": %3 @@ -10014,10 +9970,6 @@ Commit now? Cannot obtain status: %1 Неможливо отримати статус: %1 - - Continue Rebase - Продовження перебазування - Continue Продовжити @@ -10097,9 +10049,6 @@ Commit now? There are no modified files. Немає змінених файлів. - - - Git::Internal::GitEditor Reset Скидання @@ -10108,9 +10057,6 @@ Commit now? All changes in working directory will be discarded. Are you sure? Усі зміни в робочій теці будуть відкинуті. Ви впевнені? - - - Git::Internal::GitPlugin &Git &Git @@ -10295,10 +10241,6 @@ Commit now? Saves the current state of your work. Зберігає поточний стан вашої праці. - - Stash - - Saves the current state of your work and resets the repository. @@ -10355,10 +10297,6 @@ Commit now? Continue Cherry Pick - - Continue Revert - - Apply from Editor Накласти з редактора @@ -10423,14 +10361,6 @@ Commit now? Fetch Отримати (fetch) - - Clones a Git repository and tries to load the contained project. - Клонує сховище Git та намагається завантажити з нього проект. - - - Git Repository Clone - Клонування сховища Git - Reflog @@ -10523,10 +10453,6 @@ Commit now? Actions on Commits... - - Commit - - &Undo &Повернути @@ -10583,9 +10509,6 @@ Commit now? Patch %1 successfully applied to %2 Латку %1 було успішно накладено на %2 - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' Не вдалось знайти виконуваний модуль '%1' в шляху '%2' @@ -10594,9 +10517,6 @@ Commit now? The binary "%1" could not be located in the path "%2" Не вдалось знайти виконуваний модуль "%1" в шляху "%2" - - - Git::Internal::GitSubmitPanel General Information Загальна інформація @@ -10633,9 +10553,6 @@ Commit now? By&pass hooks: - - - Git::Internal::RemoteAdditionDialog Add Remote Додавання віддаленого сховища @@ -10648,29 +10565,14 @@ Commit now? URL: URL: - - - Git::Internal::RemoteDialog Remotes Віддалені сховища - - Re&fresh - &Оновити - - - &Add... - &Додати... - F&etch &Отримати - - &Remove - &Видалити - Delete Remote Видалення віддаленого сховища @@ -10683,9 +10585,6 @@ Commit now? &Push - - - Git::Internal::SettingsPage <b>Note:</b> <b>Примітка:</b> @@ -10722,10 +10621,6 @@ Commit now? Set "HOME" environment variable Встановити змінну середовища "HOME" - - Gitk - Gitk - Arguments: Аргументи: @@ -10754,13 +10649,6 @@ Commit now? Show tags in Branches dialog Показувати теги в діалозі "Гілки" - - Repository Browser - Оглядач сховища - - - - Git::Internal::SettingsPageWidget Set the environment variable HOME to "%1" (%2). @@ -10787,9 +10675,6 @@ instead of its installation directory when run outside git bash. Git Repository Browser Command Команда оглядача сховища Git - - - Git::Internal::StashDialog Stashes @@ -10834,10 +10719,6 @@ instead of its installation directory when run outside git bash. &Delete... Ви&далити... - - &Show - &Показати - R&estore... @@ -10847,10 +10728,6 @@ instead of its installation directory when run outside git bash. Restore a git stash to new branch to be created - - Re&fresh - &Оновити - Delete Stashes @@ -10864,22 +10741,10 @@ instead of its installation directory when run outside git bash. You can choose between stashing the changes or discarding them. - - Stash - - - - Discard - Відкинути - Restore Stash to Branch - - Branch: - Гілка: - Stash Restore @@ -26849,7 +26714,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - Git::Internal::CommitData + Git untracked @@ -26890,9 +26755,6 @@ should a repository require SSH-authentication (see documentation on SSH and the by them - - - Git::Internal::GitLogArgumentsWidget Show Diff Показати зміни @@ -31126,7 +30988,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. - Gerrit::Internal::GerritDialog + Git Apply in: Застосувати в: @@ -31163,21 +31025,10 @@ Stepping into the module or setting breakpoints by file and is expected to work. &Show... &Показати... - - &Show - &Показати - - - Cherry &Pick - - Fetching "%1"... Отримання "%1"... - - - Gerrit::Internal::GerritModel <html><head/><body><table><tr><td>Subject</td><td>%1</td></tr><tr><td>Number</td><td><a href="%11">%2</a></td></tr><tr><td>Owner</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Project</td><td>%5 (%6)</td></tr><tr><td>Status</td><td>%7, %8</td></tr><tr><td>Patch set</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html> <html><head/><body><table><tr><td>Тема</td><td>%1</td></tr><tr><td>Номер</td><td><a href="%11">%2</a></td></tr><tr><td>Власник</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Проект</td><td>%5 (%6)</td></tr><tr><td>Статус</td><td>%7, %8</td></tr><tr><td>Набір латок</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html> @@ -31202,10 +31053,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Approvals Схвалення - - Status - Статус - Number Номер @@ -31250,13 +31097,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Parse error in line '%1' Помилка розбору в рядку'%1' - - - Gerrit::Internal::QueryContext - - Gerrit - Gerrit - Querying Gerrit Опитування Gerrit @@ -31301,16 +31141,10 @@ Would you like to terminate it? Keep Running Продовжувати виконання - - - Gerrit::Internal::GerritOptionsPage Gerrit Gerrit - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -31355,9 +31189,6 @@ Would you like to terminate it? для формування URL у випадку, якщо "canonicalWebUrl" не налаштовано в файлі"gerrit.config". - - - Gerrit::Internal::FetchContext Gerrit Fetch Отримати з Gerrit @@ -31366,21 +31197,6 @@ Would you like to terminate it? Fetching from Gerrit Отримання з Gerrit - - %1 crashed. - %1 завершився аварійно. - - - %1 returned %2. - %1 повернув %2. - - - Error running %1: %2 - Помилка запуску %1: %2 - - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -31428,17 +31244,10 @@ were not verified among remotes in %3. Select different folder? Enter Local Repository for '%1' (%2) Введіть локальне сховище для '%1' (%2) - - - Git::Internal::GitSubmitEditorWidget Provide a valid email to commit. - - Detached HEAD - - Select Change Оберіть зміну @@ -32775,7 +32584,7 @@ cannot be found in the path. - Git::Internal::BranchCheckoutDialog + Git Local Changes Found. Choose Action: Знайдені локальні зміни. Оберіть дію: @@ -32788,10 +32597,6 @@ cannot be found in the path. Discard Local Changes Відкинути локальні зміни - - CheckBox - Прапорець - Checkout branch "%1" @@ -34095,11 +33900,7 @@ cannot be found in the path. - Git::Internal::MergeTool - - Error - Помилка - + Git Normal Звичайний @@ -35238,7 +35039,7 @@ See details for a complete list of files. - Gerrit::Internal::GerritPushDialog + Git Push to Gerrit @@ -36088,7 +35889,7 @@ Partial names can be used if they are unambiguous. - Git::Internal::GitDiffHandler + Git Working tree Робоче дерево @@ -36097,24 +35898,10 @@ Partial names can be used if they are unambiguous. Index Покажчик - - Waiting for data... - Очікування на дані... - - - - Git::Internal::LogChangeWidget Sha1 Sha1 - - Subject - Тема - - - - Git::Internal::LogChangeDialog Reset to: Скинути до: @@ -42395,15 +42182,7 @@ Install an SDK of at least API version %1. - Git::Internal::CloneWizardFactory - - Clones a Git repository and tries to load the contained project. - Клонує сховище Git та намагається завантажити з нього проект. - - - Git Repository Clone - Клонування сховища Git - + Git Gitorious::Internal::GitoriousCloneWizardFactory @@ -42417,23 +42196,12 @@ Install an SDK of at least API version %1. - Git::Internal::GitSubmitEditor + Git Refreshing Commit Data - - Git::Internal::RemoteModel - - Name - Назва - - - URL - URL - - Help @@ -45701,7 +45469,7 @@ Preselects a desktop Qt for building the application if available. - Git::Internal::GitEditorWidget + Git &Blame %1 @@ -45710,14 +45478,6 @@ Preselects a desktop Qt for building the application if available. Blame &Parent Revision %1 - - All changes in working directory will be discarded. Are you sure? - Усі зміни в робочій теці будуть відкинуті. Ви впевнені? - - - Chunk successfully staged - - Stage Chunk... @@ -51650,7 +51410,7 @@ Please set a real Clang executable. - GitGrep + Git &Use Git Grep diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 7be070daae5..bcfb18f37b0 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -7192,35 +7192,11 @@ on slow machines. In this case, the value should be increased. - Git::Internal::BranchDialog + Git Checkout Checkout - - Delete - 删除 - - - Unable to find the repository directory for '%1'. - 无法找到仓库目录'%1' - - - Diff - Diff - - - Log - 日志 - - - Refresh - 刷新 - - - Delete... - 删除... - Checkout branch? 检出分支吗？ @@ -7270,10 +7246,6 @@ on slow machines. In this case, the value should be increased. General information 概要 - - Repository: - 仓库: - Remote branches 远程 branches @@ -7306,9 +7278,6 @@ on slow machines. In this case, the value should be increased. &Checkout 检出(&C) - - - Git::Internal::ChangeSelectionDialog Select a Git commit 选择一个 Git commit @@ -7349,17 +7318,10 @@ on slow machines. In this case, the value should be increased. Change: 更改: - - - Git::Internal::GitClient Note that the git plugin for QtCreator is not able to interact with the server so far. Thus, manual ssh-identification etc. will not work. 请注意 git 插件无法与服务器交互，所以类似于“手动ssh身份认证”之类将无法工作。 - - Unable to determine the repository for %1. - 无法为%1定位代码仓库. - Waiting for data... 等待数据... @@ -7716,10 +7678,6 @@ on slow machines. In this case, the value should be increased. - - Revert - 还原 - The file has been changed. Do you want to revert it? 文件被改变，您想要还原它吗？ @@ -7764,9 +7722,6 @@ on slow machines. In this case, the value should be increased. Cannot determine git version: %1 无法确定git 的版本: %1 - - - Git::Internal::GitPlugin &Git &Git @@ -7885,10 +7840,6 @@ on slow machines. In this case, the value should be increased. Amend %1 增订 %1 - - Git Commit - Git Commit - Closing Git Editor 关闭 git 编辑器 @@ -8201,23 +8152,14 @@ on slow machines. In this case, the value should be increased. Do you want to commit the change? 您想提交此修改吗？ - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' 无法在路径 '%2' 定位二进制档 '%1' - - - Git::Internal::GitSubmitEditor Git Commit Git Commit - - - Git::Internal::GitSubmitPanel General Information 概要信息 @@ -8230,10 +8172,6 @@ on slow machines. In this case, the value should be increased. repository 代码仓库 - - Branch: - 分支: - branch 分支 @@ -8254,9 +8192,6 @@ on slow machines. In this case, the value should be increased. By&pass hooks 跳过hook(&P) - - - Git::Internal::LocalBranchModel <New branch> <新的分支> @@ -8265,9 +8200,6 @@ on slow machines. In this case, the value should be increased. Type to create a new branch 创建新分支 - - - Git::Internal::SettingsPage Environment variables 环境变量 @@ -8388,9 +8320,6 @@ on slow machines. In this case, the value should be increased. Command: 命令: - - - GitCommand '%1' failed (exit code %2). @@ -18220,7 +18149,7 @@ Will not be applied to whitespace in comments and strings. - Git::Internal::CloneWizard + Git Clones a project from a git repository. 从 Git 仓库中 clone 一个项目。 @@ -18233,9 +18162,6 @@ Will not be applied to whitespace in comments and strings. Git Repository Clone Git仓库的克隆 - - - Git::CloneWizardPage Location 位置 @@ -20525,7 +20451,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name - Git::Internal::StashDialog + Git Stashes Stash列表 @@ -20616,10 +20542,6 @@ You can choose between stashing the changes or discarding them. %1 不能被还原，因为仓库已经变更。 您可以选择 stash 修改的内容或者丢弃修改。 - - Stash - Stash - Discard 丢弃 @@ -22520,28 +22442,19 @@ Previous decimal signed value (big endian): %4 - Git::Internal::RemoteBranchModel + Git (no branch) (没有分支) - - - GitClient Unable to determine the repository for %1. 无法为 %1 决定仓库。 - - - Git::Internal::GitCommand Error: Git timed out after %1s. 错误: Git 在 %1秒后超时. - - - Git::Internal::GitEditor Blame %1 Blame %1 @@ -28618,7 +28531,7 @@ Setting breakpoints by file name and line number may fail. - Git::Internal::SettingsPageWidget + Git Set the environment variable HOME to '%1' (%2). @@ -33021,7 +32934,7 @@ Do you want to retry? - Git::Internal::BaseGitDiffArgumentsWidget + Git Use the patience algorithm for calculating the diff 使用耐心算法来计算差异 @@ -33046,9 +32959,6 @@ Do you want to retry? Ignore Whitespace 忽略空白 - - - Git::Internal::GitShowArgumentsWidget Select the pretty printing format 选择一个漂亮的输出格式 @@ -33085,9 +32995,6 @@ Do you want to retry? raw raw - - - Git::Internal::GitBlameArgumentsWidget Do not show the date a change was made in the output 输出改变了不要显示日期 @@ -33100,18 +33007,6 @@ Do you want to retry? Omit Date 忽略日期 - - Ignore whitespace only changes. - 忽略仅为空白的修改。 - - - Ignore whitespace only changes - 忽略空白仅关注改变 - - - Ignore Whitespace - 忽略空白 - GLSLEditor::Internal::FunctionArgumentWidget @@ -35026,7 +34921,7 @@ if (a && - Git::Internal::BranchAddDialog + Git Dialog 对话框 @@ -35047,9 +34942,6 @@ if (a && Track local branch '%1' 跟踪本地分支'%1' - - - Git::Internal::RemoteAdditionDialog Add Remote 添加远程 @@ -35062,29 +34954,14 @@ if (a && URL: URL: - - - Git::Internal::RemoteDialog Remotes 远程 - - Re&fresh - 刷新(&F) - - - &Add... - 添加(&A)... - F&etch F&etch - - &Remove - 删除(&R) - Delete Remote 删除远程 @@ -36064,7 +35941,7 @@ These files are preserved. - Git::Internal::BranchModel + Git Local Branches 本地分支 @@ -46052,7 +45929,7 @@ Stepping into the module or setting breakpoints by file and is expected to work. - Git::Internal::CommitData + Git untracked untracked @@ -46085,17 +45962,10 @@ Stepping into the module or setting breakpoints by file and is expected to work. updated 已更新 - - - Gerrit::Internal::GerritDialog Gerrit %1@%2 Gerrit %1@%2 - - Changes - 修改 - &Query: 查询(&Query): @@ -46120,13 +45990,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Checkout... Checkout... - - Refresh - 刷新 - - - - Gerrit::Internal::GerritModel <html><head/><body><table><tr><td>Subject</td><td>%1</td></tr><tr><td>Number</td><td><a href="%11">%2</a></td></tr><tr><td>Owner</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Project</td><td>%5 (%6)</td></tr><tr><td>Status</td><td>%7, %8</td></tr><tr><td>Patch set</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html> <html><head/><body><table><tr><td>标题</td><td>%1</td></tr><tr><td>数字</td><td><a href="%11">%2</a></td></tr><tr><td>所有者</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>项目</td><td>%5 (%6)</td></tr><tr><td>状态</td><td>%7, %8</td></tr><tr><td>补丁集</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html> @@ -46151,10 +46014,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Approvals 审批 - - Status - 状态 - Parse error: '%1' -> %2 解析错误: '%1' -> %2 @@ -46167,9 +46026,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Parse error in line '%1' 在行 '%1'发生解析错误 - - - Gerrit::Internal::QueryContext Gerrit Gerrit @@ -46186,16 +46042,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. %1 returned %2. %1 返回了 %2。 - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - Gerrit - - - - Gerrit::Internal::GerritOptionsWidget HTTPS HTTPS @@ -46227,25 +46073,10 @@ Stepping into the module or setting breakpoints by file and is expected to work. 当文件"gerrit.config"没有配置"canonicalWebUrl"时 从URL推测使用的协议。 - - - Gerrit::Internal::FetchContext Gerrit Fetch Gerrit Fetch - - %1 crashed. - "%1" 崩溃。 - - - %1 returned %2. - %1 返回了 %2。 - - - Error running %1: %2 - 运行%1发生错误: %2 - Error writing to temporary file. 写入临时文件发生错误。 @@ -46258,9 +46089,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Cherry-picking %1... 正在cherry-pick %1... - - - Gerrit::Internal::GerritPlugin Gerrit... Gerrit... @@ -46273,9 +46101,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Enter Local Repository for '%1' (%2) 输入 '%1' (%2) 的本地代码仓库 - - - Git::Internal::GitLogArgumentsWidget Show Diff 显示Diff @@ -46284,24 +46109,14 @@ Stepping into the module or setting breakpoints by file and is expected to work. Show difference. 显示差异。 - - - Git::Internal::GitSubmitEditorWidget Detached HEAD 已经detach HEAD - - - Git::Internal::ResetDialog Sha1 Sha1 - - Subject - 标题 - Reset to: 重置为: diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 5a0f90b9fa6..8f3568db07b 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -4875,7 +4875,7 @@ Reason: %3 - Git::Internal::BranchDialog + Git Checkout 取出 @@ -4924,9 +4924,6 @@ Reason: %3 &Checkout 取出(&C) - - - Git::Internal::ChangeSelectionDialog Select a Git Commit 選擇一個 Git 提交紀錄 @@ -4955,9 +4952,6 @@ Reason: %3 Change: 變更： - - - Git::Internal::GitClient Waiting for data... 等待資料中... @@ -5207,9 +5201,6 @@ Reason: %3 Cannot determine git version: %1 無法決定 git 的版本：%1 - - - Git::Internal::GitPlugin &Git Git(&G) @@ -5549,16 +5540,10 @@ Reason: %3 Do you want to commit the change? 您要提交此變更嗎？ - - - Git::Internal::GitSettings The binary '%1' could not be located in the path '%2' 在路徑 '%2' 中找不到執行檔 '%1' - - - Git::Internal::GitSubmitPanel General Information 一般資訊 @@ -5595,9 +5580,6 @@ Reason: %3 By&pass hooks - - - Git::Internal::SettingsPage <b>Note:</b> <b>注意：</b> @@ -11104,7 +11086,7 @@ Will not be applied to whitespace in comments and strings. - Git::Internal::CloneWizard + Git Clones a Git repository and tries to load the contained project. 複製一個 Git 主目錄，並試著載入裡面包含的專案。 @@ -11113,9 +11095,6 @@ Will not be applied to whitespace in comments and strings. Git Repository Clone Git 主目錄複製 - - - Git::CloneWizardPage Location 位置 @@ -12503,7 +12482,7 @@ Reason: %2 - Git::Internal::StashDialog + Git Stashes 暫存檔 @@ -12577,10 +12556,6 @@ You can choose between stashing the changes or discarding them. %1 無法還原，因為主目錄已被變更。 您可以選擇要暫存或是丟棄變更。 - - Stash - 暫存 - Discard 丟棄 @@ -12589,10 +12564,6 @@ You can choose between stashing the changes or discarding them. Restore Stash to Branch 還原暫存內容到分支 - - Branch: - 分支： - Stash Restore 暫存還原 @@ -13281,7 +13252,7 @@ For qmlproject projects, use the importPaths property to add import paths. - Git::Internal::GitEditor + Git Blame %1 "%1" 的提交紀錄 @@ -16830,7 +16801,7 @@ Setting breakpoints by file name and line number may fail. - Git::Internal::SettingsPageWidget + Git Set the environment variable HOME to '%1' (%2). @@ -20126,7 +20097,7 @@ Do you want to retry? - Git::Internal::BaseGitDiffArgumentsWidget + Git Use the patience algorithm for calculating the differences. 使用 patience 演算法來計算差異。 @@ -20143,9 +20114,6 @@ Do you want to retry? Ignore Whitespace 忽略空白 - - - Git::Internal::GitShowArgumentsWidget oneline 一行 @@ -20174,9 +20142,6 @@ Do you want to retry? raw 原始 - - - Git::Internal::GitBlameArgumentsWidget Hide the date of a change from the output. 在輸出隱藏變更日期。 @@ -20185,14 +20150,6 @@ Do you want to retry? Omit Date 省略日期 - - Ignore whitespace only changes. - 忽略只有空白的變更。 - - - Ignore Whitespace - 忽略空白 - GLSLEditor @@ -21764,7 +21721,7 @@ if (a && - Git::Internal::BranchAddDialog + Git Dialog 對話框 @@ -21785,9 +21742,6 @@ if (a && Track local branch '%1' 追蹤本地分支 '%1' - - - Git::Internal::RemoteAdditionDialog Add Remote 新增遠端 @@ -21800,29 +21754,14 @@ if (a && URL: 網址： - - - Git::Internal::RemoteDialog Remotes 遠端 - - Re&fresh - 刷新(&F) - - - &Add... - 新增(&A)... - F&etch 抓取(&E) - - &Remove - 移除(&R) - Delete Remote 移除遠端 @@ -22417,7 +22356,7 @@ These files are preserved. - Git::Internal::BranchModel + Git Local Branches 本地分支 @@ -28431,7 +28370,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - Git::Internal::CommitData + Git untracked 未追蹤的 @@ -28464,9 +28403,6 @@ should a repository require SSH-authentication (see documentation on SSH and the updated 已更新 - - - Git::Internal::GitLogArgumentsWidget Show Diff 顯示差異 @@ -31877,15 +31813,11 @@ Stepping into the module or setting breakpoints by file and is expected to work. - Gerrit::Internal::GerritDialog + Git Gerrit %1@%2 - - Changes - 變更 - &Query: @@ -31910,13 +31842,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Checkout... - - Refresh - 刷新 - - - - Gerrit::Internal::GerritModel <html><head/><body><table><tr><td>Subject</td><td>%1</td></tr><tr><td>Number</td><td><a href="%11">%2</a></td></tr><tr><td>Owner</td><td>%3 <a href="mailto:%4">%4</a></td></tr><tr><td>Project</td><td>%5 (%6)</td></tr><tr><td>Status</td><td>%7, %8</td></tr><tr><td>Patch set</td><td>%9</td></tr>%10<tr><td>URL</td><td><a href="%11">%11</a></td></tr></table></body></html> @@ -31941,10 +31866,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Approvals - - Status - 狀態 - Parse error: '%1' -> %2 @@ -31957,9 +31878,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Parse error in line '%1' - - - Gerrit::Internal::QueryContext Gerrit @@ -31976,16 +31894,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. %1 returned %2. - - - Gerrit::Internal::GerritOptionsPage - - Gerrit - - - - - Gerrit::Internal::GerritOptionsWidget HTTPS @@ -32016,25 +31924,10 @@ Stepping into the module or setting breakpoints by file and is expected to work. "gerrit.config". - - - Gerrit::Internal::FetchContext Gerrit Fetch - - %1 crashed. - - - - %1 returned %2. - - - - Error running %1: %2 - - Error writing to temporary file. @@ -32047,9 +31940,6 @@ Stepping into the module or setting breakpoints by file and is expected to work. Cherry-picking %1... - - - Gerrit::Internal::GerritPlugin Gerrit... @@ -32062,24 +31952,14 @@ Stepping into the module or setting breakpoints by file and is expected to work. Enter Local Repository for '%1' (%2) - - - Git::Internal::GitSubmitEditorWidget Detached HEAD - - - Git::Internal::ResetDialog Sha1 - - Subject - - Reset to: diff --git a/src/plugins/git/branchadddialog.cpp b/src/plugins/git/branchadddialog.cpp index 8c988b42a60..2ba6b371317 100644 --- a/src/plugins/git/branchadddialog.cpp +++ b/src/plugins/git/branchadddialog.cpp @@ -5,6 +5,7 @@ #include "branchmodel.h" #include "gitplugin.h" +#include "gittr.h" #include #include @@ -19,8 +20,7 @@ #include #include -namespace Git { -namespace Internal { +namespace Git::Internal { /*! * \brief The BranchNameValidator class validates the corresponding string as @@ -94,12 +94,12 @@ BranchAddDialog::BranchAddDialog(const QStringList &localBranches, Type type, QW { resize(590, 138); - auto branchNameLabel = new QLabel(tr("Branch Name:")); + auto branchNameLabel = new QLabel(Tr::tr("Branch Name:")); m_branchNameEdit = new QLineEdit(this); m_branchNameEdit->setValidator(new BranchNameValidator(localBranches, this)); - m_checkoutCheckBox = new QCheckBox(tr("Checkout new branch")); + m_checkoutCheckBox = new QCheckBox(Tr::tr("Checkout new branch")); m_trackingCheckBox = new QCheckBox(this); m_trackingCheckBox->setVisible(false); @@ -110,18 +110,18 @@ BranchAddDialog::BranchAddDialog(const QStringList &localBranches, Type type, QW switch (type) { case BranchAddDialog::AddBranch: - setWindowTitle(tr("Add Branch")); + setWindowTitle(Tr::tr("Add Branch")); break; case BranchAddDialog::RenameBranch: - setWindowTitle(tr("Rename Branch")); + setWindowTitle(Tr::tr("Rename Branch")); break; case BranchAddDialog::AddTag: - setWindowTitle(tr("Add Tag")); - branchNameLabel->setText(tr("Tag name:")); + setWindowTitle(Tr::tr("Add Tag")); + branchNameLabel->setText(Tr::tr("Tag name:")); break; case BranchAddDialog::RenameTag: - setWindowTitle(tr("Rename Tag")); - branchNameLabel->setText(tr("Tag name:")); + setWindowTitle(Tr::tr("Rename Tag")); + branchNameLabel->setText(Tr::tr("Tag name:")); break; } @@ -159,8 +159,8 @@ void BranchAddDialog::setTrackedBranchName(const QString &name, bool remote) m_trackingCheckBox->setVisible(false); m_trackingCheckBox->setChecked(false); } else { - m_trackingCheckBox->setText(remote ? tr("Track remote branch \"%1\"").arg(name) - : tr("Track local branch \"%1\"").arg(name)); + m_trackingCheckBox->setText(remote ? Tr::tr("Track remote branch \"%1\"").arg(name) + : Tr::tr("Track local branch \"%1\"").arg(name)); m_trackingCheckBox->setVisible(true); m_trackingCheckBox->setChecked(remote); } @@ -188,5 +188,4 @@ void BranchAddDialog::updateButtonStatus() m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_branchNameEdit->hasAcceptableInput()); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/branchadddialog.h b/src/plugins/git/branchadddialog.h index ec4a4b667da..bbcf52070c5 100644 --- a/src/plugins/git/branchadddialog.h +++ b/src/plugins/git/branchadddialog.h @@ -10,10 +10,9 @@ QT_BEGIN_NAMESPACE class QCheckBox; class QDialogButtonBox; class QLineEdit; -QT_BEGIN_NAMESPACE +QT_END_NAMESPACE -namespace Git { -namespace Internal { +namespace Git::Internal { class BranchModel; @@ -30,8 +29,6 @@ private: class BranchAddDialog : public QDialog { - Q_OBJECT - public: enum Type { AddBranch, @@ -62,5 +59,4 @@ private: QDialogButtonBox *m_buttonBox; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/branchcheckoutdialog.cpp b/src/plugins/git/branchcheckoutdialog.cpp index 67dcd30b42c..a6819bb58bc 100644 --- a/src/plugins/git/branchcheckoutdialog.cpp +++ b/src/plugins/git/branchcheckoutdialog.cpp @@ -3,16 +3,16 @@ #include "branchcheckoutdialog.h" +#include "gittr.h" + #include -#include #include #include #include #include -namespace Git { -namespace Internal { +namespace Git::Internal { BranchCheckoutDialog::BranchCheckoutDialog(QWidget *parent, const QString ¤tBranch, @@ -22,24 +22,24 @@ BranchCheckoutDialog::BranchCheckoutDialog(QWidget *parent, setWindowModality(Qt::WindowModal); resize(394, 199); setModal(true); - setWindowTitle(tr("Checkout branch \"%1\"").arg(nextBranch)); + setWindowTitle(Tr::tr("Checkout branch \"%1\"").arg(nextBranch)); - m_localChangesGroupBox = new QGroupBox(tr("Local Changes Found. Choose Action:")); + m_localChangesGroupBox = new QGroupBox(Tr::tr("Local Changes Found. Choose Action:")); - m_moveChangesRadioButton = new QRadioButton(tr("Move Local Changes to \"%1\"").arg(nextBranch)); + m_moveChangesRadioButton = new QRadioButton(Tr::tr("Move Local Changes to \"%1\"").arg(nextBranch)); - m_discardChangesRadioButton = new QRadioButton(tr("Discard Local Changes")); + m_discardChangesRadioButton = new QRadioButton(Tr::tr("Discard Local Changes")); m_discardChangesRadioButton->setEnabled(true); - m_popStashCheckBox = new QCheckBox(tr("Pop Stash of \"%1\"").arg(nextBranch)); + m_popStashCheckBox = new QCheckBox(Tr::tr("Pop Stash of \"%1\"").arg(nextBranch)); m_popStashCheckBox->setEnabled(false); m_makeStashRadioButton = new QRadioButton; m_makeStashRadioButton->setChecked(true); if (!currentBranch.isEmpty()) { - m_makeStashRadioButton->setText(tr("Create Branch Stash for \"%1\"").arg(currentBranch)); + m_makeStashRadioButton->setText(Tr::tr("Create Branch Stash for \"%1\"").arg(currentBranch)); } else { - m_makeStashRadioButton->setText(tr("Create Branch Stash for Current Branch")); + m_makeStashRadioButton->setText(Tr::tr("Create Branch Stash for Current Branch")); foundNoLocalChanges(); } @@ -119,6 +119,4 @@ void BranchCheckoutDialog::updatePopStashCheckBox(bool moveChangesChecked) m_popStashCheckBox->setEnabled(!moveChangesChecked && m_foundStashForNextBranch); } -} // namespace Internal -} // namespace Git - +} // Git::Internal diff --git a/src/plugins/git/branchcheckoutdialog.h b/src/plugins/git/branchcheckoutdialog.h index 2b58e7a4546..44be2f56690 100644 --- a/src/plugins/git/branchcheckoutdialog.h +++ b/src/plugins/git/branchcheckoutdialog.h @@ -11,13 +11,10 @@ class QGroupBox; class QRadioButton; QT_END_NAMESPACE -namespace Git { -namespace Internal { +namespace Git::Internal { class BranchCheckoutDialog : public QDialog { - Q_OBJECT - public: explicit BranchCheckoutDialog(QWidget *parent, const QString ¤tBranch, const QString &nextBranch); @@ -47,5 +44,4 @@ private: QCheckBox *m_popStashCheckBox; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp index b33b4ab277f..c262f07c0bc 100644 --- a/src/plugins/git/branchmodel.cpp +++ b/src/plugins/git/branchmodel.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 "branchmodel.h" + #include "gitclient.h" #include "gitconstants.h" +#include "gittr.h" #include #include @@ -22,8 +24,7 @@ using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { enum RootNodes { LocalBranches = 0, @@ -254,8 +255,8 @@ BranchModel::BranchModel(GitClient *client, QObject *parent) : QTC_CHECK(d->client); // Abuse the sha field for ref prefix - d->rootNode->append(new BranchNode(tr("Local Branches"), "refs/heads")); - d->rootNode->append(new BranchNode(tr("Remote Branches"), "refs/remotes")); + d->rootNode->append(new BranchNode(Tr::tr("Local Branches"), "refs/heads")); + d->rootNode->append(new BranchNode(Tr::tr("Remote Branches"), "refs/remotes")); connect(&d->fsWatcher, &Utils::FileSystemWatcher::fileChanged, this, [this] { QString errorMessage; refresh(d->workingDirectory, &errorMessage); @@ -440,7 +441,7 @@ bool BranchModel::refresh(const FilePath &workingDirectory, QString *errorMessag } if (!d->currentBranch) { BranchNode *local = d->rootNode->children.at(LocalBranches); - d->currentBranch = d->headNode = new BranchNode(tr("Detached HEAD"), "HEAD", QString(), + d->currentBranch = d->headNode = new BranchNode(Tr::tr("Detached HEAD"), "HEAD", QString(), d->currentDateTime); local->prepend(d->headNode); } @@ -796,7 +797,7 @@ void BranchModel::Private::parseOutputLine(const QString &line, bool force) oldEntriesRoot = root->append(new BranchNode(remoteName)); } else if (showTags && nameParts.first() == "tags") { if (!hasTags()) // Tags is missing, add it - rootNode->append(new BranchNode(tr("Tags"), "refs/tags")); + rootNode->append(new BranchNode(Tr::tr("Tags"), "refs/tags")); rootType = Tags; } else { return; @@ -925,6 +926,4 @@ QString BranchModel::toolTip(const QString &sha) const return output; } -} // namespace Internal -} // namespace Git - +} // Git::Internal diff --git a/src/plugins/git/branchmodel.h b/src/plugins/git/branchmodel.h index 4fa8794a7b7..122ed2480b8 100644 --- a/src/plugins/git/branchmodel.h +++ b/src/plugins/git/branchmodel.h @@ -6,26 +6,18 @@ #include #include -#include #include namespace VcsBase { class VcsCommand; } -namespace Git { -namespace Internal { - -class GitClient; +namespace Git::Internal { class BranchNode; +class GitClient; -// -------------------------------------------------------------------------- -// BranchModel: -// -------------------------------------------------------------------------- - -class BranchModel : public QAbstractItemModel { - Q_OBJECT - +class BranchModel : public QAbstractItemModel +{ public: explicit BranchModel(GitClient *client, QObject *parent = nullptr); ~BranchModel() override; @@ -80,5 +72,4 @@ private: Private *d; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp index 58a137dacb9..eb8d5ad86e7 100644 --- a/src/plugins/git/branchview.cpp +++ b/src/plugins/git/branchview.cpp @@ -9,6 +9,7 @@ #include "gitclient.h" #include "gitconstants.h" #include "gitplugin.h" +#include "gittr.h" #include "gitutils.h" #include @@ -24,7 +25,6 @@ #include #include -#include #include #include #include @@ -39,13 +39,13 @@ using namespace Core; using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { class BranchFilterModel : public QSortFilterProxyModel { public: BranchFilterModel(QObject *parent) : QSortFilterProxyModel(parent) {} + protected: bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override { @@ -70,8 +70,8 @@ struct SetInContext }; BranchView::BranchView() - : m_includeOldEntriesAction(new QAction(tr("Include Old Entries"), this)) - , m_includeTagsAction(new QAction(tr("Include Tags"), this)) + : m_includeOldEntriesAction(new QAction(Tr::tr("Include Old Entries"), this)) + , m_includeTagsAction(new QAction(Tr::tr("Include Tags"), this)) , m_addAction(new QAction(this)) , m_refreshAction(new QAction(this)) , m_repositoryLabel(new ElidingLabel(this)) @@ -83,7 +83,7 @@ BranchView::BranchView() connect(m_addAction, &QAction::triggered, this, &BranchView::add); m_refreshAction->setIcon(Utils::Icons::RELOAD_TOOLBAR.icon()); - m_refreshAction->setToolTip(tr("Refresh")); + m_refreshAction->setToolTip(Tr::tr("Refresh")); connect(m_refreshAction, &QAction::triggered, this, &BranchView::refreshCurrentRepository); m_branchView->setHeaderHidden(true); @@ -108,7 +108,7 @@ BranchView::BranchView() m_includeOldEntriesAction->setCheckable(true); m_includeOldEntriesAction->setToolTip( - tr("Include branches and tags that have not been active for %n days.", nullptr, + Tr::tr("Include branches and tags that have not been active for %n days.", nullptr, Constants::OBSOLETE_COMMIT_AGE_IN_DAYS)); connect(m_includeOldEntriesAction, &QAction::toggled, this, &BranchView::setIncludeOldEntries); @@ -146,13 +146,13 @@ void BranchView::refresh(const FilePath &repository, bool force) m_repository = repository; if (m_repository.isEmpty()) { - m_repositoryLabel->setText(tr("")); - m_addAction->setToolTip(tr("Create Git Repository...")); + m_repositoryLabel->setText(Tr::tr("")); + m_addAction->setToolTip(Tr::tr("Create Git Repository...")); m_branchView->setEnabled(false); } else { m_repositoryLabel->setText(m_repository.toUserOutput()); m_repositoryLabel->setToolTip(GitPlugin::msgRepositoryLabel(m_repository)); - m_addAction->setToolTip(tr("Add Branch...")); + m_addAction->setToolTip(Tr::tr("Add Branch...")); m_branchView->setEnabled(true); } @@ -179,7 +179,7 @@ QList BranchView::createToolButtons() { auto filter = new QToolButton; filter->setIcon(Utils::Icons::FILTER.icon()); - filter->setToolTip(tr("Filter")); + filter->setToolTip(Tr::tr("Filter")); filter->setPopupMode(QToolButton::InstantPopup); filter->setProperty("noArrow", true); @@ -227,75 +227,75 @@ void BranchView::slotCustomContextMenu(const QPoint &point) const bool currentLocal = m_model->isLocal(currentBranch); QMenu contextMenu; - contextMenu.addAction(tr("&Add..."), this, &BranchView::add); + contextMenu.addAction(Tr::tr("&Add..."), this, &BranchView::add); const std::optional remote = m_model->remoteName(index); if (remote.has_value()) { - contextMenu.addAction(tr("&Fetch"), this, [this, &remote]() { + contextMenu.addAction(Tr::tr("&Fetch"), this, [this, &remote]() { GitClient::instance()->fetch(m_repository, *remote); }); contextMenu.addSeparator(); if (!remote->isEmpty()) { - contextMenu.addAction(tr("Remove &Stale Branches"), this, [this, &remote]() { + contextMenu.addAction(Tr::tr("Remove &Stale Branches"), this, [this, &remote]() { GitClient::instance()->removeStaleRemoteBranches(m_repository, *remote); }); contextMenu.addSeparator(); } - contextMenu.addAction(tr("Manage &Remotes..."), this, [] { + contextMenu.addAction(Tr::tr("Manage &Remotes..."), this, [] { GitPlugin::manageRemotes(); }); } if (hasActions) { if (!currentSelected && (isLocal || isTag)) - contextMenu.addAction(tr("Rem&ove..."), this, &BranchView::remove); + contextMenu.addAction(Tr::tr("Rem&ove..."), this, &BranchView::remove); if (isLocal || isTag) - contextMenu.addAction(tr("Re&name..."), this, &BranchView::rename); + contextMenu.addAction(Tr::tr("Re&name..."), this, &BranchView::rename); if (!currentSelected) - contextMenu.addAction(tr("&Checkout"), this, &BranchView::checkout); + contextMenu.addAction(Tr::tr("&Checkout"), this, &BranchView::checkout); contextMenu.addSeparator(); - contextMenu.addAction(tr("&Diff"), this, [this] { + contextMenu.addAction(Tr::tr("&Diff"), this, [this] { const QString fullName = m_model->fullName(selectedIndex(), true); if (!fullName.isEmpty()) { SetInContext block(m_blockRefresh); GitClient::instance()->diffBranch(m_repository, fullName); } }); - contextMenu.addAction(tr("&Log"), this, [this] { log(selectedIndex()); }); - contextMenu.addAction(tr("Reflo&g"), this, [this] { reflog(selectedIndex()); }); + contextMenu.addAction(Tr::tr("&Log"), this, [this] { log(selectedIndex()); }); + contextMenu.addAction(Tr::tr("Reflo&g"), this, [this] { reflog(selectedIndex()); }); contextMenu.addSeparator(); if (!currentSelected) { - auto resetMenu = new QMenu(tr("Re&set"), &contextMenu); - resetMenu->addAction(tr("&Hard"), this, [this] { reset("hard"); }); - resetMenu->addAction(tr("&Mixed"), this, [this] { reset("mixed"); }); - resetMenu->addAction(tr("&Soft"), this, [this] { reset("soft"); }); + auto resetMenu = new QMenu(Tr::tr("Re&set"), &contextMenu); + resetMenu->addAction(Tr::tr("&Hard"), this, [this] { reset("hard"); }); + resetMenu->addAction(Tr::tr("&Mixed"), this, [this] { reset("mixed"); }); + resetMenu->addAction(Tr::tr("&Soft"), this, [this] { reset("soft"); }); contextMenu.addMenu(resetMenu); QString mergeTitle; if (isFastForwardMerge()) { - contextMenu.addAction(tr("&Merge \"%1\" into \"%2\" (Fast-Forward)") + contextMenu.addAction(Tr::tr("&Merge \"%1\" into \"%2\" (Fast-Forward)") .arg(indexName, currentName), this, [this] { merge(true); }); - mergeTitle = tr("Merge \"%1\" into \"%2\" (No &Fast-Forward)") + mergeTitle = Tr::tr("Merge \"%1\" into \"%2\" (No &Fast-Forward)") .arg(indexName, currentName); } else { - mergeTitle = tr("&Merge \"%1\" into \"%2\"") + mergeTitle = Tr::tr("&Merge \"%1\" into \"%2\"") .arg(indexName, currentName); } contextMenu.addAction(mergeTitle, this, [this] { merge(false); }); - contextMenu.addAction(tr("&Rebase \"%1\" on \"%2\"") + contextMenu.addAction(Tr::tr("&Rebase \"%1\" on \"%2\"") .arg(currentName, indexName), this, &BranchView::rebase); contextMenu.addSeparator(); - contextMenu.addAction(tr("Cherry &Pick"), this, &BranchView::cherryPick); + contextMenu.addAction(Tr::tr("Cherry &Pick"), this, &BranchView::cherryPick); } if (!currentSelected && !isTag) { if (currentLocal) { - contextMenu.addAction(tr("&Track"), this, [this] { + contextMenu.addAction(Tr::tr("&Track"), this, [this] { m_model->setRemoteTracking(selectedIndex()); }); } if (!isLocal) { contextMenu.addSeparator(); - contextMenu.addAction(tr("&Push"), this, &BranchView::push); + contextMenu.addAction(Tr::tr("&Push"), this, &BranchView::push); } } } @@ -459,13 +459,13 @@ bool BranchView::remove() const bool wasMerged = isTag ? true : m_model->branchIsMerged(selected); QString message; if (isTag) - message = tr("Would you like to delete the tag \"%1\"?").arg(branchName); + message = Tr::tr("Would you like to delete the tag \"%1\"?").arg(branchName); else if (wasMerged) - message = tr("Would you like to delete the branch \"%1\"?").arg(branchName); + message = Tr::tr("Would you like to delete the branch \"%1\"?").arg(branchName); else - message = tr("Would you like to delete the unmerged branch \"%1\"?").arg(branchName); + message = Tr::tr("Would you like to delete the unmerged branch \"%1\"?").arg(branchName); - if (QMessageBox::question(this, isTag ? tr("Delete Tag") : tr("Delete Branch"), + if (QMessageBox::question(this, isTag ? Tr::tr("Delete Tag") : Tr::tr("Delete Branch"), message, QMessageBox::Yes | QMessageBox::No, wasMerged ? QMessageBox::Yes : QMessageBox::No) == QMessageBox::Yes) { if (isTag) @@ -517,7 +517,7 @@ bool BranchView::reset(const QByteArray &resetType) if (currentName.isEmpty() || branchName.isEmpty()) return false; - if (QMessageBox::question(this, tr("Git Reset"), tr("Reset branch \"%1\" to \"%2\"?") + if (QMessageBox::question(this, Tr::tr("Git Reset"), Tr::tr("Reset branch \"%1\" to \"%2\"?") .arg(currentName, branchName), QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) { GitClient::instance()->reset(m_repository, QLatin1String("--" + resetType), branchName); @@ -610,7 +610,7 @@ void BranchView::push() BranchViewFactory::BranchViewFactory() { - setDisplayName(tr("Git Branches")); + setDisplayName(Tr::tr("Git Branches")); setPriority(500); setId(Constants::GIT_BRANCH_VIEW_ID); } @@ -626,5 +626,4 @@ BranchView *BranchViewFactory::view() const return m_view; } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/branchview.h b/src/plugins/git/branchview.h index 3fb79d9a9ca..5ff8df715fa 100644 --- a/src/plugins/git/branchview.h +++ b/src/plugins/git/branchview.h @@ -20,18 +20,15 @@ QT_END_NAMESPACE; namespace Utils { class ElidingLabel; class NavigationTreeView; -} +} // Utils -namespace Git { -namespace Internal { +namespace Git::Internal { class BranchModel; class BranchFilterModel; class BranchView : public QWidget { - Q_OBJECT - public: explicit BranchView(); @@ -80,8 +77,6 @@ private: class BranchViewFactory : public Core::INavigationWidgetFactory { - Q_OBJECT - public: BranchViewFactory(); @@ -93,5 +88,4 @@ private: QPointer m_view; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp index d4e9587a85a..1ef50c08fd5 100644 --- a/src/plugins/git/changeselectiondialog.cpp +++ b/src/plugins/git/changeselectiondialog.cpp @@ -5,6 +5,7 @@ #include "logchangedialog.h" #include "gitclient.h" +#include "gittr.h" #include @@ -14,9 +15,7 @@ #include #include -#include #include -#include #include #include #include @@ -30,8 +29,7 @@ using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { ChangeSelectionDialog::ChangeSelectionDialog(const FilePath &workingDirectory, Id id, QWidget *parent) : @@ -41,14 +39,14 @@ ChangeSelectionDialog::ChangeSelectionDialog(const FilePath &workingDirectory, I m_gitEnvironment = GitClient::instance()->processEnvironment(); resize(550, 350); - setWindowTitle(tr("Select a Git Commit")); + setWindowTitle(Tr::tr("Select a Git Commit")); setObjectName("Git.ChangeSelectionDialog"); m_workingDirectoryChooser = new PathChooser(this); m_changeNumberEdit = new CompletingLineEdit(this); m_changeNumberEdit->setObjectName("changeNumberEdit"); - m_changeNumberEdit->setText(tr("HEAD")); + m_changeNumberEdit->setText(Tr::tr("HEAD")); m_changeNumberEdit->setFocus(); m_changeNumberEdit->selectAll(); @@ -58,25 +56,25 @@ ChangeSelectionDialog::ChangeSelectionDialog(const FilePath &workingDirectory, I m_detailsText->setLineWrapMode(QPlainTextEdit::NoWrap); m_detailsText->setReadOnly(true); - auto selectFromHistoryButton = new QPushButton(tr("Browse &History...")); - auto closeButton = new QPushButton(tr("&Close")); - auto archiveButton = new QPushButton(tr("&Archive...")); + auto selectFromHistoryButton = new QPushButton(Tr::tr("Browse &History...")); + auto closeButton = new QPushButton(Tr::tr("&Close")); + auto archiveButton = new QPushButton(Tr::tr("&Archive...")); - m_checkoutButton = new QPushButton(tr("Check&out")); - m_revertButton = new QPushButton(tr("&Revert")); - m_cherryPickButton = new QPushButton(tr("Cherry &Pick")); - m_showButton = new QPushButton(tr("&Show")); + m_checkoutButton = new QPushButton(Tr::tr("Check&out")); + m_revertButton = new QPushButton(Tr::tr("&Revert")); + m_cherryPickButton = new QPushButton(Tr::tr("Cherry &Pick")); + m_showButton = new QPushButton(Tr::tr("&Show")); m_showButton->setObjectName("showButton"); m_workingDirectoryChooser->setExpectedKind(PathChooser::ExistingDirectory); - m_workingDirectoryChooser->setPromptDialogTitle(tr("Select Git Directory")); + m_workingDirectoryChooser->setPromptDialogTitle(Tr::tr("Select Git Directory")); m_workingDirectoryChooser->setFilePath(workingDirectory); using namespace Layouting; Column { Grid { - tr("Working directory:"), m_workingDirectoryChooser, br, - tr("Change:"), m_changeNumberEdit, selectFromHistoryButton, + Tr::tr("Working directory:"), m_workingDirectoryChooser, br, + Tr::tr("Change:"), m_changeNumberEdit, selectFromHistoryButton, }, m_detailsText, Row { @@ -143,7 +141,7 @@ void ChangeSelectionDialog::selectCommitFromRecentHistory() if (tilde != -1) commit.truncate(tilde); LogChangeDialog dialog(false, this); - dialog.setWindowTitle(tr("Select Commit")); + dialog.setWindowTitle(Tr::tr("Select Commit")); dialog.runDialog(workingDir, commit, LogChangeWidget::IncludeRemotes); @@ -184,9 +182,9 @@ void ChangeSelectionDialog::setDetails() palette.setColor(QPalette::Text, theme->color(Theme::TextColorNormal)); m_changeNumberEdit->setPalette(palette); } else if (m_process->result() == ProcessResult::StartFailed) { - m_detailsText->setPlainText(tr("Error: Could not start Git.")); + m_detailsText->setPlainText(Tr::tr("Error: Could not start Git.")); } else { - m_detailsText->setPlainText(tr("Error: Unknown reference")); + m_detailsText->setPlainText(Tr::tr("Error: Unknown reference")); palette.setColor(QPalette::Text, theme->color(Theme::TextColorError)); m_changeNumberEdit->setPalette(palette); enableButtons(false); @@ -231,7 +229,7 @@ void ChangeSelectionDialog::recalculateDetails() const FilePath workingDir = workingDirectory(); if (workingDir.isEmpty()) { - m_detailsText->setPlainText(tr("Error: Bad working directory.")); + m_detailsText->setPlainText(Tr::tr("Error: Bad working directory.")); return; } @@ -247,7 +245,7 @@ void ChangeSelectionDialog::recalculateDetails() m_process->setEnvironment(m_gitEnvironment); m_process->setCommand({m_gitExecutable, {"show", "--decorate", "--stat=80", ref}}); m_process->start(); - m_detailsText->setPlainText(tr("Fetching commit data...")); + m_detailsText->setPlainText(Tr::tr("Fetching commit data...")); } void ChangeSelectionDialog::changeTextChanged(const QString &text) @@ -261,5 +259,4 @@ void ChangeSelectionDialog::changeTextChanged(const QString &text) recalculateDetails(); } -} // Internal -} // Git +} // Git::Internal diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h index 9c43a2cfcb5..c75239213e7 100644 --- a/src/plugins/git/changeselectiondialog.h +++ b/src/plugins/git/changeselectiondialog.h @@ -21,8 +21,7 @@ class PathChooser; class QtcProcess; } // Utils -namespace Git { -namespace Internal { +namespace Git::Internal { enum ChangeCommand { NoCommand, @@ -35,7 +34,6 @@ enum ChangeCommand { class ChangeSelectionDialog : public QDialog { - Q_OBJECT public: ChangeSelectionDialog(const Utils::FilePath &workingDirectory, Utils::Id id, QWidget *parent); ~ChangeSelectionDialog() override; @@ -71,5 +69,4 @@ private: QPushButton *m_showButton; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index 9c6b948ac15..78e70a5ee48 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -3,13 +3,12 @@ #include "commitdata.h" +#include "gittr.h" + #include #include -#include - -namespace Git { -namespace Internal { +namespace Git::Internal { void GitSubmitEditorPanelInfo::clear() { @@ -175,32 +174,31 @@ QString CommitData::stateDisplayName(const FileStates &state) { QString resultState; if (state == UntrackedFile) - return tr("untracked"); + return Tr::tr("untracked"); if (state & StagedFile) - resultState = tr("staged + "); + resultState = Tr::tr("staged + "); if (state & ModifiedFile) - resultState.append(tr("modified")); + resultState.append(Tr::tr("modified")); else if (state & AddedFile) - resultState.append(tr("added")); + resultState.append(Tr::tr("added")); else if (state & DeletedFile) - resultState.append(tr("deleted")); + resultState.append(Tr::tr("deleted")); else if (state & RenamedFile) - resultState.append(tr("renamed")); + resultState.append(Tr::tr("renamed")); else if (state & CopiedFile) - resultState.append(tr("copied")); + resultState.append(Tr::tr("copied")); else if (state & TypeChangedFile) - resultState.append(tr("typechange")); + resultState.append(Tr::tr("typechange")); if (state & UnmergedUs) { if (state & UnmergedThem) - resultState.append(tr(" by both")); + resultState.append(Tr::tr(" by both")); else - resultState.append(tr(" by us")); + resultState.append(Tr::tr(" by us")); } else if (state & UnmergedThem) { - resultState.append(tr(" by them")); + resultState.append(Tr::tr(" by them")); } return resultState; } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index c425016b679..8d6c14ca918 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -7,7 +7,6 @@ #include -#include #include #include @@ -15,8 +14,7 @@ QT_BEGIN_NAMESPACE class QTextCodec; QT_END_NAMESPACE -namespace Git { -namespace Internal { +namespace Git::Internal { // Read-only class GitSubmitEditorPanelInfo @@ -69,8 +67,6 @@ Q_DECLARE_FLAGS(FileStates, FileState) class CommitData { - Q_DECLARE_TR_FUNCTIONS(Git::Internal::CommitData) - public: CommitData(CommitType type = SimpleCommit); // A pair of state string/file name ('modified', 'file.cpp'). @@ -101,17 +97,14 @@ private: bool checkLine(const QString &stateInfo, const QString &file); }; -} // namespace Internal -} // namespace Git +} // Git::Internal Q_DECLARE_OPERATORS_FOR_FLAGS(Git::Internal::FileStates) -namespace Git { -namespace Internal { +namespace Git::Internal { // Must appear after Q_DECLARE_OPERATORS_FOR_FLAGS bool operator<(const CommitData::StateFilePair &a, const CommitData::StateFilePair &b); -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gerrit/authenticationdialog.cpp b/src/plugins/git/gerrit/authenticationdialog.cpp index a12c62f2b08..3dacd0d2712 100644 --- a/src/plugins/git/gerrit/authenticationdialog.cpp +++ b/src/plugins/git/gerrit/authenticationdialog.cpp @@ -5,6 +5,8 @@ #include "gerritserver.h" +#include "../gittr.h" + #include #include #include @@ -52,11 +54,11 @@ static bool replaceEntry(QString &line, const QString &type, const QString &valu AuthenticationDialog::AuthenticationDialog(GerritServer *server) : m_server(server) { - setWindowTitle(tr("Authentication")); + setWindowTitle(Git::Tr::tr("Authentication")); resize(400, 334); // FIXME: Take html out of this translatable string. - const QString desc = tr( + const QString desc = Git::Tr::tr( "

Gerrit server with HTTP was detected, but you need " "to set up credentials for it.

To get your password, " "addButton(tr("Anonymous"), QDialogButtonBox::AcceptRole); + QPushButton *anonymous = m_buttonBox->addButton(Git::Tr::tr("Anonymous"), QDialogButtonBox::AcceptRole); connect(m_buttonBox, &QDialogButtonBox::clicked, this, [this, anonymous](QAbstractButton *button) { if (button == anonymous) diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp index 2abf25249f3..e6f83070137 100644 --- a/src/plugins/git/gerrit/gerritdialog.cpp +++ b/src/plugins/git/gerrit/gerritdialog.cpp @@ -8,6 +8,7 @@ #include "gerritremotechooser.h" #include "../gitplugin.h" +#include "../gittr.h" #include @@ -54,7 +55,7 @@ GerritDialog::GerritDialog(const QSharedPointer &p, , m_model(new GerritModel(p, this)) , m_queryModel(new QStringListModel(this)) { - setWindowTitle(tr("Gerrit")); + setWindowTitle(Git::Tr::tr("Gerrit")); resize(950, 706); m_repositoryLabel = new QLabel(this); @@ -64,12 +65,12 @@ GerritDialog::GerritDialog(const QSharedPointer &p, m_remoteComboBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); m_remoteComboBox->setMinimumSize(QSize(40, 0)); - auto changesGroup = new QGroupBox(tr("Changes")); + auto changesGroup = new QGroupBox(Git::Tr::tr("Changes")); changesGroup->setMinimumSize(QSize(0, 350)); m_queryLineEdit = new FancyLineEdit(changesGroup); m_queryLineEdit->setMinimumSize(QSize(400, 0)); - m_queryLineEdit->setPlaceholderText(tr("Change #, SHA-1, tr:id, owner:email or reviewer:email")); + m_queryLineEdit->setPlaceholderText(Git::Tr::tr("Change #, SHA-1, tr:id, owner:email or reviewer:email")); m_queryLineEdit->setSpecialCompleter(new QCompleter(m_queryModel, this)); m_queryLineEdit->setValidationFunction( [this](FancyLineEdit *, QString *) { return m_model->state() != GerritModel::Error; }); @@ -84,7 +85,7 @@ GerritDialog::GerritDialog(const QSharedPointer &p, m_treeView->setUniformRowHeights(true); m_treeView->setSortingEnabled(true); - auto detailsGroup = new QGroupBox(tr("Details")); + auto detailsGroup = new QGroupBox(Git::Tr::tr("Details")); detailsGroup->setMinimumSize(QSize(0, 175)); m_detailsBrowser = new QTextBrowser(detailsGroup); @@ -92,7 +93,7 @@ GerritDialog::GerritDialog(const QSharedPointer &p, m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); - auto queryLabel = new QLabel(tr("&Query:"), changesGroup); + auto queryLabel = new QLabel(Git::Tr::tr("&Query:"), changesGroup); queryLabel->setBuddy(m_queryLineEdit); m_remoteComboBox->setParameters(m_parameters); @@ -113,10 +114,10 @@ GerritDialog::GerritDialog(const QSharedPointer &p, m_progressIndicator->attachToWidget(m_treeView->viewport()); m_progressIndicator->hide(); - m_displayButton = addActionButton(tr("&Show"), [this]() { slotFetchDisplay(); }); - m_cherryPickButton = addActionButton(tr("Cherry &Pick"), [this]() { slotFetchCherryPick(); }); - m_checkoutButton = addActionButton(tr("C&heckout"), [this]() { slotFetchCheckout(); }); - m_refreshButton = addActionButton(tr("&Refresh"), [this]() { refresh(); }); + m_displayButton = addActionButton(Git::Tr::tr("&Show"), [this]() { slotFetchDisplay(); }); + m_cherryPickButton = addActionButton(Git::Tr::tr("Cherry &Pick"), [this]() { slotFetchCherryPick(); }); + m_checkoutButton = addActionButton(Git::Tr::tr("C&heckout"), [this]() { slotFetchCheckout(); }); + m_refreshButton = addActionButton(Git::Tr::tr("&Refresh"), [this]() { refresh(); }); m_refreshButton->setDefault(true); using namespace Layouting; @@ -142,7 +143,7 @@ GerritDialog::GerritDialog(const QSharedPointer &p, splitter->addWidget(detailsGroup); Column { - Row { m_repositoryLabel, st, tr("Remote:"), m_remoteComboBox }, + Row { m_repositoryLabel, st, Git::Tr::tr("Remote:"), m_remoteComboBox }, splitter, m_buttonBox }.attachTo(this); @@ -340,7 +341,7 @@ void GerritDialog::fetchStarted(const QSharedPointer &change) // Disable buttons to prevent parallel gerrit operations which can cause mix-ups. m_fetchRunning = true; updateButtons(); - const QString toolTip = tr("Fetching \"%1\"...").arg(change->title); + const QString toolTip = Git::Tr::tr("Fetching \"%1\"...").arg(change->title); m_displayButton->setToolTip(toolTip); m_cherryPickButton->setToolTip(toolTip); m_checkoutButton->setToolTip(toolTip); diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 1f453f10e0d..9691a8266a4 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -3,6 +3,7 @@ #include "gerritmodel.h" #include "../gitclient.h" +#include "../gittr.h" #include #include @@ -195,7 +196,7 @@ QString GerritChange::fullTitle() const { QString res = title; if (status == "DRAFT") - res += GerritModel::tr(" (Draft)"); + res += Git::Tr::tr(" (Draft)"); return res; } @@ -293,7 +294,7 @@ QueryContext::~QueryContext() void QueryContext::start() { - Core::FutureProgress *fp = Core::ProgressManager::addTask(m_progress.future(), tr("Querying Gerrit"), + Core::FutureProgress *fp = Core::ProgressManager::addTask(m_progress.future(), Git::Tr::tr("Querying Gerrit"), "gerrit-query"); fp->setKeepOnFinish(Core::FutureProgress::HideOnFinish); m_progress.reportStarted(); @@ -326,11 +327,11 @@ void QueryContext::processDone() emit errorText(m_error); if (m_process.exitStatus() == QProcess::CrashExit) - errorTermination(tr("%1 crashed.").arg(m_binary.toUserOutput())); + errorTermination(Git::Tr::tr("%1 crashed.").arg(m_binary.toUserOutput())); else if (m_process.exitCode()) - errorTermination(tr("%1 returned %2.").arg(m_binary.toUserOutput()).arg(m_process.exitCode())); + errorTermination(Git::Tr::tr("%1 returned %2.").arg(m_binary.toUserOutput()).arg(m_process.exitCode())); else if (m_process.result() != ProcessResult::FinishedWithSuccess) - errorTermination(tr("Error running %1: %2").arg(m_binary.toUserOutput(), m_process.errorString())); + errorTermination(Git::Tr::tr("Error running %1: %2").arg(m_binary.toUserOutput(), m_process.errorString())); else emit resultRetrieved(m_output); @@ -346,13 +347,13 @@ void QueryContext::timeout() QWidget *parent = QApplication::activeModalWidget(); if (!parent) parent = QApplication::activeWindow(); - QMessageBox box(QMessageBox::Question, tr("Timeout"), - tr("The gerrit process has not responded within %1 s.\n" + QMessageBox box(QMessageBox::Question, Git::Tr::tr("Timeout"), + Git::Tr::tr("The gerrit process has not responded within %1 s.\n" "Most likely this is caused by problems with SSH authentication.\n" "Would you like to terminate it?"). arg(timeOutMS / 1000), QMessageBox::NoButton, parent); - QPushButton *terminateButton = box.addButton(tr("Terminate"), QMessageBox::YesRole); - box.addButton(tr("Keep Running"), QMessageBox::NoRole); + QPushButton *terminateButton = box.addButton(Git::Tr::tr("Terminate"), QMessageBox::YesRole); + box.addButton(Git::Tr::tr("Keep Running"), QMessageBox::NoRole); connect(&m_process, &QtcProcess::done, &box, &QDialog::reject); box.exec(); if (m_process.state() != QProcess::Running) @@ -368,9 +369,9 @@ GerritModel::GerritModel(const QSharedPointer &p, QObject *par , m_parameters(p) { QStringList headers; // Keep in sync with GerritChange::toHtml() - headers << "#" << tr("Subject") << tr("Owner") - << tr("Updated") << tr("Project") - << tr("Approvals") << tr("Status"); + headers << "#" << Git::Tr::tr("Subject") << Git::Tr::tr("Owner") + << Git::Tr::tr("Updated") << Git::Tr::tr("Project") + << Git::Tr::tr("Approvals") << Git::Tr::tr("Status"); setHorizontalHeaderLabels(headers); } @@ -413,15 +414,15 @@ QString GerritModel::dependencyHtml(const QString &header, const int changeNumbe QString GerritModel::toHtml(const QModelIndex& index) const { - static const QString subjectHeader = GerritModel::tr("Subject"); - static const QString numberHeader = GerritModel::tr("Number"); - static const QString ownerHeader = GerritModel::tr("Owner"); - static const QString projectHeader = GerritModel::tr("Project"); - static const QString statusHeader = GerritModel::tr("Status"); - static const QString patchSetHeader = GerritModel::tr("Patch set"); - static const QString urlHeader = GerritModel::tr("URL"); - static const QString dependsOnHeader = GerritModel::tr("Depends on"); - static const QString neededByHeader = GerritModel::tr("Needed by"); + static const QString subjectHeader = Git::Tr::tr("Subject"); + static const QString numberHeader = Git::Tr::tr("Number"); + static const QString ownerHeader = Git::Tr::tr("Owner"); + static const QString projectHeader = Git::Tr::tr("Project"); + static const QString statusHeader = Git::Tr::tr("Status"); + static const QString patchSetHeader = Git::Tr::tr("Patch set"); + static const QString urlHeader = Git::Tr::tr("URL"); + static const QString dependsOnHeader = Git::Tr::tr("Depends on"); + static const QString neededByHeader = Git::Tr::tr("Needed by"); if (!index.isValid()) return QString(); @@ -781,7 +782,7 @@ static bool parseOutput(const QSharedPointer ¶meters, QJsonParseError error; const QJsonDocument doc = QJsonDocument::fromJson(adaptedOutput, &error); if (doc.isNull()) { - QString errorMessage = GerritModel::tr("Parse error: \"%1\" -> %2") + QString errorMessage = Git::Tr::tr("Parse error: \"%1\" -> %2") .arg(QString::fromUtf8(output)) .arg(error.errorString()); qWarning() << errorMessage; @@ -806,7 +807,7 @@ static bool parseOutput(const QSharedPointer ¶meters, } else { const QByteArray jsonObject = QJsonDocument(object).toJson(); qWarning("%s: Parse error: '%s'.", Q_FUNC_INFO, jsonObject.constData()); - VcsOutputWindow::appendError(GerritModel::tr("Parse error: \"%1\"") + VcsOutputWindow::appendError(Git::Tr::tr("Parse error: \"%1\"") .arg(QString::fromUtf8(jsonObject))); res = false; } diff --git a/src/plugins/git/gerrit/gerritoptionspage.cpp b/src/plugins/git/gerrit/gerritoptionspage.cpp index 2a9ba514dcb..af7774f905d 100644 --- a/src/plugins/git/gerrit/gerritoptionspage.cpp +++ b/src/plugins/git/gerrit/gerritoptionspage.cpp @@ -4,6 +4,7 @@ #include "gerritoptionspage.h" #include "gerritparameters.h" #include "gerritserver.h" +#include "gittr.h" #include #include @@ -24,7 +25,7 @@ GerritOptionsPage::GerritOptionsPage(const QSharedPointer &p, , m_parameters(p) { setId("Gerrit"); - setDisplayName(tr("Gerrit")); + setDisplayName(Git::Tr::tr("Gerrit")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); } @@ -70,24 +71,24 @@ GerritOptionsWidget::GerritOptionsWidget(QWidget *parent) , m_sshChooser(new Utils::PathChooser) , m_curlChooser(new Utils::PathChooser) , m_portSpinBox(new QSpinBox(this)) - , m_httpsCheckBox(new QCheckBox(tr("HTTPS"))) + , m_httpsCheckBox(new QCheckBox(Git::Tr::tr("HTTPS"))) { auto formLayout = new QFormLayout(this); formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); - formLayout->addRow(tr("&Host:"), m_hostLineEdit); - formLayout->addRow(tr("&User:"), m_userLineEdit); + formLayout->addRow(Git::Tr::tr("&Host:"), m_hostLineEdit); + formLayout->addRow(Git::Tr::tr("&User:"), m_userLineEdit); m_sshChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_sshChooser->setCommandVersionArguments({"-V"}); m_sshChooser->setHistoryCompleter("Git.SshCommand.History"); - formLayout->addRow(tr("&ssh:"), m_sshChooser); + formLayout->addRow(Git::Tr::tr("&ssh:"), m_sshChooser); m_curlChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_curlChooser->setCommandVersionArguments({"-V"}); - formLayout->addRow(tr("cur&l:"), m_curlChooser); + formLayout->addRow(Git::Tr::tr("cur&l:"), m_curlChooser); m_portSpinBox->setMinimum(1); m_portSpinBox->setMaximum(65535); - formLayout->addRow(tr("SSH &Port:"), m_portSpinBox); - formLayout->addRow(tr("P&rotocol:"), m_httpsCheckBox); - m_httpsCheckBox->setToolTip(tr( + formLayout->addRow(Git::Tr::tr("SSH &Port:"), m_portSpinBox); + formLayout->addRow(Git::Tr::tr("P&rotocol:"), m_httpsCheckBox); + m_httpsCheckBox->setToolTip(Git::Tr::tr( "Determines the protocol used to form a URL in case\n" "\"canonicalWebUrl\" is not configured in the file\n" "\"gerrit.config\".")); diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 6d1431aac6c..31e515636db 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -8,8 +8,10 @@ #include "gerritoptionspage.h" #include "gerritpushdialog.h" -#include "../gitplugin.h" #include "../gitclient.h" +#include "../gitplugin.h" +#include "../gittr.h" + #include #include @@ -139,7 +141,7 @@ FetchContext::~FetchContext() void FetchContext::start() { m_progress.setProgressRange(0, 2); - FutureProgress *fp = ProgressManager::addTask(m_progress.future(), tr("Fetching from Gerrit"), + FutureProgress *fp = ProgressManager::addTask(m_progress.future(), Git::Tr::tr("Fetching from Gerrit"), "gerrit-fetch"); fp->setKeepOnFinish(FutureProgress::HideOnFinish); m_progress.reportStarted(); @@ -237,14 +239,14 @@ void GerritPlugin::initialize(ActionContainer *ac) { m_parameters->fromSettings(ICore::settings()); - QAction *openViewAction = new QAction(tr("Gerrit..."), this); + QAction *openViewAction = new QAction(Git::Tr::tr("Gerrit..."), this); m_gerritCommand = ActionManager::registerAction(openViewAction, Constants::GERRIT_OPEN_VIEW); connect(openViewAction, &QAction::triggered, this, &GerritPlugin::openView); ac->addAction(m_gerritCommand); - QAction *pushAction = new QAction(tr("Push to Gerrit..."), this); + QAction *pushAction = new QAction(Git::Tr::tr("Push to Gerrit..."), this); m_pushToGerritCommand = ActionManager::registerAction(pushAction, Constants::GERRIT_PUSH); @@ -281,7 +283,7 @@ void GerritPlugin::push(const FilePath &topLevel) const QString initErrorMessage = dialog.initErrorMessage(); if (!initErrorMessage.isEmpty()) { - QMessageBox::warning(ICore::dialogParent(), tr("Initialization Failed"), initErrorMessage); + QMessageBox::warning(ICore::dialogParent(), Git::Tr::tr("Initialization Failed"), initErrorMessage); return; } @@ -303,8 +305,8 @@ void GerritPlugin::openView() { if (m_dialog.isNull()) { while (!m_parameters->isValid()) { - QMessageBox::warning(Core::ICore::dialogParent(), tr("Error"), - tr("Invalid Gerrit configuration. Host, user and ssh binary are mandatory.")); + QMessageBox::warning(Core::ICore::dialogParent(), Git::Tr::tr("Error"), + Git::Tr::tr("Invalid Gerrit configuration. Host, user and ssh binary are mandatory.")); if (!ICore::showOptionsDialog("Gerrit")) return; } @@ -352,7 +354,7 @@ void GerritPlugin::fetch(const QSharedPointer &change, int mode) // Locate git. const Utils::FilePath git = GitClient::instance()->vcsBinary(); if (git.isEmpty()) { - VcsBase::VcsOutputWindow::appendError(tr("Git is not available.")); + VcsBase::VcsOutputWindow::appendError(Git::Tr::tr("Git is not available.")); return; } @@ -392,8 +394,8 @@ void GerritPlugin::fetch(const QSharedPointer &change, int mode) if (!verifiedRepository) { QMessageBox::StandardButton answer = QMessageBox::question( - ICore::dialogParent(), tr("Remote Not Verified"), - tr("Change host %1\nand project %2\n\nwere not verified among remotes" + ICore::dialogParent(), Git::Tr::tr("Remote Not Verified"), + Git::Tr::tr("Change host %1\nand project %2\n\nwere not verified among remotes" " in %3. Select different folder?") .arg(m_server->host, change->project, @@ -416,7 +418,7 @@ void GerritPlugin::fetch(const QSharedPointer &change, int mode) if (!verifiedRepository) { // Ask the user for a repository to retrieve the change. const QString title = - tr("Enter Local Repository for \"%1\" (%2)").arg(change->project, change->branch); + Git::Tr::tr("Enter Local Repository for \"%1\" (%2)").arg(change->project, change->branch); const FilePath suggestedRespository = findLocalRepository(change->project, change->branch); repository = FileUtils::getExistingDirectory(m_dialog.data(), title, suggestedRespository); } diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 00fd6836ffb..cbb29355310 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -7,6 +7,7 @@ #include "../gitclient.h" #include "../gitconstants.h" +#include "../gittr.h" #include #include @@ -120,7 +121,7 @@ GerritPushDialog::GerritPushDialog(const Utils::FilePath &workingDir, const QStr initRemoteBranches(); if (m_ui->remoteComboBox->isEmpty()) { - m_initErrorMessage = tr("Cannot find a Gerrit remote. Add one and try again."); + m_initErrorMessage = Git::Tr::tr("Cannot find a Gerrit remote. Add one and try again."); return; } @@ -190,14 +191,14 @@ void GerritPushDialog::setChangeRange() } m_ui->infoLabel->show(); const QString remote = selectedRemoteName() + '/' + remoteBranchName; - QString labelText = tr("Number of commits between %1 and %2: %3").arg(branch, remote, range); + QString labelText = Git::Tr::tr("Number of commits between %1 and %2: %3").arg(branch, remote, range); const int currentRange = range.toInt(); QPalette palette = QApplication::palette(); if (currentRange > ReasonableDistance) { const QColor errorColor = Utils::creatorTheme()->color(Utils::Theme::TextColorError); palette.setColor(QPalette::WindowText, errorColor); palette.setColor(QPalette::ButtonText, errorColor); - labelText.append("\n" + tr("Are you sure you selected the right target branch?")); + labelText.append("\n" + Git::Tr::tr("Are you sure you selected the right target branch?")); } m_ui->infoLabel->setPalette(palette); m_ui->targetBranchComboBox->setPalette(palette); @@ -226,21 +227,21 @@ void GerritPushDialog::onRemoteChanged(bool force) m_currentSupportsWip = supportsWip; m_ui->wipCheckBox->setEnabled(supportsWip); if (supportsWip) { - m_ui->wipCheckBox->setToolTip(tr("Checked - Mark change as WIP.\n" + m_ui->wipCheckBox->setToolTip(Git::Tr::tr("Checked - Mark change as WIP.\n" "Unchecked - Mark change as ready for review.\n" "Partially checked - Do not change current state.")); m_ui->draftCheckBox->setTristate(true); if (m_ui->draftCheckBox->checkState() != Qt::Checked) m_ui->draftCheckBox->setCheckState(Qt::PartiallyChecked); - m_ui->draftCheckBox->setToolTip(tr("Checked - Mark change as private.\n" + m_ui->draftCheckBox->setToolTip(Git::Tr::tr("Checked - Mark change as private.\n" "Unchecked - Remove mark.\n" "Partially checked - Do not change current state.")); } else { - m_ui->wipCheckBox->setToolTip(tr("Supported on Gerrit 2.15 and later.")); + m_ui->wipCheckBox->setToolTip(Git::Tr::tr("Supported on Gerrit 2.15 and later.")); m_ui->draftCheckBox->setTristate(false); if (m_ui->draftCheckBox->checkState() != Qt::Checked) m_ui->draftCheckBox->setCheckState(Qt::Unchecked); - m_ui->draftCheckBox->setToolTip(tr("Checked - The change is a draft.\n" + m_ui->draftCheckBox->setToolTip(Git::Tr::tr("Checked - The change is a draft.\n" "Unchecked - The change is not a draft.")); } } @@ -309,9 +310,9 @@ void GerritPushDialog::setRemoteBranches(bool includeOld) if (remoteBranches.isEmpty()) { m_ui->targetBranchComboBox->setEditable(true); m_ui->targetBranchComboBox->setToolTip( - tr("No remote branches found. This is probably the initial commit.")); + Git::Tr::tr("No remote branches found. This is probably the initial commit.")); if (QLineEdit *lineEdit = m_ui->targetBranchComboBox->lineEdit()) - lineEdit->setPlaceholderText(tr("Branch name")); + lineEdit->setPlaceholderText(Git::Tr::tr("Branch name")); } } @@ -331,7 +332,7 @@ void GerritPushDialog::setRemoteBranches(bool includeOld) } } if (excluded) - m_ui->targetBranchComboBox->addItem(tr("... Include older branches ..."), 1); + m_ui->targetBranchComboBox->addItem(Git::Tr::tr("... Include older branches ..."), 1); setChangeRange(); } validate(); diff --git a/src/plugins/git/gerrit/gerritremotechooser.cpp b/src/plugins/git/gerrit/gerritremotechooser.cpp index 4ccd0ae28d8..df628194ba9 100644 --- a/src/plugins/git/gerrit/gerritremotechooser.cpp +++ b/src/plugins/git/gerrit/gerritremotechooser.cpp @@ -5,6 +5,7 @@ #include "gerritparameters.h" #include "gerritserver.h" #include "../gitclient.h" +#include "../gittr.h" #include #include @@ -34,7 +35,7 @@ GerritRemoteChooser::GerritRemoteChooser(QWidget *parent) : horizontalLayout->setContentsMargins(0, 0, 0, 0); m_resetRemoteButton = new QToolButton(this); - m_resetRemoteButton->setToolTip(tr("Refresh Remote Servers")); + m_resetRemoteButton->setToolTip(Git::Tr::tr("Refresh Remote Servers")); horizontalLayout->addWidget(m_resetRemoteButton); @@ -92,7 +93,7 @@ bool GerritRemoteChooser::updateRemotes(bool forceReload) addRemote(server, mapIt.key()); } if (m_enableFallback) - addRemote(m_parameters->server, tr("Fallback")); + addRemote(m_parameters->server, Git::Tr::tr("Fallback")); m_remoteComboBox->setEnabled(m_remoteComboBox->count() > 1); m_updatingRemotes = false; handleRemoteChanged(); diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 7b7f1215800..386549993ff 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2,14 +2,15 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "gitclient.h" -#include "gitutils.h" +#include "branchadddialog.h" #include "commitdata.h" #include "gitconstants.h" #include "giteditor.h" #include "gitplugin.h" +#include "gittr.h" +#include "gitutils.h" #include "mergetool.h" -#include "branchadddialog.h" #include #include @@ -84,8 +85,7 @@ using namespace DiffEditor; using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { static GitClient *m_instance = nullptr; @@ -117,7 +117,7 @@ static QString branchesDisplay(const QString &prefix, QStringList *branches, boo //: Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" // in git show. if (more > 0) - output += ' ' + GitClient::tr("and %n more", nullptr, more); + output += ' ' + Tr::tr("and %n more", nullptr, more); return output; } @@ -347,7 +347,7 @@ void GitBaseDiffEditorController::updateBranchList() } if (branches.isEmpty()) { if (previousRemote == localPrefix) - output += tr(""); + output += Tr::tr(""); } else { output += branchesDisplay(previousRemote, &branches, &first); } @@ -483,7 +483,7 @@ void ShowController::processDescription(const QString &output) int lastHeaderLine = modText.indexOf("\n\n") + 1; m_header = output.left(lastHeaderLine) + Constants::EXPAND_BRANCHES + '\n'; m_body = output.mid(lastHeaderLine + 1); - m_precedes = tr(""); + m_precedes = Tr::tr(""); m_follows.push_back(m_precedes); updateDescription(); const QString commit = modText.mid(7, 8); @@ -560,11 +560,11 @@ public: VcsBaseEditorConfig(toolBar) { m_patienceButton - = addToggleButton("--patience", tr("Patience"), - tr("Use the patience algorithm for calculating the differences.")); + = addToggleButton("--patience", Tr::tr("Patience"), + Tr::tr("Use the patience algorithm for calculating the differences.")); mapSetting(m_patienceButton, &settings.diffPatience); - m_ignoreWSButton = addToggleButton("--ignore-space-change", tr("Ignore Whitespace"), - tr("Ignore whitespace only changes.")); + m_ignoreWSButton = addToggleButton("--ignore-space-change", Tr::tr("Ignore Whitespace"), + Tr::tr("Ignore whitespace only changes.")); mapSetting(m_ignoreWSButton, &settings.ignoreSpaceChangesInDiff); } @@ -581,20 +581,20 @@ public: GitBlameArgumentsWidget(GitSettings &settings, QToolBar *toolBar) : VcsBaseEditorConfig(toolBar) { - mapSetting(addToggleButton(QString(), tr("Omit Date"), - tr("Hide the date of a change from the output.")), + mapSetting(addToggleButton(QString(), Tr::tr("Omit Date"), + Tr::tr("Hide the date of a change from the output.")), &settings.omitAnnotationDate); - mapSetting(addToggleButton("-w", tr("Ignore Whitespace"), - tr("Ignore whitespace only changes.")), + mapSetting(addToggleButton("-w", Tr::tr("Ignore Whitespace"), + Tr::tr("Ignore whitespace only changes.")), &settings.ignoreSpaceChangesInBlame); const QList logChoices = { - ChoiceItem(tr("No Move Detection"), ""), - ChoiceItem(tr("Detect Moves Within File"), "-M"), - ChoiceItem(tr("Detect Moves Between Files"), "-M -C"), - ChoiceItem(tr("Detect Moves and Copies Between Files"), "-M -C -C") + ChoiceItem(Tr::tr("No Move Detection"), ""), + ChoiceItem(Tr::tr("Detect Moves Within File"), "-M"), + ChoiceItem(Tr::tr("Detect Moves Between Files"), "-M -C"), + ChoiceItem(Tr::tr("Detect Moves and Copies Between Files"), "-M -C -C") }; - mapSetting(addChoices(tr("Move detection"), {}, logChoices), + mapSetting(addChoices(Tr::tr("Move detection"), {}, logChoices), &settings.blameMoveDetection); addReloadButton(); @@ -610,15 +610,15 @@ public: BaseGitDiffArgumentsWidget(settings, editor->toolBar()) { QToolBar *toolBar = editor->toolBar(); - QAction *diffButton = addToggleButton(patchOption, tr("Diff"), - tr("Show difference.")); + QAction *diffButton = addToggleButton(patchOption, Tr::tr("Diff"), + Tr::tr("Show difference.")); mapSetting(diffButton, &settings.logDiff); connect(diffButton, &QAction::toggled, m_patienceButton, &QAction::setVisible); connect(diffButton, &QAction::toggled, m_ignoreWSButton, &QAction::setVisible); m_patienceButton->setVisible(diffButton->isChecked()); m_ignoreWSButton->setVisible(diffButton->isChecked()); - auto filterAction = new QAction(tr("Filter"), toolBar); - filterAction->setToolTip(tr("Filter commits by message or content.")); + auto filterAction = new QAction(Tr::tr("Filter"), toolBar); + filterAction->setToolTip(Tr::tr("Filter commits by message or content.")); filterAction->setCheckable(true); connect(filterAction, &QAction::toggled, editor, &GitEditorWidget::toggleFilters); toolBar->addAction(filterAction); @@ -652,21 +652,21 @@ public: { QAction *firstParentButton = addToggleButton({"-m", "--first-parent"}, - tr("First Parent"), - tr("Follow only the first parent on merge commits.")); + Tr::tr("First Parent"), + Tr::tr("Follow only the first parent on merge commits.")); mapSetting(firstParentButton, &settings.firstParent); - QAction *graphButton = addToggleButton(graphArguments(), tr("Graph"), - tr("Show textual graph log.")); + QAction *graphButton = addToggleButton(graphArguments(), Tr::tr("Graph"), + Tr::tr("Show textual graph log.")); mapSetting(graphButton, &settings.graphLog); QAction *colorButton = addToggleButton(QStringList{colorOption}, - tr("Color"), tr("Use colors in log.")); + Tr::tr("Color"), Tr::tr("Use colors in log.")); mapSetting(colorButton, &settings.colorLog); if (fileRelated) { QAction *followButton = addToggleButton( - "--follow", tr("Follow"), - tr("Show log also for previous names of the file.")); + "--follow", Tr::tr("Follow"), + Tr::tr("Show log also for previous names of the file.")); mapSetting(followButton, &settings.followRenames); } @@ -711,8 +711,8 @@ public: { QAction *showDateButton = addToggleButton("--date=iso", - tr("Show Date"), - tr("Show date instead of sequence.")); + Tr::tr("Show Date"), + Tr::tr("Show date instead of sequence.")); mapSetting(showDateButton, &settings.refLogShowDate); addReloadButton(); @@ -815,17 +815,17 @@ private: static inline QString msgRepositoryNotFound(const FilePath &dir) { - return GitClient::tr("Cannot determine the repository for \"%1\".").arg(dir.toUserOutput()); + return Tr::tr("Cannot determine the repository for \"%1\".").arg(dir.toUserOutput()); } static inline QString msgParseFilesFailed() { - return GitClient::tr("Cannot parse the file output."); + return Tr::tr("Cannot parse the file output."); } static QString msgCannotLaunch(const FilePath &binary) { - return GitClient::tr("Cannot launch \"%1\".").arg(binary.toUserOutput()); + return Tr::tr("Cannot launch \"%1\".").arg(binary.toUserOutput()); } static inline void msgCannotRun(const QString &message, QString *errorMessage) @@ -839,7 +839,7 @@ static inline void msgCannotRun(const QString &message, QString *errorMessage) static inline void msgCannotRun(const QStringList &args, const FilePath &workingDirectory, const QString &error, QString *errorMessage) { - const QString message = GitClient::tr("Cannot run \"%1\" in \"%2\": %3") + const QString message = Tr::tr("Cannot run \"%1\" in \"%2\": %3") .arg("git " + args.join(' '), workingDirectory.toUserOutput(), error); @@ -963,25 +963,25 @@ void GitClient::chunkActionsRequested(DiffEditor::DiffEditorController *controll }; menu->addSeparator(); - QAction *stageChunkAction = menu->addAction(tr("Stage Chunk")); + QAction *stageChunkAction = menu->addAction(Tr::tr("Stage Chunk")); connect(stageChunkAction, &QAction::triggered, this, [stageChunk, diffController, fileIndex, chunkIndex] { stageChunk(diffController, fileIndex, chunkIndex, DiffEditorController::NoOption, DiffEditor::ChunkSelection()); }); - QAction *stageLinesAction = menu->addAction(tr("Stage Selection (%n Lines)", "", selection.selectedRowsCount())); + QAction *stageLinesAction = menu->addAction(Tr::tr("Stage Selection (%n Lines)", "", selection.selectedRowsCount())); connect(stageLinesAction, &QAction::triggered, this, [stageChunk, diffController, fileIndex, chunkIndex, selection] { stageChunk(diffController, fileIndex, chunkIndex, DiffEditorController::NoOption, selection); }); - QAction *unstageChunkAction = menu->addAction(tr("Unstage Chunk")); + QAction *unstageChunkAction = menu->addAction(Tr::tr("Unstage Chunk")); connect(unstageChunkAction, &QAction::triggered, this, [stageChunk, diffController, fileIndex, chunkIndex] { stageChunk(diffController, fileIndex, chunkIndex, DiffEditorController::Revert, DiffEditor::ChunkSelection()); }); - QAction *unstageLinesAction = menu->addAction(tr("Unstage Selection (%n Lines)", "", selection.selectedRowsCount())); + QAction *unstageLinesAction = menu->addAction(Tr::tr("Unstage Selection (%n Lines)", "", selection.selectedRowsCount())); connect(unstageLinesAction, &QAction::triggered, this, [stageChunk, diffController, fileIndex, chunkIndex, selection] { stageChunk(diffController, fileIndex, chunkIndex, @@ -1022,9 +1022,9 @@ void GitClient::stage(DiffEditor::DiffEditorController *diffController, &errorMessage, args)) { if (errorMessage.isEmpty()) { if (revert) - VcsOutputWindow::appendSilently(tr("Chunk successfully unstaged")); + VcsOutputWindow::appendSilently(Tr::tr("Chunk successfully unstaged")); else - VcsOutputWindow::appendSilently(tr("Chunk successfully staged")); + VcsOutputWindow::appendSilently(Tr::tr("Chunk successfully staged")); } else { VcsOutputWindow::appendError(errorMessage); } @@ -1069,7 +1069,7 @@ void GitClient::diffFiles(const FilePath &workingDirectory, const QString documentId = QLatin1String(Constants::GIT_PLUGIN) + QLatin1String(".DiffFiles.") + workingDirectory.toString(); requestReload(documentId, - workingDirectory.toString(), tr("Git Diff Files"), workingDirectory, + workingDirectory.toString(), Tr::tr("Git Diff Files"), workingDirectory, [stagedFileNames, unstagedFileNames](IDocument *doc) { return new FileListDiffController(doc, stagedFileNames, unstagedFileNames); }); @@ -1080,7 +1080,7 @@ void GitClient::diffProject(const FilePath &workingDirectory, const QString &pro const QString documentId = QLatin1String(Constants::GIT_PLUGIN) + QLatin1String(".DiffProject.") + workingDirectory.toString(); requestReload(documentId, - workingDirectory.toString(), tr("Git Diff Project"), workingDirectory, + workingDirectory.toString(), Tr::tr("Git Diff Project"), workingDirectory, [projectDirectory](IDocument *doc){ return new GitDiffEditorController(doc, {}, {}, {"--", projectDirectory}); }); @@ -1092,7 +1092,7 @@ void GitClient::diffRepository(const FilePath &workingDirectory, { const QString documentId = QLatin1String(Constants::GIT_PLUGIN) + QLatin1String(".DiffRepository.") + workingDirectory.toString(); - requestReload(documentId, workingDirectory.toString(), tr("Git Diff Repository"), workingDirectory, + requestReload(documentId, workingDirectory.toString(), Tr::tr("Git Diff Repository"), workingDirectory, [&leftCommit, &rightCommit](IDocument *doc) { return new GitDiffEditorController(doc, leftCommit, rightCommit, {}); }); @@ -1100,7 +1100,7 @@ void GitClient::diffRepository(const FilePath &workingDirectory, void GitClient::diffFile(const FilePath &workingDirectory, const QString &fileName) const { - const QString title = tr("Git Diff \"%1\"").arg(fileName); + const QString title = Tr::tr("Git Diff \"%1\"").arg(fileName); const QString sourceFile = VcsBaseEditor::getSource(workingDirectory, fileName); const QString documentId = QLatin1String(Constants::GIT_PLUGIN) + QLatin1String(".DifFile.") + sourceFile; @@ -1112,7 +1112,7 @@ void GitClient::diffFile(const FilePath &workingDirectory, const QString &fileNa void GitClient::diffBranch(const FilePath &workingDirectory, const QString &branchName) const { - const QString title = tr("Git Diff Branch \"%1\"").arg(branchName); + const QString title = Tr::tr("Git Diff Branch \"%1\"").arg(branchName); const QString documentId = QLatin1String(Constants::GIT_PLUGIN) + QLatin1String(".DiffBranch.") + branchName; requestReload(documentId, workingDirectory.toString(), title, workingDirectory, @@ -1169,7 +1169,7 @@ void GitClient::log(const FilePath &workingDirectory, const QString &fileName, msgArg = workingDirectory.toString(); // Creating document might change the referenced workingDirectory. Store a copy and use it. const FilePath workingDir = workingDirectory; - const QString title = tr("Git Log \"%1\"").arg(msgArg); + const QString title = Tr::tr("Git Log \"%1\"").arg(msgArg); const Id editorId = Git::Constants::GIT_LOG_EDITOR_ID; const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName); GitEditorWidget *editor = static_cast( @@ -1224,7 +1224,7 @@ void GitClient::log(const FilePath &workingDirectory, const QString &fileName, void GitClient::reflog(const FilePath &workingDirectory, const QString &ref) { - const QString title = tr("Git Reflog \"%1\"").arg(workingDirectory.toUserOutput()); + const QString title = Tr::tr("Git Reflog \"%1\"").arg(workingDirectory.toUserOutput()); const Id editorId = Git::Constants::GIT_REFLOG_EDITOR_ID; // Creating document might change the referenced workingDirectory. Store a copy and use it. const FilePath workingDir = workingDirectory; @@ -1259,7 +1259,7 @@ static inline bool canShow(const QString &sha) static inline QString msgCannotShow(const QString &sha) { - return GitClient::tr("Cannot describe \"%1\".").arg(sha); + return Tr::tr("Cannot describe \"%1\".").arg(sha); } void GitClient::show(const QString &source, const QString &id, const QString &name) @@ -1269,7 +1269,7 @@ void GitClient::show(const QString &source, const QString &id, const QString &na return; } - const QString title = tr("Git Show \"%1\"").arg(name.isEmpty() ? id : name); + const QString title = Tr::tr("Git Show \"%1\"").arg(name.isEmpty() ? id : name); const QFileInfo sourceFi(source); FilePath workingDirectory = FilePath::fromString( sourceFi.isDir() ? sourceFi.absoluteFilePath() : sourceFi.absolutePath()); @@ -1309,7 +1309,7 @@ void GitClient::archive(const FilePath &workingDirectory, QString commit) FilePath archiveName = FileUtils::getSaveFilePath( nullptr, - tr("Generate %1 archive").arg(repoName), + Tr::tr("Generate %1 archive").arg(repoName), repoDirectory.pathAppended(QString("../%1-%2").arg(repoName).arg(commit.left(8))), filters.keys().join(";;"), &selectedFilter); @@ -1322,8 +1322,8 @@ void GitClient::archive(const FilePath &workingDirectory, QString commit) } if (archive.exists()) { - if (QMessageBox::warning(ICore::dialogParent(), tr("Overwrite?"), - tr("An item named \"%1\" already exists at this location. " + if (QMessageBox::warning(ICore::dialogParent(), Tr::tr("Overwrite?"), + Tr::tr("An item named \"%1\" already exists at this location. " "Do you want to overwrite it?").arg(QDir::toNativeSeparators(archive.absoluteFilePath())), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) { return; @@ -1339,7 +1339,7 @@ VcsBaseEditorWidget *GitClient::annotate( { const Id editorId = Git::Constants::GIT_BLAME_EDITOR_ID; const QString id = VcsBaseEditor::getTitleId(workingDir, {file}, revision); - const QString title = tr("Git Blame \"%1\"").arg(id); + const QString title = Tr::tr("Git Blame \"%1\"").arg(id); const QString sourceFile = VcsBaseEditor::getSource(workingDir, file); VcsBaseEditorWidget *editor @@ -1397,8 +1397,8 @@ QStringList GitClient::setupCheckoutArguments(const FilePath &workingDirectory, if (Utils::CheckableMessageBox::doNotAskAgainQuestion( ICore::dialogParent() /*parent*/, - tr("Create Local Branch") /*title*/, - tr("Would you like to create a local branch?") /*message*/, + Tr::tr("Create Local Branch") /*title*/, + Tr::tr("Would you like to create a local branch?") /*message*/, ICore::settings(), "Git.CreateLocalBranchOnCheckout" /*setting*/, QDialogButtonBox::Yes | QDialogButtonBox::No /*buttons*/, QDialogButtonBox::No /*default button*/, @@ -1468,8 +1468,8 @@ void GitClient::reset(const FilePath &workingDirectory, const QString &argument, if (argument == "--hard") { if (gitStatus(workingDirectory, StatusMode(NoUntracked | NoSubmodules)) != StatusUnchanged) { if (QMessageBox::question( - Core::ICore::dialogParent(), tr("Reset"), - tr("All changes in working directory will be discarded. Are you sure?"), + Core::ICore::dialogParent(), Tr::tr("Reset"), + Tr::tr("All changes in working directory will be discarded. Are you sure?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) { return; @@ -1500,12 +1500,12 @@ void GitClient::recoverDeletedFiles(const FilePath &workingDirectory) if (result.result() == ProcessResult::FinishedWithSuccess) { const QString stdOut = result.cleanedStdOut().trimmed(); if (stdOut.isEmpty()) { - VcsOutputWindow::appendError(tr("Nothing to recover")); + VcsOutputWindow::appendError(Tr::tr("Nothing to recover")); return; } const QStringList files = stdOut.split('\n'); synchronousCheckoutFiles(workingDirectory, files, QString(), nullptr, false); - VcsOutputWindow::append(tr("Files recovered"), VcsOutputWindow::Message); + VcsOutputWindow::append(Tr::tr("Files recovered"), VcsOutputWindow::Message); } } @@ -1527,7 +1527,7 @@ bool GitClient::synchronousLog(const FilePath &workingDirectory, const QStringLi *output = result.cleanedStdOut(); return true; } - msgCannotRun(tr("Cannot obtain log of \"%1\": %2") + msgCannotRun(Tr::tr("Cannot obtain log of \"%1\": %2") .arg(workingDirectory.toUserOutput(), result.cleanedStdErr()), errorMessageIn); return false; } @@ -1583,7 +1583,7 @@ bool GitClient::synchronousReset(const FilePath &workingDirectory, if (files.isEmpty()) { msgCannotRun(arguments, workingDirectory, result.cleanedStdErr(), errorMessage); } else { - msgCannotRun(tr("Cannot reset %n files in \"%1\": %2", nullptr, files.size()) + msgCannotRun(Tr::tr("Cannot reset %n files in \"%1\": %2", nullptr, files.size()) .arg(workingDirectory.toUserOutput(), result.cleanedStdErr()), errorMessage); } @@ -1629,24 +1629,24 @@ bool GitClient::synchronousCheckoutFiles(const FilePath &workingDirectory, QStri const QString fileArg = files.join(", "); //: Meaning of the arguments: %1: revision, %2: files, %3: repository, //: %4: Error message - msgCannotRun(tr("Cannot checkout \"%1\" of %2 in \"%3\": %4") + msgCannotRun(Tr::tr("Cannot checkout \"%1\" of %2 in \"%3\": %4") .arg(revision, fileArg, workingDirectory.toUserOutput(), result.cleanedStdErr()), errorMessage); return false; } -static inline QString msgParentRevisionFailed(const FilePath &workingDirectory, +static QString msgParentRevisionFailed(const FilePath &workingDirectory, const QString &revision, const QString &why) { //: Failed to find parent revisions of a SHA1 for "annotate previous" - return GitClient::tr("Cannot find parent revisions of \"%1\" in \"%2\": %3") + return Tr::tr("Cannot find parent revisions of \"%1\" in \"%2\": %3") .arg(revision, workingDirectory.toUserOutput(), why); } -static inline QString msgInvalidRevision() +static QString msgInvalidRevision() { - return GitClient::tr("Invalid revision"); + return Tr::tr("Invalid revision"); } // Split a line of " ..." to obtain parents from "rev-list" or "log". @@ -1816,7 +1816,7 @@ QString GitClient::synchronousTopic(const FilePath &workingDirectory) const if (!stdOut.isEmpty()) return stdOut; } - return tr("Detached HEAD"); + return Tr::tr("Detached HEAD"); } bool GitClient::synchronousRevParseCmd(const FilePath &workingDirectory, const QString &ref, @@ -1869,7 +1869,7 @@ QString GitClient::synchronousShortDescription(const FilePath &workingDirectory, "--max-count=1", revision}; const CommandResult result = vcsSynchronousExec(workingDirectory, arguments, RunFlags::NoOutput); if (result.result() != ProcessResult::FinishedWithSuccess) { - VcsOutputWindow::appendSilently(tr("Cannot describe revision \"%1\" in \"%2\": %3") + VcsOutputWindow::appendSilently(Tr::tr("Cannot describe revision \"%1\" in \"%2\": %3") .arg(revision, workingDirectory.toUserOutput(), result.cleanedStdErr())); return revision; } @@ -1907,7 +1907,7 @@ QString GitClient::synchronousStash(const FilePath &workingDirectory, const QStr do { if ((flags & StashPromptDescription)) { if (!inputText(ICore::dialogParent(), - tr("Stash Description"), tr("Description:"), &message)) + Tr::tr("Stash Description"), Tr::tr("Description:"), &message)) break; } if (!executeSynchronousStash(workingDirectory, message)) @@ -1975,7 +1975,7 @@ bool GitClient::stashNameFromMessage(const FilePath &workingDirectory, } } //: Look-up of a stash via its descriptive message failed. - msgCannotRun(tr("Cannot resolve stash message \"%1\" in \"%2\".") + msgCannotRun(Tr::tr("Cannot resolve stash message \"%1\" in \"%2\".") .arg(message, workingDirectory.toUserOutput()), errorMessage); return false; } @@ -2066,7 +2066,7 @@ QStringList GitClient::synchronousSubmoduleStatus(const FilePath &workingDirecto RunFlags::NoOutput); if (result.result() != ProcessResult::FinishedWithSuccess) { - msgCannotRun(tr("Cannot retrieve submodule status of \"%1\": %2") + msgCannotRun(Tr::tr("Cannot retrieve submodule status of \"%1\": %2") .arg(workingDirectory.toUserOutput(), result.cleanedStdErr()), errorMessage); return {}; } @@ -2208,12 +2208,12 @@ bool GitClient::synchronousApplyPatch(const FilePath &workingDirectory, const QString stdErr = result.cleanedStdErr(); if (result.result() == ProcessResult::FinishedWithSuccess) { if (!stdErr.isEmpty()) - *errorMessage = tr("There were warnings while applying \"%1\" to \"%2\":\n%3") + *errorMessage = Tr::tr("There were warnings while applying \"%1\" to \"%2\":\n%3") .arg(file, workingDirectory.toUserOutput(), stdErr); return true; } - *errorMessage = tr("Cannot apply patch \"%1\" to \"%2\": %3") + *errorMessage = Tr::tr("Cannot apply patch \"%1\" to \"%2\": %3") .arg(QDir::toNativeSeparators(file), workingDirectory.toUserOutput(), stdErr); return false; } @@ -2289,8 +2289,8 @@ void GitClient::updateSubmodulesIfNeeded(const FilePath &workingDirectory, bool if (!updateNeeded) return; - if (prompt && QMessageBox::question(ICore::dialogParent(), tr("Submodules Found"), - tr("Would you like to update submodules?"), + if (prompt && QMessageBox::question(ICore::dialogParent(), Tr::tr("Submodules Found"), + Tr::tr("Would you like to update submodules?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) { return; } @@ -2350,7 +2350,7 @@ GitClient::StatusResult GitClient::gitStatus(const FilePath &workingDirectory, S // Is it something really fatal? if (!statusRc && !branchKnown) { if (errorMessage) { - *errorMessage = tr("Cannot obtain status: %1").arg(result.cleanedStdErr()); + *errorMessage = Tr::tr("Cannot obtain status: %1").arg(result.cleanedStdErr()); } return StatusFailed; } @@ -2368,13 +2368,13 @@ QString GitClient::commandInProgressDescription(const FilePath &workingDirectory break; case Rebase: case RebaseMerge: - return tr("REBASING"); + return Tr::tr("REBASING"); case Revert: - return tr("REVERTING"); + return Tr::tr("REVERTING"); case CherryPick: - return tr("CHERRY-PICKING"); + return Tr::tr("CHERRY-PICKING"); case Merge: - return tr("MERGING"); + return Tr::tr("MERGING"); } return QString(); } @@ -2409,24 +2409,24 @@ void GitClient::continueCommandIfNeeded(const FilePath &workingDirectory, bool a switch (command) { case Rebase: case RebaseMerge: - continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"), - tr("Rebase is in progress. What do you want to do?"), - tr("Continue"), "rebase", continueMode); + continuePreviousGitCommand(workingDirectory, Tr::tr("Continue Rebase"), + Tr::tr("Rebase is in progress. What do you want to do?"), + Tr::tr("Continue"), "rebase", continueMode); break; case Merge: - continuePreviousGitCommand(workingDirectory, tr("Continue Merge"), - tr("You need to commit changes to finish merge.\nCommit now?"), - tr("Commit"), "merge", continueMode); + continuePreviousGitCommand(workingDirectory, Tr::tr("Continue Merge"), + Tr::tr("You need to commit changes to finish merge.\nCommit now?"), + Tr::tr("Commit"), "merge", continueMode); break; case Revert: - continuePreviousGitCommand(workingDirectory, tr("Continue Revert"), - tr("You need to commit changes to finish revert.\nCommit now?"), - tr("Commit"), "revert", continueMode); + continuePreviousGitCommand(workingDirectory, Tr::tr("Continue Revert"), + Tr::tr("You need to commit changes to finish revert.\nCommit now?"), + Tr::tr("Commit"), "revert", continueMode); break; case CherryPick: - continuePreviousGitCommand(workingDirectory, tr("Continue Cherry-Picking"), - tr("You need to commit changes to finish cherry-picking.\nCommit now?"), - tr("Commit"), "cherry-pick", continueMode); + continuePreviousGitCommand(workingDirectory, Tr::tr("Continue Cherry-Picking"), + Tr::tr("You need to commit changes to finish cherry-picking.\nCommit now?"), + Tr::tr("Commit"), "cherry-pick", continueMode); break; default: break; @@ -2448,7 +2448,7 @@ void GitClient::continuePreviousGitCommand(const FilePath &workingDirectory, hasChanges = gitStatus(workingDirectory, StatusMode(NoUntracked | NoSubmodules)) == GitClient::StatusChanged; if (!hasChanges) - msgBoxText.prepend(tr("No changes found.") + ' '); + msgBoxText.prepend(Tr::tr("No changes found.") + ' '); break; case SkipOnly: hasChanges = false; @@ -2458,7 +2458,7 @@ void GitClient::continuePreviousGitCommand(const FilePath &workingDirectory, QMessageBox msgBox(QMessageBox::Question, msgBoxTitle, msgBoxText, QMessageBox::NoButton, ICore::dialogParent()); if (hasChanges || isRebase) - msgBox.addButton(hasChanges ? buttonName : tr("Skip"), QMessageBox::AcceptRole); + msgBox.addButton(hasChanges ? buttonName : Tr::tr("Skip"), QMessageBox::AcceptRole); msgBox.addButton(QMessageBox::Abort); msgBox.addButton(QMessageBox::Ignore); switch (msgBox.exec()) { @@ -2485,7 +2485,7 @@ QStringList GitClient::synchronousRepositoryBranches(const QString &repositoryUR {"ls-remote", repositoryURL, HEAD, "refs/heads/*"}, RunFlags::SuppressStdErr | RunFlags::SuppressFailMessage); QStringList branches; - branches << tr(""); + branches << Tr::tr(""); QString headSha; // split "82bfad2f51d34e98b18982211c82220b8db049brefs/heads/master" bool headFound = false; @@ -2712,7 +2712,7 @@ bool GitClient::readDataFromCommit(const FilePath &repoDirectory, const QString if (result.result() != ProcessResult::FinishedWithSuccess) { if (errorMessage) { - *errorMessage = tr("Cannot retrieve last commit data of repository \"%1\".") + *errorMessage = Tr::tr("Cannot retrieve last commit data of repository \"%1\".") .arg(repoDirectory.toUserOutput()); } return false; @@ -2748,7 +2748,7 @@ bool GitClient::getCommitData(const FilePath &workingDirectory, QString gitDir = findGitDirForRepository(repoDirectory); if (gitDir.isEmpty()) { - *errorMessage = tr("The repository \"%1\" is not initialized.").arg(repoDirectory.toString()); + *errorMessage = Tr::tr("The repository \"%1\" is not initialized.").arg(repoDirectory.toString()); return false; } @@ -2880,10 +2880,10 @@ bool GitClient::getCommitData(const FilePath &workingDirectory, static inline QString msgCommitted(const QString &amendSHA1, int fileCount) { if (amendSHA1.isEmpty()) - return GitClient::tr("Committed %n files.", nullptr, fileCount); + return Tr::tr("Committed %n files.", nullptr, fileCount); if (fileCount) - return GitClient::tr("Amended \"%1\" (%n files).", nullptr, fileCount).arg(amendSHA1); - return GitClient::tr("Amended \"%1\".").arg(amendSHA1); + return Tr::tr("Amended \"%1\" (%n files).", nullptr, fileCount).arg(amendSHA1); + return Tr::tr("Amended \"%1\".").arg(amendSHA1); } bool GitClient::addAndCommit(const FilePath &repositoryDirectory, @@ -2973,7 +2973,7 @@ bool GitClient::addAndCommit(const FilePath &repositoryDirectory, GitPlugin::updateCurrentBranch(); return true; } - VcsOutputWindow::appendError(tr("Cannot commit %n files\n", nullptr, commitCount)); + VcsOutputWindow::appendError(Tr::tr("Cannot commit %n files\n", nullptr, commitCount)); return false; } @@ -3047,8 +3047,8 @@ GitClient::RevertResult GitClient::revertI(QStringList files, // Ask to revert (to do: Handle lists with a selection dialog) const QMessageBox::StandardButton answer = QMessageBox::question(ICore::dialogParent(), - tr("Revert"), - tr("The file has been changed. Do you want to revert it?"), + Tr::tr("Revert"), + Tr::tr("The file has been changed. Do you want to revert it?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) @@ -3077,7 +3077,7 @@ void GitClient::revertFiles(const QStringList &files, bool revertStaging) case RevertCanceled: break; case RevertUnchanged: { - const QString msg = (isDirectory || files.size() > 1) ? msgNoChangedFiles() : tr("The file is not modified."); + const QString msg = (isDirectory || files.size() > 1) ? msgNoChangedFiles() : Tr::tr("The file is not modified."); VcsOutputWindow::appendWarning(msg); } break; @@ -3174,7 +3174,7 @@ void GitClient::handleMergeConflicts(const FilePath &workingDir, const QString & { QString message; if (!commit.isEmpty()) { - message = tr("Conflicts detected with commit %1.").arg(commit); + message = Tr::tr("Conflicts detected with commit %1.").arg(commit); } else if (!files.isEmpty()) { QString fileList; QStringList partialFiles = files; @@ -3183,23 +3183,23 @@ void GitClient::handleMergeConflicts(const FilePath &workingDir, const QString & fileList = partialFiles.join('\n'); if (partialFiles.count() != files.count()) fileList += "\n..."; - message = tr("Conflicts detected with files:\n%1").arg(fileList); + message = Tr::tr("Conflicts detected with files:\n%1").arg(fileList); } else { - message = tr("Conflicts detected."); + message = Tr::tr("Conflicts detected."); } - QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message, + QMessageBox mergeOrAbort(QMessageBox::Question, Tr::tr("Conflicts Detected"), message, QMessageBox::NoButton, ICore::dialogParent()); - QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"), + QPushButton *mergeToolButton = mergeOrAbort.addButton(Tr::tr("Run &Merge Tool"), QMessageBox::AcceptRole); const QString mergeTool = readConfigValue(workingDir, "merge.tool"); if (mergeTool.isEmpty() || mergeTool.startsWith("vimdiff")) { mergeToolButton->setEnabled(false); - mergeToolButton->setToolTip(tr("Only graphical merge tools are supported. " + mergeToolButton->setToolTip(Tr::tr("Only graphical merge tools are supported. " "Please configure merge.tool.")); } mergeOrAbort.addButton(QMessageBox::Ignore); if (abortCommand == "rebase") - mergeOrAbort.addButton(tr("&Skip"), QMessageBox::RejectRole); + mergeOrAbort.addButton(Tr::tr("&Skip"), QMessageBox::RejectRole); if (!abortCommand.isEmpty()) mergeOrAbort.addButton(QMessageBox::Abort); switch (mergeOrAbort.exec()) { @@ -3236,7 +3236,7 @@ void GitClient::subversionLog(const FilePath &workingDirectory) const arguments << ("--limit=" + QString::number(logCount)); // Create a command editor, no highlighting or interaction. - const QString title = tr("Git SVN Log"); + const QString title = Tr::tr("Git SVN Log"); const Id editorId = Git::Constants::GIT_SVN_LOG_EDITOR_ID; const QString sourceFile = VcsBaseEditor::getSource(workingDirectory, QStringList()); VcsBaseEditorWidget *editor = createVcsEditor(editorId, title, sourceFile, codecFor(CodecNone), @@ -3274,8 +3274,8 @@ public: if (pushFailure == NonFastForward) { const QColor warnColor = Utils::creatorTheme()->color(Theme::TextColorError); if (QMessageBox::question( - Core::ICore::dialogParent(), tr("Force Push"), - tr("Push failed. Would you like to force-push " + Core::ICore::dialogParent(), Tr::tr("Force Push"), + Tr::tr("Push failed. Would you like to force-push " "(rewrites remote history)?") .arg(QString::number(warnColor.rgba(), 16)), QMessageBox::Yes | QMessageBox::No, @@ -3293,8 +3293,8 @@ public: } // NoRemoteBranch case if (QMessageBox::question( - Core::ICore::dialogParent(), tr("No Upstream Branch"), - tr("Push failed because the local branch \"%1\" " + Core::ICore::dialogParent(), Tr::tr("No Upstream Branch"), + Tr::tr("Push failed because the local branch \"%1\" " "does not have an upstream branch on the remote.\n\n" "Would you like to create the branch \"%1\" on the " "remote and set it as upstream?") @@ -3364,7 +3364,7 @@ bool GitClient::canRebase(const FilePath &workingDirectory) const if (QFileInfo::exists(gitDir + "/rebase-apply") || QFileInfo::exists(gitDir + "/rebase-merge")) { VcsOutputWindow::appendError( - tr("Rebase, merge or am is in progress. Finish " + Tr::tr("Rebase, merge or am is in progress. Finish " "or abort it and then try again.")); return false; } @@ -3450,12 +3450,12 @@ void GitClient::interactiveRebase(const FilePath &workingDirectory, const QStrin QString GitClient::msgNoChangedFiles() { - return tr("There are no modified files."); + return Tr::tr("There are no modified files."); } QString GitClient::msgNoCommits(bool includeRemote) { - return includeRemote ? tr("No commits were found") : tr("No local commits were found"); + return includeRemote ? Tr::tr("No commits were found") : Tr::tr("No local commits were found"); } void GitClient::stashPop(const FilePath &workingDirectory, const QString &stash) @@ -3641,31 +3641,31 @@ bool GitClient::StashInfo::init(const FilePath &workingDirectory, const QString void GitClient::StashInfo::stashPrompt(const QString &command, const QString &statusOutput, QString *errorMessage) { - QMessageBox msgBox(QMessageBox::Question, tr("Uncommitted Changes Found"), - tr("What would you like to do with local changes in:") + "\n\n\"" + QMessageBox msgBox(QMessageBox::Question, Tr::tr("Uncommitted Changes Found"), + Tr::tr("What would you like to do with local changes in:") + "\n\n\"" + m_workingDir.toUserOutput() + '\"', QMessageBox::NoButton, ICore::dialogParent()); msgBox.setDetailedText(statusOutput); - QPushButton *stashAndPopButton = msgBox.addButton(tr("Stash && &Pop"), QMessageBox::AcceptRole); - stashAndPopButton->setToolTip(tr("Stash local changes and pop when %1 finishes.").arg(command)); + QPushButton *stashAndPopButton = msgBox.addButton(Tr::tr("Stash && &Pop"), QMessageBox::AcceptRole); + stashAndPopButton->setToolTip(Tr::tr("Stash local changes and pop when %1 finishes.").arg(command)); - QPushButton *stashButton = msgBox.addButton(tr("&Stash"), QMessageBox::AcceptRole); - stashButton->setToolTip(tr("Stash local changes and execute %1.").arg(command)); + QPushButton *stashButton = msgBox.addButton(Tr::tr("&Stash"), QMessageBox::AcceptRole); + stashButton->setToolTip(Tr::tr("Stash local changes and execute %1.").arg(command)); - QPushButton *discardButton = msgBox.addButton(tr("&Discard"), QMessageBox::AcceptRole); - discardButton->setToolTip(tr("Discard (reset) local changes and execute %1.").arg(command)); + QPushButton *discardButton = msgBox.addButton(Tr::tr("&Discard"), QMessageBox::AcceptRole); + discardButton->setToolTip(Tr::tr("Discard (reset) local changes and execute %1.").arg(command)); QPushButton *ignoreButton = nullptr; if (m_flags & AllowUnstashed) { ignoreButton = msgBox.addButton(QMessageBox::Ignore); - ignoreButton->setToolTip(tr("Execute %1 with local changes in working directory.") + ignoreButton->setToolTip(Tr::tr("Execute %1 with local changes in working directory.") .arg(command)); } QPushButton *cancelButton = msgBox.addButton(QMessageBox::Cancel); - cancelButton->setToolTip(tr("Cancel %1.").arg(command)); + cancelButton->setToolTip(Tr::tr("Cancel %1.").arg(command)); msgBox.exec(); @@ -3760,22 +3760,22 @@ void GitClient::addChangeActions(QMenu *menu, const QString &source, const QStri QTC_ASSERT(!change.isEmpty(), return); const FilePath &workingDir = fileWorkingDirectory(source); const bool isRange = change.contains(".."); - menu->addAction(tr("Cherr&y-Pick %1").arg(change), [workingDir, change] { + menu->addAction(Tr::tr("Cherr&y-Pick %1").arg(change), [workingDir, change] { m_instance->synchronousCherryPick(workingDir, change); }); - menu->addAction(tr("Re&vert %1").arg(change), [workingDir, change] { + menu->addAction(Tr::tr("Re&vert %1").arg(change), [workingDir, change] { m_instance->synchronousRevert(workingDir, change); }); if (!isRange) { - menu->addAction(tr("C&heckout %1").arg(change), [workingDir, change] { + menu->addAction(Tr::tr("C&heckout %1").arg(change), [workingDir, change] { m_instance->checkout(workingDir, change); }); - connect(menu->addAction(tr("&Interactive Rebase from %1...").arg(change)), + connect(menu->addAction(Tr::tr("&Interactive Rebase from %1...").arg(change)), &QAction::triggered, [workingDir, change] { GitPlugin::startRebaseFromCommit(workingDir, change); }); } - QAction *logAction = menu->addAction(tr("&Log for %1").arg(change), [workingDir, change] { + QAction *logAction = menu->addAction(Tr::tr("&Log for %1").arg(change), [workingDir, change] { m_instance->log(workingDir, QString(), false, {change}); }); if (isRange) { @@ -3783,12 +3783,12 @@ void GitClient::addChangeActions(QMenu *menu, const QString &source, const QStri } else { const FilePath filePath = FilePath::fromString(source); if (!filePath.isDir()) { - menu->addAction(tr("Sh&ow file \"%1\" on revision %2").arg(filePath.fileName()).arg(change), + menu->addAction(Tr::tr("Sh&ow file \"%1\" on revision %2").arg(filePath.fileName()).arg(change), [workingDir, change, source] { m_instance->openShowEditor(workingDir, change, source); }); } - menu->addAction(tr("Add &Tag for %1...").arg(change), [workingDir, change] { + menu->addAction(Tr::tr("Add &Tag for %1...").arg(change), [workingDir, change] { QString output; QString errorMessage; m_instance->synchronousTagCmd(workingDir, QStringList(), &output, &errorMessage); @@ -3809,26 +3809,26 @@ void GitClient::addChangeActions(QMenu *menu, const QString &source, const QStri auto resetChange = [workingDir, change](const QByteArray &resetType) { m_instance->reset(workingDir, QLatin1String("--" + resetType), change); }; - auto resetMenu = new QMenu(tr("&Reset to Change %1").arg(change), menu); - resetMenu->addAction(tr("&Hard"), std::bind(resetChange, "hard")); - resetMenu->addAction(tr("&Mixed"), std::bind(resetChange, "mixed")); - resetMenu->addAction(tr("&Soft"), std::bind(resetChange, "soft")); + auto resetMenu = new QMenu(Tr::tr("&Reset to Change %1").arg(change), menu); + resetMenu->addAction(Tr::tr("&Hard"), std::bind(resetChange, "hard")); + resetMenu->addAction(Tr::tr("&Mixed"), std::bind(resetChange, "mixed")); + resetMenu->addAction(Tr::tr("&Soft"), std::bind(resetChange, "soft")); menu->addMenu(resetMenu); } - menu->addAction((isRange ? tr("Di&ff %1") : tr("Di&ff Against %1")).arg(change), + menu->addAction((isRange ? Tr::tr("Di&ff %1") : Tr::tr("Di&ff Against %1")).arg(change), [workingDir, change] { m_instance->diffRepository(workingDir, change, {}); }); if (!isRange) { if (!m_instance->m_diffCommit.isEmpty()) { - menu->addAction(tr("Diff &Against Saved %1").arg(m_instance->m_diffCommit), + menu->addAction(Tr::tr("Diff &Against Saved %1").arg(m_instance->m_diffCommit), [workingDir, change] { m_instance->diffRepository(workingDir, m_instance->m_diffCommit, change); m_instance->m_diffCommit.clear(); }); } - menu->addAction(tr("&Save for Diff"), [change] { + menu->addAction(Tr::tr("&Save for Diff"), [change] { m_instance->m_diffCommit = change; }); } @@ -3868,7 +3868,7 @@ IEditor *GitClient::openShowEditor(const FilePath &workingDirectory, const QStri const QString documentId = QLatin1String(Git::Constants::GIT_PLUGIN) + QLatin1String(".GitShow.") + topLevelString + QLatin1String(".") + relativePath; - QString title = tr("Git Show %1:%2").arg(ref).arg(relativePath); + QString title = Tr::tr("Git Show %1:%2").arg(ref).arg(relativePath); IEditor *editor = EditorManager::openEditorWithContents(Id(), &title, content, documentId, EditorManager::DoNotSwitchToDesignMode); editor->document()->setTemporary(true); @@ -3876,7 +3876,6 @@ IEditor *GitClient::openShowEditor(const FilePath &workingDirectory, const QStri return editor; } -} // namespace Internal -} // namespace Git +} // Git::Internal #include "gitclient.moc" diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index dae7d19194d..6ff835d0b99 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -37,8 +37,7 @@ class VcsBaseEditorWidget; class VcsCommand; } -namespace Git { -namespace Internal { +namespace Git::Internal { class CommitData; class GitBaseDiffEditorController; @@ -80,8 +79,6 @@ public: class GITSHARED_EXPORT GitClient : public VcsBase::VcsBaseClientImpl { - Q_OBJECT - public: enum CommandInProgress { NoCommand, Revert, CherryPick, Rebase, Merge, RebaseMerge }; @@ -406,5 +403,4 @@ public: GitRemote(const QString &location); }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index 305d4f1198c..415d1622983 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -5,9 +5,10 @@ #include "annotationhighlighter.h" #include "gitclient.h" -#include "gitsettings.h" #include "gitconstants.h" #include "githighlighters.h" +#include "gitsettings.h" +#include "gittr.h" #include #include @@ -34,40 +35,37 @@ using namespace Core; using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { class GitLogFilterWidget : public QToolBar { - Q_DECLARE_TR_FUNCTIONS(Git::Internal::GitLogFilterWidget); - public: GitLogFilterWidget(GitEditorWidget *editor) { auto addLineEdit = [](const QString &placeholder, const QString &tooltip, GitEditorWidget *editor) { - auto lineEdit = new Utils::FancyLineEdit; + auto lineEdit = new FancyLineEdit; lineEdit->setFiltering(true); lineEdit->setToolTip(tooltip); lineEdit->setPlaceholderText(placeholder); lineEdit->setMaximumWidth(200); connect(lineEdit, &QLineEdit::returnPressed, editor, &GitEditorWidget::refresh); - connect(lineEdit, &Utils::FancyLineEdit::rightButtonClicked, + connect(lineEdit, &FancyLineEdit::rightButtonClicked, editor, &GitEditorWidget::refresh); return lineEdit; }; - grepLineEdit = addLineEdit(tr("Filter by message"), - tr("Filter log entries by text in the commit message."), + grepLineEdit = addLineEdit(Tr::tr("Filter by message"), + Tr::tr("Filter log entries by text in the commit message."), editor); - pickaxeLineEdit = addLineEdit(tr("Filter by content"), - tr("Filter log entries by added or removed string."), + pickaxeLineEdit = addLineEdit(Tr::tr("Filter by content"), + Tr::tr("Filter log entries by added or removed string."), editor); - authorLineEdit = addLineEdit(tr("Filter by author"), - tr("Filter log entries by author."), + authorLineEdit = addLineEdit(Tr::tr("Filter by author"), + Tr::tr("Filter log entries by author."), editor); - addWidget(new QLabel(tr("Filter:"))); + addWidget(new QLabel(Tr::tr("Filter:"))); addSeparator(); addWidget(grepLineEdit); addSeparator(); @@ -75,7 +73,7 @@ public: addSeparator(); addWidget(authorLineEdit); addSeparator(); - caseAction = new QAction(tr("Case Sensitive"), this); + caseAction = new QAction(Tr::tr("Case Sensitive"), this); caseAction->setCheckable(true); caseAction->setChecked(true); connect(caseAction, &QAction::toggled, editor, &GitEditorWidget::refresh); @@ -84,9 +82,9 @@ public: connect(editor, &GitEditorWidget::toggleFilters, this, &QWidget::setVisible); } - Utils::FancyLineEdit *grepLineEdit; - Utils::FancyLineEdit *pickaxeLineEdit; - Utils::FancyLineEdit *authorLineEdit; + FancyLineEdit *grepLineEdit; + FancyLineEdit *pickaxeLineEdit; + FancyLineEdit *authorLineEdit; QAction *caseAction; }; @@ -102,8 +100,8 @@ GitEditorWidget::GitEditorWidget() : */ setDiffFilePattern("^(?:diff --git a/|index |[+-]{3} (?:/dev/null|[ab]/(.+$)))"); setLogEntryPattern("^commit ([0-9a-f]{8})[0-9a-f]{32}"); - setAnnotateRevisionTextFormat(tr("&Blame %1")); - setAnnotatePreviousRevisionTextFormat(tr("Blame &Parent Revision %1")); + setAnnotateRevisionTextFormat(Tr::tr("&Blame %1")); + setAnnotatePreviousRevisionTextFormat(Tr::tr("Blame &Parent Revision %1")); setAnnotationEntryPattern("^(" CHANGE_PATTERN ") "); } @@ -189,9 +187,8 @@ void GitEditorWidget::setPlainText(const QString &text) switch (contentType()) { case LogOutput: { - Utils::AnsiEscapeCodeHandler handler; - const QList formattedTextList - = handler.parseText(Utils::FormattedText(text)); + AnsiEscapeCodeHandler handler; + const QList formattedTextList = handler.parseText(FormattedText(text)); clear(); QTextCursor cursor = textCursor(); @@ -215,7 +212,7 @@ void GitEditorWidget::setPlainText(const QString &text) void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, PatchAction patchAction) { - Utils::TemporaryFile patchFile("git-apply-chunk"); + TemporaryFile patchFile("git-apply-chunk"); if (!patchFile.open()) return; @@ -230,7 +227,7 @@ void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, PatchAction patchAc QString errorMessage; if (GitClient::instance()->synchronousApplyPatch(baseDir, patchFile.fileName(), &errorMessage, args)) { if (errorMessage.isEmpty()) - VcsOutputWindow::append(tr("Chunk successfully staged")); + VcsOutputWindow::append(Tr::tr("Chunk successfully staged")); else VcsOutputWindow::append(errorMessage); if (patchAction == PatchAction::Revert) @@ -243,7 +240,7 @@ void GitEditorWidget::applyDiffChunk(const DiffChunk& chunk, PatchAction patchAc void GitEditorWidget::init() { VcsBaseEditorWidget::init(); - Utils::Id editorId = textDocument()->id(); + Id editorId = textDocument()->id(); const bool isCommitEditor = editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID; const bool isRebaseEditor = editorId == Git::Constants::GIT_REBASE_EDITOR_ID; if (!isCommitEditor && !isRebaseEditor) @@ -259,22 +256,21 @@ void GitEditorWidget::addDiffActions(QMenu *menu, const DiffChunk &chunk) { menu->addSeparator(); - QAction *stageAction = menu->addAction(tr("Stage Chunk...")); + QAction *stageAction = menu->addAction(Tr::tr("Stage Chunk...")); connect(stageAction, &QAction::triggered, this, [this, chunk] { applyDiffChunk(chunk, PatchAction::Apply); }); - QAction *unstageAction = menu->addAction(tr("Unstage Chunk...")); + QAction *unstageAction = menu->addAction(Tr::tr("Unstage Chunk...")); connect(unstageAction, &QAction::triggered, this, [this, chunk] { applyDiffChunk(chunk, PatchAction::Revert); }); } -void GitEditorWidget::aboutToOpen(const Utils::FilePath &filePath, - const Utils::FilePath &realFilePath) +void GitEditorWidget::aboutToOpen(const FilePath &filePath, const FilePath &realFilePath) { Q_UNUSED(realFilePath) - Utils::Id editorId = textDocument()->id(); + Id editorId = textDocument()->id(); if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID || editorId == Git::Constants::GIT_REBASE_EDITOR_ID) { const FilePath gitPath = filePath.absolutePath(); @@ -392,5 +388,4 @@ bool GitEditorWidget::caseSensitive() const return m_logFilterWidget && m_logFilterWidget->caseAction->isChecked(); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h index 8c92a6da659..79ec42299ca 100644 --- a/src/plugins/git/giteditor.h +++ b/src/plugins/git/giteditor.h @@ -12,8 +12,7 @@ class FancyLineEdit; class FilePath; } // Utils -namespace Git { -namespace Internal { +namespace Git::Internal { class GitLogFilterWidget; @@ -57,5 +56,4 @@ private: GitLogFilterWidget *m_logFilterWidget = nullptr; }; -} // namespace Git -} // namespace Internal +} // Git::Internal diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index abcea246bf6..1e0fc3f1312 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.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 "gitgrep.h" + #include "gitclient.h" +#include "gittr.h" #include @@ -25,8 +27,13 @@ #include #include -namespace Git { -namespace Internal { +using namespace Core; +using namespace Utils; +using namespace VcsBase; + +namespace Git::Internal { + +const char GitGrepRef[] = "GitGrepRef"; class GitGrepParameters { @@ -36,14 +43,6 @@ public: QString id() const { return recurseSubmodules ? ref + ".Rec" : ref; } }; -using namespace Core; -using namespace Utils; -using namespace VcsBase; - -namespace { - -const char GitGrepRef[] = "GitGrepRef"; - class GitGrepRunner { using FutureInterfaceType = QFutureInterface; @@ -192,8 +191,6 @@ private: Environment m_environment; }; -} // namespace - static bool isGitDirectory(const FilePath &path) { static IVersionControl *gitVc = VcsManager::versionControl(VcsBase::Constants::VCS_ID_GIT); @@ -208,8 +205,8 @@ GitGrep::GitGrep(GitClient *client) auto layout = new QHBoxLayout(m_widget); layout->setContentsMargins(0, 0, 0, 0); m_treeLineEdit = new FancyLineEdit; - m_treeLineEdit->setPlaceholderText(tr("Tree (optional)")); - m_treeLineEdit->setToolTip(tr("Can be HEAD, tag, local or remote branch, or a commit hash.\n" + m_treeLineEdit->setPlaceholderText(Tr::tr("Tree (optional)")); + m_treeLineEdit->setToolTip(Tr::tr("Can be HEAD, tag, local or remote branch, or a commit hash.\n" "Leave empty to search through the file system.")); const QRegularExpression refExpression("[\\S]*"); m_treeLineEdit->setValidator(new QRegularExpressionValidator(refExpression, this)); @@ -219,7 +216,7 @@ GitGrep::GitGrep(GitClient *client) this, [this, pLayout = QPointer(layout)](unsigned version) { if (version >= 0x021300 && pLayout) { - m_recurseSubmodules = new QCheckBox(tr("Recurse submodules")); + m_recurseSubmodules = new QCheckBox(Tr::tr("Recurse submodules")); pLayout->addWidget(m_recurseSubmodules); } }); @@ -240,14 +237,14 @@ GitGrep::~GitGrep() QString GitGrep::title() const { - return tr("Git Grep"); + return Tr::tr("Git Grep"); } QString GitGrep::toolTip() const { const QString ref = m_treeLineEdit->text(); if (!ref.isEmpty()) - return tr("Ref: %1\n%2").arg(ref); + return Tr::tr("Ref: %1\n%2").arg(ref); return QLatin1String("%1"); } @@ -296,7 +293,6 @@ IEditor *GitGrep::openEditor(const SearchResultItem &item, return editor; } -} // Internal -} // Git +} // Git::Internal Q_DECLARE_METATYPE(Git::Internal::GitGrepParameters) diff --git a/src/plugins/git/gitgrep.h b/src/plugins/git/gitgrep.h index 41310c8b65b..405f1bc50f0 100644 --- a/src/plugins/git/gitgrep.h +++ b/src/plugins/git/gitgrep.h @@ -5,24 +5,20 @@ #include -#include - QT_FORWARD_DECLARE_CLASS(QCheckBox); namespace Utils { class FancyLineEdit; } -namespace Git { -namespace Internal { +namespace Git::Internal { class GitClient; class GitGrep : public TextEditor::SearchEngine { - Q_DECLARE_TR_FUNCTIONS(GitGrep) - public: explicit GitGrep(GitClient *client); ~GitGrep() override; + QString title() const override; QString toolTip() const override; QWidget *widget() const override; @@ -42,5 +38,4 @@ private: QCheckBox *m_recurseSubmodules = nullptr; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/githighlighters.cpp b/src/plugins/git/githighlighters.cpp index 3b98221741e..a3b7547f080 100644 --- a/src/plugins/git/githighlighters.cpp +++ b/src/plugins/git/githighlighters.cpp @@ -8,10 +8,9 @@ #include "gitconstants.h" #include "githighlighters.h" -namespace Git { -namespace Internal { +namespace Git::Internal { -static const char CHANGE_PATTERN[] = "\\b[a-f0-9]{7,40}\\b"; +const char CHANGE_PATTERN[] = "\\b[a-f0-9]{7,40}\\b"; GitSubmitHighlighter::GitSubmitHighlighter(QChar commentChar, QTextEdit * parent) : TextEditor::SyntaxHighlighter(parent), @@ -159,5 +158,4 @@ void GitRebaseHighlighter::highlightBlock(const QString &text) formatSpaces(text); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/githighlighters.h b/src/plugins/git/githighlighters.h index 3feb11373bc..81fb8327d88 100644 --- a/src/plugins/git/githighlighters.h +++ b/src/plugins/git/githighlighters.h @@ -7,8 +7,7 @@ #include -namespace Git { -namespace Internal { +namespace Git::Internal { enum Format { Format_Comment, @@ -35,6 +34,7 @@ class GitSubmitHighlighter : public TextEditor::SyntaxHighlighter { public: explicit GitSubmitHighlighter(QChar commentChar = QChar(), QTextEdit *parent = nullptr); + void highlightBlock(const QString &text) override; QChar commentChar() const; void setCommentChar(QChar commentChar); @@ -66,5 +66,4 @@ private: QList m_actions; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 83446e1f04b..4a19145300b 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -9,12 +9,13 @@ #include "gitclient.h" #include "gitconstants.h" #include "giteditor.h" +#include "gitgrep.h" #include "gitsubmiteditor.h" +#include "gittr.h" +#include "gitutils.h" +#include "logchangedialog.h" #include "remotedialog.h" #include "stashdialog.h" -#include "logchangedialog.h" -#include "gitutils.h" -#include "gitgrep.h" #include "gerrit/gerritplugin.h" @@ -80,8 +81,7 @@ using namespace Utils; using namespace VcsBase; using namespace std::placeholders; -namespace Git { -namespace Internal { +namespace Git::Internal { using GitClientMemberFunc = void (GitClient::*)(const FilePath &) const; @@ -242,9 +242,9 @@ public: const FilePath &workingDirectory, const QString &reference) final { - menu->addAction(tr("&Copy \"%1\"").arg(reference), + menu->addAction(Tr::tr("&Copy \"%1\"").arg(reference), [reference] { setClipboardAndSelection(reference); }); - QAction *action = menu->addAction(tr("&Describe Change %1").arg(reference), + QAction *action = menu->addAction(Tr::tr("&Describe Change %1").arg(reference), [=] { vcsDescribe(workingDirectory, reference); }); menu->setDefaultAction(action); GitClient::addChangeActions(menu, workingDirectory.toString(), reference); @@ -457,7 +457,7 @@ void GitPluginPrivate::onApplySettings() m_settings.gitExecutable(&gitFoundOk, &errorMessage); if (!gitFoundOk) { QTimer::singleShot(0, this, [errorMessage] { - AsynchronousMessageBox::warning(tr("Git Settings"), errorMessage); + AsynchronousMessageBox::warning(Tr::tr("Git Settings"), errorMessage); }); } } @@ -498,8 +498,8 @@ const VcsBasePluginState &GitPlugin::currentState() QString GitPlugin::msgRepositoryLabel(const FilePath &repository) { return repository.isEmpty() ? - tr("") : - tr("Repository: %1").arg(repository.toUserOutput()); + Tr::tr("") : + Tr::tr("Repository: %1").arg(repository.toUserOutput()); } // Returns a regular expression pattern with characters not allowed @@ -644,79 +644,79 @@ GitPluginPrivate::GitPluginPrivate() const QString prefix = "git"; m_commandLocator = new CommandLocator("Git", prefix, prefix, this); - m_commandLocator->setDescription(tr("Triggers a Git version control operation.")); + m_commandLocator->setDescription(Tr::tr("Triggers a Git version control operation.")); //register actions ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS); ActionContainer *gitContainer = ActionManager::createMenu("Git"); - gitContainer->menu()->setTitle(tr("&Git")); + gitContainer->menu()->setTitle(Tr::tr("&Git")); toolsContainer->addMenu(gitContainer); m_menuAction = gitContainer->menu()->menuAction(); /* "Current File" menu */ ActionContainer *currentFileMenu = ActionManager::createMenu("Git.CurrentFileMenu"); - currentFileMenu->menu()->setTitle(tr("Current &File")); + currentFileMenu->menu()->setTitle(Tr::tr("Current &File")); gitContainer->addMenu(currentFileMenu); - createFileAction(currentFileMenu, tr("Diff Current File", "Avoid translating \"Diff\""), - tr("Diff of \"%1\"", "Avoid translating \"Diff\""), + createFileAction(currentFileMenu, Tr::tr("Diff Current File", "Avoid translating \"Diff\""), + Tr::tr("Diff of \"%1\"", "Avoid translating \"Diff\""), "Git.Diff", context, true, std::bind(&GitPluginPrivate::diffCurrentFile, this), - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+D") : tr("Alt+G,Alt+D"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+D") : Tr::tr("Alt+G,Alt+D"))); - createFileAction(currentFileMenu, tr("Log Current File", "Avoid translating \"Log\""), - tr("Log of \"%1\"", "Avoid translating \"Log\""), + createFileAction(currentFileMenu, Tr::tr("Log Current File", "Avoid translating \"Log\""), + Tr::tr("Log of \"%1\"", "Avoid translating \"Log\""), "Git.Log", context, true, std::bind(&GitPluginPrivate::logFile, this), - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+L") : tr("Alt+G,Alt+L"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+L") : Tr::tr("Alt+G,Alt+L"))); - createFileAction(currentFileMenu, tr("Blame Current File", "Avoid translating \"Blame\""), - tr("Blame for \"%1\"", "Avoid translating \"Blame\""), + createFileAction(currentFileMenu, Tr::tr("Blame Current File", "Avoid translating \"Blame\""), + Tr::tr("Blame for \"%1\"", "Avoid translating \"Blame\""), "Git.Blame", context, true, std::bind(&GitPluginPrivate::blameFile, this), - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+B") : tr("Alt+G,Alt+B"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+B") : Tr::tr("Alt+G,Alt+B"))); currentFileMenu->addSeparator(context); - createFileAction(currentFileMenu, tr("Stage File for Commit"), tr("Stage \"%1\" for Commit"), + createFileAction(currentFileMenu, Tr::tr("Stage File for Commit"), Tr::tr("Stage \"%1\" for Commit"), "Git.Stage", context, true, std::bind(&GitPluginPrivate::stageFile, this), - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+A") : tr("Alt+G,Alt+A"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+A") : Tr::tr("Alt+G,Alt+A"))); - createFileAction(currentFileMenu, tr("Unstage File from Commit"), tr("Unstage \"%1\" from Commit"), + createFileAction(currentFileMenu, Tr::tr("Unstage File from Commit"), Tr::tr("Unstage \"%1\" from Commit"), "Git.Unstage", context, true, std::bind(&GitPluginPrivate::unstageFile, this)); - createFileAction(currentFileMenu, tr("Undo Unstaged Changes"), tr("Undo Unstaged Changes for \"%1\""), + createFileAction(currentFileMenu, Tr::tr("Undo Unstaged Changes"), Tr::tr("Undo Unstaged Changes for \"%1\""), "Git.UndoUnstaged", context, true, std::bind(&GitPluginPrivate::undoFileChanges, this, false)); - createFileAction(currentFileMenu, tr("Undo Uncommitted Changes"), tr("Undo Uncommitted Changes for \"%1\""), + createFileAction(currentFileMenu, Tr::tr("Undo Uncommitted Changes"), Tr::tr("Undo Uncommitted Changes for \"%1\""), "Git.Undo", context, true, std::bind(&GitPluginPrivate::undoFileChanges, this, true), - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+U") : tr("Alt+G,Alt+U"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+U") : Tr::tr("Alt+G,Alt+U"))); /* "Current Project" menu */ ActionContainer *currentProjectMenu = ActionManager::createMenu("Git.CurrentProjectMenu"); - currentProjectMenu->menu()->setTitle(tr("Current &Project")); + currentProjectMenu->menu()->setTitle(Tr::tr("Current &Project")); gitContainer->addMenu(currentProjectMenu); - createProjectAction(currentProjectMenu, tr("Diff Current Project", "Avoid translating \"Diff\""), - tr("Diff Project \"%1\"", "Avoid translating \"Diff\""), + createProjectAction(currentProjectMenu, Tr::tr("Diff Current Project", "Avoid translating \"Diff\""), + Tr::tr("Diff Project \"%1\"", "Avoid translating \"Diff\""), "Git.DiffProject", context, true, &GitPluginPrivate::diffCurrentProject, - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+Shift+D") : tr("Alt+G,Alt+Shift+D"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+Shift+D") : Tr::tr("Alt+G,Alt+Shift+D"))); - createProjectAction(currentProjectMenu, tr("Log Project", "Avoid translating \"Log\""), - tr("Log Project \"%1\"", "Avoid translating \"Log\""), + createProjectAction(currentProjectMenu, Tr::tr("Log Project", "Avoid translating \"Log\""), + Tr::tr("Log Project \"%1\"", "Avoid translating \"Log\""), "Git.LogProject", context, true, &GitPluginPrivate::logProject, - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+K") : tr("Alt+G,Alt+K"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+K") : Tr::tr("Alt+G,Alt+K"))); - createProjectAction(currentProjectMenu, tr("Clean Project...", "Avoid translating \"Clean\""), - tr("Clean Project \"%1\"...", "Avoid translating \"Clean\""), + createProjectAction(currentProjectMenu, Tr::tr("Clean Project...", "Avoid translating \"Clean\""), + Tr::tr("Clean Project \"%1\"...", "Avoid translating \"Clean\""), "Git.CleanProject", context, true, &GitPluginPrivate::cleanProject); /* "Local Repository" menu */ ActionContainer *localRepositoryMenu = ActionManager::createMenu("Git.LocalRepositoryMenu"); - localRepositoryMenu->menu()->setTitle(tr("&Local Repository")); + localRepositoryMenu->menu()->setTitle(Tr::tr("&Local Repository")); gitContainer->addMenu(localRepositoryMenu); createRepositoryAction(localRepositoryMenu, "Diff", "Git.DiffRepository", @@ -739,16 +739,16 @@ GitPluginPrivate::GitPluginPrivate() createRepositoryAction(localRepositoryMenu, "Commit...", "Git.Commit", context, true, std::bind(&GitPluginPrivate::startCommit, this, SimpleCommit), - QKeySequence(useMacShortcuts ? tr("Meta+G,Meta+C") : tr("Alt+G,Alt+C"))); + QKeySequence(useMacShortcuts ? Tr::tr("Meta+G,Meta+C") : Tr::tr("Alt+G,Alt+C"))); createRepositoryAction(localRepositoryMenu, - tr("Amend Last Commit...", "Avoid translating \"Commit\""), + Tr::tr("Amend Last Commit...", "Avoid translating \"Commit\""), "Git.AmendCommit", context, true, std::bind(&GitPluginPrivate::startCommit, this, AmendCommit)); m_fixupCommitAction = createRepositoryAction(localRepositoryMenu, - tr("Fixup Previous Commit...", "Avoid translating \"Commit\""), + Tr::tr("Fixup Previous Commit...", "Avoid translating \"Commit\""), "Git.FixupCommit", context, true, std::bind(&GitPluginPrivate::startCommit, this, FixupCommit)); @@ -758,18 +758,18 @@ GitPluginPrivate::GitPluginPrivate() createRepositoryAction(localRepositoryMenu, "Reset...", "Git.Reset", context, true, std::bind(&GitPluginPrivate::resetRepository, this)); - createRepositoryAction(localRepositoryMenu, tr("Recover Deleted Files"), "Git.RecoverDeleted", + createRepositoryAction(localRepositoryMenu, Tr::tr("Recover Deleted Files"), "Git.RecoverDeleted", context, true, std::bind(&GitPluginPrivate::recoverDeletedFiles, this)); m_interactiveRebaseAction = createRepositoryAction(localRepositoryMenu, - tr("Interactive Rebase...", "Avoid translating \"Rebase\""), + Tr::tr("Interactive Rebase...", "Avoid translating \"Rebase\""), "Git.InteractiveRebase", context, true, std::bind(&GitPluginPrivate::startRebase, this)); m_submoduleUpdateAction = createRepositoryAction(localRepositoryMenu, - tr("Update Submodules"), "Git.SubmoduleUpdate", + Tr::tr("Update Submodules"), "Git.SubmoduleUpdate", context, true, std::bind(&GitPluginPrivate::updateSubmodules, this)); auto createAction = [=](const QString &text, Id id, @@ -787,34 +787,34 @@ GitPluginPrivate::GitPluginPrivate() return createRepositoryAction(localRepositoryMenu, text, id, context, true, actionHandler); }; - m_abortMergeAction = createAction(tr("Abort Merge", "Avoid translating \"Merge\""), "Git.MergeAbort", + m_abortMergeAction = createAction(Tr::tr("Abort Merge", "Avoid translating \"Merge\""), "Git.MergeAbort", std::bind(&GitClient::synchronousMerge, &m_gitClient, _1, QString("--abort"), true)); - m_abortRebaseAction = createAction(tr("Abort Rebase", "Avoid translating \"Rebase\""), "Git.RebaseAbort", + m_abortRebaseAction = createAction(Tr::tr("Abort Rebase", "Avoid translating \"Rebase\""), "Git.RebaseAbort", std::bind(&GitClient::rebase, &m_gitClient, _1, QString("--abort"))); - m_continueRebaseAction = createAction(tr("Continue Rebase"), "Git.RebaseContinue", + m_continueRebaseAction = createAction(Tr::tr("Continue Rebase"), "Git.RebaseContinue", std::bind(&GitClient::rebase, &m_gitClient, _1, QString("--continue"))); - m_skipRebaseAction = createAction(tr("Skip Rebase"), "Git.RebaseSkip", + m_skipRebaseAction = createAction(Tr::tr("Skip Rebase"), "Git.RebaseSkip", std::bind(&GitClient::rebase, &m_gitClient, _1, QString("--skip"))); - m_abortCherryPickAction = createAction(tr("Abort Cherry Pick", "Avoid translating \"Cherry Pick\""), "Git.CherryPickAbort", + m_abortCherryPickAction = createAction(Tr::tr("Abort Cherry Pick", "Avoid translating \"Cherry Pick\""), "Git.CherryPickAbort", std::bind(&GitClient::synchronousCherryPick, &m_gitClient, _1, QString("--abort"))); - m_continueCherryPickAction = createAction(tr("Continue Cherry Pick"), "Git.CherryPickContinue", + m_continueCherryPickAction = createAction(Tr::tr("Continue Cherry Pick"), "Git.CherryPickContinue", std::bind(&GitClient::cherryPick, &m_gitClient, _1, QString("--continue"))); - m_abortRevertAction = createAction(tr("Abort Revert", "Avoid translating \"Revert\""), "Git.RevertAbort", + m_abortRevertAction = createAction(Tr::tr("Abort Revert", "Avoid translating \"Revert\""), "Git.RevertAbort", std::bind(&GitClient::synchronousRevert, &m_gitClient, _1, QString("--abort"))); - m_continueRevertAction = createAction(tr("Continue Revert"), "Git.RevertContinue", + m_continueRevertAction = createAction(Tr::tr("Continue Revert"), "Git.RevertContinue", std::bind(&GitClient::revert, &m_gitClient, _1, QString("--continue"))); // -------------- localRepositoryMenu->addSeparator(context); - createRepositoryAction(localRepositoryMenu, tr("Branches..."), "Git.BranchList", + createRepositoryAction(localRepositoryMenu, Tr::tr("Branches..."), "Git.BranchList", context, true, std::bind(&GitPluginPrivate::branchList, this)); // -------------- @@ -822,21 +822,21 @@ GitPluginPrivate::GitPluginPrivate() // "Patch" menu ActionContainer *patchMenu = ActionManager::createMenu("Git.PatchMenu"); - patchMenu->menu()->setTitle(tr("&Patch")); + patchMenu->menu()->setTitle(Tr::tr("&Patch")); localRepositoryMenu->addMenu(patchMenu); // Apply current file as patch is handled specially. m_applyCurrentFilePatchAction = createParameterAction(patchMenu, - tr("Apply from Editor"), tr("Apply \"%1\""), + Tr::tr("Apply from Editor"), Tr::tr("Apply \"%1\""), "Git.ApplyCurrentFilePatch", context, true, std::bind(&GitPluginPrivate::applyCurrentFilePatch, this)); - createRepositoryAction(patchMenu, tr("Apply from File..."), "Git.ApplyPatch", + createRepositoryAction(patchMenu, Tr::tr("Apply from File..."), "Git.ApplyPatch", context, true, std::bind(&GitPluginPrivate::promptApplyPatch, this)); // "Stash" menu ActionContainer *stashMenu = ActionManager::createMenu("Git.StashMenu"); - stashMenu->menu()->setTitle(tr("&Stash")); + stashMenu->menu()->setTitle(Tr::tr("&Stash")); localRepositoryMenu->addMenu(stashMenu); createRepositoryAction(stashMenu, "Stashes...", "Git.StashList", @@ -846,24 +846,24 @@ GitPluginPrivate::GitPluginPrivate() QAction *action = createRepositoryAction(stashMenu, "Stash", "Git.Stash", context, true, std::bind(&GitPluginPrivate::stash, this, false)); - action->setToolTip(tr("Saves the current state of your work and resets the repository.")); + action->setToolTip(Tr::tr("Saves the current state of your work and resets the repository.")); - action = createRepositoryAction(stashMenu, tr("Stash Unstaged Files", "Avoid translating \"Stash\""), + action = createRepositoryAction(stashMenu, Tr::tr("Stash Unstaged Files", "Avoid translating \"Stash\""), "Git.StashUnstaged", context, true, std::bind(&GitPluginPrivate::stashUnstaged, this)); - action->setToolTip(tr("Saves the current state of your unstaged files and resets the repository " + action->setToolTip(Tr::tr("Saves the current state of your unstaged files and resets the repository " "to its staged state.")); - action = createRepositoryAction(stashMenu, tr("Take Snapshot..."), "Git.StashSnapshot", + action = createRepositoryAction(stashMenu, Tr::tr("Take Snapshot..."), "Git.StashSnapshot", context, true, std::bind(&GitPluginPrivate::stashSnapshot, this)); - action->setToolTip(tr("Saves the current state of your work.")); + action->setToolTip(Tr::tr("Saves the current state of your work.")); stashMenu->addSeparator(context); - action = createRepositoryAction(stashMenu, tr("Stash Pop", "Avoid translating \"Stash\""), + action = createRepositoryAction(stashMenu, Tr::tr("Stash Pop", "Avoid translating \"Stash\""), "Git.StashPop", context, true, std::bind(&GitPluginPrivate::stashPop, this)); - action->setToolTip(tr("Restores changes saved to the stash list using \"Stash\".")); + action->setToolTip(Tr::tr("Restores changes saved to the stash list using \"Stash\".")); /* \"Local Repository" menu */ @@ -872,7 +872,7 @@ GitPluginPrivate::GitPluginPrivate() /* "Remote Repository" menu */ ActionContainer *remoteRepositoryMenu = ActionManager::createMenu("Git.RemoteRepositoryMenu"); - remoteRepositoryMenu->menu()->setTitle(tr("&Remote Repository")); + remoteRepositoryMenu->menu()->setTitle(Tr::tr("&Remote Repository")); gitContainer->addMenu(remoteRepositoryMenu); createRepositoryAction(remoteRepositoryMenu, "Fetch", "Git.Fetch", @@ -889,7 +889,7 @@ GitPluginPrivate::GitPluginPrivate() // "Subversion" menu ActionContainer *subversionMenu = ActionManager::createMenu("Git.Subversion"); - subversionMenu->menu()->setTitle(tr("&Subversion")); + subversionMenu->menu()->setTitle(Tr::tr("&Subversion")); remoteRepositoryMenu->addMenu(subversionMenu); createRepositoryAction(subversionMenu, "Log", "Git.Subversion.Log", @@ -898,13 +898,13 @@ GitPluginPrivate::GitPluginPrivate() createRepositoryAction(subversionMenu, "Fetch", "Git.Subversion.Fetch", context, false, &GitClient::synchronousSubversionFetch); - createRepositoryAction(subversionMenu, tr("DCommit"), "Git.Subversion.DCommit", + createRepositoryAction(subversionMenu, Tr::tr("DCommit"), "Git.Subversion.DCommit", context, false, &GitClient::subversionDeltaCommit); // -------------- remoteRepositoryMenu->addSeparator(context); - createRepositoryAction(remoteRepositoryMenu, tr("Manage Remotes..."), "Git.RemoteList", + createRepositoryAction(remoteRepositoryMenu, Tr::tr("Manage Remotes..."), "Git.RemoteList", context, false, std::bind(&GitPluginPrivate::manageRemotes, this)); /* \"Remote Repository" menu */ @@ -916,7 +916,7 @@ GitPluginPrivate::GitPluginPrivate() createChangeRelatedRepositoryAction("Revert...", "Git.Revert", context); createChangeRelatedRepositoryAction("Cherry Pick...", "Git.CherryPick", context); createChangeRelatedRepositoryAction("Checkout...", "Git.Checkout", context); - createChangeRelatedRepositoryAction(tr("Archive..."), "Git.Archive", context); + createChangeRelatedRepositoryAction(Tr::tr("Archive..."), "Git.Archive", context); createRepositoryAction(nullptr, "Rebase...", "Git.Rebase", context, true, std::bind(&GitPluginPrivate::branchList, this)); @@ -928,22 +928,22 @@ GitPluginPrivate::GitPluginPrivate() /* "Git Tools" menu */ ActionContainer *gitToolsMenu = ActionManager::createMenu("Git.GitToolsMenu"); - gitToolsMenu->menu()->setTitle(tr("Git &Tools")); + gitToolsMenu->menu()->setTitle(Tr::tr("Git &Tools")); gitContainer->addMenu(gitToolsMenu); - createRepositoryAction(gitToolsMenu, tr("Gitk"), "Git.LaunchGitK", + createRepositoryAction(gitToolsMenu, Tr::tr("Gitk"), "Git.LaunchGitK", context, true, &GitClient::launchGitK); - createFileAction(gitToolsMenu, tr("Gitk Current File"), tr("Gitk of \"%1\""), + createFileAction(gitToolsMenu, Tr::tr("Gitk Current File"), Tr::tr("Gitk of \"%1\""), "Git.GitkFile", context, true, std::bind(&GitPluginPrivate::gitkForCurrentFile, this)); - createFileAction(gitToolsMenu, tr("Gitk for folder of Current File"), tr("Gitk for folder of \"%1\""), + createFileAction(gitToolsMenu, Tr::tr("Gitk for folder of Current File"), Tr::tr("Gitk for folder of \"%1\""), "Git.GitkFolder", context, true, std::bind(&GitPluginPrivate::gitkForCurrentFolder, this)); // -------------- gitToolsMenu->addSeparator(context); - createRepositoryAction(gitToolsMenu, tr("Git Gui"), "Git.GitGui", + createRepositoryAction(gitToolsMenu, Tr::tr("Git Gui"), "Git.GitGui", context, true, std::bind(&GitPluginPrivate::gitGui, this)); // -------------- @@ -951,18 +951,18 @@ GitPluginPrivate::GitPluginPrivate() m_repositoryBrowserAction = createRepositoryAction(gitToolsMenu, - tr("Repository Browser"), "Git.LaunchRepositoryBrowser", + Tr::tr("Repository Browser"), "Git.LaunchRepositoryBrowser", context, true, &GitClient::launchRepositoryBrowser); m_mergeToolAction - = createRepositoryAction(gitToolsMenu, tr("Merge Tool"), "Git.MergeTool", + = createRepositoryAction(gitToolsMenu, Tr::tr("Merge Tool"), "Git.MergeTool", context, true, std::bind(&GitPluginPrivate::startMergeTool, this)); // -------------- if (HostOsInfo::isWindowsHost()) { gitToolsMenu->addSeparator(context); - createRepositoryAction(gitToolsMenu, tr("Git Bash"), "Git.GitBash", + createRepositoryAction(gitToolsMenu, Tr::tr("Git Bash"), "Git.GitBash", context, true, std::bind(&GitPluginPrivate::gitBash, this)); } @@ -971,14 +971,14 @@ GitPluginPrivate::GitPluginPrivate() // -------------- gitContainer->addSeparator(context); - QAction *actionsOnCommitsAction = new QAction(tr("Actions on Commits..."), this); + QAction *actionsOnCommitsAction = new QAction(Tr::tr("Actions on Commits..."), this); Command *actionsOnCommitsCommand = ActionManager::registerAction( actionsOnCommitsAction, "Git.ChangeActions"); connect(actionsOnCommitsAction, &QAction::triggered, this, [this] { startChangeRelatedAction("Git.ChangeActions"); }); gitContainer->addAction(actionsOnCommitsCommand); - QAction *createRepositoryAction = new QAction(tr("Create Repository..."), this); + QAction *createRepositoryAction = new QAction(Tr::tr("Create Repository..."), this); Command *createRepositoryCommand = ActionManager::registerAction( createRepositoryAction, "Git.CreateRepository"); connect(createRepositoryAction, &QAction::triggered, this, &GitPluginPrivate::createRepository); @@ -1131,7 +1131,7 @@ void GitPluginPrivate::resetRepository() LogChangeDialog dialog(true, ICore::dialogParent()); ResetItemDelegate delegate(dialog.widget()); - dialog.setWindowTitle(tr("Undo Changes to %1").arg(topLevel.toUserOutput())); + dialog.setWindowTitle(Tr::tr("Undo Changes to %1").arg(topLevel.toUserOutput())); if (dialog.runDialog(topLevel, {}, LogChangeWidget::IncludeRemotes)) m_gitClient.reset(topLevel, dialog.resetFlag(), dialog.commit()); } @@ -1164,7 +1164,7 @@ void GitPluginPrivate::startRebaseFromCommit(const FilePath &workingDirectory, Q if (commit.isEmpty()) { LogChangeDialog dialog(false, ICore::dialogParent()); RebaseItemDelegate delegate(dialog.widget()); - dialog.setWindowTitle(tr("Interactive Rebase")); + dialog.setWindowTitle(Tr::tr("Interactive Rebase")); if (!dialog.runDialog(workingDirectory)) return; commit = dialog.commit(); @@ -1299,7 +1299,7 @@ void GitPluginPrivate::startCommit(CommitType commitType) if (raiseSubmitEditor()) return; if (isCommitEditorOpen()) { - VcsOutputWindow::appendWarning(tr("Another submit is currently being executed.")); + VcsOutputWindow::appendWarning(Tr::tr("Another submit is currently being executed.")); return; } @@ -1344,7 +1344,7 @@ void GitPluginPrivate::updateVersionWarning() return; infoBar->addInfo( InfoBarEntry(gitVersionWarning, - tr("Unsupported version of Git found. Git %1 or later required.") + Tr::tr("Unsupported version of Git found. Git %1 or later required.") .arg(versionString(minimumRequiredVersion)), InfoBarEntry::GlobalSuppression::Enabled)); }); @@ -1362,13 +1362,13 @@ IEditor *GitPluginPrivate::openSubmitEditor(const QString &fileName, const Commi QString title; switch (cd.commitType) { case AmendCommit: - title = tr("Amend %1").arg(cd.amendSHA1); + title = Tr::tr("Amend %1").arg(cd.amendSHA1); break; case FixupCommit: - title = tr("Git Fixup Commit"); + title = Tr::tr("Git Fixup Commit"); break; default: - title = tr("Git Commit"); + title = Tr::tr("Git Commit"); } IDocument *document = submitEditor->document(); document->setPreferredDisplayName(title); @@ -1518,12 +1518,12 @@ void GitPluginPrivate::cleanRepository(const FilePath &directory) QApplication::restoreOverrideCursor(); if (!gotFiles) { - AsynchronousMessageBox::warning(tr("Unable to Retrieve File List"), errorMessage); + AsynchronousMessageBox::warning(Tr::tr("Unable to Retrieve File List"), errorMessage); return; } if (files.isEmpty() && ignoredFiles.isEmpty()) { - AsynchronousMessageBox::information(tr("Repository Clean"), - tr("The repository is clean.")); + AsynchronousMessageBox::information(Tr::tr("Repository Clean"), + Tr::tr("The repository is clean.")); return; } @@ -1571,8 +1571,8 @@ void GitPluginPrivate::applyPatch(const FilePath &workingDirectory, QString file return; // Prompt for file if (file.isEmpty()) { - const QString filter = tr("Patches (*.patch *.diff)"); - file = QFileDialog::getOpenFileName(ICore::dialogParent(), tr("Choose Patch"), {}, filter); + const QString filter = Tr::tr("Patches (*.patch *.diff)"); + file = QFileDialog::getOpenFileName(ICore::dialogParent(), Tr::tr("Choose Patch"), {}, filter); if (file.isEmpty()) { m_gitClient.endStashScope(workingDirectory); return; @@ -1582,7 +1582,7 @@ void GitPluginPrivate::applyPatch(const FilePath &workingDirectory, QString file QString errorMessage; if (m_gitClient.synchronousApplyPatch(workingDirectory, file, &errorMessage)) { if (errorMessage.isEmpty()) - VcsOutputWindow::appendMessage(tr("Patch %1 successfully applied to %2") + VcsOutputWindow::appendMessage(Tr::tr("Patch %1 successfully applied to %2") .arg(file, workingDirectory.toUserOutput())); else VcsOutputWindow::appendError(errorMessage); @@ -2099,13 +2099,11 @@ public: bool m_isValid = true; }; -} // namespace Internal -} // namespace Git +} // Git::Internal Q_DECLARE_METATYPE(Git::Internal::RemoteTest) -namespace Git { -namespace Internal { +namespace Git::Internal { void GitPlugin::testGitRemote_data() { @@ -2189,7 +2187,6 @@ void GitPlugin::testGitRemote() #endif -} // namespace Internal -} // namespace Git +} // Git::Internal #include "gitplugin.moc" diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index c6b7edec0f7..b7a3aadf927 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -16,8 +16,7 @@ namespace VcsBase { class VcsBasePluginState; } -namespace Git { -namespace Internal { +namespace Git::Internal { class GitClient; @@ -67,5 +66,4 @@ private slots: }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitsettings.cpp b/src/plugins/git/gitsettings.cpp index b1f3103a7e4..4e2432941ad 100644 --- a/src/plugins/git/gitsettings.cpp +++ b/src/plugins/git/gitsettings.cpp @@ -3,6 +3,8 @@ #include "gitsettings.h" +#include "gittr.h" + #include #include @@ -13,22 +15,21 @@ using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { GitSettings::GitSettings() { setSettingsGroup("Git"); path.setDisplayStyle(StringAspect::LineEditDisplay); - path.setLabelText(tr("Prepend to PATH:")); + path.setLabelText(Tr::tr("Prepend to PATH:")); registerAspect(&binaryPath); binaryPath.setDefaultValue("git"); registerAspect(&pullRebase); pullRebase.setSettingsKey("PullRebase"); - pullRebase.setLabelText(tr("Pull with rebase")); + pullRebase.setLabelText(Tr::tr("Pull with rebase")); registerAspect(&showTags); showTags.setSettingsKey("ShowTags"); @@ -55,16 +56,16 @@ GitSettings::GitSettings() registerAspect(&winSetHomeEnvironment); winSetHomeEnvironment.setSettingsKey("WinSetHomeEnvironment"); winSetHomeEnvironment.setDefaultValue(true); - winSetHomeEnvironment.setLabelText(tr("Set \"HOME\" environment variable")); + winSetHomeEnvironment.setLabelText(Tr::tr("Set \"HOME\" environment variable")); if (HostOsInfo::isWindowsHost()) { const QString currentHome = qtcEnvironmentVariable("HOME"); const QString toolTip - = tr("Set the environment variable HOME to \"%1\"\n(%2).\n" + = Tr::tr("Set the environment variable HOME to \"%1\"\n(%2).\n" "This causes Git to look for the SSH-keys in that location\n" "instead of its installation directory when run outside git bash.") .arg(QDir::homePath(), - currentHome.isEmpty() ? tr("not currently set") - : tr("currently set to \"%1\"").arg(currentHome)); + currentHome.isEmpty() ? Tr::tr("not currently set") + : Tr::tr("currently set to \"%1\"").arg(currentHome)); winSetHomeEnvironment.setToolTip(toolTip); } else { winSetHomeEnvironment.setVisible(false); @@ -73,19 +74,19 @@ GitSettings::GitSettings() registerAspect(&gitkOptions); gitkOptions.setDisplayStyle(StringAspect::LineEditDisplay); gitkOptions.setSettingsKey("GitKOptions"); - gitkOptions.setLabelText(tr("Arguments:")); + gitkOptions.setLabelText(Tr::tr("Arguments:")); registerAspect(&logDiff); logDiff.setSettingsKey("LogDiff"); - logDiff.setToolTip(tr("Note that huge amount of commits might take some time.")); + logDiff.setToolTip(Tr::tr("Note that huge amount of commits might take some time.")); registerAspect(&repositoryBrowserCmd); repositoryBrowserCmd.setDisplayStyle(StringAspect::PathChooserDisplay); repositoryBrowserCmd.setSettingsKey("RepositoryBrowserCmd"); repositoryBrowserCmd.setExpectedKind(PathChooser::ExistingCommand); repositoryBrowserCmd.setHistoryCompleter("Git.RepoCommand.History"); - repositoryBrowserCmd.setDisplayName(tr("Git Repository Browser Command")); - repositoryBrowserCmd.setLabelText(tr("Command:")); + repositoryBrowserCmd.setDisplayName(Tr::tr("Git Repository Browser Command")); + repositoryBrowserCmd.setLabelText(Tr::tr("Command:")); registerAspect(&graphLog); graphLog.setSettingsKey("GraphLog"); @@ -126,7 +127,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const if (ok) *ok = false; if (errorMessage) - *errorMessage = tr("The binary \"%1\" could not be located in the path \"%2\"") + *errorMessage = Tr::tr("The binary \"%1\" could not be located in the path \"%2\"") .arg(binaryPath.value(), path.value()); } return binPath; @@ -137,7 +138,7 @@ FilePath GitSettings::gitExecutable(bool *ok, QString *errorMessage) const GitSettingsPage::GitSettingsPage(GitSettings *settings) { setId(VcsBase::Constants::VCS_ID_GIT); - setDisplayName(GitSettings::tr("Git")); + setDisplayName(Tr::tr("Git")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); setSettings(settings); @@ -147,7 +148,7 @@ GitSettingsPage::GitSettingsPage(GitSettings *settings) Column { Group { - title(GitSettings::tr("Configuration")), + title(Tr::tr("Configuration")), Column { Row { s.path }, s.winSetHomeEnvironment, @@ -155,7 +156,7 @@ GitSettingsPage::GitSettingsPage(GitSettings *settings) }, Group { - title(GitSettings::tr("Miscellaneous")), + title(Tr::tr("Miscellaneous")), Column { Row { s.logCount, s.timeout, st }, s.pullRebase @@ -163,12 +164,12 @@ GitSettingsPage::GitSettingsPage(GitSettings *settings) }, Group { - title(GitSettings::tr("Gitk")), + title(Tr::tr("Gitk")), Row { s.gitkOptions } }, Group { - title(GitSettings::tr("Repository Browser")), + title(Tr::tr("Repository Browser")), Row { s.repositoryBrowserCmd } }, @@ -177,5 +178,4 @@ GitSettingsPage::GitSettingsPage(GitSettings *settings) }); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitsettings.h b/src/plugins/git/gitsettings.h index 6ac00afe887..0bf4e68fa50 100644 --- a/src/plugins/git/gitsettings.h +++ b/src/plugins/git/gitsettings.h @@ -6,8 +6,7 @@ #include #include -namespace Git { -namespace Internal { +namespace Git::Internal { enum CommitType { @@ -19,8 +18,6 @@ enum CommitType // Todo: Add user name and password? class GitSettings : public VcsBase::VcsBaseSettings { - Q_DECLARE_TR_FUNCTIONS(Git::Internal::GitSettings) - public: GitSettings(); @@ -51,5 +48,4 @@ public: explicit GitSettingsPage(GitSettings *settings); }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index 09ce7214b3f..4614f7293d2 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -2,9 +2,11 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "gitsubmiteditor.h" + #include "gitclient.h" #include "gitplugin.h" #include "gitsubmiteditorwidget.h" +#include "gittr.h" #include #include @@ -19,13 +21,12 @@ #include #include -static const char TASK_UPDATE_COMMIT[] = "Git.UpdateCommit"; - using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { + +const char TASK_UPDATE_COMMIT[] = "Git.UpdateCommit"; class GitSubmitFileModel : public SubmitFileModel { @@ -206,7 +207,7 @@ void GitSubmitEditor::updateFileModel() w->setUpdateInProgress(true); m_fetchWatcher.setFuture(Utils::runAsync(&CommitDataFetchResult::fetch, m_commitType, m_workingDirectory)); - Core::ProgressManager::addTask(m_fetchWatcher.future(), tr("Refreshing Commit Data"), + Core::ProgressManager::addTask(m_fetchWatcher.future(), Tr::tr("Refreshing Commit Data"), TASK_UPDATE_COMMIT); GitClient::instance()->addFuture(QFuture(m_fetchWatcher.future())); @@ -262,5 +263,4 @@ QByteArray GitSubmitEditor::fileContents() const return text.toUtf8(); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index 8798072465e..3b82870d8dc 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -14,8 +14,7 @@ namespace VcsBase { class SubmitFileModel; } -namespace Git { -namespace Internal { +namespace Git::Internal { class GitSubmitEditorWidget; class GitSubmitEditorPanelData; @@ -65,5 +64,4 @@ private: QFutureWatcher m_fetchWatcher; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index 57d5528079d..f81e22d1692 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -6,6 +6,7 @@ #include "commitdata.h" #include "gitconstants.h" #include "githighlighters.h" +#include "gittr.h" #include "logchangedialog.h" #include @@ -18,8 +19,6 @@ #include #include -#include -#include #include #include #include @@ -30,8 +29,7 @@ using namespace Utils; -namespace Git { -namespace Internal { +namespace Git::Internal { class GitSubmitPanel : public QWidget { @@ -40,9 +38,9 @@ public: { resize(364, 269); - repositoryLabel = new QLabel(tr("repository")); - branchLabel = new QLabel(tr("branch")); // FIXME: Isn't this overwritten soon? - showHeadLabel = new QLabel(tr("Show HEAD")); // FIXME: Simplify string in tr() + repositoryLabel = new QLabel(Tr::tr("repository")); + branchLabel = new QLabel(Tr::tr("branch")); // FIXME: Isn't this overwritten soon? + showHeadLabel = new QLabel(Tr::tr("Show HEAD")); // FIXME: Simplify string in tr() authorLineEdit = new QLineEdit; authorLineEdit->setMinimumSize(QSize(200, 0)); @@ -56,25 +54,25 @@ public: invalidEmailLabel = new QLabel; invalidEmailLabel->setMinimumSize(QSize(20, 20)); - bypassHooksCheckBox = new QCheckBox(tr("By&pass hooks")); + bypassHooksCheckBox = new QCheckBox(Tr::tr("By&pass hooks")); - signOffCheckBox = new QCheckBox(tr("Sign off")); + signOffCheckBox = new QCheckBox(Tr::tr("Sign off")); using namespace Layouting; - editGroup = new QGroupBox(tr("Commit Information")); + editGroup = new QGroupBox(Tr::tr("Commit Information")); Grid { - tr("Author:"), authorLineEdit, invalidAuthorLabel, st, br, - tr("Email:"), emailLineEdit, invalidEmailLabel, br, + Tr::tr("Author:"), authorLineEdit, invalidAuthorLabel, st, br, + Tr::tr("Email:"), emailLineEdit, invalidEmailLabel, br, empty, Row { bypassHooksCheckBox, signOffCheckBox, st } }.attachTo(editGroup); Column { Group { - title(tr("General Information")), + title(Tr::tr("General Information")), Form { - tr("Repository:"), repositoryLabel, br, - tr("Branch:"), branchLabel, br, + Tr::tr("Repository:"), repositoryLabel, br, + Tr::tr("Branch:"), branchLabel, br, Span(2, showHeadLabel) } }, @@ -103,7 +101,7 @@ GitSubmitEditorWidget::GitSubmitEditorWidget() : m_emailValidator = new QRegularExpressionValidator(QRegularExpression("[^@ ]+@[^@ ]+\\.[a-zA-Z]+"), this); const QPixmap error = Utils::Icons::CRITICAL.pixmap(); m_gitSubmitPanel->invalidAuthorLabel->setPixmap(error); - m_gitSubmitPanel->invalidEmailLabel->setToolTip(tr("Provide a valid email to commit.")); + m_gitSubmitPanel->invalidEmailLabel->setToolTip(Tr::tr("Provide a valid email to commit.")); m_gitSubmitPanel->invalidEmailLabel->setPixmap(error); connect(m_gitSubmitPanel->authorLineEdit, &QLineEdit::textChanged, @@ -121,7 +119,7 @@ void GitSubmitEditorWidget::setPanelInfo(const GitSubmitEditorPanelInfo &info) const QString errorColor = Utils::creatorTheme()->color(Utils::Theme::TextColorError).name(); m_gitSubmitPanel->branchLabel->setText(QString::fromLatin1("%2") - .arg(errorColor, tr("Detached HEAD"))); + .arg(errorColor, Tr::tr("Detached HEAD"))); } else { m_gitSubmitPanel->branchLabel->setText(info.branch); } @@ -145,7 +143,7 @@ void GitSubmitEditorWidget::initialize(const FilePath &repository, const CommitD if (data.commitType != AmendCommit) m_gitSubmitPanel->showHeadLabel->hide(); if (data.commitType == FixupCommit) { - auto logChangeGroupBox = new QGroupBox(tr("Select Change")); + auto logChangeGroupBox = new QGroupBox(Tr::tr("Select Change")); auto logChangeLayout = new QVBoxLayout; logChangeGroupBox->setLayout(logChangeLayout); m_logChangeWidget = new LogChangeWidget; @@ -166,11 +164,11 @@ void GitSubmitEditorWidget::initialize(const FilePath &repository, const CommitD if (data.enablePush) { auto menu = new QMenu(this); - connect(menu->addAction(tr("&Commit only")), &QAction::triggered, + connect(menu->addAction(Tr::tr("&Commit only")), &QAction::triggered, this, &GitSubmitEditorWidget::commitOnlySlot); - connect(menu->addAction(tr("Commit and &Push")), &QAction::triggered, + connect(menu->addAction(Tr::tr("Commit and &Push")), &QAction::triggered, this, &GitSubmitEditorWidget::commitAndPushSlot); - connect(menu->addAction(tr("Commit and Push to &Gerrit")), &QAction::triggered, + connect(menu->addAction(Tr::tr("Commit and Push to &Gerrit")), &QAction::triggered, this, &GitSubmitEditorWidget::commitAndPushToGerritSlot); addSubmitButtonMenu(menu); } @@ -212,17 +210,17 @@ bool GitSubmitEditorWidget::canSubmit(QString *whyNot) const { if (m_gitSubmitPanel->invalidAuthorLabel->isVisible()) { if (whyNot) - *whyNot = tr("Invalid author"); + *whyNot = Tr::tr("Invalid author"); return false; } if (m_gitSubmitPanel->invalidEmailLabel->isVisible()) { if (whyNot) - *whyNot = tr("Invalid email"); + *whyNot = Tr::tr("Invalid email"); return false; } if (m_hasUnmerged) { if (whyNot) - *whyNot = tr("Unresolved merge conflicts"); + *whyNot = Tr::tr("Unresolved merge conflicts"); return false; } return SubmitEditorWidget::canSubmit(whyNot); @@ -250,11 +248,11 @@ QString GitSubmitEditorWidget::cleanupDescription(const QString &input) const QString GitSubmitEditorWidget::commitName() const { if (m_pushAction == NormalPush) - return tr("&Commit and Push"); + return Tr::tr("&Commit and Push"); else if (m_pushAction == PushToGerrit) - return tr("&Commit and Push to Gerrit"); + return Tr::tr("&Commit and Push to Gerrit"); - return tr("&Commit"); + return Tr::tr("&Commit"); } void GitSubmitEditorWidget::authorInformationChanged() @@ -295,5 +293,4 @@ bool GitSubmitEditorWidget::emailIsValid() const return m_emailValidator->validate(text, pos) == QValidator::Acceptable; } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h index ba5542c6630..a6d27beaf73 100644 --- a/src/plugins/git/gitsubmiteditorwidget.h +++ b/src/plugins/git/gitsubmiteditorwidget.h @@ -3,7 +3,6 @@ #pragma once -#include "gitsettings.h" #include "commitdata.h" #include @@ -16,8 +15,7 @@ QT_BEGIN_NAMESPACE class QValidator; QT_END_NAMESPACE -namespace Git { -namespace Internal { +namespace Git::Internal { class GitSubmitPanel; class GitSubmitEditorPanelInfo; @@ -75,5 +73,4 @@ private: bool m_isInitialized = false; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitutils.cpp b/src/plugins/git/gitutils.cpp index 5ca8abbd9b5..6b9a288a65e 100644 --- a/src/plugins/git/gitutils.cpp +++ b/src/plugins/git/gitutils.cpp @@ -6,8 +6,7 @@ #include #include -namespace Git { -namespace Internal { +namespace Git::Internal { void Stash::clear() { @@ -72,5 +71,4 @@ QString versionString(unsigned ver) .arg(versionPart(ver)); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/gitutils.h b/src/plugins/git/gitutils.h index b24812fad1c..c8d0900314c 100644 --- a/src/plugins/git/gitutils.h +++ b/src/plugins/git/gitutils.h @@ -9,10 +9,10 @@ QT_BEGIN_NAMESPACE class QWidget; QT_END_NAMESPACE -namespace Git { -namespace Internal { +namespace Git::Internal { -class Stash { +class Stash +{ public: void clear(); bool parseStashLine(const QString &l); @@ -33,5 +33,4 @@ inline unsigned version(unsigned major, unsigned minor, unsigned patch) QString versionString(unsigned ver); -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index ac8c9feb45e..41c620ab6fe 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.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 "logchangedialog.h" + #include "gitclient.h" +#include "gittr.h" #include #include @@ -23,8 +25,7 @@ using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { enum Columns { @@ -65,7 +66,7 @@ LogChangeWidget::LogChangeWidget(QWidget *parent) , m_hasCustomDelegate(false) { QStringList headers; - headers << tr("Sha1")<< tr("Subject"); + headers << Tr::tr("Sha1")<< Tr::tr("Subject"); m_model->setHorizontalHeaderLabels(headers); setModel(m_model); setMinimumWidth(300); @@ -214,15 +215,15 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : , m_dialogButtonBox(new QDialogButtonBox(this)) { auto layout = new QVBoxLayout(this); - layout->addWidget(new QLabel(isReset ? tr("Reset to:") : tr("Select change:"), this)); + layout->addWidget(new QLabel(isReset ? Tr::tr("Reset to:") : Tr::tr("Select change:"), this)); layout->addWidget(m_widget); auto popUpLayout = new QHBoxLayout; if (isReset) { - popUpLayout->addWidget(new QLabel(tr("Reset type:"), this)); + popUpLayout->addWidget(new QLabel(Tr::tr("Reset type:"), this)); m_resetTypeComboBox = new QComboBox(this); - m_resetTypeComboBox->addItem(tr("Hard"), "--hard"); - m_resetTypeComboBox->addItem(tr("Mixed"), "--mixed"); - m_resetTypeComboBox->addItem(tr("Soft"), "--soft"); + m_resetTypeComboBox->addItem(Tr::tr("Hard"), "--hard"); + m_resetTypeComboBox->addItem(Tr::tr("Mixed"), "--mixed"); + m_resetTypeComboBox->addItem(Tr::tr("Soft"), "--soft"); m_resetTypeComboBox->setCurrentIndex(GitClient::settings().lastResetIndex.value()); popUpLayout->addWidget(m_resetTypeComboBox); popUpLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Ignored)); @@ -306,5 +307,4 @@ void IconItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti QStyledItemDelegate::paint(painter, o, index); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h index 09fce4dfa18..483968271f8 100644 --- a/src/plugins/git/logchangedialog.h +++ b/src/plugins/git/logchangedialog.h @@ -18,8 +18,7 @@ class QStandardItemModel; class QStandardItem; QT_END_NAMESPACE -namespace Git { -namespace Internal { +namespace Git::Internal { class LogChangeModel; @@ -65,8 +64,6 @@ private: class LogChangeDialog : public QDialog { - Q_OBJECT - public: LogChangeDialog(bool isReset, QWidget *parent); @@ -109,5 +106,4 @@ private: QIcon m_icon; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp index 19077d4d45a..88bed0dd257 100644 --- a/src/plugins/git/mergetool.cpp +++ b/src/plugins/git/mergetool.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 "mergetool.h" + #include "gitclient.h" #include "gitplugin.h" +#include "gittr.h" #include #include @@ -17,8 +19,7 @@ using namespace Utils; using namespace VcsBase; -namespace Git { -namespace Internal { +namespace Git::Internal { MergeTool::MergeTool(QObject *parent) : QObject(parent) { @@ -88,10 +89,10 @@ static MergeTool::MergeType mergeType(const QString &type) QString MergeTool::mergeTypeName() { switch (m_mergeType) { - case NormalMerge: return tr("Normal"); - case SubmoduleMerge: return tr("Submodule"); - case DeletedMerge: return tr("Deleted"); - case SymbolicLinkMerge: return tr("Symbolic link"); + case NormalMerge: return Tr::tr("Normal"); + case SubmoduleMerge: return Tr::tr("Submodule"); + case DeletedMerge: return Tr::tr("Deleted"); + case SymbolicLinkMerge: return Tr::tr("Symbolic link"); } return QString(); } @@ -99,11 +100,11 @@ QString MergeTool::mergeTypeName() QString MergeTool::stateName(MergeTool::FileState state, const QString &extraInfo) { switch (state) { - case ModifiedState: return tr("Modified"); - case CreatedState: return tr("Created"); - case DeletedState: return tr("Deleted"); - case SubmoduleState: return tr("Submodule commit %1").arg(extraInfo); - case SymbolicLinkState: return tr("Symbolic link -> %1").arg(extraInfo); + case ModifiedState: return Tr::tr("Modified"); + case CreatedState: return Tr::tr("Created"); + case DeletedState: return Tr::tr("Deleted"); + case SubmoduleState: return Tr::tr("Submodule commit %1").arg(extraInfo); + case SymbolicLinkState: return Tr::tr("Symbolic link -> %1").arg(extraInfo); default: break; } return QString(); @@ -114,25 +115,25 @@ void MergeTool::chooseAction() if (m_mergeType == NormalMerge) return; QMessageBox msgBox; - msgBox.setWindowTitle(tr("Merge Conflict")); + msgBox.setWindowTitle(Tr::tr("Merge Conflict")); msgBox.setIcon(QMessageBox::Question); msgBox.setStandardButtons(QMessageBox::Abort); - msgBox.setText(tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4") + msgBox.setText(Tr::tr("%1 merge conflict for \"%2\"\nLocal: %3\nRemote: %4") .arg(mergeTypeName(), m_fileName, stateName(m_localState, m_localInfo), stateName(m_remoteState, m_remoteInfo))); switch (m_mergeType) { case SubmoduleMerge: case SymbolicLinkMerge: - addButton(&msgBox, tr("&Local"), 'l'); - addButton(&msgBox, tr("&Remote"), 'r'); + addButton(&msgBox, Tr::tr("&Local"), 'l'); + addButton(&msgBox, Tr::tr("&Remote"), 'r'); break; case DeletedMerge: if (m_localState == CreatedState || m_remoteState == CreatedState) - addButton(&msgBox, tr("&Created"), 'c'); + addButton(&msgBox, Tr::tr("&Created"), 'c'); else - addButton(&msgBox, tr("&Modified"), 'm'); - addButton(&msgBox, tr("&Deleted"), 'd'); + addButton(&msgBox, Tr::tr("&Modified"), 'm'); + addButton(&msgBox, Tr::tr("&Deleted"), 'd'); break; default: break; @@ -182,15 +183,15 @@ void MergeTool::readData() data = data.mid(index + 1); } if (data.startsWith("Was the merge successful")) { - prompt(tr("Unchanged File"), tr("Was the merge successful?")); + prompt(Tr::tr("Unchanged File"), Tr::tr("Was the merge successful?")); } else if (data.startsWith("Continue merging")) { - prompt(tr("Continue Merging"), tr("Continue merging other unresolved paths?")); + prompt(Tr::tr("Continue Merging"), Tr::tr("Continue merging other unresolved paths?")); } else if (data.startsWith("Hit return")) { QMessageBox::warning( - Core::ICore::dialogParent(), tr("Merge Tool"), + Core::ICore::dialogParent(), Tr::tr("Merge Tool"), QString("

%1

\n

%2

").arg( - tr("Merge tool is not configured."), - tr("Run git config --global merge.tool <tool> " + Tr::tr("Merge tool is not configured."), + Tr::tr("Run git config --global merge.tool <tool> " "to configure it, then try again."))); m_process.stop(); } else { @@ -234,5 +235,4 @@ void MergeTool::write(const QString &str) VcsOutputWindow::append(str); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h index 71e1eb646a8..76adc00f5d0 100644 --- a/src/plugins/git/mergetool.h +++ b/src/plugins/git/mergetool.h @@ -12,13 +12,10 @@ QT_BEGIN_NAMESPACE class QMessageBox; QT_END_NAMESPACE -namespace Git { -namespace Internal { +namespace Git::Internal { class MergeTool : public QObject { - Q_OBJECT - enum FileState { UnknownState, ModifiedState, @@ -62,5 +59,4 @@ private: QString m_unfinishedLine; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index b06083a61b1..3c3cdb6640e 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -5,6 +5,7 @@ #include "gitclient.h" #include "gitplugin.h" +#include "gittr.h" #include "remotemodel.h" #include @@ -27,8 +28,7 @@ using namespace Utils; -namespace Git { -namespace Internal { +namespace Git::Internal { // -------------------------------------------------------------------------- // RemoteAdditionDialog: @@ -65,7 +65,7 @@ public: if (m_remoteNames.contains(input)) { if (errorMessage) - *errorMessage = RemoteDialog::tr("A remote with the name \"%1\" already exists.").arg(input); + *errorMessage = Tr::tr("A remote with the name \"%1\" already exists.").arg(input); return false; } @@ -81,7 +81,7 @@ public: const GitRemote r(edit->text()); if (!r.isValid && errorMessage) - *errorMessage = RemoteDialog::tr("The URL may not be valid."); + *errorMessage = Tr::tr("The URL may not be valid."); return r.isValid; }); @@ -91,8 +91,8 @@ public: using namespace Layouting; Grid { - tr("Name:"), m_nameEdit, br, - tr("URL:"), m_urlEdit, br, + Tr::tr("Name:"), m_nameEdit, br, + Tr::tr("URL:"), m_urlEdit, br, Span(2, buttonBox) }.attachTo(this); @@ -134,11 +134,11 @@ RemoteDialog::RemoteDialog(QWidget *parent) : { setModal(false); setAttribute(Qt::WA_DeleteOnClose, true); // Do not update unnecessarily - setWindowTitle(tr("Remotes")); + setWindowTitle(Tr::tr("Remotes")); m_repositoryLabel = new QLabel; - auto refreshButton = new QPushButton(tr("Re&fresh")); + auto refreshButton = new QPushButton(Tr::tr("Re&fresh")); refreshButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); m_remoteView = new QTreeView; @@ -151,14 +151,14 @@ RemoteDialog::RemoteDialog(QWidget *parent) : m_remoteView->setModel(m_remoteModel); new HeaderViewStretcher(m_remoteView->header(), 1); - m_addButton = new QPushButton(tr("&Add...")); + m_addButton = new QPushButton(Tr::tr("&Add...")); m_addButton->setAutoDefault(false); - m_fetchButton = new QPushButton(tr("F&etch")); + m_fetchButton = new QPushButton(Tr::tr("F&etch")); - m_pushButton = new QPushButton(tr("&Push")); + m_pushButton = new QPushButton(Tr::tr("&Push")); - m_removeButton = new QPushButton(tr("&Remove")); + m_removeButton = new QPushButton(Tr::tr("&Remove")); m_removeButton->setAutoDefault(false); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Close); @@ -169,7 +169,7 @@ RemoteDialog::RemoteDialog(QWidget *parent) : Row { m_repositoryLabel, refreshButton } }, Group { - title(tr("Remotes")), + title(Tr::tr("Remotes")), Column { m_remoteView, Row { st, m_addButton, m_fetchButton, m_pushButton, m_removeButton } @@ -233,8 +233,8 @@ void RemoteDialog::removeRemote() int row = indexList.at(0).row(); const QString remoteName = m_remoteModel->remoteName(row); - if (QMessageBox::question(this, tr("Delete Remote"), - tr("Would you like to delete the remote \"%1\"?").arg(remoteName), + if (QMessageBox::question(this, Tr::tr("Delete Remote"), + Tr::tr("Would you like to delete the remote \"%1\"?").arg(remoteName), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) { m_remoteModel->removeRemote(row); @@ -274,5 +274,4 @@ void RemoteDialog::updateButtonState() m_removeButton->setEnabled(haveSelection); } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/remotedialog.h b/src/plugins/git/remotedialog.h index 9475405c7b2..20365f9b25d 100644 --- a/src/plugins/git/remotedialog.h +++ b/src/plugins/git/remotedialog.h @@ -12,15 +12,12 @@ QT_END_NAMESPACE namespace Utils { class FilePath; } -namespace Git { -namespace Internal { +namespace Git::Internal { class RemoteModel; class RemoteDialog : public QDialog { - Q_OBJECT - public: explicit RemoteDialog(QWidget *parent = nullptr); ~RemoteDialog() override; @@ -46,5 +43,4 @@ private: QPushButton *m_removeButton; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/remotemodel.cpp b/src/plugins/git/remotemodel.cpp index 1ba984ec5db..8129c8893fe 100644 --- a/src/plugins/git/remotemodel.cpp +++ b/src/plugins/git/remotemodel.cpp @@ -2,16 +2,16 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "remotemodel.h" + #include "gitclient.h" +#include "gittr.h" #include using namespace Utils; -namespace Git { -namespace Internal { +namespace Git::Internal { -// ------ RemoteModel RemoteModel::RemoteModel(QObject *parent) : QAbstractTableModel(parent) { } @@ -120,7 +120,7 @@ QVariant RemoteModel::headerData(int section, Qt::Orientation orientation, int r if (role != Qt::DisplayRole || orientation != Qt::Horizontal) return QVariant(); - return (section == 0) ? tr("Name") : tr("URL"); + return (section == 0) ? Tr::tr("Name") : Tr::tr("URL"); } bool RemoteModel::setData(const QModelIndex &index, const QVariant &value, int role) @@ -190,6 +190,5 @@ int RemoteModel::findRemoteByName(const QString &name) const return -1; } -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/remotemodel.h b/src/plugins/git/remotemodel.h index 35d1d386e9d..61428849451 100644 --- a/src/plugins/git/remotemodel.h +++ b/src/plugins/git/remotemodel.h @@ -9,12 +9,12 @@ #include #include -namespace Git { -namespace Internal { +namespace Git::Internal { class RemoteModel : public QAbstractTableModel { Q_OBJECT + public: explicit RemoteModel(QObject *parent = nullptr); @@ -62,5 +62,4 @@ private: RemoteList m_remotes; }; -} // namespace Internal -} // namespace Git +} // Git::Internal diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index 835e3f3598b..12692b01b0d 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -5,6 +5,7 @@ #include "gitclient.h" #include "gitplugin.h" +#include "gittr.h" #include "gitutils.h" #include @@ -63,9 +64,7 @@ private: StashModel::StashModel(QObject *parent) : QStandardItemModel(0, ColumnCount, parent) { - QStringList headers; - headers << StashDialog::tr("Name") << StashDialog::tr("Branch") << StashDialog::tr("Message"); - setHorizontalHeaderLabels(headers); + setHorizontalHeaderLabels({Tr::tr("Name"), Tr::tr("Branch"), Tr::tr("Message")}); } void StashModel::setStashes(const QList &stashes) @@ -81,16 +80,16 @@ void StashModel::setStashes(const QList &stashes) StashDialog::StashDialog(QWidget *parent) : QDialog(parent), m_model(new StashModel), m_proxyModel(new QSortFilterProxyModel), - m_deleteAllButton(new QPushButton(tr("Delete &All..."))), - m_deleteSelectionButton(new QPushButton(tr("&Delete..."))), - m_showCurrentButton(new QPushButton(tr("&Show"))), - m_restoreCurrentButton(new QPushButton(tr("R&estore..."))), + m_deleteAllButton(new QPushButton(Tr::tr("Delete &All..."))), + m_deleteSelectionButton(new QPushButton(Tr::tr("&Delete..."))), + m_showCurrentButton(new QPushButton(Tr::tr("&Show"))), + m_restoreCurrentButton(new QPushButton(Tr::tr("R&estore..."))), //: Restore a git stash to new branch to be created - m_restoreCurrentInBranchButton(new QPushButton(tr("Restore to &Branch..."))), - m_refreshButton(new QPushButton(tr("Re&fresh"))) + m_restoreCurrentInBranchButton(new QPushButton(Tr::tr("Restore to &Branch..."))), + m_refreshButton(new QPushButton(Tr::tr("Re&fresh"))) { setAttribute(Qt::WA_DeleteOnClose, true); // Do not update unnecessarily - setWindowTitle(tr("Stashes")); + setWindowTitle(Tr::tr("Stashes")); resize(599, 485); @@ -184,8 +183,8 @@ void StashDialog::refresh(const FilePath &repository, bool force) void StashDialog::deleteAll() { - const QString title = tr("Delete Stashes"); - if (!ask(title, tr("Do you want to delete all stashes?"))) + const QString title = Tr::tr("Delete Stashes"); + if (!ask(title, Tr::tr("Do you want to delete all stashes?"))) return; QString errorMessage; if (GitClient::instance()->synchronousStashRemove(m_repository, QString(), &errorMessage)) @@ -198,8 +197,8 @@ void StashDialog::deleteSelection() { const QList rows = selectedRows(); QTC_ASSERT(!rows.isEmpty(), return); - const QString title = tr("Delete Stashes"); - if (!ask(title, tr("Do you want to delete %n stash(es)?", nullptr, rows.size()))) + const QString title = Tr::tr("Delete Stashes"); + if (!ask(title, Tr::tr("Do you want to delete %n stash(es)?", nullptr, rows.size()))) return; QString errorMessage; QStringList errors; @@ -252,12 +251,12 @@ static inline QString nextStash(const QString &stash) StashDialog::ModifiedRepositoryAction StashDialog::promptModifiedRepository(const QString &stash) { QMessageBox box(QMessageBox::Question, - tr("Repository Modified"), - tr("%1 cannot be restored since the repository is modified.\n" + Tr::tr("Repository Modified"), + Tr::tr("%1 cannot be restored since the repository is modified.\n" "You can choose between stashing the changes or discarding them.").arg(stash), QMessageBox::Cancel, this); - QPushButton *stashButton = box.addButton(tr("Stash"), QMessageBox::AcceptRole); - QPushButton *discardButton = box.addButton(tr("Discard"), QMessageBox::AcceptRole); + QPushButton *stashButton = box.addButton(Tr::tr("Stash"), QMessageBox::AcceptRole); + QPushButton *discardButton = box.addButton(Tr::tr("Discard"), QMessageBox::AcceptRole); box.exec(); const QAbstractButton *clickedButton = box.clickedButton(); if (clickedButton == stashButton) @@ -307,19 +306,19 @@ bool StashDialog::promptForRestore(QString *stash, // Prompt for branch or just ask. if (branch) { *branch = stashRestoreDefaultBranch(*stash); - if (!inputText(this, tr("Restore Stash to Branch"), tr("Branch:"), branch) + if (!inputText(this, Tr::tr("Restore Stash to Branch"), Tr::tr("Branch:"), branch) || branch->isEmpty()) return false; } else { - if (!modifiedPromptShown && !ask(tr("Stash Restore"), tr("Would you like to restore %1?").arg(stashIn))) + if (!modifiedPromptShown && !ask(Tr::tr("Stash Restore"), Tr::tr("Would you like to restore %1?").arg(stashIn))) return false; } return true; } -static inline QString msgRestoreFailedTitle(const QString &stash) +static QString msgRestoreFailedTitle(const QString &stash) { - return StashDialog::tr("Error restoring %1").arg(stash); + return Tr::tr("Error restoring %1").arg(stash); } void StashDialog::restoreCurrent() diff --git a/src/plugins/git/stashdialog.h b/src/plugins/git/stashdialog.h index b21249798c5..49c2833b1b6 100644 --- a/src/plugins/git/stashdialog.h +++ b/src/plugins/git/stashdialog.h @@ -15,8 +15,7 @@ QT_END_NAMESPACE namespace Utils { class TreeView; } -namespace Git { -namespace Internal { +namespace Git::Internal { class StashModel; @@ -27,8 +26,6 @@ class StashModel; class StashDialog : public QDialog { - Q_OBJECT - public: explicit StashDialog(QWidget *parent = nullptr); ~StashDialog() override; @@ -72,5 +69,4 @@ private: Utils::TreeView *m_stashView; }; -} // namespace Internal -} // namespace Git +} // Git::Internal