From 4d6827dde9248b6b47949b535ae361e8c6b04cfa Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 24 Jan 2023 16:49:41 +0100 Subject: Utils: Tr::tr Change-Id: Ic03e20993f05fb5b49a12c891d86afb2c8e18e08 Reviewed-by: Qt CI Bot Reviewed-by: hjk --- share/qtcreator/translations/qtcreator_cs.ts | 128 ++---------------- share/qtcreator/translations/qtcreator_da.ts | 133 +------------------ share/qtcreator/translations/qtcreator_de.ts | 133 ++++--------------- share/qtcreator/translations/qtcreator_es.ts | 49 +------ share/qtcreator/translations/qtcreator_fr.ts | 122 ++--------------- share/qtcreator/translations/qtcreator_hr.ts | 133 +------------------ share/qtcreator/translations/qtcreator_hu.ts | 53 +------- share/qtcreator/translations/qtcreator_it.ts | 49 +------ share/qtcreator/translations/qtcreator_ja.ts | 167 ++---------------------- share/qtcreator/translations/qtcreator_pl.ts | 115 +++------------- share/qtcreator/translations/qtcreator_ru.ts | 145 +------------------- share/qtcreator/translations/qtcreator_sl.ts | 95 +------------- share/qtcreator/translations/qtcreator_uk.ts | 147 ++------------------- share/qtcreator/translations/qtcreator_zh_CN.ts | 159 +--------------------- share/qtcreator/translations/qtcreator_zh_TW.ts | 106 ++------------- src/libs/utils/archive.cpp | 9 +- src/libs/utils/aspects.cpp | 2 +- src/libs/utils/aspects.h | 7 +- src/libs/utils/basetreeview.cpp | 3 +- src/libs/utils/buildablehelperlibrary.h | 2 - src/libs/utils/checkablemessagebox.cpp | 11 +- src/libs/utils/classnamevalidatinglineedit.cpp | 7 +- src/libs/utils/detailsbutton.cpp | 9 +- src/libs/utils/detailsbutton.h | 1 - src/libs/utils/devicefileaccess.cpp | 26 ++-- src/libs/utils/differ.cpp | 9 +- src/libs/utils/elfreader.cpp | 25 ++-- src/libs/utils/elfreader.h | 2 - src/libs/utils/environmentdialog.cpp | 17 +-- src/libs/utils/fancylineedit.cpp | 5 +- src/libs/utils/fancymainwindow.cpp | 7 +- src/libs/utils/filenamevalidatinglineedit.cpp | 22 ++-- src/libs/utils/filepath.cpp | 5 +- src/libs/utils/filesearch.cpp | 21 ++- src/libs/utils/filesystemmodel.cpp | 15 ++- src/libs/utils/fileutils.cpp | 29 ++-- src/libs/utils/fileutils.h | 4 - src/libs/utils/filewizardpage.cpp | 11 +- src/libs/utils/hostosinfo.cpp | 5 +- src/libs/utils/infobar.cpp | 7 +- src/libs/utils/jsontreeitem.cpp | 20 +-- src/libs/utils/jsontreeitem.h | 1 - src/libs/utils/launcherinterface.cpp | 8 +- src/libs/utils/launchersocket.cpp | 24 ++-- src/libs/utils/macroexpander.cpp | 22 ++-- src/libs/utils/macroexpander.h | 1 - src/libs/utils/minimizableinfobars.cpp | 3 +- src/libs/utils/namevaluemodel.cpp | 9 +- src/libs/utils/namevaluesdialog.cpp | 5 +- src/libs/utils/pathchooser.cpp | 42 +++--- src/libs/utils/pathlisteditor.cpp | 7 +- src/libs/utils/persistentsettings.cpp | 6 +- src/libs/utils/projectintropage.cpp | 29 ++-- src/libs/utils/qrcparser.cpp | 11 +- src/libs/utils/qtcprocess.cpp | 23 ++-- src/libs/utils/reloadpromptutils.cpp | 55 +++----- src/libs/utils/removefiledialog.cpp | 9 +- src/libs/utils/settingsaccessor.cpp | 77 +++++------ src/libs/utils/settingsselector.cpp | 16 ++- src/libs/utils/stringutils.cpp | 4 +- src/libs/utils/terminalprocess.cpp | 37 +++--- src/libs/utils/textfileformat.cpp | 7 +- src/libs/utils/unixutils.cpp | 17 ++- src/libs/utils/variablechooser.cpp | 19 +-- src/libs/utils/wizard.cpp | 3 +- 65 files changed, 486 insertions(+), 1964 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 9c83c1edc1..e7f565c2f3 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -14755,7 +14755,7 @@ p, li { white-space: pre-wrap; } - Utils::CheckableMessageBox + ::Utils Dialog Dialog @@ -14776,9 +14776,6 @@ p, li { white-space: pre-wrap; } Do not &ask again &Neptat se znovu - - - Utils::WizardPage Choose the location Vybrat umístění @@ -14795,9 +14792,6 @@ p, li { white-space: pre-wrap; } Choose the Location Vybrat umístění - - - Utils::NewClassWidget Class name: Název třídy: @@ -14902,17 +14896,10 @@ p, li { white-space: pre-wrap; } Inherits QQuickItem - Qt Quick 2 Dědí ze třídy QQuickItem - Qt Quick 2 - - - Utils::ProjectIntroPage Introduction and project location Uvedení a umístění projektu - - Name: - Název: - Create in: Vytvořit v: @@ -14941,9 +14928,6 @@ p, li { white-space: pre-wrap; } Project: Projekt: - - - Utils::SubmitEditorWidget Subversion Submit Odeslání Subversion @@ -16194,7 +16178,7 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás - Utils::ClassNameValidatingLineEdit + ::Utils The class name must not contain namespace delimiters. Název třídy nesmí obsahovat znaky pro oddělení jmenného prostoru. @@ -16207,9 +16191,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás The class name contains invalid characters. Název třídy obsahuje neplatné znaky. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Nepodařilo se zřídit spojovací kanál: %1 @@ -16286,9 +16267,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Cannot obtain exit status from inferior: %1 Nepodařilo se získat vrácenou hodnotu z podřízeného: %1 - - - Utils::DetailsButton Show Details Ukázat podrobnosti @@ -16297,9 +16275,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Details Podrobnosti - - - Utils::FileNameValidatingLineEdit The name must not be empty Název nesmí být prázdný @@ -16344,9 +16319,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás File extensions %1 are required: Je požadována jedna ze souborových přípon %1: - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -16371,9 +16343,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás %1: %n výskyty ve %2 ze %3 souborů. - - - Utils::PathChooser Choose... Vybrat... @@ -16450,13 +16419,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás The path '%1' is not a file. Cesta '%1' neukazuje na soubor. - - Path: - Cesta: - - - - Utils::PathListEditor Insert... Vložit... @@ -16481,9 +16443,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás From "%1" Z "%1" - - - Utils::ProjectNameValidatingLineEdit The name must not contain the '.'-character. Název nesmí obsahovat znak '.'. @@ -16496,9 +16455,6 @@ Toho se dosáhne vložením této zkratky v zadávacím poli vyhledávače, nás Invalid character '.'. Neplatný znak '.'. - - - Utils::reloadPrompt File Changed Soubor byl změněn @@ -21586,7 +21542,7 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc - Utils::FancyMainWindow + ::Utils Locked Ukotveno @@ -21595,16 +21551,10 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc Reset to Default Layout Nastavit znovu výchozí rozvržení - - - Utils::FileWizardDialog Location Umístění - - - Utils::FilterLineEdit Filter Filtr @@ -21613,9 +21563,6 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc Clear text Smazat text - - - Utils::fileDeletedPrompt File has been removed Soubor byl odstraněn @@ -21656,16 +21603,10 @@ Pro projekty qmlproject použijte vlastnost importPaths pro přidání zaváděc Save Uložit - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Proměnná</th><th>Roztáhne se k</th></tr><tr><td>%d</td><td>adresáři současného souboru</td></tr><tr><td>%f</td><td>souborový název (s úplnou cestou)</td></tr><tr><td>%n</td><td>souborový název (bez cesty)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::LinearProgressWidget ... ... @@ -29268,7 +29209,7 @@ With cache simulation, further event counters are enabled: - Utils::DebuggerLanguageChooser + ::Utils C++ C++ @@ -29285,9 +29226,6 @@ With cache simulation, further event counters are enabled: <a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">What are the prerequisites?</a> <a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">Jaké jsou předpoklady?</a> - - - Utils::EnvironmentModel <UNSET> <NENÍ NASTAVENO> @@ -29310,9 +29248,6 @@ With cache simulation, further event counters are enabled: Value when inserting a new variable <HODNOTA> - - - Utils::FileUtils Refusing to remove root directory. Kořenový adresář nelze odstranit.. @@ -29365,23 +29300,14 @@ With cache simulation, further event counters are enabled: Cannot create temporary file in %1: %2 Nepodařilo se vytvořit žádný dočasný soubor v %1: %2 - - - Utils::IpAddressLineEdit The IP address is not valid. IP adresa je neplatná. - - - Utils::QtcProcess Error in command line. Chyba v příkazovém řádku. - - - Utils::Internal::SftpChannelPrivate Server could not start sftp subsystem. Server se nepodařilo spustit subsystém sftp. @@ -29477,14 +29403,11 @@ Server: %2. - Utils::Internal::SshChannelManager + ::Utils Invalid channel id %1 Neplatný identifikátor kanálu %1 - - - Utils::Internal::SshConnectionPrivate SSH Protocol error: %1 Chyba v protokolu SSH: %1 @@ -29501,10 +29424,6 @@ Server: %2. Invalid server id '%1'. Neplatný identifikátor serveru '%1'. - - Unexpected packet of type %1. - Neočekávaný paket typu %1. - Private key error: %1 Chyba v soukromém klíči: %1 @@ -29545,9 +29464,6 @@ Server: %2. Private key file error: %1 Chyba v soukromém klíči: %1 - - - Utils::SynchronousProcess The command '%1' finished successfully. Příkaz '%1' byl ukončen úspěšně. @@ -38167,7 +38083,7 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. - Utils::Ssh + ::Utils Password Required Heslo vyžadováno @@ -38176,9 +38092,6 @@ Prověřte, prosím, oprávnění pro přístup k adresáři. Please enter the password for your private key. Zadejte, prosím, heslo pro svůj soukromý klíč. - - - Utils::TextFileFormat Out of memory. Není dostupná žádná další paměť. @@ -39293,7 +39206,7 @@ Filtr: %2 - Utils::SshKeyCreationDialog + ::Utils SSH Key Configuration Nastavení klíče SSH @@ -42392,14 +42305,11 @@ Jméno <E-mail> alias <E-mail>. - Utils::BaseTreeView + ::Utils Adjust Column Widths to Contents Přizpůsobit šířku sloupců obsahu - - - Utils::SettingsSelector Add Přidat @@ -42424,9 +42334,6 @@ Jméno <E-mail> alias <E-mail>. Rename... Přejmenovat... - - - Utils::SftpFileSystemModel File Type Typ souboru @@ -42443,9 +42350,6 @@ Jméno <E-mail> alias <E-mail>. Error listing contents of directory '%1': %2 Chyba při vypisování obsahu adresáře '%1': %2 - - - Utils::Internal::SshRemoteProcessPrivate Process killed by signal Proces ukončen signálem @@ -46006,7 +45910,7 @@ Je zapotřebí mít nějakou verzi Qt a sadu nástrojů, aby modely kódu C++ a - Utils::ElfReader + ::Utils '%1' is an invalid ELF object (%2) '%1' je neplatným objektem ELF (%2) @@ -51634,7 +51538,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 Chyba v XML na řádku %1, sloupec %2: %3 @@ -52294,7 +52198,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - Diff + ::Utils Delete Smazat @@ -55570,15 +55474,7 @@ Vytvořte, prosím, aplikaci qmldump na stránce pro nastavení verze Qt. - Utils::FancyLineEdit - - Filter - Filtr - - - Clear text - Smazat text - + ::Utils ::Android diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 0d8e43b0d2..aaf5bf35a7 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -13869,7 +13869,7 @@ Det hjælper måske at genbygge projektet. - Diff + ::Utils Delete Slet @@ -28844,7 +28844,7 @@ Byg venligst qmldump-programmet på valgmulighedersiden Qt version. - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 XML-fejl på linje %1, kolonne %2: %3 @@ -36276,7 +36276,7 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. - Utils::CheckableMessageBox + ::Utils Do not ask again Spørg ikke igen @@ -36289,9 +36289,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. Do not &show again &Vis ikke igen - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. Klassenavnet må ikke indeholde navnerum-afgrænsere. @@ -36304,9 +36301,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. The class name contains invalid characters. Klassenavnet indeholder ugyldige tegn. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Kan ikke opsætte kommunikationskanal: %1 @@ -36375,9 +36369,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. Cannot obtain exit status from inferior: %1 Kan ikke få fat i exit-status fra den laverestående: %1 - - - Utils::DebuggerMainWindow &Views &Visninger @@ -36402,16 +36393,10 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. Stop Stop - - - Utils::DetailsButton Details Detaljer - - - Utils::ElfReader "%1" is an invalid ELF object (%2) "%1" er et ugyldigt ELF-objekt (%2) @@ -36455,9 +36440,6 @@ Vil blive anvendt på blanktegn i kommentarer og strenge. section name %1 of %2 behind end of file sektionsnavn %1 af %2 efter filens slutning - - - Utils::EnvironmentDialog Enter one environment variable per line. To set or change a variable, use VARIABLE=VALUE. @@ -36472,9 +36454,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Edit Environment Rediger miljø - - - Utils::EnvironmentModel <UNSET> <AFSÆT> @@ -36497,9 +36476,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Value when inserting a new variable <VÆRDI> - - - Utils::FancyLineEdit Filter Filter @@ -36508,9 +36484,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Clear text Ryd tekst - - - Utils::FancyMainWindow Central Widget Central-widget @@ -36523,9 +36496,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Automatically Hide View Title Bars Skjul automatisk visningernes titellinjer - - - Utils::FileNameValidatingLineEdit Name is empty. Navn er tomt. @@ -36554,16 +36524,10 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. File extensions %1 are required: Filendelser %1 er krævet: - - - Utils::FileSaverBase File Error Filfejl - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -36590,9 +36554,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. List of comma separated wildcard filters. Files with file name or full file path matching any filter are included. Liste med kommasepareret jokertegnsfiltre. Filer med filnavn eller fuld filsti som matcher filter inkluderes. - - - Utils::FileUtils Refusing to remove root directory. Nægter at fjerne rodmappe. @@ -36625,10 +36586,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Cannot read %1: %2 Kan ikke læse %1: %2 - - File Error - Filfejl - Cannot write file %1: %2 Kan ikke skrive filen %1: %2 @@ -36653,30 +36610,18 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Cannot create temporary file in %1: %2 Kan ikke oprette midlertidig fil i %1: %2 - - - Utils::FileWizardPage Location Placering - - - Utils::HostOsInfo Cannot create OpenGL context. Kan ikke oprette OpenGL-kontekst. - - - Utils::LinearProgressWidget ... ... - - - Utils::MacroExpander Infinite recursion error Uendelig rekursiv fejl @@ -36713,9 +36658,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Access environment variables. Tilgå miljøvariabler. - - - Utils::NewClassWidget &Class name: &Klassenavn: @@ -36788,9 +36730,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Invalid form file name: "%1" Ugyldigt udformningsfilnavn: "%1" - - - Utils::PathChooser Choose... Vælg... @@ -36851,9 +36790,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Path: Sti: - - - Utils::PathListEditor Insert... Indsæt... @@ -36866,9 +36802,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Clear Ryd - - - Utils::ProjectIntroPage Introduction and Project Location Introduktion og projektplacering @@ -36893,10 +36826,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Enter project name Indtast projektnavn - - Location - Placering - The project already exists. Projektet findes allerede. @@ -36905,10 +36834,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. A file with that name already exists. En fil med det navn findes allerede. - - Name is empty. - Navn er tomt. - Name does not match "%1". Navn matcher ikke "%1". @@ -36921,9 +36846,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Invalid character "%1" found. Ugyldigt tegn "%1" fundet. - - - Utils::ProxyCredentialsDialog Proxy Credentials Proxy-legitimationsoplysninger @@ -36948,16 +36870,10 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Password Adgangskode - - - Utils::QtcProcess Error in command line. Fejl i kommandolinje. - - - Utils::SettingsAccessor Failed to Read File Kunne ikke læse fil @@ -37002,9 +36918,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. "%1" is not supported by %1. Do you want to try loading it anyway? "%1" understøttes ikke af %1. Vil du prøve at indlæse den alligevel? - - - Utils::SettingsSelector Add Tilføj @@ -37029,9 +36942,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Rename... Omdøb... - - - Utils::ShellCommand UNKNOWN UKENDT @@ -37040,9 +36950,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Unknown Ukendt - - - Utils::ShellCommandPage Command started... Kommando startet... @@ -37063,9 +36970,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Failed. Mislykkedes. - - - Utils::SynchronousProcess The command "%1" finished successfully. Kommandoen "%1" afsluttede med succes. @@ -37102,9 +37006,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. Would you like to terminate it? Vil du terminere den? - - - Utils::TextFileFormat Out of memory. Ikke mere ledig hukommelse. @@ -37113,31 +37014,14 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. An encoding error was encountered. Stødte på en kodningsfejl. - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Variabel</th><th>Udfolder til</th></tr><tr><td>%d</td><td>mappe af aktuel fil</td></tr><tr><td>%f</td><td>filnavn (med fuld sti)</td></tr><tr><td>%n</td><td>filnavn (uden sti)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::WizardPage Choose the Location Vælg placeringen - - Name: - Navn: - - - Path: - Sti: - - - - Utils::fileDeletedPrompt File Has Been Removed Filen er blevet fjernet @@ -37162,9 +37046,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. &Save &Gem - - - Utils::reloadPrompt File Changed Fil ændret @@ -37177,10 +37058,6 @@ Put dens navn på en linje for sig selv, for at rydde en variabel. The file <i>%1</i> has been changed on disk. Do you want to reload it? Filen <i>%1</i> er blevet ændret på disk. Vil du genindlæse den? - - &Close - &Luk - No to All && &Diff Nej til alle og &diff @@ -39597,7 +39474,7 @@ skal være et repository krævet SSH-autentifikation (se dokumentation på SSH o - Utils::RemoveFileDialog + ::Utils Remove File Fjern fil @@ -39859,7 +39736,7 @@ Spordataene er tabt. - Utils::EnvironmentIdAccessor + ::Utils Settings File for "%1" from a Different Environment? Indstillingsfil for "%1" fra et andet miljø? diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index cd20bd5fa1..66846904ec 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -12105,7 +12105,7 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun - Utils::CheckableMessageBox + ::Utils Do not ask again Nicht noch einmal nachfragen @@ -12126,9 +12126,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun Do not &show again Nicht noch einmal an&zeigen - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. Der Klassenname darf keine Namensraum-Trenner enthalten. @@ -12141,16 +12138,10 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun The class name contains invalid characters. Der Klassennamen enthält ungültige Zeichen. - - - Utils::DetailsButton Details Details - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -12177,9 +12168,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun List of comma separated wildcard filters. Files with file name or full file path matching any filter are included. Kommaseparierte Liste von Platzhalter-Filtern. Dateien werden eingeschlossen, wenn ihr Name oder vollständiger Pfad einem der Filter entspricht. - - - Utils::PathChooser Choose... Auswählen... @@ -12244,9 +12232,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun Path: Pfad: - - - Utils::PathListEditor Insert... Einfügen... @@ -12259,17 +12244,10 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun Clear Löschen - - - Utils::ProjectIntroPage Enter project name Geben Sie einen Namen für das Projekt ein - - Location - Pfad - The project already exists. Das Projekt existiert bereits. @@ -12310,9 +12288,6 @@ Werte kleiner als 100% können überlappende und falsch ausgerichtete Darstellun Introduction and Project Location Einführung und Projektverzeichnis - - - Utils::reloadPrompt File Changed Datei geändert @@ -13059,7 +13034,7 @@ Was möchten Sie tun? - Utils::UnixTools + ::Utils <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expandiert zu</th></tr><tr><td>%d</td><td>Verzeichnis der aktuellen Datei</td></tr><tr><td>%f</td><td>Dateiname mit vollständigem Pfad</td></tr><tr><td>%n</td><td>Dateiname (ohne Pfad)</td></tr><tr><td>%%</td><td>%</td></tr></table> @@ -14827,7 +14802,7 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: - Utils::fileDeletedPrompt + ::Utils File Has Been Removed Die Datei wurde gelöscht @@ -14836,10 +14811,6 @@ zu deaktivieren, deaktiviert auch die folgenden Plugins: The file %1 has been removed from disk. Do you want to save it under a different name, or close the editor? Die Datei %1 wurde vom Speichermedium gelöscht. Möchten Sie sie unter einem anderen Namen speichern oder den Editor schließen? - - &Close - &Schließen - C&lose All A&lle schließen @@ -15052,7 +15023,7 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa - Utils::LinearProgressWidget + ::Utils ... ... @@ -15149,7 +15120,7 @@ Für CMake-Projekte stellen Sie sicher, dass die Variable QML_IMPORT_PATH in CMa - Utils::FancyMainWindow + ::Utils Central Widget Zentrales Widget @@ -15928,11 +15899,7 @@ Möchten Sie sie überschreiben? - Utils::FileNameValidatingLineEdit - - Name is empty. - Der Dateiname ist leer. - + ::Utils Name contains white space. Der Name enthält Leerzeichen. @@ -16170,14 +16137,7 @@ Möchten Sie sie überschreiben? - Utils::EnvironmentModel - - <VARIABLE> - <Variable> - - - - Utils::QtcProcess + ::Utils Error in command line. Fehler in Kommandozeile. @@ -19728,7 +19688,7 @@ Speichern fehlgeschlagen. - Utils::FileUtils + ::Utils Refusing to remove root directory. Das Wurzelverzeichnis kann nicht entfernt werden. @@ -20836,7 +20796,7 @@ When disabled, moves targets straight to the current mouse position. - Utils::TextFileFormat + ::Utils Out of memory. Es ist kein Speicher mehr verfügbar. @@ -22534,7 +22494,7 @@ Bestimmt das Verhalten bezüglich der Einrückung von Fortsetzungszeilen. - Utils::SettingsSelector + ::Utils Add Hinzufügen @@ -25194,7 +25154,7 @@ wirklich löschen? - Utils::ElfReader + ::Utils "%1" is an invalid ELF object (%2) "%1" ist keine gültige ELF-Objektdatei (%2) @@ -27716,7 +27676,7 @@ The affected files are: - Diff + ::Utils Delete Löschen @@ -28142,7 +28102,7 @@ The affected files are: - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 XML-Fehler in Zeile %1, Spalte %2: %3 @@ -30313,7 +30273,7 @@ Bitte erstellen Sie die Anwendung qmldump auf der Einstellungsseite der Qt-Versi - Utils::FancyLineEdit + ::Utils Filter Filter @@ -30779,7 +30739,7 @@ Möchten Sie es beenden? - Utils::ProxyCredentialsDialog + ::Utils Proxy Credentials Proxy-Nutzerdaten @@ -30878,7 +30838,7 @@ Möchten Sie es beenden? - Utils::FileWizardPage + ::Utils Choose the Location Pfadangabe @@ -30887,10 +30847,6 @@ Möchten Sie es beenden? File name: Dateiname: - - Path: - Pfad: - Location Ort @@ -31043,7 +30999,7 @@ Möchten Sie es beenden? - Utils::SettingsAccessor + ::Utils Failed to Read File Datei konnte nicht gelesen werden @@ -31330,7 +31286,7 @@ Möchten Sie es beenden? - Utils::MacroExpander + ::Utils Infinite recursion error Fehler: Endlose Rekursion @@ -34570,7 +34526,7 @@ provided they were unmodified before the refactoring. - Utils::HostOsInfo + ::Utils Cannot create OpenGL context. OpenGL-Kontext kann nicht erzeugt werden. @@ -37628,7 +37584,7 @@ Siehe auch die Einstellungen für Google Test. - Utils::DebuggerMainWindow + ::Utils Start Starten @@ -38193,7 +38149,7 @@ Drücken Sie zusätzlich die Umschalttaste, wird ein Escape-Zeichen an der aktue - Utils::EnvironmentDialog + ::Utils Edit Environment Umgebung bearbeiten @@ -39491,11 +39447,7 @@ Zeile: %4, Spalte: %5 - Utils::FileSaverBase - - File Error - Dateifehler - + ::Utils ::Core @@ -40716,7 +40668,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten. - Utils::RemoveFileDialog + ::Utils Remove File Datei entfernen @@ -40758,7 +40710,7 @@ Außer Leerzeichen innerhalb von Kommentaren und Zeichenketten. - Utils::EnvironmentIdAccessor + ::Utils Settings File for "%1" from a Different Environment? Einstellungsdatei für "%1" aus anderer Umgebung? @@ -42918,7 +42870,7 @@ You might find further explanations in the Application Output view. - JsonTreeModelItem + ::Utils Null Null @@ -44019,7 +43971,7 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. - Utils::NameValueModel + ::Utils <UNSET> <NICHT GESETZT> @@ -44042,9 +43994,6 @@ Doppelklicken Sie einen Eintrag um ihn zu ändern. Value when inserting a new variable <VALUE> - - - StringUtils Elapsed time: %1. Verstrichene Zeit: %1. @@ -46414,7 +46363,7 @@ Useful if build directory is corrupted or when rebuilding with a newer version o - Utils::InfoBarDisplay + ::Utils &Show Details &Details anzeigen @@ -50250,7 +50199,7 @@ the QML editor know about a likely URI. - Utils::Archive + ::Utils File format not supported. Dateiformat wird nicht unterstützt. @@ -50274,16 +50223,10 @@ in "%2" aus. - - - Utils::StringAspect Reset Zurücksetzen - - - Utils::TriStateAspect Enable Aktivieren @@ -50296,16 +50239,10 @@ in "%2" aus. Leave at Default Vorgabe beibehalten - - - Utils::BaseTreeView Show %1 Column Spalte %1 anzeigen - - - Utils::FileSystemModel My Computer Mein Computer @@ -50351,7 +50288,7 @@ in "%2" aus. - Utils::LauncherSocket + ::Utils Failed to start process launcher at "%1": %2 Prozess-Launcher "%1" konnte nicht gestartet werden: %2 @@ -50376,23 +50313,14 @@ in "%2" aus. Launcher socket closed unexpectedly. Launcher-Socket wurde unerwartet geschlossen. - - - Utils::LauncherHandle Process launcher socket error. Prozess-Launcher Socketfehler. - - - Utils::MinimizableInfoBars Minimize Minimieren - - - Utils::NameValuesDialog &OK &OK @@ -50401,9 +50329,6 @@ in "%2" aus. &Cancel &Abbrechen - - - Utils::VariableChooser Insert Variable Variable einfügen diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 1c2b683262..d65a58e504 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -1691,7 +1691,7 @@ Would you like to overwrite them? - Utils::ClassNameValidatingLineEdit + ::Utils The class name must not contain namespace delimiters. El nombre de clase no debe contener delimitadores de namespaces. @@ -1704,9 +1704,6 @@ Would you like to overwrite them? The class name contains invalid characters. El nombre de clase contiene caracteres inválidos. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 No se pudo establecer canal de comunicación: %1 @@ -1755,9 +1752,6 @@ Would you like to overwrite them? Cannot obtain exit status from inferior: %1 No se pudo obtener el estado de salida del inferior: %1 - - - Utils::FileNameValidatingLineEdit The name must not be empty El nombre no puede dejarse vacío @@ -1774,9 +1768,6 @@ Would you like to overwrite them? The name must not match that of a MS Windows device. (%1). El nombre no debe coincidir con el nombre de dispositivo de MS Windows. (%1). - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -1798,9 +1789,6 @@ Would you like to overwrite them? %1: %n coincidencias encontradas en %2 de %3 archivos. - - - Utils::NewClassWidget Invalid base class name Nombre de clase base inválido @@ -1851,9 +1839,6 @@ Would you like to overwrite them? Path: Ruta: - - - Utils::PathChooser Choose... Elegir... @@ -1890,9 +1875,6 @@ Would you like to overwrite them? Path: Ruta: - - - Utils::PathListEditor Insert... Insertar... @@ -1913,9 +1895,6 @@ Would you like to overwrite them? From "%1" Desde "%1" - - - Utils::ProjectIntroPage <Enter_Name> <Introduzca_nombre> @@ -1942,16 +1921,10 @@ Would you like to overwrite them? Create in: Crear en: - - - Utils::ProjectNameValidatingLineEdit The name must not contain the '.'-character. El nombre no puede contener el caracter '.' (punto). - - - Utils::SubmitEditorWidget Subversion Submit Enviar a Subversion @@ -1966,26 +1939,10 @@ Would you like to overwrite them? F&iles Arch&ivos - - - Utils::WizardPage Choose the location Seleccione ubicación - - - Name: - Nombre: - - - - Path: - Ruta: - - - - Utils::reloadPrompt File Changed El archivo fue modificado @@ -10504,7 +10461,7 @@ p, li { white-space: pre-wrap; } - Utils::CheckableMessageBox + ::Utils Dialog @@ -11414,7 +11371,7 @@ p, li { white-space: pre-wrap; } - Utils::DetailsButton + ::Utils Show Details diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 40bf257c9e..960d7bd008 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -1871,7 +1871,7 @@ Voulez vous les écraser ? - Utils::CheckableMessageBox + ::Utils Dialog Boîte de dialogue @@ -1892,9 +1892,6 @@ Voulez vous les écraser ? Do not &ask again Ne plus &redemander - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. Le nom de classe ne doit pas contenir de délimiteur d'espace de nommage. @@ -1907,9 +1904,6 @@ Voulez vous les écraser ? The class name contains invalid characters. Le nom de classe contient des caractères invalides. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Impossible d'établir le canal de communication : %1 @@ -1986,9 +1980,6 @@ Voulez vous les écraser ? Cannot obtain exit status from inferior: %1 Impossible d'obtenir la valeur de retour du processus : %1 - - - Utils::FileNameValidatingLineEdit The name must not be empty Le nom ne peut pas être vide @@ -2033,9 +2024,6 @@ Voulez vous les écraser ? File extensions %1 are required: Les extensions de fichier %1 sont nécessaires : - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -2057,9 +2045,6 @@ Voulez vous les écraser ? %1 : %n occurences trouvés dans %2 de %3 fichiers. - - - Utils::NewClassWidget Class name: Nom de la classe : @@ -2084,10 +2069,6 @@ Voulez vous les écraser ? Form file: Fichier d'interface : - - Path: - Chemin : - Invalid base class name Nom de la classe parente invalide @@ -2169,9 +2150,6 @@ Voulez vous les écraser ? Inherits QQuickItem - Qt Quick 2 Hérite de QQuickItem - Qt Quick 2 - - - Utils::PathChooser Choose... Choisir... @@ -2257,9 +2235,6 @@ Voulez vous les écraser ? Path: Chemin : - - - Utils::PathListEditor Insert... Insérer... @@ -2284,9 +2259,6 @@ Voulez vous les écraser ? From "%1" Depuis "%1" - - - Utils::ProjectIntroPage Introduction and project location Introduction et emplacement du projet @@ -2323,9 +2295,6 @@ Voulez vous les écraser ? Project: Projet : - - - Utils::ProjectNameValidatingLineEdit The name must not contain the '.'-character. Le nom ne peut pas contenir le caractère '.'. @@ -2334,9 +2303,6 @@ Voulez vous les écraser ? Invalid character '.'. Caractère invalide '.'. - - - Utils::SubmitEditorWidget Subversion Submit Submit Subversion @@ -2394,28 +2360,14 @@ Voulez vous les écraser ? Check a&ll Coche&r tout - - - Utils::WizardPage Choose the location Choisir l'emplacement - - Name: - Nom : - - - Path: - Chemin : - Choose the Location Choisir l'emplacement - - - Utils::reloadPrompt File Changed Fichier modifié @@ -16104,7 +16056,7 @@ p, li { white-space: pre-wrap; } - Utils::DetailsButton + ::Utils Show Details Afficher les détails @@ -20740,7 +20692,7 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l - Utils::FancyMainWindow + ::Utils Locked Verrouillé @@ -20749,16 +20701,10 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l Reset to Default Layout Restaurer la disposition par défaut - - - Utils::FileWizardDialog Location Emplacement - - - Utils::FilterLineEdit Filter Filtre @@ -20767,9 +20713,6 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l Clear text Effacer le texte - - - Utils::fileDeletedPrompt File has been removed Le fichier a été supprimé @@ -20810,16 +20753,10 @@ Pour les projets qmlproject , utilisez la propriété importPaths pour ajouter l Save Enregistrer - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Développer en</th></tr><tr><td>%d</td><td>répertoire du fichier courant</td></tr><tr><td>%f</td><td>nom du fichier (avec le chemin complet)</td></tr><tr><td>%n</td><td>nom du fichier (sans le chemin)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::LinearProgressWidget ... ... @@ -25258,7 +25195,7 @@ Preselects Qt for Simulator and mobile targets if available - Utils::DebuggerLanguageChooser + ::Utils C++ C++ @@ -25275,9 +25212,6 @@ Preselects Qt for Simulator and mobile targets if available <a href="qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html">What are the prerequisites?</a> <a href="qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html">Quels sont les prérequis?</a> - - - Utils::SynchronousProcess The command '%1' finished successfully. La commande "%1' s"est terminée avec succès. @@ -28886,14 +28820,11 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f - Utils::AbstractProcess + ::Utils Cannot retrieve debugging output. Impossible d'obtenir la sortie du débogage. - - - Utils::EnvironmentModel <UNSET> <NON-DÉFINI> @@ -28916,23 +28847,14 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Value when inserting a new variable <VALEUR> - - - Utils::IpAddressLineEdit The IP address is not valid. L'adresse IP est invalide. - - - Utils::QtcProcess Error in command line. Erreur dans la ligne de commande. - - - Utils::Internal::SftpChannelPrivate Server could not start sftp subsystem. Le serveur ne peut démarrer le sous-système sftp. @@ -29017,16 +28939,10 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Error reading local file: %1 Erreur lors de la lecture du fichier local : %1 - - - Utils::Internal::SshChannelManager Invalid channel id %1 Identifiant %1 du canal invalide - - - Utils::Internal::SshConnectionPrivate SSH Protocol error: %1 Erreur dans le protocole SSH : %1 @@ -29043,10 +28959,6 @@ Les version de Qt précédentes ont des limitations lors de la compilation des f Invalid server id '%1'. Identifiant de serveur invalide "%1". - - Unexpected packet of type %1. - Paquet de type %1 inattendu. - Could not read private key file: %1 Impossible de lire le fichier de la clé privée : %1 @@ -33687,7 +33599,7 @@ Avec la simulation de cache, d'autres compteurs d'événements sont ac - Utils::FileUtils + ::Utils Refusing to remove root directory. Impossible de supprimer le répertoire racine. @@ -36749,7 +36661,7 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle - Utils::Ssh + ::Utils Password Required Mot de passe requis @@ -36758,9 +36670,6 @@ Pour compiler l'observateur QML, allez à la page des versions de Qt, séle Please enter the password for your private key. Veuillez insérer votre mot de passe pour votre clé privée. - - - Utils::TextFileFormat Out of memory. Mémoire insuffisante. @@ -39600,7 +39509,7 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e - Utils::SettingsSelector + ::Utils Add Ajouter @@ -39625,9 +39534,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e Rename... Renommer... - - - Utils::SftpFileSystemModel File Type Type du fichier @@ -39644,9 +39550,6 @@ si un dépôt requiert une authentification SSH (voir la documentation sur SSH e Error listing contents of directory '%1': %2 Erreur lors du listage du contenu du répertoire '%1' : %2 - - - Utils::Internal::SshRemoteProcessPrivate Process killed by signal Processus tué par un signal @@ -41970,14 +41873,11 @@ Le fichier APL ne sera pas utilisable sur d'autres périphériques. - Utils::BaseTreeView + ::Utils Adjust Column Widths to Contents Ajuster la largeur des colonnes au contenu - - - Utils::ElfReader '%1' is an invalid ELF object (%2) "%1" est un objet ELF invalide (%2) @@ -46830,7 +46730,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 Erreur XML sur la ligne %1, colonne %2 : %3 @@ -48001,7 +47901,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - Diff + ::Utils Delete Supression diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 7f465f5517..cbcb0c609c 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -449,7 +449,7 @@ - Utils::WizardPage + ::Utils Choose the Location Odaberi mjesto @@ -462,9 +462,6 @@ Path: Staza: - - - Utils::NewClassWidget &Class name: Naziv &klase: @@ -537,17 +534,10 @@ Invalid form file name: "%1" Nevaljani naziv datoteke obrasca: "%1" - - - Utils::ProjectIntroPage Introduction and Project Location Uvod i mjesto projekta - - Name: - Naziv: - Create in: Stvori u: @@ -592,9 +582,6 @@ Invalid character "%1" found. Nađen je nevaljani slovni znak "%1". - - - Utils::ProxyCredentialsDialog Proxy Credentials Korisnički podaci za poslužitelja @@ -619,9 +606,6 @@ Password Lozinka - - - Utils::RemoveFileDialog Remove File Ukloni datoteku @@ -12377,7 +12361,7 @@ The trace data is lost. - Utils::CheckableMessageBox + ::Utils Do not ask again Ne pitaj ponovo @@ -12390,9 +12374,6 @@ The trace data is lost. Do not &show again - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. @@ -12405,9 +12386,6 @@ The trace data is lost. The class name contains invalid characters. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 @@ -12476,16 +12454,10 @@ The trace data is lost. Cannot obtain exit status from inferior: %1 - - - Utils::DetailsButton Details Detalji - - - Diff Delete Ukloni @@ -12498,9 +12470,6 @@ The trace data is lost. Equal - - - Utils::ElfReader "%1" is an invalid ELF object (%2) @@ -12545,9 +12514,6 @@ The trace data is lost. section name %1 of %2 behind end of file - - - Utils::EnvironmentDialog Enter one environment variable per line. To set or change a variable, use VARIABLE=VALUE. @@ -12559,9 +12525,6 @@ To clear a variable, put its name on a line with nothing else on it. Edit Environment - - - Utils::EnvironmentModel <UNSET> @@ -12584,9 +12547,6 @@ To clear a variable, put its name on a line with nothing else on it. Value when inserting a new variable - - - Utils::FancyLineEdit Filter Filtar @@ -12616,7 +12576,7 @@ To clear a variable, put its name on a line with nothing else on it. - Utils::FancyMainWindow + ::Utils Central Widget @@ -12629,13 +12589,6 @@ To clear a variable, put its name on a line with nothing else on it. Automatically Hide View Title Bars - - - Utils::FileNameValidatingLineEdit - - Name is empty. - Naziv je prazan. - Name contains white space. Naziv sadrži razmake. @@ -12660,9 +12613,6 @@ To clear a variable, put its name on a line with nothing else on it. File extensions %1 are required: Datotečni nastavci %1 su obavezni: - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -12691,9 +12641,6 @@ To clear a variable, put its name on a line with nothing else on it. List of comma separated wildcard filters. Files with file name or full file path matching any filter are included. - - - Utils::FileUtils Refusing to remove root directory. @@ -12726,10 +12673,6 @@ To clear a variable, put its name on a line with nothing else on it. Cannot read %1: %2 - - File Error - - Cannot write file %1: %2 @@ -12754,23 +12697,10 @@ To clear a variable, put its name on a line with nothing else on it. Cannot create temporary file in %1: %2 - - - Utils::FileWizardPage - - Location - Mjesto - - - - Utils::HostOsInfo Cannot create OpenGL context. Nije moguće stvoriti kontekst za OpenGL. - - - JsonTreeModelItem Null Nula @@ -12807,9 +12737,6 @@ To clear a variable, put its name on a line with nothing else on it. %n stavaka - - - Utils::MacroExpander Infinite recursion error @@ -12904,7 +12831,7 @@ To clear a variable, put its name on a line with nothing else on it. - Utils::PathChooser + ::Utils Choose... Odaberi … @@ -12961,13 +12888,6 @@ To clear a variable, put its name on a line with nothing else on it. Full path: "%1" - - Path: - Staza: - - - - Utils::PathListEditor Insert... @@ -12980,23 +12900,14 @@ To clear a variable, put its name on a line with nothing else on it. Clear Ukloni - - - Utils::FileSaverBase File Error Greška datoteke - - - Utils::QtcProcess Error in command line. Greška u naredbenom retku. - - - Utils::reloadPrompt File Changed Datoteka je promijenjena @@ -13017,9 +12928,6 @@ To clear a variable, put its name on a line with nothing else on it. No to All && &Diff Ne za sve i &razlika - - - Utils::fileDeletedPrompt File Has Been Removed Datoteka je uklonjena @@ -13028,10 +12936,6 @@ To clear a variable, put its name on a line with nothing else on it. The file %1 has been removed from disk. Do you want to save it under a different name, or close the editor? - - &Close - &Zatvori - C&lose All Za&tvori sve @@ -13044,9 +12948,6 @@ To clear a variable, put its name on a line with nothing else on it. &Save &Spremi - - - Utils::SettingsAccessor Failed to Read File @@ -13091,9 +12992,6 @@ To clear a variable, put its name on a line with nothing else on it. "%1" is not supported by %2. Do you want to try loading it anyway? - - - Utils::EnvironmentIdAccessor Settings File for "%1" from a Different Environment? @@ -13102,9 +13000,6 @@ To clear a variable, put its name on a line with nothing else on it. <p>No settings file created by this instance of %1 was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%2"?</p> - - - Utils::SettingsSelector Add Dodaj @@ -13129,9 +13024,6 @@ To clear a variable, put its name on a line with nothing else on it. Rename... Preimenuj … - - - Utils::ShellCommand UNKNOWN NEPOZNATO @@ -13140,9 +13032,6 @@ To clear a variable, put its name on a line with nothing else on it. Unknown Nepoznato - - - Utils::ShellCommandPage Command started... Naredba je pokrenuta … @@ -13163,9 +13052,6 @@ To clear a variable, put its name on a line with nothing else on it. Failed. Neuspjelo. - - - Utils::SynchronousProcess The command "%1" finished successfully. @@ -13202,9 +13088,6 @@ To clear a variable, put its name on a line with nothing else on it. Would you like to terminate it? - - - Utils::TextFileFormat Out of memory. @@ -13213,16 +13096,10 @@ To clear a variable, put its name on a line with nothing else on it. An encoding error was encountered. - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::LinearProgressWidget ... … @@ -20674,7 +20551,7 @@ Oznake: %3 - Utils::DebuggerMainWindow + ::Utils &Views Prika&zi diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 5433fc93b9..40db042c8c 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -16903,7 +16903,7 @@ A következő kódolás valószínűleg erre illik: - Utils::CheckableMessageBox + ::Utils Dialog @@ -16916,9 +16916,6 @@ A következő kódolás valószínűleg erre illik: CheckBox - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. Az osztály neve nem tartalmazhat névtér határoló jeleket. @@ -16931,9 +16928,6 @@ A következő kódolás valószínűleg erre illik: The class name contains invalid characters. Az osztálynév érvénytelen karakter(eke)t tartalmaz. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Nem lehet beállítani a kommunikációs csatornát: %1 @@ -16982,16 +16976,10 @@ A következő kódolás valószínűleg erre illik: Cannot obtain exit status from inferior: %1 Nem sikerült megszerezni a kilépési státuszt alacsony rendből: %1 - - - Utils::DetailsButton Show Details Részletek megjelenítése - - - Utils::FileNameValidatingLineEdit The name must not be empty A nevet nem szabad üresen hagyni @@ -17008,9 +16996,6 @@ A következő kódolás valószínűleg erre illik: The name must not match that of a MS Windows device. (%1). A név nem egyezhet meg MS Windows eszközökkel. (%1). - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. %1: mégse. %n előfordulása található %2 fájlokban. @@ -17026,9 +17011,6 @@ A következő kódolás valószínűleg erre illik: %1: %n előfordulása található %3 fájlok %2-ben. - - - Utils::NewClassWidget Class name: Osztály név: @@ -17089,9 +17071,6 @@ A következő kódolás valószínűleg erre illik: Invalid form file name: '%1' Érvénytelen forma fájl név: '%1' - - - Utils::PathChooser Choose... Kiválasztás... @@ -17124,13 +17103,6 @@ A következő kódolás valószínűleg erre illik: The path '%1' is not a file. A(z) '%1' útvonal nem egy fájl. - - Path: - Útvonal: - - - - Utils::PathListEditor Insert... Beszúrás... @@ -17151,9 +17123,6 @@ A következő kódolás valószínűleg erre illik: From "%1" "%1"-tól - - - Utils::ProjectIntroPage Introduction and project location Bemutatás és projekt hely @@ -17178,16 +17147,10 @@ A következő kódolás valószínűleg erre illik: A file with that name already exists. Egy ilyen nevű fájl már létezik. - - - Utils::ProjectNameValidatingLineEdit The name must not contain the '.'-character. A név nem tartalmazgat '.' karaktert. - - - Utils::SubmitEditorWidget Subversion Submit Subversion feltöltés @@ -17200,24 +17163,10 @@ A következő kódolás valószínűleg erre illik: F&iles &Fájlok - - - Utils::WizardPage Choose the location A hely kiválasztása - - Name: - Név: - - - Path: - Útvonal: - - - - Utils::reloadPrompt File Changed File megváltoztatva diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 06fecc368f..20ac4f79b8 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -1710,7 +1710,7 @@ Vuoi sovrascriverli? - Utils::ClassNameValidatingLineEdit + ::Utils The class name must not contain namespace delimiters. Il nome della classe non deve contenere namespace. @@ -1723,9 +1723,6 @@ Vuoi sovrascriverli? The class name contains invalid characters. Il nome della classe contiene caratteri non validi. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Impossibile impostare il canale di comunicazione: %1 @@ -1774,9 +1771,6 @@ Vuoi sovrascriverli? Cannot obtain exit status from inferior: %1 Impossibile ottenere lo stato di uscita da: %1 - - - Utils::FileNameValidatingLineEdit The name must not be empty Il nome non deve essere vuoto @@ -1793,9 +1787,6 @@ Vuoi sovrascriverli? The name must not match that of a MS Windows device. (%1). Il nome non può essere quello di un dispositivo MS Windows (%1). - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -1817,9 +1808,6 @@ Vuoi sovrascriverli? %1: %n ricorrenze trovate in %2 di %3 file. - - - Utils::NewClassWidget Class name: Nome classe: @@ -1870,9 +1858,6 @@ Vuoi sovrascriverli? Invalid form file name: '%1' Nome del file form non valido: '%1' - - - Utils::PathChooser Choose... Scegli... @@ -1909,9 +1894,6 @@ Vuoi sovrascriverli? Path: Percorso: - - - Utils::PathListEditor Insert... Inserisci... @@ -1932,9 +1914,6 @@ Vuoi sovrascriverli? From "%1" Da "%1" - - - Utils::ProjectIntroPage Introduction and project location Introduzione e posizione del progetto @@ -1961,16 +1940,10 @@ Vuoi sovrascriverli? A file with that name already exists. Un file con lo stesso nome è già presente. - - - Utils::ProjectNameValidatingLineEdit The name must not contain the '.'-character. Il nome non può contenere il carattere '.'. - - - Utils::SubmitEditorWidget Subversion Submit Invio Subversion @@ -1985,26 +1958,10 @@ Vuoi sovrascriverli? F&iles F&ile - - - Utils::WizardPage Choose the location Scegli la posizione - - - Name: - Nome: - - - - Path: - Percorso: - - - - Utils::reloadPrompt File Changed File Modificato @@ -10380,7 +10337,7 @@ p, li { white-space: pre-wrap; } - Utils::CheckableMessageBox + ::Utils Dialog @@ -11245,7 +11202,7 @@ p, li { white-space: pre-wrap; } - Utils::DetailsButton + ::Utils Show Details diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 452b27f3bc..8db7b1a5b4 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -355,7 +355,7 @@ - Utils::WizardPage + ::Utils Choose the Location パスを選択してください @@ -368,9 +368,6 @@ Path: パス: - - - Utils::NewClassWidget &Class name: クラス名(&C): @@ -443,17 +440,10 @@ Invalid form file name: "%1" 無効なフォームファイル名: "%1" - - - Utils::ProjectIntroPage Introduction and Project Location プロジェクト名とパス - - Name: - 名前: - Create in: パス: @@ -9664,7 +9654,7 @@ CMake プロジェクトでは、CMakeCache.txt 内で QML_IMPORT_PATH 変数を - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 XML の %1 行目 %2 文字目 に誤りがあります: %3 @@ -10372,7 +10362,7 @@ with a password, which you can enter below. - Utils::CheckableMessageBox + ::Utils Do not ask again 今後このメッセージを表示しない @@ -10393,9 +10383,6 @@ with a password, which you can enter below. Do not &show again 今後このメッセージを表示しない(&S) - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. クラス名にはネームスペースの区切り文字を含めないでください。 @@ -10408,9 +10395,6 @@ with a password, which you can enter below. The class name contains invalid characters. クラス名に不正な文字が含まれています。 - - - Utils::ConsoleProcess Cannot set up communication channel: %1 通信チャンネルを用意できません: %1 @@ -10479,16 +10463,10 @@ with a password, which you can enter below. Cannot obtain exit status from inferior: %1 プログラムの終了ステータスが取得できません: %1 - - - Utils::DetailsButton Details 詳細 - - - Utils::ElfReader "%1" is an invalid ELF object (%2) "%1" は、不正な ELF オブジェクトです (%2) @@ -10531,9 +10509,6 @@ with a password, which you can enter below. section name %1 of %2 behind end of file %2 のセクション名 %1 がファイルの終端より後ろです - - - Utils::EnvironmentModel <UNSET> <未定義> @@ -10556,9 +10531,6 @@ with a password, which you can enter below. Value when inserting a new variable <値> - - - Utils::FancyMainWindow Central Widget 中央のウィジェット @@ -10571,13 +10543,6 @@ with a password, which you can enter below. Automatically Hide View Title Bars ビューのタイトルバーを自動的に隠す - - - Utils::FileNameValidatingLineEdit - - Name is empty. - ファイル名が未入力です。 - Name contains white space. ファイル名に空白が含まれています。 @@ -10606,9 +10571,6 @@ with a password, which you can enter below. File extensions %1 are required: 拡張子 %1 が必要です: - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -10633,9 +10595,6 @@ with a password, which you can enter below. List of comma separated wildcard filters. Files with file name or full file path matching any filter are included. コンマで区切られたワイルドカードフィルターのリストです。ファイル名またはフルファイルパスがいずれかのフィルターに一致するファイルが含まれます。 - - - Utils::FileUtils Refusing to remove root directory. ルートディレクトリは削除できません。 @@ -10704,9 +10663,6 @@ with a password, which you can enter below. Overwrite existing file "%1"? 既存のファイル "%1" を上書きしますか？ - - - Utils::PathChooser Choose... 選択... @@ -10775,13 +10731,6 @@ with a password, which you can enter below. Full path: <b>%1</b> フルパス: <b>%1</b> - - Path: - パス: - - - - Utils::PathListEditor Insert... 挿入... @@ -10794,16 +10743,10 @@ with a password, which you can enter below. Clear クリア - - - Utils::QtcProcess Error in command line. コマンドラインにエラーがあります。 - - - Utils::reloadPrompt File Changed ファイルは変更されています @@ -10836,9 +10779,6 @@ with a password, which you can enter below. &Close 閉じる(&C) - - - Utils::fileDeletedPrompt File has been removed ファイルは既に削除されています @@ -10859,10 +10799,6 @@ with a password, which you can enter below. The file %1 has been removed from disk. Do you want to save it under a different name, or close the editor? ファイル %1 は ディスクから削除されました。現在のファイルを別名で保存するかエディタを閉じますか？ - - &Close - 閉じる(&C) - C&lose All すべて閉じる(&L) @@ -10875,9 +10811,6 @@ with a password, which you can enter below. &Save 保存(&S) - - - Utils::SettingsSelector Add 追加 @@ -10902,9 +10835,6 @@ with a password, which you can enter below. Rename... 名前を変更... - - - Utils::SynchronousProcess The command "%1" finished successfully. コマンド "%1" は正常に終了しました。 @@ -10941,9 +10871,6 @@ with a password, which you can enter below. Would you like to terminate it? 終了させますか？ - - - Utils::TextFileFormat Out of memory. メモリ不足です。 @@ -10952,16 +10879,10 @@ with a password, which you can enter below. An encoding error was encountered. エンコーディングエラーが発生しました。 - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>変数</th><th>Expands to</th></tr><tr><td>%d</td><td>ディレクトリ</td></tr><tr><td>%f</td><td>ファイル名(パス付き)</td></tr><tr><td>%n</td><td>ファイル名(パスなし)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::LinearProgressWidget ... ... @@ -19302,7 +19223,7 @@ Rebuilding the project might help. - Diff + ::Utils Delete 削除 @@ -31824,7 +31745,7 @@ Qt バージョンオプションページで qmldump アプリケーション - Utils::FancyLineEdit + ::Utils Filter フィルタ @@ -32656,7 +32577,7 @@ kill しますか？ - Utils::ProxyCredentialsDialog + ::Utils Proxy Credentials プロキシの認証情報 @@ -32924,11 +32845,7 @@ Are you sure you want to continue? - Utils::FileWizardPage - - Location - パス - + ::Utils ::Android @@ -33303,7 +33220,7 @@ API バージョンが %1 以上の SDK をインストールしてください - Utils::SettingsAccessor + ::Utils No Valid Settings Found 有効な設定が見つかりません @@ -35291,14 +35208,11 @@ the program. - Utils::HostOsInfo + ::Utils Cannot create OpenGL context. OpenGL コンテキストが作成できません。 - - - Utils::MacroExpander Infinite recursion error 無限再帰エラー @@ -35335,9 +35249,6 @@ the program. Access environment variables. 環境変数にアクセスします。 - - - Utils::ShellCommand UNKNOWN 不明 @@ -35346,9 +35257,6 @@ the program. Unknown 不明 - - - Utils::ShellCommandPage Command started... コマンドが起動されました... @@ -37474,7 +37382,7 @@ Setting breakpoints by file name and line number may fail. - Utils::DebuggerMainWindow + ::Utils Views ビュー @@ -41827,7 +41735,7 @@ Android パッケージソースディレクトリのファイルはビルドデ - Utils::EnvironmentDialog + ::Utils Enter one variable per line with the variable name separated from the variable value by "=".<br>Environment variables can be referenced with ${OTHER}. 一行に付き一つの変数をその名と値を "=" で繋ぐ形式で入力してください。<br>他の環境変数は ${OTHER} の形式で参照できます。 @@ -42586,7 +42494,7 @@ Output: - Utils::RemoveFileDialog + ::Utils Remove File ファイルを削除する @@ -43293,11 +43201,7 @@ Output: - Utils::FileSaverBase - - File Error - ファイルエラー - + ::Utils ADS::DockWidgetTab @@ -43636,7 +43540,7 @@ The trace data is lost. - Utils::Archive + ::Utils File format not supported. 未対応のファイル形式です。 @@ -43667,9 +43571,6 @@ in "%2". - - - Utils::TriStateAspect Enable 有効 @@ -43682,16 +43583,10 @@ in "%2". Leave at Default デフォルトのままで - - - Utils::BaseTreeView Show %1 Column %1 列を表示する - - - Utils::InfoBarDisplay Do Not Show Again 今後このメッセージを表示しない @@ -43700,9 +43595,6 @@ in "%2". Close 閉じる - - - JsonTreeModelItem String 文字列 @@ -43715,41 +43607,10 @@ in "%2". Undefined 未定義 - - - Utils::NameValueModel - - <UNSET> - <未定義> - - - Variable - 変数 - - - Value - 値 - - - <VARIABLE> - Name when inserting a new variable - <変数> - - - <VALUE> - Value when inserting a new variable - <値> - - - - StringUtils Elapsed time: %1. 経過時間: %1. - - - Utils::VariableChooser Insert Variable 変数の挿入 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 2ed6dc6c73..e6c4d88e9e 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -61,7 +61,7 @@ - Utils::CheckableMessageBox + ::Utils Do not ask again Nie pytaj ponownie @@ -74,9 +74,6 @@ Do not &show again Nie po&kazuj ponownie - - - Utils::WizardPage Name: Nazwa: @@ -89,9 +86,6 @@ Choose the Location Wybierz położenie - - - Utils::NewClassWidget Invalid base class name Niepoprawna nazwa klasy bazowej @@ -164,13 +158,6 @@ Inherits QQuickItem - Qt Quick 2 Dziedziczy z QDeclarativeItem (wersja Qt Quick 2) - - - Utils::ProjectIntroPage - - Name: - Nazwa: - Create in: Utwórz w: @@ -1658,7 +1645,7 @@ Przyczyna: %3 - Utils::ClassNameValidatingLineEdit + ::Utils The class name must not contain namespace delimiters. Nazwa klasy nie może zawierać separatorów przestrzeni nazw. @@ -1671,9 +1658,6 @@ Przyczyna: %3 The class name contains invalid characters. Nazwa klasy zawiera niepoprawne znaki. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Nie można ustawić kanału komunikacyjnego: %1 @@ -1742,20 +1726,10 @@ Przyczyna: %3 Cannot obtain exit status from inferior: %1 Nie otrzymano kodu wyjściowego podprocesu: %1 - - - Utils::DetailsButton Details Szczegóły - - - Utils::FileNameValidatingLineEdit - - Name is empty. - Nazwa jest pusta. - Name contains white space. Nazwa zawiera spację. @@ -1780,9 +1754,6 @@ Przyczyna: %3 File extensions %1 are required: Wymagane są rozszerzenia %1 plików: - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -1811,9 +1782,6 @@ Przyczyna: %3 List of comma separated wildcard filters. Files with file name or full file path matching any filter are included. Lista filtrów z wykorzystaniem symboli wieloznacznych, oddzielona przecinkami. Pliki, których nazwy lub pełne ścieżki pasują do któregoś z filtrów, zostaną dołączone. - - - Utils::PathChooser Choose... Wybierz... @@ -1870,13 +1838,6 @@ Przyczyna: %3 The path must not be empty. Ścieżka nie może być pusta. - - Path: - Ścieżka: - - - - Utils::PathListEditor Insert... Wstaw... @@ -1889,9 +1850,6 @@ Przyczyna: %3 Clear Wyczyść - - - Utils::reloadPrompt File Changed Plik został zmieniony @@ -10333,7 +10291,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - Utils::fileDeletedPrompt + ::Utils File has been removed Plik został usunięty @@ -10346,10 +10304,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM The file %1 was removed. Do you want to save it under a different name, or close the editor? Plik %1 został usunięty. Zachować go pod inną nazwą, czy zamknąć edytor? - - &Close - Za&mknij - C&lose All Zamknij &wszystko @@ -10362,16 +10316,10 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM &Save &Zachowaj - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Zmienna</th><th>Rozwinięcie</th></tr><tr><td>%d</td><td>katalog bieżącego pliku</td></tr><tr><td>%f</td><td>nazwa pliku (z pełną ścieżką)</td></tr><tr><td>%n</td><td>nazwa pliku (bez ścieżki)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::LinearProgressWidget ... ... @@ -11720,7 +11668,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - Utils::FancyMainWindow + ::Utils Central Widget Centralny Widżet @@ -12495,7 +12443,7 @@ Identyfikatory muszą rozpoczynać się małą literą. - Utils::SynchronousProcess + ::Utils The command "%1" finished successfully. Komenda "%1" poprawnie zakończona. @@ -13895,7 +13843,7 @@ Local pulls are not applied to the master branch. - Utils::EnvironmentModel + ::Utils <UNSET> <USUNIĘTO> @@ -13918,9 +13866,6 @@ Local pulls are not applied to the master branch. Value when inserting a new variable <WARTOŚĆ> - - - Utils::QtcProcess Error in command line. Błąd w linii komend. @@ -16301,7 +16246,7 @@ With cache simulation, further event counters are enabled: - Utils::FileUtils + ::Utils Refusing to remove root directory. Odmowa usunięcia katalogu głównego. @@ -17584,7 +17529,7 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. - Utils::TextFileFormat + ::Utils Out of memory. Brak pamięci. @@ -19987,7 +19932,7 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. - Utils::ElfReader + ::Utils "%1" is an invalid ELF object (%2) "%1" nie jest poprawnym obiektem ELF (%2) @@ -20032,9 +19977,6 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. section name %1 of %2 behind end of file nazwa sekcji %1 z %2 poza EOF - - - Utils::SettingsSelector Add Dodaj @@ -23278,7 +23220,7 @@ Można używać nazw częściowych, jeśli są one unikalne. - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 Błąd XML w linii %1, w kolumnie %2: %3 @@ -24181,7 +24123,7 @@ Więcej informacji w dokumentacji "Checking Code Syntax". - Diff + ::Utils Delete Usunięto @@ -27109,7 +27051,7 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt. - Utils::FancyLineEdit + ::Utils Filter Filtr @@ -27829,7 +27771,7 @@ Czy przerwać ją? - Utils::ProxyCredentialsDialog + ::Utils Proxy Credentials Pośrednie listy uwierzytelniające @@ -28403,14 +28345,7 @@ Czy kontynuować instalację? - Utils::FileWizardPage - - Location - Położenie - - - - Utils::MacroExpander + ::Utils Infinite recursion error Błąd: nieskończona pętla @@ -31168,7 +31103,7 @@ Use this only if you are prototyping. You cannot create a full application with - Utils::SettingsAccessor + ::Utils No Valid Settings Found Brak poprawnych ustawień @@ -31798,7 +31733,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan - Utils::ShellCommand + ::Utils UNKNOWN NIEZNANY @@ -31807,9 +31742,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Unknown Nieznany - - - Utils::ShellCommandPage Command started... Komenda uruchomiona... @@ -34051,7 +33983,7 @@ itself takes time. - Utils::HostOsInfo + ::Utils Cannot create OpenGL context. Nie można utworzyć kontekstu OpenGL. @@ -35794,7 +35726,7 @@ Ustaw prawdziwy plik wykonywalny Clang. - Utils::DebuggerMainWindow + ::Utils &Views &Widoki @@ -36475,7 +36407,7 @@ po naciśnięciu klawisza backspace - Utils::EnvironmentDialog + ::Utils Enter one variable per line with the variable name separated from the variable value by "=".<br>Environment variables can be referenced with ${OTHER}. W każdej linii podaj jedną zmienną. Nazwa zmiennej powinna być oddzielona od wartości zmiennej przy użyciu "=".<br>Wartość zmiennej może odwoływać się do innych zmiennych w następujący sposób: ${INNA_ZMIENNA}. @@ -40027,14 +39959,7 @@ Błąd: %5 - Utils::FileSaverBase - - File Error - Błąd pliku - - - - Utils::SaveFile + ::Utils File might be locked. Plik może być zablokowany. diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index c693979b97..faab9d46ea 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -17436,7 +17436,7 @@ Rebuilding the project might help. - Diff + ::Utils Delete Удалено @@ -23607,7 +23607,7 @@ Error: %5 - JsonTreeModelItem + ::Utils Null Null @@ -37578,7 +37578,7 @@ Please build the qmldump application on the Qt version options page. - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 Ошибка XML в строке %1, поз. %2: %3 @@ -42501,7 +42501,7 @@ Row: %4, Column: %5 - StringUtils + ::Utils Elapsed time: %1. Прошло времени: %1. @@ -45962,7 +45962,7 @@ The trace data is lost. - Utils::Archive + ::Utils File format not supported. Формат файла не поддерживается. @@ -45994,9 +45994,6 @@ in "%2". - - - Utils::CheckableMessageBox Do not ask again Больше не спрашивать @@ -46017,9 +46014,6 @@ in "%2". Do not &show again Больше не п&оказывать - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. Имя класса не должно содержать разделителей пространств имён. @@ -46032,9 +46026,6 @@ in "%2". The class name contains invalid characters. Имя класса содержит недопустимые символы. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Не удалось создать канал передачи данных: %1 @@ -46103,9 +46094,6 @@ in "%2". Cannot obtain exit status from inferior: %1 Не удалось получить код завершения подчинённого процесса: %1 - - - Utils::DebuggerMainWindow &Views &Обзоры @@ -46130,16 +46118,10 @@ in "%2". Stop Остановить - - - Utils::DetailsButton Details Подробнее - - - Utils::ElfReader "%1" is an invalid ELF object (%2) «%1» не является корректным объектом ELF (%2) @@ -46184,9 +46166,6 @@ in "%2". section name %1 of %2 behind end of file имя секции %1 из %2 выходит за конец файла - - - Utils::EnvironmentDialog Edit Environment Изменение среды @@ -46203,9 +46182,6 @@ To disable a variable, prefix the line with "#". Для очистки переменной в строке укажите только её имя и больше ничего. Для отключения переменной, закомментируйте строку символом «#». - - - Utils::EnvironmentIdAccessor Settings File for "%1" from a Different Environment? Настройки проекта «%1» с другого компьютера? @@ -46214,16 +46190,6 @@ To disable a variable, prefix the line with "#". <p>No settings file created by this instance of %1 was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%2"?</p> <p>Не удалось найти файл настроек от этого экземпляра %1.</p><p>Возможно вы работали с этим проектом на другой машине или использовали другой путь к настройкам.</p><p>Продолжить загрузку файла настроек «%2»?</p> - - - Utils::EnvironmentModel - - <VARIABLE> - <переменная> - - - - Utils::FancyLineEdit Filter Фильтр @@ -46232,9 +46198,6 @@ To disable a variable, prefix the line with "#". Clear text Очистить текст - - - Utils::FancyMainWindow Central Widget Центральный виджет @@ -46247,9 +46210,6 @@ To disable a variable, prefix the line with "#". Automatically Hide View Title Bars Автоматически скрывать заголовки окон - - - Utils::FileNameValidatingLineEdit Name is empty. Имя задано пустым. @@ -46278,16 +46238,6 @@ To disable a variable, prefix the line with "#". File extensions %1 are required: Требуются файловые расширения %1: - - - Utils::FileSaverBase - - File Error - Файловая ошибка - - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -46316,9 +46266,6 @@ To disable a variable, prefix the line with "#". List of comma separated wildcard filters. Files with file name or full file path matching any filter are included. Список фильтров, разделенных запятыми. Будут включены файлы, имя или полный путь которых подходит минимум одному фильтру. - - - Utils::FileUtils Refusing to remove root directory. Предотвращение удаления корневого каталога. @@ -46387,9 +46334,6 @@ To disable a variable, prefix the line with "#". Overwrite existing file "%1"? Перезаписать существующий файл «%1»? - - - Utils::FileWizardPage Location Размещение @@ -46398,16 +46342,10 @@ To disable a variable, prefix the line with "#". The default suffix if you do not explicitly specify a file extension is ".%1". По умолчанию, если не указано явно, используется расширение файлов «.%1». - - - Utils::HostOsInfo Cannot create OpenGL context. Не удалось создать контекст OpenGL. - - - Utils::InfoBarDisplay &Show Details Показать п&одробности @@ -46420,16 +46358,10 @@ To disable a variable, prefix the line with "#". Close Закрыть - - - Utils::LinearProgressWidget ... ... - - - Utils::MacroExpander Infinite recursion error Ошибка бесконечной рекурсии @@ -46466,9 +46398,6 @@ To disable a variable, prefix the line with "#". Access environment variables. Доступ к переменным среды. - - - Utils::NameValueModel <UNSET> <не задано> @@ -46491,9 +46420,6 @@ To disable a variable, prefix the line with "#". Value when inserting a new variable <значение> - - - Utils::PathChooser Choose... Выбрать... @@ -46554,9 +46480,6 @@ To disable a variable, prefix the line with "#". Path: Путь: - - - Utils::PathListEditor Insert... Вставить... @@ -46569,17 +46492,10 @@ To disable a variable, prefix the line with "#". Clear Очистить - - - Utils::ProjectIntroPage Enter project name Введите название проекта - - Location - Размещение - The project already exists. Проект уже существует. @@ -46588,10 +46504,6 @@ To disable a variable, prefix the line with "#". A file with that name already exists. Файл с таким именем уже существует. - - Name is empty. - Имя задано пустым. - Name does not match "%1". Имя не соответствует «%1». @@ -46624,9 +46536,6 @@ To disable a variable, prefix the line with "#". Project: Проект: - - - Utils::ProxyCredentialsDialog Proxy Credentials Авторизация на прокси-сервере @@ -46651,9 +46560,6 @@ To disable a variable, prefix the line with "#". Password Пароль - - - Utils::QtcProcess Error in command line. Ошибка в командной строке. @@ -46662,9 +46568,6 @@ To disable a variable, prefix the line with "#". Invalid command Неверная команда - - - Utils::RemoveFileDialog Remove File Удаление файла @@ -46681,9 +46584,6 @@ To disable a variable, prefix the line with "#". &Remove from version control Удалить из-под &контроля версий - - - Utils::SettingsAccessor Failed to Read File Не удалось прочитать файл @@ -46728,9 +46628,6 @@ To disable a variable, prefix the line with "#". "%1" is not supported by %2. Do you want to try loading it anyway? «%1» не поддерживается %2. Попытаться продолжить загрузку? - - - Utils::SettingsSelector Add Добавить @@ -46755,9 +46652,6 @@ To disable a variable, prefix the line with "#". Rename... Переименовать... - - - Utils::ShellCommand UNKNOWN НЕИЗВЕСТНАЯ @@ -46766,9 +46660,6 @@ To disable a variable, prefix the line with "#". Unknown Неизвестная - - - Utils::ShellCommandPage Command started... Команда запущена... @@ -46789,9 +46680,6 @@ To disable a variable, prefix the line with "#". Failed. Сбой. - - - Utils::SynchronousProcess The command "%1" finished successfully. Команда «%1» успешно завершилась. @@ -46828,9 +46716,6 @@ To disable a variable, prefix the line with "#". Would you like to terminate it? Желаете завершить его? - - - Utils::TextFileFormat Out of memory. Не хватает памяти. @@ -46839,20 +46724,10 @@ To disable a variable, prefix the line with "#". An encoding error was encountered. Ошибка кодировки. - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Переменная</th><th>Разворачивается в</th></tr><tr><td>%d</td><td>каталог текущего файла</td></tr><tr><td>%f</td><td>имя файла (с полным путём)</td></tr><tr><td>%n</td><td>имя файла (без пути)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::WizardPage - - Path: - Путь: - Choose the Location Выбор размещения @@ -46861,9 +46736,6 @@ To disable a variable, prefix the line with "#". File name: Имя файла: - - - Utils::fileDeletedPrompt File Has Been Removed Файл был удалён @@ -46888,9 +46760,6 @@ To disable a variable, prefix the line with "#". &Save &Сохранить - - - Utils::reloadPrompt File Changed Файл изменён @@ -46907,10 +46776,6 @@ To disable a variable, prefix the line with "#". The default behavior can be set in Tools > Options > Environment > System. Поведение по умолчание можно задать в Инструменты > Параметры > Среда > Система. - - &Close - &Закрыть - No to All && &Diff Нет для всех и с&равнить diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 2d5b5ff582..f90d80c6a5 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -10019,7 +10019,7 @@ p, li { white-space: pre-wrap; } - Utils::CheckableMessageBox + ::Utils Dialog Pogovorno okno @@ -10032,26 +10032,15 @@ p, li { white-space: pre-wrap; } CheckBox PotrditvenoPolje - - - Utils::WizardPage Name: Ime: - - - Path: - Pot: - Choose the Location Izberite mesto - - - Utils::NewClassWidget Inherits QObject Podeduje QObject @@ -10131,13 +10120,6 @@ p, li { white-space: pre-wrap; } Inherits QDeclarativeItem Podeduje od QDeclarativeItem - - - Utils::ProjectIntroPage - - Name: - Ime: - Create in: @@ -10168,9 +10150,6 @@ p, li { white-space: pre-wrap; } Introduction and project location Uvod in lokacija projekta - - - Utils::SubmitEditorWidget Subversion Submit Pošiljanje Subversion @@ -11131,7 +11110,7 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan - Utils::ClassNameValidatingLineEdit + ::Utils The class name must not contain namespace delimiters. Ime razreda ne sme vsebovati ločil imenskega prostora. @@ -11144,9 +11123,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan The class name contains invalid characters. Ime razreda vsebuje neveljavne znake. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Ni moč vzpostaviti komunikacijskega kanala: %1 @@ -11219,16 +11195,10 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan Unexpected output from helper program. Nepričakovan izhod od pomožnega programa. - - - Utils::DetailsButton Details Podrobnosti - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -11256,9 +11226,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan %1: najdenih %n pojavitev v %2 od %3 datotek. - - - Utils::PathChooser Choose... Izbor … @@ -11323,9 +11290,6 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan The path '%1' is not a file. Pot »%1« ni datoteka. - - - Utils::PathListEditor Insert... Vstavi … @@ -11346,16 +11310,10 @@ Za uporabo v polje Iskalnika vtipkajte to bližnjico in presledek ter nato iskan From "%1" Iz »%1« - - - Utils::ProjectNameValidatingLineEdit Invalid character '.'. Neveljaven znak ».«. - - - Utils::reloadPrompt File Changed Datoteka spremenjena @@ -14420,7 +14378,7 @@ okoljsko spremenljivko SSH_ASKPASS. - Utils::FancyMainWindow + ::Utils Locked Zaklenjeno @@ -14429,16 +14387,10 @@ okoljsko spremenljivko SSH_ASKPASS. Reset to Default Layout Ponastavi na privzeti razpored - - - Utils::FileWizardDialog Location Mesto - - - Utils::FilterLineEdit Filter Filter @@ -14447,9 +14399,6 @@ okoljsko spremenljivko SSH_ASKPASS. Clear text Počisti besedilo - - - Utils::fileDeletedPrompt File has been removed Datoteka je bila odstranjena @@ -14474,16 +14423,10 @@ okoljsko spremenljivko SSH_ASKPASS. Save Shrani - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Spremenljivka</th><th>Se razširi v</th></tr><tr><td>%d</td><td>mapa trenutne datoteke</td></tr><tr><td>%f</td><td>ime datoteke (s celotno potjo)</td></tr><tr><td>%n</td><td>ime datoteke (brez poti)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::LinearProgressWidget ... … @@ -20899,7 +20842,7 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: - Utils::DebuggerLanguageChooser + ::Utils C++ C++ @@ -20916,9 +20859,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: <a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">What are the prerequisites?</a> <a href="qthelp://org.qt-project.qtcreator/doc/creator-debugging-qml.html">Kaj je potrebno?</a> - - - Utils::EnvironmentModel <UNSET> <ni nastavljena> @@ -20943,9 +20883,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: <vrednost> - - - Utils::FileNameValidatingLineEdit Name is empty. Ime je prazno. @@ -20966,9 +20903,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: Name matches MS Windows device. (%1). Ime je enako napravi v Windows. (%1). - - - Utils::FileUtils Failed to remove directory '%1'. Odstranjevanje mape »%1« ni uspelo. @@ -21013,23 +20947,14 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov: Cannot create temporary file in %1: %2 Začasne datoteke v %1 ni moč ustvariti: %2 - - - Utils::IpAddressLineEdit The IP address is not valid. Naslov IP ni veljaven. - - - Utils::QtcProcess Error in command line. Napaka v ukazni vrstici. - - - Utils::Internal::SftpChannelPrivate Server could not start sftp subsystem. Strežnik ni mogel zagnati podsistema sftp. @@ -21121,14 +21046,11 @@ Seznam za strežnik je: %2. - Utils::Internal::SshChannelManager + ::Utils Invalid channel id %1 Neveljavna identifikacija kanala: %1 - - - Utils::Internal::SshConnectionPrivate SSH Protocol error: %1 Napaka protokola SSH: %1 @@ -21145,10 +21067,6 @@ Seznam za strežnik je: %2. Invalid server id '%1'. Neveljavna identifikacija strežnika: »%1«. - - Unexpected packet of type %1. - Nepričakovan paket vrste %1. - Private key error: %1 Napaka glede zasebnega ključa: %1 @@ -21181,9 +21099,6 @@ Seznam za strežnik je: %2. Timeout waiting for reply from server. Čas za čakanje na odgovor strežnika je potekel. - - - Utils::SynchronousProcess The command '%1' finished successfully. Ukaz »%1« se je uspešno zaključil. diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 0785b00344..fe98039c1f 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -19714,7 +19714,7 @@ Will not be applied to whitespace in comments and strings. - Utils::CheckableMessageBox + ::Utils Do not ask again Не питати знову @@ -19727,9 +19727,6 @@ Will not be applied to whitespace in comments and strings. Do not &show again Не &показувати знову - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. Назва класу не повинна містити розділювачі простору імен. @@ -19742,9 +19739,6 @@ Will not be applied to whitespace in comments and strings. The class name contains invalid characters. Назва класу містить неправильні символи. - - - Utils::ConsoleProcess Cannot set up communication channel: %1 Неможливо встановити комунікаційний канал: %1 @@ -19837,16 +19831,10 @@ Will not be applied to whitespace in comments and strings. Cannot obtain exit status from inferior: %1 Неможливо отримати код завершення підлеглого процесу: %1 - - - Utils::DetailsButton Details Деталі - - - Utils::EnvironmentModel <UNSET> <НЕ ЗАДАНО> @@ -19869,9 +19857,6 @@ Will not be applied to whitespace in comments and strings. Value when inserting a new variable <ЗНАЧЕННЯ> - - - Utils::FancyMainWindow Locked Зафіксовано @@ -19884,9 +19869,6 @@ Will not be applied to whitespace in comments and strings. Automatically Hide View Title Bars Автоматично ховати заголовки перегляду - - - Utils::FileNameValidatingLineEdit Name is empty. Порожнє ім'я. @@ -19923,9 +19905,6 @@ Will not be applied to whitespace in comments and strings. File extensions %1 are required: Необхідні розширення файлу %1: - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -19950,9 +19929,6 @@ Will not be applied to whitespace in comments and strings. %1: %n збігів знайдено в %2 з %3 файлів. - - - Utils::FileUtils Refusing to remove root directory. Відмова від видалення кореневої теки. @@ -20021,41 +19997,14 @@ Will not be applied to whitespace in comments and strings. Cannot create temporary file in %1: %2 Неможливо створити тимчасовий файл в %1: %2 - - - Utils::FileWizardDialog - - Location - Розташування - - - - Utils::FilterLineEdit - - Filter - Фільтр - - - Clear text - Очистити текст - - - - Utils::IpAddressLineEdit The IP address is not valid. Неправильна IP адреса. - - - Utils::LinearProgressWidget ... ... - - - Utils::NewClassWidget &Class name: Назва &класу: @@ -20140,9 +20089,6 @@ Will not be applied to whitespace in comments and strings. Inherits QQuickItem - Qt Quick 2 Нащадок QQuickItem - Qt Quick 2 - - - Utils::PathChooser Choose... Оберіть... @@ -20227,9 +20173,6 @@ Will not be applied to whitespace in comments and strings. The path '%1' is not a directory. Шлях '%1' не є текою. - - - Utils::PathListEditor Insert... Вставити... @@ -20250,9 +20193,6 @@ Will not be applied to whitespace in comments and strings. From "%1" З "%1" - - - Utils::ProjectIntroPage Name: Назва: @@ -20281,10 +20221,6 @@ Will not be applied to whitespace in comments and strings. A file with that name already exists. Файл з таким іменем вже існує. - - Name is empty. - Порожнє ім'я. - Name does not match "%1". Ім'я не збігається з "%1". @@ -20305,9 +20241,6 @@ Will not be applied to whitespace in comments and strings. Project: Проект: - - - Utils::ProjectNameValidatingLineEdit Invalid character '%1' found! Знайдено неправильний символ '%1'! @@ -20316,24 +20249,14 @@ Will not be applied to whitespace in comments and strings. Invalid character "%1" found! Знайдено неправильний символ "%1"! - - Invalid character "%1" found. - Знайдено неправильний символ "%1". - Invalid character '.'. Неправильний символ '.'. - - - Utils::QtcProcess Error in command line. Помилка в командному рядку. - - - Utils::SynchronousProcess The command '%1' finished successfully. Команда '%1' завершилась успішно. @@ -20398,9 +20321,6 @@ Will not be applied to whitespace in comments and strings. Would you like to terminate it? Бажаєте завершити його? - - - Utils::TextFileFormat Out of memory. Брак пам'яті. @@ -20409,31 +20329,14 @@ Will not be applied to whitespace in comments and strings. An encoding error was encountered. Сталась помилка кодування. - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>Змінна</th><th>Розгортається в</th></tr><tr><td>%d</td><td>теку поточного фалу</td></tr><tr><td>%f</td><td>ім'я файлу (з повним шляхом)</td></tr><tr><td>%n</td><td>ім'я файлу (без шляху)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::WizardPage Choose the Location Оберіть розташування - - Name: - Назва: - - - Path: - Шлях: - - - - Utils::fileDeletedPrompt File has been removed Файл було видалено @@ -20462,9 +20365,6 @@ Will not be applied to whitespace in comments and strings. The file %1 was removed. Do you want to save it under a different name, or close the editor? Файл %1 було видалено. Бажаєте зберегти його під іншим іменем чи закрити редактор? - - - Utils::reloadPrompt File Changed Файл змінено @@ -20473,10 +20373,6 @@ Will not be applied to whitespace in comments and strings. The unsaved file <i>%1</i> has changed outside Qt Creator. Do you want to reload it and discard your changes? Незбережений файл <i>%1</i> було змінено поза Qt Creator. Бажаєте перезавантажити його та відкинути ваші зміни? - - &Close - &Закрити - The unsaved file <i>%1</i> has been changed outside Qt Creator. Do you want to reload it and discard your changes? Незбережений файл <i>%1</i> було змінено поза Qt Creator. Бажаєте перезавантажити його та відкинути ваші зміни? @@ -22701,7 +22597,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - Utils::SettingsSelector + ::Utils Add Додати @@ -25043,14 +24939,11 @@ should a repository require SSH-authentication (see documentation on SSH and the - Utils::BaseTreeView + ::Utils Adjust Column Widths to Contents Підігнати ширину стовпців до змісту - - - Utils::ElfReader '%1' is an invalid ELF object (%2) '%1' не є правильним об'єктом ELF (%2) @@ -31733,7 +31626,7 @@ Partial names can be used if they are unambiguous. - Diff + ::Utils Delete Видалено @@ -32067,7 +31960,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 Помилка XML в рядку %1, позиція %2: %3 @@ -34821,7 +34714,7 @@ Please build the qmldump application on the Qt version options page. - Utils::FancyLineEdit + ::Utils Filter Фільтр @@ -35906,7 +35799,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d - Utils::ProxyCredentialsDialog + ::Utils Proxy Credentials Авторизація на проксі-сервері @@ -36222,11 +36115,7 @@ Are you sure you want to continue? - Utils::FileWizardPage - - Location - Розташування - + ::Utils ::Android @@ -36723,7 +36612,7 @@ Install an SDK of at least API version %1. - Utils::SettingsAccessor + ::Utils No Valid Settings Found Не знайдено правильний налаштувань @@ -37337,7 +37226,7 @@ Deploying local Qt libraries is incompatible with Android 5. - Utils::MacroExpander + ::Utils Infinite recursion error Помилка нескінченної рекурсії @@ -39922,13 +39811,6 @@ The files in the Android package source directory are copied to the build direct &Шукати: - - Utils::GlobalMacroExpander - - Access environment variables. - Доступ до змінних середовища. - - ::Core @@ -41497,7 +41379,7 @@ Setting breakpoints by file name and line number may fail. - Utils::ShellCommand + ::Utils UNKNOWN НЕВІДОМО @@ -41510,9 +41392,6 @@ Setting breakpoints by file name and line number may fail. Error: Executable timed out after %1 s. Помилка: Час очікування на виконуваний модуль вичерпано після %1 с. - - - Utils::ShellCommandPage Command started... Команда запущена... @@ -42876,7 +42755,7 @@ the program. - Utils::HostOsInfo + ::Utils Cannot create OpenGL context. Неможливо створити контекст OpenGL. @@ -44572,7 +44451,7 @@ Please set a real Clang executable. - Utils::DebuggerMainWindow + ::Utils Views Види diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 0a8880ed79..7573466adc 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -17883,7 +17883,7 @@ Rebuilding the project might help. - Diff + ::Utils Delete 删除 @@ -23517,7 +23517,7 @@ Error: %5 - JsonTreeModelItem + ::Utils Null @@ -35986,7 +35986,7 @@ Please build the qmldump application on the Qt version options page. - QmlJS::QrcParser + ::Utils XML error on line %1, col %2: %3 XML 错误 在第 %1行, %2列: %3 @@ -41472,7 +41472,7 @@ Failed to open file "%1" - StringUtils + ::Utils Elapsed time: %1. @@ -45158,7 +45158,7 @@ The trace data is lost. - Utils::Archive + ::Utils File format not supported. @@ -45179,16 +45179,10 @@ in "%2". Running <cmd> in <workingdirectory> - - - Utils::BaseTreeView Show %1 Column - - - Utils::CheckableMessageBox Do not ask again 下次不再询问 @@ -45209,9 +45203,6 @@ in "%2". Do not &show again - - - Utils::ClassNameValidatingLineEdit The class name must not contain namespace delimiters. 类名不能包含命名空间分隔符。 @@ -45224,9 +45215,6 @@ in "%2". The class name contains invalid characters. 类名含有无效字符。 - - - Utils::DebuggerMainWindow Start @@ -45235,16 +45223,10 @@ in "%2". Stop 停止 - - - Utils::DetailsButton Details 详情 - - - Utils::ElfReader odd cpu architecture 异常的cpu体系架构 @@ -45287,9 +45269,6 @@ in "%2". odd endianness - - - Utils::EnvironmentDialog Edit Environment 编辑时的环境变量 @@ -45304,9 +45283,6 @@ To clear a variable, put its name on a line with nothing else on it. To disable a variable, prefix the line with "#". - - - Utils::EnvironmentIdAccessor Settings File for "%1" from a Different Environment? @@ -45315,16 +45291,6 @@ To disable a variable, prefix the line with "#". <p>No settings file created by this instance of %1 was found.</p><p>Did you work with this project on another machine or using a different settings path before?</p><p>Do you still want to load the settings file "%2"?</p> - - - Utils::EnvironmentModel - - <VARIABLE> - <变量> - - - - Utils::FancyLineEdit Filter 过滤器 @@ -45333,9 +45299,6 @@ To disable a variable, prefix the line with "#". Clear text 清除文字 - - - Utils::FancyMainWindow Reset to Default Layout 重置为默认布局 @@ -45348,9 +45311,6 @@ To disable a variable, prefix the line with "#". Automatically Hide View Title Bars - - - Utils::FileNameValidatingLineEdit Name is empty. 名称为空。 @@ -45379,16 +45339,6 @@ To disable a variable, prefix the line with "#". Name matches MS Windows device (CON, AUX, PRN, NUL, COM1, COM2, ..., COM9, LPT1, LPT2, ..., LPT9) - - - Utils::FileSaverBase - - File Error - 文件错误 - - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -45413,9 +45363,6 @@ To disable a variable, prefix the line with "#". List of comma separated wildcard filters. Files with file name or full file path matching any filter are included. - - - Utils::FileSystemModel My Computer @@ -45446,9 +45393,6 @@ To disable a variable, prefix the line with "#". Date Modified - - - Utils::FileUtils Refusing to remove root directory. 拒绝移除根目录(root)。 @@ -45531,9 +45475,6 @@ To disable a variable, prefix the line with "#". Failed to create directory "%1". 创建目录失败:'%1'。 - - - Utils::FileWizardPage Choose the Location 选择位置 @@ -45542,10 +45483,6 @@ To disable a variable, prefix the line with "#". File name: 文件名: - - Path: - 路径: - Location @@ -45554,16 +45491,10 @@ To disable a variable, prefix the line with "#". The default suffix if you do not explicitly specify a file extension is ".%1". - - - Utils::HostOsInfo Cannot create OpenGL context. - - - Utils::InfoBarDisplay &Show Details @@ -45576,16 +45507,10 @@ To disable a variable, prefix the line with "#". Close 关闭 - - - Utils::LauncherHandle Process launcher socket error. - - - Utils::LauncherSocket Failed to start process launcher at "%1": %2 @@ -45610,16 +45535,10 @@ To disable a variable, prefix the line with "#". Launcher socket closed unexpectedly. - - - Utils::LinearProgressWidget ... ... - - - Utils::MacroExpander Infinite recursion error @@ -45656,16 +45575,10 @@ To disable a variable, prefix the line with "#". Access environment variables. - - - Utils::MinimizableInfoBars Minimize 最小化 - - - Utils::NameValueModel <UNSET> <未设定> @@ -45681,16 +45594,13 @@ To disable a variable, prefix the line with "#". <VARIABLE> Name when inserting a new variable - <变量> + <变量> <VALUE> Value when inserting a new variable <值> - - - Utils::NameValuesDialog &OK @@ -45699,9 +45609,6 @@ To disable a variable, prefix the line with "#". &Cancel 取消(&C) - - - Utils::PathChooser Choose... 选择... @@ -45766,9 +45673,6 @@ To disable a variable, prefix the line with "#". Full path: "%1" - - - Utils::PathListEditor Insert... 插入... @@ -45781,9 +45685,6 @@ To disable a variable, prefix the line with "#". Clear 清除 - - - Utils::ProjectIntroPage The project already exists. 项目已经存在。 @@ -45812,14 +45713,6 @@ To disable a variable, prefix the line with "#". Enter project name - - Location - - - - Name is empty. - 名称为空。 - Project name is invalid. @@ -45832,9 +45725,6 @@ To disable a variable, prefix the line with "#". Invalid character "%1" found. - - - Utils::ProxyCredentialsDialog Proxy Credentials @@ -45859,9 +45749,6 @@ To disable a variable, prefix the line with "#". Password 密码 - - - Utils::QtcProcess Error in command line. 命令行发生错误。 @@ -45982,9 +45869,6 @@ To disable a variable, prefix the line with "#". Invalid command - - - Utils::RemoveFileDialog Remove File 删除文件 @@ -46009,9 +45893,6 @@ To disable a variable, prefix the line with "#". Folder to remove: - - - Utils::SettingsAccessor Failed to Read File @@ -46056,9 +45937,6 @@ To disable a variable, prefix the line with "#". "%1" is not supported by %2. Do you want to try loading it anyway? - - - Utils::SettingsSelector Add 添加 @@ -46083,16 +45961,10 @@ To disable a variable, prefix the line with "#". Rename... 重命名... - - - Utils::StringAspect Reset 重置 - - - Utils::TextFileFormat Out of memory. 内存不足。 @@ -46101,9 +45973,6 @@ To disable a variable, prefix the line with "#". An encoding error was encountered. 发生了一个编码错误。 - - - Utils::TriStateAspect Enable @@ -46116,16 +45985,10 @@ To disable a variable, prefix the line with "#". Leave at Default - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>变量</th><th>扩展为</th></tr><tr><td>%d</td><td>当前文件所在目录</td></tr><tr><td>%f</td><td>文件名 (带完整路径)</td></tr><tr><td>%n</td><td>文件名 (不带路径)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::VariableChooser Insert Variable @@ -46154,9 +46017,6 @@ To disable a variable, prefix the line with "#". Variables 变量 - - - Utils::fileDeletedPrompt &Close 关闭(&C) @@ -46181,9 +46041,6 @@ To disable a variable, prefix the line with "#". C&lose All - - - Utils::reloadPrompt File Changed 文件已改变 @@ -46205,10 +46062,6 @@ To disable a variable, prefix the line with "#". The default behavior can be set in Edit > Preferences > Environment > System. - - &Close - - No to All && &Diff diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index e0b1abd50e..5b850bc80d 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -1208,7 +1208,7 @@ - Utils::ClassNameValidatingLineEdit + ::Utils The class name must not contain namespace delimiters. 類別名稱不能包含命名空間分隔符。 @@ -1221,9 +1221,6 @@ The class name contains invalid characters. 類別名稱中含有無效字元。 - - - Utils::ConsoleProcess Cannot set up communication channel: %1 無法設定通訊頻道：%1 @@ -1292,9 +1289,6 @@ Cannot create socket '%1': %2 無法建立 socket '%1'：%2 - - - Utils::FileNameValidatingLineEdit Name is empty. 名稱是空的。 @@ -1323,9 +1317,6 @@ File extensions %1 are required: 需要副檔名 %1： - - - Utils::FileSearch %1: canceled. %n occurrences found in %2 files. @@ -1344,9 +1335,6 @@ %1：在 %3 個檔案中的 %2 個找到了 %n 個結果。 - - - Utils::NewClassWidget Invalid base class name 無效的基礎類別名稱 @@ -1415,9 +1403,6 @@ Inherits QDeclarativeItem 繼承自 QDeclarativeItem - - - Utils::PathChooser Choose... 選擇... @@ -1478,9 +1463,6 @@ Path: 路徑： - - - Utils::PathListEditor Insert... 插入... @@ -1501,9 +1483,6 @@ From "%1" 從 "%1" - - - Utils::ProjectIntroPage <Enter_Name> <輸入名稱> @@ -1536,16 +1515,10 @@ Project: - - - Utils::ProjectNameValidatingLineEdit Invalid character '.'. 無效字元 '.'。 - - - Utils::SubmitEditorWidget Subversion Submit Subversion 提交 @@ -1582,24 +1555,10 @@ Check a&ll 全部勾選(&L) - - - Utils::WizardPage - - Name: - 名稱： - - - Path: - 路徑： - Choose the Location 選擇位置 - - - Utils::reloadPrompt File Changed 檔案已變更 @@ -9594,7 +9553,7 @@ Will not be applied to whitespace in comments and strings. - Utils::CheckableMessageBox + ::Utils Do not ask again 不要再次詢問 @@ -10061,7 +10020,7 @@ Will not be applied to whitespace in comments and strings. - Utils::DetailsButton + ::Utils Details 詳情 @@ -12105,14 +12064,11 @@ For qmlproject projects, use the importPaths property to add import paths. - Utils::FileWizardDialog + ::Utils Location 位置 - - - Utils::FilterLineEdit Filter 過濾器 @@ -12121,9 +12077,6 @@ For qmlproject projects, use the importPaths property to add import paths.Clear text 清除文字 - - - Utils::fileDeletedPrompt File has been removed 檔案已經被移除 @@ -12148,16 +12101,10 @@ For qmlproject projects, use the importPaths property to add import paths.&Save 儲存(&S) - - - Utils::UnixTools <table border=1 cellspacing=0 cellpadding=3><tr><th>Variable</th><th>Expands to</th></tr><tr><td>%d</td><td>directory of current file</td></tr><tr><td>%f</td><td>file name (with full path)</td></tr><tr><td>%n</td><td>file name (without path)</td></tr><tr><td>%%</td><td>%</td></tr></table> <table border=1 cellspacing=0 cellpadding=3><tr><th>變數</th><th>展開為</th></tr><tr><td>%d</td><td>目前檔案所在目錄</td></tr><tr><td>%f</td><td>檔名 (包含完整路徑)</td></tr><tr><td>%n</td><td>檔名 (不含路徑)</td></tr><tr><td>%%</td><td>%</td></tr></table> - - - Utils::LinearProgressWidget ... ... @@ -13863,7 +13810,7 @@ Requires <b>Qt 4.7.4</b> or newer. - Utils::FancyMainWindow + ::Utils Locked 已鎖定 @@ -15156,7 +15103,7 @@ Ids must begin with a lowercase letter. - Utils::SynchronousProcess + ::Utils The command '%1' finished successfully. 指令 '%1' 已成功完成。 @@ -17583,7 +17530,7 @@ Local pulls are not applied to the master branch. - Utils::EnvironmentModel + ::Utils <UNSET> <未設定> @@ -17606,23 +17553,14 @@ Local pulls are not applied to the master branch. Value when inserting a new variable <值> - - - Utils::IpAddressLineEdit The IP address is not valid. 不是一個合法的 IP 位址。 - - - Utils::QtcProcess Error in command line. 命令列發生錯誤。 - - - Utils::Internal::SftpChannelPrivate Server could not start sftp subsystem. 伺服器無法啟動 sftp 子系統。 @@ -17703,16 +17641,10 @@ Local pulls are not applied to the master branch. Error reading local file: %1 讀取本地檔案時發生錯誤：%1 - - - Utils::Internal::SshChannelManager Invalid channel id %1 無效的頻道代碼 %1 - - - Utils::Internal::SshConnectionPrivate SSH Protocol error: %1 SSH 協定錯誤：%1 @@ -17729,10 +17661,6 @@ Local pulls are not applied to the master branch. Invalid server id '%1'. 無效的伺服器代碼 '%1'。 - - Unexpected packet of type %1. - 未預期的封包型態 %1。 - Password expired. 密碼已過期。 @@ -20995,7 +20923,7 @@ With cache simulation, further event counters are enabled: - Utils::FileUtils + ::Utils Refusing to remove root directory. 拒絕移除根目錄。 @@ -23611,7 +23539,7 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi - Utils::Ssh + ::Utils Password Required 需要密碼 @@ -23620,9 +23548,6 @@ To compile QML Observer, go to the Qt Versions page, select the current Qt versi Please enter the password for your private key. 美請輸入您的私密金鑰的密碼。 - - - Utils::TextFileFormat Out of memory. 記憶體不足。 @@ -26631,7 +26556,7 @@ should a repository require SSH-authentication (see documentation on SSH and the - Utils::SettingsSelector + ::Utils Add 新增 @@ -26656,9 +26581,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Rename... 重新命名... - - - Utils::SftpFileSystemModel File Type 檔案型態 @@ -26675,9 +26597,6 @@ should a repository require SSH-authentication (see documentation on SSH and the Error listing contents of directory '%1': %2 列出目錄 '%1' 的內容時發生錯誤：%2 - - - Utils::Internal::SshRemoteProcessPrivate Process killed by signal 行程被信號強行中止 @@ -28550,14 +28469,11 @@ This option is useful when you want to try your application on devices which don - Utils::BaseTreeView + ::Utils Adjust Column Widths to Contents - - - Utils::ElfReader '%1' is an invalid ELF object (%2) diff --git a/src/libs/utils/archive.cpp b/src/libs/utils/archive.cpp index 8db620ea57..408c75d7c5 100644 --- a/src/libs/utils/archive.cpp +++ b/src/libs/utils/archive.cpp @@ -7,6 +7,7 @@ #include "mimeutils.h" #include "qtcassert.h" #include "qtcprocess.h" +#include "utilstr.h" #include @@ -120,7 +121,7 @@ bool Archive::supportsFile(const FilePath &filePath, QString *reason) const QVector tools = toolsForFilePath(filePath); if (tools.isEmpty()) { if (reason) - *reason = tr("File format not supported."); + *reason = Tr::tr("File format not supported."); return false; } if (!anyOf(tools, [tools](const Tool &t) { return resolveTool(t); })) { @@ -128,7 +129,7 @@ bool Archive::supportsFile(const FilePath &filePath, QString *reason) const QStringList execs = transform(tools, [](const Tool &tool) { return tool.command.executable().toUserOutput(); }); - *reason = tr("Could not find any unarchiving executable in PATH (%1).") + *reason = Tr::tr("Could not find any unarchiving executable in PATH (%1).") .arg(execs.join(", ")); } return false; @@ -167,11 +168,11 @@ void Archive::unarchive() QObject::connect(m_process.get(), &QtcProcess::done, this, [this] { const bool successfulFinish = m_process->result() == ProcessResult::FinishedWithSuccess; if (!successfulFinish) - emit outputReceived(tr("Command failed.")); + emit outputReceived(Tr::tr("Command failed.")); emit finished(successfulFinish); }); - emit outputReceived(tr("Running %1\nin \"%2\".\n\n", "Running in ") + emit outputReceived(Tr::tr("Running %1\nin \"%2\".\n\n", "Running in ") .arg(m_commandLine.toUserOutput(), m_workingDirectory.toUserOutput())); m_process->setCommand(m_commandLine); diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 4296a3d1f0..2141efa867 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1138,7 +1138,7 @@ void StringAspect::addToLayout(Layouting::LayoutBuilder &builder) } } if (d->m_useResetButton) { - auto resetButton = createSubWidget(tr("Reset")); + auto resetButton = createSubWidget(Tr::tr("Reset")); resetButton->setEnabled(d->m_lineEditDisplay->text() != defaultValue()); connect(resetButton, &QPushButton::clicked, this, [this] { d->m_lineEditDisplay->setText(defaultValue()); diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index 5a99515e67..9b5bf45ab4 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -8,6 +8,7 @@ #include "infolabel.h" #include "macroexpander.h" #include "pathchooser.h" +#include "utilstr.h" #include #include @@ -499,9 +500,9 @@ class QTCREATOR_UTILS_EXPORT TriStateAspect : public SelectionAspect Q_OBJECT public: TriStateAspect( - const QString onString = tr("Enable"), - const QString &offString = tr("Disable"), - const QString &defaultString = tr("Leave at Default")); + const QString onString = Tr::tr("Enable"), + const QString &offString = Tr::tr("Disable"), + const QString &defaultString = Tr::tr("Leave at Default")); TriState value() const; void setValue(TriState setting); diff --git a/src/libs/utils/basetreeview.cpp b/src/libs/utils/basetreeview.cpp index da9c48b6cb..6ca4b6983c 100644 --- a/src/libs/utils/basetreeview.cpp +++ b/src/libs/utils/basetreeview.cpp @@ -8,6 +8,7 @@ #include "qtcassert.h" #include "qtcsettings.h" #include "treemodel.h" +#include "utilstr.h" #include #include @@ -542,7 +543,7 @@ void BaseTreeView::enableColumnHiding() shown += !isColumnHidden(i); for (int i = 0; i < columns; ++i) { QString columnName = model()->headerData(i, Qt::Horizontal).toString(); - QAction *act = menu.addAction(tr("Show %1 Column").arg(columnName)); + QAction *act = menu.addAction(Tr::tr("Show %1 Column").arg(columnName)); act->setCheckable(true); act->setChecked(!isColumnHidden(i)); // Prevent disabling the last visible column as there's no way back. diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h index 8fd6f4e740..e668fb81ad 100644 --- a/src/libs/utils/buildablehelperlibrary.h +++ b/src/libs/utils/buildablehelperlibrary.h @@ -15,8 +15,6 @@ class Environment; class QTCREATOR_UTILS_EXPORT BuildableHelperLibrary { - Q_DECLARE_TR_FUNCTIONS(ProjectExplorer::DebuggingHelperLibrary) - public: // returns the full path to the first qmake, qmake-qt4, qmake4 that has // at least version 2.0.0 and thus is a qt4 qmake diff --git a/src/libs/utils/checkablemessagebox.cpp b/src/libs/utils/checkablemessagebox.cpp index 7bc7be8e18..4420fc66cb 100644 --- a/src/libs/utils/checkablemessagebox.cpp +++ b/src/libs/utils/checkablemessagebox.cpp @@ -4,6 +4,7 @@ #include "checkablemessagebox.h" #include "qtcassert.h" +#include "utilstr.h" #include #include @@ -56,9 +57,9 @@ public: messageLabel->setAlignment(Qt::AlignLeft | Qt::AlignTop); checkBox = new QCheckBox(q); - checkBox->setText(CheckableMessageBox::tr("Do not ask again")); + checkBox->setText(Tr::tr("Do not ask again")); - const QString showText = CheckableMessageBox::tr("Show Details..."); + const QString showText = Tr::tr("Show Details..."); detailsButton = new QPushButton(showText, q); detailsButton->setAutoDefault(false); detailsButton->hide(); @@ -67,7 +68,7 @@ public: QObject::connect(detailsButton, &QPushButton::clicked, detailsText, [this, showText] { detailsText->setVisible(!detailsText->isVisible()); detailsButton->setText( - detailsText->isVisible() ? CheckableMessageBox::tr("Hide Details...") : showText); + detailsText->isVisible() ? Tr::tr("Hide Details...") : showText); }); buttonBox = new QDialogButtonBox(q); @@ -461,7 +462,7 @@ bool CheckableMessageBox::hasSuppressedQuestions(QSettings *settings) */ QString CheckableMessageBox::msgDoNotAskAgain() { - return QApplication::translate("Utils::CheckableMessageBox", "Do not &ask again"); + return Tr::tr("Do not &ask again"); } /*! @@ -470,7 +471,7 @@ QString CheckableMessageBox::msgDoNotAskAgain() */ QString CheckableMessageBox::msgDoNotShowAgain() { - return QApplication::translate("Utils::CheckableMessageBox", "Do not &show again"); + return Tr::tr("Do not &show again"); } } // namespace Utils diff --git a/src/libs/utils/classnamevalidatinglineedit.cpp b/src/libs/utils/classnamevalidatinglineedit.cpp index f3d5325933..01235d57e3 100644 --- a/src/libs/utils/classnamevalidatinglineedit.cpp +++ b/src/libs/utils/classnamevalidatinglineedit.cpp @@ -4,6 +4,7 @@ #include "classnamevalidatinglineedit.h" #include "qtcassert.h" +#include "utilstr.h" #include @@ -78,15 +79,15 @@ bool ClassNameValidatingLineEdit::validateClassName(FancyLineEdit *edit, QString const QString value = edit->text(); if (!d->m_namespacesEnabled && value.contains(d->m_namespaceDelimiter)) { if (errorMessage) - *errorMessage = tr("The class name must not contain namespace delimiters."); + *errorMessage = Tr::tr("The class name must not contain namespace delimiters."); return false; } else if (value.isEmpty()) { if (errorMessage) - *errorMessage = tr("Please enter a class name."); + *errorMessage = Tr::tr("Please enter a class name."); return false; } else if (!d->m_nameRegexp.match(value).hasMatch()) { if (errorMessage) - *errorMessage = tr("The class name contains invalid characters."); + *errorMessage = Tr::tr("The class name contains invalid characters."); return false; } return true; diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp index 703484e9c7..2fc7482d39 100644 --- a/src/libs/utils/detailsbutton.cpp +++ b/src/libs/utils/detailsbutton.cpp @@ -3,9 +3,10 @@ #include "detailsbutton.h" -#include -#include -#include +#include "hostosinfo.h" +#include "icon.h" +#include "stylehelper.h" +#include "utilstr.h" #include #include @@ -69,7 +70,7 @@ ExpandButton::ExpandButton(QWidget *parent) DetailsButton::DetailsButton(QWidget *parent) : ExpandButton(parent) { - setText(tr("Details")); + setText(Tr::tr("Details")); setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum); if (HostOsInfo::isMacHost()) setFont(QGuiApplication::font()); diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h index 5d4e473d24..2f49980dbd 100644 --- a/src/libs/utils/detailsbutton.h +++ b/src/libs/utils/detailsbutton.h @@ -45,7 +45,6 @@ public: class QTCREATOR_UTILS_EXPORT DetailsButton : public ExpandButton { - Q_DECLARE_TR_FUNCTIONS(Utils::DetailsButton); public: DetailsButton(QWidget *parent = nullptr); QSize sizeHint() const override; diff --git a/src/libs/utils/devicefileaccess.cpp b/src/libs/utils/devicefileaccess.cpp index 2f1c6632b1..b8fe790378 100644 --- a/src/libs/utils/devicefileaccess.cpp +++ b/src/libs/utils/devicefileaccess.cpp @@ -539,17 +539,13 @@ bool DesktopDeviceFileAccess::removeRecursively(const FilePath &filePath, QStrin QDir dir(fileInfo.absoluteFilePath()); dir.setPath(dir.canonicalPath()); if (dir.isRoot()) { - if (error) { - *error = QCoreApplication::translate("Utils::FileUtils", - "Refusing to remove root directory."); - } + if (error) + *error = Tr::tr("Refusing to remove root directory."); return false; } if (dir.path() == QDir::home().canonicalPath()) { - if (error) { - *error = QCoreApplication::translate("Utils::FileUtils", - "Refusing to remove your home directory."); - } + if (error) + *error = Tr::tr("Refusing to remove your home directory."); return false; } @@ -560,20 +556,14 @@ bool DesktopDeviceFileAccess::removeRecursively(const FilePath &filePath, QStrin return false; } if (!QDir::root().rmdir(dir.path())) { - if (error) { - *error = QCoreApplication::translate("Utils::FileUtils", - "Failed to remove directory \"%1\".") - .arg(filePath.toUserOutput()); - } + if (error) + *error = Tr::tr("Failed to remove directory \"%1\".").arg(filePath.toUserOutput()); return false; } } else { if (!QFile::remove(filePath.path())) { - if (error) { - *error = QCoreApplication::translate("Utils::FileUtils", - "Failed to remove file \"%1\".") - .arg(filePath.toUserOutput()); - } + if (error) + *error = Tr::tr("Failed to remove file \"%1\".").arg(filePath.toUserOutput()); return false; } } diff --git a/src/libs/utils/differ.cpp b/src/libs/utils/differ.cpp index d1b885be91..538aa6657a 100644 --- a/src/libs/utils/differ.cpp +++ b/src/libs/utils/differ.cpp @@ -11,12 +11,13 @@ publication by Neil Fraser: http://neil.fraser.name/writing/diff/ #include "differ.h" +#include "utilstr.h" + #include #include #include #include #include -#include #include namespace Utils { @@ -920,10 +921,10 @@ bool Diff::operator!=(const Diff &other) const QString Diff::commandString(Command com) { if (com == Delete) - return QCoreApplication::translate("Diff", "Delete"); + return ::Utils::Tr::tr("Delete"); else if (com == Insert) - return QCoreApplication::translate("Diff", "Insert"); - return QCoreApplication::translate("Diff", "Equal"); + return ::Utils::Tr::tr("Insert"); + return ::Utils::Tr::tr("Equal"); } QString Diff::toString() const diff --git a/src/libs/utils/elfreader.cpp b/src/libs/utils/elfreader.cpp index 21651ba446..b88e413660 100644 --- a/src/libs/utils/elfreader.cpp +++ b/src/libs/utils/elfreader.cpp @@ -5,6 +5,7 @@ #include "expected.h" #include "qtcassert.h" +#include "utilstr.h" #include #include @@ -126,7 +127,7 @@ ElfData ElfReader::readHeaders() static QString msgInvalidElfObject(const FilePath &binary, const QString &why) { - return ElfReader::tr("\"%1\" is an invalid ELF object (%2)") + return Tr::tr("\"%1\" is an invalid ELF object (%2)") .arg(binary.toUserOutput(), why); } @@ -144,12 +145,12 @@ ElfReader::Result ElfReader::readIt() const quint64 fdlen = mapper.fdlen; if (fdlen < 64) { - m_errorString = tr("\"%1\" is not an ELF object (file too small)").arg(m_binary.toUserOutput()); + m_errorString = Tr::tr("\"%1\" is not an ELF object (file too small)").arg(m_binary.toUserOutput()); return NotElf; } if (strncmp(mapper.start, "\177ELF", 4) != 0) { - m_errorString = tr("\"%1\" is not an ELF object").arg(m_binary.toUserOutput()); + m_errorString = Tr::tr("\"%1\" is not an ELF object").arg(m_binary.toUserOutput()); return NotElf; } @@ -157,7 +158,7 @@ ElfReader::Result ElfReader::readIt() m_elfData.elfclass = ElfClass(mapper.start[4]); const bool is64Bit = m_elfData.elfclass == Elf_ELFCLASS64; if (m_elfData.elfclass != Elf_ELFCLASS32 && m_elfData.elfclass != Elf_ELFCLASS64) { - m_errorString = msgInvalidElfObject(m_binary, tr("odd cpu architecture")); + m_errorString = msgInvalidElfObject(m_binary, Tr::tr("odd cpu architecture")); return Corrupt; } @@ -168,7 +169,7 @@ ElfReader::Result ElfReader::readIt() // if ((sizeof(void*) == 4 && bits != 32) // || (sizeof(void*) == 8 && bits != 64)) { // if (errorString) - // *errorString = QLibrary::tr("\"%1\" is an invalid ELF object (%2)") + // *errorString = QLibrary::Tr::tr("\"%1\" is an invalid ELF object (%2)") // .arg(m_binary).arg(QLatin1String("wrong cpu architecture")); // return Corrupt; // } @@ -176,7 +177,7 @@ ElfReader::Result ElfReader::readIt() // Read Endianess. m_elfData.endian = ElfEndian(mapper.ustart[5]); if (m_elfData.endian != Elf_ELFDATA2LSB && m_elfData.endian != Elf_ELFDATA2MSB) { - m_errorString = msgInvalidElfObject(m_binary, tr("odd endianness")); + m_errorString = msgInvalidElfObject(m_binary, Tr::tr("odd endianness")); return Corrupt; } @@ -193,7 +194,7 @@ ElfReader::Result ElfReader::readIt() quint32 e_shsize = getHalfWord(data, m_elfData); if (e_shsize > fdlen) { - m_errorString = msgInvalidElfObject(m_binary, tr("unexpected e_shsize")); + m_errorString = msgInvalidElfObject(m_binary, Tr::tr("unexpected e_shsize")); return Corrupt; } @@ -204,7 +205,7 @@ ElfReader::Result ElfReader::readIt() quint32 e_shentsize = getHalfWord(data, m_elfData); if (e_shentsize % 4) { - m_errorString = msgInvalidElfObject(m_binary, tr("unexpected e_shentsize")); + m_errorString = msgInvalidElfObject(m_binary, Tr::tr("unexpected e_shentsize")); return Corrupt; } @@ -213,7 +214,7 @@ ElfReader::Result ElfReader::readIt() QTC_CHECK(data == mapper.ustart + (is64Bit ? 64 : 52)); if (quint64(e_shnum) * e_shentsize > fdlen) { - const QString reason = tr("announced %n sections, each %1 bytes, exceed file size", nullptr, e_shnum) + const QString reason = Tr::tr("announced %n sections, each %1 bytes, exceed file size", nullptr, e_shnum) .arg(e_shentsize); m_errorString = msgInvalidElfObject(m_binary, reason); return Corrupt; @@ -222,7 +223,7 @@ ElfReader::Result ElfReader::readIt() quint64 soff = e_shoff + e_shentsize * e_shtrndx; // if ((soff + e_shentsize) > fdlen || soff % 4 || soff == 0) { -// m_errorString = QLibrary::tr("\"%1\" is an invalid ELF object (%2)") +// m_errorString = QLibrary::Tr::tr("\"%1\" is an invalid ELF object (%2)") // .arg(m_binary) // .arg(QLatin1String("shstrtab section header seems to be at %1")) // .arg(QString::number(soff, 16)); @@ -236,7 +237,7 @@ ElfReader::Result ElfReader::readIt() if (quint32(stringTableFileOffset + e_shentsize) >= fdlen || stringTableFileOffset == 0) { - const QString reason = tr("string table seems to be at 0x%1").arg(soff, 0, 16); + const QString reason = Tr::tr("string table seems to be at 0x%1").arg(soff, 0, 16); m_errorString = msgInvalidElfObject(m_binary, reason); return Corrupt; } @@ -247,7 +248,7 @@ ElfReader::Result ElfReader::readIt() parseSectionHeader(s, &sh, m_elfData); if (stringTableFileOffset + sh.index > fdlen) { - const QString reason = tr("section name %1 of %2 behind end of file") + const QString reason = Tr::tr("section name %1 of %2 behind end of file") .arg(i).arg(e_shnum); m_errorString = msgInvalidElfObject(m_binary, reason); return Corrupt; diff --git a/src/libs/utils/elfreader.h b/src/libs/utils/elfreader.h index 940f1b6e15..d1506c81f0 100644 --- a/src/libs/utils/elfreader.h +++ b/src/libs/utils/elfreader.h @@ -136,8 +136,6 @@ public: class QTCREATOR_UTILS_EXPORT ElfReader { - Q_DECLARE_TR_FUNCTIONS(Utils::ElfReader) - public: explicit ElfReader(const FilePath &binary); enum Result { Ok, NotElf, Corrupt }; diff --git a/src/libs/utils/environmentdialog.cpp b/src/libs/utils/environmentdialog.cpp index f22e770074..d52f612830 100644 --- a/src/libs/utils/environmentdialog.cpp +++ b/src/libs/utils/environmentdialog.cpp @@ -4,6 +4,7 @@ #include "environmentdialog.h" #include "environment.h" +#include "utilstr.h" namespace Utils { @@ -15,14 +16,14 @@ std::optional EnvironmentDialog::getEnvironmentItems( initial, placeholderText, polisher, - tr("Edit Environment"), - tr("Enter one environment variable per line.\n" - "To set or change a variable, use VARIABLE=VALUE.\n" - "To append to a variable, use VARIABLE+=VALUE.\n" - "To prepend to a variable, use VARIABLE=+VALUE.\n" - "Existing variables can be referenced in a VALUE with ${OTHER}.\n" - "To clear a variable, put its name on a line with nothing else on it.\n" - "To disable a variable, prefix the line with \"#\".")); + Tr::tr("Edit Environment"), + Tr::tr("Enter one environment variable per line.\n" + "To set or change a variable, use VARIABLE=VALUE.\n" + "To append to a variable, use VARIABLE+=VALUE.\n" + "To prepend to a variable, use VARIABLE=+VALUE.\n" + "Existing variables can be referenced in a VALUE with ${OTHER}.\n" + "To clear a variable, put its name on a line with nothing else on it.\n" + "To disable a variable, prefix the line with \"#\".")); } } // namespace Utils diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 264a0a3686..a0d1fd9b8a 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -9,6 +9,7 @@ #include "hostosinfo.h" #include "qtcassert.h" #include "utilsicons.h" +#include "utilstr.h" #include #include @@ -418,8 +419,8 @@ void FancyLineEdit::setFiltering(bool on) setButtonIcon(Right, icon); setButtonVisible(Right, true); - setPlaceholderText(tr("Filter")); - setButtonToolTip(Right, tr("Clear text")); + setPlaceholderText(Tr::tr("Filter")); + setButtonToolTip(Right, Tr::tr("Clear text")); setAutoHideButton(Right, true); connect(this, &FancyLineEdit::rightButtonClicked, this, &QLineEdit::clear); } else { diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp index 57a6e35d9a..1d7f3e03fa 100644 --- a/src/libs/utils/fancymainwindow.cpp +++ b/src/libs/utils/fancymainwindow.cpp @@ -6,6 +6,7 @@ #include "algorithm.h" #include "qtcassert.h" #include "stringutils.h" +#include "utilstr.h" #include #include @@ -323,11 +324,11 @@ void DockWidget::handleToplevelChanged(bool floating) FancyMainWindowPrivate::FancyMainWindowPrivate(FancyMainWindow *parent) : q(parent), m_handleDockVisibilityChanges(true), - m_showCentralWidget(FancyMainWindow::tr("Central Widget"), nullptr), + m_showCentralWidget(Tr::tr("Central Widget"), nullptr), m_menuSeparator1(nullptr), m_menuSeparator2(nullptr), - m_resetLayoutAction(FancyMainWindow::tr("Reset to Default Layout"), nullptr), - m_autoHideTitleBars(FancyMainWindow::tr("Automatically Hide View Title Bars"), nullptr) + m_resetLayoutAction(Tr::tr("Reset to Default Layout"), nullptr), + m_autoHideTitleBars(Tr::tr("Automatically Hide View Title Bars"), nullptr) { m_showCentralWidget.setCheckable(true); m_showCentralWidget.setChecked(true); diff --git a/src/libs/utils/filenamevalidatinglineedit.cpp b/src/libs/utils/filenamevalidatinglineedit.cpp index 3adf36ea2f..58112ceb6c 100644 --- a/src/libs/utils/filenamevalidatinglineedit.cpp +++ b/src/libs/utils/filenamevalidatinglineedit.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "filenamevalidatinglineedit.h" + #include "qtcassert.h" +#include "utilstr.h" #include @@ -87,7 +89,7 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name, { if (name.isEmpty()) { if (errorMessage) - *errorMessage = tr("Name is empty."); + *errorMessage = Tr::tr("Name is empty."); return false; } // Characters @@ -97,9 +99,9 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name, if (errorMessage) { const QChar qc = QLatin1Char(*c); if (qc.isSpace()) - *errorMessage = tr("Name contains white space."); + *errorMessage = Tr::tr("Name contains white space."); else - *errorMessage = tr("Invalid character \"%1\".").arg(qc); + *errorMessage = Tr::tr("Invalid character \"%1\".").arg(qc); } return false; } @@ -109,7 +111,7 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name, const QLatin1String notAllowedSubString(notAllowedSubStrings[s]); if (name.contains(notAllowedSubString)) { if (errorMessage) - *errorMessage = tr("Invalid characters \"%1\".").arg(QString(notAllowedSubString)); + *errorMessage = Tr::tr("Invalid characters \"%1\".").arg(QString(notAllowedSubString)); return false; } } @@ -119,10 +121,10 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name, matchesWinDevice = name.contains(windowsDeviceSubDirPattern()); if (matchesWinDevice) { if (errorMessage) - *errorMessage = tr("Name matches MS Windows device" - " (CON, AUX, PRN, NUL," - " COM1, COM2, ..., COM9," - " LPT1, LPT2, ..., LPT9)"); + *errorMessage = Tr::tr("Name matches MS Windows device" + " (CON, AUX, PRN, NUL," + " COM1, COM2, ..., COM9," + " LPT1, LPT2, ..., LPT9)"); return false; } return true; @@ -154,9 +156,9 @@ bool FileNameValidatingLineEdit::validateFileNameExtension(const QString &fileNa if (errorMessage) { if (requiredExtensions.count() == 1) - *errorMessage = tr("File extension %1 is required:").arg(requiredExtensions.first()); + *errorMessage = Tr::tr("File extension %1 is required:").arg(requiredExtensions.first()); else - *errorMessage = tr("File extensions %1 are required:").arg(requiredExtensions.join(QLatin1String(", "))); + *errorMessage = Tr::tr("File extensions %1 are required:").arg(requiredExtensions.join(QLatin1String(", "))); } return false; diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index 6542326581..7dfa877b17 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -827,14 +827,13 @@ QString FilePath::displayName(const QString &args) const if (deviceName.isEmpty()) return fullPath; - return QCoreApplication::translate("Utils::FileUtils", "%1 on %2", "File on device") - .arg(fullPath, deviceName); + return Tr::tr("%1 on %2", "File on device").arg(fullPath, deviceName); } if (deviceName.isEmpty()) return fullPath + ' ' + args; - return QCoreApplication::translate("Utils::FileUtils", "%1 %2 on %3", "File and args on device") + return Tr::tr("%1 %2 on %3", "File and args on device") .arg(fullPath, args, deviceName); } diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 6147bdb56f..ccbcfbfb9f 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -8,8 +8,8 @@ #include "mapreduce.h" #include "qtcassert.h" #include "stringutils.h" +#include "utilstr.h" -#include #include #include #include @@ -23,16 +23,14 @@ using namespace Utils; static inline QString msgCanceled(const QString &searchTerm, int numMatches, int numFilesSearched) { - return QCoreApplication::translate("Utils::FileSearch", - "%1: canceled. %n occurrences found in %2 files.", - nullptr, numMatches).arg(searchTerm).arg(numFilesSearched); + return Tr::tr("%1: canceled. %n occurrences found in %2 files.", + nullptr, numMatches).arg(searchTerm).arg(numFilesSearched); } static inline QString msgFound(const QString &searchTerm, int numMatches, int numFilesSearched) { - return QCoreApplication::translate("Utils::FileSearch", - "%1: %n occurrences found in %2 files.", - nullptr, numMatches).arg(searchTerm).arg(numFilesSearched); + return Tr::tr("%1: %n occurrences found in %2 files.", + nullptr, numMatches).arg(searchTerm).arg(numFilesSearched); } namespace { @@ -532,19 +530,18 @@ QStringList splitFilterUiText(const QString &text) QString msgFilePatternLabel() { - return QCoreApplication::translate("Utils::FileSearch", "Fi&le pattern:"); + return Tr::tr("Fi&le pattern:"); } QString msgExclusionPatternLabel() { - return QCoreApplication::translate("Utils::FileSearch", "Excl&usion pattern:"); + return Tr::tr("Excl&usion pattern:"); } QString msgFilePatternToolTip() { - return QCoreApplication::translate("Utils::FileSearch", - "List of comma separated wildcard filters. " - "Files with file name or full file path matching any filter are included."); + return Tr::tr("List of comma separated wildcard filters. " + "Files with file name or full file path matching any filter are included."); } QString matchCaseReplacement(const QString &originalText, const QString &replaceText) diff --git a/src/libs/utils/filesystemmodel.cpp b/src/libs/utils/filesystemmodel.cpp index 0a3d8b0d7e..60961c3599 100644 --- a/src/libs/utils/filesystemmodel.cpp +++ b/src/libs/utils/filesystemmodel.cpp @@ -6,6 +6,7 @@ #include "environment.h" #include "hostosinfo.h" #include "qtcassert.h" +#include "utilstr.h" #include #include @@ -746,8 +747,8 @@ public: // Vista == "Computer", // OS X == "Computer" (sometime user generated) "Benjamin's PowerBook G4" if (HostOsInfo::isWindowsHost()) - return FileSystemModel::tr("My Computer"); - return FileSystemModel::tr("Computer"); + return Tr::tr("My Computer"); + return Tr::tr("Computer"); } inline void delayedSort() { @@ -1505,19 +1506,19 @@ QVariant FileSystemModel::headerData(int section, Qt::Orientation orientation, i QString returnValue; switch (section) { - case 0: returnValue = tr("Name"); + case 0: returnValue = Tr::tr("Name"); break; - case 1: returnValue = tr("Size"); + case 1: returnValue = Tr::tr("Size"); break; case 2: returnValue = HostOsInfo::isMacHost() - ? tr("Kind", "Match OS X Finder") - :tr("Type", "All other platforms"); + ? Tr::tr("Kind", "Match OS X Finder") + : Tr::tr("Type", "All other platforms"); break; // Windows - Type // OS X - Kind // Konqueror - File Type // Nautilus - Type - case 3: returnValue = tr("Date Modified"); + case 3: returnValue = Tr::tr("Date Modified"); break; default: return QVariant(); } diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp index efbaf912c6..399f091365 100644 --- a/src/libs/utils/fileutils.cpp +++ b/src/libs/utils/fileutils.cpp @@ -5,8 +5,9 @@ #include "savefile.h" #include "algorithm.h" -#include "qtcassert.h" #include "hostosinfo.h" +#include "qtcassert.h" +#include "utilstr.h" #include "fsengine/fileiconprovider.h" #include "fsengine/fsengine.h" @@ -79,7 +80,7 @@ bool FileReader::fetch(const FilePath &filePath, QIODevice::OpenMode mode, QWidg if (fetch(filePath, mode)) return true; if (parent) - QMessageBox::critical(parent, tr("File Error"), m_errorString); + QMessageBox::critical(parent, Tr::tr("File Error"), m_errorString); return false; } #endif // QT_GUI_LIB @@ -112,7 +113,7 @@ bool FileSaverBase::finalize(QWidget *parent) { if (finalize()) return true; - QMessageBox::critical(parent, tr("File Error"), errorString()); + QMessageBox::critical(parent, Tr::tr("File Error"), errorString()); return false; } #endif // QT_GUI_LIB @@ -135,10 +136,11 @@ bool FileSaverBase::setResult(bool ok) { if (!ok && !m_hasError) { if (!m_file->errorString().isEmpty()) { - m_errorString = tr("Cannot write file %1: %2") + m_errorString = Tr::tr("Cannot write file %1: %2") .arg(m_filePath.toUserOutput(), m_file->errorString()); } else { - m_errorString = tr("Cannot write file %1. Disk full?").arg(m_filePath.toUserOutput()); + m_errorString = Tr::tr("Cannot write file %1. Disk full?") + .arg(m_filePath.toUserOutput()); } m_hasError = true; } @@ -175,7 +177,7 @@ FileSaver::FileSaver(const FilePath &filePath, QIODevice::OpenMode mode) "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"}; const QString fn = filePath.baseName().toUpper(); if (reservedNames.contains(fn)) { - m_errorString = tr("%1: Is a reserved filename on Windows. Cannot save.") + m_errorString = Tr::tr("%1: Is a reserved filename on Windows. Cannot save.") .arg(filePath.toUserOutput()); m_hasError = true; return; @@ -197,7 +199,7 @@ FileSaver::FileSaver(const FilePath &filePath, QIODevice::OpenMode mode) } if (!m_file->open(QIODevice::WriteOnly | mode)) { QString err = filePath.exists() ? - tr("Cannot overwrite file %1: %2") : tr("Cannot create file %1: %2"); + Tr::tr("Cannot overwrite file %1: %2") : Tr::tr("Cannot create file %1: %2"); m_errorString = err.arg(filePath.toUserOutput(), m_file->errorString()); m_hasError = true; } @@ -237,7 +239,7 @@ TempFileSaver::TempFileSaver(const QString &templ) tempFile->setFileTemplate(templ); tempFile->setAutoRemove(false); if (!tempFile->open()) { - m_errorString = tr("Cannot create temporary file in %1: %2").arg( + m_errorString = Tr::tr("Cannot create temporary file in %1: %2").arg( QDir::toNativeSeparators(QFileInfo(tempFile->fileTemplate()).absolutePath()), tempFile->errorString()); m_hasError = true; @@ -276,9 +278,8 @@ bool FileUtils::CopyAskingForOverwrite::operator()(const FilePath &src, else if (!m_overwriteAll) { const int res = QMessageBox::question( m_parent, - QCoreApplication::translate("Utils::FileUtils", "Overwrite File?"), - QCoreApplication::translate("Utils::FileUtils", "Overwrite existing file \"%1\"?") - .arg(dest.toUserOutput()), + Tr::tr("Overwrite File?"), + Tr::tr("Overwrite existing file \"%1\"?").arg(dest.toUserOutput()), QMessageBox::Yes | QMessageBox::YesToAll | QMessageBox::No | QMessageBox::NoToAll | QMessageBox::Cancel); if (res == QMessageBox::Cancel) { @@ -299,8 +300,7 @@ bool FileUtils::CopyAskingForOverwrite::operator()(const FilePath &src, dest.parentDir().ensureWritableDir(); if (!src.copyFile(dest)) { if (error) { - *error = QCoreApplication::translate("Utils::FileUtils", - "Could not copy file \"%1\" to \"%2\".") + *error = Tr::tr("Could not copy file \"%1\" to \"%2\".") .arg(src.toUserOutput(), dest.toUserOutput()); } return false; @@ -650,8 +650,7 @@ bool FileUtils::copyRecursively( if (srcFilePath.isDir()) { if (!tgtFilePath.ensureWritableDir()) { if (error) { - *error = QCoreApplication::translate("Utils::FileUtils", - "Failed to create directory \"%1\".") + *error = Tr::tr("Failed to create directory \"%1\".") .arg(tgtFilePath.toUserOutput()); } return false; diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index 80a89c6d52..f34206d8b7 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -151,7 +151,6 @@ T withNtfsPermissions(const std::function &task) class QTCREATOR_UTILS_EXPORT FileReader { - Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic! public: static QByteArray fetchQrc(const QString &fileName); // Only for internal resources bool fetch(const FilePath &filePath, QIODevice::OpenMode mode = QIODevice::NotOpen); // QIODevice::ReadOnly is implicit @@ -172,7 +171,6 @@ private: class QTCREATOR_UTILS_EXPORT FileSaverBase { - Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic! public: FileSaverBase(); virtual ~FileSaverBase(); @@ -207,7 +205,6 @@ private: class QTCREATOR_UTILS_EXPORT FileSaver : public FileSaverBase { - Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic! public: // QIODevice::WriteOnly is implicit explicit FileSaver(const FilePath &filePath, QIODevice::OpenMode mode = QIODevice::NotOpen); @@ -221,7 +218,6 @@ private: class QTCREATOR_UTILS_EXPORT TempFileSaver : public FileSaverBase { - Q_DECLARE_TR_FUNCTIONS(Utils::FileUtils) // sic! public: explicit TempFileSaver(const QString &templ = QString()); ~TempFileSaver() override; diff --git a/src/libs/utils/filewizardpage.cpp b/src/libs/utils/filewizardpage.cpp index 4e6639410a..aae79b1a49 100644 --- a/src/libs/utils/filewizardpage.cpp +++ b/src/libs/utils/filewizardpage.cpp @@ -3,6 +3,7 @@ #include "filewizardpage.h" +#include "utilstr.h" #include "wizard.h" // TODO: only because of SHORT_TITLE_PROPERTY /*! @@ -43,7 +44,7 @@ FileWizardPage::FileWizardPage(QWidget *parent) : WizardPage(parent), d(new FileWizardPagePrivate) { - setTitle(tr("Choose the Location")); + setTitle(Tr::tr("Choose the Location")); resize(368, 102); d->m_defaultSuffixLabel = new QLabel; @@ -54,8 +55,8 @@ FileWizardPage::FileWizardPage(QWidget *parent) : d->m_pathChooser = new PathChooser; d->m_pathChooser->setExpectedKind(PathChooser::Directory); - d->m_nameLabel->setText(tr("File name:")); - d->m_pathLabel->setText(tr("Path:")); + d->m_nameLabel->setText(Tr::tr("File name:")); + d->m_pathLabel->setText(Tr::tr("Path:")); using namespace Layouting; @@ -75,7 +76,7 @@ FileWizardPage::FileWizardPage(QWidget *parent) : connect(d->m_nameLineEdit, &FancyLineEdit::validReturnPressed, this, &FileWizardPage::slotActivated); - setProperty(SHORT_TITLE_PROPERTY, tr("Location")); + setProperty(SHORT_TITLE_PROPERTY, Tr::tr("Location")); registerFieldWithName(QLatin1String("Path"), d->m_pathChooser, "path", SIGNAL(textChanged(QString))); registerFieldWithName(QLatin1String("FileName"), d->m_nameLineEdit); @@ -144,7 +145,7 @@ void FileWizardPage::setDefaultSuffix(const QString &suffix) layout->removeRow(0); } else { d->m_defaultSuffixLabel->setText( - tr("The default suffix if you do not explicitly specify a file extension is \".%1\".") + Tr::tr("The default suffix if you do not explicitly specify a file extension is \".%1\".") .arg(suffix)); } } diff --git a/src/libs/utils/hostosinfo.cpp b/src/libs/utils/hostosinfo.cpp index 54954daa41..bf038ea82d 100644 --- a/src/libs/utils/hostosinfo.cpp +++ b/src/libs/utils/hostosinfo.cpp @@ -3,7 +3,7 @@ #include "hostosinfo.h" -#include +#include "utilstr.h" #if !defined(QT_NO_OPENGL) && defined(QT_GUI_LIB) #include @@ -88,8 +88,7 @@ bool HostOsInfo::canCreateOpenGLContext(QString *errorMessage) #else static const bool canCreate = QOpenGLContext().create(); if (!canCreate) - *errorMessage = QCoreApplication::translate("Utils::HostOsInfo", - "Cannot create OpenGL context."); + *errorMessage = Tr::tr("Cannot create OpenGL context."); return canCreate; #endif } diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp index c13f95e5f8..430a294adc 100644 --- a/src/libs/utils/infobar.cpp +++ b/src/libs/utils/infobar.cpp @@ -7,6 +7,7 @@ #include "qtcassert.h" #include "qtcsettings.h" #include "utilsicons.h" +#include "utilstr.h" #include #include @@ -299,7 +300,7 @@ void InfoBarDisplay::update() auto showDetailsButton = new QToolButton; showDetailsButton->setCheckable(true); showDetailsButton->setChecked(m_isShowingDetailsWidget); - showDetailsButton->setText(tr("&Show Details")); + showDetailsButton->setText(Tr::tr("&Show Details")); connect(showDetailsButton, &QToolButton::clicked, this, [this, vbox, info] (bool) { QWidget *detailsWidget = vbox->count() == 2 ? vbox->itemAt(1)->widget() : nullptr; if (!detailsWidget) { @@ -342,7 +343,7 @@ void InfoBarDisplay::update() QToolButton *infoWidgetSuppressButton = nullptr; if (info.m_globalSuppression == InfoBarEntry::GlobalSuppression::Enabled) { infoWidgetSuppressButton = new QToolButton; - infoWidgetSuppressButton->setText(tr("Do Not Show Again")); + infoWidgetSuppressButton->setText(Tr::tr("Do Not Show Again")); connect(infoWidgetSuppressButton, &QAbstractButton::clicked, this, [this, id] { m_infoBar->removeInfo(id); InfoBar::globallySuppressInfo(id); @@ -365,7 +366,7 @@ void InfoBarDisplay::update() if (info.m_cancelButtonText.isEmpty()) { infoWidgetCloseButton->setAutoRaise(true); infoWidgetCloseButton->setIcon(Icons::CLOSE_FOREGROUND.icon()); - infoWidgetCloseButton->setToolTip(tr("Close")); + infoWidgetCloseButton->setToolTip(Tr::tr("Close")); } else { infoWidgetCloseButton->setText(info.m_cancelButtonText); } diff --git a/src/libs/utils/jsontreeitem.cpp b/src/libs/utils/jsontreeitem.cpp index 9600545c55..6022125cf7 100644 --- a/src/libs/utils/jsontreeitem.cpp +++ b/src/libs/utils/jsontreeitem.cpp @@ -3,6 +3,8 @@ #include "jsontreeitem.h" +#include "utilstr.h" + #include #include @@ -17,19 +19,19 @@ static QString typeName(QJsonValue::Type type) { switch (type) { case QJsonValue::Null: - return JsonTreeItem::tr("Null"); + return Tr::tr("Null"); case QJsonValue::Bool: - return JsonTreeItem::tr("Bool"); + return Tr::tr("Bool"); case QJsonValue::Double: - return JsonTreeItem::tr("Double"); + return Tr::tr("Double"); case QJsonValue::String: - return JsonTreeItem::tr("String"); + return Tr::tr("String"); case QJsonValue::Array: - return JsonTreeItem::tr("Array"); + return Tr::tr("Array"); case QJsonValue::Object: - return JsonTreeItem::tr("Object"); + return Tr::tr("Object"); case QJsonValue::Undefined: - return JsonTreeItem::tr("Undefined"); + return Tr::tr("Undefined"); } return {}; } @@ -43,9 +45,9 @@ QVariant JsonTreeItem::data(int column, int role) const if (column == 2) return typeName(m_value.type()); if (m_value.isObject()) - return QString('[' + tr("%n Items", nullptr, m_value.toObject().size()) + ']'); + return QString('[' + Tr::tr("%n Items", nullptr, m_value.toObject().size()) + ']'); if (m_value.isArray()) - return QString('[' + tr("%n Items", nullptr, m_value.toArray().size()) + ']'); + return QString('[' + Tr::tr("%n Items", nullptr, m_value.toArray().size()) + ']'); return m_value.toVariant(); } diff --git a/src/libs/utils/jsontreeitem.h b/src/libs/utils/jsontreeitem.h index 66e03d86d5..34f09fa972 100644 --- a/src/libs/utils/jsontreeitem.h +++ b/src/libs/utils/jsontreeitem.h @@ -14,7 +14,6 @@ namespace Utils { class QTCREATOR_UTILS_EXPORT JsonTreeItem : public TypedTreeItem { - Q_DECLARE_TR_FUNCTIONS(JsonTreeModelItem) public: JsonTreeItem() = default; JsonTreeItem(const QString &displayName, const QJsonValue &value); diff --git a/src/libs/utils/launcherinterface.cpp b/src/libs/utils/launcherinterface.cpp index 2e8e679b47..e71b09b0ed 100644 --- a/src/libs/utils/launcherinterface.cpp +++ b/src/libs/utils/launcherinterface.cpp @@ -7,8 +7,8 @@ #include "launchersocket.h" #include "qtcassert.h" #include "temporarydirectory.h" +#include "utilstr.h" -#include #include #include #include @@ -123,16 +123,14 @@ void LauncherInterfacePrivate::handleProcessError() if (m_process->error() == QProcess::FailedToStart) { const QString launcherPathForUser = QDir::toNativeSeparators(QDir::cleanPath(m_process->program())); - emit errorOccurred(QCoreApplication::translate("Utils::LauncherSocket", - "Failed to start process launcher at \"%1\": %2") + emit errorOccurred(Tr::tr("Failed to start process launcher at \"%1\": %2") .arg(launcherPathForUser, m_process->errorString())); } } void LauncherInterfacePrivate::handleProcessFinished() { - emit errorOccurred(QCoreApplication::translate("Utils::LauncherSocket", - "Process launcher closed unexpectedly: %1") + emit errorOccurred(Tr::tr("Process launcher closed unexpectedly: %1") .arg(m_process->errorString())); } diff --git a/src/libs/utils/launchersocket.cpp b/src/libs/utils/launchersocket.cpp index 6a7560f710..07ebc84df9 100644 --- a/src/libs/utils/launchersocket.cpp +++ b/src/libs/utils/launchersocket.cpp @@ -1,13 +1,13 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -#include "algorithm.h" #include "launchersocket.h" -#include "launcherinterface.h" +#include "algorithm.h" +#include "launcherinterface.h" #include "qtcassert.h" +#include "utilstr.h" -#include #include #include @@ -219,8 +219,7 @@ void CallerHandle::start(const QString &program, const QStringList &arguments) { QTC_ASSERT(isCalledFromCallersThread(), return); if (!m_launcherHandle || m_launcherHandle->isSocketError()) { - const QString errorString = QCoreApplication::translate("Utils::LauncherHandle", - "Process launcher socket error."); + const QString errorString = Tr::tr("Process launcher socket error."); const ProcessResultData result = { 0, QProcess::NormalExit, QProcess::FailedToStart, errorString }; emit done(result); @@ -456,8 +455,7 @@ void LauncherHandle::handleSocketError(const QString &message) return; // TODO: FailedToStart may be wrong in case process has already started - const QString errorString = QCoreApplication::translate("Utils::QtcProcess", - "Internal socket error: %1").arg(message); + const QString errorString = Tr::tr("Internal socket error: %1").arg(message); const ProcessResultData result = { 0, QProcess::NormalExit, QProcess::FailedToStart, errorString }; m_callerHandle->appendSignal(new LauncherDoneSignal(result)); @@ -592,8 +590,7 @@ void LauncherSocket::handleSocketError() QTC_ASSERT(isCalledFromLaunchersThread(), return); auto socket = m_socket.load(); if (socket->error() != QLocalSocket::PeerClosedError) - handleError(QCoreApplication::translate("Utils::LauncherSocket", - "Socket error: %1").arg(socket->errorString())); + handleError(Tr::tr("Socket error: %1").arg(socket->errorString())); } void LauncherSocket::handleSocketDataAvailable() @@ -603,8 +600,7 @@ void LauncherSocket::handleSocketDataAvailable() if (!m_packetParser.parse()) return; } catch (const PacketParser::InvalidPacketSizeException &e) { - handleError(QCoreApplication::translate("Utils::LauncherSocket", - "Internal protocol error: invalid packet size %1.").arg(e.size)); + handleError(Tr::tr("Internal protocol error: invalid packet size %1.").arg(e.size)); return; } LauncherHandle *handle = handleForToken(m_packetParser.token()); @@ -617,8 +613,7 @@ void LauncherSocket::handleSocketDataAvailable() handle->handlePacket(m_packetParser.type(), m_packetParser.packetData()); break; default: - handleError(QCoreApplication::translate("Utils::LauncherSocket", - "Internal protocol error: invalid packet type %1.") + handleError(Tr::tr("Internal protocol error: invalid packet type %1.") .arg(static_cast(m_packetParser.type()))); return; } @@ -632,8 +627,7 @@ void LauncherSocket::handleSocketDataAvailable() void LauncherSocket::handleSocketDisconnected() { QTC_ASSERT(isCalledFromLaunchersThread(), return); - handleError(QCoreApplication::translate("Utils::LauncherSocket", - "Launcher socket closed unexpectedly.")); + handleError(Tr::tr("Launcher socket closed unexpectedly.")); } void LauncherSocket::handleError(const QString &error) diff --git a/src/libs/utils/macroexpander.cpp b/src/libs/utils/macroexpander.cpp index f3063f0d07..4e24247833 100644 --- a/src/libs/utils/macroexpander.cpp +++ b/src/libs/utils/macroexpander.cpp @@ -8,6 +8,7 @@ #include "environment.h" #include "qtcassert.h" #include "stringutils.h" +#include "utilstr.h" #include #include @@ -138,7 +139,7 @@ using namespace Internal; [...] MacroExpander::registerVariable( "MyVariable", - tr("The current value of whatever I want.")); + Tr::tr("The current value of whatever I want.")); []() -> QString { QString value; // do whatever is necessary to retrieve the value @@ -265,7 +266,7 @@ QString MacroExpander::expand(const QString &stringWithVariables) const --d->m_lockDepth; if (d->m_lockDepth == 0 && d->m_aborted) - return tr("Infinite recursion error") + QLatin1String(": ") + stringWithVariables; + return Tr::tr("Infinite recursion error") + QLatin1String(": ") + stringWithVariables; return res; } @@ -377,17 +378,17 @@ void MacroExpander::registerFileVariables(const QByteArray &prefix, const QString &heading, const FileFunction &base, bool visibleInChooser) { registerVariable(prefix + kFilePathPostfix, - tr("%1: Full path including file name.").arg(heading), + Tr::tr("%1: Full path including file name.").arg(heading), [base]() -> QString { QString tmp = base().toString(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).filePath(); }, visibleInChooser); registerVariable(prefix + kPathPostfix, - tr("%1: Full path excluding file name.").arg(heading), + Tr::tr("%1: Full path excluding file name.").arg(heading), [base]() -> QString { QString tmp = base().toString(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).path(); }, visibleInChooser); registerVariable(prefix + kNativeFilePathPostfix, - tr("%1: Full path including file name, with native path separator (backslash on Windows).").arg(heading), + Tr::tr("%1: Full path including file name, with native path separator (backslash on Windows).").arg(heading), [base]() -> QString { QString tmp = base().toString(); return tmp.isEmpty() ? QString() : QDir::toNativeSeparators(QFileInfo(tmp).filePath()); @@ -395,7 +396,7 @@ void MacroExpander::registerFileVariables(const QByteArray &prefix, visibleInChooser); registerVariable(prefix + kNativePathPostfix, - tr("%1: Full path excluding file name, with native path separator (backslash on Windows).").arg(heading), + Tr::tr("%1: Full path excluding file name, with native path separator (backslash on Windows).").arg(heading), [base]() -> QString { QString tmp = base().toString(); return tmp.isEmpty() ? QString() : QDir::toNativeSeparators(QFileInfo(tmp).path()); @@ -403,12 +404,12 @@ void MacroExpander::registerFileVariables(const QByteArray &prefix, visibleInChooser); registerVariable(prefix + kFileNamePostfix, - tr("%1: File name without path.").arg(heading), + Tr::tr("%1: File name without path.").arg(heading), [base]() -> QString { QString tmp = base().toString(); return tmp.isEmpty() ? QString() : FilePath::fromString(tmp).fileName(); }, visibleInChooser); registerVariable(prefix + kFileBaseNamePostfix, - tr("%1: File base name without path and suffix.").arg(heading), + Tr::tr("%1: File base name without path and suffix.").arg(heading), [base]() -> QString { QString tmp = base().toString(); return tmp.isEmpty() ? QString() : QFileInfo(tmp).baseName(); }, visibleInChooser); } @@ -477,9 +478,8 @@ class GlobalMacroExpander : public MacroExpander public: GlobalMacroExpander() { - setDisplayName(MacroExpander::tr("Global variables")); - registerPrefix("Env", - MacroExpander::tr("Access environment variables."), + setDisplayName(Tr::tr("Global variables")); + registerPrefix("Env", Tr::tr("Access environment variables."), [](const QString &value) { return qtcEnvironmentVariable(value); }); } }; diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h index ffb601a5a2..12172a5e17 100644 --- a/src/libs/utils/macroexpander.h +++ b/src/libs/utils/macroexpander.h @@ -22,7 +22,6 @@ using MacroExpanderProviders = QVector; class QTCREATOR_UTILS_EXPORT MacroExpander { - Q_DECLARE_TR_FUNCTIONS(Utils::MacroExpander) Q_DISABLE_COPY(MacroExpander) public: diff --git a/src/libs/utils/minimizableinfobars.cpp b/src/libs/utils/minimizableinfobars.cpp index 884f4c7ae4..a4fcd47811 100644 --- a/src/libs/utils/minimizableinfobars.cpp +++ b/src/libs/utils/minimizableinfobars.cpp @@ -6,6 +6,7 @@ #include "qtcassert.h" #include "qtcsettings.h" #include "utilsicons.h" +#include "utilstr.h" #include #include @@ -107,7 +108,7 @@ void MinimizableInfoBars::showInfoBar(const Id &id) // The minimizer() might delete the "Minimize" button immediately and as // result invalid reads will happen in QToolButton::mouseReleaseEvent(). // Avoid this by running the minimizer in the next event loop iteration. - info.addCustomButton(MinimizableInfoBars::tr("Minimize"), [this, id] { + info.addCustomButton(Tr::tr("Minimize"), [this, id] { QMetaObject::invokeMethod( this, [id, this] { diff --git a/src/libs/utils/namevaluemodel.cpp b/src/libs/utils/namevaluemodel.cpp index d1bf331f7f..2bd9180f76 100644 --- a/src/libs/utils/namevaluemodel.cpp +++ b/src/libs/utils/namevaluemodel.cpp @@ -8,6 +8,7 @@ #include "namevaluedictionary.h" #include "namevalueitem.h" #include "qtcassert.h" +#include "utilstr.h" #include #include @@ -30,7 +31,7 @@ public: // that the user can actually see those removals: for (const NameValueItem &item : std::as_const(m_items)) { if (item.operation == NameValueItem::Unset) - m_resultNameValueDictionary.set(item.name, NameValueModel::tr("")); + m_resultNameValueDictionary.set(item.name, Tr::tr("")); } } @@ -185,7 +186,7 @@ QVariant NameValueModel::headerData(int section, Qt::Orientation orientation, in { if (orientation == Qt::Vertical || role != Qt::DisplayRole) return QVariant(); - return section == 0 ? tr("Variable") : tr("Value"); + return section == 0 ? Tr::tr("Variable") : Tr::tr("Value"); } /// ***************** @@ -264,9 +265,9 @@ bool NameValueModel::setData(const QModelIndex &index, const QVariant &value, in QModelIndex NameValueModel::addVariable() { //: Name when inserting a new variable - return addVariable(NameValueItem(tr(""), + return addVariable(NameValueItem(Tr::tr(""), //: Value when inserting a new variable - tr(""))); + Tr::tr(""))); } QModelIndex NameValueModel::addVariable(const NameValueItem &item) diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp index 616ad8c125..892702566f 100644 --- a/src/libs/utils/namevaluesdialog.cpp +++ b/src/libs/utils/namevaluesdialog.cpp @@ -5,6 +5,7 @@ #include "environment.h" #include "hostosinfo.h" +#include "utilstr.h" #include #include @@ -74,8 +75,8 @@ NameValuesDialog::NameValuesDialog(const QString &windowTitle, const QString &he auto box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); - box->button(QDialogButtonBox::Ok)->setText(tr("&OK")); - box->button(QDialogButtonBox::Cancel)->setText(tr("&Cancel")); + box->button(QDialogButtonBox::Ok)->setText(Tr::tr("&OK")); + box->button(QDialogButtonBox::Cancel)->setText(Tr::tr("&Cancel")); connect(box, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(box, &QDialogButtonBox::rejected, this, &QDialog::reject); diff --git a/src/libs/utils/pathchooser.cpp b/src/libs/utils/pathchooser.cpp index 6f6a217321..84531ca555 100644 --- a/src/libs/utils/pathchooser.cpp +++ b/src/libs/utils/pathchooser.cpp @@ -308,7 +308,7 @@ void PathChooser::insertButton(int index, const QString &text, QObject *context, QString PathChooser::browseButtonLabel() { - return HostOsInfo::isMacHost() ? tr("Choose...") : tr("Browse..."); + return HostOsInfo::isMacHost() ? Tr::tr("Choose...") : Tr::tr("Browse..."); } QAbstractButton *PathChooser::buttonAtIndex(int index) const @@ -410,7 +410,7 @@ void PathChooser::slotBrowse(bool remote) case PathChooser::Directory: case PathChooser::ExistingDirectory: newPath = FileUtils::getExistingDirectory(this, - makeDialogTitle(tr("Choose Directory")), + makeDialogTitle(Tr::tr("Choose Directory")), predefined, {}, d->m_allowPathFromDevice, @@ -419,7 +419,7 @@ void PathChooser::slotBrowse(bool remote) case PathChooser::ExistingCommand: case PathChooser::Command: newPath = FileUtils::getOpenFilePath(this, - makeDialogTitle(tr("Choose Executable")), + makeDialogTitle(Tr::tr("Choose Executable")), predefined, d->m_dialogFilter, nullptr, @@ -430,7 +430,7 @@ void PathChooser::slotBrowse(bool remote) break; case PathChooser::File: // fall through newPath = FileUtils::getOpenFilePath(this, - makeDialogTitle(tr("Choose File")), + makeDialogTitle(Tr::tr("Choose File")), predefined, d->m_dialogFilter, nullptr, @@ -441,7 +441,7 @@ void PathChooser::slotBrowse(bool remote) break; case PathChooser::SaveFile: newPath = FileUtils::getSaveFilePath(this, - makeDialogTitle(tr("Choose File")), + makeDialogTitle(Tr::tr("Choose File")), predefined, d->m_dialogFilter, nullptr, @@ -450,7 +450,7 @@ void PathChooser::slotBrowse(bool remote) break; case PathChooser::Any: { newPath = FileUtils::getOpenFilePath(this, - makeDialogTitle(tr("Choose File")), + makeDialogTitle(Tr::tr("Choose File")), predefined, d->m_dialogFilter, nullptr, @@ -551,7 +551,7 @@ bool PathChooser::validatePath(FancyLineEdit *edit, QString *errorMessage) const input = d->m_defaultValue; } else { if (errorMessage) - *errorMessage = tr("The path must not be empty."); + *errorMessage = Tr::tr("The path must not be empty."); return false; } } @@ -559,7 +559,7 @@ bool PathChooser::validatePath(FancyLineEdit *edit, QString *errorMessage) const const FilePath filePath = d->expandedPath(FilePath::fromUserInput(input)); if (filePath.isEmpty()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" expanded to an empty string.").arg(input); + *errorMessage = Tr::tr("The path \"%1\" expanded to an empty string.").arg(input); return false; } @@ -568,68 +568,68 @@ bool PathChooser::validatePath(FancyLineEdit *edit, QString *errorMessage) const case PathChooser::ExistingDirectory: if (!filePath.exists()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" does not exist.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" does not exist.").arg(filePath.toUserOutput()); return false; } if (!filePath.isDir()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" is not a directory.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" is not a directory.").arg(filePath.toUserOutput()); return false; } break; case PathChooser::File: if (!filePath.exists()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" does not exist.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" does not exist.").arg(filePath.toUserOutput()); return false; } if (!filePath.isFile()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" is not a file.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" is not a file.").arg(filePath.toUserOutput()); return false; } break; case PathChooser::SaveFile: if (!filePath.parentDir().exists()) { if (errorMessage) - *errorMessage = tr("The directory \"%1\" does not exist.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The directory \"%1\" does not exist.").arg(filePath.toUserOutput()); return false; } if (filePath.exists() && filePath.isDir()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" is not a file.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" is not a file.").arg(filePath.toUserOutput()); return false; } break; case PathChooser::ExistingCommand: if (!filePath.exists()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" does not exist.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" does not exist.").arg(filePath.toUserOutput()); return false; } if (!filePath.isExecutableFile()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" is not an executable file.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" is not an executable file.").arg(filePath.toUserOutput()); return false; } break; case PathChooser::Directory: if (filePath.exists() && !filePath.isDir()) { if (errorMessage) - *errorMessage = tr("The path \"%1\" is not a directory.").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("The path \"%1\" is not a directory.").arg(filePath.toUserOutput()); return false; } if (HostOsInfo::isWindowsHost() && !filePath.startsWithDriveLetter() && !filePath.startsWith("\\\\") && !filePath.startsWith("//")) { if (errorMessage) - *errorMessage = tr("Invalid path \"%1\".").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("Invalid path \"%1\".").arg(filePath.toUserOutput()); return false; } break; case PathChooser::Command: if (filePath.exists() && !filePath.isExecutableFile()) { if (errorMessage) - *errorMessage = tr("Cannot execute \"%1\".").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("Cannot execute \"%1\".").arg(filePath.toUserOutput()); return false; } break; @@ -639,7 +639,7 @@ bool PathChooser::validatePath(FancyLineEdit *edit, QString *errorMessage) const } if (errorMessage) - *errorMessage = tr("Full path: \"%1\"").arg(filePath.toUserOutput()); + *errorMessage = Tr::tr("Full path: \"%1\"").arg(filePath.toUserOutput()); return true; } @@ -650,7 +650,7 @@ void PathChooser::setValidationFunction(const FancyLineEdit::ValidationFunction QString PathChooser::label() { - return tr("Path:"); + return Tr::tr("Path:"); } FilePath PathChooser::homePath() diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp index fb6ecf68a2..fc7beb7597 100644 --- a/src/libs/utils/pathlisteditor.cpp +++ b/src/libs/utils/pathlisteditor.cpp @@ -5,6 +5,7 @@ #include "fileutils.h" #include "hostosinfo.h" +#include "utilstr.h" #include #include @@ -97,13 +98,13 @@ PathListEditor::PathListEditor(QWidget *parent) : d(new PathListEditorPrivate) { setLayout(d->layout); - addButton(tr("Insert..."), this, [this] { + addButton(Tr::tr("Insert..."), this, [this] { const FilePath dir = FileUtils::getExistingDirectory(this, d->fileDialogTitle); if (!dir.isEmpty()) insertPathAtCursor(dir.toUserOutput()); }); - addButton(tr("Delete Line"), this, [this] { deletePathAtCursor(); }); - addButton(tr("Clear"), this, [this] { d->edit->clear(); }); + addButton(Tr::tr("Delete Line"), this, [this] { deletePathAtCursor(); }); + addButton(Tr::tr("Clear"), this, [this] { d->edit->clear(); }); connect(d->edit, &QPlainTextEdit::textChanged, this, &PathListEditor::changed); } diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp index 5b9721e274..5d7a35db3a 100644 --- a/src/libs/utils/persistentsettings.cpp +++ b/src/libs/utils/persistentsettings.cpp @@ -5,8 +5,8 @@ #include "fileutils.h" #include "qtcassert.h" +#include "utilstr.h" -#include #include #include #include @@ -415,9 +415,7 @@ bool PersistentSettingsWriter::save(const QVariantMap &data, QWidget *parent) co QString errorString; const bool success = save(data, &errorString); if (!success) - QMessageBox::critical(parent, - QCoreApplication::translate("Utils::FileSaverBase", "File Error"), - errorString); + QMessageBox::critical(parent, Tr::tr("File Error"), errorString); return success; } #endif // QT_GUI_LIB diff --git a/src/libs/utils/projectintropage.cpp b/src/libs/utils/projectintropage.cpp index 2a9dbe7ffa..8df64b97f0 100644 --- a/src/libs/utils/projectintropage.cpp +++ b/src/libs/utils/projectintropage.cpp @@ -9,6 +9,7 @@ #include "infolabel.h" #include "layoutbuilder.h" #include "pathchooser.h" +#include "utilstr.h" #include "wizard.h" #include @@ -66,7 +67,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) : d(new ProjectIntroPagePrivate) { resize(355, 289); - setTitle(tr("Introduction and Project Location")); + setTitle(Tr::tr("Introduction and Project Location")); d->m_descriptionLabel = new QLabel(this); d->m_descriptionLabel->setWordWrap(true); @@ -81,7 +82,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) : d->m_pathChooser->setExpectedKind(PathChooser::Directory); d->m_pathChooser->setDisabled(d->m_forceSubProject); - d->m_projectsDirectoryCheckBox = new QCheckBox(tr("Use as default project location")); + d->m_projectsDirectoryCheckBox = new QCheckBox(Tr::tr("Use as default project location")); d->m_projectsDirectoryCheckBox->setObjectName("projectsDirectoryCheckBox"); d->m_projectsDirectoryCheckBox->setDisabled(d->m_forceSubProject); @@ -94,7 +95,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) : d->m_stateLabel->setFilled(true); hideStatusLabel(); - d->m_nameLineEdit->setPlaceholderText(tr("Enter project name")); + d->m_nameLineEdit->setPlaceholderText(Tr::tr("Enter project name")); d->m_nameLineEdit->setObjectName("nameLineEdit"); d->m_nameLineEdit->setFocus(); d->m_nameLineEdit->setValidationFunction([this](FancyLineEdit *edit, QString *errorString) { @@ -107,10 +108,10 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) : using namespace Layouting; Form { - tr("Name:"), d->m_nameLineEdit, br, + Tr::tr("Name:"), d->m_nameLineEdit, br, d->m_projectLabel, d->m_projectComboBox, br, Column { Space(12) }, br, - tr("Create in:"), d->m_pathChooser, br, + Tr::tr("Create in:"), d->m_pathChooser, br, Span(2, d->m_projectsDirectoryCheckBox) }.attachTo(frame); @@ -134,7 +135,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) : connect(d->m_projectComboBox, &QComboBox::currentIndexChanged, this, &ProjectIntroPage::slotChanged); - setProperty(SHORT_TITLE_PROPERTY, tr("Location")); + setProperty(SHORT_TITLE_PROPERTY, Tr::tr("Location")); registerFieldWithName(QLatin1String("Path"), d->m_pathChooser, "path", SIGNAL(textChanged(QString))); registerFieldWithName(QLatin1String("ProjectName"), d->m_nameLineEdit); } @@ -207,7 +208,7 @@ bool ProjectIntroPage::validate() displayStatusMessage(InfoLabel::Error, d->m_nameLineEdit->errorMessage()); return false; case FancyLineEdit::DisplayingPlaceholderText: - displayStatusMessage(InfoLabel::Error, tr("Name is empty.")); + displayStatusMessage(InfoLabel::Error, Tr::tr("Name is empty.")); return false; case FancyLineEdit::Valid: break; @@ -219,7 +220,7 @@ bool ProjectIntroPage::validate() if (!projectDir.exists()) { // All happy if (!d->m_pathChooser->filePath().exists()) { - displayStatusMessage(InfoLabel::Information, tr("Directory \"%1\" will be created.") + displayStatusMessage(InfoLabel::Information, Tr::tr("Directory \"%1\" will be created.") .arg(d->m_pathChooser->filePath().toUserOutput())); } else { hideStatusLabel(); @@ -228,11 +229,11 @@ bool ProjectIntroPage::validate() } if (projectDir.isDir()) { - displayStatusMessage(InfoLabel::Warning, tr("The project already exists.")); + displayStatusMessage(InfoLabel::Warning, Tr::tr("The project already exists.")); return true; } // Not a directory, but something else, likely causing directory creation to fail - displayStatusMessage(InfoLabel::Error, tr("A file with that name already exists.")); + displayStatusMessage(InfoLabel::Error, Tr::tr("A file with that name already exists.")); return false; } @@ -293,7 +294,7 @@ bool ProjectIntroPage::validateProjectName(const QString &name, QString *errorMe if (!d->m_projectNameValidator.regularExpression().pattern().isEmpty()) { if (name.isEmpty()) { if (errorMessage) - *errorMessage = tr("Name is empty."); + *errorMessage = Tr::tr("Name is empty."); return false; } // pos is set by reference @@ -305,7 +306,7 @@ bool ProjectIntroPage::validateProjectName(const QString &name, QString *errorMe if (validatorState != QValidator::Acceptable && (pos == -1 || pos >= name.count())) { if (errorMessage) { if (d->m_projectNameValidatorUserMessage.isEmpty()) - *errorMessage = tr("Project name is invalid."); + *errorMessage = Tr::tr("Project name is invalid."); else *errorMessage = d->m_projectNameValidatorUserMessage; } @@ -317,14 +318,14 @@ bool ProjectIntroPage::validateProjectName(const QString &name, QString *errorMe return false; if (name.contains(QLatin1Char('.'))) { if (errorMessage) - *errorMessage = tr("Invalid character \".\"."); + *errorMessage = Tr::tr("Invalid character \".\"."); return false; } pos = FileUtils::indexOfQmakeUnfriendly(name); } if (pos >= 0) { if (errorMessage) - *errorMessage = tr("Invalid character \"%1\" found.").arg(name.at(pos)); + *errorMessage = Tr::tr("Invalid character \"%1\" found.").arg(name.at(pos)); return false; } return true; diff --git a/src/libs/utils/qrcparser.cpp b/src/libs/utils/qrcparser.cpp index 158c061f71..62aafe71a6 100644 --- a/src/libs/utils/qrcparser.cpp +++ b/src/libs/utils/qrcparser.cpp @@ -3,9 +3,10 @@ #include "qrcparser.h" +#include "filepath.h" #include "qtcassert.h" -#include +#include // Yes, the translations are still there #include #include @@ -26,7 +27,6 @@ namespace Internal { class QrcParserPrivate { - Q_DECLARE_TR_FUNCTIONS(QmlJS::QrcParser) public: typedef QMap SMap; QrcParserPrivate(QrcParser *q); @@ -55,7 +55,6 @@ private: class QrcCachePrivate { - Q_DECLARE_TR_FUNCTIONS(QmlJS::QrcCachePrivate) public: QrcCachePrivate(QrcCache *q); QrcParser::Ptr addPath(const QString &path, const QString &contents); @@ -362,7 +361,7 @@ bool QrcParserPrivate::parseFile(const QString &path, const QString &contents) QString error_msg; int error_line, error_col; if (!doc.setContent(&file, &error_msg, &error_line, &error_col)) { - m_errorMessages.append(tr("XML error on line %1, col %2: %3") + m_errorMessages.append(QmlJS::Tr::tr("XML error on line %1, col %2: %3") .arg(error_line).arg(error_col).arg(error_msg)); return false; } @@ -371,7 +370,7 @@ bool QrcParserPrivate::parseFile(const QString &path, const QString &contents) QString error_msg; int error_line, error_col; if (!doc.setContent(contents, &error_msg, &error_line, &error_col)) { - m_errorMessages.append(tr("XML error on line %1, col %2: %3") + m_errorMessages.append(QmlJS::Tr::tr("XML error on line %1, col %2: %3") .arg(error_line).arg(error_col).arg(error_msg)); return false; } @@ -379,7 +378,7 @@ bool QrcParserPrivate::parseFile(const QString &path, const QString &contents) QDomElement root = doc.firstChildElement(QLatin1String("RCC")); if (root.isNull()) { - m_errorMessages.append(tr("The root element is missing.")); + m_errorMessages.append(QmlJS::Tr::tr("The root element is missing.")); return false; } diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 876b1fa6f8..92717a571b 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -14,6 +14,7 @@ #include "stringutils.h" #include "terminalprocess_p.h" #include "threadutils.h" +#include "utilstr.h" #include #include @@ -245,7 +246,7 @@ bool DefaultImpl::dissolveCommand(QString *program, QStringList *arguments) const ProcessResultData result = {0, QProcess::NormalExit, QProcess::FailedToStart, - QtcProcess::tr("Error in command line.")}; + Tr::tr("Error in command line.")}; emit done(result); return false; } @@ -274,7 +275,7 @@ bool DefaultImpl::ensureProgramExists(const QString &program) return true; const QString errorString - = QtcProcess::tr("The program \"%1\" does not exist or is not executable.").arg(program); + = Tr::tr("The program \"%1\" does not exist or is not executable.").arg(program); const ProcessResultData result = { 0, QProcess::NormalExit, QProcess::FailedToStart, errorString }; emit done(result); @@ -1241,12 +1242,12 @@ static bool askToKill(const CommandLine &command) #ifdef QT_GUI_LIB if (!isMainThread()) return true; - const QString title = QtcProcess::tr("Process Not Responding"); - QString msg = command.isEmpty() ? QtcProcess::tr("The process is not responding.") - : QtcProcess::tr("The process \"%1\" is not responding.") + const QString title = Tr::tr("Process Not Responding"); + QString msg = command.isEmpty() ? Tr::tr("The process is not responding.") + : Tr::tr("The process \"%1\" is not responding.") .arg(command.executable().toUserOutput()); msg += ' '; - msg += QtcProcess::tr("Terminate the process?"); + msg += Tr::tr("Terminate the process?"); // Restore the cursor that is set to wait while running. const bool hasOverrideCursor = QApplication::overrideCursor() != nullptr; if (hasOverrideCursor) @@ -1517,16 +1518,16 @@ QString QtcProcess::exitMessage() const const QString fullCmd = commandLine().toUserOutput(); switch (result()) { case ProcessResult::FinishedWithSuccess: - return QtcProcess::tr("The command \"%1\" finished successfully.").arg(fullCmd); + return Tr::tr("The command \"%1\" finished successfully.").arg(fullCmd); case ProcessResult::FinishedWithError: - return QtcProcess::tr("The command \"%1\" terminated with exit code %2.") + return Tr::tr("The command \"%1\" terminated with exit code %2.") .arg(fullCmd).arg(exitCode()); case ProcessResult::TerminatedAbnormally: - return QtcProcess::tr("The command \"%1\" terminated abnormally.").arg(fullCmd); + return Tr::tr("The command \"%1\" terminated abnormally.").arg(fullCmd); case ProcessResult::StartFailed: - return QtcProcess::tr("The command \"%1\" could not be started.").arg(fullCmd); + return Tr::tr("The command \"%1\" could not be started.").arg(fullCmd); case ProcessResult::Hang: - return QtcProcess::tr("The command \"%1\" did not respond within the timeout limit (%2 s).") + return Tr::tr("The command \"%1\" did not respond within the timeout limit (%2 s).") .arg(fullCmd).arg(d->m_maxHangTimerCount); } return {}; diff --git a/src/libs/utils/reloadpromptutils.cpp b/src/libs/utils/reloadpromptutils.cpp index 998e05b062..5257138245 100644 --- a/src/libs/utils/reloadpromptutils.cpp +++ b/src/libs/utils/reloadpromptutils.cpp @@ -5,6 +5,7 @@ #include "fileutils.h" #include "hostosinfo.h" +#include "utilstr.h" #include #include @@ -19,28 +20,22 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FilePath &fileName, QWidget *parent) { - const QString title = QCoreApplication::translate("Utils::reloadPrompt", "File Changed"); + const QString title = Tr::tr("File Changed"); QString msg; if (modified) { - msg = QCoreApplication::translate("Utils::reloadPrompt", - "The unsaved file %1 has been changed on disk. " - "Do you want to reload it and discard your changes?"); + msg = Tr::tr("The unsaved file %1 has been changed on disk. " + "Do you want to reload it and discard your changes?"); } else { - msg = QCoreApplication::translate("Utils::reloadPrompt", - "The file %1 has been changed on disk. Do you want to reload it?"); + msg = Tr::tr("The file %1 has been changed on disk. Do you want to reload it?"); } msg = "

" + msg.arg(fileName.fileName()) + "

"; if (HostOsInfo::isMacHost()) { - msg += QCoreApplication::translate( - "Utils::reloadPrompt", - "The default behavior can be set in %1 > Preferences > Environment > System.", - "macOS") + msg += Tr::tr("The default behavior can be set in %1 > Preferences > Environment > System.", + "macOS") .arg(QGuiApplication::applicationDisplayName()); } else { - msg += QCoreApplication::translate( - "Utils::reloadPrompt", - "The default behavior can be set in Edit > Preferences > Environment > System."); + msg += Tr::tr("The default behavior can be set in Edit > Preferences > Environment > System."); } msg += "

"; return reloadPrompt(title, msg, fileName.toUserOutput(), enableDiffOption, parent); @@ -60,15 +55,11 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, msg.setText(prompt); msg.setDetailedText(details); - msg.button(QMessageBox::Close)->setText(QCoreApplication::translate("Utils::reloadPrompt", - "&Close")); + msg.button(QMessageBox::Close)->setText(Tr::tr("&Close")); QPushButton *diffButton = nullptr; - if (enableDiffOption) { - diffButton = msg.addButton(QCoreApplication::translate( - "Utils::reloadPrompt", "No to All && &Diff"), - QMessageBox::NoRole); - } + if (enableDiffOption) + diffButton = msg.addButton(Tr::tr("No to All && &Diff"), QMessageBox::NoRole); const int result = msg.exec(); @@ -93,25 +84,19 @@ QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer fileDeletedPrompt(const QString &fileName, QWidget *parent) { - const QString title = QCoreApplication::translate("Utils::fileDeletedPrompt", - "File Has Been Removed"); - QString msg = QCoreApplication::translate("Utils::fileDeletedPrompt", - "The file %1 has been removed from disk. " - "Do you want to save it under a different name, or close " - "the editor?").arg(QDir::toNativeSeparators(fileName)); + const QString title = Tr::tr("File Has Been Removed"); + const QString msg = Tr::tr("The file %1 has been removed from disk. " + "Do you want to save it under a different name, or close " + "the editor?").arg(QDir::toNativeSeparators(fileName)); QMessageBox box(QMessageBox::Question, title, msg, QMessageBox::NoButton, parent); - QPushButton *saveas = - box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "Save &as..."), - QMessageBox::ActionRole); QPushButton *close = - box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Close"), - QMessageBox::RejectRole); + box.addButton(Tr::tr("&Close"), QMessageBox::RejectRole); QPushButton *closeAll = - box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "C&lose All"), - QMessageBox::RejectRole); + box.addButton(Tr::tr("C&lose All"), QMessageBox::RejectRole); + QPushButton *saveas = + box.addButton(Tr::tr("Save &as..."), QMessageBox::ActionRole); QPushButton *save = - box.addButton(QCoreApplication::translate("Utils::fileDeletedPrompt", "&Save"), - QMessageBox::AcceptRole); + box.addButton(Tr::tr("&Save"), QMessageBox::AcceptRole); box.setDefaultButton(saveas); box.exec(); QAbstractButton *clickedbutton = box.clickedButton(); diff --git a/src/libs/utils/removefiledialog.cpp b/src/libs/utils/removefiledialog.cpp index 0f8cbecede..b2926d7ecf 100644 --- a/src/libs/utils/removefiledialog.cpp +++ b/src/libs/utils/removefiledialog.cpp @@ -5,6 +5,7 @@ #include "filepath.h" #include "layoutbuilder.h" +#include "utilstr.h" #include #include @@ -17,7 +18,7 @@ RemoveFileDialog::RemoveFileDialog(const FilePath &filePath, QWidget *parent) : QDialog(parent) { const bool isFile = filePath.isFile(); - setWindowTitle(isFile ? tr("Remove File") : tr("Remove Folder")); + setWindowTitle(isFile ? Tr::tr("Remove File") : Tr::tr("Remove Folder")); resize(514, 159); QFont font; @@ -27,9 +28,9 @@ RemoveFileDialog::RemoveFileDialog(const FilePath &filePath, QWidget *parent) fileNameLabel->setFont(font); fileNameLabel->setWordWrap(true); - m_deleteFileCheckBox = new QCheckBox(tr("&Delete file permanently")); + m_deleteFileCheckBox = new QCheckBox(Tr::tr("&Delete file permanently")); - auto removeVCCheckBox = new QCheckBox(tr("&Remove from version control")); + auto removeVCCheckBox = new QCheckBox(Tr::tr("&Remove from version control")); removeVCCheckBox->setVisible(false); // TODO auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); @@ -37,7 +38,7 @@ RemoveFileDialog::RemoveFileDialog(const FilePath &filePath, QWidget *parent) using namespace Layouting; Column { - isFile ? tr("File to remove:") : tr("Folder to remove:"), + isFile ? Tr::tr("File to remove:") : Tr::tr("Folder to remove:"), fileNameLabel, Space(10), m_deleteFileCheckBox, diff --git a/src/libs/utils/settingsaccessor.cpp b/src/libs/utils/settingsaccessor.cpp index 3eb440eb00..dc3cd0711e 100644 --- a/src/libs/utils/settingsaccessor.cpp +++ b/src/libs/utils/settingsaccessor.cpp @@ -4,10 +4,10 @@ #include "settingsaccessor.h" #include "algorithm.h" -#include "qtcassert.h" #include "persistentsettings.h" +#include "qtcassert.h" +#include "utilstr.h" -#include #include namespace { @@ -115,8 +115,8 @@ SettingsAccessor::RestoreData SettingsAccessor::readFile(const FilePath &path) c { PersistentSettingsReader reader; if (!reader.load(path)) { - return RestoreData(Issue(QCoreApplication::translate("Utils::SettingsAccessor", "Failed to Read File"), - QCoreApplication::translate("Utils::SettingsAccessor", "Could not open \"%1\".") + return RestoreData(Issue(Tr::tr("Failed to Read File"), + Tr::tr("Could not open \"%1\".") .arg(path.toUserOutput()), Issue::Type::ERROR)); } @@ -139,8 +139,8 @@ std::optional SettingsAccessor::writeFile(const FilePat const QVariantMap &data) const { if (data.isEmpty()) { - return Issue(QCoreApplication::translate("Utils::SettingsAccessor", "Failed to Write File"), - QCoreApplication::translate("Utils::SettingsAccessor", "There was nothing to write."), + return Issue(Tr::tr("Failed to Write File"), + Tr::tr("There was nothing to write."), Issue::Type::WARNING); } @@ -149,7 +149,7 @@ std::optional SettingsAccessor::writeFile(const FilePat m_writer = std::make_unique(path, docType); if (!m_writer->save(data, &errorMessage)) { - return Issue(QCoreApplication::translate("Utils::SettingsAccessor", "Failed to Write File"), + return Issue(Tr::tr("Failed to Write File"), errorMessage, Issue::Type::ERROR); } return {}; @@ -252,14 +252,13 @@ BackingUpSettingsAccessor::readData(const FilePath &path, QWidget *parent) const result.path = baseFilePath().parentDir(); if (result.data.isEmpty()) { - Issue i(QApplication::translate("Utils::SettingsAccessor", "No Valid Settings Found"), - QApplication::translate("Utils::SettingsAccessor", - "

No valid settings file could be found.

" - "

All settings files found in directory \"%1\" " - "were unsuitable for the current version of %2, " - "for instance because they were written by an incompatible " - "version of %2, or because a different settings path " - "was used.

") + Issue i(Tr::tr("No Valid Settings Found"), + Tr::tr("

No valid settings file could be found.

" + "

All settings files found in directory \"%1\" " + "were unsuitable for the current version of %2, " + "for instance because they were written by an incompatible " + "version of %2, or because a different settings path " + "was used.

") .arg(path.toUserOutput(), applicationDisplayName), Issue::Type::ERROR); i.buttons.insert(QMessageBox::Ok, DiscardAndContinue); result.issue = i; @@ -522,11 +521,10 @@ UpgradingSettingsAccessor::validateVersionRange(const RestoreData &data) const return result; const int version = versionFromMap(result.data); if (version < firstSupportedVersion() || version > currentVersion()) { - Issue i(QApplication::translate("Utils::SettingsAccessor", "No Valid Settings Found"), - QApplication::translate("Utils::SettingsAccessor", - "

No valid settings file could be found.

" - "

All settings files found in directory \"%1\" " - "were either too new or too old to be read.

") + Issue i(Tr::tr("No Valid Settings Found"), + Tr::tr("

No valid settings file could be found.

" + "

All settings files found in directory \"%1\" " + "were either too new or too old to be read.

") .arg(result.path.toUserOutput()), Issue::Type::ERROR); i.buttons.insert(QMessageBox::Ok, DiscardAndContinue); result.issue = i; @@ -535,15 +533,14 @@ UpgradingSettingsAccessor::validateVersionRange(const RestoreData &data) const if (result.path != baseFilePath() && !result.path.endsWith(".shared") && version < currentVersion()) { - Issue i(QApplication::translate("Utils::SettingsAccessor", "Using Old Settings"), - QApplication::translate("Utils::SettingsAccessor", - "

The versioned backup \"%1\" of the settings " - "file is used, because the non-versioned file was " - "created by an incompatible version of %2.

" - "

Settings changes made since the last time this " - "version of %2 was used are ignored, and " - "changes made now will not be propagated to " - "the newer version.

") + Issue i(Tr::tr("Using Old Settings"), + Tr::tr("

The versioned backup \"%1\" of the settings " + "file is used, because the non-versioned file was " + "created by an incompatible version of %2.

" + "

Settings changes made since the last time this " + "version of %2 was used are ignored, and " + "changes made now will not be propagated to " + "the newer version.

") .arg(result.path.toUserOutput(), applicationDisplayName), Issue::Type::WARNING); i.buttons.insert(QMessageBox::Ok, Continue); result.issue = i; @@ -552,15 +549,13 @@ UpgradingSettingsAccessor::validateVersionRange(const RestoreData &data) const const QByteArray readId = settingsIdFromMap(result.data); if (!settingsId().isEmpty() && !readId.isEmpty() && readId != settingsId()) { - Issue i(QApplication::translate("Utils::EnvironmentIdAccessor", - "Settings File for \"%1\" from a Different Environment?") + Issue i(Tr::tr("Settings File for \"%1\" from a Different Environment?") .arg(applicationDisplayName), - QApplication::translate("Utils::EnvironmentIdAccessor", - "

No settings file created by this instance " - "of %1 was found.

" - "

Did you work with this project on another machine or " - "using a different settings path before?

" - "

Do you still want to load the settings file \"%2\"?

") + Tr::tr("

No settings file created by this instance " + "of %1 was found.

" + "

Did you work with this project on another machine or " + "using a different settings path before?

" + "

Do you still want to load the settings file \"%2\"?

") .arg(applicationDisplayName, result.path.toUserOutput()), Issue::Type::WARNING); i.defaultButton = QMessageBox::No; i.escapeButton = QMessageBox::No; @@ -616,11 +611,9 @@ SettingsAccessor::RestoreData MergingSettingsAccessor::readData(const FilePath & // that perfectly match corresponding user ones. If we don't have valid user // settings to compare against, there's nothing we can do. - secondaryData.issue = Issue(QApplication::translate("Utils::SettingsAccessor", - "Unsupported Merge Settings File"), - QApplication::translate("Utils::SettingsAccessor", - "\"%1\" is not supported by %2. " - "Do you want to try loading it anyway?") + secondaryData.issue = Issue(Tr::tr("Unsupported Merge Settings File"), + Tr::tr("\"%1\" is not supported by %2. " + "Do you want to try loading it anyway?") .arg(secondaryData.path.toUserOutput(), applicationDisplayName), Issue::Type::WARNING); secondaryData.issue->buttons.clear(); diff --git a/src/libs/utils/settingsselector.cpp b/src/libs/utils/settingsselector.cpp index 442b923e24..7b437ed8a7 100644 --- a/src/libs/utils/settingsselector.cpp +++ b/src/libs/utils/settingsselector.cpp @@ -3,6 +3,8 @@ #include "settingsselector.h" +#include "utilstr.h" + #include #include #include @@ -27,9 +29,9 @@ SettingsSelector::SettingsSelector(QWidget *parent) : m_configurationCombo->setSizeAdjustPolicy(QComboBox::AdjustToContents); m_configurationCombo->setMinimumContentsLength(80); - m_addButton = new QPushButton(tr("Add"), this); - m_removeButton = new QPushButton(tr("Remove"), this); - m_renameButton = new QPushButton(tr("Rename"), this); + m_addButton = new QPushButton(Tr::tr("Add"), this); + m_removeButton = new QPushButton(Tr::tr("Remove"), this); + m_renameButton = new QPushButton(Tr::tr("Rename"), this); m_label = new QLabel(this); m_label->setMinimumWidth(200); @@ -111,8 +113,8 @@ void SettingsSelector::removeButtonClicked() int pos = currentIndex(); if (pos < 0) return; - const QString title = tr("Remove"); - const QString message = tr("Do you really want to delete the configuration %1?") + const QString title = Tr::tr("Remove"); + const QString message = Tr::tr("Do you really want to delete the configuration %1?") .arg(m_configurationCombo->currentText()); QMessageBox msgBox(QMessageBox::Question, title, message, QMessageBox::Yes|QMessageBox::No, this); msgBox.setDefaultButton(QMessageBox::No); @@ -135,9 +137,9 @@ void SettingsSelector::renameButtonClicked() QString baseName = model->data(idx, Qt::EditRole).toString(); bool ok; - const QString message = tr("New name for configuration %1:").arg(baseName); + const QString message = Tr::tr("New name for configuration %1:").arg(baseName); - QString name = QInputDialog::getText(this, tr("Rename..."), message, + QString name = QInputDialog::getText(this, Tr::tr("Rename..."), message, QLineEdit::Normal, baseName, &ok); if (!ok) return; diff --git a/src/libs/utils/stringutils.cpp b/src/libs/utils/stringutils.cpp index 0c02231405..8d389599c5 100644 --- a/src/libs/utils/stringutils.cpp +++ b/src/libs/utils/stringutils.cpp @@ -7,13 +7,13 @@ #include "hostosinfo.h" #include "qtcassert.h" #include "filepath.h" +#include "utilstr.h" #ifdef QT_WIDGETS_LIB #include #include #endif -#include #include #include #include @@ -338,7 +338,7 @@ QString formatElapsedTime(qint64 elapsed) elapsed += 500; // round up const QString format = QString::fromLatin1(elapsed >= 3600000 ? "h:mm:ss" : "mm:ss"); const QString time = QTime(0, 0).addMSecs(elapsed).toString(format); - return QCoreApplication::translate("StringUtils", "Elapsed time: %1.").arg(time); + return Tr::tr("Elapsed time: %1.").arg(time); } /* diff --git a/src/libs/utils/terminalprocess.cpp b/src/libs/utils/terminalprocess.cpp index 11157c77a8..e6e28b493e 100644 --- a/src/libs/utils/terminalprocess.cpp +++ b/src/libs/utils/terminalprocess.cpp @@ -9,6 +9,7 @@ #include "qtcassert.h" #include "qtcprocess.h" #include "terminalcommand.h" +#include "utilstr.h" #include #include @@ -58,44 +59,44 @@ static QString modeOption(TerminalMode m) static QString msgCommChannelFailed(const QString &error) { - return QtcProcess::tr("Cannot set up communication channel: %1").arg(error); + return Tr::tr("Cannot set up communication channel: %1").arg(error); } static QString msgPromptToClose() { // Shown in a terminal which might have a different character set on Windows. - return QtcProcess::tr("Press to close this window..."); + return Tr::tr("Press to close this window..."); } static QString msgCannotCreateTempFile(const QString &why) { - return QtcProcess::tr("Cannot create temporary file: %1").arg(why); + return Tr::tr("Cannot create temporary file: %1").arg(why); } static QString msgCannotWriteTempFile() { - return QtcProcess::tr("Cannot write temporary file. Disk full?"); + return Tr::tr("Cannot write temporary file. Disk full?"); } static QString msgCannotCreateTempDir(const QString & dir, const QString &why) { - return QtcProcess::tr("Cannot create temporary directory \"%1\": %2").arg(dir, why); + return Tr::tr("Cannot create temporary directory \"%1\": %2").arg(dir, why); } static QString msgUnexpectedOutput(const QByteArray &what) { - return QtcProcess::tr("Unexpected output from helper program (%1).") + return Tr::tr("Unexpected output from helper program (%1).") .arg(QString::fromLatin1(what)); } static QString msgCannotChangeToWorkDir(const FilePath &dir, const QString &why) { - return QtcProcess::tr("Cannot change to working directory \"%1\": %2").arg(dir.toString(), why); + return Tr::tr("Cannot change to working directory \"%1\": %2").arg(dir.toString(), why); } static QString msgCannotExecute(const QString & p, const QString &why) { - return QtcProcess::tr("Cannot execute \"%1\": %2").arg(p, why); + return Tr::tr("Cannot execute \"%1\": %2").arg(p, why); } class TerminalProcessPrivate @@ -290,7 +291,7 @@ void TerminalImpl::start() if (!success) { delete d->m_pid; d->m_pid = nullptr; - const QString msg = QtcProcess::tr("The process \"%1\" could not be started: %2") + const QString msg = Tr::tr("The process \"%1\" could not be started: %2") .arg(cmdLine, winErrorMessage(GetLastError())); cleanupAfterStartFailure(msg); return; @@ -315,14 +316,14 @@ void TerminalImpl::start() pcmd = m_setup.m_commandLine.executable().toString(); } else { if (perr != ProcessArgs::FoundMeta) { - emitError(QProcess::FailedToStart, QtcProcess::tr("Quoting error in command.")); + emitError(QProcess::FailedToStart, Tr::tr("Quoting error in command.")); return; } if (m_setup.m_terminalMode == TerminalMode::Debug) { // FIXME: QTCREATORBUG-2809 emitError(QProcess::FailedToStart, - QtcProcess::tr("Debugging complex shell commands in a terminal" - " is currently not supported.")); + Tr::tr("Debugging complex shell commands in a terminal" + " is currently not supported.")); return; } pcmd = qtcEnvironmentVariable("SHELL", "/bin/sh"); @@ -341,8 +342,8 @@ void TerminalImpl::start() if (qerr != ProcessArgs::SplitOk) { emitError(QProcess::FailedToStart, qerr == ProcessArgs::BadQuoting - ? QtcProcess::tr("Quoting error in terminal command.") - : QtcProcess::tr("Terminal command may not be a shell command.")); + ? Tr::tr("Quoting error in terminal command.") + : Tr::tr("Terminal command may not be a shell command.")); return; } @@ -397,7 +398,7 @@ void TerminalImpl::start() d->m_process.start(); if (!d->m_process.waitForStarted()) { - const QString msg = QtcProcess::tr("Cannot start the terminal emulator \"%1\", change the " + const QString msg = Tr::tr("Cannot start the terminal emulator \"%1\", change the " "setting in the Environment preferences. (%2)") .arg(terminal.command, d->m_process.errorString()); cleanupAfterStartFailure(msg); @@ -528,7 +529,7 @@ QString TerminalImpl::stubServerListen() const QString stubServer = stubFifoDir + QLatin1String("/stub-socket"); if (!d->m_stubServer.listen(stubServer)) { ::rmdir(d->m_stubServerDir.constData()); - return QtcProcess::tr("Cannot create socket \"%1\": %2") + return Tr::tr("Cannot create socket \"%1\": %2") .arg(stubServer, d->m_stubServer.errorString()); } return {}; @@ -601,7 +602,7 @@ void TerminalImpl::readStubOutput() FALSE, d->m_processId); if (d->m_hInferior == NULL) { emitError(QProcess::FailedToStart, - QtcProcess::tr("Cannot obtain a handle to the inferior: %1") + Tr::tr("Cannot obtain a handle to the inferior: %1") .arg(winErrorMessage(GetLastError()))); // Uhm, and now what? continue; @@ -612,7 +613,7 @@ void TerminalImpl::readStubOutput() if (!GetExitCodeProcess(d->m_hInferior, &chldStatus)) emitError(QProcess::UnknownError, - QtcProcess::tr("Cannot obtain exit status from inferior: %1") + Tr::tr("Cannot obtain exit status from inferior: %1") .arg(winErrorMessage(GetLastError()))); cleanupInferior(); emitFinished(chldStatus, QProcess::NormalExit); diff --git a/src/libs/utils/textfileformat.cpp b/src/libs/utils/textfileformat.cpp index 431c2f1686..28fb243abf 100644 --- a/src/libs/utils/textfileformat.cpp +++ b/src/libs/utils/textfileformat.cpp @@ -5,6 +5,7 @@ #include "fileutils.h" #include "qtcassert.h" +#include "utilstr.h" #include #include @@ -190,7 +191,7 @@ TextFileFormat::ReadResult readTextFile(const FilePath &filePath, const QTextCod return TextFileFormat::ReadIOError; data = reader.data(); } catch (const std::bad_alloc &) { - *errorString = QCoreApplication::translate("Utils::TextFileFormat", "Out of memory."); + *errorString = Tr::tr("Out of memory."); return TextFileFormat::ReadMemoryAllocationError; } @@ -201,7 +202,7 @@ TextFileFormat::ReadResult readTextFile(const FilePath &filePath, const QTextCod format->codec = defaultCodec ? defaultCodec : QTextCodec::codecForLocale(); if (!format->decode(data, target)) { - *errorString = QCoreApplication::translate("Utils::TextFileFormat", "An encoding error was encountered."); + *errorString = Tr::tr("An encoding error was encountered."); if (decodingErrorSampleIn) *decodingErrorSampleIn = TextFileFormat::decodingErrorSample(data); return TextFileFormat::ReadEncodingError; @@ -256,7 +257,7 @@ TextFileFormat::ReadResult TextFileFormat::readFileUTF8(const FilePath &filePath return TextFileFormat::ReadIOError; data = reader.data(); } catch (const std::bad_alloc &) { - *errorString = QCoreApplication::translate("Utils::TextFileFormat", "Out of memory."); + *errorString = Tr::tr("Out of memory."); return TextFileFormat::ReadMemoryAllocationError; } diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp index db5bcd76b0..5d626c74f2 100644 --- a/src/libs/utils/unixutils.cpp +++ b/src/libs/utils/unixutils.cpp @@ -5,8 +5,8 @@ #include "filepath.h" #include "qtcsettings.h" +#include "utilstr.h" -#include #include #include @@ -33,14 +33,13 @@ void UnixUtils::setFileBrowser(QSettings *settings, const QString &term) QString UnixUtils::fileBrowserHelpText() { - QString help = QCoreApplication::translate("Utils::UnixTools", - "" - "" - "" - "" - "" - "" - "
VariableExpands to
%ddirectory of current file
%ffile name (with full path)
%nfile name (without path)
%%%
"); + QString help = Tr::tr("" + "" + "" + "" + "" + "" + "
VariableExpands to
%ddirectory of current file
%ffile name (with full path)
%nfile name (without path)
%%%
"); return help; } diff --git a/src/libs/utils/variablechooser.cpp b/src/libs/utils/variablechooser.cpp index a42da7f82c..07348b6489 100644 --- a/src/libs/utils/variablechooser.cpp +++ b/src/libs/utils/variablechooser.cpp @@ -6,9 +6,10 @@ #include "fancylineedit.h" #include "headerviewstretcher.h" // IconButton #include "macroexpander.h" -#include "treemodel.h" #include "qtcassert.h" +#include "treemodel.h" #include "utilsicons.h" +#include "utilstr.h" #include #include @@ -82,7 +83,7 @@ public: { m_iconButton = new IconButton; m_iconButton->setIcon(Icons::REPLACE.icon()); - m_iconButton->setToolTip(VariableChooser::tr("Insert Variable")); + m_iconButton->setToolTip(Tr::tr("Insert Variable")); m_iconButton->hide(); connect(m_iconButton.data(), &QAbstractButton::clicked, this, &VariableChooserPrivate::updatePositionAndShow); @@ -188,7 +189,7 @@ public: const QString value = m_expander->value(m_variable).toHtmlEscaped(); if (!value.isEmpty()) description += QLatin1String("

") - + VariableChooser::tr("Current Value: %1").arg(value); + + Tr::tr("Current Value: %1").arg(value); return description; } @@ -212,17 +213,17 @@ void VariableTreeView::contextMenuEvent(QContextMenuEvent *ev) QAction *insertExpandedAction = nullptr; if (unexpandedText.isEmpty()) { - insertUnexpandedAction = menu.addAction(VariableChooser::tr("Insert Unexpanded Value")); + insertUnexpandedAction = menu.addAction(Tr::tr("Insert Unexpanded Value")); insertUnexpandedAction->setEnabled(false); } else { - insertUnexpandedAction = menu.addAction(VariableChooser::tr("Insert \"%1\"").arg(unexpandedText)); + insertUnexpandedAction = menu.addAction(Tr::tr("Insert \"%1\"").arg(unexpandedText)); } if (expandedText.isEmpty()) { - insertExpandedAction = menu.addAction(VariableChooser::tr("Insert Expanded Value")); + insertExpandedAction = menu.addAction(Tr::tr("Insert Expanded Value")); insertExpandedAction->setEnabled(false); } else { - insertExpandedAction = menu.addAction(VariableChooser::tr("Insert \"%1\"").arg(expandedText)); + insertExpandedAction = menu.addAction(Tr::tr("Insert \"%1\"").arg(expandedText)); } @@ -250,7 +251,7 @@ VariableChooserPrivate::VariableChooserPrivate(VariableChooser *parent) m_variableTree(nullptr), m_variableDescription(nullptr) { - m_defaultDescription = VariableChooser::tr("Select a variable to insert."); + m_defaultDescription = Tr::tr("Select a variable to insert."); m_variableFilter = new FancyLineEdit(q); m_variableTree = new VariableTreeView(q, this); @@ -371,7 +372,7 @@ VariableChooser::VariableChooser(QWidget *parent) : QWidget(parent), d(new VariableChooserPrivate(this)) { - setWindowTitle(tr("Variables")); + setWindowTitle(Tr::tr("Variables")); setWindowFlags(Qt::Tool); setFocusPolicy(Qt::StrongFocus); setFocusProxy(d->m_variableTree); diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 037467b569..9fca25eaea 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -7,6 +7,7 @@ #include "hostosinfo.h" #include "qtcassert.h" #include "theme/theme.h" +#include "utilstr.h" #include "wizardpage.h" #include @@ -115,7 +116,7 @@ LinearProgressWidget::LinearProgressWidget(WizardProgress *progress, QWidget *pa m_mainLayout->addLayout(m_itemWidgetLayout); m_mainLayout->addSpacerItem(spacer); - m_dotsItemWidget = new ProgressItemWidget(m_indicatorPixmap, tr("..."), this); + m_dotsItemWidget = new ProgressItemWidget(m_indicatorPixmap, Tr::tr("..."), this); m_dotsItemWidget->setVisible(false); m_dotsItemWidget->setEnabled(false); -- cgit v1.2.1